Cache.getDefault

diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java
index 9e0dca4..bd2eb7d 100755 (executable)
--- a/src/jalview/gui/CutAndPasteTransfer.java
+++ b/src/jalview/gui/CutAndPasteTransfer.java
@@ -128,7 +128,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
 \r
             try\r
             {\r
-                af.setMaximum(Preferences.showFullscreen);\r
+                af.setMaximum( jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));\r
             }\r
             catch (Exception ex)\r
             {\r

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 3da12e9..020a420 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -428,7 +428,7 @@ public class Desktop extends jalview.jbgui.GDesktop
           "VERSION") +\r
                                               "; last updated: " +\r
                                               jalview.bin.\r
-                                              Cache.getProperty("BUILD_DATE"));\r
+                                              Cache.getDefault("BUILD_DATE", "unknown"));\r
 \r
       if (!jalview.bin.Cache.getProperty("LATEST_VERSION").equals(\r
           jalview.bin.Cache.getProperty("VERSION")))\r

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index d2d477e..40b8ffb 100755 (executable)
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -77,7 +77,7 @@ public class FileLoader
 \r
         try\r
         {\r
-          af.setMaximum(Preferences.showFullscreen);\r
+          af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));\r
         }\r
         catch (Exception ex)\r
         {\r

diff --git a/src/jalview/util/BrowserLauncher.java b/src/jalview/util/BrowserLauncher.java
index 6bac25b..b2f532f 100755 (executable)
--- a/src/jalview/util/BrowserLauncher.java
+++ b/src/jalview/util/BrowserLauncher.java
@@ -689,14 +689,7 @@ public class BrowserLauncher
 \r
       case OTHER:\r
       default:\r
-        browser = jalview.bin.Cache.applicationProperties.getProperty(\r
-            "jalview.browser");\r
-\r
-        if (browser == null)\r
-        {\r
-          // hope firefox exists :-/\r
-          browser = "firefox";\r
-        }\r
+        browser = jalview.bin.Cache.getDefault("DEFAULT_BROWSER", "firefox");\r
 \r
         break;\r
     }\r