/hg/icedtea-web: 2 new changesets

[jvanek at icedtea.classpath.org]

changeset c5db48847b93 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c5db48847b93
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Apr 25 14:20:19 2013 +0200

	Splashscreen now strip commit id from released versions


changeset ca33c41c9f69 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=ca33c41c9f69
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Apr 25 14:25:45 2013 +0200

	Locking disabled on windows machines


diffstat:

 ChangeLog                                                                                            |  16 ++++++++
 netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java                |  16 +++++++-
 netx/net/sourceforge/jnlp/util/lockingfile/LockedFile.java                                           |   7 +++
 tests/netx/unit/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainterTest.java |  18 ++++++++++
 4 files changed, 55 insertions(+), 2 deletions(-)

diffs (116 lines):

diff -r 5c5709590a9d -r ca33c41c9f69 ChangeLog
--- a/ChangeLog	Wed Apr 24 11:06:49 2013 -0400
+++ b/ChangeLog	Thu Apr 25 14:25:45 2013 +0200
@@ -1,3 +1,19 @@
+2013-04-25  Jiri Vanek <jvanek at redhat.com>	
+
+	Locking disabled on windows machines
+	* netx/net/sourceforge/jnlp/util/lockingfile/LockedFile.java:
+	(lock) and (unlock) are no-op on windows.
+
+2013-04-25  Jiri Vanek <jvanek at redhat.com>
+
+	Splashscreen now strip commit id from released versions
+	*  netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java:
+	(stripCommitFromVersion) new method responsible for cutting
+	(drawBase) now using stripCommitFromVersion before printing drawing version
+	to splashscreen
+	* tests/netx/unit/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainterTest.java:
+	(stripCommitFromVersion) new test for 	
+
 2013-04-24  Adam Domurad  <adomurad at redhat.com>
 
 	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java:
diff -r 5c5709590a9d -r ca33c41c9f69 netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java
--- a/netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java	Wed Apr 24 11:06:49 2013 -0400
+++ b/netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java	Thu Apr 25 14:25:45 2013 +0200
@@ -371,6 +371,17 @@
         return tt;
     }
 
+    static String stripCommitFromVersion(String version) {
+        if (version.contains("pre+")) {
+            return version;
+        }
+        int i = version.indexOf("+");
+        if (i < 0) {
+            return version;
+        }
+        return version.substring(0, version.indexOf("+"));
+    }
+
     private final class MovingTextRunner extends Observable implements Runnable {
 
         private static final int MAX_ANIMATION_VALUE = 10000;
@@ -499,11 +510,12 @@
         g2d.setColor(plainTextColor);
         FontMetrics fm = g2d.getFontMetrics();
         if (version != null) {
-            int y = master.getSplashWidth() - fm.stringWidth(version + " ");
+            String niceVersion=stripCommitFromVersion(version);
+            int y = master.getSplashWidth() - fm.stringWidth(niceVersion + " ");
             if (y < 0) {
                 y = 0;
             }
-            g2d.drawString(version, y, fm.getHeight());
+            g2d.drawString(niceVersion, y, fm.getHeight());
         }
         return fm;
     }
diff -r 5c5709590a9d -r ca33c41c9f69 netx/net/sourceforge/jnlp/util/lockingfile/LockedFile.java
--- a/netx/net/sourceforge/jnlp/util/lockingfile/LockedFile.java	Wed Apr 24 11:06:49 2013 -0400
+++ b/netx/net/sourceforge/jnlp/util/lockingfile/LockedFile.java	Thu Apr 25 14:25:45 2013 +0200
@@ -44,6 +44,7 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 import java.util.concurrent.locks.ReentrantLock;
+import net.sourceforge.jnlp.runtime.JNLPRuntime;
 
 /*
  * Process & thread locked access to a file. Creates file if it does not already exist.
@@ -112,6 +113,9 @@
      * Lock access to the file. Lock is reentrant.
      */
     public void lock() throws IOException {
+        if (JNLPRuntime.isWindows()) {
+            return;
+        }
         // Create if does not already exist, cannot lock non-existing file
         if (!isReadOnly()) {
             this.file.createNewFile();
@@ -136,6 +140,9 @@
      * Unlock access to the file. Lock is reentrant.
      */
     public void unlock() throws IOException {
+        if (JNLPRuntime.isWindows()) {
+            return;
+        }
         boolean releaseProcessLock = (this.threadLock.getHoldCount() == 1);
         try {
             if (releaseProcessLock) {
diff -r 5c5709590a9d -r ca33c41c9f69 tests/netx/unit/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainterTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainterTest.java	Wed Apr 24 11:06:49 2013 -0400
+++ b/tests/netx/unit/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainterTest.java	Thu Apr 25 14:25:45 2013 +0200
@@ -105,4 +105,22 @@
 
 
     }
+
+    @Test
+    public void stripCommitFromVersion() {
+        Assert.assertEquals("1.4", BasePainter.stripCommitFromVersion("1.4"));
+        Assert.assertEquals("1.4.2", BasePainter.stripCommitFromVersion("1.4.2"));
+        Assert.assertEquals("1.4pre", BasePainter.stripCommitFromVersion("1.4pre"));
+        Assert.assertEquals("1.4", BasePainter.stripCommitFromVersion("1.4+657tgkhyu4iy5"));
+        Assert.assertEquals("1.4.2", BasePainter.stripCommitFromVersion("1.4.2+887tgjh07tftvhjj"));
+        Assert.assertEquals("1.4pre+0977tyugg", BasePainter.stripCommitFromVersion("1.4pre+0977tyugg"));
+
+        Assert.assertEquals("1.4pre+", BasePainter.stripCommitFromVersion("1.4pre+"));
+        Assert.assertEquals("1.4pre+foo+", BasePainter.stripCommitFromVersion("1.4pre+foo+"));
+        Assert.assertEquals("1.4pre+foo+bar", BasePainter.stripCommitFromVersion("1.4pre+foo+bar"));
+        
+        Assert.assertEquals("1.4", BasePainter.stripCommitFromVersion("1.4+"));
+        Assert.assertEquals("1.4", BasePainter.stripCommitFromVersion("1.4+foo+"));
+        Assert.assertEquals("1.4", BasePainter.stripCommitFromVersion("1.4+foo+bar"));
+    }
 }