Attachment #50053 for bug #104508

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 104508
Collapse All | Expand All

Lines 56-61 Link Here

(-)java/j2seproject/nbproject/project.xml (+9 lines)
56	</run-dependency>	56	</run-dependency>
57	</dependency>	57	</dependency>
58	<dependency>	58	<dependency>
		59	<code-name-base>org.jdesktop.layout</code-name-base>
		60	<build-prerequisite/>
		61	<compile-dependency/>
		62	<run-dependency>
		63	<release-version>1</release-version>
		64	<specification-version>1.4</specification-version>
		65	</run-dependency>
		66	</dependency>
		67	<dependency>
59	<code-name-base>org.netbeans.api.java</code-name-base>	68	<code-name-base>org.netbeans.api.java</code-name-base>
60	<build-prerequisite/>	69	<build-prerequisite/>
61	<compile-dependency/>	70	<compile-dependency/>




    public J2SEActionProvider( J2SEProject project, UpdateHelper updateHelper ) {
        
        commands = new HashMap<String,String[]>();
        // treated specially: COMMAND_{,RE}BUILD
        commands.put(COMMAND_CLEAN, new String[] {"clean"}); // NOI18N
        commands.put(COMMAND_REBUILD, new String[] {"clean", "jar"}); // NOI18N
        commands.put(COMMAND_COMPILE_SINGLE, new String[] {"compile-single"}); // NOI18N
        // commands.put(COMMAND_COMPILE_TEST_SINGLE, new String[] {"compile-test-single"}); // NOI18N
        commands.put(COMMAND_RUN, new String[] {"run"}); // NOI18N

            String[] targets = targetsFromConfig.get(command);
            targetNames = (targets != null) ? targets : commands.get(command);
            if (targetNames == null) {
                String buildTarget = "false".equalsIgnoreCase(project.evaluator().getProperty(J2SEProjectProperties.DO_JAR)) ? "compile" : "jar"; // NOI18N
                if (command.equals(COMMAND_BUILD)) {
                    targetNames = new String[] {buildTarget};
                } else if (command.equals(COMMAND_REBUILD)) {
                    targetNames = new String[] {"clean", buildTarget}; // NOI18N
                } else {
                    throw new IllegalArgumentException(command);
                }
            }
        }
        J2SEConfigurationProvider.Config c = context.lookup(J2SEConfigurationProvider.Config.class);

Lines 214-219 Link Here

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl (-6 / +16 lines)
214	<property name="javadoc.encoding.used" value="${{source.encoding}}"/>	214	<property name="javadoc.encoding.used" value="${{source.encoding}}"/>
215	<property name="includes" value="**"/>	215	<property name="includes" value="**"/>
216	<property name="excludes" value=""/>	216	<property name="excludes" value=""/>
		217	<property name="do.depend" value="true"/>
		218	<condition property="do.depend.true">
		219	<istrue value="${{do.depend}}"/>
		220	</condition>
217	</target>	221	</target>
218		222
219	<target name="-post-init">	223	<target name="-post-init">
Lines 688-695 Link Here
688	</xsl:for-each>	692	</xsl:for-each>
689	</xsl:attribute>	693	</xsl:attribute>
690	</target>	694	</target>
691	<target name="web-service-client-compile" depends="web-service-client-generate">	695	<target name="-web-service-client-compile-depend" if="do.depend.true">
692	<j2seproject3:depend srcdir="${{build.generated.dir}}/wsclient" classpath="${{wscompile.classpath}}:${{javac.classpath}}" destdir="${{build.classes.dir}}"/>	696	<j2seproject3:depend srcdir="${{build.generated.dir}}/wsclient" classpath="${{wscompile.classpath}}:${{javac.classpath}}" destdir="${{build.classes.dir}}"/>
		697	</target>
		698	<target name="web-service-client-compile" depends="web-service-client-generate,-web-service-client-compile-depend">
693	<j2seproject3:javac srcdir="${{build.generated.dir}}/wsclient" classpath="${{wscompile.classpath}}:${{javac.classpath}}" destdir="${{build.classes.dir}}"/>	699	<j2seproject3:javac srcdir="${{build.generated.dir}}/wsclient" classpath="${{wscompile.classpath}}:${{javac.classpath}}" destdir="${{build.classes.dir}}"/>
694	</target>	700	</target>
695	</xsl:if>	701	</xsl:if>
Lines 704-713 Link Here
704	<xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>	710	<xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
705	</target>	711	</target>
706		712
		713	<target name="-compile-depend" if="do.depend.true">
		714	<j2seproject3:depend/>
		715	</target>
707	<target name="-do-compile">	716	<target name="-do-compile">
708	<xsl:attribute name="depends">init,deps-jar,-pre-pre-compile,-pre-compile<xsl:if test="/p:project/p:configuration/jaxrpc:web-service-clients/jaxrpc:web-service-client">,web-service-client-compile</xsl:if></xsl:attribute>	717	<xsl:attribute name="depends">init,deps-jar,-pre-pre-compile,-pre-compile<xsl:if test="/p:project/p:configuration/jaxrpc:web-service-clients/jaxrpc:web-service-client">,web-service-client-compile</xsl:if>,-compile-depend</xsl:attribute>
709	<xsl:attribute name="if">have.sources</xsl:attribute>	718	<xsl:attribute name="if">have.sources</xsl:attribute>
710	<j2seproject3:depend/>
711	<j2seproject3:javac/>	719	<j2seproject3:javac/>
712	<copy todir="${{build.classes.dir}}">	720	<copy todir="${{build.classes.dir}}">
713	<xsl:call-template name="createFilesets">	721	<xsl:call-template name="createFilesets">
Lines 1022-1030 Link Here
1022	<xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>	1030	<xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
1023	</target>	1031	</target>
1024		1032
1025	<target name="-do-compile-test">	1033	<target name="-compile-test-depend" if="do.depend.true">
1026	<xsl:attribute name="if">have.tests</xsl:attribute>
1027	<xsl:attribute name="depends">init,compile,-pre-pre-compile-test,-pre-compile-test</xsl:attribute>
1028	<xsl:element name="j2seproject3:depend">	1034	<xsl:element name="j2seproject3:depend">
1029	<xsl:attribute name="srcdir">	1035	<xsl:attribute name="srcdir">
1030	<xsl:call-template name="createPath">	1036	<xsl:call-template name="createPath">
Lines 1034-1039 Link Here
1034	<xsl:attribute name="destdir">${build.test.classes.dir}</xsl:attribute>	1040	<xsl:attribute name="destdir">${build.test.classes.dir}</xsl:attribute>
1035	<xsl:attribute name="classpath">${javac.test.classpath}</xsl:attribute>	1041	<xsl:attribute name="classpath">${javac.test.classpath}</xsl:attribute>
1036	</xsl:element>	1042	</xsl:element>
		1043	</target>
		1044	<target name="-do-compile-test">
		1045	<xsl:attribute name="if">have.tests</xsl:attribute>
		1046	<xsl:attribute name="depends">init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend</xsl:attribute>
