Merge remote-tracking branch 'origin/master'

edvin · Jul 16, 2018 · eae29cd · eae29cd
2 parents 4a03be8 + d5f3d4a
commit eae29cd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/src/main/java/fxlauncher/FXManifest.java b/src/main/java/fxlauncher/FXManifest.java
@@ -107,6 +107,20 @@ public Path resolveCacheDir(Map<String, String> namedParams) {
 							.toString();
 			}
 			path = Paths.get(replacement);
+		} else if (cacheDir.startsWith("ALLUSERS")) {
+			switch (OS.current) {
+			case mac:
+				path = Paths.get("/Library/Application Support")
+					.resolve(cacheDir.substring(9));
+				break;
+			case win:
+				path = Paths.get(System.getenv("ALLUSERSPROFILE"))
+					.resolve(cacheDir.substring(9));
+				break;
+			default:
+				path = Paths.get("/usr/local/share")
+					.resolve(cacheDir.substring(9));
+			}
 		} else {
 			path = Paths.get(cacheDir);
 		}

diff --git a/src/main/java/fxlauncher/Launcher.java b/src/main/java/fxlauncher/Launcher.java
@@ -47,7 +47,7 @@ protected void createApplication(Class<Application> appClass) {
             PlatformImpl.runAndWait(() ->
             {
                 try {
-                    if (appClass.isAssignableFrom(Application.class)){
+                    if (Application.class.isAssignableFrom(appClass)) {
                         app = appClass.newInstance();
                     }
                 } catch (Throwable t) {
@@ -91,7 +91,7 @@ protected void setupClassLoader(ClassLoader classLoader) {
 
     /**
      * Check if a new version is available and return the manifest for the new version or null if no update.
-     *
+     * <p>
      * Note that updates will only be detected if the application was actually launched with FXLauncher.
      *
      * @return The manifest for the new version if available
@@ -142,7 +142,7 @@ public void start(Stage primaryStage) throws Exception {
                 filesUpdated[0] = superLauncher.syncFiles();
             } catch (Exception ex) {
                 log.log(Level.WARNING, String.format("Error during %s phase", superLauncher.getPhase()), ex);
-                if(superLauncher.checkIgnoreUpdateErrorSetting()) {
+                if (superLauncher.checkIgnoreUpdateErrorSetting()) {
                     superLauncher.reportError(String.format("Error during %s phase", superLauncher.getPhase()), ex);
                     System.exit(1);
                 }
@@ -223,13 +223,13 @@ public void stop() throws Exception {
     }
 
     private void initApplication() throws Exception {
-        if (app != null){
+        if (app != null) {
             app.init();
         }
     }
 
     private void startApplication() throws Exception {
-        if (app != null){
+        if (app != null) {
             ParametersImpl.registerParameters(app, new LauncherParams(getParameters(), superLauncher.getManifest()));
             PlatformImpl.setApplicationName(app.getClass());
             superLauncher.setPhase("Application Init");
@@ -239,7 +239,7 @@ private void startApplication() throws Exception {
             List<LibraryFile> files = superLauncher.getManifest().files;
             String cacheDir = superLauncher.getManifest().cacheDir;
             String command = String.format("java -jar %s/%s", cacheDir, files.get(0).file);
-            log.info(String.format("Execute command '%s'",command));
+            log.info(String.format("Execute command '%s'", command));
             Runtime.getRuntime().exec(command);
         }
     }