X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=f5648d28c630e32a7634b5273d0ebb8a53c19088;hb=cb51e62fe2166b236ef488e0a8f35081fcd71388;hp=f7d7cbf6a03cb90bad564b965c1caf3c22ba7f07;hpb=8fa69554edf6aeb278b4a4afd8e2b60264fdccd8;p=jalview.git diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index f7d7cbf..f5648d2 100755 --- a/src/jalview/gui/SplashScreen.java +++ b/src/jalview/gui/SplashScreen.java @@ -97,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(); } } @@ -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,8 @@ 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()) { @@ -221,7 +222,7 @@ public class SplashScreen extends JPanel /** * Java only * - * @j2sNative + * @j2sIgnore */ { authlist = new JTextPane(); @@ -236,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); @@ -287,7 +288,7 @@ public class SplashScreen extends JPanel } closeSplash(); - Desktop.instance.startDialogQueue(); + Desktop.getInstance().startDialogQueue(); } /**