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
abovePIDThreshold added to viewport
[jalview.git]
/
src
/
jalview
/
bin
/
Jalview.java
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
69fd7b0
..
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
@@
-52,15
+53,18
@@
public class Jalview extends JApplet
\r
public void destroy()
\r
{
\r
\r
public void destroy()
\r
{
\r
- System.out.println("Goodbyeee");
\r
-
\r
- applet.stop();
\r
+ if(applet!=null)
\r
+ applet.stop();
\r
+ else
\r
+ System.exit(0);
\r
frame.setVisible(false);
\r
frame.setVisible(false);
\r
-
\r
}
\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