JAL-3253 preliminary static fixes for JavaScript

[jalview.git] / src / jalview / gui / SplashScreen.java

diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index f7d7cbf..98b24d1 100755 (executable)
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -97,7 +97,7 @@ public class SplashScreen extends JPanel
       /**
        * Java only
        * 
-       * @j2sNative
+       * @j2sIgnore
        */
       {
         authlist = new JTextPane();
@@ -160,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)
     {
@@ -180,7 +180,7 @@ public class SplashScreen extends JPanel
     /**
      * Java only
      * 
-     * @j2sNative
+     * @j2sIgnore
      */
     {
       ((JTextPane) authlist).setEditable(false);
@@ -191,7 +191,7 @@ public class SplashScreen extends JPanel
     }
     add(authlist, BorderLayout.CENTER);
     authlist.addMouseListener(closer);
-    Desktop.desktop.add(iframe);
+    Desktop.getDesktopPane().add(iframe);
     refreshText();
   }
 
@@ -203,7 +203,7 @@ public class SplashScreen extends JPanel
   @SuppressWarnings("unused")
   protected boolean refreshText()
   {
-    String newtext = Desktop.instance.getAboutMessage(true).toString();
+    String newtext = Desktop.getInstance().getAboutMessage(true).toString();
     // System.err.println("Text found: \n"+newtext+"\nEnd of newtext.");
     if (oldtext != newtext.length())
     {
@@ -221,7 +221,7 @@ public class SplashScreen extends JPanel
       /**
        * Java only
        * 
-       * @j2sNative
+       * @j2sIgnore
        */
       {
         authlist = new JTextPane();
@@ -236,8 +236,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.getInstance().getWidth() - 750) / 2,
+              (Desktop.getInstance().getHeight() - 375) / 2, 750,
               authlist.getHeight() + iconimg.getHeight());
       iframe.validate();
       iframe.setVisible(true);
@@ -287,7 +287,7 @@ public class SplashScreen extends JPanel
     }
 
     closeSplash();
-    Desktop.instance.startDialogQueue();
+    Desktop.getInstance().startDialogQueue();
   }
 
   /**