X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalview.java;h=e780f78cc12371231b4b052afc2f024f16372f97;hb=37502eaea952faeafb2bbf5aed3fcfc671de6326;hp=ff2d06a86de195fa66503178e20552954bec0f0b;hpb=a109b496d2e0793d041fde50d1d3b50d3a58d271;p=jalview.git

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index ff2d06a..e780f78 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -40,29 +40,24 @@ public class Jalview
     /**
      * Initialises the Apache Axis logger
      */
+    public static Logger log;
     private static void initLogger()
     {
         Logger laxis = Logger.getLogger("org.apache.axis");
         Logger lcastor = Logger.getLogger("org.exolab.castor");
+        log = Logger.getLogger("jalview.bin.Jalview");
 
-        if (Cache.getProperty("logs.Axis.Level") == null)
-        {
-            Cache.setProperty("logs.Axis.Level", Level.INFO.toString());
-        }
-
-        if (Cache.getProperty("logs.Castor.Level") == null)
-        {
-            Cache.setProperty("logs.Castor.Level", Level.INFO.toString());
-        }
-
-        laxis.setLevel(Level.toLevel(Cache.getProperty("logs.Axis.Level")));
-        lcastor.setLevel(Level.toLevel(Cache.getProperty("logs.Castor.Level")));
+        laxis.setLevel(Level.toLevel(Cache.getDefault("logs.Axis.Level", Level.INFO.toString())));
+        lcastor.setLevel(Level.toLevel(Cache.getDefault("logs.Castor.Level", Level.INFO.toString())));
+        log.setLevel(Level.toLevel(Cache.getDefault("logs.Jalview.level", Level.INFO.toString())));
 
         ConsoleAppender ap = new ConsoleAppender(new SimpleLayout(),
                 "System.err");
         ap.setName("JalviewLogger");
+
         laxis.addAppender(ap);
         lcastor.addAppender(ap);
+        log.addAppender(ap);
     }
 
     /**
@@ -133,7 +128,13 @@ public class Jalview
           try
           {
             UIManager.setLookAndFeel(
-                UIManager.getSystemLookAndFeelClassName()
+                   UIManager.getSystemLookAndFeelClassName()
+            //        UIManager.getCrossPlatformLookAndFeelClassName()
+//"com.sun.java.swing.plaf.gtk.GTKLookAndFeel"
+//"javax.swing.plaf.metal.MetalLookAndFeel"
+//"com.sun.java.swing.plaf.windows.WindowsLookAndFeel"
+//"com.sun.java.swing.plaf.motif.MotifLookAndFeel"
+
                 );
           }
           catch (Exception ex)
@@ -142,6 +143,7 @@ public class Jalview
 
           desktop = new Desktop();
           desktop.setVisible(true);
+          desktop.discoverer.start();
         }
 
 
@@ -235,11 +237,11 @@ public class Jalview
         //////////////////////
           if (
               !headless &&
-              jalview.bin.Cache.getProperty("SHOW_STARTUP_FILE").equals("true") &&
-              jalview.bin.Cache.getProperty("STARTUP_FILE") != null)
+              jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true))
           {
 
-            file = jalview.bin.Cache.getProperty("STARTUP_FILE");
+            file = jalview.bin.Cache.getDefault("STARTUP_FILE",
+                                                "http://www.jalview.org/examples/exampleFile.jar");
             protocol = "File";
 
             if (file.indexOf("http:") > -1)