X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=05f412f0b5781db6e37a381fb2bbc2c189bb57e4;hb=eacce9627f059fc2f9e880c81d8d1bdfbe7fe5b3;hp=6edab5da5d6310d4353b11b531c522ec520c6475;hpb=588042b69abf8e60bcc950b24c283933c7dd422f;p=jalview.git

diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index 6edab5d..05f412f 100755
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -20,99 +20,150 @@ package jalview.gui;
 
 import java.awt.*;
 import java.awt.event.*;
+
 import javax.swing.*;
 
-public class SplashScreen
-    extends JPanel implements Runnable
+
+/**
+ * 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;
-
-  public SplashScreen(JInternalFrame iframe, Image i)
-  {
-    this.iframe = iframe;
-    image = i;
-
-    Thread t = new Thread(this);
-    t.start();
-    addMouseListener(new MouseAdapter()
+    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()
     {
-      public void mousePressed(MouseEvent evt)
-      {
         try
         {
-          closeSplash();
+            iframe.setClosed(true);
         }
         catch (Exception ex)
         {
+          ex.printStackTrace();
         }
-      }
-    });
-  }
-
-  public void run()
-  {
-    long startTime = System.currentTimeMillis() / 1000;
+    }
 
-    while (visible)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g DOCUMENT ME!
+     */
+    public void paintComponent(Graphics g)
     {
-      if ( ( (System.currentTimeMillis() / 1000) - startTime) > 5)
-      {
-        visible = false;
-      }
-
-      try
-      {
-        Thread.sleep(1000);
-      }
-      catch (Exception ex)
-      {
-      }
-    }
+        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);
+        }
 
-  public void closeSplash()
-  {
-    try
-    {
-      iframe.setClosed(true);
-    }
-    catch (Exception ex)
-    {
-    }
-  }
+        int y = yoffset;
 
-  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));
+        g.drawString("Jalview "+jalview.bin.Cache.getProperty("VERSION"), 50, y);
 
-    if (image != null)
-    {
-      g.drawImage(image, 5, yoffset + 12, this);
-    }
+        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.drawString("JalView 2005 ", 50, yoffset);
-    g.setFont(new Font("Verdana", Font.BOLD, fontSize + 2));
-    g.drawString("Version " + jalview.bin.Cache.VERSION +
-                 "; Last updated: " + jalview.bin.Cache.BUILD_DATE, 180,
-                 yoffset);
-    g.setFont(new Font("Verdana", Font.BOLD, fontSize));
-    g.drawString("Authors: Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton.",
-                 50, yoffset + 20);
-    g.drawString("Current development managed by Andrew Waterhouse; Barton Group, University of Dundee.",
-                 50, yoffset + 24 + fontSize);
-    g.drawString("If  you use JalView, please cite: Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004),",
-                 50, yoffset + 28 + (fontSize * 2));
-    g.drawString(
-        "\"The Jalview Java Alignment Editor\" Bioinformatics,  2004 12;426-7.",
-        50, yoffset + 32 + (fontSize * 3));
-  }
+        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);
+    }
 }