Merge pull request #300 from emilianbold/emi-beansbinding

Exclude the GPL beansbinding library
apache · Nov 28, 2017 · 8ceff22 · 8ceff22
2 parents c5bc1d1 + c270a9a
commit 8ceff22
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 132 deletions.
diff --git a/apisupport.ant/nbproject/project.xml b/apisupport.ant/nbproject/project.xml
@@ -34,15 +34,6 @@
                         <specification-version>3.6</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.jdesktop.beansbinding</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.22</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.api.annotations.common</code-name-base>
                     <build-prerequisite/>

diff --git a/form.kit/nbproject/project.xml b/form.kit/nbproject/project.xml
@@ -32,13 +32,6 @@
                         <specification-version>1.22</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.form.binding</code-name-base>
-                    <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>0.1</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.form.nb</code-name-base>
                     <run-dependency>

diff --git a/java.examples/build.xml b/java.examples/build.xml
@@ -23,26 +23,11 @@
 
     <import file="../nbbuild/templates/projectized.xml"/>
 
-    <target name="clean" depends="client-editor-clean,projectized-common.clean"/>
-
-    <target name="client-editor-compile">
-        <path id="beans-binding-classpath">
-            <fileset dir="../o.jdesktop.beansbinding/external">
-                <include name="**/*.jar"/>
-            </fileset>
-        </path>
-        <ant dir="ClientEditor" target="compile" inheritAll="false" >
-            <property name="libs.beans-binding.classpath" refid="beans-binding-classpath"/>
-        </ant>
-    </target>
-
-    <target name="client-editor-clean">
-        <ant dir="ClientEditor" target="clean" inheritAll="false"/>
-    </target>
+    <target name="clean" depends="projectized-common.clean"/>
 
     <target name="jar" depends="zip-examples,projectized-common.jar"/>
 
-    <target name="zip-examples" depends="init,client-editor-compile">
+    <target name="zip-examples" depends="init">
         <property name="examples" location="${build.classes.dir}/org/netbeans/modules/java/examples/resources"/>
         <mkdir dir="${examples}"/>
         <zip basedir="anagrams" destfile="${examples}/anagrams.zip">
@@ -55,10 +40,6 @@
             <exclude name="dist/"/>
             <exclude name="nbproject/private/"/>
         </zip>
-        <zip basedir="ClientEditor" destfile="${examples}/ClientEditor.zip">
-            <exclude name="dist/"/>
-            <exclude name="nbproject/private/"/>
-        </zip>
     </target>    
 
 </project>
diff --git a/java.examples/nbproject/project.xml b/java.examples/nbproject/project.xml
@@ -25,15 +25,6 @@
         <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
             <code-name-base>org.netbeans.modules.java.examples</code-name-base>
             <module-dependencies>
-                <dependency>
-                    <code-name-base>org.jdesktop.beansbinding</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.java.j2seproject</code-name-base>
                     <run-dependency>

diff --git a/java.examples/src/org/netbeans/modules/java/examples/Bundle.properties b/java.examples/src/org/netbeans/modules/java/examples/Bundle.properties
@@ -27,7 +27,6 @@ OpenIDE-Module-Long-Description=This module provides Java SE samples available t
 Templates/Project/Samples/Standard=Java
 Templates/Project/Samples/Standard/anagrams.zip=Anagram Game
 Templates/Project/Samples/Standard/GUIFormExamples.zip=GUI Form Examples
-Templates/Project/Samples/Standard/ClientEditor.zip=Client Editor
 
 # A11Y Panels
 ACS_NWP1_NamePanel_A11YDesc=Project Name and Location Panel

diff --git a/....examples/src/org/netbeans/modules/java/examples/resources/descriptions/ClientEditor.html b/....examples/src/org/netbeans/modules/java/examples/resources/descriptions/ClientEditor.html
diff --git a/java.examples/src/org/netbeans/modules/java/examples/resources/mf-layer.xml b/java.examples/src/org/netbeans/modules/java/examples/resources/mf-layer.xml
@@ -46,16 +46,6 @@
                       <attr name="prjType" stringvalue="j2se"/>
                       <attr name="position" intvalue="200"/>
                     </file>
