applied copyright 2008

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

diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index 30cfa63..031e930 100755 (executable)
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -1,17 +1,17 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
+ * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
@@ -168,7 +168,6 @@ public class SplashScreen
     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"))
     {
@@ -181,14 +180,17 @@ public class SplashScreen
     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);
+      if (jalview.bin.Cache.getProperty("VERSION").toLowerCase().indexOf("automated build")==-1)
+      {
+        // Displayed when code version and jnlp version do not match and code version is not a development build
+        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);
     }
@@ -196,9 +198,9 @@ public class SplashScreen
     g.setFont(new Font("Verdana", Font.BOLD, fontSize));
     g.drawString("Authors: Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton.",
                  50, y += fontSize + 4);
-    g.drawString("Current development managed by Andrew Waterhouse; Barton Group, University of Dundee.",
+    g.drawString("Development managed by The Barton Group, University of Dundee.",
                  50, y += fontSize + 4);
-    g.drawString("If  you use JalView, please cite: Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004),",
+    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 20; 426-7.",