1037	<xsl:element name="j2seproject3:javac">	1047	<xsl:element name="j2seproject3:javac">
1038	<xsl:attribute name="srcdir">	1048	<xsl:attribute name="srcdir">
1039	<xsl:call-template name="createPath">	1049	<xsl:call-template name="createPath">

Lines 80-87 Link Here

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties (-2 / +3 lines)
80	LBL_CustomizeCompile_Classpath_MoveDown_JButton=Move &Down	80	LBL_CustomizeCompile_Classpath_MoveDown_JButton=Move &Down
81	LBL_CustomizeCompile_Classpath_AddJar_JButton=Add &JAR/Folder...	81	LBL_CustomizeCompile_Classpath_AddJar_JButton=Add &JAR/Folder...
82	LBL_CustomizeCompile_Build_Subprojects=&Build Projects on Classpath	82	LBL_CustomizeCompile_Build_Subprojects=&Build Projects on Classpath
83	MNE_AdditionalCompilerOptions=C	83	LBL_AdditionalCompilerOptions=Additional &Compiler Options:
84	LBL_AdditionalCompilerOptions=Additional Compiler Options:
85	AD_AdditionalCompilerOptions=N/A	84	AD_AdditionalCompilerOptions=N/A
86	LBL_AdditionalCompilerOptionsExample=(e.g. -Xlint:unchecked)	85	LBL_AdditionalCompilerOptionsExample=(e.g. -Xlint:unchecked)
87	MSG_ProjectArtifactFormat={0} - {1}	86	MSG_ProjectArtifactFormat={0} - {1}
Lines 589-591 Link Here
589	AD_CustomizerRun_Cfg=N/A	588	AD_CustomizerRun_Cfg=N/A
590	AD_CustomizerSources_Include=N/A	589	AD_CustomizerSources_Include=N/A
591	AD_CustomizerSources_Encoding=N/A	590	AD_CustomizerSources_Encoding=N/A
		591	CustomizerCompile.doDependCheckBox=Track Java De&pendencies
		592	CustomizerJar.doJarCheckBox=&Build JAR after Compiling

Lines 1-24 Link Here

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerCompile.form (-41 / +57 lines)
1	<?xml version="1.0" encoding="UTF-8" ?>	1	<?xml version="1.0" encoding="UTF-8" ?>
2		2
3	<Form version="1.2" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">	3	<Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<AuxValues>	4	<AuxValues>
		5	<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
		6	<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
5	<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>	7	<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
		8	<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
		9	<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
6	<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>	10	<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
7	<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>	11	<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
8	<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>	12	<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
9	<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-55,0,0,1,-32"/>
10	</AuxValues>	13	</AuxValues>
11		14
12	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>	15	<Layout>
		16	<DimensionLayout dim="0">
		17	<Group type="103" groupAlignment="0" attributes="0">
		18	<Group type="102" attributes="0">
		19	<Group type="103" groupAlignment="0" attributes="0">
		20	<Component id="jCheckBoxDebugInfo" alignment="0" min="-2" max="-2" attributes="0"/>
		21	<Component id="jCheckBoxDeprecation" alignment="0" min="-2" max="-2" attributes="0"/>
		22	<Component id="doDependCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
		23	<Group type="102" alignment="0" attributes="0">
		24	<Component id="additionalJavacParamsJLabel" min="-2" max="-2" attributes="0"/>
		25	<EmptySpace min="-2" max="-2" attributes="0"/>
		26	<Group type="103" groupAlignment="0" attributes="0">
		27	<Component id="additionalJavacParamsExampleJLabel" alignment="0" min="-2" max="-2" attributes="0"/>
		28	<Component id="additionalJavacParamsJTextField" alignment="0" pref="324" max="32767" attributes="0"/>
		29	</Group>
		30	</Group>
		31	</Group>
		32	<EmptySpace max="-2" attributes="0"/>
		33	</Group>
		34	</Group>
		35	</DimensionLayout>
		36	<DimensionLayout dim="1">
		37	<Group type="103" groupAlignment="0" attributes="0">
		38	<Group type="102" attributes="0">
		39	<Component id="jCheckBoxDebugInfo" min="-2" max="-2" attributes="0"/>
		40	<EmptySpace max="-2" attributes="0"/>
		41	<Component id="jCheckBoxDeprecation" min="-2" max="-2" attributes="0"/>
		42	<EmptySpace max="-2" attributes="0"/>
		43	<Component id="doDependCheckBox" min="-2" max="-2" attributes="0"/>
		44	<EmptySpace type="unrelated" max="-2" attributes="0"/>
		45	<Group type="103" groupAlignment="3" attributes="0">
		46	<Component id="additionalJavacParamsJLabel" alignment="3" min="-2" max="-2" attributes="0"/>
		47	<Component id="additionalJavacParamsJTextField" alignment="3" min="-2" max="-2" attributes="0"/>
		48	</Group>
		49	<EmptySpace max="-2" attributes="0"/>
		50	<Component id="additionalJavacParamsExampleJLabel" min="-2" max="-2" attributes="0"/>
		51	<EmptySpace min="-2" pref="353" max="-2" attributes="0"/>
		52	</Group>
		53	</Group>
		54	</DimensionLayout>
		55	</Layout>
