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=cffe7c18fc2df72302b90e4426fc82948bd92d87;hb=0240a9ed4ae9edcf3393bb9459f66bf68714476d;hp=e7f21c6d7e3242387d0eb2b248a5abc5e50f356b;hpb=4ece480999d5e1e5c14bf56f22cf858d59013d86;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 e7f21c6..cffe7c1 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
@@ -27,8 +27,9 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 
+import jalview.bin.HiDPISetting;
 import jalview.bin.MemorySetting;
-import com.install4j.api.launcher.Variables;
+//import com.install4j.api.launcher.Variables;
 
 import com.threerings.getdown.util.*;
 // avoid ambiguity with java.util.Base64 which we can't use as it's 1.8+
@@ -353,6 +354,11 @@ public class Application
         return _resources;
     }
 
+    public List<Resource> getDigestOnly ()
+    {
+        return _digestonly;
+    }
+
     /**
      * Returns the digest of the given {@code resource}.
      */
@@ -771,6 +777,7 @@ public class Application
         // clear our arrays as we may be reinitializing
         _codes.clear();
         _resources.clear();
+        _digestonly.clear();
         _auxgroups.clear();
         _jvmargs.clear();
         _appargs.clear();
@@ -791,6 +798,8 @@ public class Application
         parseResources(config, "presource", Resource.PRELOAD, _resources);
         parseResources(config, "nresource", Resource.NATIVE, _resources);
 
+        parseResources(config, "digestonly", Resource.NORMAL, _digestonly);
+        
         // parse our auxiliary resource groups
         for (String auxgroup : config.getList("auxgroups")) {
             ArrayList<Resource> codes = new ArrayList<>();
@@ -1071,6 +1080,13 @@ public class Application
         args.add("-Dinstaller_template_version=" + System.getProperty("installer_template_version"));
         args.add("-Dlauncher_version=" + Build.version());
 
+        // set HiDPI property if wanted
+        String scalePropertyArg = HiDPISetting.getScalePropertyArg();
+        if (scalePropertyArg != null)
+        {
+          args.add(scalePropertyArg);
+        }
+
         // set the native library path if we have native resources
         // @TODO optional getdown.txt parameter to set addCurrentLibraryPath to true or false?
         ClassPath javaLibPath = PathBuilder.buildLibsPath(this, true);
@@ -1087,51 +1103,57 @@ public class Application
             }
         }
 
-        // test for jalview/s URL
+        // test for jalview/s URL. Insert startupNotification URI into start of _appargs
+        if (! StringUtil.isBlank(_jalviewUri)) {
+          _appargs.add(0, _jalviewUri);
+        }
         if (_appargs.size() > 0) {
           String uri = _appargs.get(0);
           try {
             log.info("TRYING TO PARSE URL '"+uri+"'");
             URI jalviewUri = new URI(uri);
-            if (jalviewUri.getScheme().equals("jalview") || jalviewUri.getScheme().equals("jalviews")) {
-              boolean https = jalviewUri.getScheme().equals("jalviews");
-              String host = jalviewUri.getHost();
-              int port = jalviewUri.getPort();
-              String file = jalviewUri.getPath();
-              String ref = jalviewUri.getFragment();
-              String query = jalviewUri.getQuery();
-              
-              _appargs.clear();
-              _appargs.add("-open");
-              if (host != null && host.length() > 0) {
-                URL newUrl = new URL(
-                        (https?"https":"http")
-                        + "://"
-                        + host
-                        + (port > -1? String.valueOf(port) : "")
-                        + jalviewUri.getRawPath()
-                        + (query != null && query.length() > 0 ? "?" + jalviewUri.getRawQuery() : "")
-                        );
-                _appargs.add(newUrl.toString());
-              } else {
-                _appargs.add(file);
-              }
-              
-              if (ref != null && ref.length() > 0) {
-                String[] refArgs = ref.split("&");
-                for (String refArg : refArgs) {
-                  if (refArg.startsWith("jvmmempc=")) {
-                    jvmmempc = refArg.substring(9);
-                    continue;
-                  }
-                  if (refArg.startsWith("jvmmemmax=")) {
-                    jvmmemmax = refArg.substring(10);
-                    continue;
+            if (jalviewUri != null) {
+              String scheme = jalviewUri.getScheme();
+              if (scheme != null && (scheme.equals("jalview") || scheme.equals("jalviews"))) {
+                boolean https = jalviewUri.getScheme().equals("jalviews");
+                String host = jalviewUri.getHost();
+                int port = jalviewUri.getPort();
+                String file = jalviewUri.getPath();
+                String ref = jalviewUri.getFragment();
+                String query = jalviewUri.getQuery();
+                
+                _appargs.clear();
+                _appargs.add("-open");
+                if (host != null && host.length() > 0) {
+                  URL newUrl = new URL(
+                          (https?"https":"http")
+                          + "://"
+                          + host
+                          + (port > -1? String.valueOf(port) : "")
+                          + jalviewUri.getRawPath()
+                          + (query != null && query.length() > 0 ? "?" + jalviewUri.getRawQuery() : "")
+                          );
+                  _appargs.add(newUrl.toString());
+                } else {
+                  _appargs.add(file);
+                }
+                
+                if (ref != null && ref.length() > 0) {
+                  String[] refArgs = ref.split("&");
+                  for (String refArg : refArgs) {
+                    if (refArg.startsWith("jvmmempc=")) {
+                      jvmmempc = refArg.substring(9);
+                      continue;
+                    }
+                    if (refArg.startsWith("jvmmemmax=")) {
+                      jvmmemmax = refArg.substring(10);
+                      continue;
+                    }
+                    _appargs.add(URLDecoder.decode(refArg, "UTF-8"));
                   }
-                  _appargs.add(URLDecoder.decode(refArg, "UTF-8"));
                 }
+                
               }
-              
             }
           } catch (URISyntaxException e) {
             log.error("Malformed jalview URI", uri);
@@ -1961,7 +1983,9 @@ public class Application
         for (int i = 0; i < filenames.length; i++) {
           String filename = filenames[i];
           // skip any other locator files in a multiple file list
-          if (! filename.toLowerCase().endsWith("."+Application.LOCATOR_FILE_EXTENSION)) {
+          if (filename.startsWith("jalview://") || filename.startsWith("jalviews://")) {
+            setJalviewUri(filename);
+          } else if (! filename.toLowerCase().endsWith("."+Application.LOCATOR_FILE_EXTENSION)) {
             addStartupFile(filename);
           }
         }
@@ -1976,6 +2000,10 @@ public class Application
       _startupFiles.add(new File(filename));
     }
     
+    public static void setJalviewUri(String uri) {
+      _jalviewUri = uri;
+    }
+    
     private Config createLocatorConfig(Config.ParseOpts opts) {
       if (_locatorFile == null) {
         return null;
@@ -2054,6 +2082,7 @@ public class Application
 
     protected List<Resource> _codes = new ArrayList<>();
     protected List<Resource> _resources = new ArrayList<>();
+    protected List<Resource> _digestonly = new ArrayList<>();
 
     protected boolean _useCodeCache;
     protected int _codeCacheRetentionDays;
@@ -2086,6 +2115,7 @@ public class Application
  
     protected static File _locatorFile;
     protected static List<File> _startupFiles = new ArrayList<>();
+    protected static String _jalviewUri;
     public static final String LOCATOR_FILE_EXTENSION = "jvl";
 
     private boolean _initialised = false;