User service id for preferences pane

Author: gamma

src/com/inet/gradle/setup/dmg/Dmg.java

@@ -407,12 +407,14 @@ public void setBackgroundColor( Color backgroundColor ) {
      */
     public String getApplicationIdentifier( SetupBuilder setup ) {
         if ( applicationIdentifier == null || applicationIdentifier.isEmpty() ) {
-            return setup.getAppIdentifier();
+            if ( setup.getMainClass() == null || setup.getMainClass().isEmpty() ) {
+                return setup.getAppIdentifier();
+            }
+            return setup.getMainClass();
         }
         return applicationIdentifier;
     }
 
-
     /**
      * Sets an application identifier for the DMG builder.
      * It is being used as ID in the Info.plist

src/com/inet/gradle/setup/dmg/OSXPrefPaneCreator.java

@@ -88,7 +88,7 @@ void create( Service service ) throws Exception {
 
         // Patch Info.plist
         File prefPanePLIST = new File( prefPaneLocation, "Contents/Info.plist" );
-        String prefPaneIdentifier = getSetupBuilder().getMainClass() != null ? getSetupBuilder().getMainClass() : getSetupBuilder().getAppIdentifier();
+        String prefPaneIdentifier = task.getApplicationIdentifier( getSetupBuilder() );
         setPlistProperty( prefPanePLIST, ":CFBundleIdentifier", prefPaneIdentifier + ".prefPane" );
         setPlistProperty( prefPanePLIST, ":CFBundleName", displayName + " Preference Pane" );
         setPlistProperty( prefPanePLIST, ":CFBundleExecutable", internalName );
@@ -104,7 +104,7 @@ void create( Service service ) throws Exception {
 
         File servicePLIST = new File( prefPaneLocation, "Contents/Resources/service.plist" );
         setPlistProperty( servicePLIST, ":Name", displayName );
-        setPlistProperty( servicePLIST, ":Label", service.getMainClass() != null ? service.getMainClass() : getSetupBuilder().getAppIdentifier() );
+        setPlistProperty( servicePLIST, ":Label", service.getId() );
 
         // Program will be set during installation.
         setPlistProperty( servicePLIST, ":Description", service.getDescription() );