update text and version checker

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 2be8770..8d8e6af 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -586,7 +586,7 @@ public class Desktop
    */
   public void aboutMenuItem_actionPerformed(ActionEvent e)
   {
-    StringBuffer message = new StringBuffer("JalView version " +
+    StringBuffer message = new StringBuffer("Jalview version " +
                                             jalview.bin.Cache.getProperty(
                                                 "VERSION") +
                                             "; last updated: " +
@@ -605,9 +605,10 @@ public class Desktop
     }
 
     message.append("\nAuthors:  Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton." +
-                   "\nCurrent development managed by Andrew Waterhouse; Barton Group, University of Dundee." +
-                   "\nFor all issues relating to Jalview, email help@jalview.org" +
-                   "\n\nIf  you use JalView, please cite:" +
+                   "\nDevelopment managed by The Barton Group, University of Dundee.\n"+
+                   "\nFor specific issues relating to Jalview, email help@jalview.org\n"+
+                   " or join the jalview-discuss@jalview.org mailing list" +
+                   "\n\nIf  you use Jalview, please cite:" +
                    "\n\"Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004), The Jalview Java Alignment Editor\"" +
                    "\nBioinformatics,  2004 20;426-7.");
 

diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index 30cfa63..b72cc61 100755 (executable)
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -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.",