Merge branch 'master' into BaseKitEDT2

andres620x · Jan 10, 2020 · 67208e6 · 67208e6
2 parents b2214cc + eb5595b
commit 67208e6
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -291,6 +291,7 @@ matrix:
             - ant $OPTS -f ide/xml.multiview test
             - ant $OPTS -f ide/xml.text test
             - ant $OPTS -f ide/xml.text.obsolete90 test
+            - travis_retry ant $OPTS -f ide/xml.wsdl.model test
             - ant $OPTS -f ide/xml.xam test
             - ant $OPTS -f ide/xml.xdm test
             - ant $OPTS -f ide/xsl test
@@ -313,11 +314,21 @@ matrix:
             - ant $OPTS clean
             - ant $OPTS build
           script:
+            #- ant $OPTS -f java/ant.debugger test
+            - ant $OPTS -f java/ant.freeform test
+            #- ant $OPTS -f java/ant.grammar test
+            - ant $OPTS -f java/api.debugger.jpda test
+            - ant $OPTS -f java/api.java test
+            - ant $OPTS -f java/api.maven test
+            #- ant $OPTS -f java/beans test
+            - ant $OPTS -f java/classfile test
+            - ant $OPTS -f java/dbschema test -Dtest.config=stable
+            - ant $OPTS -f java/hudson.maven test
             - ant $OPTS -f java/java.completion test
-            #- ant $OPTS -f java/spi.java.hints test
             - ant $OPTS -f java/java.hints.declarative test
-            - ant $OPTS -f java/spring.beans test
             - ant $OPTS -f java/java.source.base test
+            #- ant $OPTS -f java/spi.java.hints test
+            - ant $OPTS -f java/spring.beans test
 
         - name: Test Java modules with nb-javac on Java 11
           jdk: openjdk8

diff --git a/java/api.maven/nbproject/project.properties b/java/api.maven/nbproject/project.properties
@@ -16,7 +16,7 @@
 # under the License.
 
 is.autoload=true
-javac.source=1.6
+javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 javadoc.apichanges=${basedir}/apichanges.xml
 javadoc.arch=${basedir}/arch.xml

