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 (from parent 1:
0d79fdf
)
load properties on startup
author
amwaterhouse
<Andrew Waterhouse>
Mon, 7 Feb 2005 17:06:34 +0000
(17:06 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Mon, 7 Feb 2005 17:06:34 +0000
(17:06 +0000)
src/jalview/bin/Jalview.java
patch
|
blob
|
history
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
f23bcc9
..
35fc4c9
100755
(executable)
--- a/
src/jalview/bin/Jalview.java
+++ b/
src/jalview/bin/Jalview.java
@@
-12,7
+12,8
@@
package jalview.bin;
import jalview.gui.*;
\r
import javax.swing.*;
\r
import java.awt.event.*;
\r
import jalview.gui.*;
\r
import javax.swing.*;
\r
import java.awt.event.*;
\r
-import java.applet.Applet;
\r
+import jalview.io.*;
\r
+
\r
\r
public class Jalview extends JApplet
\r
{
\r
\r
public class Jalview extends JApplet
\r
{
\r
@@
-39,7
+40,7
@@
public class Jalview extends JApplet
\r
if(file!=null)
\r
{
\r
\r
if(file!=null)
\r
{
\r
- jalview.bin.Cache.LAST_DIRECTORY = file;
\r
+ jalview.bin.Cache.setProperty("LAST_DIRECTORY", file);
\r
String protocol = "File";
\r
if (file.indexOf("http:") > -1)
\r
protocol = "URL";
\r
String protocol = "File";
\r
if (file.indexOf("http:") > -1)
\r
protocol = "URL";
\r
@@
-60,7
+61,10
@@
public class Jalview extends JApplet
}
\r
\r
public static void main(String[] args) {
\r
}
\r
\r
public static void main(String[] args) {
\r
- try{
\r
+
\r
+ Cache.loadProperties();
\r
+
\r
+ try{
\r
UIManager.setLookAndFeel(
\r
// "javax.swing.plaf.metal.MetalLookAndFeel"
\r
// "javax.swing.plaf.multi.MultiLookAndFeel"
\r
UIManager.setLookAndFeel(
\r
// "javax.swing.plaf.metal.MetalLookAndFeel"
\r
// "javax.swing.plaf.multi.MultiLookAndFeel"
\r
@@
-82,7
+86,6
@@
public class Jalview extends JApplet
if(args!=null && args.length>0)
\r
{
\r
String file = args[0];
\r
if(args!=null && args.length>0)
\r
{
\r
String file = args[0];
\r
- jalview.bin.Cache.LAST_DIRECTORY = file;
\r
String protocol = "File";
\r
if(file.indexOf("http:")>-1)
\r
protocol = "URL";
\r
String protocol = "File";
\r
if(file.indexOf("http:")>-1)
\r
protocol = "URL";
\r
@@
-95,3
+98,4
@@
public class Jalview extends JApplet
}
\r
\r
}
\r
}
\r
\r
}
\r
+
\r