X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=e46c5e7b008b1a1e8ce61cf4901c6bd5acbb141f;hb=956eee960b27a9cd6bec91f55bdd063dd0410e0e;hp=c4bdc0326a8a9858e8fb63cdb2bda089ff31e69f;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index c4bdc03..e46c5e7 100755 --- a/src/jalview/gui/SplashScreen.java +++ b/src/jalview/gui/SplashScreen.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,10 +20,20 @@ */ package jalview.gui; -import java.awt.*; -import java.awt.event.*; - -import javax.swing.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.MediaTracker; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +import javax.swing.JInternalFrame; +import javax.swing.JLayeredPane; +import javax.swing.JPanel; +import javax.swing.JTextPane; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; @@ -33,8 +43,8 @@ import javax.swing.event.HyperlinkListener; * @author $author$ * @version $Revision$ */ -public class SplashScreen extends JPanel implements Runnable, - HyperlinkListener +public class SplashScreen extends JPanel + implements Runnable, HyperlinkListener { boolean visible = true; @@ -70,12 +80,13 @@ public class SplashScreen extends JPanel implements Runnable, { this.interactiveDialog = interactive; // show a splashscreen that will disapper - Thread t = new Thread(this); + Thread t = new Thread(this, "ShowSplashScreenThread"); t.start(); } MouseAdapter closer = new MouseAdapter() { + @Override public void mousePressed(MouseEvent evt) { try @@ -101,14 +112,14 @@ public class SplashScreen extends JPanel implements Runnable, try { java.net.URL url = getClass().getResource("/images/Jalview_Logo.png"); - java.net.URL urllogo = getClass().getResource( - "/images/Jalview_Logo_small.png"); + java.net.URL urllogo = getClass() + .getResource("/images/Jalview_Logo_small.png"); if (url != null) { image = java.awt.Toolkit.getDefaultToolkit().createImage(url); - Image logo = java.awt.Toolkit.getDefaultToolkit().createImage( - urllogo); + Image logo = java.awt.Toolkit.getDefaultToolkit() + .createImage(urllogo); MediaTracker mt = new MediaTracker(this); mt.addImage(image, 0); mt.addImage(logo, 1); @@ -169,11 +180,11 @@ public class SplashScreen extends JPanel implements Runnable, authlist.setContentType("text/html"); authlist.setText(newtext); authlist.setVisible(true); - authlist.setSize(new Dimension(750, 275)); + authlist.setSize(new Dimension(750, 375)); add(authlist, BorderLayout.CENTER); revalidate(); - iframe.setBounds((int) ((Desktop.instance.getWidth() - 750) / 2), - (int) ((Desktop.instance.getHeight() - 140) / 2), 750, + iframe.setBounds((Desktop.instance.getWidth() - 750) / 2, + (Desktop.instance.getHeight() - 375) / 2, 750, authlist.getHeight() + iconimg.getHeight()); iframe.validate(); iframe.setVisible(true); @@ -186,6 +197,7 @@ public class SplashScreen extends JPanel implements Runnable, /** * Create splash screen, display it and clear it off again. */ + @Override public void run() { initSplashScreenWindow(); @@ -257,6 +269,7 @@ public class SplashScreen extends JPanel implements Runnable, return new Dimension(image.getWidth(this) + 8, image.getHeight(this)); } + @Override public void paintComponent(Graphics g) { g.setColor(Color.white);