13	<SubComponents>	56	<SubComponents>
14	<Component class="javax.swing.JCheckBox" name="jCheckBoxDebugInfo">	57	<Component class="javax.swing.JCheckBox" name="jCheckBoxDebugInfo">
15	<Properties>	58	<Properties>
16	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">	59	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
17	<ResourceString bundle="org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties" key="LBL_CustomizeCompile_Compiler_DebugInfo_JCheckBox" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>	60	<ResourceString bundle="org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties" key="LBL_CustomizeCompile_Compiler_DebugInfo_JCheckBox" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
18	</Property>	61	</Property>
19	<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
20	<Insets value="[0, 0, 0, 0]"/>
21	</Property>
22	</Properties>	62	</Properties>
23	<AccessibilityProperties>	63	<AccessibilityProperties>
24	<Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">	64	<Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
Lines 28-47 Link Here
28	<AuxValues>	68	<AuxValues>
29	<AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>	69	<AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
30	</AuxValues>	70	</AuxValues>
31	<Constraints>
32	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
33	<GridBagConstraints gridX="0" gridY="0" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="5" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
34	</Constraint>
35	</Constraints>
36	</Component>	71	</Component>
37	<Component class="javax.swing.JCheckBox" name="jCheckBoxDeprecation">	72	<Component class="javax.swing.JCheckBox" name="jCheckBoxDeprecation">
38	<Properties>	73	<Properties>
39	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">	74	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
40	<ResourceString bundle="org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties" key="LBL_CustomizeCompile_Compiler_Deprecation_JCheckBox" replaceFormat="org.openide.util.NbBundle.getBundle({sourceFileName}.class).getString("{key}")"/>	75	<ResourceString bundle="org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties" key="LBL_CustomizeCompile_Compiler_Deprecation_JCheckBox" replaceFormat="org.openide.util.NbBundle.getBundle({sourceFileName}.class).getString("{key}")"/>
41	</Property>	76	</Property>
42	<Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
43	<Insets value="[0, 0, 0, 0]"/>
44	</Property>
45	</Properties>	77	</Properties>
46	<AccessibilityProperties>	78	<AccessibilityProperties>
47	<Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">	79	<Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
Lines 51-79 Link Here
51	<AuxValues>	83	<AuxValues>
52	<AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>	84	<AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
53	</AuxValues>	85	</AuxValues>
54	<Constraints>
55	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
56	<GridBagConstraints gridX="0" gridY="1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="12" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
57	</Constraint>
58	</Constraints>
59	</Component>	86	</Component>
60	<Component class="javax.swing.JLabel" name="additionalJavacParamsJLabel">	87	<Component class="javax.swing.JCheckBox" name="doDependCheckBox">
61	<Properties>	88	<Properties>
62	<Property name="displayedMnemonic" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">	89	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
63	<Connection code="org.openide.util.NbBundle.getMessage (CustomizerCompile.class,"MNE_AdditionalCompilerOptions").charAt(0)" type="code"/>	90	<ResourceString bundle="org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties" key="CustomizerCompile.doDependCheckBox" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
64	</Property>	91	</Property>
		92	</Properties>
		93	</Component>
		94	<Component class="javax.swing.JLabel" name="additionalJavacParamsJLabel">
		95	<Properties>
65	<Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">	96	<Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
66	<ComponentRef name="additionalJavacParamsJTextField"/>	97	<ComponentRef name="additionalJavacParamsJTextField"/>
67	</Property>	98	</Property>
68	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">	99	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
69	<Connection code="org.openide.util.NbBundle.getMessage (CustomizerCompile.class,"LBL_AdditionalCompilerOptions")" type="code"/>	100	<ResourceString bundle="org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties" key="LBL_AdditionalCompilerOptions" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
70	</Property>	101	</Property>
71	</Properties>	102	</Properties>
72	<Constraints>
73	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
74	<GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="5" insetsRight="12" anchor="17" weightX="0.0" weightY="0.0"/>
75	</Constraint>
76	</Constraints>
77	</Component>	103	</Component>
78	<Component class="javax.swing.JTextField" name="additionalJavacParamsJTextField">	104	<Component class="javax.swing.JTextField" name="additionalJavacParamsJTextField">
79	<AccessibilityProperties>	105	<AccessibilityProperties>
Lines 81-103 Link Here
81	<Connection code="org.openide.util.NbBundle.getMessage (CustomizerCompile.class,"AD_AdditionalCompilerOptions")" type="code"/>	107	<Connection code="org.openide.util.NbBundle.getMessage (CustomizerCompile.class,"AD_AdditionalCompilerOptions")" type="code"/>
82	</Property>	108	</Property>
83	</AccessibilityProperties>	109	</AccessibilityProperties>
84	<Constraints>
85	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
86	<GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="5" insetsRight="0" anchor="17" weightX="1.0" weightY="0.0"/>
87	</Constraint>
88	</Constraints>
89	</Component>	110	</Component>
90	<Component class="javax.swing.JLabel" name="additionalJavacParamsExampleJLabel">	111	<Component class="javax.swing.JLabel" name="additionalJavacParamsExampleJLabel">
91	<Properties>	112	<Properties>
92	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">	113	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
93	<Connection code="org.openide.util.NbBundle.getMessage (CustomizerCompile.class,"LBL_AdditionalCompilerOptionsExample")" type="code"/>	114	<ResourceString bundle="org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties" key="LBL_AdditionalCompilerOptionsExample" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
94	</Property>	115	</Property>
95	</Properties>	116	</Properties>
96	<Constraints>
97	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
98	<GridBagConstraints gridX="1" gridY="-1" gridWidth="0" gridHeight="0" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="12" insetsRight="0" anchor="18" weightX="0.0" weightY="1.0"/>
99	</Constraint>
100	</Constraints>
101	</Component>	117	</Component>
102	</SubComponents>	118	</SubComponents>
103	</Form>	119	</Form>

Lines 90-95 Link Here

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerCompile.java (-50 / +51 lines)
90	uiProperties.JAVAC_DEBUG_MODEL.setMnemonic( jCheckBoxDebugInfo.getMnemonic() );	90	uiProperties.JAVAC_DEBUG_MODEL.setMnemonic( jCheckBoxDebugInfo.getMnemonic() );
91	jCheckBoxDebugInfo.setModel( uiProperties.JAVAC_DEBUG_MODEL );	91	jCheckBoxDebugInfo.setModel( uiProperties.JAVAC_DEBUG_MODEL );
92		92
		93	uiProperties.DO_DEPEND_MODEL.setMnemonic(doDependCheckBox.getMnemonic());
		94	doDependCheckBox.setModel(uiProperties.DO_DEPEND_MODEL);
		95