-                    <file name="ClientEditor.zip" url="ClientEditor.zip">
-                      <attr name="template" boolvalue="true"/>
-                      <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/java/examples/resources/descriptions/ClientEditor.html"/>
-                      <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.java.examples.Bundle"/>
-                      <attr name="SystemFileSystem.icon" urlvalue="nbresloc:/org/netbeans/modules/java/examples/resources/j2seProject.gif"/>
-                      <attr name="instantiatingIterator" newvalue="org.netbeans.modules.java.examples.J2SESampleProjectIterator"/>
-                      <attr name="prjType" stringvalue="j2se"/>
-                      <attr name="position" intvalue="500"/>
-                      <attr name="defaultFileToOpen" stringvalue="src/clienteditor/ClientEditor.java"/>
-                    </file>
                 </folder>
             </folder>
         </folder>

diff --git a/maven/nbproject/project.xml b/maven/nbproject/project.xml
@@ -29,15 +29,6 @@
                     <code-name-base>org.apache.commons.codec</code-name-base>
                     <run-dependency/>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.jdesktop.beansbinding</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.22</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.api.annotations.common</code-name-base>
                     <build-prerequisite/>

diff --git a/nashorn.execution/nbproject/project.xml b/nashorn.execution/nbproject/project.xml
@@ -25,15 +25,6 @@
         <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
             <code-name-base>org.netbeans.modules.nashorn.execution</code-name-base>
             <module-dependencies>
-                <dependency>
-                    <code-name-base>org.jdesktop.beansbinding</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.23</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.api.java</code-name-base>
                     <build-prerequisite/>

diff --git a/....execution/src/org/netbeans/modules/nashorn/execution/options/JavaScriptNashornPanel.form b/....execution/src/org/netbeans/modules/nashorn/execution/options/JavaScriptNashornPanel.form
@@ -51,13 +51,13 @@
     </Component>
     <Component class="javax.swing.JLabel" name="platformsLabel">
       <Properties>
+        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
+          <ComponentRef name="platformsComboBox"/>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/netbeans/modules/nashorn/execution/options/Bundle.properties" key="JavaScriptNashornPanel.platformsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
-      <BindingProperties>
-        <BindingProperty name="labelFor" source="platformsComboBox" target="platformsLabel" targetPath="labelFor" updateStrategy="0" immediately="false"/>
-      </BindingProperties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
           <GridBagConstraints gridX="0" gridY="1" gridWidth="2" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="17" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
@@ -76,13 +76,13 @@
     </Component>
     <Component class="javax.swing.JLabel" name="engineOptionsLabel">
       <Properties>
+        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
+          <ComponentRef name="engineOptionsTextField"/>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/netbeans/modules/nashorn/execution/options/Bundle.properties" key="JavaScriptNashornPanel.engineOptionsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
-      <BindingProperties>
-        <BindingProperty name="labelFor" source="engineOptionsTextField" target="engineOptionsLabel" targetPath="labelFor" updateStrategy="0" immediately="false"/>
-      </BindingProperties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
           <GridBagConstraints gridX="0" gridY="5" gridWidth="3" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="14" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
@@ -121,13 +121,13 @@
     </Component>
     <Component class="javax.swing.JLabel" name="argumentsLabel">
       <Properties>
+        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
+          <ComponentRef name="argumentsTextField"/>
+        </Property>
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/netbeans/modules/nashorn/execution/options/Bundle.properties" key="JavaScriptNashornPanel.argumentsLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
       </Properties>
-      <BindingProperties>
-        <BindingProperty name="labelFor" source="argumentsTextField" target="argumentsLabel" targetPath="labelFor" updateStrategy="0" immediately="false"/>
-      </BindingProperties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
           <GridBagConstraints gridX="0" gridY="7" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="8" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>

