Merge branch 'task/JAL-3348_document_cli_memory_settings_when_launching_jalview'...

[jalview.git] / getdown / src / getdown / core / src / main / java / com / threerings / getdown / data / Application.java

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..7c2a427 100644 (file)
--- 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,16 @@ 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);
     }
 
     /**
      * Returns the configured application directory.
      */
     public File getAppDir () {
-        return _envc.appDir;
+       return _envc.appDir;
     }
 
     /**
@@ -300,7 +301,7 @@ public class Application
      */
     public boolean useCodeCache ()
     {
-        return _useCodeCache;
+       return _useCodeCache;
     }
 
     /**
@@ -309,7 +310,7 @@ public class Application
      */
     public int getCodeCacheRetentionDays ()
     {
-        return _codeCacheRetentionDays;
+       return _codeCacheRetentionDays;
     }
 
     /**
@@ -317,7 +318,7 @@ public class Application
      * app files from its hosting server.
      */
     public int maxConcurrentDownloads () {
-        return _maxConcDownloads;
+       return _maxConcDownloads;
     }
 
     /**
@@ -325,22 +326,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 +338,7 @@ public class Application
      */
     public List<Resource> getCodeResources ()
     {
-        return _codes;
+       return _codes;
     }
 
     /**
@@ -617,7 +607,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);
@@ -828,14 +819,16 @@ public class Application
             ARG: for (int i = 0; i < _jvmargs.size(); i++) {
               if (_jvmargs.get(i) instanceof java.lang.String && _jvmargs.get(i).startsWith("-Xmx")) {
                 _jvmargs.remove(i);
+                break ARG;
               }
             }
             addAll(maxMemHeapArg, _jvmargs);
+            log.info("Max memory set", "maxMemHeapArg", maxMemHeapArg[0]);
             
           }
 
         } else if (jvmmempc != -1) {
-          System.out.println("'jvmmempc' value must be in range 0 to 100 (read as '"+Integer.toString(jvmmempc)+"')");
+          log.warning("'jvmmempc' value must be in range 0 to 100 (read as '"+Integer.toString(jvmmempc)+"')");
         }
 
         // get the set of optimum JVM arguments
@@ -1137,7 +1130,7 @@ public class Application
           if (j > -1) {
             ext = filename.substring(j+1);
           }
-          if (LOCATOR_FILE_EXTENSION.equals(ext.toLowerCase())) {
+          if (ext != null && LOCATOR_FILE_EXTENSION.equals(ext.toLowerCase())) {
             // this file extension should have been dealt with in Getdown class
           } else {
             _appargs.add(0, "-open");