Merge pull request processing#4582 from JakubValtar/fix-network-locations

benfry · web-flow · commit ce704e26dda8 · 2016-07-28T18:52:32.000-04:00
Fix running PDE from network locations
diff --git a/app/src/processing/app/Language.java b/app/src/processing/app/Language.java
@@ -316,6 +316,9 @@ static class LanguageBundle {
 
     void read(File additions) {
       String[] lines = PApplet.loadStrings(additions);
+      if (lines == null) {
+        throw new NullPointerException("File not found:\n" + additions.getAbsolutePath());
+      }
       //for (String line : lines) {
       for (int i = 0; i < lines.length; i++) {
         String line = lines[i];
diff --git a/app/src/processing/app/Platform.java b/app/src/processing/app/Platform.java
@@ -288,7 +288,7 @@ static public File getContentFile(String name) {
       // Decode URL
       String decodedPath;
       try {
-        decodedPath = pathURL.toURI().getPath();
+        decodedPath = pathURL.toURI().getSchemeSpecificPart();
       } catch (URISyntaxException e) {
         e.printStackTrace();
         return null;
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -7413,7 +7413,7 @@ static protected String calcSketchPath() {
       URL jarURL =
           PApplet.class.getProtectionDomain().getCodeSource().getLocation();
       // Decode URL
-      String jarPath = jarURL.toURI().getPath();
+      String jarPath = jarURL.toURI().getSchemeSpecificPart();
 
       // Workaround for bug in Java for OS X from Oracle (7u51)
       // https://github.com/processing/processing/issues/2181
