Properties file is used in preference to viewport/cache/preferences replicating defaults

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

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index 3ab3bf4..882818c 100755 (executable)
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -25,9 +25,6 @@ import org.apache.log4j.*;
 import javax.swing.*;\r
 \r
 import java.util.Vector;\r
-import jalview.datamodel.Alignment;\r
-import jalview.io.FormatAdapter;\r
-import jalview.datamodel.SequenceI;\r
 \r
 \r
 /**\r
@@ -103,18 +100,17 @@ public class Jalview
           }\r
 \r
 \r
-     if (aparser.contains("nodisplay"))\r
-      System.setProperty("java.awt.headless", "true");\r
-\r
-    if(   System.getProperty("java.awt.headless") != null\r
-          && System.getProperty("java.awt.headless").equals("true"))\r
-      {\r
-        headless = true;\r
-      }\r
+          if (aparser.contains("nodisplay"))\r
+            System.setProperty("java.awt.headless", "true");\r
 \r
+          if (System.getProperty("java.awt.headless") != null\r
+              && System.getProperty("java.awt.headless").equals("true"))\r
+          {\r
+            headless = true;\r
+          }\r
 \r
         Cache.loadProperties(aparser.getValue("props"));\r
-        jalview.gui.Preferences.initPreferences();\r
+\r
         try\r
         {\r
           initLogger();\r
@@ -131,9 +127,8 @@ public class Jalview
           try\r
           {\r
             UIManager.setLookAndFeel(\r
-                //  "javax.swing.plaf.metal.MetalLookAndFeel"\r
-                //  "javax.swing.plaf.multi.MultiLookAndFeel"\r
-                UIManager.getSystemLookAndFeelClassName());\r
+                UIManager.getSystemLookAndFeelClassName()\r
+                );\r
           }\r
           catch (Exception ex)\r
           {\r
@@ -234,11 +229,11 @@ public class Jalview
         //////////////////////\r
           if (\r
               !headless &&\r
-              jalview.gui.Preferences.showStartupFile &&\r
-              jalview.gui.Preferences.startupFile != null)\r
+              jalview.bin.Cache.getProperty("SHOW_STARTUP_FILE").equals("true") &&\r
+              jalview.bin.Cache.getProperty("STARTUP_FILE") != null)\r
           {\r
 \r
-            file = jalview.gui.Preferences.startupFile;\r
+            file = jalview.bin.Cache.getProperty("STARTUP_FILE");\r
             protocol = "File";\r
 \r
             if (file.indexOf("http:") > -1)\r