Add support for the LSApplicationCategoryType key; set the initial working directory to the value of NSHomeDirectory() instead of the bundle root.

git-svn-id: https://svn.java.net/svn/appbundler~svn@21 07572b26-92e5-4d45-f66a-c18421440a21

Author: gk_brown

appbundler/doc/appbundler.html

@@ -93,6 +93,13 @@ <h3>Parameters</h3>
     file.</td>
     <td align="center" valign="top">No</td>
   </tr>
+  <tr>
+    <td valign="top">applicationCategory</td>
+    <td valign="top">The application category.
+    Corresponds to the <code>LSApplicationCategoryType</code> key in the <tt>Info.plist</tt>
+    file.</td>
+    <td align="center" valign="top">No</td>
+  </tr>
   <tr>
     <td valign="top">mainclassname</td>
     <td valign="top">The name of the bundled application's main class.</td>

appbundler/native/main.m

@@ -72,11 +72,8 @@ int launch(char *commandName) {
     // Get the main bundle
     NSBundle *mainBundle = [NSBundle mainBundle];
 
-    // Set the working directory to the main bundle root
-    NSString *mainBundlePath = [mainBundle bundlePath];
-    if (chdir([mainBundlePath UTF8String]) == -1) {
-        [NSException raise:@JAVA_LAUNCH_ERROR format:@"Could not set initial working directory."];
-    }
+    // Set the working directory to the user's home directory
+    chdir([NSHomeDirectory() UTF8String]);
 
     // Get the main bundle's info dictionary
     NSDictionary *infoDictionary = [mainBundle infoDictionary];
@@ -114,6 +111,7 @@ int launch(char *commandName) {
     }
 
     // Set the class path
+    NSString *mainBundlePath = [mainBundle bundlePath];
     NSString *javaPath = [mainBundlePath stringByAppendingString:@"/Contents/Java"];
     NSMutableString *classPath = [NSMutableString stringWithFormat:@"-Djava.class.path=%@/Classes", javaPath];
 

appbundler/src/com/oracle/appbundler/AppBundlerTask.java

@@ -65,6 +65,8 @@ public class AppBundlerTask extends Task {
     private String signature = "????";
     private String copyright = "";
 
+    private String applicationCategory = null;
+
     // JVM info properties
     private String mainClassName = null;
     private FileSet runtime = null;
@@ -117,6 +119,10 @@ public void setCopyright(String copyright) {
         this.copyright = copyright;
     }
 
+    public void setApplicationCategory(String applicationCategory) {
+        this.applicationCategory = applicationCategory;
+    }
+
     public void setMainClassName(String mainClassName) {
         this.mainClassName = mainClassName;
     }
@@ -390,6 +396,10 @@ private void writeInfoPlist(File file) throws IOException {
             writeProperty(xout, "CFBundleVersion", "1");
             writeProperty(xout, "NSHumanReadableCopyright", copyright);
 
+            if (applicationCategory != null) {
+                writeProperty(xout, "LSApplicationCategoryType", applicationCategory);
+            }
+
             // Write runtime
             if (runtime != null) {
                 writeProperty(xout, "JVMRuntime", runtime.getDir().getParentFile().getParentFile().getName());

build.xml

@@ -115,6 +115,7 @@ questions.
             displayname="SwingSet 2"
             identifier="com.oracle.javax.swing.SwingSet2"
             shortversion="1.0"
+            applicationCategory="public.app-category.developer-tools"
             mainclassname="SwingSet2">
             <runtime dir="${env.JAVA_HOME}">
                 <exclude name="db/"/>
@@ -135,6 +136,7 @@ questions.
             displayname="SwingSet 2 (Plugin)"
             identifier="com.oracle.javax.swing.SwingSet2Plugin"
             shortversion="1.0"
+            applicationCategory="public.app-category.developer-tools"
             mainclassname="SwingSet2">
             <classpath file="/Library/Java/Demos/JFC/SwingSet2/SwingSet2.jar"/>
             <option value="-Dapple.laf.useScreenMenuBar=true"/>