This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 40383a9 Merge pull request #3350 from ppisl/NETBEANS-6253
new c182fc3 Make MockServices independent of JUnit API
new 5eecb86 Splitting the API and implementation of HTML/Java UI module
new bd40d85 Updating to HTML/Java API 1.7.3
new 189fbc0 Let the api.htmlui module compute content of the page's Lookup
new e146808 Improving the documentation and licences
new 1b111c5 Using proper name in the (ignored) manifest
new 811ba9e Removing unneeded dependencies in the api.htmlui module
new 40f460e Fallback viewer to handle missing WebView gracefully
new 9161609 Merge pull request #3357 from
JaroslavTulach/jtulach/HtmlJavaApi173
The 6270 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 1 +
.../src/org/netbeans/junit/MockServices.java | 9 +-
nbbuild/cluster.properties | 2 +
nbbuild/javadoctools/links.xml | 2 +-
platform/api.htmlui/apichanges.xml | 19 ++
platform/api.htmlui/manifest.mf | 3 +-
platform/api.htmlui/nbproject/project.xml | 39 +--
.../src/org/netbeans/api/htmlui/HTMLDialog.java | 184 +++++++------
.../netbeans/api/htmlui/OpenHTMLRegistration.java | 36 +--
.../src/org/netbeans/modules/htmlui/Buttons.java | 144 ++++++++---
.../netbeans/modules/htmlui/ContextAccessor.java | 57 ++++
.../netbeans/modules/htmlui/FallbackViewer.java | 102 ++++++++
.../netbeans/modules/htmlui/HTMLDialogBase.java | 114 ++++++++
.../netbeans/modules/htmlui/HTMLDialogImpl.java | 152 -----------
.../modules/htmlui/HTMLDialogProcessor.java | 99 +++++--
.../org/netbeans/modules/htmlui/HtmlComponent.java | 156 -----------
.../src/org/netbeans/modules/htmlui/HtmlPair.java | 74 ++++++
.../src/org/netbeans/modules/htmlui/Pages.java | 47 ++--
.../org/netbeans/modules/htmlui/PagesLookup.java | 121 +++++++++
.../src/org/netbeans/modules/htmlui/fallback.png | Bin
.../src/org/netbeans/spi/htmlui/HTMLViewerSpi.java | 288 +++++++++++++++++++++
.../src/org/netbeans/spi/htmlui/package.html} | 26 +-
.../src/org/netbeans/api/htmlui/AskQuestion.java | 49 ++++
.../unit/src/org/netbeans/api/htmlui/Compile.java | 2 +-
.../unit/src/org/netbeans/api/htmlui/UICntrl.java | 59 +++++
.../unit/src/org/netbeans/api/htmlui/dialog.html} | 32 +--
.../test/unit/src/org/netbeans/api/htmlui/ui.html} | 29 +--
.../src/org/netbeans/modules/htmlui/ATech.java | 2 +-
.../modules/htmlui/DialogOnSubmitTest.java | 69 +++++
.../netbeans/modules/htmlui/MockHtmlViewer.java | 120 +++++++++
.../modules/htmlui/OpenHTMLRegistrationTest.java | 2 +-
.../nbproject/project.xml => htmlui/build.xml} | 16 +-
platform/htmlui/manifest.mf | 6 +
.../htmlui}/nbproject/project.properties | 0
.../{api.htmlui => htmlui}/nbproject/project.xml | 66 ++---
.../modules/htmlui/impl/Bundle.properties} | 6 +-
.../modules/htmlui/impl/DefaultHtmlToolkit.java | 85 ++++++
.../modules/htmlui/impl/HtmlComponent.java | 75 ++++++
.../netbeans/modules/htmlui/impl}/HtmlToolkit.java | 24 +-
.../modules/htmlui/impl/SwingFXViewer.java | 223 ++++++++++++++++
.../modules/htmlui/jfx/JavaFxHtmlToolkit.java | 18 +-
.../netbeans/modules/htmlui/jfx/NbBrowsers.java | 0
.../org/netbeans/modules/htmlui/jfx/NbFxPanel.java | 0
.../org/netbeans/modules/htmlui/DialogsTest.java | 89 +++++--
.../org/netbeans/modules/htmlui/impl}/ATech.java | 4 +-
.../modules/htmlui/impl}/ComponentsTest.java | 6 +-
.../modules/htmlui/impl}/EnsureJavaFXPresent.java | 8 +-
.../modules/htmlui/impl}/HtmlComponentTest.java | 36 +--
.../netbeans/modules/htmlui/impl}/NbResloc.java | 2 +-
.../htmlui/impl}/ShowDialogFromEDTTest.java | 2 +-
.../htmlui/impl}/ShowDialogFromFXThreadTest.java | 2 +-
.../org/netbeans/modules/htmlui/impl}/empty.html | 0
.../org/netbeans/modules/htmlui/impl}/simple.html | 0
.../net.java.html.boot.fx/external/binaries-list | 2 +-
...txt => net.java.html.boot.fx-1.7.3-license.txt} | 2 +-
.../nbproject/project.properties | 2 +-
.../net.java.html.boot.fx/nbproject/project.xml | 2 +-
.../external/binaries-list | 2 +-
...=> net.java.html.boot.script-1.7.3-license.txt} | 2 +-
.../nbproject/project.properties | 2 +-
.../nbproject/project.xml | 2 +-
platform/net.java.html.boot/external/binaries-list | 2 +-
...se.txt => net.java.html.boot-1.7.3-license.txt} | 2 +-
.../nbproject/project.properties | 2 +-
platform/net.java.html.boot/nbproject/project.xml | 2 +-
platform/net.java.html.geo/external/binaries-list | 2 +-
...nse.txt => net.java.html.geo-1.7.3-license.txt} | 2 +-
.../net.java.html.geo/nbproject/project.properties | 2 +-
platform/net.java.html.geo/nbproject/project.xml | 2 +-
platform/net.java.html.json/external/binaries-list | 2 +-
...se.txt => net.java.html.json-1.7.3-license.txt} | 2 +-
.../nbproject/project.properties | 2 +-
platform/net.java.html.json/nbproject/project.xml | 2 +-
.../net.java.html.sound/external/binaries-list | 2 +-
...e.txt => net.java.html.sound-1.7.3-license.txt} | 2 +-
.../nbproject/project.properties | 2 +-
platform/net.java.html.sound/nbproject/project.xml | 2 +-
platform/net.java.html/external/binaries-list | 2 +-
...license.txt => net.java.html-1.7.3-license.txt} | 2 +-
.../net.java.html/nbproject/project.properties | 2 +-
platform/net.java.html/nbproject/project.xml | 2 +-
platform/o.n.html.ko4j/external/binaries-list | 2 +-
...ko4j-1.7-license.txt => ko4j-1.7.3-license.txt} | 2 +-
.../o.n.html.ko4j/nbproject/project.properties | 2 +-
platform/o.n.html.ko4j/nbproject/project.xml | 2 +-
.../build.xml} | 16 +-
.../external/binaries-list | 2 +-
.../external/generic-1.7.3-license.txt} | 2 +-
platform/o.n.html.presenters.spi/manifest.mf | 1 +
.../nbproject/project.properties | 4 +-
.../nbproject/project.xml | 6 +-
platform/o.n.html.xhr4j/external/binaries-list | 2 +-
...r4j-1.7-license.txt => xhr4j-1.7.3-license.txt} | 2 +-
.../o.n.html.xhr4j/nbproject/project.properties | 2 +-
platform/o.n.html.xhr4j/nbproject/project.xml | 2 +-
95 files changed, 2027 insertions(+), 783 deletions(-)
create mode 100644
platform/api.htmlui/src/org/netbeans/modules/htmlui/ContextAccessor.java
create mode 100644
platform/api.htmlui/src/org/netbeans/modules/htmlui/FallbackViewer.java
create mode 100644
platform/api.htmlui/src/org/netbeans/modules/htmlui/HTMLDialogBase.java
delete mode 100644
platform/api.htmlui/src/org/netbeans/modules/htmlui/HTMLDialogImpl.java
delete mode 100644
platform/api.htmlui/src/org/netbeans/modules/htmlui/HtmlComponent.java
create mode 100644
platform/api.htmlui/src/org/netbeans/modules/htmlui/HtmlPair.java
create mode 100644
platform/api.htmlui/src/org/netbeans/modules/htmlui/PagesLookup.java
copy nbbuild/javadoctools/siteresource/module.png =>
platform/api.htmlui/src/org/netbeans/modules/htmlui/fallback.png (100%)
create mode 100644
platform/api.htmlui/src/org/netbeans/spi/htmlui/HTMLViewerSpi.java
copy platform/{net.java.html/nbproject/project.xml =>
api.htmlui/src/org/netbeans/spi/htmlui/package.html} (56%)
create mode 100644
platform/api.htmlui/test/unit/src/org/netbeans/api/htmlui/AskQuestion.java
create mode 100644
platform/api.htmlui/test/unit/src/org/netbeans/api/htmlui/UICntrl.java
copy platform/{net.java.html/nbproject/project.xml =>
api.htmlui/test/unit/src/org/netbeans/api/htmlui/dialog.html} (56%)
copy platform/{net.java.html/nbproject/project.xml =>
api.htmlui/test/unit/src/org/netbeans/api/htmlui/ui.html} (56%)
create mode 100644
platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/DialogOnSubmitTest.java
create mode 100644
platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/MockHtmlViewer.java
copy platform/{net.java.html/nbproject/project.xml => htmlui/build.xml} (59%)
create mode 100644 platform/htmlui/manifest.mf
copy {php/hudson.php => platform/htmlui}/nbproject/project.properties (100%)
copy platform/{api.htmlui => htmlui}/nbproject/project.xml (68%)
copy platform/{net.java.html.boot.fx/external/binaries-list =>
htmlui/src/org/netbeans/modules/htmlui/impl/Bundle.properties} (68%)
create mode 100644
platform/htmlui/src/org/netbeans/modules/htmlui/impl/DefaultHtmlToolkit.java
create mode 100644
platform/htmlui/src/org/netbeans/modules/htmlui/impl/HtmlComponent.java
rename platform/{api.htmlui/src/org/netbeans/modules/htmlui =>
htmlui/src/org/netbeans/modules/htmlui/impl}/HtmlToolkit.java (62%)
create mode 100644
platform/htmlui/src/org/netbeans/modules/htmlui/impl/SwingFXViewer.java
rename platform/{api.htmlui =>
htmlui}/src/org/netbeans/modules/htmlui/jfx/JavaFxHtmlToolkit.java (92%)
rename platform/{api.htmlui =>
htmlui}/src/org/netbeans/modules/htmlui/jfx/NbBrowsers.java (100%)
rename platform/{api.htmlui =>
htmlui}/src/org/netbeans/modules/htmlui/jfx/NbFxPanel.java (100%)
rename platform/{api.htmlui =>
htmlui}/test/unit/src/org/netbeans/modules/htmlui/DialogsTest.java (75%)
copy platform/{api.htmlui/test/unit/src/org/netbeans/modules/htmlui =>
htmlui/test/unit/src/org/netbeans/modules/htmlui/impl}/ATech.java (97%)
rename platform/{api.htmlui/test/unit/src/org/netbeans/modules/htmlui =>
htmlui/test/unit/src/org/netbeans/modules/htmlui/impl}/ComponentsTest.java (93%)
rename platform/{api.htmlui/test/unit/src/org/netbeans/modules/htmlui =>
htmlui/test/unit/src/org/netbeans/modules/htmlui/impl}/EnsureJavaFXPresent.java
(90%)
rename platform/{api.htmlui/test/unit/src/org/netbeans/modules/htmlui =>
htmlui/test/unit/src/org/netbeans/modules/htmlui/impl}/HtmlComponentTest.java
(93%)
rename platform/{api.htmlui/test/unit/src/org/netbeans/modules/htmlui =>
htmlui/test/unit/src/org/netbeans/modules/htmlui/impl}/NbResloc.java (96%)
rename platform/{api.htmlui/test/unit/src/org/netbeans/modules/htmlui =>
htmlui/test/unit/src/org/netbeans/modules/htmlui/impl}/ShowDialogFromEDTTest.java
(97%)
rename platform/{api.htmlui/test/unit/src/org/netbeans/modules/htmlui =>
htmlui/test/unit/src/org/netbeans/modules/htmlui/impl}/ShowDialogFromFXThreadTest.java
(98%)
copy platform/{api.htmlui/test/unit/src/org/netbeans/api/htmlui =>
htmlui/test/unit/src/org/netbeans/modules/htmlui/impl}/empty.html (100%)
copy platform/{api.htmlui/test/unit/src/org/netbeans/modules/htmlui =>
htmlui/test/unit/src/org/netbeans/modules/htmlui/impl}/simple.html (100%)
rename
platform/net.java.html.boot.fx/external/{net.java.html.boot.fx-1.7-license.txt
=> net.java.html.boot.fx-1.7.3-license.txt} (99%)
rename
platform/net.java.html.boot.script/external/{net.java.html.boot.script-1.7-license.txt
=> net.java.html.boot.script-1.7.3-license.txt} (99%)
rename
platform/net.java.html.boot/external/{net.java.html.boot-1.7-license.txt =>
net.java.html.boot-1.7.3-license.txt} (99%)
rename platform/net.java.html.geo/external/{net.java.html.geo-1.7-license.txt
=> net.java.html.geo-1.7.3-license.txt} (99%)
rename
platform/net.java.html.json/external/{net.java.html.json-1.7-license.txt =>
net.java.html.json-1.7.3-license.txt} (99%)
rename
platform/net.java.html.sound/external/{net.java.html.sound-1.7-license.txt =>
net.java.html.sound-1.7.3-license.txt} (99%)
rename platform/net.java.html/external/{net.java.html-1.7-license.txt =>
net.java.html-1.7.3-license.txt} (99%)
copy platform/o.n.html.ko4j/external/{ko4j-1.7-license.txt =>
ko4j-1.7.3-license.txt} (99%)
copy platform/{net.java.html/nbproject/project.xml =>
o.n.html.presenters.spi/build.xml} (59%)
copy platform/{o.n.html.ko4j =>
o.n.html.presenters.spi}/external/binaries-list (91%)
rename platform/{o.n.html.ko4j/external/ko4j-1.7-license.txt =>
o.n.html.presenters.spi/external/generic-1.7.3-license.txt} (99%)
create mode 100644 platform/o.n.html.presenters.spi/manifest.mf
copy platform/{net.java.html.boot =>
o.n.html.presenters.spi}/nbproject/project.properties (91%)
copy platform/{net.java.html.json =>
o.n.html.presenters.spi}/nbproject/project.xml (83%)
rename platform/o.n.html.xhr4j/external/{xhr4j-1.7-license.txt =>
xhr4j-1.7.3-license.txt} (99%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
