You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2020/10/25 20:36:36 UTC

[netbeans] branch delivery updated: [NETBEANS-4916] Removed Non-Inplemented COS Settings from Gradle Project UI

This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/delivery by this push:
     new 7eb08c0  [NETBEANS-4916] Removed Non-Inplemented COS Settings from Gradle Project UI
7eb08c0 is described below

commit 7eb08c0e4603e2dff88ecf1facf5d1fa00c5026a
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Sat Oct 24 23:53:38 2020 -0700

    [NETBEANS-4916] Removed Non-Inplemented COS Settings from Gradle Project UI
---
 .../gradle/java/customizer/Bundle.properties       |  2 --
 .../java/customizer/CompileOptionsPanel.form       | 38 +++-------------------
 .../java/customizer/CompileOptionsPanel.java       | 32 +++---------------
 3 files changed, 10 insertions(+), 62 deletions(-)

diff --git a/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/Bundle.properties b/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/Bundle.properties
index a3172dc..bec58d8 100644
--- a/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/Bundle.properties
+++ b/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/Bundle.properties
@@ -15,8 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-CompileOptionsPanel.lbCompileOnSave.text=<html>NetBeans will trigger Gradle to compile the changed sourcesets.<br/>\nThis can make further build execution for run and debug a bit faster.<br/>\n
-CompileOptionsPanel.cbCompileOnSave.text=&Compile on Save
 CompileOptionsPanel.jLabel2.text=<html>Allow NetBeans to make on-the-fly changes to the Gradle build process. This way a few useful IDE actions/options can be enabled without actually changing the build files.
 CompileOptionsPanel.cbAugmentedBuild.text=&Augmented Build Execution
 CompileOptionsPanel.btManagePlatforms.text=Manage Platforms...
diff --git a/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.form b/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.form
index 97198c9..88cf620 100644
--- a/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.form
+++ b/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.form
@@ -42,22 +42,14 @@
                   <Group type="102" alignment="0" attributes="0">
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Group type="102" attributes="0">
-                              <Component id="cbCompileOnSave" min="-2" max="-2" attributes="0"/>
-                              <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
-                          </Group>
                           <Group type="102" alignment="0" attributes="0">
                               <Component id="lbPlatform" min="-2" max="-2" attributes="0"/>
                               <EmptySpace max="-2" attributes="0"/>
-                              <Component id="cbPlatform" max="32767" attributes="0"/>
+                              <Component id="cbPlatform" pref="222" max="32767" attributes="0"/>
                               <EmptySpace type="unrelated" max="-2" attributes="0"/>
                               <Component id="btManagePlatforms" min="-2" max="-2" attributes="0"/>
                           </Group>
                           <Component id="cbAugmentedBuild" alignment="0" max="32767" attributes="0"/>
-                          <Group type="102" attributes="0">
-                              <EmptySpace min="19" pref="19" max="-2" attributes="0"/>
-                              <Component id="lbCompileOnSave" pref="489" max="32767" attributes="0"/>
-                          </Group>
                       </Group>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
@@ -91,40 +83,20 @@
                   <Component id="cbPlatform" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="btManagePlatforms" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
-              <Component id="cbCompileOnSave" min="-2" max="-2" attributes="0"/>
-              <EmptySpace min="-2" max="-2" attributes="0"/>
-              <Component id="lbCompileOnSave" min="-2" pref="60" max="-2" attributes="0"/>
-              <EmptySpace min="-2" max="-2" attributes="0"/>
+              <EmptySpace type="separate" max="-2" attributes="0"/>
               <Component id="cbAugmentedBuild" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
-              <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
-              <EmptySpace type="separate" max="-2" attributes="0"/>
+              <Component id="jLabel2" min="-2" pref="71" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Component id="cbIncludeOpenProjects" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="lbIncludeOpenProjects" min="-2" pref="56" max="-2" attributes="0"/>
-              <EmptySpace pref="67" max="32767" attributes="0"/>
+              <EmptySpace pref="156" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
   </Layout>
   <SubComponents>
-    <Component class="javax.swing.JCheckBox" name="cbCompileOnSave">
-      <Properties>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/netbeans/modules/gradle/java/customizer/Bundle.properties" key="CompileOptionsPanel.cbCompileOnSave.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-        <Property name="enabled" type="boolean" value="false"/>
-      </Properties>
-    </Component>
-    <Component class="javax.swing.JLabel" name="lbCompileOnSave">
-      <Properties>
-        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString bundle="org/netbeans/modules/gradle/java/customizer/Bundle.properties" key="CompileOptionsPanel.lbCompileOnSave.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
-        </Property>
-        <Property name="verticalAlignment" type="int" value="1"/>
-      </Properties>
-    </Component>
     <Component class="javax.swing.JCheckBox" name="cbAugmentedBuild">
       <Properties>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
