eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix for exported apps loading from data folder with spaces (issue #1073)

Browse Source
This commit is contained in:
benfry
2012-09-01 20:58:44 +00:00
parent 4bb78febd0
commit 9cf364de51
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/core/PApplet.java
+7 -4
View File
@@ -5974,7 +5974,7 @@ public class PApplet extends Applet
// safe to check for this as a url first. this will prevent online
// access logs from being spammed with GET /sketchfolder/http://blahblah
if (filename.indexOf(":") != -1) { // at least smells like URL
if (filename.contains(":")) { // at least smells like URL
try {
URL url = new URL(filename);
stream = url.openStream();
@@ -6708,9 +6708,12 @@ public class PApplet extends Applet
File why = new File(where);
if (why.isAbsolute()) return why;
String jarPath = getClass().getProtectionDomain().getCodeSource().getLocation().getPath();
String jarPath =
getClass().getProtectionDomain().getCodeSource().getLocation().getPath();
if (jarPath.contains("Contents/Resources/Java/")) {
File containingFolder = new File(jarPath).getParentFile();
// The path will be URL encoded (%20 for spaces) coming from above
// http://code.google.com/p/processing/issues/detail?id=1073
File containingFolder = new File(urlDecode(jarPath)).getParentFile();
File dataFolder = new File(containingFolder, "data");
return new File(dataFolder, where);
}
@@ -14433,7 +14436,7 @@ public class PApplet extends Applet
* @see PApplet#color(float, float, float, float)
*/
static public int blendColor(int c1, int c2, int mode) {
return PGraphics.blendColor(c1, c2, mode);
return PImage.blendColor(c1, c2, mode);
}