X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=getdown%2Fsrc%2Fgetdown%2Fcore%2Fsrc%2Fmain%2Fjava%2Fcom%2Fthreerings%2Fgetdown%2Fdata%2FApplication.java;h=2dddd6f7d6b15d5371d2f51ae9c01b45589db0f4;hb=3c1f6f30767b4ca5611b8c8331004ab4ff5b8042;hp=c3a3d799162f717507156195bfa64a33429ae440;hpb=199ad468f742cf47b913ef6f5719efe6992c77dc;p=jalview.git

diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
index c3a3d79..2dddd6f 100644
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
@@ -23,8 +23,6 @@ import java.util.concurrent.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
-import com.sun.management.OperatingSystemMXBean;
-import java.lang.management.ManagementFactory;
 
 import jalview.bin.MemorySetting;
 
@@ -46,6 +44,9 @@ public class Application
 {
     /** The name of our configuration file. */
     public static final String CONFIG_FILE = "getdown.txt";
+    
+    /** Dir where a backup config file might reside */ 
+    public static final String BACKUP_CONFIG_DIR = "install";
 
     /** The name of our target version file. */
     public static final String VERSION_FILE = "version.txt";
@@ -69,17 +70,18 @@ public class Application
          */
         public enum Step
         {
-            UPDATE_JAVA(10),
+            //UPDATE_JAVA(10),
+            UPDATE_JAVA(20),
             //VERIFY_METADATA(15, 65, 95),
             VERIFY_METADATA(15, 45, 90),
-            DOWNLOAD(50),
+            DOWNLOAD(60),
             PATCH(60),
             //VERIFY_RESOURCES(70, 97),
-            VERIFY_RESOURCES(30, 60),
+            VERIFY_RESOURCES(40, 90),
             //REDOWNLOAD_RESOURCES(90),
-            REDOWNLOAD_RESOURCES(70),
+            REDOWNLOAD_RESOURCES(80),
             //UNPACK(98),
-            UNPACK(90),
+            UNPACK(95),
             //LAUNCH(99);
             LAUNCH(100);
 
@@ -150,9 +152,12 @@ public class Application
         /** Whether progress text should be hidden or not. */
         public final boolean hideProgressText;
 
-        /** Whether the splash screen should retain focus. */
+        /** Whether the splash screen should update non-asynchronously before being shown. */
         public final boolean progressSync;
 
+        /** Whether the splash screen should update non-asynchronously after being shown. */
+        public final boolean progressSyncAfterShown;
+
         /** Whether the splash screen should retain focus. */
         public final boolean keepOnTop;
 
@@ -180,7 +185,8 @@ public class Application
                 ", pb=" + progressBar + ", srect=" + status + ", st=" + statusText +
                 ", shadow=" + textShadow + ", err=" + installError + ", nrect=" + patchNotes +
                 ", notes=" + patchNotesUrl + ", stepPercentages=" + stepPercentages +
-                ", hideProgressText=" + hideProgressText + ", keepOnTop=" + keepOnTop + ", progressSync=" + progressSync + ", minShow=" + minShowSeconds +
+                ", hideProgressText=" + hideProgressText + ", keepOnTop=" + keepOnTop + ", progressSync=" + progressSync +
+                ", progressSyncAfterShown=" + progressSyncAfterShown + ", minShow=" + minShowSeconds +
                 ", displayAppbase=" + displayAppbase + ", displayVersion=" + displayVersion + "]";
         }
 
@@ -189,8 +195,9 @@ public class Application
             this.name = config.getString("ui.name");
             this.progress = config.getRect("ui.progress", new Rectangle(5, 5, 300, 15));
             this.progressText = config.getColor("ui.progress_text", Color.BLACK);
-            this.hideProgressText =  config.getBoolean("ui.hide_progress_text");
-            this.progressSync =  config.getBoolean("ui.progress_sync");
+            this.hideProgressText = config.getBoolean("ui.hide_progress_text");
+            this.progressSync = config.getBoolean("ui.progress_sync_before_shown");
+            this.progressSyncAfterShown = config.getBoolean("ui.progress_sync_after_shown");
             this.keepOnTop =  config.getBoolean("ui.keep_on_top");
             this.displayAppbase =  config.getBoolean("ui.display_appbase");
             this.displayVersion =  config.getBoolean("ui.display_version");
@@ -276,15 +283,17 @@ public class Application
      *
      */
     public Application (EnvConfig envc) {
-        _envc = envc;
-        _config = getLocalPath(envc.appDir, CONFIG_FILE);
+    	_envc = envc;
+    	_config = getLocalPath(envc.appDir, CONFIG_FILE);
+    	_backupConfig = getLocalPath(envc.appDir, BACKUP_CONFIG_DIR+File.separator+CONFIG_FILE);
+    	log.warning("Backup config file now", "_backupConfig", _backupConfig, "exists", _backupConfig.exists(), "isReadable", _backupConfig.canRead());
     }
 
     /**
      * Returns the configured application directory.
      */
     public File getAppDir () {
-        return _envc.appDir;
+    	return _envc.appDir;
     }
 
     /**
@@ -293,7 +302,7 @@ public class Application
      */
     public boolean useCodeCache ()
     {
-        return _useCodeCache;
+    	return _useCodeCache;
     }
 
     /**
@@ -302,7 +311,7 @@ public class Application
      */
     public int getCodeCacheRetentionDays ()
     {
-        return _codeCacheRetentionDays;
+    	return _codeCacheRetentionDays;
     }
 
     /**
@@ -310,7 +319,7 @@ public class Application
      * app files from its hosting server.
      */
     public int maxConcurrentDownloads () {
-        return _maxConcDownloads;
+    	return _maxConcDownloads;
     }
 
     /**
@@ -318,11 +327,11 @@ public class Application
      */
     public Resource getConfigResource ()
     {
-        try {
-            return createResource(CONFIG_FILE, Resource.NORMAL);
-        } catch (Exception e) {
-            throw new RuntimeException("Invalid appbase '" + _vappbase + "'.", e);
-        }
+    	try {
+    		return createResource(CONFIG_FILE, Resource.NORMAL);
+    	} catch (Exception e) {
+    		throw new RuntimeException("Invalid appbase '" + _vappbase + "'.", e);
+    	}
     }
 
     /**
@@ -330,7 +339,7 @@ public class Application
      */
     public List<Resource> getCodeResources ()
     {
-        return _codes;
+    	return _codes;
     }
 
     /**
@@ -597,6 +606,15 @@ public class Application
         } catch (Exception e) {
             log.warning("Failure reading config file", "file", _config, e);
         }
+        if (config == null || config.getString("appbase") == null || config.getString("appbase").isEmpty()) {
+        	try {
+        		Config backupConfig = Config.parseConfig(_backupConfig, opts);
+        		config = backupConfig;
+        		log.warning("Using backup config file", "appdir", getAppDir(), "backupConfig", _backupConfig.getAbsoluteFile());
+        	} catch (Exception e) {
+        		log.warning("Failure reading backup config file", "file", _backupConfig, e);
+        	}
+        }
         
         // see if there's an override config from locator file
         Config locatorConfig = createLocatorConfig(opts);
@@ -1919,8 +1937,6 @@ public class Application
         log.warning("Failure reading locator file",  "file", _locatorFile, e);
       }
       
-      log.info("Returning locatorConfig", locatorConfig);
-      
       return locatorConfig;
     }
     
@@ -1930,6 +1946,7 @@ public class Application
     
     protected final EnvConfig _envc;
     protected File _config;
+    protected File _backupConfig;
     protected Digest _digest;
 
     protected long _version = -1;