# HG changeset patch
# User asotona@netbeans.org
# Date 1273573155 -7200
# Node ID 9e65e108a8fe7dd3a8d0779229abb2e9efddb48a
# Parent  2b508644e09490c00a0e86eade519a3e58df0893
fixed issue #185874  -  Need a way to specify additional packager options from NetBeans

diff -r 2b508644e094 -r 9e65e108a8fe javafx.project/src/org/netbeans/modules/javafx/project/resources/build-impl.xsl
--- a/javafx.project/src/org/netbeans/modules/javafx/project/resources/build-impl.xsl	Mon May 10 16:27:09 2010 +0200
+++ b/javafx.project/src/org/netbeans/modules/javafx/project/resources/build-impl.xsl	Tue May 11 12:19:15 2010 +0200
@@ -188,6 +188,7 @@
                 </not>
             </condition>
             <property name="run.jvmargs" value=""/>
+            <property name="packager.options" value=""/>
             <available property="emulator.available" file="${{platform.fxhome}}/emulator/mobile/bin/emulator${{binary.extension}}"/>
             <available property="tvemulator.available" file="${{platform.fxhome}}/emulator/tv/bin/cvm${{binary.extension}}"/>
         </target>
@@ -256,6 +257,7 @@
                 <arg value="${{sign.arg}}"/>
                 <arg value="-updatecheck"/>
                 <arg value="${{jnlp.update.model}}"/>
+                <arg line="${{packager.options}}"/>
                 <arg value="-cp"/>
                 <arg path="${{javac.classpath}}"/>
             </exec>
diff -r 2b508644e094 -r 9e65e108a8fe javafx.project/src/org/netbeans/modules/javafx/project/ui/customizer/Bundle.properties
--- a/javafx.project/src/org/netbeans/modules/javafx/project/ui/customizer/Bundle.properties	Mon May 10 16:27:09 2010 +0200
+++ b/javafx.project/src/org/netbeans/modules/javafx/project/ui/customizer/Bundle.properties	Tue May 11 12:19:15 2010 +0200
@@ -524,9 +524,6 @@
 CustomizerRunComponent.jRadioButton4.text=Run in Mobile &Emulator
 CustomizerRunComponent.jLabel1.text=Application Execution Model:
 CustomizerWebStart.jCheckBox1.text=&Pack200 Compression
-CustomizerApplication.vendorLabel.text=&Vendor:
-CustomizerApplication.panelDescLabel.text=Common Application Properties
-CustomizerApplication.titleLabel.text=&Name:
 CustomizerWebStart.jCheckBox2.text=&Self Signed Jar
 CustomizerApplet.jCheckBox1.text=&Draggable Applet
 CustomizerRunArguments.textArguments.text=
@@ -542,3 +539,9 @@
 LBL_UP_Combo_Always=Always
 LBL_UP_Combo_Timeout=Timeout
 LBL_UP_Combo_Background=Background
+CustomizerApplication.vendorLabel.text=&Vendor:
+CustomizerApplication.titleLabel.text=&Name:
+CustomizerApplication.panelDescLabel.text=Common Application Properties
+CustomizerApplication.packagerLabel.text=&Additional JavaFX Packager Options:
+CustomizerApplication.packagerLabel.AccessibleContext.accessibleDescription=Additional command line options passed to the JavaFX Packager
+CustomizerApplication.exampleLabel.text=(e.g. -shortcut or -J<compiler flag>)
diff -r 2b508644e094 -r 9e65e108a8fe javafx.project/src/org/netbeans/modules/javafx/project/ui/customizer/CustomizerApplication.form
--- a/javafx.project/src/org/netbeans/modules/javafx/project/ui/customizer/CustomizerApplication.form	Mon May 10 16:27:09 2010 +0200
+++ b/javafx.project/src/org/netbeans/modules/javafx/project/ui/customizer/CustomizerApplication.form	Tue May 11 12:19:15 2010 +0200
@@ -5,7 +5,7 @@
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
-    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
@@ -112,10 +112,49 @@
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
     </Container>
