X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=05f412f0b5781db6e37a381fb2bbc2c189bb57e4;hb=eacce9627f059fc2f9e880c81d8d1bdfbe7fe5b3;hp=aff93d7d8199def4e9d5105e3516ee3dcd97f1b4;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git

diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index aff93d7..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();
         }
     }
 
@@ -123,18 +125,45 @@ public class SplashScreen extends JPanel implements Runnable
             g.drawImage(image, 5, yoffset + 12, this);
         }
 
-        g.drawString("JalView 2005 ", 50, yoffset);
+        int y = yoffset;
+
+        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.VERSION +
-            "; Last updated: " + jalview.bin.Cache.BUILD_DATE, 180, yoffset);
+        g.drawString("Last updated: " + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"),
+                     50 + vwidth +5, y);
+
+        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")))
+        {
+          // Displayed when code version and jnlp version do not match
+          g.setColor(Color.red);
+          g.drawString("!! Jalview version " +
+                       jalview.bin.Cache.getDefault("LATEST_VERSION", "..Checking..")
+                       + " is available for download from http://www.jalview.org !!",
+                       50, y += fontSize + 10);
+          y += 5;
+          g.setColor(Color.black);
+        }
+
         g.setFont(new Font("Verdana", Font.BOLD, fontSize));
         g.drawString("Authors: Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton.",
-            50, yoffset + 20);
+            50, y+=fontSize+4);
         g.drawString("Current development managed by Andrew Waterhouse; Barton Group, University of Dundee.",
-            50, yoffset + 24 + fontSize);
+            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, yoffset + 28 + (fontSize * 2));
-        g.drawString("\"The Jalview Java Alignment Editor\" Bioinformatics,  2004 12;426-7.",
-            50, yoffset + 32 + (fontSize * 3));
+            50, y+=fontSize+4);
+        g.drawString("\"The Jalview Java Alignment Editor\" Bioinformatics,  2004 12; 426-7.",
+            50, y+=fontSize+4);
     }
 }