Skip to content

Commit 9161609

Browse files
author
Jaroslav Tulach
authored
Merge pull request #3357 from JaroslavTulach/jtulach/HtmlJavaApi173
Updating HTML/Java API to 1.7.3 version
2 parents 40383a9 + 40f460e commit 9161609

95 files changed

Lines changed: 2641 additions & 654 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ matrix:
109109
- ant $OPTS build
110110
script:
111111
- travis_retry hide-logs.sh ant $OPTS -f platform/api.htmlui test
112+
- travis_retry hide-logs.sh ant $OPTS -f platform/htmlui test
112113
- hide-logs.sh ant $OPTS -f platform/api.intent test
113114
- hide-logs.sh ant $OPTS -f platform/api.io test
114115
- hide-logs.sh ant $OPTS -f platform/api.progress test

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737
import java.util.NoSuchElementException;
3838
import java.util.logging.Level;
3939
import java.util.logging.Logger;
40-
import junit.framework.Assert;
41-
import junit.framework.AssertionFailedError;
4240

4341
/**
4442
* Lets you register mock implementations of global services.
@@ -161,7 +159,10 @@ public ServiceClassLoader(Class<?>[] services, ClassLoader l, boolean test) {
161159
for (Class<?> c : services) {
162160
try {
163161
if (test) {
164-
Assert.assertEquals(c, getParent().loadClass(c.getName()));
162+
final Class<?> real = getParent().loadClass(c.getName());
163+
if (!c.equals(real)) {
164+
throw new AssertionError("Service " + c + " isn't " + real);
165+
}
165166
}
166167
int mods = c.getModifiers();
167168
if (!Modifier.isPublic(mods) || Modifier.isAbstract(mods)) {
@@ -173,7 +174,7 @@ public ServiceClassLoader(Class<?>[] services, ClassLoader l, boolean test) {
173174
} catch (NoSuchMethodException x) {
174175
throw (IllegalArgumentException) new IllegalArgumentException("Class " + c.getName() + " has no public no-arg constructor").initCause(x);
175176
} catch (Exception x) {
176-
throw (AssertionFailedError) new AssertionFailedError(x.toString()).initCause(x);
177+
throw new AssertionError(x.toString(), x);
177178
}
178179
}
179180
this.services = services;

‎nbbuild/cluster.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ nb.cluster.platform=\
226226
editor.mimelookup,\
227227
editor.mimelookup.impl,\
228228
favorites,\
229+
htmlui,\
229230
janitor,\
230231
javahelp,\
231232
junitlib,\
@@ -263,6 +264,7 @@ nb.cluster.platform=\
263264
o.apache.commons.logging,\
264265
o.n.core,\
265266
o.n.html.ko4j,\
267+
o.n.html.presenters.spi,\
266268
o.n.html.xhr4j,\
267269
o.n.swing.laf.dark,\
268270
o.n.swing.laf.flatlaf,\

‎nbbuild/javadoctools/links.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
<link href="${javadoc.docs.org-netbeans-api-actions-support}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-api-actions-support"/>
118118
<link href="http://download.oracle.com/javase/6/docs/jdk/api/javac/tree" offline="true" packagelistloc="./tree-api"/>
119119
<link href="http://download.oracle.com/javase/6/docs/api" offline="true" packagelistloc="./javac-api"/>
120-
<link href="http://bits.netbeans.org/html+java/1.2.3" offline="true" packagelistloc="./html+java"/>
120+
<link href="http://bits.netbeans.org/html+java/1.7.1" offline="true" packagelistloc="./html+java"/>
121121
<link href="${javadoc.docs.org-netbeans-modules-uihandler}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-uihandler"/>
122122
<link href="${javadoc.docs.org-netbeans-lib-uihandler}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-lib-uihandler"/>
123123
<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‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,25 @@
2525
<apidef name="htmlui">HTML UI API</apidef>
2626
</apidefs>
2727
<changes>
28+
<change id="HTMLViewerSpi">
29+
<api name="htmlui"/>
30+
<summary>OnSubmit &amp; Service Provider Interface</summary>
31+
<version major="1" minor="23"/>
32+
<date year="2021" month="12" day="10"/>
33+
<author login="jtulach"/>
34+
<compatibility semantic="compatible" binary="compatible" source="compatible"/>
35+
<description>
36+
<p>
37+
Validate your dialogs with
38+
<a href="@TOP@org/netbeans/api/htmlui/HTMLDialog.OnSubmit.html">OnSubmit</a>
39+
interface. Write own
40+
<a href="@TOP@org/netbeans/spi/htmlui/HTMLViewerSpi.html">HTMLViewerSpi</a>
41+
to provide own "chrome" for displaying HTML UI components.
42+
</p>
43+
</description>
44+
<class package="org.netbeans.api.htmlui" name="HTMLDialog"/>
45+
<class package="org.netbeans.spi.htmlui" name="HTMLViewerSpi"/>
46+
</change>
2847
<change id="NoFreeGeoIp">
2948
<api name="htmlui"/>
3049
<summary>FreeGeoIp service no longer works</summary>

‎platform/api.htmlui/manifest.mf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
Manifest-Version: 1.0
22
OpenIDE-Module: org.netbeans.api.htmlui
33
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/htmlui/Bundle.properties
4-
OpenIDE-Module-Specification-Version: 1.22
5-
4+
OpenIDE-Module-Specification-Version: 1.23

‎platform/api.htmlui/nbproject/project.xml‎

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@
3737
<compile-dependency/>
3838
<run-dependency/>
3939
</dependency>
40-
<dependency>
41-
<code-name-base>net.java.html.boot.fx</code-name-base>
42-
<build-prerequisite/>
43-
<compile-dependency/>
44-
<run-dependency/>
45-
</dependency>
4640
<dependency>
4741
<code-name-base>net.java.html.json</code-name-base>
4842
<build-prerequisite/>
@@ -57,14 +51,6 @@
5751
<code-name-base>org.netbeans.html.xhr4j</code-name-base>
5852
<run-dependency/>
5953
</dependency>
60-
<dependency>
61-
<code-name-base>org.netbeans.libs.javafx</code-name-base>
62-
<build-prerequisite/>
63-
<compile-dependency/>
64-
<run-dependency>
65-
<specification-version>2.4</specification-version>
66-
</run-dependency>
67-
</dependency>
6854
<dependency>
6955
<code-name-base>org.netbeans.libs.asm</code-name-base>
7056
<build-prerequisite/>
@@ -77,14 +63,6 @@
7763
<specification-version>7.62</specification-version>
7864
</run-dependency>
7965
</dependency>
80-
<dependency>
81-
<code-name-base>org.openide.dialogs</code-name-base>
82-
<build-prerequisite/>
83-
<compile-dependency/>
84-
<run-dependency>
85-
<specification-version>7.30</specification-version>
86-
</run-dependency>
87-
</dependency>
8866
<dependency>
8967
<code-name-base>org.openide.filesystems</code-name-base>
9068
<build-prerequisite/>
@@ -93,14 +71,6 @@
9371
<specification-version>9.0</specification-version>
9472
</run-dependency>
9573
</dependency>
96-
<dependency>
97-
<code-name-base>org.openide.util.ui</code-name-base>
98-
<build-prerequisite/>
99-
<compile-dependency/>
100-
<run-dependency>
101-
<specification-version>9.3</specification-version>
102-
</run-dependency>
103-
</dependency>
10474
<dependency>
10575
<code-name-base>org.openide.util</code-name-base>
10676
<build-prerequisite/>
@@ -118,11 +88,11 @@
11888
</run-dependency>
11989
</dependency>
12090
<dependency>
121-
<code-name-base>org.openide.windows</code-name-base>
91+
<code-name-base>org.openide.util.ui</code-name-base>
12292
<build-prerequisite/>
12393
<compile-dependency/>
12494
<run-dependency>
125-
<specification-version>6.71</specification-version>
95+
<specification-version>9.3</specification-version>
12696
</run-dependency>
12797
</dependency>
12898
</module-dependencies>
@@ -142,10 +112,15 @@
142112
<code-name-base>org.netbeans.libs.testng</code-name-base>
143113
<compile-dependency/>
144114
</test-dependency>
115+
<test-dependency>
116+
<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
117+
<compile-dependency/>
118+
</test-dependency>
145119
</test-type>
146120
</test-dependencies>
147121
<public-packages>
148122
<package>org.netbeans.api.htmlui</package>
123+
<package>org.netbeans.spi.htmlui</package>
149124
</public-packages>
150125
</data>
151126
</configuration>

0 commit comments

Comments
 (0)