diff --git a/....execution/src/org/netbeans/modules/nashorn/execution/options/JavaScriptNashornPanel.java b/....execution/src/org/netbeans/modules/nashorn/execution/options/JavaScriptNashornPanel.java
@@ -57,7 +57,6 @@ public JavaScriptNashornPanel(JavaScriptNashornOptionsPanelController optionsCon
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
         java.awt.GridBagConstraints gridBagConstraints;
-        bindingGroup = new org.jdesktop.beansbinding.BindingGroup();
 
         infoLabel = new javax.swing.JLabel();
         platformsLabel = new javax.swing.JLabel();
@@ -82,11 +81,8 @@ private void initComponents() {
         gridBagConstraints.weightx = 1.0;
         add(infoLabel, gridBagConstraints);
 
+        platformsLabel.setLabelFor(platformsComboBox);
         org.openide.awt.Mnemonics.setLocalizedText(platformsLabel, org.openide.util.NbBundle.getMessage(JavaScriptNashornPanel.class, "JavaScriptNashornPanel.platformsLabel.text")); // NOI18N
-
-        org.jdesktop.beansbinding.Binding binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE, platformsComboBox, org.jdesktop.beansbinding.ObjectProperty.create(), platformsLabel, org.jdesktop.beansbinding.BeanProperty.create("labelFor"));
-        bindingGroup.addBinding(binding);
-
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 1;
@@ -112,11 +108,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         gridBagConstraints.insets = new java.awt.Insets(12, 24, 0, 0);
         add(platformsComboBox, gridBagConstraints);
 
+        engineOptionsLabel.setLabelFor(engineOptionsTextField);
         org.openide.awt.Mnemonics.setLocalizedText(engineOptionsLabel, org.openide.util.NbBundle.getMessage(JavaScriptNashornPanel.class, "JavaScriptNashornPanel.engineOptionsLabel.text")); // NOI18N
-
-        binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE, engineOptionsTextField, org.jdesktop.beansbinding.ObjectProperty.create(), engineOptionsLabel, org.jdesktop.beansbinding.BeanProperty.create("labelFor"));
-        bindingGroup.addBinding(binding);
-
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 5;
@@ -152,11 +145,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         gridBagConstraints.insets = new java.awt.Insets(6, 24, 0, 0);
         add(platformHintLabel, gridBagConstraints);
 
+        argumentsLabel.setLabelFor(argumentsTextField);
         org.openide.awt.Mnemonics.setLocalizedText(argumentsLabel, org.openide.util.NbBundle.getMessage(JavaScriptNashornPanel.class, "JavaScriptNashornPanel.argumentsLabel.text")); // NOI18N
-
-        binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ_WRITE, argumentsTextField, org.jdesktop.beansbinding.ObjectProperty.create(), argumentsLabel, org.jdesktop.beansbinding.BeanProperty.create("labelFor"));
-        bindingGroup.addBinding(binding);
-
         gridBagConstraints = new java.awt.GridBagConstraints();
         gridBagConstraints.gridx = 0;
         gridBagConstraints.gridy = 7;
@@ -201,8 +191,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         gridBagConstraints.weightx = 0.1;
         gridBagConstraints.weighty = 0.1;
         add(fillPanel, gridBagConstraints);
-
-        bindingGroup.bind();
     }// </editor-fold>//GEN-END:initComponents
 
     private void platformManageButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_platformManageButtonActionPerformed
@@ -225,7 +213,6 @@ private void platformsComboBoxActionPerformed(java.awt.event.ActionEvent evt) {/
     private javax.swing.JButton platformManageButton;
     private javax.swing.JComboBox platformsComboBox;
     private javax.swing.JLabel platformsLabel;
-    private org.jdesktop.beansbinding.BindingGroup bindingGroup;
     // End of variables declaration//GEN-END:variables
 
     private JavaPlatform getSelectedPlatform() {

diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
@@ -568,7 +568,6 @@ nb.cluster.java=\
         debugger.jpda.visual,\
         findbugs.installer,\
         form,\
-        form.binding,\
         form.j2ee,\
         form.kit,\
         form.nb,\
@@ -670,7 +669,6 @@ nb.cluster.java=\
         maven.search,\
         maven.spring,\
         nashorn.execution,\
-        o.jdesktop.beansbinding,\
         performance,\
         performance.java,\
         projectimport.eclipse.core,\