handle extensions list properly (fixes processing#4615)

benfry · benfry · commit 6f3caeb1917a · 2016-10-29T10:02:21.000-04:00
diff --git a/build/macosx/appbundler/src/com/oracle/appbundler/BundleDocument.java b/build/macosx/appbundler/src/com/oracle/appbundler/BundleDocument.java
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License version
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- * 
+ *
  */
 
 package com.oracle.appbundler;
@@ -43,67 +43,67 @@ static private String capitalizeFirst(String string) {
         stringArray[0] = Character.toUpperCase(stringArray[0]);
         return new String(stringArray);
     }
-    
+
     public void setExtensions(String extensionsList) {
         if(extensionsList == null) {
             throw new BuildException("Extensions can't be null");
         }
-        
+
         extensions = extensionsList.split(",");
-        for (String extension : extensions) {
-            extension.trim().toLowerCase();
+        for (int i = 0; i < extensions.length; i++) {
+          extensions[i] = extensions[i].trim().toLowerCase();
         }
     }
-    
+
     public void setIcon(File icon) {
       this.icon = icon;
     }
-    
+
     public void setName(String name) {
       this.name = name;
     }
 
     public void setRole(String role) {
       this.role = capitalizeFirst(role);
     }
-    
+
     public void setIsPackage(String isPackageString) {
         if(isPackageString.trim().equalsIgnoreCase("true")) {
             this.isPackage = true;
         } else {
             this.isPackage = false;
         }
     }
-    
+
 //    public String getIcon() {
 //        return icon;
 //    }
-    
+
     public String getIconName() {
         return icon.getName();
     }
-    
-    
+
+
     public File getIconFile() {
         return icon;
     }
-    
+
     public String getName() {
         return name;
     }
 
     public String getRole() {
         return role;
     }
-    
+
     public String[] getExtensions() {
         return extensions;
     }
-    
+
     public boolean hasIcon() {
         return icon != null;
     }
-    
+
     public boolean isPackage() {
         return isPackage;
     }
@@ -115,7 +115,7 @@ public String toString() {
         for(String extension : extensions) {
             s.append(extension).append(" ");
         }
-        
+
         return s.toString();
     }
 }
diff --git a/todo.txt b/todo.txt
@@ -16,6 +16,8 @@ X   update the Linux notes based on where we land on this
 X   https://github.com/processing/processing/wiki/Supported-Platforms#linux
 X "Could not open the url" when clicking on the error message
 X   https://github.com/processing/processing/issues/4695
+X fix extensions handling in CFBundleDocument code from appbundler
+X   https://github.com/processing/processing/issues/4615
 
 _ update launch4j to 3.9
 _   https://sourceforge.net/projects/launch4j/files/launch4j-3/3.9/

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`* You should have received a copy of the GNU General Public License version`
`19`	`19`	`* 2 along with this work; if not, write to the Free Software Foundation,`
`20`	`20`	`* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.`
`21`		`- *`
	`21`	`+ *`
`22`	`22`	`*/`
`23`	`23`
`24`	`24`	`package com.oracle.appbundler;`
`@@ -43,67 +43,67 @@ static private String capitalizeFirst(String string) {`
`43`	`43`	`stringArray[0] = Character.toUpperCase(stringArray[0]);`
`44`	`44`	`return new String(stringArray);`
`45`	`45`	`}`
`46`		`-`
	`46`	`+`
`47`	`47`	`public void setExtensions(String extensionsList) {`
`48`	`48`	`if(extensionsList == null) {`
`49`	`49`	`throw new BuildException("Extensions can't be null");`
`50`	`50`	`}`
`51`		`-`
	`51`	`+`
`52`	`52`	`extensions = extensionsList.split(",");`
`53`		`- for (String extension : extensions) {`
`54`		`- extension.trim().toLowerCase();`
	`53`	`+ for (int i = 0; i < extensions.length; i++) {`
	`54`	`+ extensions[i] = extensions[i].trim().toLowerCase();`
`55`	`55`	`}`
`56`	`56`	`}`
`57`		`-`
	`57`	`+`
`58`	`58`	`public void setIcon(File icon) {`
`59`	`59`	`this.icon = icon;`
`60`	`60`	`}`
`61`		`-`
	`61`	`+`
`62`	`62`	`public void setName(String name) {`
`63`	`63`	`this.name = name;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public void setRole(String role) {`
`67`	`67`	`this.role = capitalizeFirst(role);`
`68`	`68`	`}`
`69`		`-`
	`69`	`+`
`70`	`70`	`public void setIsPackage(String isPackageString) {`
`71`	`71`	`if(isPackageString.trim().equalsIgnoreCase("true")) {`
`72`	`72`	`this.isPackage = true;`
`73`	`73`	`} else {`
`74`	`74`	`this.isPackage = false;`
`75`	`75`	`}`
`76`	`76`	`}`
`77`		`-`
	`77`	`+`
`78`	`78`	`// public String getIcon() {`
`79`	`79`	`// return icon;`
`80`	`80`	`// }`
`81`		`-`
	`81`	`+`
`82`	`82`	`public String getIconName() {`
`83`	`83`	`return icon.getName();`
`84`	`84`	`}`
`85`		`-`
`86`		`-`
	`85`	`+`
	`86`	`+`
`87`	`87`	`public File getIconFile() {`
`88`	`88`	`return icon;`
`89`	`89`	`}`
`90`		`-`
	`90`	`+`
`91`	`91`	`public String getName() {`
`92`	`92`	`return name;`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`public String getRole() {`
`96`	`96`	`return role;`
`97`	`97`	`}`
`98`		`-`
	`98`	`+`
`99`	`99`	`public String[] getExtensions() {`
`100`	`100`	`return extensions;`
`101`	`101`	`}`
`102`		`-`
	`102`	`+`
`103`	`103`	`public boolean hasIcon() {`
`104`	`104`	`return icon != null;`
`105`	`105`	`}`
`106`		`-`
	`106`	`+`
`107`	`107`	`public boolean isPackage() {`
`108`	`108`	`return isPackage;`
`109`	`109`	`}`
`@@ -115,7 +115,7 @@ public String toString() {`
`115`	`115`	`for(String extension : extensions) {`
`116`	`116`	`s.append(extension).append(" ");`
`117`	`117`	`}`
`118`		`-`
	`118`	`+`
`119`	`119`	`return s.toString();`
`120`	`120`	`}`
`121`	`121`	`}`