From: amwaterhouse <Andrew Waterhouse>
Date: Tue, 9 Aug 2005 16:53:42 +0000 (+0000)
Subject: Cache.getDefault
X-Git-Tag: Release_2_03~57
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=258c0056231d8a97c1d40dd665260e7814d11206;p=jalview.git

Cache.getDefault
---

diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java
index 9e0dca4..bd2eb7d 100755
--- a/src/jalview/gui/CutAndPasteTransfer.java
+++ b/src/jalview/gui/CutAndPasteTransfer.java
@@ -128,7 +128,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
 
             try
             {
-                af.setMaximum(Preferences.showFullscreen);
+                af.setMaximum( jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));
             }
             catch (Exception ex)
             {
diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 3da12e9..020a420 100755
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -428,7 +428,7 @@ public class Desktop extends jalview.jbgui.GDesktop
           "VERSION") +
                                               "; last updated: " +
                                               jalview.bin.
-                                              Cache.getProperty("BUILD_DATE"));
+                                              Cache.getDefault("BUILD_DATE", "unknown"));
 
       if (!jalview.bin.Cache.getProperty("LATEST_VERSION").equals(
           jalview.bin.Cache.getProperty("VERSION")))
diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index d2d477e..40b8ffb 100755
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -77,7 +77,7 @@ public class FileLoader
 
         try
         {
-          af.setMaximum(Preferences.showFullscreen);
+          af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));
         }
         catch (Exception ex)
         {
diff --git a/src/jalview/util/BrowserLauncher.java b/src/jalview/util/BrowserLauncher.java
index 6bac25b..b2f532f 100755
--- a/src/jalview/util/BrowserLauncher.java
+++ b/src/jalview/util/BrowserLauncher.java
@@ -689,14 +689,7 @@ public class BrowserLauncher
 
       case OTHER:
       default:
-        browser = jalview.bin.Cache.applicationProperties.getProperty(
-            "jalview.browser");
-
-        if (browser == null)
-        {
-          // hope firefox exists :-/
-          browser = "firefox";
-        }
+        browser = jalview.bin.Cache.getDefault("DEFAULT_BROWSER", "firefox");
 
         break;
     }