93	additionalJavacParamsJTextField.setDocument( uiProperties.JAVAC_COMPILER_ARG_MODEL );	96	additionalJavacParamsJTextField.setDocument( uiProperties.JAVAC_COMPILER_ARG_MODEL );
94		97
95	}	98	}
Lines 104-177 Link Here
104	* WARNING: Do NOT modify this code. The content of this method is	107	* WARNING: Do NOT modify this code. The content of this method is
105	* always regenerated by the Form Editor.	108	* always regenerated by the Form Editor.
106	*/	109	*/
107	private void initComponents() {//GEN-BEGIN:initComponents	110	// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
108	java.awt.GridBagConstraints gridBagConstraints;	111	private void initComponents() {
109		112
110	jCheckBoxDebugInfo = new javax.swing.JCheckBox();	113	jCheckBoxDebugInfo = new javax.swing.JCheckBox();
111	jCheckBoxDeprecation = new javax.swing.JCheckBox();	114	jCheckBoxDeprecation = new javax.swing.JCheckBox();
		115	doDependCheckBox = new javax.swing.JCheckBox();
112	additionalJavacParamsJLabel = new javax.swing.JLabel();	116	additionalJavacParamsJLabel = new javax.swing.JLabel();
113	additionalJavacParamsJTextField = new javax.swing.JTextField();	117	additionalJavacParamsJTextField = new javax.swing.JTextField();
114	additionalJavacParamsExampleJLabel = new javax.swing.JLabel();	118	additionalJavacParamsExampleJLabel = new javax.swing.JLabel();
115		119
116	setLayout(new java.awt.GridBagLayout());	120	org.openide.awt.Mnemonics.setLocalizedText(jCheckBoxDebugInfo, org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "LBL_CustomizeCompile_Compiler_DebugInfo_JCheckBox")); // NOI18N
		121
		122	org.openide.awt.Mnemonics.setLocalizedText(jCheckBoxDeprecation, org.openide.util.NbBundle.getBundle(CustomizerCompile.class).getString("LBL_CustomizeCompile_Compiler_Deprecation_JCheckBox")); // NOI18N
117		123
118	org.openide.awt.Mnemonics.setLocalizedText(jCheckBoxDebugInfo, org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "LBL_CustomizeCompile_Compiler_DebugInfo_JCheckBox"));	124	org.openide.awt.Mnemonics.setLocalizedText(doDependCheckBox, org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "CustomizerCompile.doDependCheckBox")); // NOI18N
119	jCheckBoxDebugInfo.setMargin(new java.awt.Insets(0, 0, 0, 0));
120	gridBagConstraints = new java.awt.GridBagConstraints();
121	gridBagConstraints.gridx = 0;
122	gridBagConstraints.gridy = 0;
123	gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
124	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
125	gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0);
126	add(jCheckBoxDebugInfo, gridBagConstraints);
127	jCheckBoxDebugInfo.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "ACSD_CustomizerCompile_jCheckBoxDebugInfo"));
128
129	org.openide.awt.Mnemonics.setLocalizedText(jCheckBoxDeprecation, org.openide.util.NbBundle.getBundle(CustomizerCompile.class).getString("LBL_CustomizeCompile_Compiler_Deprecation_JCheckBox"));
130	jCheckBoxDeprecation.setMargin(new java.awt.Insets(0, 0, 0, 0));
131	gridBagConstraints = new java.awt.GridBagConstraints();
132	gridBagConstraints.gridx = 0;
133	gridBagConstraints.gridy = 1;
134	gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
135	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
136	gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 0);
137	add(jCheckBoxDeprecation, gridBagConstraints);
138	jCheckBoxDeprecation.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "ACSD_CustomizerCompile_jCheckBoxDeprecation"));
139		125
140	additionalJavacParamsJLabel.setDisplayedMnemonic(org.openide.util.NbBundle.getMessage (CustomizerCompile.class,"MNE_AdditionalCompilerOptions").charAt(0));
141	additionalJavacParamsJLabel.setLabelFor(additionalJavacParamsJTextField);	126	additionalJavacParamsJLabel.setLabelFor(additionalJavacParamsJTextField);
142	additionalJavacParamsJLabel.setText(org.openide.util.NbBundle.getMessage (CustomizerCompile.class,"LBL_AdditionalCompilerOptions"));	127	org.openide.awt.Mnemonics.setLocalizedText(additionalJavacParamsJLabel, org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "LBL_AdditionalCompilerOptions")); // NOI18N
143	gridBagConstraints = new java.awt.GridBagConstraints();
144	gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
145	gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 12);
146	add(additionalJavacParamsJLabel, gridBagConstraints);
147
148	gridBagConstraints = new java.awt.GridBagConstraints();
149	gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
150	gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
151	gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
152	gridBagConstraints.weightx = 1.0;
153	gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0);
154	add(additionalJavacParamsJTextField, gridBagConstraints);
155	additionalJavacParamsJTextField.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage (CustomizerCompile.class,"AD_AdditionalCompilerOptions"));
156		128
157	additionalJavacParamsExampleJLabel.setText(org.openide.util.NbBundle.getMessage (CustomizerCompile.class,"LBL_AdditionalCompilerOptionsExample"));	129	org.openide.awt.Mnemonics.setLocalizedText(additionalJavacParamsExampleJLabel, org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "LBL_AdditionalCompilerOptionsExample")); // NOI18N
158	gridBagConstraints = new java.awt.GridBagConstraints();
159	gridBagConstraints.gridx = 1;
160	gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
161	gridBagConstraints.gridheight = java.awt.GridBagConstraints.REMAINDER;
162	gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
163	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
164	gridBagConstraints.weighty = 1.0;
165	gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 0);
166	add(additionalJavacParamsExampleJLabel, gridBagConstraints);
167		130
168	}//GEN-END:initComponents	131	org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
		132	this.setLayout(layout);
		133	layout.setHorizontalGroup(
		134	layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
		135	.add(layout.createSequentialGroup()
		136	.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
		137	.add(jCheckBoxDebugInfo)
		138	.add(jCheckBoxDeprecation)
		139	.add(doDependCheckBox)
		140	.add(layout.createSequentialGroup()
		141	.add(additionalJavacParamsJLabel)
		142	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
		143	.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
		144	.add(additionalJavacParamsExampleJLabel)
		145	.add(additionalJavacParamsJTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 324, Short.MAX_VALUE))))
		146	.addContainerGap())
		147	);
		148	layout.setVerticalGroup(
		149	layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
		150	.add(layout.createSequentialGroup()
		151	.add(jCheckBoxDebugInfo)
		152	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
		153	.add(jCheckBoxDeprecation)
		154	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
		155	.add(doDependCheckBox)
		156	.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
		157	.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
		158	.add(additionalJavacParamsJLabel)
		159	.add(additionalJavacParamsJTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
		160	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
		161	.add(additionalJavacParamsExampleJLabel)
		162	.add(353, 353, 353))
		163	);
		164
		165	jCheckBoxDebugInfo.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "ACSD_CustomizerCompile_jCheckBoxDebugInfo")); // NOI18N
		166	jCheckBoxDeprecation.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "ACSD_CustomizerCompile_jCheckBoxDeprecation")); // NOI18N
		167	additionalJavacParamsJTextField.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage (CustomizerCompile.class,"AD_AdditionalCompilerOptions"));
		168	}// </editor-fold>//GEN-END:initComponents
169		169
170		170
171	// Variables declaration - do not modify//GEN-BEGIN:variables	171	// Variables declaration - do not modify//GEN-BEGIN:variables
172	private javax.swing.JLabel additionalJavacParamsExampleJLabel;	172	private javax.swing.JLabel additionalJavacParamsExampleJLabel;
173	private javax.swing.JLabel additionalJavacParamsJLabel;	173	private javax.swing.JLabel additionalJavacParamsJLabel;
174	private javax.swing.JTextField additionalJavacParamsJTextField;	174	private javax.swing.JTextField additionalJavacParamsJTextField;
		175	private javax.swing.JCheckBox doDependCheckBox;