diff --git a/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.java
index 1bd00fe..60cfa87 100644
--- a/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.java
+++ b/java/gradle.java/src/org/netbeans/modules/gradle/java/customizer/CompileOptionsPanel.java
@@ -78,7 +78,6 @@ public class CompileOptionsPanel extends javax.swing.JPanel {
     private CompileOptionsPanel(Project project) {
         this.project = project;
         initComponents();
-        setupCheckBox(cbCompileOnSave, RunUtils.PROP_COMPILE_ON_SAVE, false);
         setupCheckBox(cbAugmentedBuild, RunUtils.PROP_AUGMENTED_BUILD, true);
         setupCheckBox(cbIncludeOpenProjects, RunUtils.PROP_INCLUDE_OPEN_PROJECTS, false);
         setupPlatform();
@@ -150,7 +149,6 @@ public class CompileOptionsPanel extends javax.swing.JPanel {
     }
     
     private void save() {
-        saveCheckBox(cbCompileOnSave, RunUtils.PROP_COMPILE_ON_SAVE);
         saveCheckBox(cbAugmentedBuild, RunUtils.PROP_AUGMENTED_BUILD);
         saveCheckBox(cbIncludeOpenProjects, RunUtils.PROP_INCLUDE_OPEN_PROJECTS);
         savePlatform();
@@ -168,8 +166,6 @@ public class CompileOptionsPanel extends javax.swing.JPanel {
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
-        cbCompileOnSave = new javax.swing.JCheckBox();
-        lbCompileOnSave = new javax.swing.JLabel();
         cbAugmentedBuild = new javax.swing.JCheckBox();
         lbPlatform = new javax.swing.JLabel();
         cbPlatform = new javax.swing.JComboBox<>();
@@ -178,12 +174,6 @@ public class CompileOptionsPanel extends javax.swing.JPanel {
         cbIncludeOpenProjects = new javax.swing.JCheckBox();
         lbIncludeOpenProjects = new javax.swing.JLabel();
 
-        org.openide.awt.Mnemonics.setLocalizedText(cbCompileOnSave, org.openide.util.NbBundle.getMessage(CompileOptionsPanel.class, "CompileOptionsPanel.cbCompileOnSave.text")); // NOI18N
-        cbCompileOnSave.setEnabled(false);
-
-        org.openide.awt.Mnemonics.setLocalizedText(lbCompileOnSave, org.openide.util.NbBundle.getMessage(CompileOptionsPanel.class, "CompileOptionsPanel.lbCompileOnSave.text")); // NOI18N
-        lbCompileOnSave.setVerticalAlignment(javax.swing.SwingConstants.TOP);
-
         org.openide.awt.Mnemonics.setLocalizedText(cbAugmentedBuild, org.openide.util.NbBundle.getMessage(CompileOptionsPanel.class, "CompileOptionsPanel.cbAugmentedBuild.text")); // NOI18N
 
         lbPlatform.setLabelFor(cbPlatform);
@@ -214,18 +204,12 @@ public class CompileOptionsPanel extends javax.swing.JPanel {
                         .addContainerGap()
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addGroup(layout.createSequentialGroup()
-                                .addComponent(cbCompileOnSave)
-                                .addGap(0, 0, Short.MAX_VALUE))
-                            .addGroup(layout.createSequentialGroup()
                                 .addComponent(lbPlatform)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(cbPlatform, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                                .addComponent(cbPlatform, 0, 222, Short.MAX_VALUE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                                 .addComponent(btManagePlatforms))
-                            .addComponent(cbAugmentedBuild, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                            .addGroup(layout.createSequentialGroup()
-                                .addGap(19, 19, 19)
-                                .addComponent(lbCompileOnSave, javax.swing.GroupLayout.DEFAULT_SIZE, 489, Short.MAX_VALUE))))
+                            .addComponent(cbAugmentedBuild, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
                     .addGroup(layout.createSequentialGroup()
                         .addGap(25, 25, 25)
                         .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))
@@ -249,18 +233,14 @@ public class CompileOptionsPanel extends javax.swing.JPanel {
                     .addComponent(cbPlatform, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(btManagePlatforms))
                 .addGap(18, 18, 18)
-                .addComponent(cbCompileOnSave)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(lbCompileOnSave, javax.swing.GroupLayout.PREFERRED_SIZE, 60, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(cbAugmentedBuild)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addGap(18, 18, 18)
+                .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(cbIncludeOpenProjects)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(lbIncludeOpenProjects, javax.swing.GroupLayout.PREFERRED_SIZE, 56, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(67, Short.MAX_VALUE))
+                .addContainerGap(156, Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
@@ -301,11 +281,9 @@ public class CompileOptionsPanel extends javax.swing.JPanel {
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton btManagePlatforms;
     private javax.swing.JCheckBox cbAugmentedBuild;
-    private javax.swing.JCheckBox cbCompileOnSave;
     private javax.swing.JCheckBox cbIncludeOpenProjects;
     private javax.swing.JComboBox<JavaPlatform> cbPlatform;
     private javax.swing.JLabel jLabel2;
-    private javax.swing.JLabel lbCompileOnSave;
     private javax.swing.JLabel lbIncludeOpenProjects;
     private javax.swing.JLabel lbPlatform;
     // End of variables declaration//GEN-END:variables


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists