X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=b6c31e14412b8b4e5ccfe033c660cd22d53dc34f;hb=7ce65b1fa2b76b09754d4128089c37b7208a356a;hp=a122eb6b647f41cb272f517a24e19d3992e1b2b4;hpb=bd53adc27eab07569b1944a7c33f31c41dad785f;p=jalview.git
diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index a122eb6..b6c31e1 100755
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -20,6 +20,8 @@
*/
package jalview.gui;
+import jalview.util.Platform;
+
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
@@ -27,42 +29,64 @@ import java.awt.Dimension;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.Image;
+import java.awt.Insets;
import java.awt.MediaTracker;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import java.beans.PropertyVetoException;
import javax.swing.JInternalFrame;
import javax.swing.JLabel;
import javax.swing.JLayeredPane;
import javax.swing.JPanel;
-import javax.swing.JTextField;
import javax.swing.JTextPane;
+import javax.swing.Timer;
+import javax.swing.border.EmptyBorder;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
/**
- * DOCUMENT ME!
+ * A class that serves both as an initial 5-second splash screen (interactive
+ * false) as well as for the Help menu item action (interactive true).
+ *
+ * As a splash screen, the frame closes if clicked by the user.
+ *
+ * Closure loop converted from a while/sleep loop to a JavaScript-compatible
+ * state machine by Bob Hanson 2019.11.26.
+ *
+ * TODO: get JTextPane working for read-only HTML.
*
- * @author $author$
- * @version $Revision$
*/
+@SuppressWarnings("serial")
public class SplashScreen extends JPanel
implements Runnable, HyperlinkListener
{
- boolean visible = true;
+ private static final int STATE_INIT = 0;
+
+ private static final int STATE_LOOP = 1;
- JPanel iconimg = new JPanel(new BorderLayout());
+ private static final int STATE_DONE = 2;
+
+ // boolean visible = true;
+
+ private JPanel iconimg = new JPanel(new BorderLayout());
/**
- * either text area in javascript or in java text pane
+ * Temporary SwingJS Hack: Either a JLabel in JavaScript or a JTextPane in
+ * Java
*/
- Component authlist;
+ protected Component htmlPane;
+
+ private JInternalFrame iframe;
- JInternalFrame iframe;
+ private Image image;
- Image image;
+ private final static int fontSize = 11;
- int fontSize = 11;
+ protected final static Font largeFont = new Font("Verdana", Font.BOLD,
+ fontSize + 6);
int yoffset = 30;
@@ -74,7 +98,7 @@ public class SplashScreen extends JPanel
this(false);
}
- private boolean interactiveDialog = false;
+ protected boolean isInteractive = false;
/**
*
@@ -82,38 +106,23 @@ public class SplashScreen extends JPanel
* if true - an internal dialog is opened rather than a free-floating
* splash screen
*/
- public SplashScreen(boolean interactive)
+ public SplashScreen(boolean isInteractive)
{
- this.interactiveDialog = interactive;
- // show a splashscreen that will disapper
- if (/** @j2sNative true || */ false)
- {
- authlist = new JLabel("");
- run();
- }
- else
- {
- /**
- * @j2sNative
- */
- {
- authlist = new JTextPane();
- Thread t = new Thread(this);
- t.start();
- }
- }
-
+ this.isInteractive = isInteractive;
+ Thread t = new Thread(this, "SplashScreen");
+ t.start();
}
MouseAdapter closer = new MouseAdapter()
{
+ @Override
public void mousePressed(MouseEvent evt)
{
try
{
- if (!interactiveDialog)
+ if (!isInteractive)
{
- visible = false;
+ setVisible(false);
closeSplash();
}
} catch (Exception ex)
@@ -126,107 +135,112 @@ public class SplashScreen extends JPanel
* ping the jalview version page then create and display the jalview
* splashscreen window.
*/
- void initSplashScreenWindow()
+ protected void initSplashScreenWindow()
{
addMouseListener(closer);
try
{
java.net.URL url = getClass().getResource("/images/Jalview_Logo.png");
- java.net.URL urllogo = getClass()
- .getResource("/images/Jalview_Logo_small.png");
-
- if (/** @j2sNative false || */ url != null)
+ image = java.awt.Toolkit.getDefaultToolkit().createImage(url);
+ MediaTracker mt = new MediaTracker(this);
+ mt.addImage(image, 0);
+ Image logo = (Platform.isJS() ? null
+ : java.awt.Toolkit.getDefaultToolkit().createImage(getClass()
+ .getResource("/images/Jalview_Logo_small.png")));
+ if (logo != null)
{
- image = java.awt.Toolkit.getDefaultToolkit().createImage(url);
- Image logo = java.awt.Toolkit.getDefaultToolkit()
- .createImage(urllogo);
- MediaTracker mt = new MediaTracker(this);
- mt.addImage(image, 0);
mt.addImage(logo, 1);
- do
+ }
+ do
+ {
+ try
{
- try
- {
- mt.waitForAll();
- } catch (InterruptedException x)
- {
- }
- ;
- if (mt.isErrorAny())
- {
- System.err.println("Error when loading images!");
- }
- } while (!mt.checkAll());
- Desktop.instance.setIconImage(logo);
+ mt.waitForAll();
+ } catch (InterruptedException x)
+ {
+ }
+ if (mt.isErrorAny())
+ {
+ System.err.println("Error when loading images!");
+ }
+ } while (!mt.checkAll());
+ if (url != null)
+ {
+ Desktop.getInstance().setIconImage(logo);
}
} catch (Exception ex)
{
}
-
iframe = new JInternalFrame();
iframe.setFrameIcon(null);
- iframe.setClosable(interactiveDialog);
+ iframe.setClosable(isInteractive);
this.setLayout(new BorderLayout());
iframe.setContentPane(this);
iframe.setLayer(JLayeredPane.PALETTE_LAYER);
- /**
- * we add image directly in html for javascript ?
- * @j2sNative
- */
- {
- ((JTextPane) authlist).setEditable(false);
-
- SplashImage splashimg = new SplashImage(image);
- iconimg.add(splashimg, BorderLayout.CENTER);
- add(iconimg, BorderLayout.NORTH);
- }
- add(authlist, BorderLayout.CENTER);
- authlist.addMouseListener(closer);
- Desktop.desktop.add(iframe);
+ SplashImage splashimg = new SplashImage(image);
+ iconimg.add(splashimg, BorderLayout.CENTER);
+ add(iconimg, BorderLayout.NORTH);
+ Desktop.getDesktopPane().add(iframe);
refreshText();
}
- long oldtext = -1;
+ String oldtext;
+
+ private int mainState;
/**
* update text in author text panel reflecting current version information
*/
- @SuppressWarnings("unused")
protected boolean refreshText()
{
- String newtext = Desktop.instance.getAboutMessage(true).toString();
+ Desktop desktop = Desktop.getInstance();
+ String newtext = desktop.getAboutMessage(true).toString();
// System.err.println("Text found: \n"+newtext+"\nEnd of newtext.");
- if (oldtext != newtext.length())
+ if (!newtext.equals(oldtext))
{
iframe.setVisible(false);
- oldtext = newtext.length();
- if (/** @j2sNative true || */ false)
+ oldtext = newtext;
+ if (Platform.isJS()) // BH 2019
+ {
+ // BH TODO SwingJS does not implement HTML style. Could rethink this.
+
+ if (htmlPane == null)
+ {
+ htmlPane = new JLabel();
+ }
+ JLabel l = (JLabel)htmlPane;
+ l.setText(newtext);
+ Font f = htmlPane.getFont();
+ l.setFont(new Font(f.getFamily(), Font.PLAIN, f.getSize()));
+ l.setBorder(new EmptyBorder(new Insets(5, 5, 5, 5)));
+ l.setOpaque(true);
+ l.setBackground(Color.white);
+ htmlPane = l;
+ }
+ else
+ /**
+ * Java only
+ *
+ * @j2sIgnore
+ */
{
- authlist = new JLabel("
![](\"swingjs/j2s/images/Jalview_Logo.png\"/)
"+newtext);
- ((JLabel) authlist).setOpaque(true);
- ((JLabel) authlist).setBackground(Color.white);
- } else {
- /**
- * @j2sNative
- */
+ if (htmlPane == null)
{
- authlist = new JTextPane();
- ((JTextPane) authlist).setEditable(false);
- ((JTextPane) authlist).setContentType("text/html");
- ((JTextPane) authlist).setText(newtext);
- ((JTextPane) authlist).addHyperlinkListener(this);
+ htmlPane = new JTextPane();
}
+ JTextPane pane = (JTextPane)htmlPane;
+ pane.setEditable(false);
+ pane.setContentType("text/html");
+ pane.setText(newtext);
+ pane.addHyperlinkListener(this);
+ htmlPane = pane;
}
- authlist.addMouseListener(closer);
-
- authlist.setVisible(true);
- authlist.setSize(new Dimension(750, 375));
- add(authlist, BorderLayout.CENTER);
- revalidate();
- iframe.setBounds((Desktop.instance.getWidth() - 750) / 2,
- (Desktop.instance.getHeight() - 375) / 2, 750,
- authlist.getHeight() + iconimg.getHeight());
- iframe.validate();
+ htmlPane.addMouseListener(closer);
+ htmlPane.setSize(new Dimension(750, 375));
+ add(htmlPane, BorderLayout.CENTER);
+ int h = htmlPane.getHeight() + iconimg.getHeight();
+ iframe.setBounds(Math.max(0, (desktop.getWidth() - 750) / 2),
+ Math.max(0, (desktop.getHeight() - h) / 2), 750, h);
iframe.setVisible(true);
return true;
}
@@ -236,70 +250,100 @@ public class SplashScreen extends JPanel
/**
* Create splash screen, display it and clear it off again.
*/
+ @Override
public void run()
{
- initSplashScreenWindow();
+ mainState = STATE_INIT;
+ mainLoop();
+ }
- long startTime = System.currentTimeMillis() / 1000;
+ protected long startTime;
- while (visible)
+ /**
+ * A simple state machine with just three states: init, loop, and done. Ideal
+ * for a simple while/sleep loop that works in Java and JavaScript
+ * identically.
+ *
+ */
+ protected void mainLoop()
+ {
+ while (true)
{
- iframe.repaint();
- try
- {
- Thread.sleep(500);
- } catch (Exception ex)
- {
- }
-
- if (!interactiveDialog
- && ((System.currentTimeMillis() / 1000) - startTime) > 5)
+ switch (mainState)
{
- visible = false;
- }
+ case STATE_INIT:
+ initSplashScreenWindow();
+ startTime = System.currentTimeMillis() / 1000;
+ mainState = STATE_LOOP;
+ continue;
+ case STATE_LOOP:
+ if (!isVisible())
+ {
+ mainState = STATE_DONE;
+ continue;
+ }
+ if (!isInteractive
+ && ((System.currentTimeMillis() / 1000) - startTime) > 5)
+ {
+ setVisible(false);
+ continue;
+ }
+ if (isVisible() && refreshText())
+ {
+ iframe.repaint();
+ }
+ if (isInteractive)
+ {
+ return;
+ }
+ Timer timer = new Timer(500, new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ System.out.println(htmlPane.getFont());
+ mainLoop();
+ }
- if (visible && refreshText())
- {
- // if (interactiveDialog) {
- iframe.repaint();
- // } else {
- // iframe.repaint();
- // };
- }
- if (interactiveDialog)
- {
+ });
+ timer.setRepeats(false);
+ timer.start();
+ return;
+ case STATE_DONE:
+ closeSplash();
+ Desktop.getInstance().startDialogQueue();
return;
}
}
- closeSplash();
- Desktop.instance.startDialogQueue();
}
/**
- * DOCUMENT ME!
+ * Close the internal frame, either from the timer expiring or from the mouse
+ * action.
*/
public void closeSplash()
{
+ setVisible(false);
try
{
-
iframe.setClosed(true);
- } catch (Exception ex)
+ } catch (PropertyVetoException e)
{
}
}
- public class SplashImage extends JPanel
+ private class SplashImage extends JPanel
{
- Image image;
+ private Image image;
public SplashImage(Image todisplay)
{
image = todisplay;
- if (image!=null)
- { setPreferredSize(new Dimension(image.getWidth(this) + 8,
- image.getHeight(this)));
+ if (image != null)
+ {
+ setPreferredSize(new Dimension(image.getWidth(this) + 8,
+ image.getHeight(this)));
}
}
@@ -309,12 +353,13 @@ public class SplashScreen extends JPanel
return new Dimension(image.getWidth(this) + 8, image.getHeight(this));
}
+ @Override
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.setFont(largeFont);
if (image != null)
{
@@ -370,4 +415,5 @@ public class SplashScreen extends JPanel
Desktop.hyperlinkUpdate(e);
}
+
}