stick with old naming

benfry · benfry · commit 8d6e3f85b803 · 2013-10-11T12:30:40.000-04:00
diff --git a/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java b/build/macosx/appbundler/src/com/oracle/appbundler/AppBundlerTask.java
@@ -63,7 +63,7 @@ public class AppBundlerTask extends Task {
   private String name = null;
   private String displayName = null;
   private String identifier = null;
-  private File icon = null;
+  private File iconFile = null;
   private String executableName = EXECUTABLE_NAME;
 
   private String shortVersion = null; //"1.0";
@@ -121,7 +121,7 @@ public void setIdentifier(String identifier) {
 
 
   public void setIcon(File icon) {
-    this.icon = icon;
+    this.iconFile = icon;
   }
 
 
@@ -332,12 +332,12 @@ public void execute() throws BuildException {
       throw new IllegalStateException("Identifier is required.");
     }
 
-    if (icon != null) {
-      if (!icon.exists()) {
+    if (iconFile != null) {
+      if (!iconFile.exists()) {
         throw new IllegalStateException("Icon does not exist.");
       }
 
-      if (icon.isDirectory()) {
+      if (iconFile.isDirectory()) {
         throw new IllegalStateException("Invalid icon.");
       }
     }
@@ -552,11 +552,11 @@ private void copyLibraryPathEntries(File macOSDirectory) throws IOException {
 
 
   private void copyIcon(File resourcesDirectory) throws IOException {
-    if (icon == null) {
+    if (iconFile == null) {
       copy(getClass().getResource(DEFAULT_ICON_NAME), 
            new File(resourcesDirectory, DEFAULT_ICON_NAME));
     } else {
-      copy(icon, new File(resourcesDirectory, icon.getName()));
+      copy(iconFile, new File(resourcesDirectory, iconFile.getName()));
     }
   }
   
@@ -584,7 +584,7 @@ private void writeInfoPlist(File file) throws IOException {
     // Write bundle properties
     plist.writeProperty("CFBundleDevelopmentRegion", "English");
     plist.writeProperty("CFBundleExecutable", executableName);
-    plist.writeProperty("CFBundleIconFile", (icon == null) ? DEFAULT_ICON_NAME : icon.getName());
+    plist.writeProperty("CFBundleIconFile", (iconFile == null) ? DEFAULT_ICON_NAME : iconFile.getName());
     plist.writeProperty("CFBundleIdentifier", identifier);
     plist.writeProperty("CFBundleDisplayName", displayName);
     plist.writeProperty("CFBundleInfoDictionaryVersion", "6.0");
