X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=d819d982691230663491368165ceac43d13da378;hb=e894eb87d40be6e8452d19032ddffe80dad5f804;hp=b73b99699260c65c573f144343159fc0a96774ad;hpb=309f2ebc93eb5aab5478279a3c40914f216f01a4;p=jalview.git

diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index b73b996..d819d98 100755
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -1,167 +1,169 @@
-/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 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
- */
-package jalview.gui;
-
-import java.awt.*;
-import java.awt.event.*;
-
-import javax.swing.*;
-
-
-/**
- * DOCUMENT ME!
- *
- * @author $author$
- * @version $Revision$
- */
-public class SplashScreen extends JPanel implements Runnable
-{
-    boolean visible = true;
-    JInternalFrame iframe;
-    Image image;
-    int fontSize = 11;
-    int yoffset = 30;
-
-    /**
-     * Creates a new SplashScreen object.
-     *
-     * @param iframe DOCUMENT ME!
-     * @param i DOCUMENT ME!
-     */
-    public SplashScreen(JInternalFrame iframe, Image i)
-    {
-        this.iframe = iframe;
-        image = i;
-
-        Thread t = new Thread(this);
-        t.start();
-        addMouseListener(new MouseAdapter()
-            {
-                public void mousePressed(MouseEvent evt)
-                {
-                    try
-                    {
-                        closeSplash();
-                    }
-                    catch (Exception ex)
-                    {
-                    }
-                }
-            });
-    }
-
-    /**
-     * DOCUMENT ME!
-     */
-    public void run()
-    {
-        long startTime = System.currentTimeMillis() / 1000;
-
-        while (visible)
-        {
-            if (((System.currentTimeMillis() / 1000) - startTime) > 5)
-            {
-                visible = false;
-            }
-
-            try
-            {
-                Thread.sleep(1000);
-                repaint();
-            }
-            catch (Exception ex)
-            {
-            }
-        }
-
-        closeSplash();
-    }
-
-    /**
-     * DOCUMENT ME!
-     */
-    public void closeSplash()
-    {
-        try
-        {
-            iframe.setClosed(true);
-        }
-        catch (Exception ex)
-        {
-        }
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param g DOCUMENT ME!
-     */
-    public void paintComponent(Graphics g)
-    {
-        g.setColor(Color.white);
-        g.fillRect(0, 0, getWidth(), getHeight());
-        g.setColor(Color.black);
-        g.setFont(new Font("Verdana", Font.BOLD, fontSize + 6));
-
-        if (image != null)
-        {
-            g.drawImage(image, 5, yoffset + 12, this);
-        }
-
-        int y = yoffset;
-
-        g.drawString("JalView 2005 ", 50, y);
-        g.setFont(new Font("Verdana", Font.BOLD, fontSize + 2));
-        g.drawString("Version " + jalview.bin.Cache.getProperty("VERSION") +
-                     "; Last updated: " + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"),
-                     180, y);
-
-        if (jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals("Checking"))
-        {
-          // Displayed when code version and jnlp version do not match
-          g.drawString("...Checking latest version...",
-                       50, y += fontSize + 10);
-          y += 5;
-          g.setColor(Color.black);
-        }
-        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);
-          y += 5;
-          g.setColor(Color.black);
-        }
-
-        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.",
-            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 12;426-7.",
-            50, y+=fontSize+4);
-    }
-}
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2006 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
+ */
+package jalview.gui;
+
+import java.awt.*;
+import java.awt.event.*;
+
+import javax.swing.*;
+
+
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class SplashScreen extends JPanel implements Runnable
+{
+    boolean visible = true;
+    JInternalFrame iframe;
+    Image image;
+    int fontSize = 11;
+    int yoffset = 30;
+
+    /**
+     * Creates a new SplashScreen object.
+     *
+     * @param iframe DOCUMENT ME!
+     * @param i DOCUMENT ME!
+     */
+    public SplashScreen(JInternalFrame iframe, Image i)
+    {
+        this.iframe = iframe;
+        image = i;
+
+        Thread t = new Thread(this);
+        t.start();
+        addMouseListener(new MouseAdapter()
+            {
+                public void mousePressed(MouseEvent evt)
+                {
+                    try
+                    {
+                        closeSplash();
+                    }
+                    catch (Exception ex)
+                    {
+                    }
+                }
+            });
+    }
+
+    /**
+     * DOCUMENT ME!
+     */
+    public void run()
+    {
+        long startTime = System.currentTimeMillis() / 1000;
+
+        while (visible)
+        {
+            if (((System.currentTimeMillis() / 1000) - startTime) > 5)
+            {
+                visible = false;
+            }
+
+            try
+            {
+                Thread.sleep(1000);
+                repaint();
+            }
+            catch (Exception ex)
+            {
+            }
+        }
+
+        closeSplash();
+    }
+
+    /**
+     * DOCUMENT ME!
+     */
+    public void closeSplash()
+    {
+        try
+        {
+            iframe.setClosed(true);
+        }
+        catch (Exception ex)
+        {
+          ex.printStackTrace();
+        }
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g DOCUMENT ME!
+     */
+    public void paintComponent(Graphics g)
+    {
+        g.setColor(Color.white);
+        g.fillRect(0, 0, getWidth(), getHeight());
+        g.setColor(Color.black);
+        g.setFont(new Font("Verdana", Font.BOLD, fontSize + 6));
+
+        if (image != null)
+        {
+            g.drawImage(image, 5, yoffset + 12, this);
+        }
+
+        int y = yoffset;
+
+        g.drawString("Jalview "+jalview.bin.Cache.getProperty("VERSION"), 50, y);
+
+        FontMetrics fm = g.getFontMetrics();
+        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"),
+                     50 + vwidth +5, y);
+
+        if (jalview.bin.Cache.getDefault("LATEST_VERSION", "Checking").equals("Checking"))
+        {
+          // Displayed when code version and jnlp version do not match
+          g.drawString("...Checking latest version...",
+                       50, y += fontSize + 10);
+          y += 5;
+          g.setColor(Color.black);
+        }
+        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);
+          y += 5;
+          g.setColor(Color.black);
+        }
+
+        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.",
+            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);
+    }
+}