X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=30503b1aa47564b59d82b9776e7acc2b18153fb5;hb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;hp=30cfa63ef1ad4d7d4651a275f06c03485a440daa;hpb=bcfc087d75da78963a3bba83ee2a206035297ee7;p=jalview.git diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index 30cfa63..30503b1 100755 --- a/src/jalview/gui/SplashScreen.java +++ b/src/jalview/gui/SplashScreen.java @@ -1,17 +1,17 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle - * + * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) + * Copyright (C) 2009 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 @@ -24,17 +24,20 @@ 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; /** @@ -45,20 +48,22 @@ public class SplashScreen Thread t = new Thread(this); t.start(); } + /** - * ping the jalview version page then create and display the jalview splashscreen window. + * ping the jalview version page then create and display the jalview + * splashscreen window. */ - void initSplashScreenWindow() { + void initSplashScreenWindow() + { addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent evt) { try { - visible=false; + visible = false; closeSplash(); - } - catch (Exception ex) + } catch (Exception ex) { } } @@ -77,12 +82,10 @@ public class SplashScreen mt.waitForID(0); Desktop.instance.setIconImage(image); } - } - catch (Exception ex) + } catch (Exception ex) { } - iframe = new JInternalFrame(); iframe.setFrameIcon(null); iframe.setClosable(false); @@ -92,9 +95,8 @@ public class SplashScreen Desktop.desktop.add(iframe); iframe.setVisible(true); - iframe.setBounds( (int) ( (Desktop.instance.getWidth() - 750) / 2), - (int) ( (Desktop.instance.getHeight() - 160) / 2), - 750, 160); + iframe.setBounds((int) ((Desktop.instance.getWidth() - 750) / 2), + (int) ((Desktop.instance.getHeight() - 160) / 2), 750, 190); } /** @@ -104,18 +106,17 @@ public class SplashScreen { initSplashScreenWindow(); long startTime = System.currentTimeMillis() / 1000; - + while (visible) { try { Thread.sleep(1000); - } - catch (Exception ex) + } catch (Exception ex) { } - if ( ( (System.currentTimeMillis() / 1000) - startTime) > 5) + if (((System.currentTimeMillis() / 1000) - startTime) > 5) { visible = false; } @@ -135,15 +136,16 @@ public class SplashScreen { iframe.setClosed(true); + } catch (Exception ex) + { } - catch (Exception ex) - { } } /** * DOCUMENT ME! - * - * @param g DOCUMENT ME! + * + * @param g + * DOCUMENT ME! */ public void paintComponent(Graphics g) { @@ -159,49 +161,60 @@ public class SplashScreen int y = yoffset; - g.drawString("Jalview " + jalview.bin.Cache.getProperty("VERSION"), 50, y); + g.drawString("Jalview " + jalview.bin.Cache.getProperty("VERSION"), 50, + y); FontMetrics fm = g.getFontMetrics(); - int vwidth = fm.stringWidth("Jalview " + - jalview.bin.Cache.getProperty("VERSION")); + 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")) + 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); + 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"))) + 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); + 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); 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); + g + .drawString( + "Authors: Andrew Waterhouse, Jim Procter, 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: ",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); } }