header updated

[jalview.git] / src / jalview / gui / SplashScreen.java

diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index 1bf51ed..063a11c 100755 (executable)
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -104,6 +104,7 @@ public class SplashScreen extends JPanel implements Runnable
         }\r
         catch (Exception ex)\r
         {\r
+          ex.printStackTrace();\r
         }\r
     }\r
 \r
@@ -126,17 +127,17 @@ public class SplashScreen extends JPanel implements Runnable
 \r
         int y = yoffset;\r
 \r
-        g.drawString("JalView 2005 ", 50, y);\r
+        g.drawString("Jalview "+jalview.bin.Cache.getProperty("VERSION"), 50, y);\r
+\r
+        FontMetrics fm = g.getFontMetrics();\r
+        int vwidth = fm.stringWidth("Jalview "+jalview.bin.Cache.getProperty("VERSION"));\r
         g.setFont(new Font("Verdana", Font.BOLD, fontSize + 2));\r
-        g.drawString("Version " + jalview.bin.Cache.getProperty("VERSION") +\r
-                     "; Last updated: " + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"),\r
-                     180, y);\r
+        g.drawString("Last updated: " + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"),\r
+                     50 + vwidth +5, y);\r
 \r
         if (jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals("Checking"))\r
         {\r
-          // If the jnlp version and the code version differ, warn the user\r
-          g.setColor(Color.red);\r
-\r
+          // Displayed when code version and jnlp version do not match\r
           g.drawString("...Checking latest version...",\r
                        50, y += fontSize + 10);\r
           y += 5;\r
@@ -145,9 +146,8 @@ public class SplashScreen extends JPanel implements Runnable
         else if (!jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals(\r
             jalview.bin.Cache.getProperty("VERSION")))\r
         {\r
-          // If the jnlp version and the code version differ, warn the user\r
+          // Displayed when code version and jnlp version do not match\r
           g.setColor(Color.red);\r
-\r
           g.drawString("!! Jalview version " +\r
                        jalview.bin.Cache.getDefault("LATEST_VERSION", "..Checking..")\r
                        + " is available for download from http://www.jalview.org !!",\r
@@ -163,7 +163,7 @@ public class SplashScreen extends JPanel implements Runnable
             50,  y+=fontSize+4);\r
         g.drawString("If  you use JalView, please cite: Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004),",\r
             50, y+=fontSize+4);\r
-        g.drawString("\"The Jalview Java Alignment Editor\" Bioinformatics,  2004 12;426-7.",\r
+        g.drawString("\"The Jalview Java Alignment Editor\" Bioinformatics,  2004 20; 426-7.",\r
             50, y+=fontSize+4);\r
     }\r
 }\r