+    <Component class="javax.swing.JLabel" name="packagerLabel">
+      <Properties>
+        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
+          <ComponentRef name="packagerOptionsTextField"/>
+        </Property>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/javafx/project/ui/customizer/Bundle.properties" key="CustomizerApplication.packagerLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+      <AccessibilityProperties>
+        <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/javafx/project/ui/customizer/Bundle.properties" key="CustomizerApplication.packagerLabel.AccessibleContext.accessibleDescription" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </AccessibilityProperties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="18" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
+        </Constraint>
+      </Constraints>
+    </Component>
+    <Component class="javax.swing.JTextField" name="packagerOptionsTextField">
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="16" insetsLeft="6" insetsBottom="0" insetsRight="0" anchor="17" weightX="1.0" weightY="0.0"/>
+        </Constraint>
+      </Constraints>
+    </Component>
+    <Component class="javax.swing.JLabel" name="exampleLabel">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/javafx/project/ui/customizer/Bundle.properties" key="CustomizerApplication.exampleLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+          <GridBagConstraints gridX="1" gridY="6" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="6" insetsBottom="0" insetsRight="0" anchor="18" weightX="1.0" weightY="0.0"/>
+        </Constraint>
+      </Constraints>
+    </Component>
     <Container class="javax.swing.JPanel" name="jPanel3">
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
-          <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="1.0"/>
+          <GridBagConstraints gridX="0" gridY="7" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="1.0"/>
         </Constraint>
       </Constraints>
 
diff -r 2b508644e094 -r 9e65e108a8fe javafx.project/src/org/netbeans/modules/javafx/project/ui/customizer/CustomizerApplication.java
--- a/javafx.project/src/org/netbeans/modules/javafx/project/ui/customizer/CustomizerApplication.java	Mon May 10 16:27:09 2010 +0200
+++ b/javafx.project/src/org/netbeans/modules/javafx/project/ui/customizer/CustomizerApplication.java	Tue May 11 12:19:15 2010 +0200
@@ -60,6 +60,7 @@
         initComponents();
         titleTextField.setDocument(props.APPLICATION_TITLE_DOC);
         vendorTextField.setDocument(props.APPLICATION_VENDOR_DOC);
