X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=05f412f0b5781db6e37a381fb2bbc2c189bb57e4;hb=refs%2Fheads%2FvamsasDemo;hp=9f089a3bbeed8d1778d7176ae0cbdf460cf12a93;hpb=086115440f8e30fa1bfc881e00b94878b491fb89;p=jalview.git

diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index 9f089a3..05f412f 100755
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -83,6 +83,7 @@ public class SplashScreen extends JPanel implements Runnable
             try
             {
                 Thread.sleep(1000);
+                repaint();
             }
             catch (Exception ex)
             {
@@ -103,6 +104,7 @@ public class SplashScreen extends JPanel implements Runnable
         }
         catch (Exception ex)
         {
+          ex.printStackTrace();
         }
     }
 
@@ -125,20 +127,29 @@ public class SplashScreen extends JPanel implements Runnable
 
         int y = yoffset;
 
-        g.drawString("JalView 2005 ", 50, y);
+        g.drawString("Jalview "+jalview.bin.Cache.getProperty("VERSION"), 50, y);
+
+        FontMetrics fm = g.getFontMetrics();
+        int vwidth = fm.stringWidth("Jalview "+jalview.bin.Cache.getProperty("VERSION"));
         g.setFont(new Font("Verdana", Font.BOLD, fontSize + 2));
-        g.drawString("Version " + jalview.bin.Cache.getProperty("VERSION") +
-                     "; Last updated: " + jalview.bin.Cache.getProperty("BUILD_DATE"),
-                     180, y);
+        g.drawString("Last updated: " + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"),
+                     50 + vwidth +5, y);
 
-        if (!jalview.bin.Cache.getProperty("LATEST_VERSION").equals(
+        if (jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals("Checking"))
+        {
+          // Displayed when code version and jnlp version do not match
+          g.drawString("...Checking latest version...",
+                       50, y += fontSize + 10);
+          y += 5;
+          g.setColor(Color.black);
+        }
+        else if (!jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals(
             jalview.bin.Cache.getProperty("VERSION")))
         {
-          // If the jnlp version and the code version differ, warn the user
+          // Displayed when code version and jnlp version do not match
           g.setColor(Color.red);
-
           g.drawString("!! Jalview version " +
-                       jalview.bin.Cache.getProperty("LATEST_VERSION")
+                       jalview.bin.Cache.getDefault("LATEST_VERSION", "..Checking..")
                        + " is available for download from http://www.jalview.org !!",
                        50, y += fontSize + 10);
           y += 5;
@@ -152,7 +163,7 @@ public class SplashScreen extends JPanel implements Runnable
             50,  y+=fontSize+4);
         g.drawString("If  you use JalView, please cite: Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004),",
             50, y+=fontSize+4);
-        g.drawString("\"The Jalview Java Alignment Editor\" Bioinformatics,  2004 12;426-7.",
+        g.drawString("\"The Jalview Java Alignment Editor\" Bioinformatics,  2004 12; 426-7.",
             50, y+=fontSize+4);
     }
 }