175	private javax.swing.JCheckBox jCheckBoxDebugInfo;	176	private javax.swing.JCheckBox jCheckBoxDebugInfo;
176	private javax.swing.JCheckBox jCheckBoxDeprecation;	177	private javax.swing.JCheckBox jCheckBoxDeprecation;
177	// End of variables declaration//GEN-END:variables	178	// End of variables declaration//GEN-END:variables

Lines 1-15 Link Here

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerJar.form (-32 / +60 lines)
1	<?xml version="1.0" encoding="UTF-8" ?>	1	<?xml version="1.0" encoding="UTF-8" ?>
2		2
3	<Form version="1.2" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">	3	<Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<AuxValues>	4	<AuxValues>
		5	<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
		6	<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
5	<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>	7	<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
		8	<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
		9	<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
6	<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>	10	<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
7	<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>	11	<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
8	<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>	12	<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
9	</AuxValues>	13	</AuxValues>
10		14
11	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>	15	<Layout>
		16	<DimensionLayout dim="0">
		17	<Group type="103" groupAlignment="0" attributes="0">
		18	<Group type="102" alignment="0" attributes="0">
		19	<Group type="103" groupAlignment="0" attributes="0">
		20	<Group type="102" alignment="0" attributes="0">
		21	<Component id="jLabelDistDir" min="-2" max="-2" attributes="0"/>
		22	<EmptySpace min="-2" pref="88" max="-2" attributes="0"/>
		23	<Component id="jTextFieldDistDir" pref="270" max="32767" attributes="0"/>
		24	</Group>
		25	<Component id="doJarCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
		26	<Component id="jCheckBoxCommpress" alignment="0" min="-2" max="-2" attributes="0"/>
		27	<Group type="102" alignment="0" attributes="0">
		28	<Component id="jLabel2" min="-2" max="-2" attributes="0"/>
		29	<EmptySpace min="-2" max="-2" attributes="0"/>
		30	<Group type="103" groupAlignment="0" attributes="0">
		31	<Component id="excludeMessage" alignment="0" min="-2" max="-2" attributes="0"/>
		32	<Component id="jTextFieldExcludes" alignment="0" pref="270" max="32767" attributes="0"/>
		33	</Group>
		34	</Group>
		35	</Group>
		36	<EmptySpace min="-2" pref="24" max="-2" attributes="0"/>
		37	</Group>
		38	</Group>
		39	</DimensionLayout>
		40	<DimensionLayout dim="1">
		41	<Group type="103" groupAlignment="0" attributes="0">
		42	<Group type="102" alignment="0" attributes="0">
		43	<Component id="doJarCheckBox" min="-2" max="-2" attributes="0"/>
		44	<EmptySpace min="-2" pref="8" max="-2" attributes="0"/>
		45	<Group type="103" groupAlignment="3" attributes="0">
		46	<Component id="jLabelDistDir" alignment="3" min="-2" max="-2" attributes="0"/>
		47	<Component id="jTextFieldDistDir" alignment="3" min="-2" max="-2" attributes="0"/>
		48	</Group>
		49	<EmptySpace max="-2" attributes="0"/>
		50	<Group type="103" groupAlignment="3" attributes="0">
		51	<Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
		52	<Component id="jTextFieldExcludes" alignment="3" min="-2" max="-2" attributes="0"/>
		53	</Group>
		54	<EmptySpace max="-2" attributes="0"/>
		55	<Component id="excludeMessage" min="-2" max="-2" attributes="0"/>
		56	<EmptySpace min="-2" pref="8" max="-2" attributes="0"/>
		57	<Component id="jCheckBoxCommpress" min="-2" max="-2" attributes="0"/>
		58	<EmptySpace pref="178" max="32767" attributes="0"/>
		59	</Group>
		60	</Group>
		61	</DimensionLayout>
		62	</Layout>
12	<SubComponents>	63	<SubComponents>
		64	<Component class="javax.swing.JCheckBox" name="doJarCheckBox">
		65	<Properties>
		66	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
		67	<ResourceString bundle="org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties" key="CustomizerJar.doJarCheckBox" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
		68	</Property>
		69	</Properties>
		70	</Component>
13	<Component class="javax.swing.JLabel" name="jLabelDistDir">	71	<Component class="javax.swing.JLabel" name="jLabelDistDir">
14	<Properties>	72	<Properties>
15	<Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">	73	<Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
Lines 22-32 Link Here
22	<AuxValues>	80	<AuxValues>
23	<AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>	81	<AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
24	</AuxValues>	82	</AuxValues>
25	<Constraints>
26	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
27	<GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="12" insetsRight="12" anchor="18" weightX="0.0" weightY="0.0"/>
28	</Constraint>
29	</Constraints>
30	</Component>	83	</Component>
31	<Component class="javax.swing.JTextField" name="jTextFieldDistDir">	84	<Component class="javax.swing.JTextField" name="jTextFieldDistDir">
32	<Properties>	85	<Properties>
Lines 37-47 Link Here
37	<ResourceString bundle="org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties" key="AD_jTextFieldDistDir" replaceFormat="org.openide.util.NbBundle.getBundle({sourceFileName}.class).getString("{key}")"/>	90	<ResourceString bundle="org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties" key="AD_jTextFieldDistDir" replaceFormat="org.openide.util.NbBundle.getBundle({sourceFileName}.class).getString("{key}")"/>
38	</Property>	91	</Property>
39	</AccessibilityProperties>	92	</AccessibilityProperties>
40	<Constraints>
41	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
42	<GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="12" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/>
43	</Constraint>
44	</Constraints>
45	</Component>	93	</Component>
46	<Component class="javax.swing.JLabel" name="jLabel2">	94	<Component class="javax.swing.JLabel" name="jLabel2">
47	<Properties>	95	<Properties>
Lines 55-65 Link Here
55	<AuxValues>	103	<AuxValues>
56	<AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>	104	<AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
57	</AuxValues>	105	</AuxValues>
58	<Constraints>
59	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
60	<GridBagConstraints gridX="0" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="18" weightX="0.0" weightY="0.0"/>
61	</Constraint>
62	</Constraints>
63	</Component>	106	</Component>
64	<Component class="javax.swing.JTextField" name="jTextFieldExcludes">	107	<Component class="javax.swing.JTextField" name="jTextFieldExcludes">
65	<AccessibilityProperties>	108	<AccessibilityProperties>
Lines 67-77 Link Here
67	<ResourceString bundle="org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties" key="AD_jTextFieldExcludes" replaceFormat="org.openide.util.NbBundle.getBundle({sourceFileName}.class).getString("{key}")"/>	110	<ResourceString bundle="org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties" key="AD_jTextFieldExcludes" replaceFormat="org.openide.util.NbBundle.getBundle({sourceFileName}.class).getString("{key}")"/>
68	</Property>	111	</Property>
69	</AccessibilityProperties>	112	</AccessibilityProperties>
70	<Constraints>
71	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
72	<GridBagConstraints gridX="1" gridY="1" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/>
73	</Constraint>
74	</Constraints>
75	</Component>	113	</Component>
76	<Component class="javax.swing.JCheckBox" name="jCheckBoxCommpress">	114	<Component class="javax.swing.JCheckBox" name="jCheckBoxCommpress">
77	<Properties>	115	<Properties>
Lines 87-97 Link Here
87	<AuxValues>	125	<AuxValues>
88	<AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>	126	<AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
89	</AuxValues>	127	</AuxValues>
90	<Constraints>
91	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
92	<GridBagConstraints gridX="0" gridY="3" gridWidth="0" gridHeight="0" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="1.0"/>
93	</Constraint>
94	</Constraints>
95	</Component>	128	</Component>
96	<Component class="javax.swing.JLabel" name="excludeMessage">	129	<Component class="javax.swing.JLabel" name="excludeMessage">
97	<Properties>	130	<Properties>
Lines 102-112 Link Here
102	<ResourceString bundle="org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties" key="LBL_CustomizerJar_ExcludeMessage" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>	135	<ResourceString bundle="org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties" key="LBL_CustomizerJar_ExcludeMessage" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
103	</Property>	136	</Property>
104	</Properties>	137	</Properties>
105	<Constraints>
106	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
107	<GridBagConstraints gridX="1" gridY="2" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="6" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
108	</Constraint>
109	</Constraints>
110	</Component>	138	</Component>
111	</SubComponents>	139	</SubComponents>
112	</Form>	140	</Form>

