Index: java/j2seproject/nbproject/project.xml
===================================================================
RCS file: /shared/data/ccvs/repository/java/j2seproject/nbproject/project.xml,v
retrieving revision 1.56
diff -u -r1.56 project.xml
--- java/j2seproject/nbproject/project.xml 1 Oct 2007 14:22:50 -0000 1.56
+++ java/j2seproject/nbproject/project.xml 3 Oct 2007 00:40:36 -0000
@@ -56,6 +56,15 @@
+ org.jdesktop.layout
+
+
+
+ 1
+ 1.4
+
+
+
org.netbeans.api.java
Index: java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java
===================================================================
RCS file: /shared/data/ccvs/repository/java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java,v
retrieving revision 1.62
diff -u -r1.62 J2SEActionProvider.java
--- java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java 1 Oct 2007 14:22:50 -0000 1.62
+++ java/j2seproject/src/org/netbeans/modules/java/j2seproject/J2SEActionProvider.java 3 Oct 2007 00:40:36 -0000
@@ -150,9 +150,8 @@
public J2SEActionProvider( J2SEProject project, UpdateHelper updateHelper ) {
commands = new HashMap();
- commands.put(COMMAND_BUILD, new String[] {"jar"}); // NOI18N
+ // 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
@@ -434,7 +433,14 @@
String[] targets = targetsFromConfig.get(command);
targetNames = (targets != null) ? targets : commands.get(command);
if (targetNames == null) {
- throw new IllegalArgumentException(command);
+ 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);
Index: java/j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl
===================================================================
RCS file: /shared/data/ccvs/repository/java/j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl,v
retrieving revision 1.102
diff -u -r1.102 build-impl.xsl
--- java/j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl 1 Oct 2007 14:22:54 -0000 1.102
+++ java/j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl 3 Oct 2007 00:40:37 -0000
@@ -214,6 +214,10 @@
+
+
+
+
@@ -688,8 +692,10 @@
-
+
+
+
@@ -704,10 +710,12 @@
You can override this target in the ../build.xml file.
+
+
+
- init,deps-jar,-pre-pre-compile,-pre-compile,web-service-client-compile
+ init,deps-jar,-pre-pre-compile,-pre-compile,web-service-client-compile,-compile-depend
have.sources
-
@@ -1022,9 +1030,7 @@
You can override this target in the ../build.xml file.
-
- have.tests
- init,compile,-pre-pre-compile-test,-pre-compile-test
+
@@ -1034,6 +1040,10 @@
${build.test.classes.dir}
${javac.test.classpath}
+
+
+ have.tests
+ init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend
Index: java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties
===================================================================
RCS file: /shared/data/ccvs/repository/java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties,v
retrieving revision 1.93
diff -u -r1.93 Bundle.properties
--- java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties 2 Oct 2007 12:30:38 -0000 1.93
+++ java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/Bundle.properties 3 Oct 2007 00:40:37 -0000
@@ -80,8 +80,7 @@
LBL_CustomizeCompile_Classpath_MoveDown_JButton=Move &Down
LBL_CustomizeCompile_Classpath_AddJar_JButton=Add &JAR/Folder...
LBL_CustomizeCompile_Build_Subprojects=&Build Projects on Classpath
-MNE_AdditionalCompilerOptions=C
-LBL_AdditionalCompilerOptions=Additional Compiler Options:
+LBL_AdditionalCompilerOptions=Additional &Compiler Options:
AD_AdditionalCompilerOptions=N/A
LBL_AdditionalCompilerOptionsExample=(e.g. -Xlint:unchecked)
MSG_ProjectArtifactFormat={0} - {1}
@@ -589,3 +588,5 @@
AD_CustomizerRun_Cfg=N/A
AD_CustomizerSources_Include=N/A
AD_CustomizerSources_Encoding=N/A
+CustomizerCompile.doDependCheckBox=Track Java De&pendencies
+CustomizerJar.doJarCheckBox=&Build JAR after Compiling
Index: java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerCompile.form
===================================================================
RCS file: /shared/data/ccvs/repository/java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerCompile.form,v
retrieving revision 1.11
diff -u -r1.11 CustomizerCompile.form
--- java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerCompile.form 3 Feb 2005 16:59:32 -0000 1.11
+++ java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerCompile.form 3 Oct 2007 00:40:37 -0000
@@ -1,24 +1,64 @@
-
Index: java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerCompile.java
===================================================================
RCS file: /shared/data/ccvs/repository/java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerCompile.java,v
retrieving revision 1.16
diff -u -r1.16 CustomizerCompile.java
--- java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerCompile.java 1 Oct 2007 14:22:57 -0000 1.16
+++ java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerCompile.java 3 Oct 2007 00:40:37 -0000
@@ -90,6 +90,9 @@
uiProperties.JAVAC_DEBUG_MODEL.setMnemonic( jCheckBoxDebugInfo.getMnemonic() );
jCheckBoxDebugInfo.setModel( uiProperties.JAVAC_DEBUG_MODEL );
+ uiProperties.DO_DEPEND_MODEL.setMnemonic(doDependCheckBox.getMnemonic());
+ doDependCheckBox.setModel(uiProperties.DO_DEPEND_MODEL);
+
additionalJavacParamsJTextField.setDocument( uiProperties.JAVAC_COMPILER_ARG_MODEL );
}
@@ -104,74 +107,72 @@
* WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor.
*/
- private void initComponents() {//GEN-BEGIN:initComponents
- java.awt.GridBagConstraints gridBagConstraints;
+ // //GEN-BEGIN:initComponents
+ private void initComponents() {
jCheckBoxDebugInfo = new javax.swing.JCheckBox();
jCheckBoxDeprecation = new javax.swing.JCheckBox();
+ doDependCheckBox = new javax.swing.JCheckBox();
additionalJavacParamsJLabel = new javax.swing.JLabel();
additionalJavacParamsJTextField = new javax.swing.JTextField();
additionalJavacParamsExampleJLabel = new javax.swing.JLabel();
- setLayout(new java.awt.GridBagLayout());
+ org.openide.awt.Mnemonics.setLocalizedText(jCheckBoxDebugInfo, org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "LBL_CustomizeCompile_Compiler_DebugInfo_JCheckBox")); // NOI18N
+
+ org.openide.awt.Mnemonics.setLocalizedText(jCheckBoxDeprecation, org.openide.util.NbBundle.getBundle(CustomizerCompile.class).getString("LBL_CustomizeCompile_Compiler_Deprecation_JCheckBox")); // NOI18N
- org.openide.awt.Mnemonics.setLocalizedText(jCheckBoxDebugInfo, org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "LBL_CustomizeCompile_Compiler_DebugInfo_JCheckBox"));
- jCheckBoxDebugInfo.setMargin(new java.awt.Insets(0, 0, 0, 0));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0);
- add(jCheckBoxDebugInfo, gridBagConstraints);
- jCheckBoxDebugInfo.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "ACSD_CustomizerCompile_jCheckBoxDebugInfo"));
-
- org.openide.awt.Mnemonics.setLocalizedText(jCheckBoxDeprecation, org.openide.util.NbBundle.getBundle(CustomizerCompile.class).getString("LBL_CustomizeCompile_Compiler_Deprecation_JCheckBox"));
- jCheckBoxDeprecation.setMargin(new java.awt.Insets(0, 0, 0, 0));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 0);
- add(jCheckBoxDeprecation, gridBagConstraints);
- jCheckBoxDeprecation.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "ACSD_CustomizerCompile_jCheckBoxDeprecation"));
+ org.openide.awt.Mnemonics.setLocalizedText(doDependCheckBox, org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "CustomizerCompile.doDependCheckBox")); // NOI18N
- additionalJavacParamsJLabel.setDisplayedMnemonic(org.openide.util.NbBundle.getMessage (CustomizerCompile.class,"MNE_AdditionalCompilerOptions").charAt(0));
additionalJavacParamsJLabel.setLabelFor(additionalJavacParamsJTextField);
- additionalJavacParamsJLabel.setText(org.openide.util.NbBundle.getMessage (CustomizerCompile.class,"LBL_AdditionalCompilerOptions"));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 12);
- add(additionalJavacParamsJLabel, gridBagConstraints);
-
- 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(0, 0, 5, 0);
- add(additionalJavacParamsJTextField, gridBagConstraints);
- additionalJavacParamsJTextField.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage (CustomizerCompile.class,"AD_AdditionalCompilerOptions"));
+ org.openide.awt.Mnemonics.setLocalizedText(additionalJavacParamsJLabel, org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "LBL_AdditionalCompilerOptions")); // NOI18N
- additionalJavacParamsExampleJLabel.setText(org.openide.util.NbBundle.getMessage (CustomizerCompile.class,"LBL_AdditionalCompilerOptionsExample"));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.gridheight = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.weighty = 1.0;
- gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 0);
- add(additionalJavacParamsExampleJLabel, gridBagConstraints);
+ org.openide.awt.Mnemonics.setLocalizedText(additionalJavacParamsExampleJLabel, org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "LBL_AdditionalCompilerOptionsExample")); // NOI18N
- }//GEN-END:initComponents
+ org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+ this.setLayout(layout);
+ layout.setHorizontalGroup(
+ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(layout.createSequentialGroup()
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(jCheckBoxDebugInfo)
+ .add(jCheckBoxDeprecation)
+ .add(doDependCheckBox)
+ .add(layout.createSequentialGroup()
+ .add(additionalJavacParamsJLabel)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(additionalJavacParamsExampleJLabel)
+ .add(additionalJavacParamsJTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 324, Short.MAX_VALUE))))
+ .addContainerGap())
+ );
+ layout.setVerticalGroup(
+ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(layout.createSequentialGroup()
+ .add(jCheckBoxDebugInfo)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(jCheckBoxDeprecation)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(doDependCheckBox)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(additionalJavacParamsJLabel)
+ .add(additionalJavacParamsJTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(additionalJavacParamsExampleJLabel)
+ .add(353, 353, 353))
+ );
+
+ jCheckBoxDebugInfo.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "ACSD_CustomizerCompile_jCheckBoxDebugInfo")); // NOI18N
+ jCheckBoxDeprecation.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CustomizerCompile.class, "ACSD_CustomizerCompile_jCheckBoxDeprecation")); // NOI18N
+ additionalJavacParamsJTextField.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage (CustomizerCompile.class,"AD_AdditionalCompilerOptions"));
+ }// //GEN-END:initComponents
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JLabel additionalJavacParamsExampleJLabel;
private javax.swing.JLabel additionalJavacParamsJLabel;
private javax.swing.JTextField additionalJavacParamsJTextField;
+ private javax.swing.JCheckBox doDependCheckBox;
private javax.swing.JCheckBox jCheckBoxDebugInfo;
private javax.swing.JCheckBox jCheckBoxDeprecation;
// End of variables declaration//GEN-END:variables
Index: java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerJar.form
===================================================================
RCS file: /shared/data/ccvs/repository/java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerJar.form,v
retrieving revision 1.10
diff -u -r1.10 CustomizerJar.form
--- java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerJar.form 1 Apr 2005 12:02:19 -0000 1.10
+++ java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerJar.form 3 Oct 2007 00:40:37 -0000
@@ -1,15 +1,73 @@
-
Index: java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerJar.java
===================================================================
RCS file: /shared/data/ccvs/repository/java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerJar.java,v
retrieving revision 1.13
diff -u -r1.13 CustomizerJar.java
--- java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerJar.java 1 Oct 2007 14:22:57 -0000 1.13
+++ java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/CustomizerJar.java 3 Oct 2007 00:40:37 -0000
@@ -76,6 +76,9 @@
uiProperties.JAR_COMPRESS_MODEL.setMnemonic( jCheckBoxCommpress.getMnemonic() );
jCheckBoxCommpress.setModel( uiProperties.JAR_COMPRESS_MODEL );
+
+ uiProperties.DO_JAR_MODEL.setMnemonic(doJarCheckBox.getMnemonic());
+ doJarCheckBox.setModel(uiProperties.DO_JAR_MODEL);
}
public HelpCtx getHelpCtx() {
@@ -88,10 +91,10 @@
* WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor.
*/
- // //GEN-BEGIN:initComponents
+ // //GEN-BEGIN:initComponents
private void initComponents() {
- java.awt.GridBagConstraints gridBagConstraints;
+ doJarCheckBox = new javax.swing.JCheckBox();
jLabelDistDir = new javax.swing.JLabel();
jTextFieldDistDir = new javax.swing.JTextField();
jLabel2 = new javax.swing.JLabel();
@@ -99,69 +102,69 @@
jCheckBoxCommpress = new javax.swing.JCheckBox();
excludeMessage = new javax.swing.JLabel();
- setLayout(new java.awt.GridBagLayout());
+ org.openide.awt.Mnemonics.setLocalizedText(doJarCheckBox, org.openide.util.NbBundle.getMessage(CustomizerJar.class, "CustomizerJar.doJarCheckBox")); // NOI18N
jLabelDistDir.setLabelFor(jTextFieldDistDir);
- org.openide.awt.Mnemonics.setLocalizedText(jLabelDistDir, org.openide.util.NbBundle.getMessage(CustomizerJar.class, "LBL_CustomizeJar_DistDir_JTextField"));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 12);
- add(jLabelDistDir, gridBagConstraints);
+ org.openide.awt.Mnemonics.setLocalizedText(jLabelDistDir, org.openide.util.NbBundle.getMessage(CustomizerJar.class, "LBL_CustomizeJar_DistDir_JTextField")); // NOI18N
jTextFieldDistDir.setEditable(false);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.weightx = 1.0;
- gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 0);
- add(jTextFieldDistDir, gridBagConstraints);
- jTextFieldDistDir.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getBundle(CustomizerJar.class).getString("AD_jTextFieldDistDir"));
jLabel2.setLabelFor(jTextFieldExcludes);
- org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(CustomizerJar.class, "LBL_CustomizeJar_Excludes_JTextField"));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 12);
- add(jLabel2, gridBagConstraints);
-
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.weightx = 1.0;
- add(jTextFieldExcludes, gridBagConstraints);
- jTextFieldExcludes.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getBundle(CustomizerJar.class).getString("AD_jTextFieldExcludes"));
-
- org.openide.awt.Mnemonics.setLocalizedText(jCheckBoxCommpress, org.openide.util.NbBundle.getMessage(CustomizerJar.class, "LBL_CustomizeJar_Commpres_JCheckBox"));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 3;
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.gridheight = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.weighty = 1.0;
- add(jCheckBoxCommpress, gridBagConstraints);
- jCheckBoxCommpress.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getBundle(CustomizerJar.class).getString("AD_jCheckBoxCompress"));
+ org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(CustomizerJar.class, "LBL_CustomizeJar_Excludes_JTextField")); // NOI18N
+
+ org.openide.awt.Mnemonics.setLocalizedText(jCheckBoxCommpress, org.openide.util.NbBundle.getMessage(CustomizerJar.class, "LBL_CustomizeJar_Commpres_JCheckBox")); // NOI18N
excludeMessage.setLabelFor(jTextFieldExcludes);
- org.openide.awt.Mnemonics.setLocalizedText(excludeMessage, java.util.ResourceBundle.getBundle("org/netbeans/modules/java/j2seproject/ui/customizer/Bundle").getString("LBL_CustomizerJar_ExcludeMessage"));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 2;
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.insets = new java.awt.Insets(0, 0, 6, 0);
- add(excludeMessage, gridBagConstraints);
+ java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/modules/java/j2seproject/ui/customizer/Bundle"); // NOI18N
+ org.openide.awt.Mnemonics.setLocalizedText(excludeMessage, bundle.getString("LBL_CustomizerJar_ExcludeMessage")); // NOI18N
- }
- // //GEN-END:initComponents
+ org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+ this.setLayout(layout);
+ layout.setHorizontalGroup(
+ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(layout.createSequentialGroup()
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(layout.createSequentialGroup()
+ .add(jLabelDistDir)
+ .add(88, 88, 88)
+ .add(jTextFieldDistDir, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 270, Short.MAX_VALUE))
+ .add(doJarCheckBox)
+ .add(jCheckBoxCommpress)
+ .add(layout.createSequentialGroup()
+ .add(jLabel2)
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(excludeMessage)
+ .add(jTextFieldExcludes, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 270, Short.MAX_VALUE))))
+ .add(24, 24, 24))
+ );
+ layout.setVerticalGroup(
+ layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+ .add(layout.createSequentialGroup()
+ .add(doJarCheckBox)
+ .add(8, 8, 8)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(jLabelDistDir)
+ .add(jTextFieldDistDir, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+ .add(jLabel2)
+ .add(jTextFieldExcludes, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+ .add(excludeMessage)
+ .add(8, 8, 8)
+ .add(jCheckBoxCommpress)
+ .addContainerGap(178, Short.MAX_VALUE))
+ );
+
+ jTextFieldDistDir.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getBundle(CustomizerJar.class).getString("AD_jTextFieldDistDir")); // NOI18N
+ jTextFieldExcludes.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getBundle(CustomizerJar.class).getString("AD_jTextFieldExcludes")); // NOI18N
+ jCheckBoxCommpress.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getBundle(CustomizerJar.class).getString("AD_jCheckBoxCompress")); // NOI18N
+ }// //GEN-END:initComponents
// Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JCheckBox doJarCheckBox;
private javax.swing.JLabel excludeMessage;
private javax.swing.JCheckBox jCheckBoxCommpress;
private javax.swing.JLabel jLabel2;
Index: java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEProjectProperties.java
===================================================================
RCS file: /shared/data/ccvs/repository/java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEProjectProperties.java,v
retrieving revision 1.67
diff -u -r1.67 J2SEProjectProperties.java
--- java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEProjectProperties.java 1 Oct 2007 14:22:58 -0000 1.67
+++ java/j2seproject/src/org/netbeans/modules/java/j2seproject/ui/customizer/J2SEProjectProperties.java 3 Oct 2007 00:40:37 -0000
@@ -100,6 +100,8 @@
private static final Integer BOOLEAN_KIND_YN = new Integer( 1 );
private static final Integer BOOLEAN_KIND_ED = new Integer( 2 );
private Integer javacDebugBooleanKind;
+ private Integer doDependBooleanKind;
+ private Integer doJarBooleanKind;
private Integer javadocPreviewBooleanKind;
// Special properties of the project
@@ -136,6 +138,10 @@
public static final String INCLUDES = "includes"; // NOI18N
/** @since org.netbeans.modules.java.j2seproject/1 1.11 */
public static final String EXCLUDES = "excludes"; // NOI18N
+ /** @since org.netbeans.modules.java.j2seproject/1 1.12 */
+ public static final String DO_DEPEND = "do.depend"; // NOI18N
+ /** @since org.netbeans.modules.java.j2seproject/1 1.12 */
+ public static final String DO_JAR = "do.jar"; // NOI18N
public static final String JAVADOC_PRIVATE="javadoc.private"; // NOI18N
public static final String JAVADOC_NO_TREE="javadoc.notree"; // NOI18N
@@ -203,6 +209,7 @@
// CustomizerCompile
ButtonModel JAVAC_DEPRECATION_MODEL;
ButtonModel JAVAC_DEBUG_MODEL;
+ ButtonModel DO_DEPEND_MODEL;
ButtonModel NO_DEPENDENCIES_MODEL;
Document JAVAC_COMPILER_ARG_MODEL;
@@ -212,6 +219,7 @@
Document DIST_JAR_MODEL;
Document BUILD_CLASSES_EXCLUDES_MODEL;
ButtonModel JAR_COMPRESS_MODEL;
+ ButtonModel DO_JAR_MODEL;
// CustomizerJavadoc
ButtonModel JAVADOC_PRIVATE_MODEL;
@@ -311,7 +319,10 @@
//Should use the StoreGroup when the StoreGroup SPI will be extended to allow false default value in ToggleButtonModel
Integer[] kind = new Integer[1];
JAVAC_DEBUG_MODEL = createToggleButtonModel( evaluator, JAVAC_DEBUG, kind);
- javacDebugBooleanKind = kind[0];
+
+ DO_DEPEND_MODEL = createToggleButtonModel(evaluator, DO_DEPEND, kind);
+ doDependBooleanKind = kind[0];
+
NO_DEPENDENCIES_MODEL = projectGroup.createInverseToggleButtonModel( evaluator, NO_DEPENDENCIES );
JAVAC_COMPILER_ARG_MODEL = projectGroup.createStringDocument( evaluator, JAVAC_COMPILER_ARG );
@@ -320,6 +331,8 @@
DIST_JAR_MODEL = projectGroup.createStringDocument( evaluator, DIST_JAR );
BUILD_CLASSES_EXCLUDES_MODEL = projectGroup.createStringDocument( evaluator, BUILD_CLASSES_EXCLUDES );
JAR_COMPRESS_MODEL = projectGroup.createToggleButtonModel( evaluator, JAR_COMPRESS );
+ DO_JAR_MODEL = createToggleButtonModel(evaluator, DO_JAR, kind);
+ doJarBooleanKind = kind[0];
// CustomizerJavadoc
JAVADOC_PRIVATE_MODEL = projectGroup.createToggleButtonModel( evaluator, JAVADOC_PRIVATE );
@@ -448,6 +461,8 @@
//Should use the StoreGroup when the StoreGroup SPI will be extended to allow false default value in ToggleButtonModel
//Save javac.debug
privateProperties.setProperty(JAVAC_DEBUG, encodeBoolean (JAVAC_DEBUG_MODEL.isSelected(), javacDebugBooleanKind));
+ privateProperties.setProperty(DO_DEPEND, encodeBoolean(DO_DEPEND_MODEL.isSelected(), doDependBooleanKind));
+ privateProperties.setProperty(DO_JAR, encodeBoolean(DO_JAR_MODEL.isSelected(), doJarBooleanKind));
//Hotfix of the issue #70058
//Should use the StoreGroup when the StoreGroup SPI will be extended to allow false default value in ToggleButtonModel