X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=2bc4f9e5be11a1c2c600279035f97dac27f7be23;hb=f8c81e5adaada96c5255a539e9d26447bccce3e5;hp=6fc4262c8e402d6919f471e9bf5088fd57209ef8;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git

diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index 6fc4262..2bc4f9e 100755
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -1,20 +1,19 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, 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 file is part of Jalview.
  * 
- * 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.
+ * Jalview 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 3 of the License, or (at your option) any later version.
  * 
- * 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
+ * Jalview 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 Jalview.  If not, see <http://www.gnu.org/licenses/>.
  */
 package jalview.gui;
 
@@ -145,7 +144,7 @@ public class SplashScreen extends JPanel implements Runnable
    * DOCUMENT ME!
    * 
    * @param g
-   *                DOCUMENT ME!
+   *          DOCUMENT ME!
    */
   public void paintComponent(Graphics g)
   {
@@ -168,8 +167,9 @@ public class SplashScreen extends JPanel implements Runnable
     int vwidth = fm.stringWidth("Jalview "
             + jalview.bin.Cache.getProperty("VERSION"));
     g.setFont(new Font("Verdana", Font.BOLD, fontSize + 2));
-    g.drawString("Last updated: "
-            + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"),
+    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"))
@@ -182,41 +182,40 @@ public class SplashScreen extends JPanel implements Runnable
     else if (!jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking")
             .equals(jalview.bin.Cache.getProperty("VERSION")))
     {
-      if (jalview.bin.Cache.getProperty("VERSION").toLowerCase().indexOf(
-              "automated build") == -1)
+      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);
+      g.drawString(
+              "!! Jalview version "
+                      + jalview.bin.Cache.getDefault("LATEST_VERSION",
+                              "..Checking..")
+                      + " is available for download from "+jalview.bin.Cache.getDefault("www.jalview.org","http://www.jalview.org")+" !!",
+              50, y += fontSize + 10);
       y += 5;
       g.setColor(Color.black);
     }
 
     g.setFont(new Font("Verdana", Font.BOLD, fontSize));
-    g
-            .drawString(
-                    "Authors: Andrew Waterhouse, Jim Procter, Michele Clamp, James Cuff, Steve Searle,",
-                    50, y += fontSize + 4);
+    g.drawString(
+            "Authors: Jim Procter, Andrew Waterhouse, Michele Clamp, James Cuff, Steve Searle,",
+            50, y += fontSize + 4);
     g.drawString("David Martin & Geoff Barton.", 60, y += fontSize + 4);
-    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),",
-                    50, y += fontSize + 4);
-    g
-            .drawString(
-                    "\"The Jalview Java Alignment Editor\" Bioinformatics,  2004 20; 426-7.",
-                    50, y += fontSize + 4);
+    g.drawString(
+            "Development managed by The Barton Group, University of Dundee.",
+            50, y += fontSize + 4);
+    g.drawString("If  you use Jalview, please cite: ", 50,
+            y += fontSize + 4);
+    g.drawString(
+            "Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)",
+            50, y += fontSize + 4);
+    g.drawString(
+            "Jalview Version 2 - a multiple sequence alignment editor and analysis workbench",
+            50, y += fontSize + 4);
+    g.drawString("Bioinformatics doi: 10.1093/bioinformatics/btp033", 50,
+            y += fontSize + 4);
   }
 }