Lines 76-81 Link Here

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerJar.java (-53 / +56 lines)
76		76
77	uiProperties.JAR_COMPRESS_MODEL.setMnemonic( jCheckBoxCommpress.getMnemonic() );	77	uiProperties.JAR_COMPRESS_MODEL.setMnemonic( jCheckBoxCommpress.getMnemonic() );
78	jCheckBoxCommpress.setModel( uiProperties.JAR_COMPRESS_MODEL );	78	jCheckBoxCommpress.setModel( uiProperties.JAR_COMPRESS_MODEL );
		79
		80	uiProperties.DO_JAR_MODEL.setMnemonic(doJarCheckBox.getMnemonic());
		81	doJarCheckBox.setModel(uiProperties.DO_JAR_MODEL);
79	}	82	}
80		83
81	public HelpCtx getHelpCtx() {	84	public HelpCtx getHelpCtx() {
Lines 88-97 Link Here
88	* WARNING: Do NOT modify this code. The content of this method is	91	* WARNING: Do NOT modify this code. The content of this method is
89	* always regenerated by the Form Editor.	92	* always regenerated by the Form Editor.
90	*/	93	*/
91	// <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents	94	// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
92	private void initComponents() {	95	private void initComponents() {
93	java.awt.GridBagConstraints gridBagConstraints;
94		96
		97	doJarCheckBox = new javax.swing.JCheckBox();
95	jLabelDistDir = new javax.swing.JLabel();	98	jLabelDistDir = new javax.swing.JLabel();
96	jTextFieldDistDir = new javax.swing.JTextField();	99	jTextFieldDistDir = new javax.swing.JTextField();
97	jLabel2 = new javax.swing.JLabel();	100	jLabel2 = new javax.swing.JLabel();
Lines 99-167 Link Here
99	jCheckBoxCommpress = new javax.swing.JCheckBox();	102	jCheckBoxCommpress = new javax.swing.JCheckBox();
100	excludeMessage = new javax.swing.JLabel();	103	excludeMessage = new javax.swing.JLabel();
101		104
102	setLayout(new java.awt.GridBagLayout());	105	org.openide.awt.Mnemonics.setLocalizedText(doJarCheckBox, org.openide.util.NbBundle.getMessage(CustomizerJar.class, "CustomizerJar.doJarCheckBox")); // NOI18N
103		106
104	jLabelDistDir.setLabelFor(jTextFieldDistDir);	107	jLabelDistDir.setLabelFor(jTextFieldDistDir);
105	org.openide.awt.Mnemonics.setLocalizedText(jLabelDistDir, org.openide.util.NbBundle.getMessage(CustomizerJar.class, "LBL_CustomizeJar_DistDir_JTextField"));	108	org.openide.awt.Mnemonics.setLocalizedText(jLabelDistDir, org.openide.util.NbBundle.getMessage(CustomizerJar.class, "LBL_CustomizeJar_DistDir_JTextField")); // NOI18N
106	gridBagConstraints = new java.awt.GridBagConstraints();
107	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
108	gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 12);
109	add(jLabelDistDir, gridBagConstraints);
110		109
111	jTextFieldDistDir.setEditable(false);	110	jTextFieldDistDir.setEditable(false);
112	gridBagConstraints = new java.awt.GridBagConstraints();
113	gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
114	gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
115	gridBagConstraints.weightx = 1.0;
116	gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 0);
117	add(jTextFieldDistDir, gridBagConstraints);
118	jTextFieldDistDir.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getBundle(CustomizerJar.class).getString("AD_jTextFieldDistDir"));
119		111
120	jLabel2.setLabelFor(jTextFieldExcludes);	112	jLabel2.setLabelFor(jTextFieldExcludes);
121	org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(CustomizerJar.class, "LBL_CustomizeJar_Excludes_JTextField"));	113	org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(CustomizerJar.class, "LBL_CustomizeJar_Excludes_JTextField")); // NOI18N
122	gridBagConstraints = new java.awt.GridBagConstraints();	114
123	gridBagConstraints.gridx = 0;	115	org.openide.awt.Mnemonics.setLocalizedText(jCheckBoxCommpress, org.openide.util.NbBundle.getMessage(CustomizerJar.class, "LBL_CustomizeJar_Commpres_JCheckBox")); // NOI18N
124	gridBagConstraints.gridy = 1;
125	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
126	gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 12);
127	add(jLabel2, gridBagConstraints);
128
129	gridBagConstraints = new java.awt.GridBagConstraints();
130	gridBagConstraints.gridx = 1;
131	gridBagConstraints.gridy = 1;
132	gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
133	gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
134	gridBagConstraints.weightx = 1.0;
135	add(jTextFieldExcludes, gridBagConstraints);
136	jTextFieldExcludes.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getBundle(CustomizerJar.class).getString("AD_jTextFieldExcludes"));
137
138	org.openide.awt.Mnemonics.setLocalizedText(jCheckBoxCommpress, org.openide.util.NbBundle.getMessage(CustomizerJar.class, "LBL_CustomizeJar_Commpres_JCheckBox"));
139	gridBagConstraints = new java.awt.GridBagConstraints();
140	gridBagConstraints.gridx = 0;
141	gridBagConstraints.gridy = 3;
142	gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
143	gridBagConstraints.gridheight = java.awt.GridBagConstraints.REMAINDER;
144	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
145	gridBagConstraints.weighty = 1.0;
146	add(jCheckBoxCommpress, gridBagConstraints);
147	jCheckBoxCommpress.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getBundle(CustomizerJar.class).getString("AD_jCheckBoxCompress"));
148		116
149	excludeMessage.setLabelFor(jTextFieldExcludes);	117	excludeMessage.setLabelFor(jTextFieldExcludes);
150	org.openide.awt.Mnemonics.setLocalizedText(excludeMessage, java.util.ResourceBundle.getBundle("org/netbeans/modules/java/j2seproject/ui/customizer/Bundle").getString("LBL_CustomizerJar_ExcludeMessage"));	118	java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/modules/java/j2seproject/ui/customizer/Bundle"); // NOI18N
151	gridBagConstraints = new java.awt.GridBagConstraints();	119	org.openide.awt.Mnemonics.setLocalizedText(excludeMessage, bundle.getString("LBL_CustomizerJar_ExcludeMessage")); // NOI18N
152	gridBagConstraints.gridx = 1;
153	gridBagConstraints.gridy = 2;
154	gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
155	gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
156	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
157	gridBagConstraints.insets = new java.awt.Insets(0, 0, 6, 0);
158	add(excludeMessage, gridBagConstraints);
159		120
160	}	121	org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
161	// </editor-fold>//GEN-END:initComponents	122	this.setLayout(layout);
		123	layout.setHorizontalGroup(
		124	layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
		125	.add(layout.createSequentialGroup()
		126	.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
		127	.add(layout.createSequentialGroup()
		128	.add(jLabelDistDir)
		129	.add(88, 88, 88)
		130	.add(jTextFieldDistDir, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 270, Short.MAX_VALUE))
		131	.add(doJarCheckBox)
		132	.add(jCheckBoxCommpress)
		133	.add(layout.createSequentialGroup()
		134	.add(jLabel2)
		135	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
		136	.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
		137	.add(excludeMessage)
		138	.add(jTextFieldExcludes, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 270, Short.MAX_VALUE))))
		139	.add(24, 24, 24))
		140	);
		141	layout.setVerticalGroup(
		142	layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
		143	.add(layout.createSequentialGroup()
		144	.add(doJarCheckBox)
		145	.add(8, 8, 8)
		146	.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
		147	.add(jLabelDistDir)
		148	.add(jTextFieldDistDir, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
		149	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
		150	.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
		151	.add(jLabel2)
		152	.add(jTextFieldExcludes, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
		153	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
		154	.add(excludeMessage)
		155	.add(8, 8, 8)
		156	.add(jCheckBoxCommpress)
		157	.addContainerGap(178, Short.MAX_VALUE))
		158	);
		159
		160	jTextFieldDistDir.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getBundle(CustomizerJar.class).getString("AD_jTextFieldDistDir")); // NOI18N
		161	jTextFieldExcludes.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getBundle(CustomizerJar.class).getString("AD_jTextFieldExcludes")); // NOI18N
		162	jCheckBoxCommpress.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getBundle(CustomizerJar.class).getString("AD_jCheckBoxCompress")); // NOI18N
		163	}// </editor-fold>//GEN-END:initComponents
