X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSplashScreen.java;h=f5648d28c630e32a7634b5273d0ebb8a53c19088;hb=1e9f882c52f5b95d198c42973e7b2b1ce2b420df;hp=96f5c8c88b2440397c00f36d087f49124e8fa598;hpb=53b2ec17b88081e402f60deab2723750bc4867d1;p=jalview.git diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index 96f5c8c..f5648d2 100755 --- a/src/jalview/gui/SplashScreen.java +++ b/src/jalview/gui/SplashScreen.java @@ -20,7 +20,6 @@ */ package jalview.gui; -import jalview.bin.Instance; import jalview.util.Platform; import java.awt.BorderLayout; @@ -102,7 +101,7 @@ public class SplashScreen extends JPanel */ { 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()); - Instance.getDesktop().setIconImage(logo); + Desktop.getInstance().setIconImage(logo); } } catch (Exception ex) { @@ -204,7 +203,8 @@ public class SplashScreen extends JPanel @SuppressWarnings("unused") protected boolean refreshText() { - String newtext = Instance.getDesktop().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()) { @@ -237,8 +237,8 @@ public class SplashScreen extends JPanel authlist.setSize(new Dimension(750, 375)); add(authlist, BorderLayout.CENTER); revalidate(); - iframe.setBounds((Instance.getDesktop().getWidth() - 750) / 2, - (Instance.getDesktop().getHeight() - 375) / 2, 750, + iframe.setBounds((desktop.getWidth() - 750) / 2, + (desktop.getHeight() - 375) / 2, 750, authlist.getHeight() + iconimg.getHeight()); iframe.validate(); iframe.setVisible(true); @@ -288,7 +288,7 @@ public class SplashScreen extends JPanel } closeSplash(); - Instance.getDesktop().startDialogQueue(); + Desktop.getInstance().startDialogQueue(); } /**