+        packagerOptionsTextField.setDocument(props.PACKAGER_OPTIONS_DOC);
     }
     
     /** This method is called from within the constructor to
@@ -78,11 +79,14 @@
         vendorTextField = new javax.swing.JTextField();
         jPanel1 = new javax.swing.JPanel();
         jPanel2 = new javax.swing.JPanel();
+        packagerLabel = new javax.swing.JLabel();
+        packagerOptionsTextField = new javax.swing.JTextField();
+        exampleLabel = new javax.swing.JLabel();
         jPanel3 = new javax.swing.JPanel();
 
         setLayout(new java.awt.GridBagLayout());
 
-        panelDescLabel.setText(org.openide.util.NbBundle.getMessage(CustomizerApplication.class, "CustomizerApplication.panelDescLabel.text")); // NOI18N
+        org.openide.awt.Mnemonics.setLocalizedText(panelDescLabel, org.openide.util.NbBundle.getMessage(CustomizerApplication.class, "CustomizerApplication.panelDescLabel.text")); // NOI18N
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 0;
@@ -148,7 +152,35 @@
         gridBagConstraints.weightx = 1.0;
         gridBagConstraints.insets = new java.awt.Insets(18, 0, 0, 0);
         add(jPanel2, gridBagConstraints);
+
+        packagerLabel.setLabelFor(packagerOptionsTextField);
+        org.openide.awt.Mnemonics.setLocalizedText(packagerLabel, org.openide.util.NbBundle.getMessage(CustomizerApplication.class, "CustomizerApplication.packagerLabel.text")); // NOI18N
         gridBagConstraints = new java.awt.GridBagConstraints();
+        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
+        gridBagConstraints.insets = new java.awt.Insets(18, 0, 0, 0);
+        add(packagerLabel, gridBagConstraints);
+        packagerLabel.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CustomizerApplication.class, "CustomizerApplication.packagerLabel.AccessibleContext.accessibleDescription")); // NOI18N
+
+        gridBagConstraints = new java.awt.GridBagConstraints();
+        gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
+        gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+        gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+        gridBagConstraints.weightx = 1.0;
+        gridBagConstraints.insets = new java.awt.Insets(16, 6, 0, 0);
+        add(packagerOptionsTextField, gridBagConstraints);
+
+        org.openide.awt.Mnemonics.setLocalizedText(exampleLabel, org.openide.util.NbBundle.getMessage(CustomizerApplication.class, "CustomizerApplication.exampleLabel.text")); // NOI18N
+        gridBagConstraints = new java.awt.GridBagConstraints();
+        gridBagConstraints.gridx = 1;
+        gridBagConstraints.gridy = 6;
+        gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
+        gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
+        gridBagConstraints.weightx = 1.0;
+        gridBagConstraints.insets = new java.awt.Insets(6, 6, 0, 0);
+        add(exampleLabel, gridBagConstraints);
+        gridBagConstraints = new java.awt.GridBagConstraints();
+        gridBagConstraints.gridx = 0;
+        gridBagConstraints.gridy = 7;
         gridBagConstraints.weighty = 1.0;
         add(jPanel3, gridBagConstraints);
     }// </editor-fold>//GEN-END:initComponents
@@ -178,9 +210,12 @@
     }
     
     // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JLabel exampleLabel;
     javax.swing.JPanel jPanel1;
     javax.swing.JPanel jPanel2;
     private javax.swing.JPanel jPanel3;
+    private javax.swing.JLabel packagerLabel;
+    private javax.swing.JTextField packagerOptionsTextField;
     private javax.swing.JLabel panelDescLabel;
     private javax.swing.JLabel titleLabel;
     private javax.swing.JTextField titleTextField;
diff -r 2b508644e094 -r 9e65e108a8fe javafx.project/src/org/netbeans/modules/javafx/project/ui/customizer/JavaFXProjectProperties.java
--- a/javafx.project/src/org/netbeans/modules/javafx/project/ui/customizer/JavaFXProjectProperties.java	Mon May 10 16:27:09 2010 +0200
+++ b/javafx.project/src/org/netbeans/modules/javafx/project/ui/customizer/JavaFXProjectProperties.java	Tue May 11 12:19:15 2010 +0200
@@ -169,6 +169,8 @@
     public static final String APPLICATION_DESC ="application.desc"; // NOI18N
     public static final String APPLICATION_HOMEPAGE ="application.homepage"; // NOI18N
     public static final String APPLICATION_SPLASH ="application.splash"; // NOI18N
+
+    public static final String PACKAGER_OPTIONS ="packager.options"; // NOI18N
 /*    
     public static final String WEBSTART_ENABLE = "webstart.enable"; // NOI18N
     public static final String WEBSTART_ICON = "webstart.icon"; // NOI18N
@@ -261,6 +263,7 @@
     Document APPLICATION_DESC_DOC;
     Document APPLICATION_HOMEPAGE_DOC;
     Document APPLICATION_SPLASH_DOC;
+    Document PACKAGER_OPTIONS_DOC;
     
     // CustomizerWebStart
     /*
@@ -400,6 +403,7 @@
         APPLICATION_DESC_DOC = projectGroup.createStringDocument(evaluator, APPLICATION_DESC);
         APPLICATION_HOMEPAGE_DOC = projectGroup.createStringDocument(evaluator, APPLICATION_HOMEPAGE);
         APPLICATION_SPLASH_DOC = projectGroup.createStringDocument(evaluator, APPLICATION_SPLASH);
+        PACKAGER_OPTIONS_DOC = projectGroup.createStringDocument(evaluator, PACKAGER_OPTIONS);
         /*
         // CustomizerWebStart
         WEBSTART_ENABLE_MODEL = projectGroup.createToggleButtonModel(evaluator, WEBSTART_ENABLE);