X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=35fc4c9c6362372919b93694ac669e550cf75e4e;hb=d9929c98ecb8fa9aa65cf5e2c07fc8cbf8fc91df;hp=69fd7b0197998fd34bf2cca0d8c5fb6e7baaa3fa;hpb=5e3b30218383ee6da117dbebf824e56c7c67943f;p=jalview.git

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 69fd7b0..35fc4c9 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -12,7 +12,8 @@ package jalview.bin;
 import jalview.gui.*;
 import javax.swing.*;
 import java.awt.event.*;
-import java.applet.Applet;
+import jalview.io.*;
+
 
 public class Jalview extends JApplet
 {
@@ -39,7 +40,7 @@ public class Jalview extends JApplet
 
     if(file!=null)
     {
-      jalview.bin.Cache.LAST_DIRECTORY = file;
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY", file);
       String protocol = "File";
       if (file.indexOf("http:") > -1)
         protocol = "URL";
@@ -52,15 +53,18 @@ public class Jalview extends JApplet
 
   public void destroy()
   {
-    System.out.println("Goodbyeee");
-
-    applet.stop();
+    if(applet!=null)
+      applet.stop();
+    else
+      System.exit(0);
     frame.setVisible(false);
-
   }
 
    public static void main(String[] args) {
-     try{
+
+    Cache.loadProperties();
+
+    try{
        UIManager.setLookAndFeel(
    //   "javax.swing.plaf.metal.MetalLookAndFeel"
     //  "javax.swing.plaf.multi.MultiLookAndFeel"
@@ -82,7 +86,6 @@ public class Jalview extends JApplet
      if(args!=null && args.length>0)
      {
          String file = args[0];
-         jalview.bin.Cache.LAST_DIRECTORY = file;
          String protocol = "File";
          if(file.indexOf("http:")>-1)
            protocol = "URL";
@@ -95,3 +98,4 @@ public class Jalview extends JApplet
    }
 
 }
+