Updating HTML/Java API to 1.7.3 version

.travis.yml

@@ -109,6 +109,7 @@ matrix:
             - ant $OPTS build
           script:
             - travis_retry hide-logs.sh ant $OPTS -f platform/api.htmlui test
+            - travis_retry hide-logs.sh ant $OPTS -f platform/htmlui test
             - hide-logs.sh ant $OPTS -f platform/api.intent test
             - hide-logs.sh ant $OPTS -f platform/api.io test
             - hide-logs.sh ant $OPTS -f platform/api.progress test

harness/nbjunit/src/org/netbeans/junit/MockServices.java

@@ -37,8 +37,6 @@
 import java.util.NoSuchElementException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
 
 /**
  * Lets you register mock implementations of global services.
@@ -161,7 +159,10 @@ public ServiceClassLoader(Class<?>[] services, ClassLoader l, boolean test) {
             for (Class<?> c : services) {
                 try {
                     if (test) {
-                        Assert.assertEquals(c, getParent().loadClass(c.getName()));
+                        final Class<?> real = getParent().loadClass(c.getName());
+                        if (!c.equals(real)) {
+                            throw new AssertionError("Service " + c + " isn't " + real);
+                        }
                     }
                     int mods = c.getModifiers();
                     if (!Modifier.isPublic(mods) || Modifier.isAbstract(mods)) {
@@ -173,7 +174,7 @@ public ServiceClassLoader(Class<?>[] services, ClassLoader l, boolean test) {
                 } catch (NoSuchMethodException x) {
                     throw (IllegalArgumentException) new IllegalArgumentException("Class " + c.getName() + " has no public no-arg constructor").initCause(x);
                 } catch (Exception x) {
-                    throw (AssertionFailedError) new AssertionFailedError(x.toString()).initCause(x);
+                    throw new AssertionError(x.toString(), x);
                 }
             }
             this.services = services;

nbbuild/cluster.properties

@@ -226,6 +226,7 @@ nb.cluster.platform=\
         editor.mimelookup,\
         editor.mimelookup.impl,\
         favorites,\
+        htmlui,\
         janitor,\
         javahelp,\
         junitlib,\
@@ -263,6 +264,7 @@ nb.cluster.platform=\
         o.apache.commons.logging,\
         o.n.core,\
         o.n.html.ko4j,\
+        o.n.html.presenters.spi,\
         o.n.html.xhr4j,\
         o.n.swing.laf.dark,\
         o.n.swing.laf.flatlaf,\

nbbuild/javadoctools/links.xml

@@ -117,7 +117,7 @@
 <link href="${javadoc.docs.org-netbeans-api-actions-support}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-api-actions-support"/>
 <link href="http://download.oracle.com/javase/6/docs/jdk/api/javac/tree" offline="true" packagelistloc="./tree-api"/>
 <link href="http://download.oracle.com/javase/6/docs/api" offline="true" packagelistloc="./javac-api"/>
-<link href="http://bits.netbeans.org/html+java/1.2.3" offline="true" packagelistloc="./html+java"/>
+<link href="http://bits.netbeans.org/html+java/1.7.1" offline="true" packagelistloc="./html+java"/>
 <link href="${javadoc.docs.org-netbeans-modules-uihandler}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-uihandler"/>
 <link href="${javadoc.docs.org-netbeans-lib-uihandler}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-lib-uihandler"/>
 <link href="${javadoc.docs.org-netbeans-modules-j2ee-metadata}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-j2ee-metadata"/>

platform/api.htmlui/apichanges.xml

@@ -25,6 +25,25 @@
     <apidef name="htmlui">HTML UI API</apidef>
 </apidefs>
 <changes>
+    <change id="HTMLViewerSpi">
+        <api name="htmlui"/>
+        <summary>OnSubmit &amp; Service Provider Interface</summary>
+        <version major="1" minor="23"/>
+        <date year="2021" month="12" day="10"/>
+        <author login="jtulach"/>
+        <compatibility semantic="compatible" binary="compatible" source="compatible"/>
+        <description>
+            <p>
+                Validate your dialogs with
+                <a href="@TOP@org/netbeans/api/htmlui/HTMLDialog.OnSubmit.html">OnSubmit</a>
+                interface. Write own
+                <a href="@TOP@org/netbeans/spi/htmlui/HTMLViewerSpi.html">HTMLViewerSpi</a>
+                to provide own "chrome" for displaying HTML UI components.
+            </p>
+        </description>
+        <class package="org.netbeans.api.htmlui" name="HTMLDialog"/>
+        <class package="org.netbeans.spi.htmlui" name="HTMLViewerSpi"/>
+    </change>
     <change id="NoFreeGeoIp">
         <api name="htmlui"/>
         <summary>FreeGeoIp service no longer works</summary>

platform/api.htmlui/manifest.mf

@@ -1,5 +1,4 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.api.htmlui
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/htmlui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.22
-
+OpenIDE-Module-Specification-Version: 1.23

platform/api.htmlui/nbproject/project.xml

@@ -37,12 +37,6 @@
                     <compile-dependency/>
                     <run-dependency/>
                 </dependency>
-                <dependency>
-                    <code-name-base>net.java.html.boot.fx</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency/>
-                </dependency>
                 <dependency>
                     <code-name-base>net.java.html.json</code-name-base>
                     <build-prerequisite/>
@@ -57,14 +51,6 @@
                     <code-name-base>org.netbeans.html.xhr4j</code-name-base>
                     <run-dependency/>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.libs.javafx</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>2.4</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.libs.asm</code-name-base>
                     <build-prerequisite/>
@@ -77,14 +63,6 @@
                         <specification-version>7.62</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.openide.dialogs</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>7.30</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.openide.filesystems</code-name-base>
                     <build-prerequisite/>
@@ -93,14 +71,6 @@
                         <specification-version>9.0</specification-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.openide.util.ui</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <specification-version>9.3</specification-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.openide.util</code-name-base>
                     <build-prerequisite/>
@@ -118,11 +88,11 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.windows</code-name-base>
+                    <code-name-base>org.openide.util.ui</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.71</specification-version>
+                        <specification-version>9.3</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
@@ -142,10 +112,15 @@
                         <code-name-base>org.netbeans.libs.testng</code-name-base>
                         <compile-dependency/>
                     </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+                        <compile-dependency/>
+                    </test-dependency>
                 </test-type>
             </test-dependencies>
             <public-packages>
                 <package>org.netbeans.api.htmlui</package>
+                <package>org.netbeans.spi.htmlui</package>
             </public-packages>
         </data>
     </configuration>