Merge branch 'JAL-3878_web_services_overhaul' into try-to-update-slivka-jar

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

diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index cb3a415..8d1fdd2 100755 (executable)
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -47,7 +47,6 @@ import java.util.regex.Pattern;
 import javax.swing.LookAndFeel;
 import javax.swing.UIManager;
 
-
 import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
 import jalview.datamodel.PDBEntry;
 import jalview.gui.Preferences;
@@ -228,6 +227,7 @@ import jalview.ws.sifts.SiftsSettings;
  */
 public class Cache implements ApplicationSingletonI
 {
+
   private Cache()
   {
     // private singleton
@@ -244,6 +244,7 @@ public class Cache implements ApplicationSingletonI
   {
     return (Cache) ApplicationSingletonProvider.getInstance(Cache.class);
   }
+
   /**
    * property giving log4j level for CASTOR loggers
    */
@@ -264,7 +265,6 @@ public class Cache implements ApplicationSingletonI
    */
   public static final String DEFAULT_SIFTS_DOWNLOAD_DIR = Platform.getUserPath(".sifts_downloads/");
   
-
   private final static String DEFAULT_CACHE_THRESHOLD_IN_DAYS = "2";
 
   private final static String DEFAULT_FAIL_SAFE_PID_THRESHOLD = "30";
@@ -347,12 +347,14 @@ public class Cache implements ApplicationSingletonI
    */
   public static void loadProperties(String propsFile)
   {
+
     getInstance().loadPropertiesImpl(propsFile);
 
   }
 
   private void loadPropertiesImpl(String propsFile)
   {
+
     propertiesFile = propsFile;
     String releasePropertiesFile = null;
     boolean defaultProperties = false;
@@ -391,6 +393,7 @@ public class Cache implements ApplicationSingletonI
           System.out.println(
                   "Disabling Jalview writing to user's local properties file.");
           propsAreReadOnly = true;
+
         } catch (Exception ex)
         {
           fis = null;
@@ -420,7 +423,6 @@ public class Cache implements ApplicationSingletonI
         System.out.println("Error reading properties file: " + ex);
       }
     }
-
     /* TO BE REPLACED WITH PROXY_TYPE SETTINGS 
     if (getDefault("USE_PROXY", false))
     {
@@ -521,16 +523,13 @@ public class Cache implements ApplicationSingletonI
             && (System.getProperty("java.awt.headless") == null || System
                     .getProperty("java.awt.headless").equals("false")))
     {
-
       class VersionChecker extends Thread
       {
-
         @Override
         public void run()
         {
           String remoteBuildPropertiesUrl = Cache
                   .getAppbaseBuildProperties();
-
           String orgtimeout = System
                   .getProperty("sun.net.client.defaultConnectTimeout");
           if (orgtimeout == null)
@@ -1285,7 +1284,6 @@ public class Cache implements ApplicationSingletonI
     return Cache.getDefault("INSTALLATION", "unknown");
   }
 
-
   /**
    * 
    * For AppletParams and Preferences ok_actionPerformed and