diff --git a/java/api.maven/src/org/netbeans/api/maven/archetype/Archetype.java b/java/api.maven/src/org/netbeans/api/maven/archetype/Archetype.java
@@ -30,7 +30,7 @@
  */
 public final class Archetype {
 
-    private org.netbeans.modules.maven.api.archetype.Archetype delegate;
+    private final org.netbeans.modules.maven.api.archetype.Archetype delegate;
 
     /**
      * C'tor 

diff --git a/java/dbschema/nbproject/project.properties b/java/dbschema/nbproject/project.properties
@@ -16,9 +16,7 @@
 # under the License.
 
 javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.7
+javac.source=1.8
 spec.version.base=1.48.0
 
-test.config.stableBTD.includes=**/*Test.class
-test.config.stableBTD.excludes=\
-    **/ColumnElementTest.class
+test.config.stable.includes=**/XMLGraphSerializerTest.class
diff --git a/java/hudson.maven/nbproject/project.properties b/java/hudson.maven/nbproject/project.properties
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 is.eager=true
-javac.source=1.6
+javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 
 test.config.stableBTD.includes=**/*Test.class
diff --git a/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/resources/build-impl.xsl b/java/java.j2semodule/src/org/netbeans/modules/java/j2semodule/resources/build-impl.xsl
@@ -1697,7 +1697,7 @@ is divided into following sections:
             </target>
 
             <target name="-do-jar-jar">
-                <xsl:attribute name="depends">init,compile,-pre-pre-jar,-pre-jar</xsl:attribute>
+                <xsl:attribute name="depends">init,compile,-pre-pre-jar,-pre-jar,-main-module-check-condition</xsl:attribute>
                 <xsl:attribute name="if">do.archive</xsl:attribute>
                 <xsl:attribute name="unless">do.mkdist</xsl:attribute>
                 <property name="build.modules.dir.resolved" location="${{build.modules.dir}}"/>
@@ -1716,7 +1716,17 @@ is divided into following sections:
                         <param name="module.dir" location="${{entry}}"/>
                     </antcall>
                 </j2semodularproject1:for-paths>
-
+                <condition property="named.module.internal">
+                    <and>
+                        <isset property="module.name"/>
+                        <length length="0" string="${{module.name}}" when="greater"/>
+                    </and>
+                </condition>
+                <condition property="unnamed.module.internal">
+                    <not>
+                        <isset property="named.module.internal"/>
+                    </not>
+                </condition>
                 <property location="${{build.classes.dir}}" name="build.classes.dir.resolved"/>
                 <property location="${{dist.jar}}" name="dist.jar.resolved"/>
                 <pathconvert property="run.classpath.with.dist.jar">
@@ -1727,7 +1737,7 @@ is divided into following sections:
                     <path path="${{run.modulepath}}"/>
                     <map from="${{build.classes.dir.resolved}}" to="${{dist.jar.resolved}}"/>
                 </pathconvert>
-                <condition property="jar.usage.message.module.path" value=" -modulepath ${{run.modulepath.with.dist.jar}}" else="">
+                <condition property="jar.usage.message.module.path" value=" --module-path ${{run.modulepath.with.dist.jar}}" else="">
                     <and>
                         <isset property="modules.supported.internal"/>
                         <length length="0" string="${{run.modulepath.with.dist.jar}}" when="greater"/>
@@ -1905,6 +1915,18 @@ is divided into following sections:
                     </condition>
                 </fail>
             </target>
+            <target name="-main-module-check-condition" depends="-main-module-set" if="main.class.available">
+                <fail message="Could not determine module of the main class and module.name is not set">
+                    <condition>
+                        <or>
+                            <not>
+                                <isset property="module.name"/>
+                            </not>
+                            <length string="${{module.name}}" when="equal" length="0"/>
+                        </or>
+                    </condition>
+                </fail>
+            </target>
             <target name="-do-not-recompile">
                 <property name="javac.includes.binary" value=""/> <!-- #116230 hack -->
             </target>

diff --git a/java/java.source/src/org/netbeans/modules/java/ui/FmtImports.form b/java/java.source/src/org/netbeans/modules/java/ui/FmtImports.form
@@ -69,8 +69,8 @@
                               <Component id="removeStarImportPackageButton" alignment="0" min="-2" pref="108" max="-2" attributes="1"/>
                           </Group>
                           <Group type="103" alignment="1" groupAlignment="0" max="-2" attributes="0">
-                              <Component id="starImportTresholdSpinner" alignment="1" max="32767" attributes="1"/>
-                              <Component id="startStaticImportTresholdSpinner" alignment="1" min="-2" pref="38" max="-2" attributes="1"/>
+                              <Component id="starImportTresholdSpinner" linkSize="1" alignment="1" pref="62" max="32767" attributes="1"/>
+                              <Component id="startStaticImportTresholdSpinner" linkSize="1" alignment="1" min="-2" pref="38" max="-2" attributes="1"/>
                           </Group>
                       </Group>
                   </Group>
@@ -116,12 +116,12 @@
               <Component id="importInnerClassesCheckBox" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="starImportTresholdSpinner" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="starImportTresholdSpinner" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="starImportTresholdCheckBox" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="startStaticImportTresholdSpinner" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="startStaticImportTresholdSpinner" linkSize="2" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="starStaticImportTresholdCheckBox" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>

diff --git a/java/java.source/src/org/netbeans/modules/java/ui/FmtImports.java b/java/java.source/src/org/netbeans/modules/java/ui/FmtImports.java
@@ -160,7 +160,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             }
         });
 
-        starImportTresholdSpinner.setModel(new javax.swing.SpinnerNumberModel(Integer.valueOf(0), Integer.valueOf(0), null, Integer.valueOf(1)));
+        starImportTresholdSpinner.setModel(new javax.swing.SpinnerNumberModel(0, 0, null, 1));
 
         org.openide.awt.Mnemonics.setLocalizedText(starStaticImportTresholdCheckBox, org.openide.util.NbBundle.getMessage(FmtImports.class, "LBL_imp_staticImportTreshold")); // NOI18N
         starStaticImportTresholdCheckBox.addActionListener(new java.awt.event.ActionListener() {
@@ -169,7 +169,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             }
         });
 
-        startStaticImportTresholdSpinner.setModel(new javax.swing.SpinnerNumberModel(Integer.valueOf(0), Integer.valueOf(0), null, Integer.valueOf(1)));
+        startStaticImportTresholdSpinner.setModel(new javax.swing.SpinnerNumberModel(0, 0, null, 1));
 
         starImportPackagesLabel.setLabelFor(starImportPackagesTable);
         org.openide.awt.Mnemonics.setLocalizedText(starImportPackagesLabel, org.openide.util.NbBundle.getMessage(FmtImports.class, "LBL_imp_starImportPackages")); // NOI18N
@@ -274,7 +274,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                                 .addComponent(addStarImportPackageButton, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                                 .addComponent(removeStarImportPackageButton, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 108, javax.swing.GroupLayout.PREFERRED_SIZE))
                             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
-                                .addComponent(starImportTresholdSpinner, javax.swing.GroupLayout.Alignment.TRAILING)
+                                .addComponent(starImportTresholdSpinner, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 62, Short.MAX_VALUE)
                                 .addComponent(startStaticImportTresholdSpinner, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 38, javax.swing.GroupLayout.PREFERRED_SIZE))))
                     .addGroup(layout.createSequentialGroup()
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -301,6 +301,9 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                         .addGap(0, 0, Short.MAX_VALUE)))
                 .addContainerGap())
         );
+
+        layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {starImportTresholdSpinner, startStaticImportTresholdSpinner});
+
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
@@ -351,6 +354,9 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                 .addComponent(separateGroupsCheckBox)
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
+
+        layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {starImportTresholdSpinner, startStaticImportTresholdSpinner});
+
     }// </editor-fold>//GEN-END:initComponents
 
     private void singleClassImportsRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_singleClassImportsRadioButtonActionPerformed
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ @@
      */
     public final class Archetype {
-        private org.netbeans.modules.maven.api.archetype.Archetype delegate;
+        private final org.netbeans.modules.maven.api.archetype.Archetype delegate;
         /**
          * C'tor
@@ Expand Down @@