X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=9f4429af6666bbfdf0abbbfcfa3815e81bc2e298;hb=e9217775986fbca85770d7fe5b3763b6920b0c3f;hp=20624afaa23359ba5e3e657481c4dc83e4025a11;hpb=17c13e68179a67ff57db2db96ed875eb3c8f6fe2;p=jalview.git

diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index 20624af..9f4429a 100755
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2007 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
@@ -20,148 +20,155 @@ 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
+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()
+  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
         {
-            iframe.setClosed(true);
+          closeSplash();
         }
         catch (Exception ex)
         {
-          ex.printStackTrace();
         }
+      }
+    });
+  }
+
+  /**
+   * 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)
+      {
+      }
     }
 
-    /**
-     * 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));
+    closeSplash();
+  }
 
-        if (image != null)
-        {
-            g.drawImage(image, 5, yoffset + 12, this);
-        }
+  /**
+   * 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;
+    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);
+    g.drawString("Jalview " + jalview.bin.Cache.getProperty("VERSION"), 50, 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);
-        }
+    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);
 
-        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);
+    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);
+  }
 }