git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
de17a37
)
Use getDefault for exampleFile
author
amwaterhouse
<Andrew Waterhouse>
Wed, 17 Aug 2005 09:30:56 +0000
(09:30 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Wed, 17 Aug 2005 09:30:56 +0000
(09:30 +0000)
src/jalview/bin/Jalview.java
patch
|
blob
|
history
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
ff2d06a
..
e8e66d8
100755
(executable)
--- a/
src/jalview/bin/Jalview.java
+++ b/
src/jalview/bin/Jalview.java
@@
-133,7
+133,13
@@
public class Jalview
try
\r
{
\r
UIManager.setLookAndFeel(
\r
try
\r
{
\r
UIManager.setLookAndFeel(
\r
- UIManager.getSystemLookAndFeelClassName()
\r
+ UIManager.getSystemLookAndFeelClassName()
\r
+ // UIManager.getCrossPlatformLookAndFeelClassName()
\r
+//"com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
\r
+//"javax.swing.plaf.metal.MetalLookAndFeel"
\r
+//"com.sun.java.swing.plaf.windows.WindowsLookAndFeel"
\r
+//"com.sun.java.swing.plaf.motif.MotifLookAndFeel"
\r
+
\r
);
\r
}
\r
catch (Exception ex)
\r
);
\r
}
\r
catch (Exception ex)
\r
@@
-235,11
+241,13
@@
public class Jalview
//////////////////////
\r
if (
\r
!headless &&
\r
//////////////////////
\r
if (
\r
!headless &&
\r
- jalview.bin.Cache.getProperty("SHOW_STARTUP_FILE").equals("true") &&
\r
- jalview.bin.Cache.getProperty("STARTUP_FILE") != null)
\r
+ jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true) &&
\r
+ jalview.bin.Cache.getDefault("STARTUP_FILE",
\r
+ "http://www.jalview.org/examples/exampleFile.jar")!= null)
\r
{
\r
\r
{
\r
\r
- file = jalview.bin.Cache.getProperty("STARTUP_FILE");
\r
+ file = jalview.bin.Cache.getDefault("STARTUP_FILE",
\r
+ "http://www.jalview.org/examples/exampleFile.jar");
\r
protocol = "File";
\r
\r
if (file.indexOf("http:") > -1)
\r
protocol = "File";
\r
\r
if (file.indexOf("http:") > -1)
\r