try system look and feel for a change

[jalview.git] / src / jalview / bin / Jalview.java

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index be0440a..e113728 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -11,16 +11,65 @@ package jalview.bin;
 \r
 import jalview.gui.*;\r
 import javax.swing.*;\r
+import java.awt.event.*;\r
+import jalview.io.*;\r
 \r
-public class Jalview\r
+\r
+public class Jalview extends JApplet\r
 {\r
+  public static JApplet applet;\r
+  Desktop frame;\r
+  public void init()\r
+  {\r
+    applet = this;\r
+\r
+    frame = new Desktop();\r
+    frame.setResizable(true);\r
+    frame.setVisible(true);\r
+    frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);\r
+    frame.addWindowListener(new WindowAdapter()\r
+    {\r
+      public void windowClosing(WindowEvent e)\r
+      {\r
+          applet.stop();\r
+          applet.destroy();\r
+      }\r
+    });\r
+\r
+    String file = getParameter("alignment");\r
+\r
+    if(file!=null)\r
+    {\r
+      jalview.bin.Cache.setProperty("LAST_DIRECTORY", file);\r
+      String protocol = "File";\r
+      if (file.indexOf("http:") > -1)\r
+        protocol = "URL";\r
+\r
+      String format = jalview.io.IdentifyFile.Identify(file, protocol);\r
+\r
+      frame.LoadFile(file, protocol, format);\r
+    }\r
+  }\r
+\r
+  public void destroy()\r
+  {\r
+    if(applet!=null)\r
+      applet.stop();\r
+    else\r
+      System.exit(0);\r
+    frame.setVisible(false);\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.getCrossPlatformLookAndFeelClassName()\r
+         UIManager.getSystemLookAndFeelClassName()\r
+         //.getCrossPlatformLookAndFeelClassName()\r
        // "com.sun.java.swing.plaf.gtk.GTKLookAndFeel"\r
        //   "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"\r
        //  "com.sun.java.swing.plaf.motif.MotifLookAndFeel"\r
@@ -38,7 +87,6 @@ public class Jalview
      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
@@ -51,3 +99,4 @@ public class Jalview
    }\r
 \r
 }\r
+\r