X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=b72cc61c9ecb7fcfc0b5d73325c92a5012c65e2c;hb=1028c4132e550ff8122bb8ec91519b1349561f93;hp=30cfa63ef1ad4d7d4651a275f06c03485a440daa;hpb=12c2e0bbb8e7b086ce02d2d2ba05c86350f7c356;p=jalview.git diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index 30cfa63..b72cc61 100755 --- 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.",