git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3210 Barebones gradle/buildship/eclipse. See README
[jalview.git]
/
src
/
jalview
/
gui
/
SplashScreen.java
diff --git
a/src/jalview/gui/SplashScreen.java
b/src/jalview/gui/SplashScreen.java
index
f5648d2
..
2b87e10
100755
(executable)
--- a/
src/jalview/gui/SplashScreen.java
+++ b/
src/jalview/gui/SplashScreen.java
@@
-101,7
+101,7
@@
public class SplashScreen extends JPanel
*/
{
authlist = new JTextPane();
*/
{
authlist = new JTextPane();
- Thread t = new Thread(this, "SplashScreen");
+ Thread t = new Thread(this);
t.start();
}
}
t.start();
}
}
@@
-160,7
+160,7
@@
public class SplashScreen extends JPanel
System.err.println("Error when loading images!");
}
} while (!mt.checkAll());
System.err.println("Error when loading images!");
}
} while (!mt.checkAll());
- Desktop.getInstance().setIconImage(logo);
+ Desktop.instance.setIconImage(logo);
}
} catch (Exception ex)
{
}
} catch (Exception ex)
{
@@
-191,7
+191,7
@@
public class SplashScreen extends JPanel
}
add(authlist, BorderLayout.CENTER);
authlist.addMouseListener(closer);
}
add(authlist, BorderLayout.CENTER);
authlist.addMouseListener(closer);
- Desktop.getDesktopPane().add(iframe);
+ Desktop.desktop.add(iframe);
refreshText();
}
refreshText();
}
@@
-203,8
+203,7
@@
public class SplashScreen extends JPanel
@SuppressWarnings("unused")
protected boolean refreshText()
{
@SuppressWarnings("unused")
protected boolean refreshText()
{
- Desktop desktop = Desktop.getInstance();
- String newtext = desktop.getAboutMessage(true).toString();
+ String newtext = Desktop.instance.getAboutMessage(true).toString();
// System.err.println("Text found: \n"+newtext+"\nEnd of newtext.");
if (oldtext != newtext.length())
{
// System.err.println("Text found: \n"+newtext+"\nEnd of newtext.");
if (oldtext != newtext.length())
{
@@
-237,8
+236,8
@@
public class SplashScreen extends JPanel
authlist.setSize(new Dimension(750, 375));
add(authlist, BorderLayout.CENTER);
revalidate();
authlist.setSize(new Dimension(750, 375));
add(authlist, BorderLayout.CENTER);
revalidate();
- iframe.setBounds((desktop.getWidth() - 750) / 2,
- (desktop.getHeight() - 375) / 2, 750,
+ iframe.setBounds((Desktop.instance.getWidth() - 750) / 2,
+ (Desktop.instance.getHeight() - 375) / 2, 750,
authlist.getHeight() + iconimg.getHeight());
iframe.validate();
iframe.setVisible(true);
authlist.getHeight() + iconimg.getHeight());
iframe.validate();
iframe.setVisible(true);
@@
-288,7
+287,7
@@
public class SplashScreen extends JPanel
}
closeSplash();
}
closeSplash();
- Desktop.getInstance().startDialogQueue();
+ Desktop.instance.startDialogQueue();
}
/**
}
/**