X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=2b87e1063a63484fe224628f2005c800d03cb16a;hb=afffa24481a7d3cb65ae41e0948c16a5f490f302;hp=6bb96c092bfa01eb1bd1ec3e5a9b2ebf96bf69d3;hpb=91dd5d379e0624f6cd4be02c17187ec1a630d693;p=jalview.git
diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index 6bb96c0..2b87e10 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,7 +97,7 @@ public class SplashScreen extends JPanel
/**
* Java only
*
- * @j2sNative
+ * @j2sIgnore
*/
{
authlist = new JTextPane();
@@ -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);
@@ -206,7 +210,6 @@ public class SplashScreen extends JPanel
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 +218,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);