X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=getdown%2Fsrc%2Fgetdown%2Fcore%2Fsrc%2Fmain%2Fjava%2Fcom%2Fthreerings%2Fgetdown%2Fdata%2FApplication.java;h=2dddd6f7d6b15d5371d2f51ae9c01b45589db0f4;hb=3c1f6f30767b4ca5611b8c8331004ab4ff5b8042;hp=0ba2a5e7bd29f9b1540f34d12634d7973ca7713f;hpb=7d8ba6c44b69e49f071c082d19470c399ff84255;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 0ba2a5e..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
@@ -70,15 +70,16 @@ 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, 90),
+            VERIFY_RESOURCES(40, 90),
             //REDOWNLOAD_RESOURCES(90),
-            REDOWNLOAD_RESOURCES(75),
+            REDOWNLOAD_RESOURCES(80),
             //UNPACK(98),
             UNPACK(95),
             //LAUNCH(99);
@@ -282,16 +283,17 @@ public class Application
      *
      */
     public Application (EnvConfig envc) {
-        _envc = envc;
-        _config = getLocalPath(envc.appDir, CONFIG_FILE);
-        _backupConfig = getLocalPath(new File(envc.appDir.getAbsolutePath()+File.separator+BACKUP_CONFIG_DIR), 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;
     }
 
     /**
@@ -300,7 +302,7 @@ public class Application
      */
     public boolean useCodeCache ()
     {
-        return _useCodeCache;
+    	return _useCodeCache;
     }
 
     /**
@@ -309,7 +311,7 @@ public class Application
      */
     public int getCodeCacheRetentionDays ()
     {
-        return _codeCacheRetentionDays;
+    	return _codeCacheRetentionDays;
     }
 
     /**
@@ -317,7 +319,7 @@ public class Application
      * app files from its hosting server.
      */
     public int maxConcurrentDownloads () {
-        return _maxConcDownloads;
+    	return _maxConcDownloads;
     }
 
     /**
@@ -325,22 +327,11 @@ public class Application
      */
     public Resource getConfigResource ()
     {
-    	Resource res = null;
-        try {
-            res = createResource(CONFIG_FILE, Resource.NORMAL);
-        } catch (Exception e) {
-            log.warning("Invalid appbase '" + _vappbase + "'.", e);
-        }
-        if (res == null) {
-        	try {
-				String backupConfig = BACKUP_CONFIG_DIR + File.separator + CONFIG_FILE;
-        		log.warning("Could not read config '"+CONFIG_FILE+"'. Attempting to use backup '"+backupConfig+"'");
-				res = createResource(backupConfig, Resource.NORMAL);
-        	} catch (Exception ex) {
-				throw new RuntimeException("Invalid appbase in backup config'" + _vappbase + "'.", ex);
-        	}
-        }
-        return res;
+    	try {
+    		return createResource(CONFIG_FILE, Resource.NORMAL);
+    	} catch (Exception e) {
+    		throw new RuntimeException("Invalid appbase '" + _vappbase + "'.", e);
+    	}
     }
 
     /**
@@ -348,7 +339,7 @@ public class Application
      */
     public List<Resource> getCodeResources ()
     {
-        return _codes;
+    	return _codes;
     }
 
     /**
@@ -617,7 +608,8 @@ public class Application
         }
         if (config == null || config.getString("appbase") == null || config.getString("appbase").isEmpty()) {
         	try {
-        		config = Config.parseConfig(_backupConfig, opts);
+        		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);