X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=515b2a672733d318ce36c77415a883e499a37cb1;hb=1ee8b306b296ea2724e128f66486675bdaac7a3d;hp=a54a36f5891c6990058e33c824136e6a37db5e07;hpb=1303e926afe9f3beeae52f1cc8ca854b68cc53b7;p=jalview.git

diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index a54a36f..515b2a6 100755
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -1,81 +1,157 @@
+/*
+ * 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 javax.swing.*;
 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;
-
-  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)
-        {}
-      }
-      });
-  }
+    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;
 
-  public void run()
-  {
-    long startTime =  System.currentTimeMillis()/1000;
+        Thread t = new Thread(this);
+        t.start();
+        addMouseListener(new MouseAdapter()
+            {
+                public void mousePressed(MouseEvent evt)
+                {
+                    try
+                    {
+                        closeSplash();
+                    }
+                    catch (Exception ex)
+                    {
+                    }
+                }
+            });
+    }
 
-    while( visible )
+    /**
+     * DOCUMENT ME!
+     */
+    public void run()
     {
-      if( System.currentTimeMillis()/1000 - startTime > 5)
-        visible = false;
-
-      try{
-        Thread.sleep(400);
-        iframe.setSelected(true);
-      }
-      catch(Exception ex){}
-    }
+        long startTime = System.currentTimeMillis() / 1000;
+
+        while (visible)
+        {
+            if (((System.currentTimeMillis() / 1000) - startTime) > 5)
+            {
+                visible = false;
+            }
 
-    closeSplash();
+            try
+            {
+                Thread.sleep(1000);
+            }
+            catch (Exception ex)
+            {
+            }
+        }
 
-  }
+        closeSplash();
+    }
 
-  public void closeSplash()
-  {
-    try
+    /**
+     * DOCUMENT ME!
+     */
+    public void closeSplash()
     {
-      iframe.setClosed(true);
+        try
+        {
+            iframe.setClosed(true);
+        }
+        catch (Exception ex)
+        {
+        }
     }
-    catch (Exception ex)
-    {}
-
-  }
-
-  int fontSize = 11;
-  int yoffset = 30;
-  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+4));
-    if(image!=null)
-    g.drawImage(image, 5,yoffset+10,this);
-    g.drawString("JalView 2005", 50,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+20+fontSize);
-    g.drawString("If  you use JalView, please cite:",50,yoffset+20+fontSize*2);
-    g.drawString("\"Clamp, M., Cuff, J., Searle, S. M. and Barton, G. J. (2004), The Jalview Java Alignment Editor\"",50,yoffset+20+fontSize*3);
-
-  }
 
+    /**
+     * 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.getProperty("BUILD_DATE"),
+                     180, y);
+
+        if (!jalview.bin.Cache.getProperty("jalview.version").equals(
+            jalview.bin.Cache.getProperty("VERSION")))
+        {
+          // If the jnlp version and the code version differ, warn the user
+          g.setColor(Color.red);
+          g.drawString("!! Jalview version " +
+                       jalview.bin.Cache.getProperty("jalview.version")
+                       + " 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);
+    }
 }