X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=f5648d28c630e32a7634b5273d0ebb8a53c19088;hb=bc948cc6fa075fe5bcd9aa29bf8e37552cf83cb7;hp=6bb96c092bfa01eb1bd1ec3e5a9b2ebf96bf69d3;hpb=91dd5d379e0624f6cd4be02c17187ec1a630d693;p=jalview.git
diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index 6bb96c0..f5648d2 100755
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -88,7 +88,6 @@ public class SplashScreen extends JPanel
this.interactiveDialog = interactive;
// show a splashscreen that will disapper
if (Platform.isJS()) // BH 2019
- // if (/** @j2sNative true || */ false)
{
authlist = new JLabel("");
run();
@@ -98,11 +97,11 @@ public class SplashScreen extends JPanel
/**
* Java only
*
- * @j2sNative
+ * @j2sIgnore
*/
{
authlist = new JTextPane();
- Thread t = new Thread(this);
+ Thread t = new Thread(this, "SplashScreen");
t.start();
}
}
@@ -161,7 +160,7 @@ public class SplashScreen extends JPanel
System.err.println("Error when loading images!");
}
} while (!mt.checkAll());
- Desktop.instance.setIconImage(logo);
+ Desktop.getInstance().setIconImage(logo);
}
} catch (Exception ex)
{
@@ -173,10 +172,15 @@ public class SplashScreen extends JPanel
this.setLayout(new BorderLayout());
iframe.setContentPane(this);
iframe.setLayer(JLayeredPane.PALETTE_LAYER);
+ if (Platform.isJS())
+ {
+ // ignore in JavaScript
+ }
+ else
/**
- * we add image directly in html for javascript ?
+ * Java only
*
- * @j2sNative
+ * @j2sIgnore
*/
{
((JTextPane) authlist).setEditable(false);
@@ -187,7 +191,7 @@ public class SplashScreen extends JPanel
}
add(authlist, BorderLayout.CENTER);
authlist.addMouseListener(closer);
- Desktop.desktop.add(iframe);
+ Desktop.getDesktopPane().add(iframe);
refreshText();
}
@@ -199,14 +203,14 @@ public class SplashScreen extends JPanel
@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();
if (Platform.isJS()) // BH 2019
- // if (/** @j2sNative true || */ false)
{
authlist = new JLabel(
"
![](\"swingjs/j2s/images/Jalview_Logo.png\"/)
"
@@ -215,19 +219,17 @@ public class SplashScreen extends JPanel
((JLabel) authlist).setBackground(Color.white);
}
else
+ /**
+ * Java only
+ *
+ * @j2sIgnore
+ */
{
- /**
- * Java only
- *
- * @j2sNative
- */
- {
- authlist = new JTextPane();
- ((JTextPane) authlist).setEditable(false);
- ((JTextPane) authlist).setContentType("text/html");
- ((JTextPane) authlist).setText(newtext);
- ((JTextPane) authlist).addHyperlinkListener(this);
- }
+ authlist = new JTextPane();
+ ((JTextPane) authlist).setEditable(false);
+ ((JTextPane) authlist).setContentType("text/html");
+ ((JTextPane) authlist).setText(newtext);
+ ((JTextPane) authlist).addHyperlinkListener(this);
}
authlist.addMouseListener(closer);
@@ -235,8 +237,8 @@ public class SplashScreen extends JPanel
authlist.setSize(new Dimension(750, 375));
add(authlist, BorderLayout.CENTER);
revalidate();
- iframe.setBounds((Desktop.instance.getWidth() - 750) / 2,
- (Desktop.instance.getHeight() - 375) / 2, 750,
+ iframe.setBounds((desktop.getWidth() - 750) / 2,
+ (desktop.getHeight() - 375) / 2, 750,
authlist.getHeight() + iconimg.getHeight());
iframe.validate();
iframe.setVisible(true);
@@ -286,7 +288,7 @@ public class SplashScreen extends JPanel
}
closeSplash();
- Desktop.instance.startDialogQueue();
+ Desktop.getInstance().startDialogQueue();
}
/**