/*\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
try\r
{\r
Thread.sleep(1000);\r
+ repaint();\r
}\r
catch (Exception ex)\r
{\r
}\r
catch (Exception ex)\r
{\r
+ ex.printStackTrace();\r
}\r
}\r
\r
\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.getProperty("BUILD_DATE"),\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.getProperty("jalview.version").equals(\r
+ if (jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals("Checking"))\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
+ g.setColor(Color.black);\r
+ }\r
+ 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
g.drawString("!! Jalview version " +\r
- jalview.bin.Cache.getProperty("jalview.version")\r
+ jalview.bin.Cache.getDefault("LATEST_VERSION", "..Checking..")\r
+ " is available for download from http://www.jalview.org !!",\r
50, y += fontSize + 10);\r
y += 5;\r
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