162		164
163		165
164	// Variables declaration - do not modify//GEN-BEGIN:variables	166	// Variables declaration - do not modify//GEN-BEGIN:variables
		167	private javax.swing.JCheckBox doJarCheckBox;
165	private javax.swing.JLabel excludeMessage;	168	private javax.swing.JLabel excludeMessage;
166	private javax.swing.JCheckBox jCheckBoxCommpress;	169	private javax.swing.JCheckBox jCheckBoxCommpress;
167	private javax.swing.JLabel jLabel2;	170	private javax.swing.JLabel jLabel2;

Lines 100-105 Link Here

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEProjectProperties.java (-1 / +16 lines)
100	private static final Integer BOOLEAN_KIND_YN = new Integer( 1 );	100	private static final Integer BOOLEAN_KIND_YN = new Integer( 1 );
101	private static final Integer BOOLEAN_KIND_ED = new Integer( 2 );	101	private static final Integer BOOLEAN_KIND_ED = new Integer( 2 );
102	private Integer javacDebugBooleanKind;	102	private Integer javacDebugBooleanKind;
		103	private Integer doDependBooleanKind;
		104	private Integer doJarBooleanKind;
103	private Integer javadocPreviewBooleanKind;	105	private Integer javadocPreviewBooleanKind;
104		106
105	// Special properties of the project	107	// Special properties of the project
Lines 136-141 Link Here
136	public static final String INCLUDES = "includes"; // NOI18N	138	public static final String INCLUDES = "includes"; // NOI18N
137	/** @since org.netbeans.modules.java.j2seproject/1 1.11 */	139	/** @since org.netbeans.modules.java.j2seproject/1 1.11 */
138	public static final String EXCLUDES = "excludes"; // NOI18N	140	public static final String EXCLUDES = "excludes"; // NOI18N
		141	/** @since org.netbeans.modules.java.j2seproject/1 1.12 */
		142	public static final String DO_DEPEND = "do.depend"; // NOI18N
		143	/** @since org.netbeans.modules.java.j2seproject/1 1.12 */
		144	public static final String DO_JAR = "do.jar"; // NOI18N
139		145
140	public static final String JAVADOC_PRIVATE="javadoc.private"; // NOI18N	146	public static final String JAVADOC_PRIVATE="javadoc.private"; // NOI18N
141	public static final String JAVADOC_NO_TREE="javadoc.notree"; // NOI18N	147	public static final String JAVADOC_NO_TREE="javadoc.notree"; // NOI18N
Lines 203-208 Link Here
203	// CustomizerCompile	209	// CustomizerCompile
204	ButtonModel JAVAC_DEPRECATION_MODEL;	210	ButtonModel JAVAC_DEPRECATION_MODEL;
205	ButtonModel JAVAC_DEBUG_MODEL;	211	ButtonModel JAVAC_DEBUG_MODEL;
		212	ButtonModel DO_DEPEND_MODEL;
206	ButtonModel NO_DEPENDENCIES_MODEL;	213	ButtonModel NO_DEPENDENCIES_MODEL;
207	Document JAVAC_COMPILER_ARG_MODEL;	214	Document JAVAC_COMPILER_ARG_MODEL;
208		215
Lines 212-217 Link Here
212	Document DIST_JAR_MODEL;	219	Document DIST_JAR_MODEL;
213	Document BUILD_CLASSES_EXCLUDES_MODEL;	220	Document BUILD_CLASSES_EXCLUDES_MODEL;
214	ButtonModel JAR_COMPRESS_MODEL;	221	ButtonModel JAR_COMPRESS_MODEL;
		222	ButtonModel DO_JAR_MODEL;
