fighting more battles for #3543

benfry · benfry · commit bf99ae27cdaf · 2016-05-08T20:05:02.000-04:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
diff --git a/app/src/processing/app/Util.java b/app/src/processing/app/Util.java
@@ -666,4 +666,12 @@ static public byte[] gzipEncode(byte[] what) throws IOException {
     output.close();
     return baos.toByteArray();
   }
+
+
+  static public final boolean hasNonAsciiChars(String what) {
+    for (char c : what.toCharArray()) {
+      if (c < 32 || c > 127) return true;
+    }
+    return false;
+  }
 }
diff --git a/app/src/processing/app/platform/WindowsPlatform.java b/app/src/processing/app/platform/WindowsPlatform.java
@@ -34,6 +34,7 @@
 import processing.app.Base;
 import processing.app.Messages;
 import processing.app.Preferences;
+import processing.app.Util;
 import processing.app.platform.WindowsRegistry.REGISTRY_ROOT_KEY;
 
 import processing.core.PApplet;
@@ -255,29 +256,43 @@ protected void checkPath() {
 
   // looking for Documents and Settings/blah/Application Data/Processing
   public File getSettingsFolder() throws Exception {
-    String appDataRoaming = getAppDataPath();
-    if (appDataRoaming != null) {
-      File settingsFolder = new File(appDataRoaming, APP_NAME);
-      if (settingsFolder.exists() || settingsFolder.mkdirs()) {
-        return settingsFolder;
+    try {
+      String appDataRoaming = getAppDataPath();
+      if (appDataRoaming != null) {
+        File settingsFolder = new File(appDataRoaming, APP_NAME);
+        if (settingsFolder.exists() || settingsFolder.mkdirs()) {
+          return settingsFolder;
+        }
+      }
+
+      String appDataLocal = getLocalAppDataPath();
+      if (appDataLocal != null) {
+        File settingsFolder = new File(appDataLocal, APP_NAME);
+        if (settingsFolder.exists() || settingsFolder.mkdirs()) {
+          return settingsFolder;
+        }
       }
-    }
 
-    String appDataLocal = getLocalAppDataPath();
-    if (appDataLocal != null) {
-      File settingsFolder = new File(appDataLocal, APP_NAME);
-      if (settingsFolder.exists() || settingsFolder.mkdirs()) {
-        return settingsFolder;
+      if (appDataRoaming == null && appDataLocal == null) {
+        throw new IOException("Could not get the AppData folder");
       }
-    }
 
-    if (appDataRoaming == null && appDataLocal == null) {
-      throw new IOException("Could not get the AppData folder");
+      // https://github.com/processing/processing/issues/3838
+      throw new IOException("Permissions error: make sure that " +
+                            appDataRoaming + " or " + appDataLocal +
+                            " is writable.");
+
+    } catch (UnsatisfiedLinkError ule) {
+      String path = new File("lib").getCanonicalPath();
+
+      String msg = Util.hasNonAsciiChars(path) ?
+        "Please move Processing to a location with only\n" +
+        "ASCII characters in the path and try again.\n" +
+        "https://github.com/processing/processing/issues/3543" :
+        "Could not find JNA support files, please reinstall Processing.";
+      Messages.showError("Windows JNA Problem", msg, ule);
+      return null;  // unreachable
     }
-
-    // https://github.com/processing/processing/issues/3838
-    throw new IOException("Please fix permissions for either " +
-                          appDataRoaming + " or " + appDataLocal);
   }
 
 
diff --git a/app/src/processing/app/ui/Toolkit.java b/app/src/processing/app/ui/Toolkit.java
@@ -72,6 +72,7 @@
 import processing.app.Messages;
 import processing.app.Platform;
 import processing.app.Preferences;
+import processing.app.Util;
 
 
 /**
@@ -990,7 +991,7 @@ static private Font createFont(String filename, int size) throws IOException, Fo
       // This gets the JAVA_HOME for the *local* copy of the JRE installed with
       // Processing. If it's not using the local JRE, it may be because of this
       // launch4j bug: https://github.com/processing/processing/issues/3543
-      if (hasNonAsciiChars(Platform.getJavaHome().getAbsolutePath())) {
+      if (Util.hasNonAsciiChars(Platform.getJavaHome().getAbsolutePath())) {
         msg += "Trying moving Processing\n" +
           "to a location with only ASCII characters in the path.";
       } else {
@@ -1006,14 +1007,6 @@ static private Font createFont(String filename, int size) throws IOException, Fo
   }
 
 
-  static private final boolean hasNonAsciiChars(String what) {
-    for (char c : what.toCharArray()) {
-      if (c < 32 || c > 127) return true;
-    }
-    return false;
-  }
-
-
   /**
    * Synthesized replacement for FontMetrics.getAscent(), which is dreadfully
    * inaccurate and inconsistent across platforms.

Original file line number	Diff line number	Diff line change
`@@ -666,4 +666,12 @@ static public byte[] gzipEncode(byte[] what) throws IOException {`
`666`	`666`	`output.close();`
`667`	`667`	`return baos.toByteArray();`
`668`	`668`	`}`
	`669`	`+`
	`670`	`+`
	`671`	`+ static public final boolean hasNonAsciiChars(String what) {`
	`672`	`+ for (char c : what.toCharArray()) {`
	`673`	`+ if (c < 32 \|\| c > 127) return true;`
	`674`	`+ }`
	`675`	`+ return false;`
	`676`	`+ }`
`669`	`677`	`}`