JAL-4298 Fixed initial log level to see .jalview_properties setting. Moved Java Conso...

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

diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 9266d2a..a44d474 100755 (executable)
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -589,7 +589,7 @@ public class Cache
             {
               if (!Jalview.quiet())
               {
-                jalview.bin.Console.outPrintln(
+                jalview.bin.Console.errPrintln(
                         "Non-fatal exception when checking version at "
                                 + remoteBuildPropertiesUrl + ":");
                 jalview.bin.Console.printStackTrace(ex);
@@ -792,7 +792,7 @@ public class Cache
       } catch (NumberFormatException e)
       {
         if (!Jalview.quiet())
-          jalview.bin.Console.outPrintln("Error parsing int property '"
+          jalview.bin.Console.errPrintln("Error parsing int property '"
                   + property + "' with value '" + string + "'");
       }
     }
@@ -811,7 +811,7 @@ public class Cache
       } catch (NumberFormatException e)
       {
         if (!Jalview.quiet())
-          jalview.bin.Console.outPrintln("Error parsing float property '"
+          jalview.bin.Console.errPrintln("Error parsing float property '"
                   + property + "' with value '" + string + "'");
       }
     }
@@ -862,7 +862,7 @@ public class Cache
     } catch (Exception ex)
     {
       if (!Jalview.quiet())
-        jalview.bin.Console.outPrintln(
+        jalview.bin.Console.errPrintln(
                 "Error setting property: " + key + " " + obj + "\n" + ex);
     }
     return oldValue;
@@ -894,7 +894,7 @@ public class Cache
       } catch (Exception ex)
       {
         if (!Jalview.quiet())
-          jalview.bin.Console.outPrintln("Error saving properties: " + ex);
+          jalview.bin.Console.errPrintln("Error saving properties: " + ex);
       }
     }
   }
@@ -1663,27 +1663,36 @@ public class Cache
     }
     if (file == null || !file.exists())
     {
+      if (file != null)
+      {
+        jalview.bin.Console
+                .errPrintln("Could not load bootstrap preferences file '"
+                        + file.getPath() + "'");
+      }
       String channelPrefsFilename = ChannelProperties
               .getProperty("preferences.filename");
       String propertiesFilename = System.getProperty("user.home")
               + File.separatorChar + channelPrefsFilename;
+      jalview.bin.Console.errPrintln(
+              "Using default properties file '" + propertiesFilename + "'");
       file = new File(propertiesFilename);
     }
     if (file == null || !file.exists())
+
     {
       String releasePrefsFilename = fallbackPropertiesFile;
       String releasePropertiesFilename = System.getProperty("user.home")
               + File.separatorChar + releasePrefsFilename;
+      jalview.bin.Console.errPrintln("Falling back to properties file '"
+              + releasePropertiesFilename + "'");
       file = new File(releasePropertiesFilename);
     }
 
-    if (filename == null)
-      return null;
     if (!file.exists())
     {
       jalview.bin.Console
               .errPrintln("Could not load bootstrap preferences file '"
-                      + filename + "'");
+                      + file.getPath() + "'");
       return null;
     }