215		223
216	// CustomizerJavadoc	224	// CustomizerJavadoc
217	ButtonModel JAVADOC_PRIVATE_MODEL;	225	ButtonModel JAVADOC_PRIVATE_MODEL;
Lines 311-317 Link Here
311	//Should use the StoreGroup when the StoreGroup SPI will be extended to allow false default value in ToggleButtonModel	319	//Should use the StoreGroup when the StoreGroup SPI will be extended to allow false default value in ToggleButtonModel
312	Integer[] kind = new Integer[1];	320	Integer[] kind = new Integer[1];
313	JAVAC_DEBUG_MODEL = createToggleButtonModel( evaluator, JAVAC_DEBUG, kind);	321	JAVAC_DEBUG_MODEL = createToggleButtonModel( evaluator, JAVAC_DEBUG, kind);
314	javacDebugBooleanKind = kind[0];	322
		323	DO_DEPEND_MODEL = createToggleButtonModel(evaluator, DO_DEPEND, kind);
		324	doDependBooleanKind = kind[0];
		325
315		326
316	NO_DEPENDENCIES_MODEL = projectGroup.createInverseToggleButtonModel( evaluator, NO_DEPENDENCIES );	327	NO_DEPENDENCIES_MODEL = projectGroup.createInverseToggleButtonModel( evaluator, NO_DEPENDENCIES );
317	JAVAC_COMPILER_ARG_MODEL = projectGroup.createStringDocument( evaluator, JAVAC_COMPILER_ARG );	328	JAVAC_COMPILER_ARG_MODEL = projectGroup.createStringDocument( evaluator, JAVAC_COMPILER_ARG );
Lines 320-325 Link Here
320	DIST_JAR_MODEL = projectGroup.createStringDocument( evaluator, DIST_JAR );	331	DIST_JAR_MODEL = projectGroup.createStringDocument( evaluator, DIST_JAR );
321	BUILD_CLASSES_EXCLUDES_MODEL = projectGroup.createStringDocument( evaluator, BUILD_CLASSES_EXCLUDES );	332	BUILD_CLASSES_EXCLUDES_MODEL = projectGroup.createStringDocument( evaluator, BUILD_CLASSES_EXCLUDES );
322	JAR_COMPRESS_MODEL = projectGroup.createToggleButtonModel( evaluator, JAR_COMPRESS );	333	JAR_COMPRESS_MODEL = projectGroup.createToggleButtonModel( evaluator, JAR_COMPRESS );
		334	DO_JAR_MODEL = createToggleButtonModel(evaluator, DO_JAR, kind);
		335	doJarBooleanKind = kind[0];
323		336
324	// CustomizerJavadoc	337	// CustomizerJavadoc
325	JAVADOC_PRIVATE_MODEL = projectGroup.createToggleButtonModel( evaluator, JAVADOC_PRIVATE );	338	JAVADOC_PRIVATE_MODEL = projectGroup.createToggleButtonModel( evaluator, JAVADOC_PRIVATE );
Lines 448-453 Link Here
448	//Should use the StoreGroup when the StoreGroup SPI will be extended to allow false default value in ToggleButtonModel	461	//Should use the StoreGroup when the StoreGroup SPI will be extended to allow false default value in ToggleButtonModel
449	//Save javac.debug	462	//Save javac.debug
450	privateProperties.setProperty(JAVAC_DEBUG, encodeBoolean (JAVAC_DEBUG_MODEL.isSelected(), javacDebugBooleanKind));	463	privateProperties.setProperty(JAVAC_DEBUG, encodeBoolean (JAVAC_DEBUG_MODEL.isSelected(), javacDebugBooleanKind));
		464	privateProperties.setProperty(DO_DEPEND, encodeBoolean(DO_DEPEND_MODEL.isSelected(), doDependBooleanKind));
		465	privateProperties.setProperty(DO_JAR, encodeBoolean(DO_JAR_MODEL.isSelected(), doJarBooleanKind));
451		466
452	//Hotfix of the issue #70058	467	//Hotfix of the issue #70058
453	//Should use the StoreGroup when the StoreGroup SPI will be extended to allow false default value in ToggleButtonModel	468	//Should use the StoreGroup when the StoreGroup SPI will be extended to allow false default value in ToggleButtonModel

Return to bug 104508

Lines 150-158 Link Here

(-)java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java (-3 / +9 lines)
150	public J2SEActionProvider( J2SEProject project, UpdateHelper updateHelper ) {	150	public J2SEActionProvider( J2SEProject project, UpdateHelper updateHelper ) {
151		151
152	commands = new HashMap<String,String[]>();	152	commands = new HashMap<String,String[]>();
153	commands.put(COMMAND_BUILD, new String[] {"jar"}); // NOI18N	153	// treated specially: COMMAND_{,RE}BUILD
154	commands.put(COMMAND_CLEAN, new String[] {"clean"}); // NOI18N	154	commands.put(COMMAND_CLEAN, new String[] {"clean"}); // NOI18N
155	commands.put(COMMAND_REBUILD, new String[] {"clean", "jar"}); // NOI18N
156	commands.put(COMMAND_COMPILE_SINGLE, new String[] {"compile-single"}); // NOI18N	155	commands.put(COMMAND_COMPILE_SINGLE, new String[] {"compile-single"}); // NOI18N
157	// commands.put(COMMAND_COMPILE_TEST_SINGLE, new String[] {"compile-test-single"}); // NOI18N	156	// commands.put(COMMAND_COMPILE_TEST_SINGLE, new String[] {"compile-test-single"}); // NOI18N
158	commands.put(COMMAND_RUN, new String[] {"run"}); // NOI18N	157	commands.put(COMMAND_RUN, new String[] {"run"}); // NOI18N
Lines 434-440 Link Here
434	String[] targets = targetsFromConfig.get(command);	433	String[] targets = targetsFromConfig.get(command);
435	targetNames = (targets != null) ? targets : commands.get(command);	434	targetNames = (targets != null) ? targets : commands.get(command);
436	if (targetNames == null) {	435	if (targetNames == null) {
437	throw new IllegalArgumentException(command);	436	String buildTarget = "false".equalsIgnoreCase(project.evaluator().getProperty(J2SEProjectProperties.DO_JAR)) ? "compile" : "jar"; // NOI18N
		437	if (command.equals(COMMAND_BUILD)) {
		438	targetNames = new String[] {buildTarget};
		439	} else if (command.equals(COMMAND_REBUILD)) {
		440	targetNames = new String[] {"clean", buildTarget}; // NOI18N
		441	} else {
		442	throw new IllegalArgumentException(command);
		443	}
438	}	444	}
439	}	445	}
440	J2SEConfigurationProvider.Config c = context.lookup(J2SEConfigurationProvider.Config.class);	446	J2SEConfigurationProvider.Config c = context.lookup(J2SEConfigurationProvider.Config.class);