X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=f5648d28c630e32a7634b5273d0ebb8a53c19088;hb=1cec732f963ab102c9d8381203df8c8cba2a9ee4;hp=1006782cf66ed032fa25806924e123cc31bc022b;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git
diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index 1006782..f5648d2 100755
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -1,27 +1,43 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * 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.
*
* Jalview 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 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview 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 Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
-import java.awt.*;
-import java.awt.event.*;
-
-import javax.swing.*;
+import jalview.util.Platform;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+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.JLabel;
+import javax.swing.JLayeredPane;
+import javax.swing.JPanel;
+import javax.swing.JTextPane;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
@@ -31,14 +47,17 @@ 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;
JPanel iconimg = new JPanel(new BorderLayout());
- JTextPane authlist = new JTextPane();
+ /**
+ * either text area in javascript or in java text pane
+ */
+ Component authlist;
JInternalFrame iframe;
@@ -68,12 +87,30 @@ public class SplashScreen extends JPanel implements Runnable,
{
this.interactiveDialog = interactive;
// show a splashscreen that will disapper
- Thread t = new Thread(this);
- t.start();
+ if (Platform.isJS()) // BH 2019
+ {
+ authlist = new JLabel("");
+ run();
+ }
+ else
+ {
+ /**
+ * Java only
+ *
+ * @j2sIgnore
+ */
+ {
+ authlist = new JTextPane();
+ Thread t = new Thread(this, "SplashScreen");
+ t.start();
+ }
+ }
+
}
MouseAdapter closer = new MouseAdapter()
{
+ @Override
public void mousePressed(MouseEvent evt)
{
try
@@ -99,14 +136,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)
+ if (!Platform.isJS() && 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);
@@ -118,13 +155,12 @@ public class SplashScreen extends JPanel implements Runnable,
} catch (InterruptedException x)
{
}
- ;
if (mt.isErrorAny())
{
System.err.println("Error when loading images!");
}
} while (!mt.checkAll());
- Desktop.instance.setIconImage(logo);
+ Desktop.getInstance().setIconImage(logo);
}
} catch (Exception ex)
{
@@ -136,14 +172,26 @@ public class SplashScreen extends JPanel implements Runnable,
this.setLayout(new BorderLayout());
iframe.setContentPane(this);
iframe.setLayer(JLayeredPane.PALETTE_LAYER);
+ if (Platform.isJS())
+ {
+ // ignore in JavaScript
+ }
+ else
+ /**
+ * Java only
+ *
+ * @j2sIgnore
+ */
+ {
+ ((JTextPane) authlist).setEditable(false);
- SplashImage splashimg = new SplashImage(image);
- iconimg.add(splashimg, BorderLayout.CENTER);
- add(iconimg, BorderLayout.NORTH);
+ SplashImage splashimg = new SplashImage(image);
+ iconimg.add(splashimg, BorderLayout.CENTER);
+ add(iconimg, BorderLayout.NORTH);
+ }
add(authlist, BorderLayout.CENTER);
- authlist.setEditable(false);
authlist.addMouseListener(closer);
- Desktop.desktop.add(iframe);
+ Desktop.getDesktopPane().add(iframe);
refreshText();
}
@@ -152,30 +200,48 @@ public class SplashScreen extends JPanel implements Runnable,
/**
* 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())
{
iframe.setVisible(false);
oldtext = newtext.length();
- authlist = new JTextPane();
- authlist.setEditable(false);
+ if (Platform.isJS()) // BH 2019
+ {
+ authlist = new JLabel(
+ "
"
+ + newtext);
+ ((JLabel) authlist).setOpaque(true);
+ ((JLabel) authlist).setBackground(Color.white);
+ }
+ else
+ /**
+ * Java only
+ *
+ * @j2sIgnore
+ */
+ {
+ authlist = new JTextPane();
+ ((JTextPane) authlist).setEditable(false);
+ ((JTextPane) authlist).setContentType("text/html");
+ ((JTextPane) authlist).setText(newtext);
+ ((JTextPane) authlist).addHyperlinkListener(this);
+ }
authlist.addMouseListener(closer);
- authlist.addHyperlinkListener(this);
- 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.getWidth() - 750) / 2,
+ (desktop.getHeight() - 375) / 2, 750,
authlist.getHeight() + iconimg.getHeight());
iframe.validate();
iframe.setVisible(true);
-
return true;
}
return false;
@@ -184,6 +250,7 @@ public class SplashScreen extends JPanel implements Runnable,
/**
* Create splash screen, display it and clear it off again.
*/
+ @Override
public void run()
{
initSplashScreenWindow();
@@ -221,7 +288,7 @@ public class SplashScreen extends JPanel implements Runnable,
}
closeSplash();
- Desktop.instance.startDialogQueue();
+ Desktop.getInstance().startDialogQueue();
}
/**
@@ -245,8 +312,11 @@ public class SplashScreen extends JPanel implements Runnable,
public SplashImage(Image todisplay)
{
image = todisplay;
- setPreferredSize(new Dimension(image.getWidth(this) + 8,
- image.getHeight(this)));
+ if (image != null)
+ {
+ setPreferredSize(new Dimension(image.getWidth(this) + 8,
+ image.getHeight(this)));
+ }
}
@Override
@@ -255,6 +325,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);