[libnb-platform-java] 01/01: Import Debian changes 8.1+dfsg1-6
Markus Koschany
apo at moszumanska.debian.org
Sun Jul 23 15:39:49 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository libnb-platform-java.
commit 6b2fac25d9b3e4d569cd63e7212680dc8e6ce341
Author: Markus Koschany <apo at debian.org>
Date: Sun Jul 23 17:22:32 2017 +0200
Import Debian changes 8.1+dfsg1-6
libnb-platform18-java (8.1+dfsg1-6) unstable; urgency=medium
* Add jna-4.4.0-compatibility.patch and fix FTBFS with JNA 4.4.0.
Thanks to Lucas Nussbaum for the report. (Closes: #868923)
* Switch to compat level 10.
* Use https for Format field.
* Declare compliance with Debian Policy 4.0.0.
* Tighten B-D on libjna-platform-java to >= 4.4.0.
libnb-platform18-java (8.1+dfsg1-5) unstable; urgency=medium
* Use the correct name for libjna-jni library. (Closes: #858876)
libnb-platform18-java (8.1+dfsg1-4) unstable; urgency=medium
* Add gcc-6-ftbfs.patch and fix FTBFS with GCC-6. (Closes: #835691)
Thanks to Lucas Nussbaum for the report.
libnb-platform18-java (8.1+dfsg1-3) unstable; urgency=medium
* Declare compliance with Debian Policy 3.9.8.
* Vcs-Git: Use https.
* Set permit.jdk8.builds=true.
* Fix include path to find jni_md.h.
Thanks to Lucas Nussbaum for the report. (Closes: #830455)
libnb-platform18-java (8.1+dfsg1-2) unstable; urgency=medium
* netbeans-platform-o.n.html.ko4j.patch: Readd apisupport.project module.
libnb-platform18-java (8.1+dfsg1-1) unstable; urgency=medium
* Imported Upstream version 8.1+dfsg1.
* orig-tar.sh: Use xz compression.
* debian/rules: Remove conditional whether patches are applied or not.
* Drop debian/patches/netbeans-platform-junit4.patch. Fixed upstream.
* Refresh debian/patches/netbeans-platform-empty-binaries-list.patch
* Refresh debian/patches/netbeans-platform-windowslauncher.patch
* Add asm4-all.jar to linked-jars and build-depend on libasm4-java.
* Add libhamcrest-java to Build-Depends and update linked-jars accordingly.
* Add netbeans-platform-disable-net.java-modules.patch and disable the
net.java.html module.
* Add netbeans-platform-junitlib.patch to prevent a FTBFS.
* Add netbeans-platform-o.n.html.ko4j.patch and disable o.n.html.ko4j module.
* Update version of openide-* pom files.
* Update my e-mail address.
* libnb-platform18-java: Depend on libasm4-java and libhamcrest-java.
* Install org-openide-util-ui.jar into libnb-org-openide-util-java.
Apparently the old org-openide-util.jar was split into two jar files.
* libnb-platform-devel-java: Tighten dependency on libnb-platform18-java.
* debian/rules: Build with --parallel.
libnb-platform18-java (8.0.2+dfsg1-2) unstable; urgency=medium
* Tighten dependency on felix-framework, osgi-core and osgi-compendium.
Thanks to Mark Carroll for the report. (Closes: #799936)
* Remove libstringtemplate-java from Build-Depends and do not symlink
the jar file with linked-jars.
* Tighten dependency on antlr3 to >= 3.4.
* Vcs-Browser: Use https.
libnb-platform18-java (8.0.2+dfsg1-1) unstable; urgency=medium
* Imported Upstream version 8.0.2+dfsg1.
- Fix FTBFS in sid by updating the package to the latest upstream release.
(Closes: #784442)
* Replace b-d w3c-dtd-xhtml with w3c-sgml-lib because the former will be
removed from Debian. (Closes: #787177)
* debian/control:
- Tighten build-dependency on felix-framework.
- Declare compliance with Debian Policy 3.9.6.
- Remove virtual java7-jdk build-dependency. (Closes: #754602)
- Switch Vcs-Browser field to cgit.
- Run wrap-and-sort -sa.
- Add myself to Uploaders.
- Remove obsolete Breaks, Replaces, Conflicts and Provides fields.
* Use compat level 9 and require debhelper >= 9.
* Remove duplicate files in doc package. Add rdfind and symlinks to
Build-Depends-Indep.
* Update linked-jars for new release.
* Change version in pom files to 8.0.2.
* Rebase all patches for new release.
* Drop netbeans-platform~classfile-version.patch. Use upstream values.
* Drop netbeans-platform~include-extras.patch and use only included modules.
* Drop netbeans-platform~suitebuild.patch because the build does not fail and
we don't build for older netbeans platforms either.
* Add osgi-update.patch for incorporating the changes of the OSGi framework
specification.
* Add netbeans-platform-junit4.patch and bundle Junit4, so that nobody has to
download Junit4 from the Internet.
* Fix privacy breach logo lintian error and privacy breach lintian warning by
removing the links to external image sources in javadoc files in
debian/rules.
* Update debian/copyright for new release.
libnb-platform18-java (7.4+dfsg1-2) unstable; urgency=medium
* Team upload.
* Added the missing dependency on libjna-platform-java (Closes: #768622)
libnb-platform18-java (7.4+dfsg1-1) unstable; urgency=low
* Team upload.
[ Andrew Ross ]
* New upstream release of Netbeans.
* Switch to mingw-w64 (Closes: #680468)
* Separate Netbeans Platform back into its own package.
* Include cluster release number in source package name to allow
multiple Netbeans platforms to be installed at once.
* Build .nbm modules and install into their own package.
* Upstream removed bashism from o.n.bootstrap/launcher/unix/nbexec
(Closes: #690633)
* Updated debian/patches.
[ tony mancill ]
* Bump standards version to 3.9.5.
libnb-platform-java (6.9-1) unstable; urgency=low
[ Andres Mejia ]
* Upload to Debian. (Closes: #610927)
* Add Debian Java team as Maintainer, Yulia and myself as Uploaders.
* Define a function for creation of symlinks.
* Add symlinks for xhtml entries found only in /usr/share/xml/entities/xhtml
for Debian.
* Update packaging to use source format 3.0 (quilt) and dh with javahelper.
* Refreshed patches.
* Bumped to Standards-Version 3.9.1.
[ Damien Raude-Morvan ]
* d/copyright: Small fix for missing copyright assignment,
Update to DEP-5 r166 format.
* d/watch: Prepare for next upstream release.
* d/control: Drop Depends: default-jre | java2-runtime as a Java
library don't need to depends on runtime (Java Policy).
libnb-platform-java (6.9-0ubuntu2) maverick; urgency=low
* Bug fix upload:
- Patch netbeans-platform-6.9~suite-xml.patch is added
(fix for http://netbeans.org/bugzilla/show_bug.cgi?id=189196)
libnb-platform-java (6.9-0ubuntu1) maverick; urgency=low
* New upstream release
- License corrected
- control/Standards-Version is changed to 3.9.0
- debian/copyright file is updated
- debian/patches are updated
libnb-platform-java (6.8-0ubuntu2) lucid; urgency=low
* debian/patches/l10n.patch added (LP: #527547)
* debian/rules is updated to build l10n
* control/Standards-Version is changed to 3.8.4
libnb-platform-java (6.8-0ubuntu1) lucid; urgency=low
* new upstream release (LP: 517083)
- debian/copyright and watch files are updated
to point to the correct download location
libnb-platform-java (6.7.1-0ubuntu1) karmic; urgency=low
* new upstream release (LP: #418875)
- control/Standards-Version is chaged to 3.8.3
- copyright file updated
libnb-platform-java (6.5-0ubuntu2) jaunty; urgency=low
* Added debian/patches/60-6.5.1-patches.patch with bug fixes from
NetBeans 6.5.1 (LP: #345562)
libnb-platform-java (6.5-0ubuntu1) jaunty; urgency=low
* New upstream version (LP: #316793)
* added dependency of libnb-platform-devel-java
on libnb-platform9-java (LP: #276731)
* removed version number from binary package:
libnb-platform8-devel-java -> libnb-platform-devel-java
* watch file and get-orig-source target are added
libnb-platform-java (6.1-0ubuntu1) intrepid; urgency=low
* Initial release (LP: #252658)
---
api.annotations.common/build.xml | 53 +-
api.annotations.common/manifest.mf | 2 +-
.../org-netbeans-api-annotations-common.sig | 2 +-
api.annotations.common/nbproject/project.xml | 39 -
.../annotations/common/resources/Bundle.properties | 37 -
api.htmlui/arch.xml | 41 +-
api.htmlui/build.xml | 39 -
api.htmlui/manifest.mf | 2 +-
api.htmlui/nbproject/org-netbeans-api-htmlui.sig | 80 -
api.htmlui/nbproject/project.properties | 37 -
api.htmlui/nbproject/project.xml | 49 -
.../org/netbeans/modules/htmlui/Bundle.properties | 37 -
.../netbeans/modules/htmlui/FreeGeoProvider.java | 127 --
.../modules/htmlui/FreeGeoProviderTest.java | 120 --
api.intent/arch.xml | 39 -
api.intent/build.xml | 39 -
api.intent/manifest.mf | 2 +-
api.intent/nbproject/org-netbeans-api-intent.sig | 118 --
api.intent/nbproject/project.properties | 37 -
api.intent/nbproject/project.xml | 39 -
.../src/org/netbeans/api/intent/Bundle.properties | 37 -
api.io/apichanges.xml | 10 +-
api.io/arch.xml | 39 -
api.io/build.xml | 39 -
api.io/manifest.mf | 4 +-
api.io/nbproject/org-netbeans-api-io.sig | 358 ----
api.io/nbproject/project.properties | 37 -
api.io/nbproject/project.xml | 39 -
api.io/src/org/netbeans/api/io/Bundle.properties | 37 -
api.progress.compat8/build.xml | 39 -
api.progress.compat8/manifest.mf | 4 +-
api.progress.compat8/nbproject/project.properties | 37 -
api.progress.compat8/nbproject/project.xml | 39 -
.../src/api/progress/compat8/Bundle.properties | 37 -
api.progress.nb/arch.xml | 45 +-
api.progress.nb/build.xml | 39 -
api.progress.nb/manifest.mf | 2 +-
.../nbproject/org-netbeans-api-progress-nb.sig | 113 +-
api.progress.nb/nbproject/project.properties | 37 -
api.progress.nb/nbproject/project.xml | 39 -
.../org/netbeans/api/progress/nb/Bundle.properties | 37 -
.../org/netbeans/api/progress/RunOffEDTTest.java | 56 +-
api.progress/manifest.mf | 2 +-
.../nbproject/org-netbeans-api-progress.sig | 63 +-
.../netbeans/api/progress/aggregate/package.html | 75 +-
.../src/org/netbeans/api/progress/package.html | 75 +-
.../modules/progress/spi/RunOffEDTProvider.java | 2 +-
api.search/arch.xml | 45 +-
api.search/build.xml | 39 -
api.search/manifest.mf | 2 +-
api.search/nbproject/org-netbeans-api-search.sig | 2 +-
api.search/nbproject/project.properties | 37 -
api.search/nbproject/project.xml | 39 -
.../src/org/netbeans/api/search/Bundle.properties | 37 -
.../netbeans/modules/search/BasicSearchForm.java | 3 +-
.../search/ui/AbstractSearchResultsPanel.form | 2 +-
.../search/ui/AbstractSearchResultsPanel.java | 2 +-
.../modules/search/ui/ResultsOutlineSupport.java | 2 +-
.../test/modules/search/BasicSearchTest.java | 5 +
.../modules/search/matcher/Bundle.properties | 37 -
api.templates/apichanges.xml | 2 +-
api.templates/arch.xml | 43 +-
api.templates/build.xml | 39 -
api.templates/manifest.mf | 2 +-
.../nbproject/org-netbeans-api-templates.sig | 162 --
api.templates/nbproject/project.properties | 37 -
api.templates/nbproject/project.xml | 39 -
.../netbeans/api/templates/CreateDescriptor.java | 2 +-
.../netbeans/modules/templates/Bundle.properties | 37 -
.../modules/templates/SCFTHandlerTest.java | 22 +-
.../src/org/netbeans/modules/templates/utf8.xml | 8 +-
api.visual/apichanges.xml | 2 +-
api.visual/manifest.mf | 2 +-
api.visual/nbproject/org-netbeans-api-visual.sig | 4 +-
.../org/netbeans/api/visual/action/package.html | 16 +-
.../org/netbeans/api/visual/anchor/package.html | 16 +-
.../org/netbeans/api/visual/animator/package.html | 16 +-
.../org/netbeans/api/visual/border/package.html | 16 +-
.../org/netbeans/api/visual/export/package.html | 18 +-
.../netbeans/api/visual/graph/layout/package.html | 16 +-
.../src/org/netbeans/api/visual/graph/package.html | 16 +-
.../src/org/netbeans/api/visual/laf/package.html | 16 +-
.../org/netbeans/api/visual/layout/package.html | 16 +-
.../src/org/netbeans/api/visual/model/package.html | 16 +-
.../src/org/netbeans/api/visual/package.html | 16 +-
.../src/org/netbeans/api/visual/print/package.html | 16 +-
.../org/netbeans/api/visual/router/package.html | 16 +-
.../src/org/netbeans/api/visual/vmd/package.html | 16 +-
.../api/visual/widget/doc-files/documentation.html | 16 +-
.../api/visual/widget/general/package.html | 16 +-
.../org/netbeans/api/visual/widget/package.html | 16 +-
.../bugs/GraphLayoutListenerRemoval197502Test.java | 11 +
apisupport.harness/manifest.mf | 2 +-
apisupport.harness/release/etc/Info.plist | 39 -
apisupport.harness/release/etc/app.conf | 36 -
apisupport.harness/release/launchers/app.sh | 39 +-
apisupport.harness/windows-launcher-src/Makefile | 38 -
apisupport.harness/windows-launcher-src/app.cpp | 3 +-
apisupport.harness/windows-launcher-src/app.rc | 36 -
.../windows-launcher-src/applauncher.cpp | 3 +-
.../windows-launcher-src/applauncher.h | 3 +-
.../nbproject/Makefile-app.exe.mk | 102 ++
.../nbproject/Makefile-app64.exe.mk | 102 ++
.../nbproject/Makefile-impl.mk | 133 ++
.../nbproject/Makefile-variables.mk | 35 +
.../nbproject/Package-app.exe.bash | 75 +
.../nbproject/Package-app64.exe.bash | 75 +
.../nbproject/configurations.xml | 39 -
.../nbproject/project.properties | 37 -
.../windows-launcher-src/nbproject/project.xml | 39 -
applemenu/build.xml | 1 -
applemenu/manifest.mf | 2 +-
applemenu/src/com/apple/eawt/AppEvent.java | 96 --
applemenu/src/com/apple/eawt/AppEventListener.java | 52 -
applemenu/src/com/apple/eawt/Application.java | 38 +-
...enFilesHandler.java => ApplicationAdapter.java} | 26 +-
.../{OpenURIHandler.java => ApplicationEvent.java} | 22 +-
...{AboutHandler.java => ApplicationListener.java} | 26 +-
...PreferencesHandler.java => CocoaComponent.java} | 24 +-
.../src/com/apple/eawt/PrintFilesHandler.java | 55 -
applemenu/src/com/apple/eawt/QuitHandler.java | 55 -
applemenu/src/com/apple/eawt/QuitResponse.java | 55 -
applemenu/src/com/apple/eawt/QuitStrategy.java | 54 -
applemenu/src/java/awt/Desktop.java | 62 -
applemenu/src/java/awt/desktop/AboutEvent.java | 51 -
applemenu/src/java/awt/desktop/AboutHandler.java | 53 -
applemenu/src/java/awt/desktop/AppEvent.java | 55 -
applemenu/src/java/awt/desktop/FilesEvent.java | 57 -
applemenu/src/java/awt/desktop/OpenFilesEvent.java | 53 -
.../src/java/awt/desktop/OpenFilesHandler.java | 53 -
.../src/java/awt/desktop/PreferencesEvent.java | 53 -
.../src/java/awt/desktop/PreferencesHandler.java | 53 -
applemenu/src/java/awt/desktop/QuitEvent.java | 51 -
applemenu/src/java/awt/desktop/QuitHandler.java | 53 -
applemenu/src/java/awt/desktop/QuitResponse.java | 54 -
applemenu/src/java/awt/desktop/QuitStrategy.java | 54 -
.../modules/applemenu/ApplePopupFactory.java | 453 ++++++
.../org/netbeans/modules/applemenu/Install.java | 38 +-
.../modules/applemenu/NbApplicationAdapter.java | 107 +-
.../applemenu/NbApplicationAdapterJDK8.java | 106 --
.../applemenu/NbApplicationAdapterJDK9.java | 109 --
autoupdate.cli/build.xml | 9 +-
autoupdate.cli/manifest.mf | 2 +-
autoupdate.cli/nbproject/project.properties | 9 +-
autoupdate.cli/nbproject/project.xml | 9 +-
.../modules/autoupdate/cli/ModuleOptions.java | 2 +-
autoupdate.services/build.xml | 45 +-
.../libsrc/org/netbeans/updater/ModuleUpdater.java | 4 +-
.../updater/resources/autoupdate-catalog-1_0.dtd | 39 -
.../updater/resources/autoupdate-catalog-2_0.dtd | 39 -
.../updater/resources/autoupdate-catalog-2_2.dtd | 39 -
.../updater/resources/autoupdate-catalog-2_3.dtd | 39 -
.../updater/resources/autoupdate-catalog-2_4.dtd | 39 -
.../updater/resources/autoupdate-catalog-2_5.dtd | 39 -
.../updater/resources/autoupdate-catalog-2_6.dtd | 39 -
.../updater/resources/autoupdate-catalog-2_7.dtd | 39 -
.../updater/resources/autoupdate-info-1_0.dtd | 39 -
.../updater/resources/autoupdate-info-2_0.dtd | 39 -
.../updater/resources/autoupdate-info-2_2.dtd | 39 -
.../updater/resources/autoupdate-info-2_3.dtd | 39 -
.../updater/resources/autoupdate-info-2_4.dtd | 39 -
.../updater/resources/autoupdate-info-2_5.dtd | 39 -
.../updater/resources/autoupdate-info-2_7.dtd | 39 -
autoupdate.services/manifest.mf | 2 +-
.../org-netbeans-modules-autoupdate-services.sig | 6 +-
autoupdate.services/nbproject/project.properties | 37 -
autoupdate.services/nbproject/project.xml | 39 -
autoupdate.services/src/META-INF/translate.names | 37 -
.../src/org/netbeans/api/autoupdate/package.html | 75 +-
.../modules/autoupdate/services/Bundle.properties | 39 +-
.../services/resources/Bundle.properties | 37 -
.../autoupdate/updateprovider/Bundle.properties | 37 -
.../autoupdate/updateprovider/NetworkAccess.java | 72 +-
.../doc-files/autoupdate-catalog-2_4.dtd | 39 -
.../autoupdate/doc-files/autoupdate-info-2_4.dtd | 39 -
.../src/org/netbeans/spi/autoupdate/package.html | 75 +-
.../src/org/netbeans/api/autoupdate/mf-layer.xml | 12 +-
autoupdate.ui/apichanges.xml | 6 +-
autoupdate.ui/arch.xml | 45 +-
autoupdate.ui/build.xml | 39 -
autoupdate.ui/manifest.mf | 2 +-
.../org-netbeans-modules-autoupdate-ui.sig | 2 +-
autoupdate.ui/nbproject/project.properties | 37 -
autoupdate.ui/nbproject/project.xml | 39 -
.../modules/autoupdate/ui/Bundle.properties | 37 -
.../autoupdate/ui/actions/Bundle.properties | 37 -
.../autoupdate/ui/resources/Bundle.properties | 37 -
.../autoupdate/ui/wizards/Bundle.properties | 37 -
core.execution/manifest.mf | 2 +-
.../src/org/netbeans/core/execution/IOTable.java | 1 -
.../execution/beaninfo/editors/package-info.java | 39 -
.../core/execution/beaninfo/package-info.java | 39 -
core.io.ui/manifest.mf | 2 +-
core.io.ui/nbproject/project.xml | 39 -
.../src/org/netbeans/core/io/ui/Bundle.properties | 37 -
core.io.ui/src/org/netbeans/core/io/ui/layer.xml | 39 -
.../netbeans/core/io/ui/resources/output.settings | 39 -
.../netbeans/core/io/ui/resources/output.wstcgrp | 39 -
.../netbeans/core/io/ui/resources/output.wstcref | 39 -
core.kit/build.xml | 39 -
core.kit/manifest.mf | 2 +-
core.kit/nbproject/project.properties | 37 -
core.kit/nbproject/project.xml | 39 -
core.kit/release/VERSION.txt | 2 +-
.../netbeans/modules/core/kit/Bundle.properties | 37 -
core.multitabs/arch.xml | 45 +-
core.multitabs/build.xml | 39 -
.../nbproject/org-netbeans-core-multitabs.sig | 4 +-
core.multitabs/nbproject/project.properties | 39 +-
core.multitabs/nbproject/project.xml | 39 -
.../org/netbeans/core/multitabs/Bundle.properties | 37 -
.../org/netbeans/core/multitabs/Controller.java | 2 +-
.../netbeans/core/multitabs/impl/Bundle.properties | 37 -
.../core/multitabs/impl/TabDataRenderer.java | 2 -
.../src/org/netbeans/core/multitabs/layer.xml | 39 -
.../core/multitabs/prefs/Bundle.properties | 37 -
.../core/multitabs/prefs/InnerTabsPanel.java | 39 +-
core.multiview/arch.xml | 2 +-
core.multiview/manifest.mf | 2 +-
.../nbproject/org-netbeans-core-multiview.sig | 4 +-
.../org/netbeans/core/api/multiview/package.html | 77 +-
.../org/netbeans/core/spi/multiview/package.html | 81 +-
.../netbeans/core/spi/multiview/text/package.html | 75 +-
core.nativeaccess/build.xml | 39 -
core.nativeaccess/manifest.mf | 2 +-
core.nativeaccess/nbproject/project.properties | 37 -
core.nativeaccess/nbproject/project.xml | 39 -
core.netigso/manifest.mf | 2 +-
.../nbproject/org-netbeans-core-netigso.sig | 2 +-
.../src/org/netbeans/core/netigso/Netigso.java | 2 +-
.../src/org/netbeans/core/netigso/spi/package.html | 39 -
.../src/org/netbeans/core/netigso/NetigsoUtil.java | 4 +-
core.network/build.xml | 39 -
core.network/manifest.mf | 2 +-
core.network/nbproject/project.xml | 39 -
.../netbeans/core/network/proxy/Bundle.properties | 37 -
.../proxy/mac/MacCoreFoundationLibrary.java | 55 +-
.../network/proxy/mac/MacNetworkProxyLibrary.java | 41 +-
core.osgi/build.xml | 39 -
core.osgi/manifest.mf | 2 +-
core.osgi/nbproject/project.properties | 37 -
core.osgi/nbproject/project.xml | 39 -
.../src/org/netbeans/core/osgi/Bundle.properties | 37 -
core.output2/manifest.mf | 2 +-
.../src/org/netbeans/core/output2/NbIO.java | 25 +-
.../src/org/netbeans/core/output2/layer.xml | 39 -
.../core/output2/options/Bundle.properties | 37 -
.../core/output2/ui/AbstractOutputPane.java | 35 -
.../org/netbeans/core/output2/NbIOFoldTest.java | 14 -
core.startup.base/arch.xml | 45 +-
core.startup.base/build.xml | 39 -
core.startup.base/nbproject/project.properties | 39 +-
core.startup.base/nbproject/project.xml | 39 -
.../netbeans/core/startup/base/Bundle.properties | 37 -
core.startup/arch.xml | 2 +-
core.startup/nbproject/project.properties | 2 +-
.../org/netbeans/core/startup/Bundle.properties | 4 +-
.../netbeans/core/startup/ConsistencyVerifier.java | 11 +-
.../src/org/netbeans/core/startup/NbInstaller.java | 4 +
.../src/org/netbeans/core/startup/frame32_dark.gif | Bin 1944 -> 0 bytes
.../src/org/netbeans/core/startup/frame48_dark.gif | Bin 3417 -> 0 bytes
.../src/org/netbeans/core/startup/frame_dark.gif | Bin 733 -> 0 bytes
.../netbeans/core/startup/module-status-1_0.dtd | 2 -
.../src/org/netbeans/core/startup/package.html | 16 +-
.../src/org/netbeans/core/startup/splash.gif | Bin 128065 -> 127901 bytes
.../src/org/netbeans/core/startup/splash_dark.gif | Bin 91716 -> 0 bytes
.../startup/ClassLoaderCacheContent.properties | 37 -
.../startup/MistakeOnRadimsComputer.properties | 37 -
.../startup/PlatformDependencySatisfiedTest.java | 8 +-
.../layers/CustomWritableSystemFileSystemTest.java | 15 +-
core.ui/manifest.mf | 2 +-
.../core/ui/notifications/NotificationImpl.java | 6 +-
.../org/netbeans/core/ui/resources/Standard.xml | 2 +-
.../netbeans/core/ui/resources/SwingBrowser.xml | 39 -
.../netbeans/core/ui/resources/properties.wstcgrp | 39 -
.../netbeans/core/ui/resources/properties.wstcref | 39 -
.../org/netbeans/core/ui/resources/properties.xml | 39 -
.../netbeans/core/ui/warmup/DiagnosticTask.java | 30 +-
core.windows/arch.xml | 45 +-
core.windows/manifest.mf | 2 +-
core.windows/src/META-INF/netbeans/translate.names | 37 -
.../src/org/netbeans/core/windows/Constants.java | 6 -
.../core/windows/documentgroup/Bundle.properties | 37 -
.../netbeans/core/windows/resources/toolbar.dtd | 39 -
.../netbeans/core/windows/resources/toolbar1_1.dtd | 39 -
.../core/windows/services/NbPresenter.java | 33 +-
.../netbeans/core/windows/view/DefaultView.java | 12 +-
.../netbeans/core/windows/view/ViewHierarchy.java | 3 -
.../core/windows/view/dnd/WindowDnDManager.java | 9 +-
.../core/windows/view/ui/Bundle.properties | 6 +-
.../windows/view/ui/CloseButtonTabbedPane.java | 16 +-
.../core/windows/view/ui/TabbedHandler.java | 1 -
.../core/windows/resources/component00.settings | 39 -
.../core/windows/resources/component00.wstcref | 39 -
.../core/windows/view/ui/CustomMenuBarTest.java | 15 +-
debian/changelog | 44 +-
debian/control | 10 +-
debian/copyright | 4 +-
debian/linked-jars | 5 +-
debian/patches/gcc-6-ftbfs.patch | 51 +
debian/patches/jna-4.4.0-compatibility.patch | 25 +
...etbeans-platform-disable-net.java-modules.patch | 16 +-
.../netbeans-platform-disable-xhr4j-module.patch | 23 -
.../netbeans-platform-empty-binaries-list.patch | 70 +-
debian/patches/netbeans-platform-junitlib.patch | 6 +-
debian/patches/netbeans-platform-nbi.patch | 11 +-
.../patches/netbeans-platform-nojnabinaries.patch | 60 +-
.../patches/netbeans-platform-o.n.html.ko4j.patch | 12 +-
.../netbeans-platform-windowslauncher.patch | 379 +++++
debian/patches/osgi-update.patch | 4 +-
debian/patches/series | 14 +-
debian/pom/openide-modules.xml | 6 +-
debian/pom/openide-util-lookup.xml | 2 +-
debian/pom/openide-util-ui.xml | 4 +-
debian/pom/openide-util.xml | 4 +-
debian/rules | 27 +-
editor.mimelookup.impl/arch.xml | 49 +-
editor.mimelookup.impl/manifest.mf | 2 +-
editor.mimelookup/arch.xml | 49 +-
editor.mimelookup/manifest.mf | 2 +-
.../org-netbeans-modules-editor-mimelookup.sig | 7 +-
.../netbeans/spi/editor/mimelookup/package.html | 16 +-
favorites/manifest.mf | 2 +-
favorites/nbproject/project.xml | 6 +-
ide/launcher/netbeans.conf | 4 +-
ide/launcher/unix/netbeans | 17 +-
ide/launcher/windows/Makefile | 38 -
ide/launcher/windows/cmdargs.h | 5 +-
ide/launcher/windows/nblauncher.cpp | 26 +-
ide/launcher/windows/nblauncher.h | 5 +-
ide/launcher/windows/nbproject/Makefile-impl.mk | 133 ++
.../windows/nbproject/Makefile-netbeans.exe.mk | 95 ++
.../windows/nbproject/Makefile-netbeans64.exe.mk | 95 ++
.../windows/nbproject/Makefile-variables.mk | 35 +
.../windows/nbproject/Package-netbeans.exe.bash | 76 +
.../windows/nbproject/Package-netbeans64.exe.bash | 76 +
ide/launcher/windows/nbproject/configurations.xml | 39 -
ide/launcher/windows/nbproject/project.properties | 37 -
ide/launcher/windows/nbproject/project.xml | 39 -
ide/launcher/windows/netbeans.cpp | 5 +-
ide/launcher/windows/netbeans.exe.manifest | 2 +-
ide/launcher/windows/netbeans64.exe.manifest | 2 +-
ide/launcher/windows/version.h | 12 +-
ide/projectopener/build.xml | 45 +-
ide/projectopener/master.jnlp | 39 -
.../nbproject/configs/JWS_generated.properties | 37 -
ide/projectopener/nbproject/project.properties | 37 -
ide/projectopener/nbproject/project.xml | 39 -
.../org/netbeans/projectopener/Bundle.properties | 39 +-
javahelp/manifest.mf | 2 +-
javahelp/src/META-INF/upgrade/Help.hint | 39 -
.../org/netbeans/api/javahelp/doc-files/api.html | 28 +-
.../api/javahelp/doc-files/help-guide.html | 2 +-
.../org/netbeans/modules/javahelp/JavaHelp.java | 3 +-
.../modules/javahelp/resources/helpcontext-1_0.dtd | 39 -
.../modules/javahelp/resources/helpsetref-1_0.dtd | 39 -
jellytools.platform/build.xml | 39 -
jellytools.platform/manifest.mf | 2 +-
.../org-netbeans-modules-jellytools-platform.sig | 78 +-
jellytools.platform/nbproject/project.properties | 37 -
jellytools.platform/nbproject/project.xml | 39 -
.../jellytools/properties/editors/package.html | 16 +-
.../netbeans/jellytools/properties/package.html | 18 +-
.../src/org/netbeans/jellytools/util/package.html | 16 +-
.../modules/jellytools/platform/Bundle.properties | 37 -
.../jellytools/PlatformBundleKeysTest.properties | 37 -
jemmy/manifest.mf | 2 +-
junitlib/build.xml | 39 -
junitlib/manifest.mf | 2 +-
junitlib/nbproject/project.properties | 37 -
junitlib/nbproject/project.xml | 39 -
.../netbeans/modules/junitlib/Bundle.properties | 37 -
.../src/org/netbeans/modules/junitlib/hamcrest.xml | 41 +-
.../src/org/netbeans/modules/junitlib/junit_4.xml | 41 +-
.../src/org/netbeans/modules/junitlib/layer.xml | 39 -
keyring.fallback/build.xml | 39 -
keyring.fallback/manifest.mf | 2 +-
keyring.fallback/nbproject/project.properties | 37 -
keyring.fallback/nbproject/project.xml | 39 -
.../modules/keyring/fallback/Bundle.properties | 37 -
keyring.impl/build.xml | 39 -
keyring.impl/manifest.mf | 2 +-
keyring.impl/nbproject/project.properties | 37 -
keyring.impl/nbproject/project.xml | 39 -
.../modules/keyring/impl/Bundle.properties | 37 -
.../modules/keyring/kde/CommonKWalletProvider.java | 250 ---
.../modules/keyring/kde/KWalletProvider.java | 216 ++-
keyring/arch.xml | 45 +-
keyring/build.xml | 39 -
keyring/manifest.mf | 2 +-
keyring/nbproject/org-netbeans-modules-keyring.sig | 2 +-
keyring/nbproject/project.properties | 37 -
keyring/nbproject/project.xml | 39 -
.../org/netbeans/modules/keyring/Bundle.properties | 37 -
keyring/src/org/netbeans/modules/keyring/layer.xml | 39 -
lib.uihandler/build.xml | 39 -
lib.uihandler/manifest.mf | 2 +-
.../nbproject/org-netbeans-lib-uihandler.sig | 2 +-
lib.uihandler/nbproject/project.properties | 37 -
lib.uihandler/nbproject/project.xml | 39 -
.../org/netbeans/lib/uihandler/InputGesture.java | 17 +-
.../org/netbeans/lib/uihandler/LogFormatter.java | 23 +-
.../src/org/netbeans/lib/uihandler/LogRecords.java | 29 +-
.../src/org/netbeans/lib/uihandler/ProjectOp.java | 27 +-
.../src/org/netbeans/lib/uihandler/layer.xml | 39 -
.../netbeans/lib/uihandler/LogFormatterTest.java | 27 +-
.../org/netbeans/lib/uihandler/ProjectOpTest.java | 19 +-
.../org/netbeans/lib/uihandler/TestHandler.java | 21 +-
.../lib/uihandlerserver/InputGestureTest.java | 23 +-
.../lib/uihandlerserver/LogRecordsTest.java | 27 +-
.../netbeans/lib/uihandlerserver/Props.properties | 16 +-
.../lib/uihandlerserver/ReadBigDataTest.java | 33 +-
libs.asm/manifest.mf | 2 +-
libs.felix/build.xml | 39 -
libs.felix/manifest.mf | 2 +-
libs.felix/nbproject/project.xml | 39 -
libs.javafx/build.xml | 39 -
libs.javafx/manifest.mf | 2 +-
libs.javafx/nbproject/project.xml | 39 -
.../src/org/netbeans/libs/javafx/Bundle.properties | 37 -
libs.jna.platform/external/binaries-list | 2 +-
.../external/jna-platform-4.1.0-license.txt | 2 +-
libs.jna.platform/manifest.mf | 2 +-
libs.jna.platform/nbproject/project.properties | 2 +-
libs.jna.platform/nbproject/project.xml | 4 +-
libs.jna/external/binaries-list | 2 +-
.../external/jna-4.1.0-license.txt | 2 +-
libs.jna/manifest.mf | 2 +-
libs.jna/nbproject/project.properties | 22 +-
libs.jna/nbproject/project.xml | 4 +-
libs.jna/src/org/netbeans/libs/jna/Installer.java | 2 +-
libs.jsr223/manifest.mf | 2 +-
libs.junit4/manifest.mf | 2 +-
libs.nbi.ant/build.xml | 39 -
libs.nbi.ant/manifest.mf | 2 +-
libs.nbi.ant/nbproject/project.properties | 37 -
libs.nbi.ant/nbproject/project.xml | 39 -
.../org/netbeans/libs/nbi/ant/Bundle.properties | 37 -
libs.nbi.ant/stub/build.properties | 61 +-
libs.nbi.ant/stub/build.xml | 49 +-
.../ext/components/products/helloworld/build.xml | 45 +-
.../products/helloworld/data/Bundle.properties | 60 +-
.../helloworld/nbproject/project.properties | 37 -
.../products/helloworld/nbproject/project.xml | 39 -
.../helloworld/src/org/mycompany/Bundle.properties | 37 -
.../src/org/mycompany/ConfigurationLogic.java | 11 +-
.../helloworld/src/org/mycompany/wizard.xml | 69 +-
.../org/mycompany/wizard/panels/Bundle.properties | 61 +-
.../mycompany/wizard/panels/HelloWorldPanel.java | 15 +-
libs.nbi.ant/stub/ext/engine/build.properties | 60 +-
libs.nbi.ant/stub/ext/engine/build.xml | 77 +-
.../stub/ext/engine/nbproject/build-impl.xml | 2 +-
.../stub/ext/engine/nbproject/project.properties | 60 +-
libs.nbi.ant/stub/ext/engine/nbproject/project.xml | 67 +-
.../stub/ext/engine/src/data/engine.properties | 61 +-
.../native/launcher/unix/i18n/launcher.properties | 60 +-
.../launcher/windows/i18n/launcher.properties | 60 +-
.../installer/utils/applications/Bundle.properties | 60 +-
.../utils/applications/NetBeansRCPUtils.java | 66 +-
.../wizard/components/actions/Bundle.properties | 37 -
.../components/actions/InitializeAction.java | 68 +-
.../wizard/components/panels/Bundle.properties | 37 -
.../components/panels/PostInstallSummaryPanel.java | 63 +-
.../components/panels/PreInstallSummaryPanel.java | 61 +-
.../wizard/components/panels/WelcomePanel.java | 61 +-
.../wizard/components/sequences/Bundle.properties | 60 +-
.../wizard/components/sequences/MainSequence.java | 63 +-
.../installer/wizard/wizard-components.xml | 77 +-
.../stub/ext/infra/build/engine/build.properties | 39 +
libs.nbi.ant/stub/ext/infra/build/engine/build.xml | 38 +
.../build/products/helloworld/build.properties | 39 +
.../ext/infra/build/products/helloworld/build.xml | 38 +
libs.nbi.ant/stub/tmpl.properties | 37 -
libs.nbi.engine/build.xml | 39 -
libs.nbi.engine/manifest.mf | 2 +-
libs.nbi.engine/nbproject/project.properties | 37 -
libs.nbi.engine/nbproject/project.xml | 39 -
.../org/netbeans/libs/nbi/engine/Bundle.properties | 37 -
libs.osgi/build.xml | 39 -
libs.osgi/manifest.mf | 2 +-
libs.osgi/nbproject/project.properties | 37 -
libs.osgi/nbproject/project.xml | 39 -
.../src/org/netbeans/libs/osgi/Bundle.properties | 37 -
libs.testng/manifest.mf | 2 +-
masterfs.linux/build.xml | 39 -
masterfs.linux/manifest.mf | 2 +-
masterfs.linux/nbproject/project.properties | 37 -
masterfs.linux/nbproject/project.xml | 39 -
.../masterfs/watcher/linux/Bundle.properties | 37 -
.../masterfs/watcher/linux/LinuxNotifier.java | 9 +-
masterfs.macosx/build.xml | 39 -
masterfs.macosx/manifest.mf | 2 +-
masterfs.macosx/nbproject/project.properties | 37 -
masterfs.macosx/nbproject/project.xml | 39 -
.../masterfs/watcher/macosx/Bundle.properties | 37 -
.../masterfs/watcher/macosx/OSXNotifier.java | 9 +-
masterfs.nio2/build.xml | 39 -
masterfs.nio2/manifest.mf | 2 +-
masterfs.nio2/nbproject/project.properties | 37 -
masterfs.nio2/nbproject/project.xml | 39 -
.../masterfs/watcher/nio2/Bundle.properties | 37 -
masterfs.ui/build.xml | 39 -
masterfs.ui/nbproject/project.properties | 39 +-
masterfs.ui/nbproject/project.xml | 39 -
.../netbeans/modules/masterfs/ui/Bundle.properties | 37 -
masterfs.windows/build.xml | 39 -
masterfs.windows/manifest.mf | 2 +-
masterfs.windows/nbproject/project.properties | 37 -
masterfs.windows/nbproject/project.xml | 39 -
.../masterfs/watcher/windows/Bundle.properties | 37 -
.../masterfs/watcher/windows/WindowsNotifier.java | 9 +-
masterfs/nbproject/project.properties | 2 +-
.../filebasedfs/fileobjects/BaseFileObj.java | 71 +-
.../filebasedfs/fileobjects/FileObjectKeeper.java | 15 +-
.../modules/masterfs/providers/Notifier.java | 9 +-
.../netbeans/modules/masterfs/watcher/Watcher.java | 9 +-
.../filebasedfs/BaseFileObjectTestHid.java | 30 +-
.../antsrc/org/netbeans/nbbuild/CustomJavac.java | 18 -
nbbuild/antsrc/org/netbeans/nbbuild/JNLP-6.0.dtd | 55 +-
nbbuild/antsrc/org/netbeans/nbbuild/LocFiles.java | 9 +-
.../org/netbeans/nbbuild/ParseProjectXml.java | 11 +-
.../org/netbeans/nbbuild/extlibs/package.html | 39 -
nbbuild/antsrc/org/netbeans/nbbuild/package.html | 16 +-
nbbuild/build.properties | 8 +-
nbbuild/build.xml | 11 +-
nbbuild/cluster.properties | 102 +-
nbbuild/external/binaries-list | 3 +-
nbbuild/external/findbugs/build.xml | 23 +-
nbbuild/hudson/core-main | 2 +-
nbbuild/javadoctools/apichanges.dtd | 2 +-
nbbuild/javadoctools/arch-empty.xml | 39 -
nbbuild/javadoctools/export2apichanges.xsl | 7 +-
nbbuild/javadoctools/export2html.xsl | 7 +-
nbbuild/javadoctools/javadoc-generic.css | 39 -
nbbuild/javadoctools/javadoc.css | 39 -
nbbuild/javadoctools/links.xml | 3 -
nbbuild/javadoctools/nb-docs-stability.css | 39 -
nbbuild/javadoctools/nb-docs.css | 39 -
nbbuild/javadoctools/netbeans-lite.css | 39 -
nbbuild/javadoctools/netbeans.css | 39 -
nbbuild/javadoctools/properties.xml | 3 -
nbbuild/javadoctools/prose.css | 39 -
nbbuild/javadoctools/replaces.xml | 3 -
nbbuild/jdk.xml | 4 +-
nbbuild/misc/hints-settings.xml | 41 +-
nbbuild/nbproject/genfiles.properties | 5 -
nbbuild/nbproject/jdk.xml | 157 --
nbbuild/nbproject/nbjdk.properties | 1 -
nbbuild/nbproject/nbjdk.xml | 28 -
nbbuild/nbproject/project.xml | 10 -
nbbuild/newbuild/build-all-components.sh | 25 +-
nbbuild/newbuild/build-mac-nbi.sh | 39 -
nbbuild/newbuild/files-info.sh | 4 +-
nbbuild/newbuild/init.sh | 6 +-
nbbuild/newbuild/push-remote-java-help.sh | 38 -
nbbuild/newbuild/trunk-nightly.sh | 8 +-
nbbuild/newbuild/upload-bits.sh | 4 +-
nbbuild/templates/common.xml | 7 +-
nbbuild/templates/projectized.xml | 28 +-
.../cleaner/windows/nbproject/Makefile-Debug.mk | 65 +
.../cleaner/windows/nbproject/Makefile-Release.mk | 63 +
.../cleaner/windows/nbproject/Makefile-impl.mk | 113 ++
.../jnilib/linux/nbproject/Makefile-Debug.mk | 68 +
.../jnilib/linux/nbproject/Makefile-Debug_amd64.mk | 115 +-
.../jnilib/linux/nbproject/Makefile-Release.mk | 68 +
.../native/jnilib/linux/nbproject/Makefile-impl.mk | 113 ++
.../jnilib/macosx/nbproject/Makefile-Debug.mk | 68 +
.../jnilib/macosx/nbproject/Makefile-Release.mk | 68 +
.../jnilib/macosx/nbproject/Makefile-impl.mk | 111 ++
.../jnilib/macosx/nbproject/configurations.xml | 39 -
.../solaris-sparc/nbproject/Makefile-Debug.mk | 72 +
.../solaris-sparc/nbproject/Makefile-Debug_gnu.mk | 123 +-
.../solaris-sparc/nbproject/Makefile-Debug_x64.mk | 123 +-
.../nbproject/Makefile-Debug_x64_gnu.mk | 102 ++
.../solaris-sparc/nbproject/Makefile-Release.mk | 72 +
.../solaris-sparc/nbproject/Makefile-impl.mk | 113 ++
.../jnilib/solaris-x86/nbproject/Makefile-Debug.mk | 72 +
.../solaris-x86/nbproject/Makefile-Debug_gnu.mk | 123 +-
.../solaris-x86/nbproject/Makefile-Debug_x64.mk | 123 +-
.../nbproject/Makefile-Debug_x64_gnu.mk | 123 +-
.../solaris-x86/nbproject/Makefile-Release.mk | 72 +
.../jnilib/solaris-x86/nbproject/Makefile-impl.mk | 113 ++
.../windows/nbproject/Makefile-Default-32bit.mk | 131 +-
.../windows/nbproject/Makefile-Default-64bit.mk | 131 +-
.../jnilib/windows/nbproject/Makefile-impl.mk | 113 ++
.../native/launcher/unix/i18n/launcher.properties | 2 +-
nbi/engine/native/launcher/unix/src/launcher.sh | 2 +-
.../launcher/windows/i18n/launcher.properties | 2 +-
.../launcher/windows/nbproject/Makefile-Debug.mk | 132 ++
.../launcher/windows/nbproject/Makefile-Release.mk | 132 ++
.../launcher/windows/nbproject/Makefile-impl.mk | 133 ++
.../windows/nbproject/Makefile-variables.mk | 35 +
.../launcher/windows/nbproject/Package-Debug.bash | 75 +
.../windows/nbproject/Package-Release.bash | 75 +
.../launcher/windows/nbproject/configurations.xml | 39 -
.../native/launcher/windows/resources/res.rc | 42 -
nbi/engine/nbproject/genfiles.properties | 51 +-
nbi/engine/nbproject/project.properties | 6 +-
.../org/netbeans/installer/utils/FileUtils.java | 50 +-
.../installer/utils/applications/JavaUtils.java | 6 +-
.../utils/system/launchers/impl/ExeLauncher.java | 2 +-
nbi/infra/build/jvm/conf/common.properties | 8 +-
.../server/modules/war-admin/web/css/main.css | 66 +-
nbjunit/apichanges.xml | 32 +-
nbjunit/arch.xml | 2 +-
nbjunit/manifest.mf | 2 +-
nbjunit/nbproject/org-netbeans-modules-nbjunit.sig | 47 +-
nbjunit/src/META-INF/upgrade/NbModuleSuite.hint | 39 -
net.java.html.boot.fx/build.xml | 39 -
net.java.html.boot.fx/external/binaries-list | 2 +-
net.java.html.boot.fx/nbproject/project.properties | 39 +-
net.java.html.boot.fx/nbproject/project.xml | 41 +-
net.java.html.boot.script/build.xml | 39 -
net.java.html.boot.script/external/binaries-list | 2 +-
.../nbproject/project.properties | 39 +-
net.java.html.boot.script/nbproject/project.xml | 41 +-
net.java.html.boot/build.xml | 39 -
net.java.html.boot/external/binaries-list | 2 +-
net.java.html.boot/nbproject/project.properties | 39 +-
net.java.html.boot/nbproject/project.xml | 41 +-
net.java.html.geo/build.xml | 39 -
net.java.html.geo/external/binaries-list | 2 +-
net.java.html.geo/nbproject/project.properties | 39 +-
net.java.html.geo/nbproject/project.xml | 41 +-
net.java.html.json/build.xml | 39 -
net.java.html.json/external/binaries-list | 2 +-
net.java.html.json/nbproject/project.properties | 39 +-
net.java.html.json/nbproject/project.xml | 41 +-
net.java.html.sound/build.xml | 39 -
net.java.html.sound/external/binaries-list | 2 +-
net.java.html.sound/nbproject/project.properties | 39 +-
net.java.html.sound/nbproject/project.xml | 41 +-
net.java.html/build.xml | 39 -
net.java.html/external/binaries-list | 2 +-
net.java.html/nbproject/project.properties | 39 +-
net.java.html/nbproject/project.xml | 41 +-
netbinox/build.xml | 2 +-
netbinox/external/binaries-list | 3 +-
netbinox/manifest.mf | 2 +-
netbinox/nbproject/project.xml | 39 -
.../netbeans/modules/netbinox/Bundle.properties | 2 +-
.../netbeans/modules/netbinox/EmptyBundleFile.java | 2 +-
.../netbeans/modules/netbinox/JarBundleFile.java | 2 +-
.../org/netbeans/modules/netbinox/Netbinox.java | 4 +-
.../netbeans/modules/netbinox/NetbinoxFactory.java | 2 +-
.../netbeans/modules/netbinox/NetbinoxHooks.java | 2 +-
.../netbeans/modules/netbinox/NetbinoxLoader.java | 2 +-
.../modules/netbinox/NetigsoBundleFile.java | 2 +-
.../test/unit/src/org/netbeans/MockEvents.java | 2 +-
.../unit/src/org/netbeans/MockModuleInstaller.java | 2 +-
netbinox/test/unit/src/org/netbeans/SetupHid.java | 2 +-
.../modules/netbinox/BundleResourceTest.java | 2 +-
.../modules/netbinox/BundleURLConnectionTest.java | 4 +-
.../netbinox/CachingAndExternalPathsTest.java | 2 +-
.../netbinox/CachingAndExternalURLTest.java | 2 +-
.../netbinox/CachingPreventsFileTouchesTest.java | 2 +-
.../modules/netbinox/ContextClassLoaderTest.java | 4 +-
.../modules/netbinox/CountingSecurityManager.java | 2 +-
.../modules/netbinox/EnabledAutoloadTest.java | 2 +-
.../modules/netbinox/ExternalDirectoryTest.java | 4 +-
.../netbeans/modules/netbinox/ExternalJARTest.java | 4 +-
.../modules/netbinox/HookConfiguratorTest.java | 4 +-
.../netbeans/modules/netbinox/IntegrationTest.java | 2 +-
.../netbeans/modules/netbinox/LoadedBytesTest.java | 6 +-
.../modules/netbinox/LogReaderServiceTest.java | 4 +-
.../netbinox/NetbinoxBuddyClassLoaderTest.java | 2 +-
.../modules/netbinox/NetbinoxLibraryTest.java | 4 +-
.../netbinox/NetbinoxUseSystemPropertiesTest.java | 6 +-
.../modules/netbinox/NetigsoActivationTest.java | 4 +-
.../netbinox/NetigsoActivationWithAllDirsTest.java | 2 +-
.../modules/netbinox/NetigsoDashnamesTest.java | 2 +-
.../modules/netbinox/NetigsoHasSAXParserTest.java | 6 +-
.../org/netbeans/modules/netbinox/NetigsoHid.java | 4 +-
.../modules/netbinox/NetigsoLayerTest.java | 2 +-
.../modules/netbinox/NetigsoLoggingTest.java | 2 +-
.../netbinox/NetigsoOSGiActivationVisibleTest.java | 4 +-
.../modules/netbinox/NetigsoOSGiCanDependTest.java | 2 +-
.../netbinox/NetigsoOSGiCanRequestTest.java | 2 +-
.../org/netbeans/modules/netbinox/NetigsoTest.java | 2 +-
.../modules/netbinox/NetigsoUsesSwingTest.java | 2 +-
o.jdesktop.layout/manifest.mf | 2 +-
o.n.bootstrap/launcher/unix/nbexec | 36 +-
o.n.bootstrap/launcher/windows/Makefile | 38 -
o.n.bootstrap/launcher/windows/argnames.h | 2 +-
o.n.bootstrap/launcher/windows/jvmlauncher.cpp | 45 +-
o.n.bootstrap/launcher/windows/jvmlauncher.h | 7 +-
o.n.bootstrap/launcher/windows/nbexec.cpp | 5 +-
o.n.bootstrap/launcher/windows/nbexecexe.cpp | 5 +-
o.n.bootstrap/launcher/windows/nbexecloader.h | 2 +-
.../launcher/windows/nbproject/Makefile-impl.mk | 133 ++
.../launcher/windows/nbproject/Makefile-nbexec.mk | 120 ++
.../windows/nbproject/Makefile-nbexec64.mk | 120 ++
.../windows/nbproject/Makefile-variables.mk | 35 +
.../launcher/windows/nbproject/Package-nbexec.bash | 76 +
.../windows/nbproject/Package-nbexec64.bash | 76 +
.../launcher/windows/nbproject/configurations.xml | 54 +-
.../launcher/windows/nbproject/project.properties | 37 -
.../launcher/windows/nbproject/project.xml | 39 -
.../launcher/windows/platformlauncher.cpp | 30 +-
o.n.bootstrap/launcher/windows/platformlauncher.h | 7 +-
o.n.bootstrap/launcher/windows/utilsfuncs.cpp | 5 +-
o.n.bootstrap/launcher/windows/utilsfuncs.h | 5 +-
o.n.bootstrap/launcher/windows/version.h | 12 +-
o.n.bootstrap/manifest.mf | 2 +-
o.n.bootstrap/src/org/netbeans/CLIHandler.java | 22 +-
o.n.bootstrap/src/org/netbeans/ModuleManager.java | 29 +-
o.n.bootstrap/src/org/netbeans/PatchByteCode.java | 5 -
.../src/org/netbeans/ProxyClassLoader.java | 5 +-
.../src/org/netbeans/TopSecurityManager.java | 11 +-
o.n.core/manifest.mf | 2 +-
.../netbeans/beaninfo/editors/package-info.java | 39 -
.../src/org/netbeans/beaninfo/package-info.java | 39 -
o.n.core/src/org/netbeans/core/NotifyExcPanel.java | 13 +-
o.n.html.ko4j/build.xml | 39 -
o.n.html.ko4j/external/binaries-list | 2 +-
o.n.html.ko4j/nbproject/project.properties | 39 +-
o.n.html.ko4j/nbproject/project.xml | 41 +-
o.n.html.xhr4j/build.xml | 44 -
o.n.html.xhr4j/external/binaries-list | 1 -
o.n.html.xhr4j/manifest.mf | 1 -
o.n.html.xhr4j/nbproject/project.properties | 40 -
o.n.html.xhr4j/nbproject/project.xml | 54 -
o.n.insane/nbproject/project.properties | 2 +-
o.n.swing.outline/build.xml | 39 -
o.n.swing.outline/manifest.mf | 2 +-
.../nbproject/org-netbeans-swing-outline.sig | 12 +-
o.n.swing.outline/nbproject/project.properties | 37 -
o.n.swing.outline/nbproject/project.xml | 39 -
.../src/org/netbeans/swing/etable/ETable.java | 33 +-
.../src/org/netbeans/swing/outline/Outline.java | 6 +-
o.n.swing.plaf/manifest.mf | 2 +-
o.n.swing.plaf/nbproject/project.properties | 2 +-
.../src/org/netbeans/swing/plaf/Startup.java | 106 +-
.../swing/plaf/metal/StatusLineBorder.java | 4 +
.../swing/plaf/nimbus/StatusLineBorder.java | 4 +
.../src/org/netbeans/swing/plaf/package.html | 18 +-
.../swing/plaf/winclassic/StatusLineBorder.java | 4 +
.../swing/plaf/windows8/StatusLineBorder.java | 4 +
.../swing/plaf/winvista/StatusLineBorder.java | 4 +
.../swing/plaf/winxp/StatusLineBorder.java | 4 +
o.n.swing.tabcontrol/manifest.mf | 2 +-
.../nbproject/org-netbeans-swing-tabcontrol.sig | 7 +-
.../src/org/netbeans/swing/tabcontrol/package.html | 16 +-
.../plaf/BasicScrollingTabDisplayerUI.java | 3 -
.../plaf/BasicSlidingTabDisplayerUI.java | 4 +
openide.actions/manifest.mf | 2 +-
openide.actions/nbproject/org-openide-actions.sig | 2 +-
.../src/org/openide/actions/UndoRedoAction.java | 9 +-
.../src/org/openide/actions/doc-files/api.html | 44 +-
.../actions/doc-files/toolbarsAdvanced.html | 22 +-
.../src/org/openide/actions/package.html | 16 +-
.../org/openide/actions/UndoRedoActionTest.java | 9 +-
openide.awt/apichanges.xml | 22 +-
openide.awt/arch.xml | 10 +-
openide.awt/manifest.mf | 2 +-
openide.awt/nbproject/org-openide-awt.sig | 7 +-
.../src/org/netbeans/api/actions/package.html | 77 +-
.../modules/openide/awt/ActionProcessor.java | 9 +-
.../src/org/netbeans/spi/actions/package.html | 75 +-
openide.awt/src/org/openide/awt/ActionID.java | 9 +-
.../src/org/openide/awt/ActionReference.java | 9 +-
.../src/org/openide/awt/ActionReferences.java | 9 +-
.../src/org/openide/awt/ActionRegistration.java | 9 +-
.../src/org/openide/awt/CloseButtonFactory.java | 22 +-
.../src/org/openide/awt/HtmlRendererImpl.java | 9 +-
openide.awt/src/org/openide/awt/Mnemonics.java | 2 -
.../src/org/openide/awt/Mnemonics.properties | 4 +-
openide.awt/src/org/openide/awt/QuickSearch.java | 3 +-
.../src/org/openide/awt/ToolbarWithOverflow.java | 3 +-
openide.awt/src/org/openide/awt/package.html | 16 +-
.../modules/openide/awt/ActionProcessorTest.java | 9 +-
.../unit/src/org/openide/awt/UndoRedoTest.java | 9 +-
openide.compat/manifest.mf | 2 +-
.../src/org/openide/explorer/FindHelpTest.java | 5 -
openide.dialogs/apichanges.xml | 2 +-
openide.dialogs/arch.xml | 4 +-
openide.dialogs/manifest.mf | 2 +-
openide.dialogs/nbproject/org-openide-dialogs.sig | 3 +-
.../src/org/openide/NotifyDescriptor.java | 10 -
.../org/openide/doc-files/wizard-guidebook.html | 95 +-
openide.dialogs/src/org/openide/package.html | 75 +-
openide.execution.compat8/build.xml | 39 -
openide.execution.compat8/manifest.mf | 2 +-
.../nbproject/project.properties | 37 -
openide.execution.compat8/nbproject/project.xml | 39 -
.../openide/execution/compat8/Bundle.properties | 37 -
openide.execution/manifest.mf | 2 +-
.../nbproject/org-openide-execution.sig | 2 +-
.../src/org/openide/execution/doc-files/api.html | 50 +-
.../src/org/openide/execution/package.html | 16 +-
openide.explorer/apichanges.xml | 12 +-
openide.explorer/arch.xml | 6 +-
openide.explorer/manifest.mf | 2 +-
.../nbproject/org-openide-explorer.sig | 15 +-
.../src/META-INF/upgrade/TreeView.hint | 39 -
.../openide/explorer/ExplorerActionsImpl.java | 47 +-
.../src/org/openide/explorer/doc-files/api.html | 58 +-
.../explorer/doc-files/customExplorerViews.html | 26 +-
.../explorer/doc-files/propertySheetReference.html | 18 +-
.../doc-files/propertyViewCustomization.html | 22 +-
.../src/org/openide/explorer/package.html | 16 +-
.../explorer/propertysheet/PropertyPanel.java | 10 -
.../propertysheet/editors/package-info.java | 39 -
.../openide/explorer/propertysheet/package.html | 75 +-
.../openide/explorer/view/CustomPopupFactory.java | 258 ---
.../org/openide/explorer/view/NodeRenderer.java | 20 -
.../src/org/openide/explorer/view/TreeView.java | 16 +
.../org/openide/explorer/view/ViewTooltips.java | 64 +-
.../src/org/openide/explorer/view/package.html | 75 +-
.../explorer/propertysheet/NodeDeletionTest.java | 11 +-
.../PropertySheetQuickSearchEnablementTest.java | 11 +-
.../AnotherSetKeysBeforeEventsProcessedTest.java | 12 +-
.../openide/explorer/view/BeanTreeViewTest.java | 227 +--
.../openide/explorer/view/ContextTreeViewTest.java | 26 +-
.../explorer/view/TreeTableMemoryLeakTest.java | 39 -
.../explorer/view/TreeViewExpandAllTest.java | 12 +-
.../explorer/view/TreeViewQuickSearchTest.java | 111 +-
.../org/openide/explorer/view/TreeViewTest.java | 55 +-
openide.filesystems.compat8/arch.xml | 39 -
openide.filesystems.compat8/build.xml | 39 -
openide.filesystems.compat8/manifest.mf | 2 +-
.../nbproject/project.properties | 37 -
openide.filesystems.compat8/nbproject/project.xml | 39 -
.../openide/filesystems/compat8/Bundle.properties | 37 -
openide.filesystems.nb/build.xml | 39 -
openide.filesystems.nb/manifest.mf | 2 +-
.../nbproject/org-openide-filesystems-nb.sig | 152 +-
.../nbproject/project.properties | 37 -
openide.filesystems.nb/nbproject/project.xml | 39 -
.../org/openide/filesystems/nb/Bundle.properties | 37 -
openide.filesystems/apichanges.xml | 65 +-
openide.filesystems/arch.xml | 2 +-
openide.filesystems/manifest.mf | 2 +-
.../nbproject/org-openide-filesystems.sig | 63 +-
openide.filesystems/nbproject/project.properties | 2 +-
.../src/META-INF/upgrade/FileObject.hint | 39 -
.../src/META-INF/upgrade/FileUtil.hint | 59 -
.../src/META-INF/upgrade/Repository.hint | 39 -
.../filesystems/RecognizeInstanceFiles.java | 48 +-
.../src/org/openide/filesystems/FileUtil.java | 261 +--
.../filesystems/JarArchiveRootProvider.java | 214 ---
.../src/org/openide/filesystems/attributes.dtd | 39 -
.../openide/filesystems/doc-files/HOWTO-MIME.html | 16 +-
.../src/org/openide/filesystems/doc-files/api.html | 56 +-
.../doc-files/resolverDocumentation.html | 75 +-
.../src/org/openide/filesystems/filesystem.dtd | 39 -
.../src/org/openide/filesystems/filesystem1_1.dtd | 39 -
.../src/org/openide/filesystems/filesystem1_2.dtd | 39 -
.../src/org/openide/filesystems/package.html | 16 +-
.../filesystems/spi/ArchiveRootProvider.java | 156 --
.../src/org/openide/filesystems/FileUtilTest.java | 2 +-
.../openide/filesystems/JarFileSystemHidden.java | 15 +-
.../filesystems/annotations/LayerBuilderTest.java | 5 -
openide.io/apichanges.xml | 14 +-
openide.io/manifest.mf | 2 +-
openide.io/nbproject/org-openide-io.sig | 2 +-
openide.io/src/org/openide/windows/package.html | 18 +-
openide.loaders/apichanges.xml | 31 +-
openide.loaders/arch.xml | 6 +-
openide.loaders/manifest.mf | 2 +-
openide.loaders/nbproject/org-openide-loaders.sig | 61 +-
.../upgrade/org.openide.loaders.DataObject.hint | 39 -
.../modules/openide/loaders/EntityCatalog.dtd | 39 -
.../org/netbeans/modules/openide/loaders/layer.xml | 39 -
.../netbeans/modules/openide/loaders/xmlinfo.dtd | 39 -
.../netbeans/modules/templates/Bundle.properties | 37 -
openide.loaders/src/org/openide/awt/MenuBar.java | 91 +-
.../src/org/openide/loaders/Bundle.properties | 1 -
.../src/org/openide/loaders/DataFolder.java | 15 -
.../src/org/openide/loaders/DataNode.java | 191 +--
.../src/org/openide/loaders/FolderChildren.java | 6 +-
.../src/org/openide/loaders/FolderComparator.java | 124 --
.../src/org/openide/loaders/FolderOrder.java | 19 +-
.../src/org/openide/loaders/SortModeEditor.java | 6 +-
.../src/org/openide/loaders/doc-files/api.html | 100 +-
.../src/org/openide/loaders/package.html | 16 +-
.../unit/src/META-INF/netbeans/translate.names | 37 -
.../unit/src/org/openide/awt/MenuBarCNFETest.java | 10 +-
.../test/unit/src/org/openide/awt/MenuBarTest.java | 162 +-
.../src/org/openide/loaders/Deadlock60917Test.java | 2 -
.../org/openide/loaders/FolderComparatorTest.java | 167 --
openide.modules/apichanges.xml | 8 +-
openide.modules/manifest.mf | 2 +-
openide.modules/nbproject/org-openide-modules.sig | 15 +-
.../src/org/openide/modules/doc-files/api.html | 42 +-
.../org/openide/modules/doc-files/classpath.html | 20 +-
.../openide/modules/doc-files/i18n-branding.html | 16 +-
.../src/org/openide/modules/package.html | 16 +-
openide.nodes/apichanges.xml | 30 +-
openide.nodes/arch.xml | 10 +-
openide.nodes/manifest.mf | 2 +-
openide.nodes/nbproject/org-openide-nodes.sig | 4 +-
.../META-INF/upgrade/org.openides.nodes.Node.hint | 39 -
openide.nodes/src/org/openide/cookies/package.html | 75 +-
.../src/org/openide/nodes/AsynchChildren.java | 6 -
.../src/org/openide/nodes/ChildFactory.java | 5 -
.../org/openide/nodes/DestroyableNodesFactory.java | 64 -
.../src/org/openide/nodes/EntrySupportLazy.java | 30 +-
.../src/org/openide/nodes/SynchChildren.java | 7 -
.../src/org/openide/nodes/doc-files/api.html | 124 +-
openide.nodes/src/org/openide/nodes/package.html | 16 +-
.../src/org/openide/util/actions/CookieAction.java | 2 +-
.../modules/openide/nodes/package-info.java | 39 -
.../src/org/openide/nodes/ChildFactoryTest.java | 83 -
openide.options/manifest.mf | 2 +-
.../src/org/openide/options/doc-files/api.html | 28 +-
.../src/org/openide/options/package.html | 16 +-
openide.text/apichanges.xml | 2 +-
openide.text/arch.xml | 4 +-
openide.text/manifest.mf | 2 +-
openide.text/nbproject/org-openide-text.sig | 20 +-
.../openide/text/CloneableEditorInitializer.java | 1 -
.../org/openide/text/CloneableEditorSupport.java | 20 +-
.../src/org/openide/text/DocumentLine.java | 61 +-
.../src/org/openide/text/DocumentOpenClose.java | 16 +-
.../src/org/openide/text/EditorSupportLineSet.java | 31 +-
openide.text/src/org/openide/text/Line.java | 58 +-
openide.text/src/org/openide/text/LineVector.java | 492 ------
.../src/org/openide/text/QuietEditorPane.java | 29 +-
.../src/org/openide/text/doc-files/api.html | 124 +-
openide.text/src/org/openide/text/package.html | 16 +-
.../unit/src/org/openide/text/LineSetTest.java | 38 -
.../text/UndoRedoWrappingCooperationTest.java | 9 +-
openide.util.enumerations/manifest.mf | 2 +-
.../src/org/openide/util/enum/package.html | 75 +-
openide.util.lookup/apichanges.xml | 12 +-
openide.util.lookup/arch.xml | 26 +-
openide.util.lookup/build.xml | 39 -
openide.util.lookup/manifest.mf | 2 +-
.../nbproject/org-openide-util-lookup.sig | 5 +-
openide.util.lookup/nbproject/project.properties | 2 +-
openide.util.lookup/nbproject/project.xml | 39 -
.../META-INF/upgrade/org.openide.util.Lookup.hint | 39 -
.../src/org/openide/util/lookup/Bundle.properties | 37 -
.../openide/util/lookup/MetaInfServicesLookup.java | 2 +-
.../org/openide/util/lookup/doc-files/index.html | 91 +-
.../openide/util/lookup/doc-files/lookup-api.html | 77 +-
.../openide/util/lookup/doc-files/lookup-spi.html | 81 +-
.../implspi/AbstractServiceProviderProcessor.java | 5 +-
.../openide/util/lookup/implspi/ActiveQueue.java | 97 +-
.../src/org/openide/util/lookup/package.html | 16 +-
.../src/org/openide/util/package.html | 75 +-
.../modules/openide/util/ActiveQueueTest.java | 2 -
.../openide/util/lookup/LookupPermGenLeakTest.java | 2 +-
.../util/test/AnnotationProcessorTestUtils.java | 20 +-
openide.util.ui/apichanges.xml | 6 +-
openide.util.ui/arch.xml | 8 +-
openide.util.ui/manifest.mf | 2 +-
openide.util.ui/nbproject/org-openide-util-ui.sig | 1703 --------------------
.../src/META-INF/upgrade/ImageUtilities.hint | 39 -
openide.util.ui/src/META-INF/upgrade/NbBundle.hint | 39 -
.../src/META-INF/upgrade/Utilities.hint | 39 -
.../modules/openide/util/NbBundleProcessor.java | 2 +-
openide.util.ui/src/org/openide/package.html | 75 +-
.../src/org/openide/util/ImageUtilities.java | 29 +-
.../openide/util/actions/CallableSystemAction.java | 2 +-
.../openide/util/actions/CallbackSystemAction.java | 2 +-
.../src/org/openide/util/actions/package.html | 75 +-
.../src/org/openide/util/datatransfer/package.html | 75 +-
.../src/org/openide/util/doc-files/api.html | 44 +-
.../src/org/openide/util/doc-files/logging.html | 69 +-
.../org/openide/util/doc-files/preferences.html | 41 +-
openide.util.ui/src/org/openide/util/package.html | 75 +-
openide.util/arch.xml | 49 +-
openide.util/build.xml | 39 -
openide.util/manifest.mf | 2 +-
openide.util/nbproject/org-openide-util.sig | 1114 -------------
openide.util/nbproject/project.properties | 37 -
openide.util/nbproject/project.xml | 39 -
.../openide/util/DefaultMutexImplementation.java | 43 +
.../modules/openide/util/NbBundleProcessor.java | 2 +-
.../src/org/openide/util/base/Bundle.properties | 37 -
.../src/org/openide/util/base/doc-files/api.html | 22 +-
.../org/openide/util/base/doc-files/logging.html | 47 +-
.../src/org/openide/util/doc-files/api.html | 40 +-
.../src/org/openide/util/doc-files/logging.html | 69 +-
.../org/openide/util/doc-files/preferences.html | 41 +-
openide.util/src/org/openide/util/io/package.html | 75 +-
openide.util/src/org/openide/util/package.html | 75 +-
openide.util/src/org/openide/xml/package.html | 16 +-
.../src/org/openide/util/ReadWriteAccessTest.java | 132 +-
.../org/openide/util/UtilitiesActiveQueueTest.java | 44 -
openide.windows/apichanges.xml | 8 +-
openide.windows/arch.xml | 10 +-
openide.windows/manifest.mf | 2 +-
openide.windows/nbproject/org-openide-windows.sig | 6 +-
.../src/org/openide/windows/doc-files/api.html | 74 +-
.../src/org/openide/windows/package.html | 16 +-
options.api/manifest.mf | 2 +-
.../nbproject/org-netbeans-modules-options-api.sig | 2 +-
.../netbeans/modules/options/CategoryModel.java | 5 +-
.../org/netbeans/modules/options/OptionsPanel.java | 25 +-
options.keymap/manifest.mf | 2 +-
options.keymap/nbproject/project.properties | 37 -
print/manifest.mf | 2 +-
print/nbproject/org-netbeans-modules-print.sig | 2 +-
progress.ui/build.xml | 39 -
progress.ui/manifest.mf | 2 +-
progress.ui/nbproject/project.properties | 38 -
progress.ui/nbproject/project.xml | 39 -
queries/manifest.mf | 2 +-
queries/nbproject/org-netbeans-modules-queries.sig | 2 +-
queries/src/org/netbeans/api/queries/package.html | 18 +-
queries/src/org/netbeans/spi/queries/package.html | 16 +-
sampler/build.xml | 39 -
sampler/manifest.mf | 2 +-
sampler/nbproject/org-netbeans-modules-sampler.sig | 2 +-
sampler/nbproject/project.properties | 37 -
sampler/nbproject/project.xml | 39 -
.../org/netbeans/modules/sampler/Bundle.properties | 37 -
sendopts/apichanges.xml | 8 +-
sendopts/arch.xml | 30 +-
sendopts/manifest.mf | 2 +-
.../nbproject/org-netbeans-modules-sendopts.sig | 2 +-
.../src/org/netbeans/api/sendopts/package.html | 39 -
.../src/org/netbeans/spi/sendopts/package.html | 43 +-
settings/apichanges.xml | 4 +-
.../modules/settings/examples/Bundle.properties | 37 -
.../examples/resources/JavaCompilerSetting.xml | 39 -
.../settings/examples/resources/ProxySettings.xml | 39 -
settings/manifest.mf | 2 +-
.../nbproject/org-netbeans-modules-settings.sig | 2 +-
.../src/org/netbeans/spi/settings/package.html | 77 +-
spi.actions/build.xml | 39 -
spi.actions/manifest.mf | 2 +-
spi.actions/nbproject/project.properties | 37 -
spi.actions/nbproject/project.xml | 39 -
.../src/org/netbeans/spi/actions/Bundle.properties | 37 -
spi.quicksearch/build.xml | 39 -
spi.quicksearch/manifest.mf | 2 +-
.../nbproject/org-netbeans-spi-quicksearch.sig | 2 +-
spi.quicksearch/nbproject/project.properties | 37 -
spi.quicksearch/nbproject/project.xml | 39 -
.../org/netbeans/spi/quicksearch/Bundle.properties | 37 -
templates/manifest.mf | 2 +-
.../modules/templates/actions/TemplatesAction.java | 2 +-
.../modules/templates/resources/templatesFile.html | 75 +-
.../templates/resources/templatesFolder.html | 75 +-
templatesui/build.xml | 39 -
templatesui/manifest.mf | 2 +-
templatesui/nbproject/project.properties | 37 -
templatesui/nbproject/project.xml | 39 -
.../modules/templatesui/AbstractWizard.java | 11 +-
.../netbeans/modules/templatesui/Bundle.properties | 37 -
.../modules/templatesui/HTMLJavaTemplateTest.java | 9 -
.../modules/templatesui/HTMLTemplateTest.java | 37 +-
.../org/netbeans/modules/templatesui/RunTCK.java | 9 -
.../unit/src/org/netbeans/modules/templatesui/x.js | 40 -
uihandler/arch.xml | 2 +-
uihandler/manifest.mf | 2 +-
.../nbproject/org-netbeans-modules-uihandler.sig | 2 +-
.../org/netbeans/modules/uihandler/Connecting.html | 39 -
.../org/netbeans/modules/uihandler/Installer.java | 6 +-
.../ReporterResultTopComponentSettings.xml | 39 +-
.../ReporterResultTopComponentWstcref.xml | 39 +-
.../netbeans/modules/uihandler/SAXException.html | 39 -
.../modules/uihandler/UnknownHostException.html | 43 +-
.../modules/uihandler/api/doc-files/ui.html | 43 +-
.../src/org/netbeans/modules/uihandler/layer.xml | 39 -
.../src/org/netbeans/modules/uihandler/error.html | 41 +-
.../org/netbeans/modules/uihandler/error_ja.html | 45 +-
.../org/netbeans/modules/uihandler/index_ja.html | 43 +-
.../modules/uihandler/parsing_with_suffix.html | 39 -
1063 files changed, 10723 insertions(+), 28095 deletions(-)
diff --git a/api.annotations.common/build.xml b/api.annotations.common/build.xml
index a5c1d71..fef74af 100644
--- a/api.annotations.common/build.xml
+++ b/api.annotations.common/build.xml
@@ -1,62 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="api.annotations.common">
<description>Builds, tests, and runs the project org.netbeans.annotations.common</description>
-
+
<import file="../nbbuild/templates/projectized.xml"/>
-
+
<!--
<target name="findbugs-annotations-init" if="api.annotations.common.findbugs">
<echo>Building common annotations for usage with FindBugs...</echo>
<property name="src.dir" location="build/generated"/>
<property name="src.common" location="src"/>
-
+
</target>
-
+
<target name="build-init" depends="findbugs-annotations-init, projectized.build-init"/>
-
+
<target name="compile" depends="findbugs-annotations, projectized-common.compile"/>
-
- <target name="findbugs-annotations" if="api.annotations.common.findbugs" depends="build-init, projectized.findbugs-init">
+
+ <target name="findbugs-annotations" if="api.annotations.common.findbugs" depends="build-init, projectized.findbugs-init">
<copy todir="${src.dir}">
<fileset dir="${src.common}">
<exclude name="org/netbeans/api/annotations/common/CheckForNull.java"/>
diff --git a/api.annotations.common/manifest.mf b/api.annotations.common/manifest.mf
index bd91fa3..7d01c50 100644
--- a/api.annotations.common/manifest.mf
+++ b/api.annotations.common/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.api.annotations.common/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/annotations/common/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.27.1
+OpenIDE-Module-Specification-Version: 1.26.1
diff --git a/api.annotations.common/nbproject/org-netbeans-api-annotations-common.sig b/api.annotations.common/nbproject/org-netbeans-api-annotations-common.sig
index 28ca96c..245834e 100644
--- a/api.annotations.common/nbproject/org-netbeans-api-annotations-common.sig
+++ b/api.annotations.common/nbproject/org-netbeans-api-annotations-common.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.26.1
+#Version 1.24
CLSS public abstract interface java.lang.annotation.Annotation
meth public abstract boolean equals(java.lang.Object)
diff --git a/api.annotations.common/nbproject/project.xml b/api.annotations.common/nbproject/project.xml
index c58b215..fd6cbab 100644
--- a/api.annotations.common/nbproject/project.xml
+++ b/api.annotations.common/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/api.annotations.common/src/org/netbeans/annotations/common/resources/Bundle.properties b/api.annotations.common/src/org/netbeans/annotations/common/resources/Bundle.properties
index c8ca60b..3eac2cc 100644
--- a/api.annotations.common/src/org/netbeans/annotations/common/resources/Bundle.properties
+++ b/api.annotations.common/src/org/netbeans/annotations/common/resources/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Long-Description=\
Contains annotations useful for static analysis, such as a @SuppressWarnings usable by FindBugs.
OpenIDE-Module-Name=Common Annotations
diff --git a/api.htmlui/arch.xml b/api.htmlui/arch.xml
index d564ddd..733b7e2 100644
--- a/api.htmlui/arch.xml
+++ b/api.htmlui/arch.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
@@ -73,7 +34,7 @@ Contributor(s):
<answer id="arch-usecases">
<p>
- Primary purpose of this API is to allow smooth use of HTML based UI
+ Primary purpose of this API is to allow smooth use of HTML based UI
in NetBeans Platform. To achieve that it provides specific annotatations
like <a href="@TOP@/org/netbeans/api/htmlui/OpenHTMLRegistration.html">@OpenHTMLRegistration</a>,
but otherwise it builds on the same usecases as the
diff --git a/api.htmlui/build.xml b/api.htmlui/build.xml
index e5f25f3..e3d245f 100644
--- a/api.htmlui/build.xml
+++ b/api.htmlui/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="api.htmlui">
<description>Builds, tests, and runs the project org.netbeans.api.htmlui</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/api.htmlui/manifest.mf b/api.htmlui/manifest.mf
index aaba544..0663568 100644
--- a/api.htmlui/manifest.mf
+++ b/api.htmlui/manifest.mf
@@ -1,5 +1,5 @@
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.5.1
+OpenIDE-Module-Specification-Version: 1.4.1
diff --git a/api.htmlui/nbproject/org-netbeans-api-htmlui.sig b/api.htmlui/nbproject/org-netbeans-api-htmlui.sig
deleted file mode 100644
index d06b7b4..0000000
--- a/api.htmlui/nbproject/org-netbeans-api-htmlui.sig
+++ /dev/null
@@ -1,80 +0,0 @@
-#Signature file v4.1
-#Version 1.4.1
-
-CLSS public java.lang.Object
-cons public init()
-meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
-meth protected void finalize() throws java.lang.Throwable
-meth public boolean equals(java.lang.Object)
-meth public final java.lang.Class<?> getClass()
-meth public final void notify()
-meth public final void notifyAll()
-meth public final void wait() throws java.lang.InterruptedException
-meth public final void wait(long) throws java.lang.InterruptedException
-meth public final void wait(long,int) throws java.lang.InterruptedException
-meth public int hashCode()
-meth public java.lang.String toString()
-
-CLSS public abstract interface java.lang.annotation.Annotation
-meth public abstract boolean equals(java.lang.Object)
-meth public abstract int hashCode()
-meth public abstract java.lang.Class<? extends java.lang.annotation.Annotation> annotationType()
-meth public abstract java.lang.String toString()
-
-CLSS public abstract interface !annotation java.lang.annotation.Documented
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-
-CLSS public abstract interface !annotation java.lang.annotation.Retention
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract java.lang.annotation.RetentionPolicy value()
-
-CLSS public abstract interface !annotation java.lang.annotation.Target
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract java.lang.annotation.ElementType[] value()
-
-CLSS public abstract interface !annotation org.netbeans.api.htmlui.HTMLComponent
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[METHOD])
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault java.lang.String className()
-meth public abstract !hasdefault java.lang.String[] techIds()
-meth public abstract java.lang.Class<?> type()
-meth public abstract java.lang.String url()
-
-CLSS public abstract interface !annotation org.netbeans.api.htmlui.HTMLDialog
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[METHOD])
-innr public final static Builder
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault java.lang.String className()
-meth public abstract !hasdefault java.lang.String[] techIds()
-meth public abstract java.lang.String url()
-
-CLSS public final static org.netbeans.api.htmlui.HTMLDialog$Builder
- outer org.netbeans.api.htmlui.HTMLDialog
-meth public !varargs org.netbeans.api.htmlui.HTMLDialog$Builder addTechIds(java.lang.String[])
-meth public <%0 extends java.lang.Object> {%%0} component(java.lang.Class<{%%0}>)
-meth public java.lang.String showAndWait()
-meth public org.netbeans.api.htmlui.HTMLDialog$Builder loadFinished(java.lang.Runnable)
-meth public static org.netbeans.api.htmlui.HTMLDialog$Builder newDialog(java.lang.String)
-supr java.lang.Object
-hfds impl
-
-CLSS public abstract interface !annotation org.netbeans.api.htmlui.OpenHTMLRegistration
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[METHOD])
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault java.lang.String iconBase()
-meth public abstract !hasdefault java.lang.String[] techIds()
-meth public abstract java.lang.String displayName()
-meth public abstract java.lang.String url()
-
diff --git a/api.htmlui/nbproject/project.properties b/api.htmlui/nbproject/project.properties
index 53a32e0..a79068c 100644
--- a/api.htmlui/nbproject/project.properties
+++ b/api.htmlui/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/api.htmlui/nbproject/project.xml b/api.htmlui/nbproject/project.xml
index 2948829..2e8d4e7 100644
--- a/api.htmlui/nbproject/project.xml
+++ b/api.htmlui/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
@@ -57,12 +18,6 @@ Contributor(s):
<run-dependency/>
</dependency>
<dependency>
- <code-name-base>net.java.html.geo</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency/>
- </dependency>
- <dependency>
<code-name-base>net.java.html.boot.fx</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -79,10 +34,6 @@ Contributor(s):
<run-dependency/>
</dependency>
<dependency>
- <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/>
diff --git a/api.htmlui/src/org/netbeans/modules/htmlui/Bundle.properties b/api.htmlui/src/org/netbeans/modules/htmlui/Bundle.properties
index c6b263f..fbef0aa 100644
--- a/api.htmlui/src/org/netbeans/modules/htmlui/Bundle.properties
+++ b/api.htmlui/src/org/netbeans/modules/htmlui/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=HTML UI API
AlertTitle=Warning
diff --git a/api.htmlui/src/org/netbeans/modules/htmlui/FreeGeoProvider.java b/api.htmlui/src/org/netbeans/modules/htmlui/FreeGeoProvider.java
deleted file mode 100644
index 47ece67..0000000
--- a/api.htmlui/src/org/netbeans/modules/htmlui/FreeGeoProvider.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-package org.netbeans.modules.htmlui;
-
-import net.java.html.json.Model;
-import net.java.html.json.OnReceive;
-import net.java.html.json.Property;
-import org.netbeans.html.geo.spi.GLProvider;
-import org.netbeans.html.geo.spi.GLProvider.Query;
-import org.openide.util.lookup.ServiceProvider;
-
- at ServiceProvider(service = GLProvider.class)
- at Model(className = "FreeGeoIp", properties = {
- @Property(name = "id", type = String.class),
- @Property(name = "country_code", type = String.class),
- @Property(name = "country_name", type = String.class),
- @Property(name = "region_code", type = String.class),
- @Property(name = "region_name", type = String.class),
- @Property(name = "city", type = String.class),
- @Property(name = "zip_code", type = String.class),
- @Property(name = "time_zone", type = String.class),
- @Property(name = "latitude", type = double.class),
- @Property(name = "longitude", type = double.class),
- @Property(name = "metro_code", type = int.class),
-})
-public final class FreeGeoProvider extends GLProvider<FreeGeoIp,Query> {
- private static FreeGeoProvider INSTANCE;
- private Query current;
-
- public FreeGeoProvider() {
- INSTANCE = this;
- }
-
- @Override
- protected Query start(Query query) {
- current = query;
- new FreeGeoIp().findLocation(query);
- return query;
- }
-
- @Override
- protected void stop(Query watch) {
- }
-
- @Override
- protected double latitude(FreeGeoIp coords) {
- return coords.getLatitude();
- }
-
- @Override
- protected double longitude(FreeGeoIp coords) {
- return coords.getLongitude();
- }
-
- @Override
- protected double accuracy(FreeGeoIp coords) {
- return 0;
- }
-
- @Override
- protected Double altitude(FreeGeoIp coords) {
- return null;
- }
-
- @Override
- protected Double altitudeAccuracy(FreeGeoIp coords) {
- return null;
- }
-
- @Override
- protected Double heading(FreeGeoIp coords) {
- return null;
- }
-
- @Override
- protected Double speed(FreeGeoIp coords) {
- return null;
- }
-
- @OnReceive(url = "https://freegeoip.net/json/", onError = "noLocation")
- static void findLocation(FreeGeoIp model, FreeGeoIp data, Query q) {
- INSTANCE.callback(q, System.currentTimeMillis(), data, null);
- }
-
- static void noLocation(FreeGeoIp model, Exception ex) {
- INSTANCE.callback(INSTANCE.current, System.currentTimeMillis(), null, ex);
- }
-}
diff --git a/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/FreeGeoProviderTest.java b/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/FreeGeoProviderTest.java
deleted file mode 100644
index c21908c..0000000
--- a/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/FreeGeoProviderTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-package org.netbeans.modules.htmlui;
-
-import java.net.URL;
-import java.util.concurrent.CountDownLatch;
-import javafx.application.Platform;
-import javafx.embed.swing.JFXPanel;
-import javafx.scene.Scene;
-import javafx.scene.web.WebView;
-import javax.swing.JFrame;
-import net.java.html.BrwsrCtx;
-import net.java.html.geo.OnLocation;
-import net.java.html.geo.Position;
-import static org.testng.Assert.assertNotNull;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-public class FreeGeoProviderTest {
- private static final CountDownLatch down = new CountDownLatch(1);
- private static BrwsrCtx ctx;
-
- private CountDownLatch done = new CountDownLatch(1);
- private Position position;
- private Exception error;
-
- @BeforeClass
- public static void initializeContext() throws Exception {
- final JFXPanel p = new JFXPanel();
- final URL u = DialogsTest.class.getResource("/org/netbeans/api/htmlui/empty.html");
- Platform.runLater(new Runnable() {
- @Override
- public void run() {
- WebView v = new WebView();
- Scene s = new Scene(v);
- p.setScene(s);
- NbBrowsers.load(v, u, new Runnable() {
- @Override
- public void run() {
- ctx = BrwsrCtx.findDefault(DialogsTest.class);
- down.countDown();
- }
- }, null);
- }
- });
- down.await();
- JFrame f = new JFrame();
- f.getContentPane().add(p);
- f.pack();
- f.setVisible(true);
- }
-
-
- @Test
- public void checkGeoLocation() throws InterruptedException {
- ctx.execute(new Runnable() {
- @Override
- public void run() {
- Position.Handle query = Loc.createQuery(FreeGeoProviderTest.this);
- query.setTimeout(10000);
- query.start();
- }
- });
- done.await();
- if (error != null) {
- return;
- }
- assertNotNull(position);
- }
-
- @OnLocation(className = "Loc", onError = "noLocation")
- public void location(Position p) {
- this.position = p;
- done.countDown();
- }
-
- public void noLocation(Exception ex) {
- error = ex;
- done.countDown();
- }
-}
diff --git a/api.intent/arch.xml b/api.intent/arch.xml
index 4386254..e6b4336 100644
--- a/api.intent/arch.xml
+++ b/api.intent/arch.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
diff --git a/api.intent/build.xml b/api.intent/build.xml
index 4ed7be7..c4cd3bf 100644
--- a/api.intent/build.xml
+++ b/api.intent/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="api.intent">
<description>Builds, tests, and runs the project org.netbeans.api.intent</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/api.intent/manifest.mf b/api.intent/manifest.mf
index a411994..49b13ca 100644
--- a/api.intent/manifest.mf
+++ b/api.intent/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.api.intent
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/intent/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.2.1
+OpenIDE-Module-Specification-Version: 1.1.1
diff --git a/api.intent/nbproject/org-netbeans-api-intent.sig b/api.intent/nbproject/org-netbeans-api-intent.sig
deleted file mode 100644
index 880e95a..0000000
--- a/api.intent/nbproject/org-netbeans-api-intent.sig
+++ /dev/null
@@ -1,118 +0,0 @@
-#Signature file v4.1
-#Version 1.1.1
-
-CLSS public abstract interface java.io.Serializable
-
-CLSS public java.lang.Exception
-cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean)
-cons public init()
-cons public init(java.lang.String)
-cons public init(java.lang.String,java.lang.Throwable)
-cons public init(java.lang.Throwable)
-supr java.lang.Throwable
-hfds serialVersionUID
-
-CLSS public java.lang.Object
-cons public init()
-meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
-meth protected void finalize() throws java.lang.Throwable
-meth public boolean equals(java.lang.Object)
-meth public final java.lang.Class<?> getClass()
-meth public final void notify()
-meth public final void notifyAll()
-meth public final void wait() throws java.lang.InterruptedException
-meth public final void wait(long) throws java.lang.InterruptedException
-meth public final void wait(long,int) throws java.lang.InterruptedException
-meth public int hashCode()
-meth public java.lang.String toString()
-
-CLSS public java.lang.Throwable
-cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean)
-cons public init()
-cons public init(java.lang.String)
-cons public init(java.lang.String,java.lang.Throwable)
-cons public init(java.lang.Throwable)
-intf java.io.Serializable
-meth public final java.lang.Throwable[] getSuppressed()
-meth public final void addSuppressed(java.lang.Throwable)
-meth public java.lang.StackTraceElement[] getStackTrace()
-meth public java.lang.String getLocalizedMessage()
-meth public java.lang.String getMessage()
-meth public java.lang.String toString()
-meth public java.lang.Throwable fillInStackTrace()
-meth public java.lang.Throwable getCause()
-meth public java.lang.Throwable initCause(java.lang.Throwable)
-meth public void printStackTrace()
-meth public void printStackTrace(java.io.PrintStream)
-meth public void printStackTrace(java.io.PrintWriter)
-meth public void setStackTrace(java.lang.StackTraceElement[])
-supr java.lang.Object
-hfds CAUSE_CAPTION,EMPTY_THROWABLE_ARRAY,NULL_CAUSE_MESSAGE,SELF_SUPPRESSION_MESSAGE,SUPPRESSED_CAPTION,SUPPRESSED_SENTINEL,UNASSIGNED_STACK,backtrace,cause,detailMessage,serialVersionUID,stackTrace,suppressedExceptions
-hcls PrintStreamOrWriter,SentinelHolder,WrappedPrintStream,WrappedPrintWriter
-
-CLSS public abstract interface java.lang.annotation.Annotation
-meth public abstract boolean equals(java.lang.Object)
-meth public abstract int hashCode()
-meth public abstract java.lang.Class<? extends java.lang.annotation.Annotation> annotationType()
-meth public abstract java.lang.String toString()
-
-CLSS public abstract interface org.netbeans.api.intent.Callback
-meth public abstract void failure(java.lang.Exception)
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public abstract void success(java.lang.Object)
- anno 1 org.netbeans.api.annotations.common.NullAllowed()
-
-CLSS public final org.netbeans.api.intent.Intent
-cons public init(java.lang.String,java.net.URI)
- anno 1 org.netbeans.api.annotations.common.NonNull()
- anno 2 org.netbeans.api.annotations.common.NonNull()
-fld public final static java.lang.String ACTION_EDIT = "EDIT"
-fld public final static java.lang.String ACTION_VIEW = "VIEW"
-meth public java.lang.String getAction()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public java.lang.String toString()
-meth public java.net.URI getUri()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public java.util.SortedSet<? extends org.netbeans.api.intent.IntentAction> getIntentActions()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public java.util.concurrent.Future<java.lang.Object> execute()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public void execute(org.netbeans.api.intent.Callback)
- anno 1 org.netbeans.api.annotations.common.NullAllowed()
-supr java.lang.Object
-hfds LOG,action,uri
-
-CLSS public final org.netbeans.api.intent.IntentAction
-meth public java.lang.String getDisplayName()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public java.lang.String getIcon()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public java.util.concurrent.Future<java.lang.Object> execute()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public void execute(org.netbeans.api.intent.Callback)
- anno 1 org.netbeans.api.annotations.common.NullAllowed()
-supr java.lang.Object
-hfds delegate,intent
-
-CLSS public org.netbeans.api.intent.NoAvailableHandlerException
-cons public init(org.netbeans.api.intent.Intent)
-cons public init(org.netbeans.api.intent.Intent,java.lang.Throwable)
-supr java.lang.Exception
-
-CLSS abstract interface org.netbeans.api.intent.package-info
-
-CLSS public abstract interface !annotation org.netbeans.spi.intent.IntentHandlerRegistration
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault java.lang.String icon()
-meth public abstract int position()
-meth public abstract java.lang.String displayName()
-meth public abstract java.lang.String uriPattern()
-meth public abstract java.lang.String[] actions()
-
-CLSS public abstract interface org.netbeans.spi.intent.Result
-meth public abstract void setException(java.lang.Exception)
-meth public abstract void setResult(java.lang.Object)
- anno 1 org.netbeans.api.annotations.common.NullAllowed()
-
-CLSS abstract interface org.netbeans.spi.intent.package-info
-
diff --git a/api.intent/nbproject/project.properties b/api.intent/nbproject/project.properties
index 0497a1d..88b6ada 100644
--- a/api.intent/nbproject/project.properties
+++ b/api.intent/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/api.intent/nbproject/project.xml b/api.intent/nbproject/project.xml
index 4f197f6..7d1ecf0 100644
--- a/api.intent/nbproject/project.xml
+++ b/api.intent/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/api.intent/src/org/netbeans/api/intent/Bundle.properties b/api.intent/src/org/netbeans/api/intent/Bundle.properties
index be651e5..f359be1 100644
--- a/api.intent/src/org/netbeans/api/intent/Bundle.properties
+++ b/api.intent/src/org/netbeans/api/intent/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Long-Description=\
API for invoking intended operations (described by suitable type of object, e.g. \
diff --git a/api.io/apichanges.xml b/api.io/apichanges.xml
index 23e4ed2..6186246 100644
--- a/api.io/apichanges.xml
+++ b/api.io/apichanges.xml
@@ -125,9 +125,9 @@ is the proper place.
and new methods into class <a href="@TOP@/org/netbeans/spi/io/support/Hyperlinks.html">Hyperlinks</a>:
</p>
<ul>
- <li><a href="@TOP@/org/netbeans/spi/io/support/Hyperlinks.html#getType-org.netbeans.api.io.Hyperlink-">Hyperlinks.getType(Hyperlink)</a></li>
- <li><a href="@TOP@/org/netbeans/spi/io/support/Hyperlinks.html#getIntent-org.netbeans.api.io.Hyperlink-">Hyperlinks.getIntent(Hyperlink)</a></li>
- <li><a href="@TOP@/org/netbeans/spi/io/support/Hyperlinks.html#getRunnable-org.netbeans.api.io.Hyperlink-">Hyperlinks.getRunnable(Hyperlink)</a></li>
+ <li><a href="@TOP@/org/netbeans/spi/io/support/Hyperlinks.html#getType(org.netbeans.api.io.Hyperlink)">Hyperlinks.getType(Hyperlink)</a></li>
+ <li><a href="@TOP@/org/netbeans/spi/io/support/Hyperlinks.html#getIntent(org.netbeans.api.io.Hyperlink)">Hyperlinks.getIntent(Hyperlink)</a></li>
+ <li><a href="@TOP@/org/netbeans/spi/io/support/Hyperlinks.html#getRunnable(org.netbeans.api.io.Hyperlink)">Hyperlinks.getRunnable(Hyperlink)</a></li>
</ul>
</description>
<issue number="249321" />
@@ -148,8 +148,8 @@ is the proper place.
Added new static methods into class <a href="@TOP@/org/netbeans/api/io/Hyperlink.html">Hyperlink</a>:
</p>
<ul>
- <li><a href="@TOP@/org/netbeans/api/io/Hyperlink.html#from-org.netbeans.api.intent.Intent-">Hyperlink.from(Intent)</a></li>
- <li><a href="@TOP@/org/netbeans/api/io/Hyperlink.html#from-org.netbeans.api.intent.Intent-boolean-">Hyperlink.from(Intent, boolean)</a></li>
+ <li><a href="@TOP@/org/netbeans/api/io/Hyperlink.html#from(org.netbeans.api.intent.Intent)">Hyperlink.from(Intent)</a></li>
+ <li><a href="@TOP@/org/netbeans/api/io/Hyperlink.html#from(org.netbeans.api.intent.Intent, boolean)">Hyperlink.from(Intent, boolean)</a></li>
</ul>
</description>
<issue number="249321" />
diff --git a/api.io/arch.xml b/api.io/arch.xml
index d4c8ca7..ef0ea69 100644
--- a/api.io/arch.xml
+++ b/api.io/arch.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
diff --git a/api.io/build.xml b/api.io/build.xml
index 3b0d134..8232932 100644
--- a/api.io/build.xml
+++ b/api.io/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="api.io">
<description>Builds, tests, and runs the project org.netbeans.api.io</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/api.io/manifest.mf b/api.io/manifest.mf
index 51eeafd..8d2c85c 100644
--- a/api.io/manifest.mf
+++ b/api.io/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
-AutoUpdate-Essential-Module: true
+AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.api.io
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/io/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.3.1
+OpenIDE-Module-Specification-Version: 1.2.1
OpenIDE-Module-Recommends: org.netbeans.spi.io.InputOutputProvider
diff --git a/api.io/nbproject/org-netbeans-api-io.sig b/api.io/nbproject/org-netbeans-api-io.sig
deleted file mode 100644
index f684aff..0000000
--- a/api.io/nbproject/org-netbeans-api-io.sig
+++ /dev/null
@@ -1,358 +0,0 @@
-#Signature file v4.1
-#Version 1.2.1
-
-CLSS public abstract interface java.io.Closeable
-intf java.lang.AutoCloseable
-meth public abstract void close() throws java.io.IOException
-
-CLSS public abstract interface java.io.Flushable
-meth public abstract void flush() throws java.io.IOException
-
-CLSS public java.io.PrintWriter
-cons public init(java.io.File) throws java.io.FileNotFoundException
-cons public init(java.io.File,java.lang.String) throws java.io.FileNotFoundException,java.io.UnsupportedEncodingException
-cons public init(java.io.OutputStream)
-cons public init(java.io.OutputStream,boolean)
-cons public init(java.io.Writer)
-cons public init(java.io.Writer,boolean)
-cons public init(java.lang.String) throws java.io.FileNotFoundException
-cons public init(java.lang.String,java.lang.String) throws java.io.FileNotFoundException,java.io.UnsupportedEncodingException
-fld protected java.io.Writer out
-meth protected void clearError()
-meth protected void setError()
-meth public !varargs java.io.PrintWriter format(java.lang.String,java.lang.Object[])
-meth public !varargs java.io.PrintWriter format(java.util.Locale,java.lang.String,java.lang.Object[])
-meth public !varargs java.io.PrintWriter printf(java.lang.String,java.lang.Object[])
-meth public !varargs java.io.PrintWriter printf(java.util.Locale,java.lang.String,java.lang.Object[])
-meth public boolean checkError()
-meth public java.io.PrintWriter append(char)
-meth public java.io.PrintWriter append(java.lang.CharSequence)
-meth public java.io.PrintWriter append(java.lang.CharSequence,int,int)
-meth public void close()
-meth public void flush()
-meth public void print(boolean)
-meth public void print(char)
-meth public void print(char[])
-meth public void print(double)
-meth public void print(float)
-meth public void print(int)
-meth public void print(java.lang.Object)
-meth public void print(java.lang.String)
-meth public void print(long)
-meth public void println()
-meth public void println(boolean)
-meth public void println(char)
-meth public void println(char[])
-meth public void println(double)
-meth public void println(float)
-meth public void println(int)
-meth public void println(java.lang.Object)
-meth public void println(java.lang.String)
-meth public void println(long)
-meth public void write(char[])
-meth public void write(char[],int,int)
-meth public void write(int)
-meth public void write(java.lang.String)
-meth public void write(java.lang.String,int,int)
-supr java.io.Writer
-hfds autoFlush,formatter,lineSeparator,psOut,trouble
-
-CLSS public abstract interface java.io.Serializable
-
-CLSS public abstract java.io.Writer
-cons protected init()
-cons protected init(java.lang.Object)
-fld protected java.lang.Object lock
-intf java.io.Closeable
-intf java.io.Flushable
-intf java.lang.Appendable
-meth public abstract void close() throws java.io.IOException
-meth public abstract void flush() throws java.io.IOException
-meth public abstract void write(char[],int,int) throws java.io.IOException
-meth public java.io.Writer append(char) throws java.io.IOException
-meth public java.io.Writer append(java.lang.CharSequence) throws java.io.IOException
-meth public java.io.Writer append(java.lang.CharSequence,int,int) throws java.io.IOException
-meth public void write(char[]) throws java.io.IOException
-meth public void write(int) throws java.io.IOException
-meth public void write(java.lang.String) throws java.io.IOException
-meth public void write(java.lang.String,int,int) throws java.io.IOException
-supr java.lang.Object
-hfds writeBuffer,writeBufferSize
-
-CLSS public abstract interface java.lang.Appendable
-meth public abstract java.lang.Appendable append(char) throws java.io.IOException
-meth public abstract java.lang.Appendable append(java.lang.CharSequence) throws java.io.IOException
-meth public abstract java.lang.Appendable append(java.lang.CharSequence,int,int) throws java.io.IOException
-
-CLSS public abstract interface java.lang.AutoCloseable
-meth public abstract void close() throws java.lang.Exception
-
-CLSS public abstract interface java.lang.Comparable<%0 extends java.lang.Object>
-meth public abstract int compareTo({java.lang.Comparable%0})
-
-CLSS public abstract java.lang.Enum<%0 extends java.lang.Enum<{java.lang.Enum%0}>>
-cons protected init(java.lang.String,int)
-intf java.io.Serializable
-intf java.lang.Comparable<{java.lang.Enum%0}>
-meth protected final java.lang.Object clone() throws java.lang.CloneNotSupportedException
-meth protected final void finalize()
-meth public final boolean equals(java.lang.Object)
-meth public final int compareTo({java.lang.Enum%0})
-meth public final int hashCode()
-meth public final int ordinal()
-meth public final java.lang.Class<{java.lang.Enum%0}> getDeclaringClass()
-meth public final java.lang.String name()
-meth public java.lang.String toString()
-meth public static <%0 extends java.lang.Enum<{%%0}>> {%%0} valueOf(java.lang.Class<{%%0}>,java.lang.String)
-supr java.lang.Object
-hfds name,ordinal
-
-CLSS public java.lang.Object
-cons public init()
-meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
-meth protected void finalize() throws java.lang.Throwable
-meth public boolean equals(java.lang.Object)
-meth public final java.lang.Class<?> getClass()
-meth public final void notify()
-meth public final void notifyAll()
-meth public final void wait() throws java.lang.InterruptedException
-meth public final void wait(long) throws java.lang.InterruptedException
-meth public final void wait(long,int) throws java.lang.InterruptedException
-meth public int hashCode()
-meth public java.lang.String toString()
-
-CLSS public abstract org.netbeans.api.io.Fold
-meth public abstract void setExpanded(boolean)
-meth public final void collapse()
-meth public final void expand()
-supr java.lang.Object
-hfds UNSUPPORTED
-hcls Impl
-
-CLSS public abstract org.netbeans.api.io.Hyperlink
-meth public static org.netbeans.api.io.Hyperlink from(java.lang.Runnable)
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public static org.netbeans.api.io.Hyperlink from(java.lang.Runnable,boolean)
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public static org.netbeans.api.io.Hyperlink from(org.netbeans.api.intent.Intent)
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public static org.netbeans.api.io.Hyperlink from(org.netbeans.api.intent.Intent,boolean)
- anno 1 org.netbeans.api.annotations.common.NonNull()
-supr java.lang.Object
-hfds important
-hcls IntentHyperlink,OnClickHyperlink
-
-CLSS public abstract org.netbeans.api.io.IOProvider
-meth public abstract java.lang.String getId()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public abstract org.netbeans.api.io.InputOutput getIO(java.lang.String,boolean)
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public abstract org.netbeans.api.io.InputOutput getIO(java.lang.String,boolean,org.openide.util.Lookup)
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
- anno 3 org.netbeans.api.annotations.common.NonNull()
-meth public static org.netbeans.api.io.IOProvider get(java.lang.String)
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public static org.netbeans.api.io.IOProvider getDefault()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-supr java.lang.Object
-hcls Impl,Trivial
-
-CLSS public abstract org.netbeans.api.io.InputOutput
-intf org.openide.util.Lookup$Provider
-meth public abstract boolean isClosed()
-meth public abstract java.io.Reader getIn()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public abstract java.lang.String getDescription()
- anno 0 org.netbeans.api.annotations.common.CheckForNull()
-meth public abstract org.netbeans.api.io.OutputWriter getErr()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public abstract org.netbeans.api.io.OutputWriter getOut()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public abstract org.openide.util.Lookup getLookup()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public abstract void close()
-meth public abstract void reset()
-meth public abstract void setDescription(java.lang.String)
- anno 1 org.netbeans.api.annotations.common.NullAllowed()
-meth public abstract void show(java.util.Set<org.netbeans.api.io.ShowOperation>)
- anno 1 org.netbeans.api.annotations.common.NullAllowed()
-meth public final void show()
-meth public static org.netbeans.api.io.InputOutput get(java.lang.String,boolean)
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public static org.netbeans.api.io.InputOutput get(java.lang.String,boolean,org.openide.util.Lookup)
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
- anno 3 org.netbeans.api.annotations.common.NonNull()
-supr java.lang.Object
-hfds DEFAULT_SHOW_OPERATIONS
-hcls Impl
-
-CLSS public abstract org.netbeans.api.io.OutputColor
-meth public static org.netbeans.api.io.OutputColor debug()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public static org.netbeans.api.io.OutputColor failure()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public static org.netbeans.api.io.OutputColor rgb(int)
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public static org.netbeans.api.io.OutputColor rgb(int,int,int)
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public static org.netbeans.api.io.OutputColor success()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public static org.netbeans.api.io.OutputColor warning()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-supr java.lang.Object
-hfds CLR_DEBUG,CLR_FAILURE,CLR_SUCCESS,CLR_WARNING,type
-hcls RgbColor,TypeColor
-
-CLSS public abstract org.netbeans.api.io.OutputWriter
-meth public abstract org.netbeans.api.io.Fold startFold(boolean)
-meth public abstract org.netbeans.api.io.Position getCurrentPosition()
-meth public abstract void endFold(org.netbeans.api.io.Fold)
-meth public abstract void print(java.lang.String,org.netbeans.api.io.Hyperlink)
-meth public abstract void print(java.lang.String,org.netbeans.api.io.Hyperlink,org.netbeans.api.io.OutputColor)
-meth public abstract void print(java.lang.String,org.netbeans.api.io.OutputColor)
-meth public abstract void println(java.lang.String,org.netbeans.api.io.Hyperlink)
-meth public abstract void println(java.lang.String,org.netbeans.api.io.Hyperlink,org.netbeans.api.io.OutputColor)
-meth public abstract void println(java.lang.String,org.netbeans.api.io.OutputColor)
-supr java.io.PrintWriter
-hcls DummyWriter,Impl
-
-CLSS public abstract org.netbeans.api.io.Position
-meth public abstract void scrollTo()
-supr java.lang.Object
-hfds UNSUPPORTED
-hcls Impl
-
-CLSS public final !enum org.netbeans.api.io.ShowOperation
-fld public final static org.netbeans.api.io.ShowOperation ACTIVATE
-fld public final static org.netbeans.api.io.ShowOperation MAKE_VISIBLE
-fld public final static org.netbeans.api.io.ShowOperation OPEN
-meth public static org.netbeans.api.io.ShowOperation valueOf(java.lang.String)
-meth public static org.netbeans.api.io.ShowOperation[] values()
-supr java.lang.Enum<org.netbeans.api.io.ShowOperation>
-
-CLSS public abstract interface org.netbeans.spi.io.InputOutputProvider<%0 extends java.lang.Object, %1 extends java.io.PrintWriter, %2 extends java.lang.Object, %3 extends java.lang.Object>
-meth public abstract boolean isIOClosed({org.netbeans.spi.io.InputOutputProvider%0})
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public abstract java.io.Reader getIn({org.netbeans.spi.io.InputOutputProvider%0})
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public abstract java.lang.String getIODescription({org.netbeans.spi.io.InputOutputProvider%0})
- anno 0 org.netbeans.api.annotations.common.CheckForNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public abstract java.lang.String getId()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public abstract org.openide.util.Lookup getIOLookup({org.netbeans.spi.io.InputOutputProvider%0})
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public abstract void closeIO({org.netbeans.spi.io.InputOutputProvider%0})
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public abstract void endFold({org.netbeans.spi.io.InputOutputProvider%0},{org.netbeans.spi.io.InputOutputProvider%1},{org.netbeans.spi.io.InputOutputProvider%3})
- anno 1 org.netbeans.api.annotations.common.NonNull()
- anno 2 org.netbeans.api.annotations.common.NonNull()
- anno 3 org.netbeans.api.annotations.common.NonNull()
-meth public abstract void print({org.netbeans.spi.io.InputOutputProvider%0},{org.netbeans.spi.io.InputOutputProvider%1},java.lang.String,org.netbeans.api.io.Hyperlink,org.netbeans.api.io.OutputColor,boolean)
- anno 1 org.netbeans.api.annotations.common.NonNull()
- anno 2 org.netbeans.api.annotations.common.NonNull()
- anno 3 org.netbeans.api.annotations.common.NullAllowed()
- anno 4 org.netbeans.api.annotations.common.NullAllowed()
- anno 5 org.netbeans.api.annotations.common.NullAllowed()
-meth public abstract void resetIO({org.netbeans.spi.io.InputOutputProvider%0})
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public abstract void scrollTo({org.netbeans.spi.io.InputOutputProvider%0},{org.netbeans.spi.io.InputOutputProvider%1},{org.netbeans.spi.io.InputOutputProvider%2})
- anno 1 org.netbeans.api.annotations.common.NonNull()
- anno 2 org.netbeans.api.annotations.common.NonNull()
- anno 3 org.netbeans.api.annotations.common.NonNull()
-meth public abstract void setFoldExpanded({org.netbeans.spi.io.InputOutputProvider%0},{org.netbeans.spi.io.InputOutputProvider%1},{org.netbeans.spi.io.InputOutputProvider%3},boolean)
- anno 1 org.netbeans.api.annotations.common.NonNull()
- anno 2 org.netbeans.api.annotations.common.NonNull()
-meth public abstract void setIODescription({org.netbeans.spi.io.InputOutputProvider%0},java.lang.String)
- anno 1 org.netbeans.api.annotations.common.NonNull()
- anno 2 org.netbeans.api.annotations.common.NullAllowed()
-meth public abstract void showIO({org.netbeans.spi.io.InputOutputProvider%0},java.util.Set<org.netbeans.api.io.ShowOperation>)
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public abstract {org.netbeans.spi.io.InputOutputProvider%0} getIO(java.lang.String,boolean,org.openide.util.Lookup)
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
- anno 3 org.netbeans.api.annotations.common.NonNull()
-meth public abstract {org.netbeans.spi.io.InputOutputProvider%1} getErr({org.netbeans.spi.io.InputOutputProvider%0})
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public abstract {org.netbeans.spi.io.InputOutputProvider%1} getOut({org.netbeans.spi.io.InputOutputProvider%0})
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public abstract {org.netbeans.spi.io.InputOutputProvider%2} getCurrentPosition({org.netbeans.spi.io.InputOutputProvider%0},{org.netbeans.spi.io.InputOutputProvider%1})
- anno 0 org.netbeans.api.annotations.common.CheckForNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
- anno 2 org.netbeans.api.annotations.common.NonNull()
-meth public abstract {org.netbeans.spi.io.InputOutputProvider%3} startFold({org.netbeans.spi.io.InputOutputProvider%0},{org.netbeans.spi.io.InputOutputProvider%1},boolean)
- anno 0 org.netbeans.api.annotations.common.CheckForNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
- anno 2 org.netbeans.api.annotations.common.NonNull()
-
-CLSS public final !enum org.netbeans.spi.io.support.HyperlinkType
-fld public final static org.netbeans.spi.io.support.HyperlinkType FROM_INTENT
-fld public final static org.netbeans.spi.io.support.HyperlinkType FROM_RUNNABLE
-meth public static org.netbeans.spi.io.support.HyperlinkType valueOf(java.lang.String)
-meth public static org.netbeans.spi.io.support.HyperlinkType[] values()
-supr java.lang.Enum<org.netbeans.spi.io.support.HyperlinkType>
-
-CLSS public final org.netbeans.spi.io.support.Hyperlinks
-meth public static boolean isImportant(org.netbeans.api.io.Hyperlink)
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public static java.lang.Runnable getRunnable(org.netbeans.api.io.Hyperlink)
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public static org.netbeans.api.intent.Intent getIntent(org.netbeans.api.io.Hyperlink)
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public static org.netbeans.spi.io.support.HyperlinkType getType(org.netbeans.api.io.Hyperlink)
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public static void invoke(org.netbeans.api.io.Hyperlink)
-supr java.lang.Object
-
-CLSS public final !enum org.netbeans.spi.io.support.OutputColorType
-fld public final static org.netbeans.spi.io.support.OutputColorType DEBUG
-fld public final static org.netbeans.spi.io.support.OutputColorType FAILURE
-fld public final static org.netbeans.spi.io.support.OutputColorType RGB
-fld public final static org.netbeans.spi.io.support.OutputColorType SUCCESS
-fld public final static org.netbeans.spi.io.support.OutputColorType WARNING
-meth public static org.netbeans.spi.io.support.OutputColorType valueOf(java.lang.String)
-meth public static org.netbeans.spi.io.support.OutputColorType[] values()
-supr java.lang.Enum<org.netbeans.spi.io.support.OutputColorType>
-
-CLSS public final org.netbeans.spi.io.support.OutputColors
-meth public static int getRGB(org.netbeans.api.io.OutputColor)
-meth public static org.netbeans.spi.io.support.OutputColorType getType(org.netbeans.api.io.OutputColor)
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
-supr java.lang.Object
-
-CLSS public abstract org.openide.util.Lookup
-cons public init()
-fld public final static org.openide.util.Lookup EMPTY
-innr public abstract interface static Provider
-innr public abstract static Item
-innr public abstract static Result
-innr public final static Template
-meth public <%0 extends java.lang.Object> java.util.Collection<? extends {%%0}> lookupAll(java.lang.Class<{%%0}>)
-meth public <%0 extends java.lang.Object> org.openide.util.Lookup$Item<{%%0}> lookupItem(org.openide.util.Lookup$Template<{%%0}>)
-meth public <%0 extends java.lang.Object> org.openide.util.Lookup$Result<{%%0}> lookupResult(java.lang.Class<{%%0}>)
-meth public abstract <%0 extends java.lang.Object> org.openide.util.Lookup$Result<{%%0}> lookup(org.openide.util.Lookup$Template<{%%0}>)
-meth public abstract <%0 extends java.lang.Object> {%%0} lookup(java.lang.Class<{%%0}>)
-meth public static org.openide.util.Lookup getDefault()
-supr java.lang.Object
-hfds LOG,defaultLookup,defaultLookupProvider
-hcls DefLookup,Empty
-
-CLSS public abstract interface static org.openide.util.Lookup$Provider
- outer org.openide.util.Lookup
-meth public abstract org.openide.util.Lookup getLookup()
-
diff --git a/api.io/nbproject/project.properties b/api.io/nbproject/project.properties
index f549d36..f0066e2 100644
--- a/api.io/nbproject/project.properties
+++ b/api.io/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/api.io/nbproject/project.xml b/api.io/nbproject/project.xml
index 561160c..0e11d89 100644
--- a/api.io/nbproject/project.xml
+++ b/api.io/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/api.io/src/org/netbeans/api/io/Bundle.properties b/api.io/src/org/netbeans/api/io/Bundle.properties
index facaa6c..17a2bf5 100644
--- a/api.io/src/org/netbeans/api/io/Bundle.properties
+++ b/api.io/src/org/netbeans/api/io/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Long-Description=\
API classes for creating output panes (e.g. tabs in output window) and for writing data into them.\n\
diff --git a/api.progress.compat8/build.xml b/api.progress.compat8/build.xml
index a1de4b7..2beb318 100644
--- a/api.progress.compat8/build.xml
+++ b/api.progress.compat8/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="api.progress.compat8">
<description>Builds, tests, and runs the project api.progress.compat8</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/api.progress.compat8/manifest.mf b/api.progress.compat8/manifest.mf
index 8a388b0..238110f 100644
--- a/api.progress.compat8/manifest.mf
+++ b/api.progress.compat8/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
-AutoUpdate-Essential-Module: true
+AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.api.progress.compat8
OpenIDE-Module-Localizing-Bundle: api/progress/compat8/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47.1
+OpenIDE-Module-Specification-Version: 1.46.1
OpenIDE-Module-Fragment-Host: org.netbeans.api.progress
diff --git a/api.progress.compat8/nbproject/project.properties b/api.progress.compat8/nbproject/project.properties
index c1e759d..1261def 100644
--- a/api.progress.compat8/nbproject/project.properties
+++ b/api.progress.compat8/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/api.progress.compat8/nbproject/project.xml b/api.progress.compat8/nbproject/project.xml
index 2426f99..be5544b 100644
--- a/api.progress.compat8/nbproject/project.xml
+++ b/api.progress.compat8/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/api.progress.compat8/src/api/progress/compat8/Bundle.properties b/api.progress.compat8/src/api/progress/compat8/Bundle.properties
index e9af594..05e6297 100644
--- a/api.progress.compat8/src/api/progress/compat8/Bundle.properties
+++ b/api.progress.compat8/src/api/progress/compat8/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Long-Description=\
NetBeans 8.0 compatibility for Task progress visualization APIs.
diff --git a/api.progress.nb/arch.xml b/api.progress.nb/arch.xml
index 66098d2..1a5d1e5 100644
--- a/api.progress.nb/arch.xml
+++ b/api.progress.nb/arch.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
@@ -52,11 +13,11 @@ Contributor(s):
<!--
<question id="arch-overall" when="init">
- Describe the overall architecture.
+ Describe the overall architecture.
<hint>
- What will be API for
+ What will be API for
<a href="http://wiki.netbeans.org/API_Design#Separate_API_for_clients_from_support_API">
- clients and what support API</a>?
+ clients and what support API</a>?
What parts will be pluggable?
How will plug-ins be registered? Please use <code><api type="export"/></code>
to describe your general APIs and specify their
diff --git a/api.progress.nb/build.xml b/api.progress.nb/build.xml
index 3350165..cc6b010 100644
--- a/api.progress.nb/build.xml
+++ b/api.progress.nb/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="api.progress.nb">
<description>Builds, tests, and runs the project org.netbeans.api.progress.nb</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/api.progress.nb/manifest.mf b/api.progress.nb/manifest.mf
index d1f3769..aeb2d1c 100644
--- a/api.progress.nb/manifest.mf
+++ b/api.progress.nb/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.api.progress.nb
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/progress/nb/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47.1
+OpenIDE-Module-Specification-Version: 1.46.1
diff --git a/api.progress.nb/nbproject/org-netbeans-api-progress-nb.sig b/api.progress.nb/nbproject/org-netbeans-api-progress-nb.sig
index 46802a7..d6d7d05 100644
--- a/api.progress.nb/nbproject/org-netbeans-api-progress-nb.sig
+++ b/api.progress.nb/nbproject/org-netbeans-api-progress-nb.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.46.1
+#Version 1.38
CLSS public java.lang.Object
cons public init()
@@ -15,44 +15,22 @@ meth public final void wait(long,int) throws java.lang.InterruptedException
meth public int hashCode()
meth public java.lang.String toString()
-CLSS public abstract interface java.lang.Runnable
-meth public abstract void run()
-
-CLSS public abstract interface java.util.concurrent.Executor
-meth public abstract void execute(java.lang.Runnable)
-
-CLSS public final org.netbeans.api.progress.BaseProgressUtils
-meth public static <%0 extends java.lang.Object> java.util.concurrent.Future<{%%0}> showProgressDialogAndRunLater(org.netbeans.api.progress.ProgressRunnable<{%%0}>,org.netbeans.api.progress.ProgressHandle,boolean)
-meth public static <%0 extends java.lang.Object> {%%0} showProgressDialogAndRun(org.netbeans.api.progress.ProgressRunnable<{%%0}>,java.lang.String,boolean)
-meth public static void runOffEventDispatchThread(java.lang.Runnable,java.lang.String,java.util.concurrent.atomic.AtomicBoolean,boolean)
-meth public static void runOffEventDispatchThread(java.lang.Runnable,java.lang.String,java.util.concurrent.atomic.AtomicBoolean,boolean,int,int)
-meth public static void runOffEventThreadWithProgressDialog(java.lang.Runnable,java.lang.String,org.netbeans.api.progress.ProgressHandle,boolean,int,int)
-meth public static void showProgressDialogAndRun(java.lang.Runnable,java.lang.String)
-meth public static void showProgressDialogAndRun(java.lang.Runnable,org.netbeans.api.progress.ProgressHandle,boolean)
-supr java.lang.Object
-hfds DISPLAY_DIALOG_MS,DISPLAY_WAIT_CURSOR_MS,PROVIDER,TRIVIAL
-hcls CancellableRunnableWrapper,RunnableWrapper,Trivial
-
CLSS public final org.netbeans.api.progress.ProgressHandle
-meth public final void finish()
-meth public final void progress(int)
-meth public final void progress(java.lang.String)
-meth public final void progress(java.lang.String,int)
-meth public final void setDisplayName(java.lang.String)
-meth public final void setInitialDelay(int)
-meth public final void start()
-meth public final void start(int)
-meth public final void start(int,long)
-meth public final void suspend(java.lang.String)
-meth public final void switchToDeterminate(int)
-meth public final void switchToDeterminate(int,long)
-meth public final void switchToIndeterminate()
-meth public static org.netbeans.api.progress.ProgressHandle createHandle(java.lang.String)
-meth public static org.netbeans.api.progress.ProgressHandle createHandle(java.lang.String,org.openide.util.Cancellable)
-meth public static org.netbeans.api.progress.ProgressHandle createSystemHandle(java.lang.String,org.openide.util.Cancellable)
+meth public void finish()
+meth public void progress(int)
+meth public void progress(java.lang.String)
+meth public void progress(java.lang.String,int)
+meth public void setDisplayName(java.lang.String)
+meth public void setInitialDelay(int)
+meth public void start()
+meth public void start(int)
+meth public void start(int,long)
+meth public void suspend(java.lang.String)
+meth public void switchToDeterminate(int)
+meth public void switchToDeterminate(int,long)
+meth public void switchToIndeterminate()
supr java.lang.Object
hfds LOG,internal
-hcls Accessor
CLSS public final org.netbeans.api.progress.ProgressHandleFactory
meth public static javax.swing.JComponent createProgressComponent(org.netbeans.api.progress.ProgressHandle)
@@ -81,7 +59,7 @@ meth public static void showProgressDialogAndRun(java.lang.Runnable,java.lang.St
meth public static void showProgressDialogAndRun(java.lang.Runnable,org.netbeans.api.progress.ProgressHandle,boolean)
supr java.lang.Object
hfds DISPLAY_DIALOG_MS,DISPLAY_WAIT_CURSOR_MS,PROVIDER
-hcls Trivial
+hcls CancellableRunnableWrapper,RunnableWrapper,Trivial
CLSS public final org.netbeans.api.progress.aggregate.AggregateProgressFactory
meth public static javax.swing.JComponent createProgressComponent(org.netbeans.api.progress.aggregate.AggregateProgressHandle)
@@ -89,7 +67,8 @@ meth public static javax.swing.JLabel createDetailLabelComponent(org.netbeans.ap
meth public static javax.swing.JLabel createMainLabelComponent(org.netbeans.api.progress.aggregate.AggregateProgressHandle)
meth public static org.netbeans.api.progress.aggregate.AggregateProgressHandle createHandle(java.lang.String,org.netbeans.api.progress.aggregate.ProgressContributor[],org.openide.util.Cancellable,javax.swing.Action)
meth public static org.netbeans.api.progress.aggregate.AggregateProgressHandle createSystemHandle(java.lang.String,org.netbeans.api.progress.aggregate.ProgressContributor[],org.openide.util.Cancellable,javax.swing.Action)
-supr org.netbeans.api.progress.aggregate.BasicAggregateProgressFactory
+meth public static org.netbeans.api.progress.aggregate.ProgressContributor createProgressContributor(java.lang.String)
+supr java.lang.Object
CLSS public final org.netbeans.api.progress.aggregate.AggregateProgressHandle
meth public void addContributor(org.netbeans.api.progress.aggregate.ProgressContributor)
@@ -103,14 +82,6 @@ meth public void suspend(java.lang.String)
supr java.lang.Object
hfds LOG,WORKUNITS,contributors,current,displayName,finished,handle,monitor
-CLSS public org.netbeans.api.progress.aggregate.BasicAggregateProgressFactory
-cons public init()
-meth protected static org.netbeans.api.progress.ProgressHandle getProgressHandle(org.netbeans.api.progress.aggregate.AggregateProgressHandle)
-meth protected static org.netbeans.api.progress.aggregate.AggregateProgressHandle doCreateHandle(java.lang.String,org.netbeans.api.progress.aggregate.ProgressContributor[],org.openide.util.Cancellable,boolean,org.netbeans.api.progress.ProgressHandle)
-meth public static org.netbeans.api.progress.aggregate.AggregateProgressHandle createHandle(java.lang.String,org.netbeans.api.progress.aggregate.ProgressContributor[],org.openide.util.Cancellable)
-meth public static org.netbeans.api.progress.aggregate.ProgressContributor createProgressContributor(java.lang.String)
-supr java.lang.Object
-
CLSS public final org.netbeans.api.progress.aggregate.ProgressContributor
meth public java.lang.String getTrackingId()
meth public void finish()
@@ -130,16 +101,12 @@ CLSS public org.netbeans.modules.progress.spi.Controller
cons public init(org.netbeans.modules.progress.spi.ProgressUIWorker)
fld public final static int INITIAL_DELAY = 500
fld public static org.netbeans.modules.progress.spi.Controller defaultInstance
-meth protected final org.netbeans.modules.progress.spi.ProgressUIWorker getProgressUIWorker()
-meth protected java.util.concurrent.Executor getEventExecutor()
-meth protected org.netbeans.modules.progress.spi.ProgressUIWorkerWithModel createWorker()
meth protected void resetTimer(int,boolean)
-meth protected void runEvents()
meth public org.netbeans.modules.progress.spi.TaskModel getModel()
meth public static org.netbeans.modules.progress.spi.Controller getDefault()
meth public void runNow()
supr java.lang.Object
-hfds RQ,TIMER_QUANTUM,component,dispatchRunning,eventQueue,model,task,taskDelay,timerStart
+hfds TIMER_QUANTUM,component,dispatchRunning,eventQueue,model,timerStart
CLSS public abstract interface org.netbeans.modules.progress.spi.ExtractedProgressUIWorker
intf org.netbeans.modules.progress.spi.ProgressUIWorker
@@ -147,26 +114,22 @@ meth public abstract javax.swing.JComponent getProgressComponent()
meth public abstract javax.swing.JLabel getDetailLabelComponent()
meth public abstract javax.swing.JLabel getMainLabelComponent()
-CLSS public org.netbeans.modules.progress.spi.InternalHandle
-cons protected init(java.lang.String,org.openide.util.Cancellable,boolean)
+CLSS public final org.netbeans.modules.progress.spi.InternalHandle
fld public final static int NO_INCREASE = -2
fld public final static int STATE_FINISHED = 2
fld public final static int STATE_INITIALIZED = 0
fld public final static int STATE_REQUEST_STOP = 3
fld public final static int STATE_RUNNING = 1
-meth protected final void setController(org.netbeans.modules.progress.spi.Controller)
meth public boolean isAllowCancel()
meth public boolean isAllowView()
meth public boolean isCustomPlaced()
meth public boolean isInSleepMode()
+meth public boolean isUserInitialized()
meth public double getPercentageDone()
-meth public final boolean isUserInitialized()
-meth public final org.netbeans.api.progress.ProgressHandle createProgressHandle()
meth public int getInitialDelay()
meth public int getState()
meth public int getTotalUnits()
meth public java.lang.String getDisplayName()
-meth public long getLastPingTime()
meth public long getTimeStampStarted()
meth public org.netbeans.modules.progress.spi.ProgressEvent requestStateSnapshot()
meth public void finish()
@@ -181,11 +144,7 @@ meth public void toDeterminate(int,long)
meth public void toIndeterminate()
meth public void toSilent(java.lang.String)
supr java.lang.Object
-hfds LOG,cancelable,compatInit,controller,currentUnit,del,displayName,initialDelay,initialEstimate,lastMessage,state,timeLastProgress,timeSleepy,timeStarted,totalUnits,userInitiated
-
-CLSS public abstract interface org.netbeans.modules.progress.spi.ProgressEnvironment
-meth public abstract org.netbeans.api.progress.ProgressHandle createHandle(java.lang.String,org.openide.util.Cancellable,boolean)
-meth public abstract org.netbeans.modules.progress.spi.Controller getController()
+hfds LOG,cancelable,component,controller,currentUnit,customPlaced1,customPlaced2,customPlaced3,displayName,initialDelay,initialEstimate,lastMessage,state,timeLastProgress,timeSleepy,timeStarted,totalUnits,userInitiated,viewAction
CLSS public final org.netbeans.modules.progress.spi.ProgressEvent
cons public init(org.netbeans.modules.progress.spi.InternalHandle,int,boolean)
@@ -243,22 +202,6 @@ intf org.netbeans.modules.progress.spi.RunOffEDTProvider$Progress
meth public abstract void runOffEventThreadWithCustomDialogContent(java.lang.Runnable,java.lang.String,javax.swing.JPanel,int,int)
meth public abstract void runOffEventThreadWithProgressDialog(java.lang.Runnable,java.lang.String,org.netbeans.api.progress.ProgressHandle,boolean,int,int)
-CLSS public org.netbeans.modules.progress.spi.SwingController
-cons public init(org.netbeans.modules.progress.spi.ProgressUIWorker)
-intf java.lang.Runnable
-intf java.util.concurrent.Executor
-meth protected java.util.concurrent.Executor getEventExecutor()
-meth protected javax.swing.Timer getTimer()
-meth protected org.netbeans.modules.progress.spi.ProgressUIWorkerWithModel createWorker()
-meth protected void resetTimer(int,boolean)
-meth protected void runEvents()
-meth public java.awt.Component getVisualComponent()
-meth public static org.netbeans.modules.progress.spi.SwingController getDefault()
-meth public void execute(java.lang.Runnable)
-meth public void run()
-supr org.netbeans.modules.progress.spi.Controller
-hfds INSTANCE,TIMER_QUANTUM,compatInit,timer
-
CLSS public final org.netbeans.modules.progress.spi.TaskModel
cons public init()
meth public int getSize()
@@ -273,20 +216,8 @@ meth public void removeHandle(org.netbeans.modules.progress.spi.InternalHandle)
meth public void removeListDataListener(javax.swing.event.ListDataListener)
meth public void removeListSelectionListener(javax.swing.event.ListSelectionListener)
supr java.lang.Object
-hfds dataListeners,eventExecutor,explicit,model,selectionListeners,selectionModel
+hfds dataListeners,explicit,model,selectionListeners,selectionModel
hcls TaskListener
-CLSS public final org.netbeans.modules.progress.spi.UIInternalHandle
-cons public init(java.lang.String,org.openide.util.Cancellable,boolean,javax.swing.Action)
-meth public boolean isAllowCancel()
-meth public boolean isAllowView()
-meth public boolean isCustomPlaced()
-meth public javax.swing.JComponent extractComponent()
-meth public javax.swing.JLabel extractDetailLabel()
-meth public javax.swing.JLabel extractMainLabel()
-meth public void requestView()
-supr org.netbeans.modules.progress.spi.InternalHandle
-hfds LOG,component,customPlaced1,customPlaced2,customPlaced3,viewAction
-
CLSS abstract interface org.netbeans.modules.progress.spi.package-info
diff --git a/api.progress.nb/nbproject/project.properties b/api.progress.nb/nbproject/project.properties
index c36e8ed..b797c5f 100644
--- a/api.progress.nb/nbproject/project.properties
+++ b/api.progress.nb/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/api.progress.nb/nbproject/project.xml b/api.progress.nb/nbproject/project.xml
index 6a8d000..65e65c7 100644
--- a/api.progress.nb/nbproject/project.xml
+++ b/api.progress.nb/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/api.progress.nb/src/org/netbeans/api/progress/nb/Bundle.properties b/api.progress.nb/src/org/netbeans/api/progress/nb/Bundle.properties
index a04a14a..2d39372 100644
--- a/api.progress.nb/src/org/netbeans/api/progress/nb/Bundle.properties
+++ b/api.progress.nb/src/org/netbeans/api/progress/nb/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Long-Description=\
Swing specific progress visualization APIs.
diff --git a/api.progress.nb/test/unit/src/org/netbeans/api/progress/RunOffEDTTest.java b/api.progress.nb/test/unit/src/org/netbeans/api/progress/RunOffEDTTest.java
index e9af076..80b6cd4 100644
--- a/api.progress.nb/test/unit/src/org/netbeans/api/progress/RunOffEDTTest.java
+++ b/api.progress.nb/test/unit/src/org/netbeans/api/progress/RunOffEDTTest.java
@@ -44,8 +44,6 @@ package org.netbeans.api.progress;
import java.awt.GraphicsEnvironment;
import java.awt.KeyboardFocusManager;
import java.awt.Window;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.swing.SwingUtilities;
@@ -184,29 +182,38 @@ public class RunOffEDTTest extends NbTestCase {
final R r = new R();
r.l = new CountDownLatch(1);
- KeyboardFocusManager.getCurrentKeyboardFocusManager().addPropertyChangeListener(new PropertyChangeListener() {
- @Override
- public void propertyChange(PropertyChangeEvent evt) {
- Window w = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow();
- if (w != null) {
- w.setVisible(false);
- }
- }
- });
- SwingUtilities.invokeAndWait(new Runnable() {
+ SwingUtilities.invokeLater(new Runnable() {
public void run() {
ProgressUtils.runOffEventDispatchThread(r, "Test", new AtomicBoolean(false), false, 10, 100);
}
});
+ for (int i = 0; i < 100; i++) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ Window w = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow();
+ if (w != null) {
+ w.setVisible(false);
+ break;
+ }
+ }
final AtomicBoolean finished = new AtomicBoolean(false);
- SwingUtilities.invokeAndWait(new Runnable() {
+ SwingUtilities.invokeLater(new Runnable() {
public void run() {
finished.set(true);
}
});
+ for (int i = 0; i < 10; i++) {
+ Thread.sleep(100);
+ if (finished.get()) {
+ break;
+ }
+ }
assertTrue("Should be finished", finished.get());
r.l.countDown();
SwingUtilities.invokeAndWait(new Runnable() {
@@ -260,26 +267,21 @@ public class RunOffEDTTest extends NbTestCase {
public void testDlgIsShown() throws Exception {
final R r = new R();
r.l = new CountDownLatch(1);
- final boolean[] shown = new boolean[] { false };
- KeyboardFocusManager.getCurrentKeyboardFocusManager().addPropertyChangeListener(new PropertyChangeListener() {
- @Override
- public void propertyChange(PropertyChangeEvent evt) {
- Window w = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow();
- if (w != null) {
- r.l.countDown();
- shown[0] = true;
- }
- }
- });
- SwingUtilities.invokeAndWait(new Runnable() {
+ SwingUtilities.invokeLater(new Runnable() {
public void run() {
ProgressUtils.runOffEventDispatchThread(r, "Test", new AtomicBoolean(false), true, 10, 100);
}
});
- if (!shown[0]) {
- fail("Dialog was not shown");
+ for (int i = 0; i < 100; i++) {
+ Thread.sleep(100);
+ Window w = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow();
+ if (w != null) {
+ r.l.countDown();
+ return;
+ }
}
+ fail("Dialog was not shown");
}
/* No longer consistently pass after 42651596988d, TBD why:
diff --git a/api.progress/manifest.mf b/api.progress/manifest.mf
index 813bd23..2ffbb4b 100644
--- a/api.progress/manifest.mf
+++ b/api.progress/manifest.mf
@@ -3,5 +3,5 @@ OpenIDE-Module: org.netbeans.api.progress/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/progress/module/resources/Bundle.properties
OpenIDE-Module-Recommends: org.netbeans.modules.progress.spi.ProgressUIWorkerProvider, org.netbeans.modules.progress.spi.RunOffEDTProvider
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.47.1
+OpenIDE-Module-Specification-Version: 1.46.1
diff --git a/api.progress/nbproject/org-netbeans-api-progress.sig b/api.progress/nbproject/org-netbeans-api-progress.sig
index b65ea71..079bf04 100644
--- a/api.progress/nbproject/org-netbeans-api-progress.sig
+++ b/api.progress/nbproject/org-netbeans-api-progress.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.46.1
+#Version 1.38
CLSS public java.lang.Object
cons public init()
@@ -15,18 +15,6 @@ meth public final void wait(long,int) throws java.lang.InterruptedException
meth public int hashCode()
meth public java.lang.String toString()
-CLSS public final org.netbeans.api.progress.BaseProgressUtils
-meth public static <%0 extends java.lang.Object> java.util.concurrent.Future<{%%0}> showProgressDialogAndRunLater(org.netbeans.api.progress.ProgressRunnable<{%%0}>,org.netbeans.api.progress.ProgressHandle,boolean)
-meth public static <%0 extends java.lang.Object> {%%0} showProgressDialogAndRun(org.netbeans.api.progress.ProgressRunnable<{%%0}>,java.lang.String,boolean)
-meth public static void runOffEventDispatchThread(java.lang.Runnable,java.lang.String,java.util.concurrent.atomic.AtomicBoolean,boolean)
-meth public static void runOffEventDispatchThread(java.lang.Runnable,java.lang.String,java.util.concurrent.atomic.AtomicBoolean,boolean,int,int)
-meth public static void runOffEventThreadWithProgressDialog(java.lang.Runnable,java.lang.String,org.netbeans.api.progress.ProgressHandle,boolean,int,int)
-meth public static void showProgressDialogAndRun(java.lang.Runnable,java.lang.String)
-meth public static void showProgressDialogAndRun(java.lang.Runnable,org.netbeans.api.progress.ProgressHandle,boolean)
-supr java.lang.Object
-hfds DISPLAY_DIALOG_MS,DISPLAY_WAIT_CURSOR_MS,PROVIDER,TRIVIAL
-hcls CancellableRunnableWrapper,RunnableWrapper,Trivial
-
CLSS public final org.netbeans.api.progress.ProgressHandle
meth public final void finish()
meth public final void progress(int)
@@ -51,6 +39,25 @@ hcls Accessor
CLSS public abstract interface org.netbeans.api.progress.ProgressRunnable<%0 extends java.lang.Object>
meth public abstract {org.netbeans.api.progress.ProgressRunnable%0} run(org.netbeans.api.progress.ProgressHandle)
+CLSS public final org.netbeans.api.progress.BaseProgressUtils
+meth public static <%0 extends java.lang.Object> java.util.concurrent.Future<{%%0}> showProgressDialogAndRunLater(org.netbeans.api.progress.ProgressRunnable<{%%0}>,org.netbeans.api.progress.ProgressHandle,boolean)
+meth public static <%0 extends java.lang.Object> {%%0} showProgressDialogAndRun(org.netbeans.api.progress.ProgressRunnable<{%%0}>,java.lang.String,boolean)
+meth public static void runOffEventDispatchThread(java.lang.Runnable,java.lang.String,java.util.concurrent.atomic.AtomicBoolean,boolean)
+meth public static void runOffEventDispatchThread(java.lang.Runnable,java.lang.String,java.util.concurrent.atomic.AtomicBoolean,boolean,int,int)
+meth public static void runOffEventThreadWithProgressDialog(java.lang.Runnable,java.lang.String,org.netbeans.api.progress.ProgressHandle,boolean,int,int)
+meth public static void showProgressDialogAndRun(java.lang.Runnable,java.lang.String)
+meth public static void showProgressDialogAndRun(java.lang.Runnable,org.netbeans.api.progress.ProgressHandle,boolean)
+supr java.lang.Object
+hfds DISPLAY_DIALOG_MS,DISPLAY_WAIT_CURSOR_MS,PROVIDER
+hcls CancellableRunnableWrapper,RunnableWrapper,Trivial
+
+CLSS public org.netbeans.api.progress.aggregate.BasicAggregateProgressFactory
+cons public init()
+meth protected static org.netbeans.api.progress.ProgressHandle getProgressHandle(org.netbeans.api.progress.aggregate.AggregateProgressHandle)
+meth public static org.netbeans.api.progress.aggregate.AggregateProgressHandle createHandle(java.lang.String,org.netbeans.api.progress.aggregate.ProgressContributor[],org.openide.util.Cancellable)
+meth public static org.netbeans.api.progress.aggregate.ProgressContributor createProgressContributor(java.lang.String)
+supr java.lang.Object
+
CLSS public final org.netbeans.api.progress.aggregate.AggregateProgressHandle
meth public void addContributor(org.netbeans.api.progress.aggregate.ProgressContributor)
meth public void finish()
@@ -63,14 +70,6 @@ meth public void suspend(java.lang.String)
supr java.lang.Object
hfds LOG,WORKUNITS,contributors,current,displayName,finished,handle,monitor
-CLSS public org.netbeans.api.progress.aggregate.BasicAggregateProgressFactory
-cons public init()
-meth protected static org.netbeans.api.progress.ProgressHandle getProgressHandle(org.netbeans.api.progress.aggregate.AggregateProgressHandle)
-meth protected static org.netbeans.api.progress.aggregate.AggregateProgressHandle doCreateHandle(java.lang.String,org.netbeans.api.progress.aggregate.ProgressContributor[],org.openide.util.Cancellable,boolean,org.netbeans.api.progress.ProgressHandle)
-meth public static org.netbeans.api.progress.aggregate.AggregateProgressHandle createHandle(java.lang.String,org.netbeans.api.progress.aggregate.ProgressContributor[],org.openide.util.Cancellable)
-meth public static org.netbeans.api.progress.aggregate.ProgressContributor createProgressContributor(java.lang.String)
-supr java.lang.Object
-
CLSS public final org.netbeans.api.progress.aggregate.ProgressContributor
meth public java.lang.String getTrackingId()
meth public void finish()
@@ -90,37 +89,29 @@ CLSS public org.netbeans.modules.progress.spi.Controller
cons public init(org.netbeans.modules.progress.spi.ProgressUIWorker)
fld public final static int INITIAL_DELAY = 500
fld public static org.netbeans.modules.progress.spi.Controller defaultInstance
-meth protected final org.netbeans.modules.progress.spi.ProgressUIWorker getProgressUIWorker()
-meth protected java.util.concurrent.Executor getEventExecutor()
-meth protected org.netbeans.modules.progress.spi.ProgressUIWorkerWithModel createWorker()
meth protected void resetTimer(int,boolean)
-meth protected void runEvents()
meth public org.netbeans.modules.progress.spi.TaskModel getModel()
meth public static org.netbeans.modules.progress.spi.Controller getDefault()
meth public void runNow()
supr java.lang.Object
-hfds RQ,TIMER_QUANTUM,component,dispatchRunning,eventQueue,model,task,taskDelay,timerStart
+hfds TIMER_QUANTUM,component,dispatchRunning,eventQueue,model,timerStart
-CLSS public org.netbeans.modules.progress.spi.InternalHandle
-cons protected init(java.lang.String,org.openide.util.Cancellable,boolean)
+CLSS public final org.netbeans.modules.progress.spi.InternalHandle
fld public final static int NO_INCREASE = -2
fld public final static int STATE_FINISHED = 2
fld public final static int STATE_INITIALIZED = 0
fld public final static int STATE_REQUEST_STOP = 3
fld public final static int STATE_RUNNING = 1
-meth protected final void setController(org.netbeans.modules.progress.spi.Controller)
meth public boolean isAllowCancel()
meth public boolean isAllowView()
meth public boolean isCustomPlaced()
meth public boolean isInSleepMode()
+meth public boolean isUserInitialized()
meth public double getPercentageDone()
-meth public final boolean isUserInitialized()
-meth public final org.netbeans.api.progress.ProgressHandle createProgressHandle()
meth public int getInitialDelay()
meth public int getState()
meth public int getTotalUnits()
meth public java.lang.String getDisplayName()
-meth public long getLastPingTime()
meth public long getTimeStampStarted()
meth public org.netbeans.modules.progress.spi.ProgressEvent requestStateSnapshot()
meth public void finish()
@@ -135,11 +126,7 @@ meth public void toDeterminate(int,long)
meth public void toIndeterminate()
meth public void toSilent(java.lang.String)
supr java.lang.Object
-hfds LOG,cancelable,compatInit,controller,currentUnit,del,displayName,initialDelay,initialEstimate,lastMessage,state,timeLastProgress,timeSleepy,timeStarted,totalUnits,userInitiated
-
-CLSS public abstract interface org.netbeans.modules.progress.spi.ProgressEnvironment
-meth public abstract org.netbeans.api.progress.ProgressHandle createHandle(java.lang.String,org.openide.util.Cancellable,boolean)
-meth public abstract org.netbeans.modules.progress.spi.Controller getController()
+hfds LOG,cancelable,component,controller,currentUnit,customPlaced1,customPlaced2,customPlaced3,displayName,initialDelay,initialEstimate,lastMessage,state,timeLastProgress,timeSleepy,timeStarted,totalUnits,userInitiated,viewAction
CLSS public final org.netbeans.modules.progress.spi.ProgressEvent
cons public init(org.netbeans.modules.progress.spi.InternalHandle,int,boolean)
@@ -207,7 +194,7 @@ meth public void removeHandle(org.netbeans.modules.progress.spi.InternalHandle)
meth public void removeListDataListener(javax.swing.event.ListDataListener)
meth public void removeListSelectionListener(javax.swing.event.ListSelectionListener)
supr java.lang.Object
-hfds dataListeners,eventExecutor,explicit,model,selectionListeners,selectionModel
+hfds dataListeners,explicit,model,selectionListeners,selectionModel
hcls TaskListener
CLSS abstract interface org.netbeans.modules.progress.spi.package-info
diff --git a/api.progress/src/org/netbeans/api/progress/aggregate/package.html b/api.progress/src/org/netbeans/api/progress/aggregate/package.html
index f5df95e..9a9a175 100644
--- a/api.progress/src/org/netbeans/api/progress/aggregate/package.html
+++ b/api.progress/src/org/netbeans/api/progress/aggregate/package.html
@@ -2,43 +2,44 @@
<html>
<head>
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
</head>
<body>
diff --git a/api.progress/src/org/netbeans/api/progress/package.html b/api.progress/src/org/netbeans/api/progress/package.html
index 2b9983d..9bad9a3 100644
--- a/api.progress/src/org/netbeans/api/progress/package.html
+++ b/api.progress/src/org/netbeans/api/progress/package.html
@@ -2,43 +2,44 @@
<html>
<head>
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
</head>
<body>
diff --git a/api.progress/src/org/netbeans/modules/progress/spi/RunOffEDTProvider.java b/api.progress/src/org/netbeans/modules/progress/spi/RunOffEDTProvider.java
index 24ce0d4..6f0519a 100644
--- a/api.progress/src/org/netbeans/modules/progress/spi/RunOffEDTProvider.java
+++ b/api.progress/src/org/netbeans/modules/progress/spi/RunOffEDTProvider.java
@@ -64,7 +64,7 @@ public interface RunOffEDTProvider {
*
* @since 1.19
*/
- public interface Progress extends RunOffEDTProvider {
+ public interface Progress extends RunOffEDTProvider {
/**
* Show a modal progress dialog that blocks the main window while running
diff --git a/api.search/arch.xml b/api.search/arch.xml
index 9c0d4c3..77de60e 100644
--- a/api.search/arch.xml
+++ b/api.search/arch.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
@@ -56,11 +17,11 @@ Contributor(s):
<!--
<question id="arch-overall" when="init">
- Describe the overall architecture.
+ Describe the overall architecture.
<hint>
- What will be API for
+ What will be API for
<a href="http://wiki.netbeans.org/API_Design#Separate_API_for_clients_from_support_API">
- clients and what support API</a>?
+ clients and what support API</a>?
What parts will be pluggable?
How will plug-ins be registered? Please use <code><api type="export"/></code>
to describe your general APIs and specify their
diff --git a/api.search/build.xml b/api.search/build.xml
index daba4f0..d087a8c 100644
--- a/api.search/build.xml
+++ b/api.search/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="api.search">
<description>Builds, tests, and runs the project org.netbeans.api.search</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/api.search/manifest.mf b/api.search/manifest.mf
index 49002c5..e735e8a 100644
--- a/api.search/manifest.mf
+++ b/api.search/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.api.search
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/search/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.21.1
+OpenIDE-Module-Specification-Version: 1.20.1
diff --git a/api.search/nbproject/org-netbeans-api-search.sig b/api.search/nbproject/org-netbeans-api-search.sig
index 8944ff3..73d9f53 100644
--- a/api.search/nbproject/org-netbeans-api-search.sig
+++ b/api.search/nbproject/org-netbeans-api-search.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.20.1
+#Version 1.17
CLSS public abstract interface java.io.Serializable
diff --git a/api.search/nbproject/project.properties b/api.search/nbproject/project.properties
index b6b7b3f..a79068c 100644
--- a/api.search/nbproject/project.properties
+++ b/api.search/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/api.search/nbproject/project.xml b/api.search/nbproject/project.xml
index 8e4e69e..b01b4b9 100644
--- a/api.search/nbproject/project.xml
+++ b/api.search/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/api.search/src/org/netbeans/api/search/Bundle.properties b/api.search/src/org/netbeans/api/search/Bundle.properties
index d00b2b0..c700584 100644
--- a/api.search/src/org/netbeans/api/search/Bundle.properties
+++ b/api.search/src/org/netbeans/api/search/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Name=Search API
OpenIDE-Module-Short-Description=API for controlling search in projects and for implementing custom search providers
diff --git a/api.search/src/org/netbeans/modules/search/BasicSearchForm.java b/api.search/src/org/netbeans/modules/search/BasicSearchForm.java
index 5bfb8ef..18583b8 100644
--- a/api.search/src/org/netbeans/modules/search/BasicSearchForm.java
+++ b/api.search/src/org/netbeans/modules/search/BasicSearchForm.java
@@ -1096,8 +1096,7 @@ final class BasicSearchForm extends JPanel implements ChangeListener,
public void replace(FilterBypass fb, int offset, int length,
String text, AttributeSet attrs) throws BadLocationException {
int currentLength = fb.getDocument().getLength();
- int newTextLength = text == null ? 0 : text.length();
- int newLength = currentLength + newTextLength - length;
+ int newLength = currentLength + text.length() - length;
if (newLength <= LIMIT) {
super.replace(fb, offset, length, text, attrs);
} else {
diff --git a/api.search/src/org/netbeans/modules/search/ui/AbstractSearchResultsPanel.form b/api.search/src/org/netbeans/modules/search/ui/AbstractSearchResultsPanel.form
index 670fb6c..f77d9c2 100644
--- a/api.search/src/org/netbeans/modules/search/ui/AbstractSearchResultsPanel.form
+++ b/api.search/src/org/netbeans/modules/search/ui/AbstractSearchResultsPanel.form
@@ -61,7 +61,7 @@
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.LineBorderInfo">
<LineBorder>
- <Color PropertyName="color" blue="a0" green="a0" id="controlShadow" palette="3" red="a0" type="palette"/>
+ <Color PropertyName="color" blue="99" green="99" red="99" type="rgb"/>
</LineBorder>
</Border>
</Property>
diff --git a/api.search/src/org/netbeans/modules/search/ui/AbstractSearchResultsPanel.java b/api.search/src/org/netbeans/modules/search/ui/AbstractSearchResultsPanel.java
index ab363d5..776e125 100644
--- a/api.search/src/org/netbeans/modules/search/ui/AbstractSearchResultsPanel.java
+++ b/api.search/src/org/netbeans/modules/search/ui/AbstractSearchResultsPanel.java
@@ -177,7 +177,7 @@ public abstract class AbstractSearchResultsPanel extends javax.swing.JPanel
toolBar.setRequestFocusEnabled(false);
add(toolBar, java.awt.BorderLayout.WEST);
- contentPanel.setBorder(javax.swing.BorderFactory.createLineBorder(javax.swing.UIManager.getDefaults().getColor("controlShadow")));
+ contentPanel.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(153, 153, 153)));
contentPanel.setLayout(new javax.swing.BoxLayout(contentPanel, javax.swing.BoxLayout.LINE_AXIS));
add(contentPanel, java.awt.BorderLayout.CENTER);
}// </editor-fold>//GEN-END:initComponents
diff --git a/api.search/src/org/netbeans/modules/search/ui/ResultsOutlineSupport.java b/api.search/src/org/netbeans/modules/search/ui/ResultsOutlineSupport.java
index 6acf3a4..94a3b5e 100644
--- a/api.search/src/org/netbeans/modules/search/ui/ResultsOutlineSupport.java
+++ b/api.search/src/org/netbeans/modules/search/ui/ResultsOutlineSupport.java
@@ -480,7 +480,7 @@ public class ResultsOutlineSupport {
return new Node[]{createNodeForMatchingObject(key)};
}
- private void update() {
+ private synchronized void update() {
setKeys(resultModel.getMatchingObjects());
}
}
diff --git a/api.search/test/qa-functional/src/org/netbeans/test/modules/search/BasicSearchTest.java b/api.search/test/qa-functional/src/org/netbeans/test/modules/search/BasicSearchTest.java
index 69db907..91f4179 100644
--- a/api.search/test/qa-functional/src/org/netbeans/test/modules/search/BasicSearchTest.java
+++ b/api.search/test/qa-functional/src/org/netbeans/test/modules/search/BasicSearchTest.java
@@ -40,6 +40,11 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
+ *
+ * BasicSearchTest.java
+ *
+ * Created on November 30, 2006, 3:31 PM
+ *
*/
package org.netbeans.test.modules.search;
diff --git a/api.search/test/unit/src/org/netbeans/modules/search/matcher/Bundle.properties b/api.search/test/unit/src/org/netbeans/modules/search/matcher/Bundle.properties
index 7940599..46b31f1 100644
--- a/api.search/test/unit/src/org/netbeans/modules/search/matcher/Bundle.properties
+++ b/api.search/test/unit/src/org/netbeans/modules/search/matcher/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
SearchPerformanceComparator.jLabel1.text=Root file/dir:
SearchPerformanceComparator.rootTextField.text=
SearchPerformanceComparator.jButton1.text=Browse...
diff --git a/api.templates/apichanges.xml b/api.templates/apichanges.xml
index 9607727..4ef8a91 100644
--- a/api.templates/apichanges.xml
+++ b/api.templates/apichanges.xml
@@ -114,7 +114,7 @@ made subject to such option by the copyright holder.
source="compatible" deprecation="yes"/>
<description>
One new attribute
- <a href="@org-netbeans-api-templates@/org/netbeans/api/templates/TemplateRegistration.html#page--">
+ <a href="@org-netbeans-api-templates@/org/netbeans/api/templates/TemplateRegistration.html#page()">
page()</a>
to allow usage of HTML based UI driven by Java or JavaScript.
</description>
diff --git a/api.templates/arch.xml b/api.templates/arch.xml
index ee9f925..c9a6049 100644
--- a/api.templates/arch.xml
+++ b/api.templates/arch.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
@@ -55,7 +16,7 @@ Contributor(s):
processing the template, or custom Handlers may be registered to process certain templates.
</p>
<p>
- A template can use places substituable with parameter values; certain well-known parameters are
+ A template can use places substituable with parameter values; certain well-known parameters are
predefined, if the caller does not provide its custom values.
</p>
</answer>
@@ -106,7 +67,7 @@ Contributor(s):
<p>
Often many people require ability to create a "clever" template - e.g.
write piece of simple text and at the time of its
- <a href="@TOP@/org/netbeans/api/templates/FileBuilder.html#createFromTemplate-org.openide.filesystems.FileObject-org.openide.filesystems.FileObject-java.lang.String-java.util.Map-org.netbeans.api.templates.FileBuilder.Mode-">
+ <a href="@TOP@/org/netbeans/api/templates/FileBuilder.html#createFromTemplate(org.openide.filesystems.FileObject, org.openide.filesystems.FileObject, java.lang.String, java.util.Map, org.netbeans.api.templates.FileBuilder.Mode)">
processing
</a>
do some advanced changes to it using either
diff --git a/api.templates/build.xml b/api.templates/build.xml
index 12ebe4c..385543b 100644
--- a/api.templates/build.xml
+++ b/api.templates/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="api.templates">
<description>Builds, tests, and runs the project org.netbeans.api.templates</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/api.templates/manifest.mf b/api.templates/manifest.mf
index 0126e71..e1f6404 100644
--- a/api.templates/manifest.mf
+++ b/api.templates/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.api.templates
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/templates/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.7.1
+OpenIDE-Module-Specification-Version: 1.6.1
OpenIDE-Module-Recommends: org.netbeans.templates.IndentEngine
diff --git a/api.templates/nbproject/org-netbeans-api-templates.sig b/api.templates/nbproject/org-netbeans-api-templates.sig
deleted file mode 100644
index e4a0cea..0000000
--- a/api.templates/nbproject/org-netbeans-api-templates.sig
+++ /dev/null
@@ -1,162 +0,0 @@
-#Signature file v4.1
-#Version 1.6.1
-
-CLSS public abstract interface java.io.Serializable
-
-CLSS public abstract interface java.lang.Comparable<%0 extends java.lang.Object>
-meth public abstract int compareTo({java.lang.Comparable%0})
-
-CLSS public abstract java.lang.Enum<%0 extends java.lang.Enum<{java.lang.Enum%0}>>
-cons protected init(java.lang.String,int)
-intf java.io.Serializable
-intf java.lang.Comparable<{java.lang.Enum%0}>
-meth protected final java.lang.Object clone() throws java.lang.CloneNotSupportedException
-meth protected final void finalize()
-meth public final boolean equals(java.lang.Object)
-meth public final int compareTo({java.lang.Enum%0})
-meth public final int hashCode()
-meth public final int ordinal()
-meth public final java.lang.Class<{java.lang.Enum%0}> getDeclaringClass()
-meth public final java.lang.String name()
-meth public java.lang.String toString()
-meth public static <%0 extends java.lang.Enum<{%%0}>> {%%0} valueOf(java.lang.Class<{%%0}>,java.lang.String)
-supr java.lang.Object
-hfds name,ordinal
-
-CLSS public java.lang.Object
-cons public init()
-meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
-meth protected void finalize() throws java.lang.Throwable
-meth public boolean equals(java.lang.Object)
-meth public final java.lang.Class<?> getClass()
-meth public final void notify()
-meth public final void notifyAll()
-meth public final void wait() throws java.lang.InterruptedException
-meth public final void wait(long) throws java.lang.InterruptedException
-meth public final void wait(long,int) throws java.lang.InterruptedException
-meth public int hashCode()
-meth public java.lang.String toString()
-
-CLSS public abstract interface java.lang.annotation.Annotation
-meth public abstract boolean equals(java.lang.Object)
-meth public abstract int hashCode()
-meth public abstract java.lang.Class<? extends java.lang.annotation.Annotation> annotationType()
-meth public abstract java.lang.String toString()
-
-CLSS public abstract interface !annotation java.lang.annotation.Documented
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-
-CLSS public abstract interface !annotation java.lang.annotation.Retention
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract java.lang.annotation.RetentionPolicy value()
-
-CLSS public abstract interface !annotation java.lang.annotation.Target
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract java.lang.annotation.ElementType[] value()
-
-CLSS public final org.netbeans.api.templates.CreateDescriptor
-fld public final static java.lang.String FREE_FILE_EXTENSION = "freeFileExtension"
-fld public final static java.lang.String PREFORMATTED_TEMPLATE = "org-netbeans-modules-java-preformattedSource"
-meth public <%0 extends java.lang.Object> {%%0} getValue(java.lang.String)
- anno 0 org.netbeans.api.annotations.common.CheckForNull()
-meth public boolean hasFreeExtension()
-meth public boolean isPreformatted()
-meth public java.lang.String getName()
- anno 0 org.netbeans.api.annotations.common.CheckForNull()
-meth public java.lang.String getProposedName()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public java.util.Locale getLocale()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public java.util.Map<java.lang.String,java.lang.Object> getParameters()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public org.openide.filesystems.FileObject getTarget()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public org.openide.filesystems.FileObject getTemplate()
- anno 0 org.netbeans.api.annotations.common.NonNull()
-supr java.lang.Object
-hfds freeExtension,locale,name,parameters,preformatted,proposedName,target,template
-
-CLSS public abstract interface org.netbeans.api.templates.CreateFromTemplateAttributes
-meth public abstract java.util.Map<java.lang.String,?> attributesFor(org.netbeans.api.templates.CreateDescriptor)
-
-CLSS public abstract org.netbeans.api.templates.CreateFromTemplateHandler
-cons public init()
-meth protected abstract boolean accept(org.netbeans.api.templates.CreateDescriptor)
-meth protected abstract java.util.List<org.openide.filesystems.FileObject> createFromTemplate(org.netbeans.api.templates.CreateDescriptor) throws java.io.IOException
- anno 0 org.netbeans.api.annotations.common.NonNull()
-supr java.lang.Object
-
-CLSS public final org.netbeans.api.templates.FileBuilder
-cons public init(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject)
- anno 1 org.netbeans.api.annotations.common.NonNull()
- anno 2 org.netbeans.api.annotations.common.NonNull()
-innr public final static !enum Mode
-meth public java.util.List<org.openide.filesystems.FileObject> build() throws java.io.IOException
- anno 0 org.netbeans.api.annotations.common.CheckForNull()
-meth public org.netbeans.api.templates.CreateDescriptor createDescriptor(boolean)
- anno 0 org.netbeans.api.annotations.common.NonNull()
-meth public org.netbeans.api.templates.FileBuilder defaultMode(org.netbeans.api.templates.FileBuilder$Mode)
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public org.netbeans.api.templates.FileBuilder name(java.lang.String)
-meth public org.netbeans.api.templates.FileBuilder param(java.lang.String,java.lang.Object)
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public org.netbeans.api.templates.FileBuilder useFormat(java.text.Format)
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public org.netbeans.api.templates.FileBuilder useLocale(java.util.Locale)
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public org.netbeans.api.templates.FileBuilder withParameters(java.util.Map<java.lang.String,?>)
- anno 1 org.netbeans.api.annotations.common.NullAllowed()
-meth public static org.netbeans.api.templates.FileBuilder fromDescriptor(org.netbeans.api.templates.CreateDescriptor)
- anno 0 org.netbeans.api.annotations.common.NonNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
-meth public static org.openide.filesystems.FileObject createFromTemplate(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.lang.String,java.util.Map<java.lang.String,?>,org.netbeans.api.templates.FileBuilder$Mode) throws java.io.IOException
- anno 0 org.netbeans.api.annotations.common.CheckForNull()
- anno 1 org.netbeans.api.annotations.common.NonNull()
- anno 2 org.netbeans.api.annotations.common.NonNull()
- anno 3 org.netbeans.api.annotations.common.NullAllowed()
- anno 4 org.netbeans.api.annotations.common.NullAllowed()
-supr java.lang.Object
-hfds defaultMode,descriptor,format
-
-CLSS public final static !enum org.netbeans.api.templates.FileBuilder$Mode
- outer org.netbeans.api.templates.FileBuilder
-fld public final static org.netbeans.api.templates.FileBuilder$Mode COPY
-fld public final static org.netbeans.api.templates.FileBuilder$Mode FAIL
-fld public final static org.netbeans.api.templates.FileBuilder$Mode FORMAT
-meth public static org.netbeans.api.templates.FileBuilder$Mode valueOf(java.lang.String)
-meth public static org.netbeans.api.templates.FileBuilder$Mode[] values()
-supr java.lang.Enum<org.netbeans.api.templates.FileBuilder$Mode>
-
-CLSS public abstract interface !annotation org.netbeans.api.templates.TemplateRegistration
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE, METHOD, PACKAGE])
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault boolean requireProject()
-meth public abstract !hasdefault int position()
-meth public abstract !hasdefault java.lang.String description()
-meth public abstract !hasdefault java.lang.String displayName()
-meth public abstract !hasdefault java.lang.String iconBase()
-meth public abstract !hasdefault java.lang.String id()
-meth public abstract !hasdefault java.lang.String page()
-meth public abstract !hasdefault java.lang.String scriptEngine()
-meth public abstract !hasdefault java.lang.String targetName()
-meth public abstract !hasdefault java.lang.String[] category()
-meth public abstract !hasdefault java.lang.String[] content()
-meth public abstract !hasdefault java.lang.String[] techIds()
-meth public abstract java.lang.String folder()
-
-CLSS public abstract interface !annotation org.netbeans.api.templates.TemplateRegistrations
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE, METHOD, PACKAGE])
-intf java.lang.annotation.Annotation
-meth public abstract org.netbeans.api.templates.TemplateRegistration[] value()
-
diff --git a/api.templates/nbproject/project.properties b/api.templates/nbproject/project.properties
index 53a32e0..a79068c 100644
--- a/api.templates/nbproject/project.properties
+++ b/api.templates/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/api.templates/nbproject/project.xml b/api.templates/nbproject/project.xml
index 1c82f22..ea10cde 100644
--- a/api.templates/nbproject/project.xml
+++ b/api.templates/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/api.templates/src/org/netbeans/api/templates/CreateDescriptor.java b/api.templates/src/org/netbeans/api/templates/CreateDescriptor.java
index b81d8f3..660e297 100644
--- a/api.templates/src/org/netbeans/api/templates/CreateDescriptor.java
+++ b/api.templates/src/org/netbeans/api/templates/CreateDescriptor.java
@@ -69,7 +69,7 @@ public final class CreateDescriptor {
* include an extension (<samp>*.*</samp>), the handler should not append
* any extension from the template.
* @since org.openide.loaders 7.16
- * @see <a href="@org-netbeans-modules-projectuiapi@/org/netbeans/spi/project/ui/templates/support/Templates.SimpleTargetChooserBuilder.html#freeFileExtension--"><code>Templates.SimpleTargetChooserBuilder.freeFileExtension</code></a>
+ * @see <a href="@org-netbeans-modules-projectuiapi@/org/netbeans/spi/project/ui/templates/support/Templates.SimpleTargetChooserBuilder.html#freeFileExtension()"><code>Templates.SimpleTargetChooserBuilder.freeFileExtension</code></a>
*/
public static final String FREE_FILE_EXTENSION = "freeFileExtension"; // NOI18N
diff --git a/api.templates/src/org/netbeans/modules/templates/Bundle.properties b/api.templates/src/org/netbeans/modules/templates/Bundle.properties
index e4af3d5..1f85abd 100644
--- a/api.templates/src/org/netbeans/modules/templates/Bundle.properties
+++ b/api.templates/src/org/netbeans/modules/templates/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Long-Description=\
Provides API to create files based on templates. Supports scripting in templates \
diff --git a/api.templates/test/unit/src/org/netbeans/modules/templates/SCFTHandlerTest.java b/api.templates/test/unit/src/org/netbeans/modules/templates/SCFTHandlerTest.java
index 52b491d..b28ef23 100644
--- a/api.templates/test/unit/src/org/netbeans/modules/templates/SCFTHandlerTest.java
+++ b/api.templates/test/unit/src/org/netbeans/modules/templates/SCFTHandlerTest.java
@@ -110,7 +110,7 @@ public class SCFTHandlerTest extends NbTestCase {
FileObject root = FileUtil.createMemoryFileSystem().getRoot();
FileObject fo = FileUtil.createData(root, "simpleObject.txt");
OutputStream os = fo.getOutputStream();
- String txt = "print('<html><h1>', title, '</h1></html>');";
+ String txt = "print('<html><h1>'); print(title); print('</h1></html>');";
os.write(txt.getBytes());
os.close();
fo.setAttribute(ScriptingCreateFromTemplateHandler.SCRIPT_ENGINE_ATTR, "js");
@@ -126,7 +126,7 @@ public class SCFTHandlerTest extends NbTestCase {
assertEquals("Created in right place", folder, n.getFolder());
assertEquals("Created with right name", "complex.txt", n.getName());
- String exp = "<html><h1> Nazdar </h1></html>\n";
+ String exp = "<html><h1>Nazdar</h1></html>";
assertEquals(exp, readFile(n.getPrimaryFile()));
}
@@ -135,7 +135,7 @@ public class SCFTHandlerTest extends NbTestCase {
FileObject root = FileUtil.createMemoryFileSystem().getRoot();
FileObject fo = FileUtil.createData(root, "simpleObject.txt");
OutputStream os = fo.getOutputStream();
- String txt = "print('<html><h1>', nameAndExt, '</h1></html>')";
+ String txt = "print('<html><h1>'); print(nameAndExt); print('</h1></html>')";
os.write(txt.getBytes());
os.close();
fo.setAttribute(ScriptingCreateFromTemplateHandler.SCRIPT_ENGINE_ATTR, "js");
@@ -151,7 +151,7 @@ public class SCFTHandlerTest extends NbTestCase {
assertEquals("Created in right place", folder, n.getFolder());
assertEquals("Created with right name", "complex.txt", n.getName());
- String exp = "<html><h1> complex.txt </h1></html>\n";
+ String exp = "<html><h1>complex.txt</h1></html>";
assertEquals(exp, readFile(n.getPrimaryFile()));
}
@@ -162,14 +162,14 @@ public class SCFTHandlerTest extends NbTestCase {
FileObject root = lfs.getRoot();
FileObject fo = FileUtil.createData(root, "j.java");
OutputStream os = fo.getOutputStream();
- String txt = "print('<html><h1>', nameAndExt, '</h1></html>')";
+ String txt = "print('<html><h1>'); print(nameAndExt); print('</h1></html>')";
os.write(txt.getBytes());
os.close();
fo.setAttribute(ScriptingCreateFromTemplateHandler.SCRIPT_ENGINE_ATTR, "js");
FileObject fo2 = FileUtil.createData(root, "j.form");
OutputStream os2 = fo2.getOutputStream();
- String txt2 = "print('<html><h2>', nameAndExt, '</h2></html>')";
+ String txt2 = "print('<html><h2>'); print(nameAndExt); print('</h2></html>')";
os2.write(txt2.getBytes());
os2.close();
fo2.setAttribute(ScriptingCreateFromTemplateHandler.SCRIPT_ENGINE_ATTR, "js");
@@ -196,10 +196,10 @@ public class SCFTHandlerTest extends NbTestCase {
assertEquals("Created in right place", folder, n.getFolder());
assertEquals("Created with right name", "complex", n.getName());
- String exp = "<html><h1> complex.java </h1></html>\n";
+ String exp = "<html><h1>complex.java</h1></html>";
assertEquals("Primary file" + n.getPrimaryFile(), exp, readFile(n.getPrimaryFile()));
- String exp2 = "<html><h2> complex.form </h2></html>\n";
+ String exp2 = "<html><h2>complex.form</h2></html>";
assertEquals(exp2, readFile(newForm));
}
@@ -285,8 +285,8 @@ public class SCFTHandlerTest extends NbTestCase {
assertEquals("Created with right name", "complex.txt", n.getName());
- String read = readChars(n.getPrimaryFile(), set).replaceAll("print\\('", "").replaceAll("'\\);", "");
- String exp = readChars(xml, Charset.forName("utf-8")).replaceAll("print\\('", "").replaceAll("'\\);", "");
+ String read = readChars(n.getPrimaryFile(), set).replaceAll("println\\('", "").replaceAll("'\\);", "");
+ String exp = readChars(xml, Charset.forName("utf-8")).replaceAll("println\\('", "").replaceAll("'\\);", "");
assertEquals(exp, read);
}
@@ -344,7 +344,7 @@ public class SCFTHandlerTest extends NbTestCase {
fail("no input stream for " + snd);
}
String read = new String(cbuf, 0, len);
- txt = txt.replaceAll("print\\('", "").replaceAll("'\\)", "") +'\n';
+ txt = txt.replaceAll("print\\('", "").replaceAll("'\\)", "");
assertEquals(txt, read);
}
diff --git a/api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml b/api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml
index b508d10..0de77ce 100644
--- a/api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml
+++ b/api.templates/test/unit/src/org/netbeans/modules/templates/utf8.xml
@@ -1,4 +1,4 @@
-print('<?xml version="1.0"?>');
-print('<root>');
-print(' Žluťoučký kůň skákal přes čtvero mezí.');
-print('</root>');
+println('<?xml version="1.0"?>');
+println('<root>');
+println(' Žluťoučký kůň skákal přes čtvero mezí.');
+println('</root>');
diff --git a/api.visual/apichanges.xml b/api.visual/apichanges.xml
index 75942a0..8a138be 100644
--- a/api.visual/apichanges.xml
+++ b/api.visual/apichanges.xml
@@ -730,7 +730,7 @@ made subject to such option by the copyright holder.
<author login="dkaspar"/>
<compatibility addition="yes"/>
<description>
- <a href="@TOP@/org/netbeans/api/visual/action/ActionFactory.html#createContiguousSelectAction-org.netbeans.api.visual.action.ContiguousSelectProvider-">
+ <a href="@TOP@/org/netbeans/api/visual/action/ActionFactory.html#createContiguousSelectAction(org.netbeans.api.visual.action.ContiguousSelectProvider)">
<code>ActionFactory.createContiguousSelectAction</code></a> creates contiguous selection action.
<a href="@TOP@/org/netbeans/api/visual/action/ContiguousSelectProvider.html"><code>ContiguousSelectProvider</code></a>
provides logic for selection action.
diff --git a/api.visual/manifest.mf b/api.visual/manifest.mf
index 3a9bfa2..728d6ac 100644
--- a/api.visual/manifest.mf
+++ b/api.visual/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.api.visual
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/visual/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.47.1
+OpenIDE-Module-Specification-Version: 2.46.1
AutoUpdate-Essential-Module: true
diff --git a/api.visual/nbproject/org-netbeans-api-visual.sig b/api.visual/nbproject/org-netbeans-api-visual.sig
index 74b87a6..c874ba3 100644
--- a/api.visual/nbproject/org-netbeans-api-visual.sig
+++ b/api.visual/nbproject/org-netbeans-api-visual.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 2.46.1
+#Version 2.43
CLSS public abstract interface java.io.Serializable
@@ -1759,7 +1759,7 @@ meth public abstract <%0 extends java.lang.Object> org.openide.util.Lookup$Resul
meth public abstract <%0 extends java.lang.Object> {%%0} lookup(java.lang.Class<{%%0}>)
meth public static org.openide.util.Lookup getDefault()
supr java.lang.Object
-hfds LOG,defaultLookup,defaultLookupProvider
+hfds LOG,defaultLookup
hcls DefLookup,Empty
CLSS public abstract interface static org.openide.util.Lookup$Provider
diff --git a/api.visual/src/org/netbeans/api/visual/action/package.html b/api.visual/src/org/netbeans/api/visual/action/package.html
index e239db7..a3a782a 100644
--- a/api.visual/src/org/netbeans/api/visual/action/package.html
+++ b/api.visual/src/org/netbeans/api/visual/action/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/api.visual/src/org/netbeans/api/visual/anchor/package.html b/api.visual/src/org/netbeans/api/visual/anchor/package.html
index 95fe5a8..2eb0c54 100644
--- a/api.visual/src/org/netbeans/api/visual/anchor/package.html
+++ b/api.visual/src/org/netbeans/api/visual/anchor/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/api.visual/src/org/netbeans/api/visual/animator/package.html b/api.visual/src/org/netbeans/api/visual/animator/package.html
index 59ef05d..164b886 100644
--- a/api.visual/src/org/netbeans/api/visual/animator/package.html
+++ b/api.visual/src/org/netbeans/api/visual/animator/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/api.visual/src/org/netbeans/api/visual/border/package.html b/api.visual/src/org/netbeans/api/visual/border/package.html
index f6a3639..74f9f96 100644
--- a/api.visual/src/org/netbeans/api/visual/border/package.html
+++ b/api.visual/src/org/netbeans/api/visual/border/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/api.visual/src/org/netbeans/api/visual/export/package.html b/api.visual/src/org/netbeans/api/visual/export/package.html
index 5b6b7a4..9d04b4e 100644
--- a/api.visual/src/org/netbeans/api/visual/export/package.html
+++ b/api.visual/src/org/netbeans/api/visual/export/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,14 +38,12 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
<p>
This package contains the class necessary to export a <code>Scene</code> to an
-image file and get the coordinates from the exported image to create an HTML
+image file and get the coordinates from the exported image to create an HTML
image map
</body>
</html>
diff --git a/api.visual/src/org/netbeans/api/visual/graph/layout/package.html b/api.visual/src/org/netbeans/api/visual/graph/layout/package.html
index 4079320..25e870f 100644
--- a/api.visual/src/org/netbeans/api/visual/graph/layout/package.html
+++ b/api.visual/src/org/netbeans/api/visual/graph/layout/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/api.visual/src/org/netbeans/api/visual/graph/package.html b/api.visual/src/org/netbeans/api/visual/graph/package.html
index 2083ef6..2487c80 100644
--- a/api.visual/src/org/netbeans/api/visual/graph/package.html
+++ b/api.visual/src/org/netbeans/api/visual/graph/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/api.visual/src/org/netbeans/api/visual/laf/package.html b/api.visual/src/org/netbeans/api/visual/laf/package.html
index 5aa43ca..d3a0dff 100644
--- a/api.visual/src/org/netbeans/api/visual/laf/package.html
+++ b/api.visual/src/org/netbeans/api/visual/laf/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/api.visual/src/org/netbeans/api/visual/layout/package.html b/api.visual/src/org/netbeans/api/visual/layout/package.html
index a57d641..0c9ce8b 100644
--- a/api.visual/src/org/netbeans/api/visual/layout/package.html
+++ b/api.visual/src/org/netbeans/api/visual/layout/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/api.visual/src/org/netbeans/api/visual/model/package.html b/api.visual/src/org/netbeans/api/visual/model/package.html
index 96f8623..616dcc5 100644
--- a/api.visual/src/org/netbeans/api/visual/model/package.html
+++ b/api.visual/src/org/netbeans/api/visual/model/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/api.visual/src/org/netbeans/api/visual/package.html b/api.visual/src/org/netbeans/api/visual/package.html
index 572ff0b..81ce758 100644
--- a/api.visual/src/org/netbeans/api/visual/package.html
+++ b/api.visual/src/org/netbeans/api/visual/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/api.visual/src/org/netbeans/api/visual/print/package.html b/api.visual/src/org/netbeans/api/visual/print/package.html
index 13a4661..23b09a8 100644
--- a/api.visual/src/org/netbeans/api/visual/print/package.html
+++ b/api.visual/src/org/netbeans/api/visual/print/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/api.visual/src/org/netbeans/api/visual/router/package.html b/api.visual/src/org/netbeans/api/visual/router/package.html
index 629faaf..15d552d 100644
--- a/api.visual/src/org/netbeans/api/visual/router/package.html
+++ b/api.visual/src/org/netbeans/api/visual/router/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/api.visual/src/org/netbeans/api/visual/vmd/package.html b/api.visual/src/org/netbeans/api/visual/vmd/package.html
index 88a1ec5..f593b0b 100644
--- a/api.visual/src/org/netbeans/api/visual/vmd/package.html
+++ b/api.visual/src/org/netbeans/api/visual/vmd/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/api.visual/src/org/netbeans/api/visual/widget/doc-files/documentation.html b/api.visual/src/org/netbeans/api/visual/widget/doc-files/documentation.html
index 9314430..31aa49a 100644
--- a/api.visual/src/org/netbeans/api/visual/widget/doc-files/documentation.html
+++ b/api.visual/src/org/netbeans/api/visual/widget/doc-files/documentation.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
diff --git a/api.visual/src/org/netbeans/api/visual/widget/general/package.html b/api.visual/src/org/netbeans/api/visual/widget/general/package.html
index e861a01..15d0edc 100644
--- a/api.visual/src/org/netbeans/api/visual/widget/general/package.html
+++ b/api.visual/src/org/netbeans/api/visual/widget/general/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/api.visual/src/org/netbeans/api/visual/widget/package.html b/api.visual/src/org/netbeans/api/visual/widget/package.html
index 4104ecc..3b0d07d 100644
--- a/api.visual/src/org/netbeans/api/visual/widget/package.html
+++ b/api.visual/src/org/netbeans/api/visual/widget/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original
+ Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/api.visual/test/unit/src/org/netbeans/modules/visual/bugs/GraphLayoutListenerRemoval197502Test.java b/api.visual/test/unit/src/org/netbeans/modules/visual/bugs/GraphLayoutListenerRemoval197502Test.java
index 6e30ad7..e66ced9 100644
--- a/api.visual/test/unit/src/org/netbeans/modules/visual/bugs/GraphLayoutListenerRemoval197502Test.java
+++ b/api.visual/test/unit/src/org/netbeans/modules/visual/bugs/GraphLayoutListenerRemoval197502Test.java
@@ -40,6 +40,17 @@
* The Original Software is NetBeans. The Initial Developer of the Original
* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
* Microsystems, Inc. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
*/
package org.netbeans.modules.visual.bugs;
diff --git a/apisupport.harness/manifest.mf b/apisupport.harness/manifest.mf
index 1587009..f1e0d41 100644
--- a/apisupport.harness/manifest.mf
+++ b/apisupport.harness/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.apisupport.harness
-OpenIDE-Module-Specification-Version: 1.42.1
+OpenIDE-Module-Specification-Version: 1.41.1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/harness/Bundle.properties
diff --git a/apisupport.harness/release/etc/Info.plist b/apisupport.harness/release/etc/Info.plist
index d92ae17..73b9dd0 100644
--- a/apisupport.harness/release/etc/Info.plist
+++ b/apisupport.harness/release/etc/Info.plist
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
<plist version="0.9">
<dict>
diff --git a/apisupport.harness/release/etc/app.conf b/apisupport.harness/release/etc/app.conf
index 08e88d5..c5e2a96 100644
--- a/apisupport.harness/release/etc/app.conf
+++ b/apisupport.harness/release/etc/app.conf
@@ -1,39 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-
# ${HOME} will be replaced by user home directory according to platform
default_userdir="${HOME}/.${APPNAME}/dev"
default_mac_userdir="${HOME}/Library/Application Support/${APPNAME}/dev"
diff --git a/apisupport.harness/release/launchers/app.sh b/apisupport.harness/release/launchers/app.sh
index a7c3eb1..f9cd75e 100644
--- a/apisupport.harness/release/launchers/app.sh
+++ b/apisupport.harness/release/launchers/app.sh
@@ -1,43 +1,5 @@
#!/bin/sh
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-
#
# resolve symlinks
#
@@ -126,6 +88,7 @@ case "`uname`" in
Darwin*)
eval exec sh '"$nbexec"' \
--jdkhome '"$jdkhome"' \
+ -J-Dcom.apple.mrj.application.apple.menu.about.name='"$APPNAME"' \
-J-Xdock:name='"$APPNAME"' \
'"-J-Xdock:icon=$progdir/../../$APPNAME.icns"' \
--clusters '"$clusters"' \
diff --git a/apisupport.harness/windows-launcher-src/Makefile b/apisupport.harness/windows-launcher-src/Makefile
index 8393fb3..c7d6f5e 100644
--- a/apisupport.harness/windows-launcher-src/Makefile
+++ b/apisupport.harness/windows-launcher-src/Makefile
@@ -1,41 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-
# Main targets can be executed directly, and they are:
#
# build build a specific configuration
diff --git a/apisupport.harness/windows-launcher-src/app.cpp b/apisupport.harness/windows-launcher-src/app.cpp
index a89c1f7..afab7df 100644
--- a/apisupport.harness/windows-launcher-src/app.cpp
+++ b/apisupport.harness/windows-launcher-src/app.cpp
@@ -40,8 +40,7 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- */
- /*
+ *
* Author: Tomas Holy
*/
diff --git a/apisupport.harness/windows-launcher-src/app.rc b/apisupport.harness/windows-launcher-src/app.rc
index bddb177..7465d93 100644
--- a/apisupport.harness/windows-launcher-src/app.rc
+++ b/apisupport.harness/windows-launcher-src/app.rc
@@ -1,39 +1,3 @@
-// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-//
-// Copyright 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-//
-// Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-// Other names may be trademarks of their respective owners.
-//
-// The contents of this file are subject to the terms of either the GNU
-// General Public License Version 2 only ("GPL") or the Common
-// Development and Distribution License("CDDL") (collectively, the
-// "License"). You may not use this file except in compliance with the
-// License. You can obtain a copy of the License at
-// http://www.netbeans.org/cddl-gplv2.html
-// or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-// specific language governing permissions and limitations under the
-// License. When distributing the software, include this License Header
-// Notice in each file and include the License file at
-// nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-// particular file as subject to the "Classpath" exception as provided
-// by Oracle in the GPL Version 2 section of the License file that
-// accompanied this code. If applicable, add the following below the
-// License Header, with the fields enclosed by brackets [] replaced by
-// your own identifying information:
-// "Portions Copyrighted [year] [name of copyright owner]"
-//
-// If you wish your version of this file to be governed by only the CDDL
-// or only the GPL Version 2, indicate your decision by adding
-// "[Contributor] elects to include this software in this distribution
-// under the [CDDL or GPL Version 2] license." If you do not indicate a
-// single choice of license, a recipient has the option to distribute
-// your version of this file under either the CDDL, the GPL Version 2 or
-// to extend the choice of license to its licensees as provided above.
-// However, if you add GPL Version 2 code and therefore, elected the GPL
-// Version 2 license, then the option applies only if the new code is
-// made subject to such option by the copyright holder.
-
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
diff --git a/apisupport.harness/windows-launcher-src/applauncher.cpp b/apisupport.harness/windows-launcher-src/applauncher.cpp
index 92a83f6..540cc89 100644
--- a/apisupport.harness/windows-launcher-src/applauncher.cpp
+++ b/apisupport.harness/windows-launcher-src/applauncher.cpp
@@ -40,8 +40,7 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- */
- /*
+ *
* Author: Tomas Holy
*/
diff --git a/apisupport.harness/windows-launcher-src/applauncher.h b/apisupport.harness/windows-launcher-src/applauncher.h
index 4b00791..16daf60 100644
--- a/apisupport.harness/windows-launcher-src/applauncher.h
+++ b/apisupport.harness/windows-launcher-src/applauncher.h
@@ -40,8 +40,7 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- */
- /*
+ *
* Author: Tomas Holy
*/
diff --git a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
new file mode 100644
index 0000000..c96635b
--- /dev/null
+++ b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
@@ -0,0 +1,102 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add customized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+GREP=grep
+NM=nm
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc.exe
+CCC=g++.exe
+CXX=g++.exe
+FC=gfortran
+AS=as.exe
+
+# Macros
+CND_PLATFORM=Cygwin-Windows
+CND_DLIB_EXT=dll
+CND_CONF=app.exe
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/applauncher.o \
+ ${OBJECTDIR}/_ext/493252820/utilsfuncs.o \
+ ${OBJECTDIR}/_ext/216238457/nblauncher.o \
+ ${OBJECTDIR}/app.o
+
+
+# C Compiler Flags
+CFLAGS=
+
+# CC Compiler Flags
+CCFLAGS=-m32 -mno-cygwin
+CXXFLAGS=-m32 -mno-cygwin
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Assembler Flags
+ASFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=app.res
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS}
+ "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ../release/launchers/app.exe
+
+../release/launchers/app.exe: ${OBJECTFILES}
+ ${MKDIR} -p ../release/launchers
+ ${LINK.cc} -mwindows -o ../release/launchers/app.exe ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/applauncher.o: applauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} $@.d
+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/applauncher.o applauncher.cpp
+
+${OBJECTDIR}/_ext/493252820/utilsfuncs.o: ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+ ${MKDIR} -p ${OBJECTDIR}/_ext/493252820
+ ${RM} $@.d
+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+
+${OBJECTDIR}/_ext/216238457/nblauncher.o: ../../ide/launcher/windows/nblauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}/_ext/216238457
+ ${RM} $@.d
+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/216238457/nblauncher.o ../../ide/launcher/windows/nblauncher.cpp
+
+${OBJECTDIR}/app.o: app.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} $@.d
+ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf: ${CLEAN_SUBPROJECTS}
+ ${RM} -r ${CND_BUILDDIR}/${CND_CONF}
+ ${RM} ../release/launchers/app.exe
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.dep.inc: .depcheck-impl
+
+include .dep.inc
diff --git a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
new file mode 100644
index 0000000..e35d1ac
--- /dev/null
+++ b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
@@ -0,0 +1,102 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add customized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+GREP=grep
+NM=nm
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=x86_64-w64-mingw32-gcc.exe
+CCC=x86_64-w64-mingw32-g++.exe
+CXX=x86_64-w64-mingw32-g++.exe
+FC=gfortran
+AS=as.exe
+
+# Macros
+CND_PLATFORM=Cygwin64-Windows
+CND_DLIB_EXT=dll
+CND_CONF=app64.exe
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/applauncher.o \
+ ${OBJECTDIR}/_ext/493252820/utilsfuncs.o \
+ ${OBJECTDIR}/_ext/216238457/nblauncher.o \
+ ${OBJECTDIR}/app.o
+
+
+# C Compiler Flags
+CFLAGS=
+
+# CC Compiler Flags
+CCFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
+CXXFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Assembler Flags
+ASFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=app64.res
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS}
+ "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ../release/launchers/app64.exe
+
+../release/launchers/app64.exe: ${OBJECTFILES}
+ ${MKDIR} -p ../release/launchers
+ ${LINK.cc} -mwindows -o ../release/launchers/app64.exe ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/applauncher.o: applauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} $@.d
+ $(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/applauncher.o applauncher.cpp
+
+${OBJECTDIR}/_ext/493252820/utilsfuncs.o: ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+ ${MKDIR} -p ${OBJECTDIR}/_ext/493252820
+ ${RM} $@.d
+ $(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+
+${OBJECTDIR}/_ext/216238457/nblauncher.o: ../../ide/launcher/windows/nblauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}/_ext/216238457
+ ${RM} $@.d
+ $(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/216238457/nblauncher.o ../../ide/launcher/windows/nblauncher.cpp
+
+${OBJECTDIR}/app.o: app.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} $@.d
+ $(COMPILE.cc) -O2 -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf: ${CLEAN_SUBPROJECTS}
+ ${RM} -r ${CND_BUILDDIR}/${CND_CONF}
+ ${RM} ../release/launchers/app64.exe
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.dep.inc: .depcheck-impl
+
+include .dep.inc
diff --git a/apisupport.harness/windows-launcher-src/nbproject/Makefile-impl.mk b/apisupport.harness/windows-launcher-src/nbproject/Makefile-impl.mk
new file mode 100644
index 0000000..68fae7d
--- /dev/null
+++ b/apisupport.harness/windows-launcher-src/nbproject/Makefile-impl.mk
@@ -0,0 +1,133 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a pre- and a post- target defined where you can add customization code.
+#
+# This makefile implements macros and targets common to all configurations.
+#
+# NOCDDL
+
+
+# Building and Cleaning subprojects are done by default, but can be controlled with the SUB
+# macro. If SUB=no, subprojects will not be built or cleaned. The following macro
+# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf
+# and .clean-reqprojects-conf unless SUB has the value 'no'
+SUB_no=NO
+SUBPROJECTS=${SUB_${SUB}}
+BUILD_SUBPROJECTS_=.build-subprojects
+BUILD_SUBPROJECTS_NO=
+BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}}
+CLEAN_SUBPROJECTS_=.clean-subprojects
+CLEAN_SUBPROJECTS_NO=
+CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
+
+
+# Project Name
+PROJECTNAME=windows-launcher-src
+
+# Active Configuration
+DEFAULTCONF=app.exe
+CONF=${DEFAULTCONF}
+
+# All Configurations
+ALLCONFS=app.exe app64.exe
+
+
+# build
+.build-impl: .build-pre .validate-impl .depcheck-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .build-conf
+
+
+# clean
+.clean-impl: .clean-pre .validate-impl .depcheck-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .clean-conf
+
+
+# clobber
+.clobber-impl: .clobber-pre .depcheck-impl
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ "${MAKE}" -f nbproject/Makefile-$${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .clean-conf; \
+ done
+
+# all
+.all-impl: .all-pre .depcheck-impl
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ "${MAKE}" -f nbproject/Makefile-$${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .build-conf; \
+ done
+
+# build tests
+.build-tests-impl: .build-impl .build-tests-pre
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-tests-conf
+
+# run tests
+.test-impl: .build-tests-impl .test-pre
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .test-conf
+
+# dependency checking support
+.depcheck-impl:
+ @echo "# This code depends on make tool being used" >.dep.inc
+ @if [ -n "${MAKE_VERSION}" ]; then \
+ echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES}))" >>.dep.inc; \
+ echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \
+ echo "include \$${DEPFILES}" >>.dep.inc; \
+ echo "endif" >>.dep.inc; \
+ else \
+ echo ".KEEP_STATE:" >>.dep.inc; \
+ echo ".KEEP_STATE_FILE:.make.state.\$${CONF}" >>.dep.inc; \
+ fi
+
+# configuration validation
+.validate-impl:
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ echo ""; \
+ echo "Error: can not find the makefile for configuration '${CONF}' in project ${PROJECTNAME}"; \
+ echo "See 'make help' for details."; \
+ echo "Current directory: " `pwd`; \
+ echo ""; \
+ fi
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ exit 1; \
+ fi
+
+
+# help
+.help-impl: .help-pre
+ @echo "This makefile supports the following configurations:"
+ @echo " ${ALLCONFS}"
+ @echo ""
+ @echo "and the following targets:"
+ @echo " build (default target)"
+ @echo " clean"
+ @echo " clobber"
+ @echo " all"
+ @echo " help"
+ @echo ""
+ @echo "Makefile Usage:"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] build"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] clean"
+ @echo " make [SUB=no] clobber"
+ @echo " make [SUB=no] all"
+ @echo " make help"
+ @echo ""
+ @echo "Target 'build' will build a specific configuration and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'clean' will clean a specific configuration and, unless 'SUB=no',"
+ @echo " also clean subprojects."
+ @echo "Target 'clobber' will remove all built files from all configurations and,"
+ @echo " unless 'SUB=no', also from subprojects."
+ @echo "Target 'all' will will build all configurations and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'help' prints this message."
+ @echo ""
+
diff --git a/apisupport.harness/windows-launcher-src/nbproject/Makefile-variables.mk b/apisupport.harness/windows-launcher-src/nbproject/Makefile-variables.mk
new file mode 100644
index 0000000..ef96f57
--- /dev/null
+++ b/apisupport.harness/windows-launcher-src/nbproject/Makefile-variables.mk
@@ -0,0 +1,35 @@
+#
+# Generated - do not edit!
+#
+# NOCDDL
+#
+CND_BASEDIR=`pwd`
+CND_BUILDDIR=build
+CND_DISTDIR=dist
+# app.exe configuration
+CND_PLATFORM_app.exe=Cygwin-Windows
+CND_ARTIFACT_DIR_app.exe=../release/launchers
+CND_ARTIFACT_NAME_app.exe=app.exe
+CND_ARTIFACT_PATH_app.exe=../release/launchers/app.exe
+CND_PACKAGE_DIR_app.exe=dist/app.exe/Cygwin-Windows/package
+CND_PACKAGE_NAME_app.exe=windows-launcher-src.tar
+CND_PACKAGE_PATH_app.exe=dist/app.exe/Cygwin-Windows/package/windows-launcher-src.tar
+# app64.exe configuration
+CND_PLATFORM_app64.exe=Cygwin64-Windows
+CND_ARTIFACT_DIR_app64.exe=../release/launchers
+CND_ARTIFACT_NAME_app64.exe=app64.exe
+CND_ARTIFACT_PATH_app64.exe=../release/launchers/app64.exe
+CND_PACKAGE_DIR_app64.exe=dist/app64.exe/Cygwin64-Windows/package
+CND_PACKAGE_NAME_app64.exe=windows-launcher-src.tar
+CND_PACKAGE_PATH_app64.exe=dist/app64.exe/Cygwin64-Windows/package/windows-launcher-src.tar
+#
+# include compiler specific variables
+#
+# dmake command
+ROOT:sh = test -f nbproject/private/Makefile-variables.mk || \
+ (mkdir -p nbproject/private && touch nbproject/private/Makefile-variables.mk)
+#
+# gmake command
+.PHONY: $(shell test -f nbproject/private/Makefile-variables.mk || (mkdir -p nbproject/private && touch nbproject/private/Makefile-variables.mk))
+#
+include nbproject/private/Makefile-variables.mk
diff --git a/apisupport.harness/windows-launcher-src/nbproject/Package-app.exe.bash b/apisupport.harness/windows-launcher-src/nbproject/Package-app.exe.bash
new file mode 100644
index 0000000..d2dc810
--- /dev/null
+++ b/apisupport.harness/windows-launcher-src/nbproject/Package-app.exe.bash
@@ -0,0 +1,75 @@
+#!/bin/bash -x
+
+#
+# Generated - do not edit!
+#
+
+# Macros
+TOP=`pwd`
+CND_PLATFORM=Cygwin-Windows
+CND_CONF=app.exe
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
+TMPDIRNAME=tmp-packaging
+OUTPUT_PATH=../release/launchers/app.exe
+OUTPUT_BASENAME=app.exe
+PACKAGE_TOP_DIR=windows-launcher-src/
+
+# Functions
+function checkReturnCode
+{
+ rc=$?
+ if [ $rc != 0 ]
+ then
+ exit $rc
+ fi
+}
+function makeDirectory
+# $1 directory path
+# $2 permission (optional)
+{
+ mkdir -p "$1"
+ checkReturnCode
+ if [ "$2" != "" ]
+ then
+ chmod $2 "$1"
+ checkReturnCode
+ fi
+}
+function copyFileToTmpDir
+# $1 from-file path
+# $2 to-file path
+# $3 permission
+{
+ cp "$1" "$2"
+ checkReturnCode
+ if [ "$3" != "" ]
+ then
+ chmod $3 "$2"
+ checkReturnCode
+ fi
+}
+
+# Setup
+cd "${TOP}"
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
+rm -rf ${NBTMPDIR}
+mkdir -p ${NBTMPDIR}
+
+# Copy files and create directories and links
+cd "${TOP}"
+makeDirectory "${NBTMPDIR}/windows-launcher-src/bin"
+copyFileToTmpDir "${OUTPUT_PATH}.exe" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}.exe" 0755
+
+
+# Generate tar file
+cd "${TOP}"
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/windows-launcher-src.tar
+cd ${NBTMPDIR}
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/windows-launcher-src.tar *
+checkReturnCode
+
+# Cleanup
+cd "${TOP}"
+rm -rf ${NBTMPDIR}
diff --git a/apisupport.harness/windows-launcher-src/nbproject/Package-app64.exe.bash b/apisupport.harness/windows-launcher-src/nbproject/Package-app64.exe.bash
new file mode 100644
index 0000000..21ad256
--- /dev/null
+++ b/apisupport.harness/windows-launcher-src/nbproject/Package-app64.exe.bash
@@ -0,0 +1,75 @@
+#!/bin/bash -x
+
+#
+# Generated - do not edit!
+#
+
+# Macros
+TOP=`pwd`
+CND_PLATFORM=Cygwin64-Windows
+CND_CONF=app64.exe
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
+TMPDIRNAME=tmp-packaging
+OUTPUT_PATH=../release/launchers/app64.exe
+OUTPUT_BASENAME=app64.exe
+PACKAGE_TOP_DIR=windows-launcher-src/
+
+# Functions
+function checkReturnCode
+{
+ rc=$?
+ if [ $rc != 0 ]
+ then
+ exit $rc
+ fi
+}
+function makeDirectory
+# $1 directory path
+# $2 permission (optional)
+{
+ mkdir -p "$1"
+ checkReturnCode
+ if [ "$2" != "" ]
+ then
+ chmod $2 "$1"
+ checkReturnCode
+ fi
+}
+function copyFileToTmpDir
+# $1 from-file path
+# $2 to-file path
+# $3 permission
+{
+ cp "$1" "$2"
+ checkReturnCode
+ if [ "$3" != "" ]
+ then
+ chmod $3 "$2"
+ checkReturnCode
+ fi
+}
+
+# Setup
+cd "${TOP}"
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
+rm -rf ${NBTMPDIR}
+mkdir -p ${NBTMPDIR}
+
+# Copy files and create directories and links
+cd "${TOP}"
+makeDirectory "${NBTMPDIR}/windows-launcher-src/bin"
+copyFileToTmpDir "${OUTPUT_PATH}.exe" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}.exe" 0755
+
+
+# Generate tar file
+cd "${TOP}"
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/windows-launcher-src.tar
+cd ${NBTMPDIR}
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/windows-launcher-src.tar *
+checkReturnCode
+
+# Cleanup
+cd "${TOP}"
+rm -rf ${NBTMPDIR}
diff --git a/apisupport.harness/windows-launcher-src/nbproject/configurations.xml b/apisupport.harness/windows-launcher-src/nbproject/configurations.xml
index 75efa99..099faae 100644
--- a/apisupport.harness/windows-launcher-src/nbproject/configurations.xml
+++ b/apisupport.harness/windows-launcher-src/nbproject/configurations.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<configurationDescriptor version="84">
<logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
<logicalFolder name="HeaderFiles"
diff --git a/apisupport.harness/windows-launcher-src/nbproject/project.properties b/apisupport.harness/windows-launcher-src/nbproject/project.properties
index 541078c..e69de29 100644
--- a/apisupport.harness/windows-launcher-src/nbproject/project.properties
+++ b/apisupport.harness/windows-launcher-src/nbproject/project.properties
@@ -1,37 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
diff --git a/apisupport.harness/windows-launcher-src/nbproject/project.xml b/apisupport.harness/windows-launcher-src/nbproject/project.xml
index 644c16b..a2fee85 100644
--- a/apisupport.harness/windows-launcher-src/nbproject/project.xml
+++ b/apisupport.harness/windows-launcher-src/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.cnd.makeproject</type>
<configuration>
diff --git a/applemenu/build.xml b/applemenu/build.xml
index 06423f5..1320117 100644
--- a/applemenu/build.xml
+++ b/applemenu/build.xml
@@ -49,7 +49,6 @@ made subject to such option by the copyright holder.
<target name="compile" depends="projectized-common.compile">
<delete dir="${build.classes.dir}/com"/> <!-- just stubs -->
- <delete dir="${build.classes.dir}/java"/> <!-- just stubs -->
</target>
</project>
diff --git a/applemenu/manifest.mf b/applemenu/manifest.mf
index 8c9852c..2457a23 100644
--- a/applemenu/manifest.mf
+++ b/applemenu/manifest.mf
@@ -4,6 +4,6 @@ OpenIDE-Module: org.netbeans.modules.applemenu/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/applemenu/Bundle.properties
OpenIDE-Module-Install: org/netbeans/modules/applemenu/Install.class
OpenIDE-Module-Layer: org/netbeans/modules/applemenu/layer.xml
-OpenIDE-Module-Specification-Version: 1.37.1
+OpenIDE-Module-Specification-Version: 1.36.1
OpenIDE-Module-Requires: org.openide.modules.os.MacOSX
diff --git a/applemenu/src/com/apple/eawt/AppEvent.java b/applemenu/src/com/apple/eawt/AppEvent.java
deleted file mode 100644
index 7107e96..0000000
--- a/applemenu/src/com/apple/eawt/AppEvent.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* this is stub code written based on Apple EAWT package javadoc published at
- * http://developer.apple.com. It makes compiling code which uses Apple EAWT
- * on non-Mac platforms possible. The compiled stub classes should never be
- * included in the final product.
- */
-
-package com.apple.eawt;
-
-import java.io.File;
-import java.net.URI;
-import java.util.*;
-import java.awt.Window;
-
-public abstract class AppEvent extends EventObject {
- AppEvent() {
- super(null);
- }
-
- public abstract static class FilesEvent extends AppEvent {
- public List<File> getFiles() { return null; }
- }
-
- public static class OpenFilesEvent extends FilesEvent {
- public String getSearchTerm() { return null;}
- }
-
- public static class PrintFilesEvent extends FilesEvent {}
-
- public static class OpenURIEvent extends AppEvent {
- public URI getURI() { return null;}
- }
-
- public static class AboutEvent extends AppEvent { }
-
- public static class PreferencesEvent extends AppEvent { }
-
- public static class QuitEvent extends AppEvent { }
-
- public static class AppReOpenedEvent extends AppEvent { }
-
- public static class AppForegroundEvent extends AppEvent { }
-
- public static class AppHiddenEvent extends AppEvent { }
-
- public static class UserSessionEvent extends AppEvent { }
-
- public static class ScreenSleepEvent extends AppEvent { }
-
- public static class SystemSleepEvent extends AppEvent { }
-
- public static class FullScreenEvent extends AppEvent {
- public Window getWindow() { return null;}
- }
-}
diff --git a/applemenu/src/com/apple/eawt/AppEventListener.java b/applemenu/src/com/apple/eawt/AppEventListener.java
deleted file mode 100644
index 69f4b86..0000000
--- a/applemenu/src/com/apple/eawt/AppEventListener.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* this is stub code written based on Apple EAWT package javadoc published at
- * http://developer.apple.com. It makes compiling code which uses Apple EAWT
- * on non-Mac platforms possible. The compiled stub classes should never be
- * included in the final product.
- */
-
-package com.apple.eawt;
-
-public interface AppEventListener { }
-
diff --git a/applemenu/src/com/apple/eawt/Application.java b/applemenu/src/com/apple/eawt/Application.java
index c0946d3..7eb8dc5 100644
--- a/applemenu/src/com/apple/eawt/Application.java
+++ b/applemenu/src/com/apple/eawt/Application.java
@@ -50,32 +50,22 @@
package com.apple.eawt;
-import java.awt.Image;
-import java.awt.PopupMenu;
-import javax.swing.JMenuBar;
-
public class Application
{
+ public Application() { }
+ public void addAboutMenuItem() {}
+ public void addApplicationListener(ApplicationListener listener) {}
+ public void addPreferencesMenuItem() {}
public static Application getApplication() { return null; }
- public void addAppEventListener(final AppEventListener listener) {}
- public void removeAppEventListener(final AppEventListener listener) {}
- public void setAboutHandler(final AboutHandler aboutHandler) {}
- public void setPreferencesHandler(final PreferencesHandler preferencesHandler) {}
- public void setOpenFileHandler(final OpenFilesHandler openFileHandler) {}
- public void setPrintFileHandler(final PrintFilesHandler printFileHandler) {}
- public void setOpenURIHandler(final OpenURIHandler openURIHandler) {}
- public void setQuitHandler(final QuitHandler quitHandler) {}
- public void setQuitStrategy(final QuitStrategy strategy) {}
- public void enableSuddenTermination() {}
- public void disableSuddenTermination() {}
- public void requestForeground(final boolean allWindows) {}
- public void requestUserAttention(final boolean critical) {}
- public void openHelpViewer() {}
- public void setDockMenu(final PopupMenu menu) {}
- public PopupMenu getDockMenu() { return null; }
- public void setDockIconImage(final Image image) {}
- public Image getDockIconImage() { return null; }
- public void setDockIconBadge(final String badge) {}
- public void setDefaultMenuBar(final JMenuBar menuBar) {}
+ public boolean getEnabledAboutMenu() { return false; }
+ public boolean getEnabledPreferencesMenu() { return false; }
+ public static java.awt.Point getMouseLocationOnScreen() { return null; }
+ public boolean isAboutMenuItemPresent() { return false; }
+ public boolean isPreferencesMenuItemPresent() { return false; }
+ public void removeAboutMenuItem() {}
+ public void removeApplicationListener(ApplicationListener listener) {}
+ public void removePreferencesMenuItem() {}
+ public void setEnabledAboutMenu(boolean enable) {}
+ public void setEnabledPreferencesMenu(boolean enable) {}
}
diff --git a/applemenu/src/com/apple/eawt/OpenFilesHandler.java b/applemenu/src/com/apple/eawt/ApplicationAdapter.java
similarity index 75%
rename from applemenu/src/com/apple/eawt/OpenFilesHandler.java
rename to applemenu/src/com/apple/eawt/ApplicationAdapter.java
index ddc4d7b..4f9e83c 100644
--- a/applemenu/src/com/apple/eawt/OpenFilesHandler.java
+++ b/applemenu/src/com/apple/eawt/ApplicationAdapter.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,6 +24,12 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
* If you wish your version of this file to be governed by only the CDDL
* or only the GPL Version 2, indicate your decision by adding
* "[Contributor] elects to include this software in this distribution
@@ -34,10 +40,6 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
*/
/* this is stub code written based on Apple EAWT package javadoc published at
@@ -48,8 +50,14 @@
package com.apple.eawt;
-import com.apple.eawt.AppEvent.OpenFilesEvent;
-
-public interface OpenFilesHandler {
- public void openFiles(final OpenFilesEvent e);
+public class ApplicationAdapter implements ApplicationListener {
+ public void handleAbout(ApplicationEvent event) {}
+ public void handleOpenApplication(ApplicationEvent event) {}
+ public void handleOpenFile(ApplicationEvent event) {}
+ public void handlePreferences(ApplicationEvent event) {}
+ public void handlePrintFile(ApplicationEvent event) {}
+ public void handleQuit(ApplicationEvent event) {}
+ public void handleReOpenApplication(ApplicationEvent event) {}
}
+
+
diff --git a/applemenu/src/com/apple/eawt/OpenURIHandler.java b/applemenu/src/com/apple/eawt/ApplicationEvent.java
similarity index 80%
rename from applemenu/src/com/apple/eawt/OpenURIHandler.java
rename to applemenu/src/com/apple/eawt/ApplicationEvent.java
index 43b369e..61edf0a 100644
--- a/applemenu/src/com/apple/eawt/OpenURIHandler.java
+++ b/applemenu/src/com/apple/eawt/ApplicationEvent.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,6 +24,12 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
* If you wish your version of this file to be governed by only the CDDL
* or only the GPL Version 2, indicate your decision by adding
* "[Contributor] elects to include this software in this distribution
@@ -34,10 +40,6 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
*/
/* this is stub code written based on Apple EAWT package javadoc published at
@@ -48,9 +50,11 @@
package com.apple.eawt;
-import com.apple.eawt.AppEvent.OpenURIEvent;
-
-public interface OpenURIHandler {
- public void openURI(final OpenURIEvent e);
+public class ApplicationEvent extends java.util.EventObject implements java.io.Serializable
+{
+ public ApplicationEvent(Object source) { super(source); }
+ public java.lang.String getFilename() { return null; }
+ public boolean isHandled() { return false; }
+ public void setHandled(boolean state) {}
}
diff --git a/applemenu/src/com/apple/eawt/AboutHandler.java b/applemenu/src/com/apple/eawt/ApplicationListener.java
similarity index 75%
rename from applemenu/src/com/apple/eawt/AboutHandler.java
rename to applemenu/src/com/apple/eawt/ApplicationListener.java
index 7472a61..fd9912e 100644
--- a/applemenu/src/com/apple/eawt/AboutHandler.java
+++ b/applemenu/src/com/apple/eawt/ApplicationListener.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,6 +24,12 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
* If you wish your version of this file to be governed by only the CDDL
* or only the GPL Version 2, indicate your decision by adding
* "[Contributor] elects to include this software in this distribution
@@ -34,10 +40,6 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
*/
/* this is stub code written based on Apple EAWT package javadoc published at
@@ -48,9 +50,13 @@
package com.apple.eawt;
-import com.apple.eawt.AppEvent.AboutEvent;
-
-public interface AboutHandler {
-
- public void handleAbout(final AboutEvent e);
+public interface ApplicationListener extends java.util.EventListener
+{
+ public void handleAbout(ApplicationEvent event);
+ public void handleOpenApplication(ApplicationEvent event);
+ public void handleOpenFile(ApplicationEvent event);
+ public void handlePreferences(ApplicationEvent event);
+ public void handlePrintFile(ApplicationEvent event);
+ public void handleQuit(ApplicationEvent event);
+ public void handleReOpenApplication(ApplicationEvent event);
}
diff --git a/applemenu/src/com/apple/eawt/PreferencesHandler.java b/applemenu/src/com/apple/eawt/CocoaComponent.java
similarity index 77%
rename from applemenu/src/com/apple/eawt/PreferencesHandler.java
rename to applemenu/src/com/apple/eawt/CocoaComponent.java
index 2cb4c5e..e16bd11 100644
--- a/applemenu/src/com/apple/eawt/PreferencesHandler.java
+++ b/applemenu/src/com/apple/eawt/CocoaComponent.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,6 +24,12 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
* If you wish your version of this file to be governed by only the CDDL
* or only the GPL Version 2, indicate your decision by adding
* "[Contributor] elects to include this software in this distribution
@@ -34,10 +40,6 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
*/
/* this is stub code written based on Apple EAWT package javadoc published at
@@ -48,8 +50,12 @@
package com.apple.eawt;
-import com.apple.eawt.AppEvent.PreferencesEvent;
-
-public interface PreferencesHandler {
- public void handlePreferences(final PreferencesEvent e);
+public abstract class CocoaComponent extends java.awt.Canvas
+{
+ public abstract int createNSView();
+ public long createNSViewLong() { return 0; }
+ public abstract java.awt.Dimension getMaximumSize();
+ public abstract java.awt.Dimension getMinimumSize();
+ public abstract java.awt.Dimension getPreferredSize();
+ public void sendMessage(int messageID, java.lang.Object message) {}
}
diff --git a/applemenu/src/com/apple/eawt/PrintFilesHandler.java b/applemenu/src/com/apple/eawt/PrintFilesHandler.java
deleted file mode 100644
index fce2f2b..0000000
--- a/applemenu/src/com/apple/eawt/PrintFilesHandler.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* this is stub code written based on Apple EAWT package javadoc published at
- * http://developer.apple.com. It makes compiling code which uses Apple EAWT
- * on non-Mac platforms possible. The compiled stub classes should never be
- * included in the final product.
- */
-
-package com.apple.eawt;
-
-import com.apple.eawt.AppEvent.PrintFilesEvent;
-
-public interface PrintFilesHandler {
- public void printFiles(final PrintFilesEvent e);
-}
diff --git a/applemenu/src/com/apple/eawt/QuitHandler.java b/applemenu/src/com/apple/eawt/QuitHandler.java
deleted file mode 100644
index 0c2ba12..0000000
--- a/applemenu/src/com/apple/eawt/QuitHandler.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* this is stub code written based on Apple EAWT package javadoc published at
- * http://developer.apple.com. It makes compiling code which uses Apple EAWT
- * on non-Mac platforms possible. The compiled stub classes should never be
- * included in the final product.
- */
-
-package com.apple.eawt;
-
-import com.apple.eawt.AppEvent.QuitEvent;
-
-public interface QuitHandler {
- public void handleQuitRequestWith(final QuitEvent e, final QuitResponse response);
-}
diff --git a/applemenu/src/com/apple/eawt/QuitResponse.java b/applemenu/src/com/apple/eawt/QuitResponse.java
deleted file mode 100644
index 257c929..0000000
--- a/applemenu/src/com/apple/eawt/QuitResponse.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* this is stub code written based on Apple EAWT package javadoc published at
- * http://developer.apple.com. It makes compiling code which uses Apple EAWT
- * on non-Mac platforms possible. The compiled stub classes should never be
- * included in the final product.
- */
-
-package com.apple.eawt;
-
-public class QuitResponse {
- public void performQuit() {}
-
- public void cancelQuit() {}
-}
diff --git a/applemenu/src/com/apple/eawt/QuitStrategy.java b/applemenu/src/com/apple/eawt/QuitStrategy.java
deleted file mode 100644
index 131b019..0000000
--- a/applemenu/src/com/apple/eawt/QuitStrategy.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* this is stub code written based on Apple EAWT package javadoc published at
- * http://developer.apple.com. It makes compiling code which uses Apple EAWT
- * on non-Mac platforms possible. The compiled stub classes should never be
- * included in the final product.
- */
-
-package com.apple.eawt;
-
-public enum QuitStrategy {
- SYSTEM_EXIT_0,
- CLOSE_ALL_WINDOWS
-}
diff --git a/applemenu/src/java/awt/Desktop.java b/applemenu/src/java/awt/Desktop.java
deleted file mode 100644
index b3260d3..0000000
--- a/applemenu/src/java/awt/Desktop.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* This is stub code written based on java.awt package javadoc published for
- * JDK 9. It makes possible to compile code, which uses new JDK 9 features,
- * on JDK 8. The compiled stub classes should never be included in the final
- * product.
- */
-
-package java.awt;
-
-import java.awt.desktop.PreferencesHandler;
-import java.awt.desktop.QuitHandler;
-import java.awt.desktop.OpenFilesHandler;
-import java.awt.desktop.AboutHandler;
-
-public class Desktop {
- public static Desktop getDesktop() {return null;}
- public void setAboutHandler(final AboutHandler aboutHandler) {}
- public void setPreferencesHandler(final PreferencesHandler preferencesHandler) {}
- public void setOpenFileHandler(final OpenFilesHandler openFileHandler) {}
- public void setQuitHandler(final QuitHandler quitHandler) {}
-}
diff --git a/applemenu/src/java/awt/desktop/AboutEvent.java b/applemenu/src/java/awt/desktop/AboutEvent.java
deleted file mode 100644
index 1949ac3..0000000
--- a/applemenu/src/java/awt/desktop/AboutEvent.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* This is stub code written based on java.awt package javadoc published for
- * JDK 9. It makes possible to compile code, which uses new JDK 9 features,
- * on JDK 8. The compiled stub classes should never be included in the final
- * product.
- */
-
-package java.awt.desktop;
-
-public final class AboutEvent extends AppEvent {}
diff --git a/applemenu/src/java/awt/desktop/AboutHandler.java b/applemenu/src/java/awt/desktop/AboutHandler.java
deleted file mode 100644
index 2836412..0000000
--- a/applemenu/src/java/awt/desktop/AboutHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* This is stub code written based on java.awt package javadoc published for
- * JDK 9. It makes possible to compile code, which uses new JDK 9 features,
- * on JDK 8. The compiled stub classes should never be included in the final
- * product.
- */
-
-package java.awt.desktop;
-
-public interface AboutHandler {
- public void handleAbout(final AboutEvent e);
-}
diff --git a/applemenu/src/java/awt/desktop/AppEvent.java b/applemenu/src/java/awt/desktop/AppEvent.java
deleted file mode 100644
index 90a6861..0000000
--- a/applemenu/src/java/awt/desktop/AppEvent.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* This is stub code written based on java.awt package javadoc published for
- * JDK 9. It makes possible to compile code, which uses new JDK 9 features,
- * on JDK 8. The compiled stub classes should never be included in the final
- * product.
- */
-
-package java.awt.desktop;
-
-import java.util.EventObject;
-
-public class AppEvent extends EventObject {
- AppEvent() {super(null);}
-}
diff --git a/applemenu/src/java/awt/desktop/FilesEvent.java b/applemenu/src/java/awt/desktop/FilesEvent.java
deleted file mode 100644
index f453286..0000000
--- a/applemenu/src/java/awt/desktop/FilesEvent.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* This is stub code written based on java.awt package javadoc published for
- * JDK 9. It makes possible to compile code, which uses new JDK 9 features,
- * on JDK 8. The compiled stub classes should never be included in the final
- * product.
- */
-
-package java.awt.desktop;
-
-import java.io.File;
-import java.util.List;
-
-public class FilesEvent extends AppEvent {
- public List<File> getFiles() {return null;}
-
-}
diff --git a/applemenu/src/java/awt/desktop/OpenFilesEvent.java b/applemenu/src/java/awt/desktop/OpenFilesEvent.java
deleted file mode 100644
index 912a9b7..0000000
--- a/applemenu/src/java/awt/desktop/OpenFilesEvent.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* This is stub code written based on java.awt package javadoc published for
- * JDK 9. It makes possible to compile code, which uses new JDK 9 features,
- * on JDK 8. The compiled stub classes should never be included in the final
- * product.
- */
-
-package java.awt.desktop;
-
-public final class OpenFilesEvent extends FilesEvent {
- public String getSearchTerm() {return null;}
-}
diff --git a/applemenu/src/java/awt/desktop/OpenFilesHandler.java b/applemenu/src/java/awt/desktop/OpenFilesHandler.java
deleted file mode 100644
index 697e54f..0000000
--- a/applemenu/src/java/awt/desktop/OpenFilesHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* This is stub code written based on java.awt package javadoc published for
- * JDK 9. It makes possible to compile code, which uses new JDK 9 features,
- * on JDK 8. The compiled stub classes should never be included in the final
- * product.
- */
-
-package java.awt.desktop;
-
-public interface OpenFilesHandler {
- public void openFiles(final OpenFilesEvent e);
-}
\ No newline at end of file
diff --git a/applemenu/src/java/awt/desktop/PreferencesEvent.java b/applemenu/src/java/awt/desktop/PreferencesEvent.java
deleted file mode 100644
index 6dfb00b..0000000
--- a/applemenu/src/java/awt/desktop/PreferencesEvent.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* This is stub code written based on java.awt package javadoc published for
- * JDK 9. It makes possible to compile code, which uses new JDK 9 features,
- * on JDK 8. The compiled stub classes should never be included in the final
- * product.
- */
-
-package java.awt.desktop;
-
-public final class PreferencesEvent extends AppEvent {
- public PreferencesEvent() {}
-}
diff --git a/applemenu/src/java/awt/desktop/PreferencesHandler.java b/applemenu/src/java/awt/desktop/PreferencesHandler.java
deleted file mode 100644
index 6f1601a..0000000
--- a/applemenu/src/java/awt/desktop/PreferencesHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* This is stub code written based on java.awt package javadoc published for
- * JDK 9. It makes possible to compile code, which uses new JDK 9 features,
- * on JDK 8. The compiled stub classes should never be included in the final
- * product.
- */
-
-package java.awt.desktop;
-
-public interface PreferencesHandler {
- public void handlePreferences(final PreferencesEvent e);
-}
\ No newline at end of file
diff --git a/applemenu/src/java/awt/desktop/QuitEvent.java b/applemenu/src/java/awt/desktop/QuitEvent.java
deleted file mode 100644
index 5f8b865..0000000
--- a/applemenu/src/java/awt/desktop/QuitEvent.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* This is stub code written based on java.awt package javadoc published for
- * JDK 9. It makes possible to compile code, which uses new JDK 9 features,
- * on JDK 8. The compiled stub classes should never be included in the final
- * product.
- */
-
-package java.awt.desktop;
-
-public final class QuitEvent extends AppEvent {}
diff --git a/applemenu/src/java/awt/desktop/QuitHandler.java b/applemenu/src/java/awt/desktop/QuitHandler.java
deleted file mode 100644
index 06bc0e7..0000000
--- a/applemenu/src/java/awt/desktop/QuitHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* This is stub code written based on java.awt package javadoc published for
- * JDK 9. It makes possible to compile code, which uses new JDK 9 features,
- * on JDK 8. The compiled stub classes should never be included in the final
- * product.
- */
-
-package java.awt.desktop;
-
-public interface QuitHandler {
- public void handleQuitRequestWith(final QuitEvent e, final QuitResponse response);
-}
diff --git a/applemenu/src/java/awt/desktop/QuitResponse.java b/applemenu/src/java/awt/desktop/QuitResponse.java
deleted file mode 100644
index 5fc2ba1..0000000
--- a/applemenu/src/java/awt/desktop/QuitResponse.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* This is stub code written based on java.awt package javadoc published for
- * JDK 9. It makes possible to compile code, which uses new JDK 9 features,
- * on JDK 8. The compiled stub classes should never be included in the final
- * product.
- */
-
-package java.awt.desktop;
-
-public interface QuitResponse {
- public void performQuit();
- public void cancelQuit();
-}
diff --git a/applemenu/src/java/awt/desktop/QuitStrategy.java b/applemenu/src/java/awt/desktop/QuitStrategy.java
deleted file mode 100644
index f264a21..0000000
--- a/applemenu/src/java/awt/desktop/QuitStrategy.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-
-/* This is stub code written based on java.awt package javadoc published for
- * JDK 9. It makes possible to compile code, which uses new JDK 9 features,
- * on JDK 8. The compiled stub classes should never be included in the final
- * product.
- */
-
-package java.awt.desktop;
-
-public enum QuitStrategy {
- NORMAL_EXIT,
- CLOSE_ALL_WINDOWS
-}
diff --git a/applemenu/src/org/netbeans/modules/applemenu/ApplePopupFactory.java b/applemenu/src/org/netbeans/modules/applemenu/ApplePopupFactory.java
new file mode 100644
index 0000000..c7fe4d5
--- /dev/null
+++ b/applemenu/src/org/netbeans/modules/applemenu/ApplePopupFactory.java
@@ -0,0 +1,453 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+
+package org.netbeans.modules.applemenu;
+
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JWindow;
+import javax.swing.Popup;
+import javax.swing.PopupFactory;
+import javax.swing.SwingUtilities;
+import org.openide.ErrorManager;
+
+
+
+/**
+ * Heavyweight popups created using PopupFactory are on mac-os will have a
+ * drop-shadow, which is exactly what we don't want for explorer tooltips that
+ * are supposed to look like a seamless part of the component they appear
+ * over.
+ *
+ * This class decides accurately if a heavyweight popup is needed, and if it
+ * is, uses a background color hack (which alas, only works about 60% of the
+ * time) to attempt to eliminate the drop shadow on the window it uses.
+ *
+ * Caveats: 1. Heavyweight popups from ViewTooltips are currently simply
+ * disabled by default. Enable them by setting the system property
+ * "nb.explorer.hw.completions" to "true". This only affects macintosh.
+ * They are off by default because sometimes the popup window will have a
+ * drop shadow no matter what we do.
+ *
+ * If using a macintosh and "nb.explorer.hw.completions" is "true" then,
+ * "nb.explorer.hw.cocoahack" can also be set true. If it is true one of
+ * two things will happen: 1. If System/Library/Java is on NetBeans' classpath
+ * (so the cocoa java classes are accessible), then we will have heavyweight
+ * popups that have no drop shadow 100% of the time. 2. If the cocoa java
+ * classes cannot be loaded, the standard Swing PopupFactory will be used,
+ * which means the drop-shadow problem will be visible.
+ *
+ * @see org.openide.explorer.view.ViewTooltips
+ *
+ * @author Tim Boudreau
+ */
+ at org.openide.util.lookup.ServiceProvider(service=javax.swing.PopupFactory.class)
+public class ApplePopupFactory extends PopupFactory {
+ private static final boolean APPLE_HEAVYWEIGHT =
+ Boolean.getBoolean ("nb.explorer.hw.completions"); //NOI18N
+
+ private static final boolean APPLE_COCOA_HACK = APPLE_HEAVYWEIGHT &&
+ Boolean.getBoolean ("nb.explorer.hw.cocoahack"); //NOI18N
+
+ private static Set<Reference<JWindow>> windowPool = new HashSet<Reference<JWindow>>();
+
+ //As is, the background color hack in this class works about 60% of
+ //the time to get rid of the drop shadow on heavyweight popups, and
+ //this class will reliably prefer a lightweight popup wherever possible,
+ //which Apple's implementation doesn't. So it is useful without the
+ //egregious hack...it will just work 100% with it.
+ //To be continued...
+ public ApplePopupFactory() {
+ }
+
+ @Override
+ public Popup getPopup(Component owner, Component contents,
+ int x, int y) throws IllegalArgumentException {
+ assert owner instanceof JComponent;
+ Dimension d = contents.getPreferredSize();
+ Container c = ((JComponent) owner).getTopLevelAncestor();
+ if (c == null) {
+ throw new IllegalArgumentException ("Not onscreen: " + owner);
+ }
+ Point p = new Point (x, y);
+ SwingUtilities.convertPointFromScreen(p, c);
+ Rectangle r = new Rectangle (p.x, p.y, d.width, d.height);
+ if (c.getBounds().contains(r)) {
+ //XXX need API to determine if editor area comp is heavyweight,
+ //and if so, return a "medium weight" popup of a java.awt.Component
+ //that embeds the passed contents component
+ return new LWPopup (owner, contents, x, y);
+ } else {
+ return APPLE_HEAVYWEIGHT ?
+ (Popup) new HWPopup (owner, contents, x, y) :
+ (Popup) new NullPopup();
+ }
+ }
+
+ private static final class NullPopup extends Popup {
+ @Override
+ public void show() {}
+ @Override
+ public void hide() {}
+ }
+
+ private static abstract class OurPopup extends Popup {
+ protected Component owner = null;
+ protected Component contents = null;
+ protected int x = -1;
+ protected int y = -1;
+ public OurPopup (Component owner, Component contents, int x, int y) {
+ configure (owner, contents, x, y);
+ }
+
+ final void configure (Component owner, Component contents, int x, int y) {
+ this.owner = owner;
+ this.contents = contents;
+ this.x = x;
+ this.y = y;
+ }
+
+ protected abstract void prepareResources();
+ protected abstract void doShow();
+ public abstract boolean isShowing();
+ protected abstract void doHide();
+
+ @Override
+ public final void show() {
+ prepareResources();
+ doShow();
+ }
+
+ @Override
+ public final void hide() {
+ doHide();
+ }
+
+ void dispose() {
+ owner = null;
+ contents = null;
+ x = -1;
+ y = -1;
+ }
+
+ private boolean canReuse = false;
+ public final void clear() {
+ canReuse = true;
+ dispose();
+ }
+
+ boolean isInUse() {
+ return canReuse;
+ }
+ }
+
+ private static class LWPopup extends OurPopup {
+ public LWPopup (Component owner, Component contents, int x, int y) {
+ super (owner, contents, x, y);
+ }
+
+ private Rectangle bounds = null;
+ @Override
+ protected void prepareResources() {
+ JComponent jc = (JComponent) owner;
+ Container w = jc.getTopLevelAncestor();
+ JComponent pane = null;
+ if (w instanceof JFrame) {
+ pane = (JComponent) ((JFrame) w).getGlassPane();
+ } else if (w instanceof JDialog) {
+ pane = (JComponent) ((JDialog) w).getGlassPane();
+ } else if (w instanceof JWindow) {
+ pane = (JComponent) ((JWindow) w).getGlassPane();
+ }
+ if (w == null) {
+ throw new IllegalArgumentException ("Not a JFrame/" + //NOI18N
+ "JWindow/JDialog: " + owner); //NOI18N
+ }
+ Point p = new Point (x, y);
+ SwingUtilities.convertPointFromScreen(p, pane);
+ if (pane.getLayout() != null) {
+ pane.setLayout (null);
+ }
+ pane.setVisible(true);
+ contents.setVisible (false);
+ Dimension d = contents.getPreferredSize();
+ pane.add (contents);
+ bounds = new Rectangle (p.x, p.y, d.width, d.height);
+ contents.setBounds (p.x, p.y, d.width, d.height);
+ }
+
+ @Override
+ protected void doShow() {
+ contents.setVisible (true);
+ }
+
+ @Override
+ public boolean isShowing() {
+ return contents != null && contents.isShowing();
+ }
+
+ @Override
+ protected void doHide() {
+ Container parent = contents.getParent();
+ if (parent != null) {
+ contents.getParent().remove (contents);
+ parent.repaint(bounds.x, bounds.y, bounds.width, bounds.height);
+ parent.setVisible(false);
+ }
+ //If doShow() was never called, we've modified the visibility
+ //of the contents component, which could cause problems elsewhere
+ contents.setVisible (true);
+ }
+ }
+
+ private static class HWPopup extends OurPopup {
+ private JWindow window = null;
+ public HWPopup (Component owner, Component contents, int x, int y) {
+ super (owner, contents, x, y);
+ }
+
+ @Override
+ public boolean isShowing() {
+ return window != null && window.isShowing();
+ }
+
+ @Override
+ void dispose() {
+ if (window != null) {
+ checkInWindow (window);
+ window = null;
+ }
+ super.dispose();
+ }
+
+ @Override
+ protected void prepareResources() {
+ window = checkOutWindow();
+ window.getContentPane().add (contents);
+ window.setLocation (new Point (x, y));
+ window.pack();
+ window.setBackground (new java.awt.Color (255, 255, 255, 0));
+ }
+
+ @Override
+ protected void doShow() {
+ window.setVisible(true);
+ }
+
+ @Override
+ protected void doHide() {
+ if (window != null) {
+ window.setVisible(false);
+ window.getContentPane().remove (contents);
+ //Try to force a reset
+ dispose();
+ }
+ }
+ }
+
+ private static JWindow checkOutWindow() {
+ if (windowPool != null) {
+ if (!windowPool.isEmpty()) {
+ for (Iterator<Reference<JWindow>> i=windowPool.iterator(); i.hasNext();) {
+ Reference<JWindow> ref = i.next();
+ JWindow win = ref.get();
+ i.remove();
+ if (win != null) {
+ assert !win.isShowing();
+ win.setBounds (0, 0, 1, 1);
+ win.getContentPane().removeAll();
+ win.setBackground (new java.awt.Color (255, 255, 255, 0));
+ return win;
+ }
+ }
+ }
+ }
+ JWindow nue = APPLE_COCOA_HACK ? (JWindow) new HackedJWindow() : new JWindow();
+
+ nue.setBackground (new java.awt.Color (255, 255, 255, 0));
+ return nue;
+ }
+
+ private static void checkInWindow (JWindow win) {
+ if (!APPLE_COCOA_HACK) {
+ win.dispose();
+ }
+ windowPool.add (new SoftReference<JWindow> (win));
+ }
+
+ //A counter for unique window ids (used only if APPLE_COCOA_HACK is true)
+ private static int ct = 0;
+ //A flag if our reflection-based hack doesn't work, so we don't try
+ //again
+ private static boolean hackBroken = false;
+ //Make sure we've logged a warning
+ private static boolean warned = false;
+
+ static boolean broken() {
+ return hackBroken;
+ }
+
+ /**
+ * A JWindow which can (maybe) look up the native cocoa window that
+ * corresponds to it and hack its shadow property. No guarantees
+ * this will continue working, but once it fails it will fall back
+ * gracefully.
+ *
+ * This class is ONLY used if both system properties,
+ * nb.explorer.hw.completions and nb.explorer.hw.cocoahack
+ * are intentionally set to true. If the cocoa classes are not
+ * available, it will log a warning and fail gracefully.
+ *
+ */
+ private static final class HackedJWindow extends JWindow {
+ private String title = "none";
+ HackedJWindow() {}
+
+ @Override
+ public void addNotify() {
+ super.addNotify();
+ hackTitle();
+ hackNativeWindow();
+ }
+
+ private void hackTitle() {
+ if (!hackBroken) {
+ try {
+ //First we set a unique title on the peer - JWindow
+ //doesn't have a title, but apple.awt.CWindow does.
+ //Later we will use it to identify the right window in
+ //the array of windows owned by the application.
+ //This ain't pretty.
+ Field f = Component.class.getDeclaredField("peer"); // NOI18N
+ f.setAccessible(true);
+ Object o = f.get(this);
+ if (o != null) {
+ Method m = o.getClass().getDeclaredMethod ("setTitle",
+ new Class[] { String.class });
+ m.setAccessible(true);
+ title = "hw popup" + (ct++);
+ m.invoke (o, new Object[] { title });
+ }
+ } catch (Exception e) {
+ warn(e);
+ }
+ }
+ }
+
+ private void hackNativeWindow() {
+ if (!hackBroken) {
+ try {
+ //First, lookup the global singleton NSApplication
+ Class<?> c = Class.forName ("com.apple.cocoa.application." +
+ "NSApplication");
+
+ Method m = c.getDeclaredMethod ("sharedApplication");
+ Object nsapplication = m.invoke (null);
+
+ //Now we'll get an NSArray array wrapper of NSWindow objects
+ m = nsapplication.getClass().getMethod ("windows");
+ Object nsarray_of_nswindows = m.invoke (nsapplication);
+ //Get the array size
+ m = nsarray_of_nswindows.getClass().getMethod("count");
+ int arrSize = ((Integer) m.invoke (nsarray_of_nswindows)).intValue();
+
+ //Allocate an array to copy into
+ Object[] windows = new Object [arrSize];
+ m = nsarray_of_nswindows.getClass().getMethod(
+ "getObjects", new Class[] { Object[].class });
+
+ //Gets us an NSWindow[]
+ m.invoke (nsarray_of_nswindows, new Object[] { windows });
+ if (windows.length > 0) {
+ //Lookup the methods we'll need first, to reduce
+ //overhead inside the loop
+ c = windows[0].getClass();
+ Method titleMethod = c.getMethod("title");
+ Method setHasShadowMethod = c.getMethod ("setHasShadow",
+ new Class[] { Boolean.TYPE});
+
+ for (int i=0; i < windows.length; i++) {
+ //Get the title
+ String ttl = (String) titleMethod.invoke (windows[i]);
+
+ if (title.equals (ttl)) {
+ //We have the right method, set hasShadow to
+ //false
+ setHasShadowMethod.invoke (windows[i],
+ new Object[] { Boolean.FALSE });
+ }
+ }
+ }
+ } catch (Exception e) {
+ warn(e);
+ }
+ }
+ }
+
+ private void warn(Exception e) {
+ hackBroken = true;
+ if (!warned) {
+ warned = true;
+ ErrorManager.getDefault().log(ErrorManager.INFORMATIONAL,
+ "Cannot turn off popup drop shadow, " +
+ "reverting to standard swing popup factory");
+ ErrorManager.getDefault().notify(ErrorManager.INFORMATIONAL, e);
+ e.printStackTrace();
+ }
+ }
+ }
+}
diff --git a/applemenu/src/org/netbeans/modules/applemenu/Install.java b/applemenu/src/org/netbeans/modules/applemenu/Install.java
index 3397d24..6c66fb2 100644
--- a/applemenu/src/org/netbeans/modules/applemenu/Install.java
+++ b/applemenu/src/org/netbeans/modules/applemenu/Install.java
@@ -50,43 +50,34 @@ import java.lang.reflect.*;
import org.openide.modules.ModuleInstall;
import org.openide.util.Utilities;
-/** Module installer that installs listeners, which will interpret
+/** Module installer that installs an com.apple.eawt.ApplicationListener on
+ * the com.apple.eawt.Application object for this session, which will interpret
* apple events and call the appropriate action from the actions pool.
*
* @author Tim Boudreau
*/
public class Install extends ModuleInstall {
private CtrlClickHack listener;
- private Class adapter;
@Override
public void restored () {
listener = new CtrlClickHack();
Toolkit.getDefaultToolkit().addAWTEventListener(listener, AWTEvent.MOUSE_EVENT_MASK | AWTEvent.FOCUS_EVENT_MASK);
- if (Utilities.isMac() ) {
+ if (Utilities.isMac() ) { // NOI18N
+ try {
+ Class<?> adapter = Class.forName("org.netbeans.modules.applemenu.NbApplicationAdapter");
+ Method m = adapter.getDeclaredMethod("install", new Class[0] );
+ m.invoke(adapter, new Object[0]);
+ } catch (NoClassDefFoundError e) {
+ } catch (ClassNotFoundException e) {
+ } catch (Exception e) {
+ }
String pn = "apple.laf.useScreenMenuBar"; // NOI18N
if (System.getProperty(pn) == null) {
System.setProperty(pn, "true"); // NOI18N
}
- if (!installAdapter("org.netbeans.modules.applemenu.NbApplicationAdapterJDK8")) { // NOI18N
- // JDK 8 failed, try JDK 9
- installAdapter("org.netbeans.modules.applemenu.NbApplicationAdapterJDK9"); // NOI18N
- }
}
}
-
- private boolean installAdapter(String className) {
- try {
- adapter = Class.forName(className);
- Method m = adapter.getDeclaredMethod("install", new Class[0] ); // NOI18N
- m.invoke(adapter, new Object[0]);
- return true;
- }catch (NoClassDefFoundError e) {
- }catch (ClassNotFoundException e) {
- }catch (Exception e) {
- }
- return false;
- }
@Override
public void uninstalled () {
@@ -94,11 +85,14 @@ public class Install extends ModuleInstall {
Toolkit.getDefaultToolkit().removeAWTEventListener(listener);
listener = null;
}
- if (Utilities.isMac() && adapter != null) {
+ if (System.getProperty("mrj.version") != null) { // NOI18N
+
try {
- Method m = adapter.getDeclaredMethod("uninstall", new Class[0] ); // NOI18N
+ Class<?> adapter = Class.forName("org.netbeans.modules.applemenu.NbApplicationAdapter");
+ Method m = adapter.getDeclaredMethod("uninstall", new Class[0] );
m.invoke(adapter, new Object[0]);
} catch (NoClassDefFoundError e) {
+ } catch (ClassNotFoundException e) {
} catch (Exception e) {
}
}
diff --git a/applemenu/src/org/netbeans/modules/applemenu/NbApplicationAdapter.java b/applemenu/src/org/netbeans/modules/applemenu/NbApplicationAdapter.java
index b55844c..859f070 100644
--- a/applemenu/src/org/netbeans/modules/applemenu/NbApplicationAdapter.java
+++ b/applemenu/src/org/netbeans/modules/applemenu/NbApplicationAdapter.java
@@ -44,18 +44,18 @@
package org.netbeans.modules.applemenu;
+import com.apple.eawt.*;
import java.awt.Dialog;
-import java.awt.Frame;
import java.awt.Window;
+import java.beans.Beans;
import java.awt.event.ActionEvent;
import java.io.File;
-import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.Action;
import javax.swing.JDialog;
-import javax.swing.RootPaneContainer;
+import javax.swing.SwingUtilities;
import org.openide.ErrorManager;
import org.openide.awt.Actions;
@@ -75,20 +75,37 @@ import org.openide.windows.WindowSystemListener;
* @author Tim Boudreau
*/
-abstract class NbApplicationAdapter {
+class NbApplicationAdapter implements ApplicationListener {
- NbApplicationAdapter() {
+ private static ApplicationListener al = null;
+
+ private NbApplicationAdapter() {
}
static void install() {
+ //Thanks to Scott Kovatch from Apple for this fix - enabling the preferences menu
+ //requires that Beans.isDesignTime() be false
+ boolean wasDesignTime = Beans.isDesignTime();
+
+ try {
+ Beans.setDesignTime (false);
+
+ al = new NbApplicationAdapter();
+ Application.getApplication().addApplicationListener(al);
+ Application.getApplication().setEnabledAboutMenu(true);
+ Application.getApplication().setEnabledPreferencesMenu(true);
+ } finally {
+ Beans.setDesignTime(wasDesignTime);
+ }
WindowManager.getDefault().addWindowSystemListener(new WindowSystemListener() {
@Override
public void beforeLoad(WindowSystemEvent event) {
WindowManager.getDefault().removeWindowSystemListener(this);
try {
- Frame main = WindowManager.getDefault().getMainWindow();
- ((RootPaneContainer)main).getRootPane().putClientProperty("apple.awt.fullscreenable", true); // NOI18N
+ FullScreenUtilities.setWindowCanFullScreen(WindowManager.getDefault().getMainWindow(), true);
+ } catch( ThreadDeath td ) {
+ throw td;
} catch( Throwable e ) {
Logger.getLogger(NbApplicationAdapter.class.getName()).log(Level.FINE,
"Error while setting up full screen support.", e );//NOI18N
@@ -109,7 +126,14 @@ abstract class NbApplicationAdapter {
});
}
- void handleAbout() {
+ static void uninstall() {
+ if (al != null) {
+ Application.getApplication().removeApplicationListener(al);
+ al = null;
+ }
+ }
+
+ public void handleAbout(ApplicationEvent e) {
//#221571 - check if About window is showing already
Window[] windows = Dialog.getWindows();
if( null != windows ) {
@@ -119,49 +143,64 @@ abstract class NbApplicationAdapter {
if( Boolean.TRUE.equals(dlg.getRootPane().getClientProperty("nb.about.dialog") ) ) { //NOI18N
if( dlg.isVisible() ) {
dlg.toFront();
+ e.setHandled(true);
return;
}
}
}
}
}
- performAction("Help", "org.netbeans.core.actions.AboutAction"); // NOI18N
+ e.setHandled(performAction("Help", "org.netbeans.core.actions.AboutAction"));
}
- void openFiles(List<File> files) {
- for (File f : files) {
- if (f.exists() && !f.isDirectory()) {
- FileObject obj = FileUtil.toFileObject(f);
- if (obj != null) {
- try {
- DataObject dob = DataObject.find(obj);
- OpenCookie oc = dob.getLookup().lookup (OpenCookie.class);
- if (oc != null) {
- oc.open();
+ public void handleOpenApplication (ApplicationEvent e) {
+ }
+
+ public void handleOpenFile (ApplicationEvent e) {
+ boolean result = false;
+ String fname = e.getFilename();
+ File f = new File (fname);
+ if (f.exists() && !f.isDirectory()) {
+ FileObject obj = FileUtil.toFileObject(f);
+ if (obj != null) {
+ try {
+ DataObject dob = DataObject.find(obj);
+ OpenCookie oc = dob.getLookup().lookup (OpenCookie.class);
+ if (result = oc != null) {
+ oc.open();
+ } else {
+ EditCookie ec = dob.getLookup().lookup(EditCookie.class);
+ if (result = ec != null) {
+ ec.edit();
} else {
- EditCookie ec = dob.getLookup().lookup(EditCookie.class);
- if (ec != null) {
- ec.edit();
- } else {
- ViewCookie v = dob.getLookup().lookup(ViewCookie.class);
- if (v != null) {
- v.view();
- }
+ ViewCookie v = dob.getLookup().lookup(ViewCookie.class);
+ if (result = v != null) {
+ v.view();
}
}
- } catch (DataObjectNotFoundException ex) {
- Logger.getLogger(NbApplicationAdapter.class.getName()).log(Level.INFO, f.getAbsolutePath(), ex);
}
+ } catch (DataObjectNotFoundException ex) {
+ Logger.getLogger(NbApplicationAdapter.class.getName()).log(Level.INFO, fname, ex);
}
}
}
+ e.setHandled(result);
+ }
+
+ public void handlePreferences (ApplicationEvent e) {
+ e.setHandled(performAction("Window", "org.netbeans.modules.options.OptionsWindowAction"));
}
- public void handlePreferences() {
- performAction("Window", "org.netbeans.modules.options.OptionsWindowAction"); // NOI18N
+ public void handlePrintFile (ApplicationEvent e) {
+ //do nothing - what invokes this?
}
- public void handleQuit() {
- performAction("System", "org.netbeans.core.actions.SystemExit"); // NOI18N
+
+ public void handleQuit (ApplicationEvent e) {
+ //Set it to false to abort the quit, our code will handle shutdown
+ e.setHandled(!performAction("System", "org.netbeans.core.actions.SystemExit"));
+ }
+
+ public void handleReOpenApplication (ApplicationEvent e) {
}
private boolean performAction(String category, String id) {
@@ -169,7 +208,7 @@ abstract class NbApplicationAdapter {
if (a == null) {
return false;
}
- ActionEvent ae = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, "whatever"); // NOI18N
+ ActionEvent ae = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, "whatever");
try {
a.actionPerformed(ae);
return true;
diff --git a/applemenu/src/org/netbeans/modules/applemenu/NbApplicationAdapterJDK8.java b/applemenu/src/org/netbeans/modules/applemenu/NbApplicationAdapterJDK8.java
deleted file mode 100644
index 8d424af..0000000
--- a/applemenu/src/org/netbeans/modules/applemenu/NbApplicationAdapterJDK8.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-package org.netbeans.modules.applemenu;
-
-import com.apple.eawt.AboutHandler;
-import com.apple.eawt.AppEvent;
-import com.apple.eawt.Application;
-import com.apple.eawt.OpenFilesHandler;
-import com.apple.eawt.PreferencesHandler;
-import com.apple.eawt.QuitHandler;
-import com.apple.eawt.QuitResponse;
-import org.openide.ErrorManager;
-
-/**
- *
- * @author Tomas Hurka
- *
- * Uses old com.apple.eawt.* API.
- * This class can be deleted once NetBeans is built by JDK 9.
- */
-public class NbApplicationAdapterJDK8 extends NbApplicationAdapter implements AboutHandler, OpenFilesHandler, PreferencesHandler, QuitHandler {
-
- static void install() {
- try {
- Application app = Application.getApplication();
- NbApplicationAdapterJDK8 al = new NbApplicationAdapterJDK8();
-
- app.setAboutHandler(al);
- app.setOpenFileHandler(al);
- app.setPreferencesHandler(al);
- app.setQuitHandler(al);
- } catch (Throwable ex) {
- ErrorManager.getDefault().notify(ErrorManager.WARNING, ex);
- } finally {
- }
- NbApplicationAdapter.install();
- }
-
- static void uninstall() {
- Application app = Application.getApplication();
-
- app.setAboutHandler(null);
- app.setOpenFileHandler(null);
- app.setPreferencesHandler(null);
- app.setQuitHandler(null);
- }
-
- @Override
- public void handleAbout(AppEvent.AboutEvent e) {
- handleAbout();
- }
-
- @Override
- public void openFiles(AppEvent.OpenFilesEvent e) {
- openFiles(e.getFiles());
- }
-
- @Override
- public void handlePreferences(AppEvent.PreferencesEvent e) {
- handlePreferences();
- }
-
- @Override
- public void handleQuitRequestWith(AppEvent.QuitEvent e, QuitResponse response) {
- handleQuit();
- }
-}
diff --git a/applemenu/src/org/netbeans/modules/applemenu/NbApplicationAdapterJDK9.java b/applemenu/src/org/netbeans/modules/applemenu/NbApplicationAdapterJDK9.java
deleted file mode 100644
index 936c334..0000000
--- a/applemenu/src/org/netbeans/modules/applemenu/NbApplicationAdapterJDK9.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-package org.netbeans.modules.applemenu;
-
-import java.awt.Desktop;
-import java.awt.desktop.AboutEvent;
-import java.awt.desktop.AboutHandler;
-import java.awt.desktop.OpenFilesEvent;
-import java.awt.desktop.OpenFilesHandler;
-import java.awt.desktop.PreferencesEvent;
-import java.awt.desktop.PreferencesHandler;
-import java.awt.desktop.QuitEvent;
-import java.awt.desktop.QuitHandler;
-import java.awt.desktop.QuitResponse;
-import org.openide.ErrorManager;
-
-/**
- *
- * @author Tomas Hurka
- *
- * Uses new 'JEP 272: Platform-Specific Desktop Features' API.
- * This class can be merged with superclass, once NetBeans is built by JDK 9.
- */
-public class NbApplicationAdapterJDK9 extends NbApplicationAdapter implements AboutHandler, OpenFilesHandler, PreferencesHandler, QuitHandler {
-
- static void install() {
- try {
- Desktop app = Desktop.getDesktop();
- NbApplicationAdapterJDK9 al = new NbApplicationAdapterJDK9();
-
- app.setAboutHandler(al);
- app.setOpenFileHandler(al);
- app.setPreferencesHandler(al);
- app.setQuitHandler(al);
- } catch (Throwable ex) {
- ErrorManager.getDefault().notify(ErrorManager.WARNING, ex);
- } finally {
- }
- NbApplicationAdapter.install();
- }
-
- static void uninstall() {
- Desktop app = Desktop.getDesktop();
-
- app.setAboutHandler(null);
- app.setOpenFileHandler(null);
- app.setPreferencesHandler(null);
- app.setQuitHandler(null);
- }
-
- @Override
- public void handleAbout(AboutEvent e) {
- handleAbout();
- }
-
- @Override
- public void openFiles(OpenFilesEvent e) {
- openFiles(e.getFiles());
- }
-
- @Override
- public void handlePreferences(PreferencesEvent e) {
- handlePreferences();
- }
-
- @Override
- public void handleQuitRequestWith(QuitEvent e, QuitResponse response) {
- handleQuit();
- }
-}
diff --git a/autoupdate.cli/build.xml b/autoupdate.cli/build.xml
index 8b63803..f890189 100644
--- a/autoupdate.cli/build.xml
+++ b/autoupdate.cli/build.xml
@@ -2,10 +2,7 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
The contents of this file are subject to the terms of either the GNU
@@ -18,9 +15,9 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
diff --git a/autoupdate.cli/manifest.mf b/autoupdate.cli/manifest.mf
index ec65499..d1a95da 100644
--- a/autoupdate.cli/manifest.mf
+++ b/autoupdate.cli/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.autoupdate.cli
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/autoupdate/cli/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.13.1
+OpenIDE-Module-Specification-Version: 1.12.1
diff --git a/autoupdate.cli/nbproject/project.properties b/autoupdate.cli/nbproject/project.properties
index b818857..8faa8c6 100644
--- a/autoupdate.cli/nbproject/project.properties
+++ b/autoupdate.cli/nbproject/project.properties
@@ -1,9 +1,6 @@
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
+# Copyright 1997-2013 Sun Microsystems, Inc. All rights reserved.
#
# The contents of this file are subject to the terms of either the GNU
# General Public License Version 2 only ("GPL") or the Common
@@ -15,9 +12,9 @@
# specific language governing permissions and limitations under the
# License. When distributing the software, include this License Header
# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+# nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
+# by Sun in the GPL Version 2 section of the License file that
# accompanied this code. If applicable, add the following below the
# License Header, with the fields enclosed by brackets [] replaced by
# your own identifying information:
diff --git a/autoupdate.cli/nbproject/project.xml b/autoupdate.cli/nbproject/project.xml
index d4f8d59..b295c52 100644
--- a/autoupdate.cli/nbproject/project.xml
+++ b/autoupdate.cli/nbproject/project.xml
@@ -2,10 +2,7 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
The contents of this file are subject to the terms of either the GNU
@@ -18,9 +15,9 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
diff --git a/autoupdate.cli/src/org/netbeans/modules/autoupdate/cli/ModuleOptions.java b/autoupdate.cli/src/org/netbeans/modules/autoupdate/cli/ModuleOptions.java
index 443405a..3a5ee79 100644
--- a/autoupdate.cli/src/org/netbeans/modules/autoupdate/cli/ModuleOptions.java
+++ b/autoupdate.cli/src/org/netbeans/modules/autoupdate/cli/ModuleOptions.java
@@ -360,7 +360,7 @@ public class ModuleOptions extends OptionProcessor {
@NbBundle.Messages({
"# {0} - regexp",
- "MSG_CantCompileRegex=Cannot understand regular expession ''{0}''"
+ "MSG_CantCompileRegex=Cannot understand regular expession '{0}'"
})
private static Pattern[] findMatcher(Env env, String[] pattern) {
Pattern[] arr = new Pattern[pattern.length];
diff --git a/autoupdate.services/build.xml b/autoupdate.services/build.xml
index 3b74b06..ac77263 100644
--- a/autoupdate.services/build.xml
+++ b/autoupdate.services/build.xml
@@ -1,52 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="autoupdate.services">
<description>Builds, tests, and runs the project org.netbeans.modules.autoupdate.services</description>
<import file="../nbbuild/templates/projectized.xml"/>
<target name="compile-updater" depends="init">
<mkdir dir="${build.dir}/updaterclasses"/>
<javac srcdir="libsrc" destdir="${build.dir}/updaterclasses"
- deprecation="${build.compiler.deprecation}"
- debug="${build.compiler.debug}" debuglevel="${build.compiler.debuglevel}"
- optimize="${build.compiler.optimize}" source="${javac.source}"
+ deprecation="${build.compiler.deprecation}"
+ debug="${build.compiler.debug}" debuglevel="${build.compiler.debuglevel}"
+ optimize="${build.compiler.optimize}" source="${javac.source}"
target="${javac.target}">
<compilerarg line="${javac.compilerargs}"/>
</javac>
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/ModuleUpdater.java b/autoupdate.services/libsrc/org/netbeans/updater/ModuleUpdater.java
index c3c5c82..acee209 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/ModuleUpdater.java
+++ b/autoupdate.services/libsrc/org/netbeans/updater/ModuleUpdater.java
@@ -477,7 +477,7 @@ public final class ModuleUpdater extends Thread {
}
} else {
bytesRead = copyStreams( jarFile.getInputStream( entry ), context.createOS( destFile ), bytesRead );
- XMLUtil.LOG.info("Copied file " + jarFile.getName() + ":" + entry + " to " + destFile);
+ XMLUtil.LOG.info("Copied file " + entry + " to " + destFile);
crc = entry.getCrc();
}
if(executableFiles.contains(pathTo)) {
@@ -512,7 +512,7 @@ public final class ModuleUpdater extends Thread {
destFile.getParentFile ().mkdirs ();
hasMainClass = true;
bytesRead = copyStreams( jarFile.getInputStream( entry ), context.createOS( destFile ), bytesRead );
- XMLUtil.LOG.info("Copied file " + jarFile.getName() + ":" + entry + " to " + destFile);
+ XMLUtil.LOG.info("Copied file " + entry + " to " + destFile);
context.setProgressValue( bytesRead );
}
}
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-1_0.dtd b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-1_0.dtd
index 7ed10df..5c0881b 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-1_0.dtd
+++ b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-1_0.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Catalog 1.0//EN -->
<!-- XML representation of Autoupdate Modules/Updates Catalog -->
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_0.dtd b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_0.dtd
index 147820a..ec58115 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_0.dtd
+++ b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_0.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Catalog 2.0//EN -->
<!-- XML representation of Autoupdate Modules/Updates Catalog -->
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_2.dtd b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_2.dtd
index 0553ed9..9905c2f 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_2.dtd
+++ b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_2.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Catalog 2.2//EN -->
<!-- XML representation of Autoupdate Modules/Updates Catalog -->
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_3.dtd b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_3.dtd
index 06a6144..2e6ffb5 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_3.dtd
+++ b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_3.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Catalog 2.3//EN -->
<!-- XML representation of Autoupdate Modules/Updates Catalog -->
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_4.dtd b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_4.dtd
index 39eb52a..f07f2fb 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_4.dtd
+++ b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_4.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Catalog 2.4//EN -->
<!-- XML representation of Autoupdate Modules/Updates Catalog -->
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_5.dtd b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_5.dtd
index 0fdd648..0d180ee 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_5.dtd
+++ b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_5.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Catalog 2.5//EN -->
<!-- XML representation of Autoupdate Modules/Updates Catalog -->
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_6.dtd b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_6.dtd
index 1c66dab..0cc47d1 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_6.dtd
+++ b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_6.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Catalog 2.6//EN -->
<!-- XML representation of Autoupdate Modules/Updates Catalog -->
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_7.dtd b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_7.dtd
index 19fe08e..0c959bc 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_7.dtd
+++ b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-catalog-2_7.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Catalog 2.7//EN -->
<!-- XML representation of Autoupdate Modules/Updates Catalog -->
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-1_0.dtd b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-1_0.dtd
index 08a037b..830e3c1 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-1_0.dtd
+++ b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-1_0.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Module Info 1.0//EN -->
<!-- XML representation of Autoupdate Module Info file -->
<!-- (Info.xml is included in NBM archive) -->
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_0.dtd b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_0.dtd
index 69fe5ba..e5dff0c 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_0.dtd
+++ b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_0.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Module Info 2.0//EN -->
<!-- XML representation of Autoupdate Module Info file -->
<!-- (Info.xml is included in NBM archive) -->
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_2.dtd b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_2.dtd
index b9b0fab..63f96b2 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_2.dtd
+++ b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_2.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Module Info 2.2//EN -->
<!-- XML representation of Autoupdate Module Info file -->
<!-- (Info.xml is included in NBM archive) -->
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_3.dtd b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_3.dtd
index 0bcd0d0..abae7fa 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_3.dtd
+++ b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_3.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Module Info 2.3//EN -->
<!-- XML representation of Autoupdate Module Info file -->
<!-- (Info.xml is included in NBM archive) -->
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_4.dtd b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_4.dtd
index 1952c66..307ab16 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_4.dtd
+++ b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_4.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Module Info 2.4//EN -->
<!-- XML representation of Autoupdate Module Info file -->
<!-- (Info.xml is included in NBM archive) -->
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_5.dtd b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_5.dtd
index 568038c..55fbc03 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_5.dtd
+++ b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_5.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Module Info 2.5//EN -->
<!-- XML representation of Autoupdate Module Info file -->
<!-- (Info.xml is included in NBM archive) -->
diff --git a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_7.dtd b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_7.dtd
index dbe6ff0..8f1a705 100644
--- a/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_7.dtd
+++ b/autoupdate.services/libsrc/org/netbeans/updater/resources/autoupdate-info-2_7.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Module Info 2.7//EN -->
<!-- XML representation of Autoupdate Module Info file -->
<!-- (Info.xml is included in NBM archive) -->
diff --git a/autoupdate.services/manifest.mf b/autoupdate.services/manifest.mf
index 2173309..ad2a9b3 100644
--- a/autoupdate.services/manifest.mf
+++ b/autoupdate.services/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.autoupdate.services
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/autoupdate/services/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.52.1
+OpenIDE-Module-Specification-Version: 1.51.1
OpenIDE-Module-Layer: org/netbeans/modules/autoupdate/services/resources/layer.xml
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
diff --git a/autoupdate.services/nbproject/org-netbeans-modules-autoupdate-services.sig b/autoupdate.services/nbproject/org-netbeans-modules-autoupdate-services.sig
index 5265c07..a4f6979 100644
--- a/autoupdate.services/nbproject/org-netbeans-modules-autoupdate-services.sig
+++ b/autoupdate.services/nbproject/org-netbeans-modules-autoupdate-services.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.51.1
+#Version 1.47
CLSS public abstract interface java.io.Serializable
@@ -73,10 +73,7 @@ hcls PrintStreamOrWriter,SentinelHolder,WrappedPrintStream,WrappedPrintWriter
CLSS public final org.netbeans.api.autoupdate.InstallSupport
innr public final static Installer
innr public final static Validator
-meth public boolean isContentModified(org.netbeans.api.autoupdate.InstallSupport$Installer,org.netbeans.api.autoupdate.UpdateElement)
meth public boolean isSigned(org.netbeans.api.autoupdate.InstallSupport$Installer,org.netbeans.api.autoupdate.UpdateElement)
-meth public boolean isSignedUnverified(org.netbeans.api.autoupdate.InstallSupport$Installer,org.netbeans.api.autoupdate.UpdateElement)
-meth public boolean isSignedVerified(org.netbeans.api.autoupdate.InstallSupport$Installer,org.netbeans.api.autoupdate.UpdateElement)
meth public boolean isTrusted(org.netbeans.api.autoupdate.InstallSupport$Installer,org.netbeans.api.autoupdate.UpdateElement)
meth public java.lang.String getCertificate(org.netbeans.api.autoupdate.InstallSupport$Installer,org.netbeans.api.autoupdate.UpdateElement)
meth public org.netbeans.api.autoupdate.InstallSupport$Installer doValidate(org.netbeans.api.autoupdate.InstallSupport$Validator,org.netbeans.api.progress.ProgressHandle) throws org.netbeans.api.autoupdate.OperationException
@@ -155,7 +152,6 @@ CLSS public final static !enum org.netbeans.api.autoupdate.OperationException$ER
fld public final static org.netbeans.api.autoupdate.OperationException$ERROR_TYPE ENABLE
fld public final static org.netbeans.api.autoupdate.OperationException$ERROR_TYPE INSTALL
fld public final static org.netbeans.api.autoupdate.OperationException$ERROR_TYPE INSTALLER
-fld public final static org.netbeans.api.autoupdate.OperationException$ERROR_TYPE MODIFIED
fld public final static org.netbeans.api.autoupdate.OperationException$ERROR_TYPE PROXY
fld public final static org.netbeans.api.autoupdate.OperationException$ERROR_TYPE UNINSTALL
fld public final static org.netbeans.api.autoupdate.OperationException$ERROR_TYPE WRITE_PERMISSION
diff --git a/autoupdate.services/nbproject/project.properties b/autoupdate.services/nbproject/project.properties
index 779440d..8cfb106 100644
--- a/autoupdate.services/nbproject/project.properties
+++ b/autoupdate.services/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
extra.module.files=modules/ext/updater.jar
is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/autoupdate.services/nbproject/project.xml b/autoupdate.services/nbproject/project.xml
index 4c8ed9a..ed5ac50 100644
--- a/autoupdate.services/nbproject/project.xml
+++ b/autoupdate.services/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/autoupdate.services/src/META-INF/translate.names b/autoupdate.services/src/META-INF/translate.names
index 43d5f6b..1736f46 100644
--- a/autoupdate.services/src/META-INF/translate.names
+++ b/autoupdate.services/src/META-INF/translate.names
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
org.netbeans.modules.autoupdate.XMLAutoupdateType=org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory
org.netbeans.modules.autoupdate.AutoupdateType=org.netbeans.spi.autoupdate.UpdateProvider
diff --git a/autoupdate.services/src/org/netbeans/api/autoupdate/package.html b/autoupdate.services/src/org/netbeans/api/autoupdate/package.html
index 4f00426..8304067 100644
--- a/autoupdate.services/src/org/netbeans/api/autoupdate/package.html
+++ b/autoupdate.services/src/org/netbeans/api/autoupdate/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/autoupdate.services/src/org/netbeans/modules/autoupdate/services/Bundle.properties b/autoupdate.services/src/org/netbeans/modules/autoupdate/services/Bundle.properties
index 1d3e545..a6ada28 100644
--- a/autoupdate.services/src/org/netbeans/modules/autoupdate/services/Bundle.properties
+++ b/autoupdate.services/src/org/netbeans/modules/autoupdate/services/Bundle.properties
@@ -1,42 +1,5 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
InstallSupportImpl_Download_Estabilish=Establishing a connection ...
-UpdateUnitProviderImpl_FormatCheckingForUpdates=Checking for updates in {0}...
+UpdateUnitProviderImpl_FormatCheckingForUpdates=Checking for updates in {0}...
InstallSupportImpl_Validate_CorruptedNBM=Cannot read NBM {0}
InstallSupportImpl_TurnOnTimeout=timeout of loading {0}
InstallSupportImpl_NullSource=Source URL for module "{0}" is null, most likely "distribution" attribute is set to the empty string in the UC catalog.\n\
diff --git a/autoupdate.services/src/org/netbeans/modules/autoupdate/services/resources/Bundle.properties b/autoupdate.services/src/org/netbeans/modules/autoupdate/services/resources/Bundle.properties
index 23f20de..1807a77 100644
--- a/autoupdate.services/src/org/netbeans/modules/autoupdate/services/resources/Bundle.properties
+++ b/autoupdate.services/src/org/netbeans/modules/autoupdate/services/resources/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Long-Description=\
The AutoUpdate feature provides several services: download and install available updates of installed modules, search and install new modules from subscribed Update Centers, view and manage the modules.
diff --git a/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/Bundle.properties b/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/Bundle.properties
index 5a9019c..1897ca4 100644
--- a/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/Bundle.properties
+++ b/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
CTL_CatalogUpdatesProviderFactory_DefaultName=Default Update Center
#NOI18N
URL_Prefix_Hash_Code=unique=
diff --git a/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/NetworkAccess.java b/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/NetworkAccess.java
index 2abc681..8e7ff94 100644
--- a/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/NetworkAccess.java
+++ b/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/NetworkAccess.java
@@ -71,8 +71,6 @@ public class NetworkAccess {
private static final RequestProcessor NETWORK_ACCESS = new RequestProcessor("autoupdate-network-access", 10, false);
- private static final int MAX_REDIRECTS = 10;
-
private NetworkAccess () {}
public static Task createNetworkAcessTask (URL url, int timeout, NetworkListener networkAcesssListener) {
@@ -163,32 +161,32 @@ public class NetworkAccess {
if(conn instanceof HttpsURLConnection){
NetworkAccess.initSSL((HttpsURLConnection) conn);
}
-
- // handle redirection here
- int redirCount = 0;
- URLConnection redir = conn;
- do {
- conn = redir;
- redir = checkRedirect(conn, timeout);
- redirCount++;
- } while (conn != redir && redirCount <= MAX_REDIRECTS);
-
- if (conn != redir) {
- throw new IOException("Too many redirects for " + url);
+ //for HTTP or HTTPS: conenct and read response - redirection or not?
+ if (conn instanceof HttpURLConnection) {
+ conn.connect();
+ if (((HttpURLConnection) conn).getResponseCode() == HttpURLConnection.HTTP_MOVED_TEMP) {
+ // in case of redirection, try to obtain new URL
+ String redirUrl = conn.getHeaderField("Location"); //NOI18N
+ if (null != redirUrl && !redirUrl.isEmpty()) {
+ //create connection to redirected url and substitute original conn
+ URL redirectedUrl = new URL(redirUrl);
+ URLConnection connRedir = redirectedUrl.openConnection();
+ connRedir.setRequestProperty("User-Agent", "NetBeans");
+ connRedir.setConnectTimeout(timeout);
+ conn = (HttpURLConnection) connRedir;
+ }
+ }
}
-
InputStream is = conn.getInputStream ();
contentLength = conn.getContentLength();
- if (err.isLoggable(Level.FINE)) {
- Map <String, List <String>> map = conn.getHeaderFields();
- StringBuilder sb = new StringBuilder("Connection opened for:\n");
- sb.append(" Url: ").append(conn.getURL()).append("\n");
- for(String field : map.keySet()) {
- sb.append(" ").append(field==null ? "Status" : field).append(": ").append(map.get(field)).append("\n");
- }
- sb.append("\n");
- err.log(Level.FINE, sb.toString());
+ Map <String, List <String>> map = conn.getHeaderFields();
+ StringBuilder sb = new StringBuilder("Connection opened for:\n");
+ sb.append(" Url: ").append(conn.getURL()).append("\n");
+ for(String field : map.keySet()) {
+ sb.append(" ").append(field==null ? "Status" : field).append(": ").append(map.get(field)).append("\n");
}
+ sb.append("\n");
+ err.log(Level.FINE, sb.toString());
return new BufferedInputStream (is);
}
};
@@ -246,30 +244,4 @@ public class NetworkAccess {
}
}
}
-
- private static URLConnection checkRedirect(URLConnection conn, int timeout) throws IOException {
- if (conn instanceof HttpURLConnection) {
- conn.connect();
- int code = ((HttpURLConnection) conn).getResponseCode();
- if (code == HttpURLConnection.HTTP_MOVED_TEMP
- || code == HttpURLConnection.HTTP_MOVED_PERM) {
- // in case of redirection, try to obtain new URL
- String redirUrl = conn.getHeaderField("Location"); //NOI18N
- if (null != redirUrl && !redirUrl.isEmpty()) {
- //create connection to redirected url and substitute original conn
- URL redirectedUrl = new URL(redirUrl);
- URLConnection connRedir = redirectedUrl.openConnection();
- // XXX is this neede
- connRedir.setRequestProperty("User-Agent", "NetBeans"); // NOI18N
- connRedir.setConnectTimeout(timeout);
- connRedir.setReadTimeout(timeout);
- if (connRedir instanceof HttpsURLConnection) {
- NetworkAccess.initSSL((HttpsURLConnection) connRedir);
- }
- return connRedir;
- }
- }
- }
- return conn;
- }
}
diff --git a/autoupdate.services/src/org/netbeans/spi/autoupdate/doc-files/autoupdate-catalog-2_4.dtd b/autoupdate.services/src/org/netbeans/spi/autoupdate/doc-files/autoupdate-catalog-2_4.dtd
index 39eb52a..f07f2fb 100644
--- a/autoupdate.services/src/org/netbeans/spi/autoupdate/doc-files/autoupdate-catalog-2_4.dtd
+++ b/autoupdate.services/src/org/netbeans/spi/autoupdate/doc-files/autoupdate-catalog-2_4.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Catalog 2.4//EN -->
<!-- XML representation of Autoupdate Modules/Updates Catalog -->
diff --git a/autoupdate.services/src/org/netbeans/spi/autoupdate/doc-files/autoupdate-info-2_4.dtd b/autoupdate.services/src/org/netbeans/spi/autoupdate/doc-files/autoupdate-info-2_4.dtd
index 1952c66..307ab16 100644
--- a/autoupdate.services/src/org/netbeans/spi/autoupdate/doc-files/autoupdate-info-2_4.dtd
+++ b/autoupdate.services/src/org/netbeans/spi/autoupdate/doc-files/autoupdate-info-2_4.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Autoupdate Module Info 2.4//EN -->
<!-- XML representation of Autoupdate Module Info file -->
<!-- (Info.xml is included in NBM archive) -->
diff --git a/autoupdate.services/src/org/netbeans/spi/autoupdate/package.html b/autoupdate.services/src/org/netbeans/spi/autoupdate/package.html
index aa6ff27..2b0bdab 100644
--- a/autoupdate.services/src/org/netbeans/spi/autoupdate/package.html
+++ b/autoupdate.services/src/org/netbeans/spi/autoupdate/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/mf-layer.xml b/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/mf-layer.xml
index 495ee6b..6baef7f 100644
--- a/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/mf-layer.xml
+++ b/autoupdate.services/test/unit/src/org/netbeans/api/autoupdate/mf-layer.xml
@@ -21,7 +21,7 @@ License. When distributing the software, include this License Header
Notice in each file and include the License file at
nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
@@ -56,19 +56,19 @@ made subject to such option by the copyright holder.
<file name="enabled-update-provider.instance">
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.api.autoupdate.Bundle"/>
<attr name="url_key" stringvalue="UC_ENABLED"/>
- <attr name="category" stringvalue="STANDARD"/>
+ <attr name="category" stringvalue="STANDARD"/>
<attr name="enabled" boolvalue="true"/>
<attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider" />
- <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider" />
+ <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider" />
</file>
-
+
<file name="disabled-update-provider.instance">
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.api.autoupdate.Bundle"/>
<attr name="url_key" stringvalue="UC_DISABLED"/>
- <attr name="category" stringvalue="STANDARD"/>
+ <attr name="category" stringvalue="STANDARD"/>
<attr name="enabled" boolvalue="false"/>
<attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider" />
- <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider" />
+ <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider" />
</file>
<file name="beta-update-provider.instance">
diff --git a/autoupdate.ui/apichanges.xml b/autoupdate.ui/apichanges.xml
index 1716895..ce8599c 100644
--- a/autoupdate.ui/apichanges.xml
+++ b/autoupdate.ui/apichanges.xml
@@ -68,8 +68,8 @@ made subject to such option by the copyright holder.
<description>
<p>
<code>PluginManager</code> ands its
- <a href="@TOP@/org/netbeans/modules/autoupdate/ui/api/PluginManager.html#installSingle-java.lang.String-java.lang.String-java.lang.Object...-">installSingle</a>
- and <a href="@TOP@/org/netbeans/modules/autoupdate/ui/api/PluginManager.html#install-java.util.Set-java.lang.Object...-">install</a>
+ <a href="@TOP@/org/netbeans/modules/autoupdate/ui/api/PluginManager.html#installSingle(java.lang.String, java.lang.String, java.lang.Object...)">installSingle</a>
+ and <a href="@TOP@/org/netbeans/modules/autoupdate/ui/api/PluginManager.html#install(java.util.Set, java.lang.Object...)">install</a>
shows standard UI for easy installation of single plugin based
on codenamebase.
</p>
@@ -89,7 +89,7 @@ made subject to such option by the copyright holder.
<description>
<p>
<code>PluginManager</code> ands its
- <a href="@TOP@/org/netbeans/modules/autoupdate/ui/api/PluginManager.html#openInstallWizard-org.netbeans.api.autoupdate.OperationContainer-">openInstallWizard</a>
+ <a href="@TOP@/org/netbeans/modules/autoupdate/ui/api/PluginManager.html#openInstallWizard(org.netbeans.api.autoupdate.OperationContainer)">openInstallWizard</a>
shows standard UI for installing of selected modules.
</p>
</description>
diff --git a/autoupdate.ui/arch.xml b/autoupdate.ui/arch.xml
index 6e5804b..eac13e9 100644
--- a/autoupdate.ui/arch.xml
+++ b/autoupdate.ui/arch.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
@@ -52,11 +13,11 @@ Contributor(s):
<!--
<question id="arch-overall" when="init">
- Describe the overall architecture.
+ Describe the overall architecture.
<hint>
- What will be API for
+ What will be API for
<a href="http://openide.netbeans.org/tutorial/api-design.html#design.apiandspi">
- clients and what support API</a>?
+ clients and what support API</a>?
What parts will be pluggable?
How will plug-ins be registered? Please use <code><api type="export"/></code>
to describe your general APIs and specify their
diff --git a/autoupdate.ui/build.xml b/autoupdate.ui/build.xml
index cfe2485..a042a0e 100644
--- a/autoupdate.ui/build.xml
+++ b/autoupdate.ui/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="autoupdate.ui">
<description>Builds, tests, and runs the project org.netbeans.modules.autoupdate.ui</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/autoupdate.ui/manifest.mf b/autoupdate.ui/manifest.mf
index 7442c71..d0bd239 100644
--- a/autoupdate.ui/manifest.mf
+++ b/autoupdate.ui/manifest.mf
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.autoupdate.ui
OpenIDE-Module-Install: org/netbeans/modules/autoupdate/ui/actions/Installer.class
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/autoupdate/ui/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.45.1
+OpenIDE-Module-Specification-Version: 1.44.1
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
diff --git a/autoupdate.ui/nbproject/org-netbeans-modules-autoupdate-ui.sig b/autoupdate.ui/nbproject/org-netbeans-modules-autoupdate-ui.sig
index 10ab13a..f622f4a 100644
--- a/autoupdate.ui/nbproject/org-netbeans-modules-autoupdate-ui.sig
+++ b/autoupdate.ui/nbproject/org-netbeans-modules-autoupdate-ui.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.44.1
+#Version 1.41
CLSS public java.lang.Object
cons public init()
diff --git a/autoupdate.ui/nbproject/project.properties b/autoupdate.ui/nbproject/project.properties
index 682aed9..8fb04c9 100644
--- a/autoupdate.ui/nbproject/project.properties
+++ b/autoupdate.ui/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
javac.compilerargs=-Xlint:unchecked
javac.source=1.7
diff --git a/autoupdate.ui/nbproject/project.xml b/autoupdate.ui/nbproject/project.xml
index 5d06993..072673c 100644
--- a/autoupdate.ui/nbproject/project.xml
+++ b/autoupdate.ui/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/Bundle.properties b/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/Bundle.properties
index bae64b7..3209d21 100644
--- a/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/Bundle.properties
+++ b/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
More_Command_Text={0} more ...
Less_Command_Text={0} less ...
UnitTab_ReloadTime=Last Check: {0}
diff --git a/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/Bundle.properties b/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/Bundle.properties
index 70772bf..0f72f15 100644
--- a/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/Bundle.properties
+++ b/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/actions/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
CTL_CheckForUpdatesAction=Check for &Updates
PluginManagerAction_Name=Plu&gins
PluginManager_Panel_Name=Plugins
diff --git a/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/resources/Bundle.properties b/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/resources/Bundle.properties
index a9d65d3..97ce0e8 100644
--- a/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/resources/Bundle.properties
+++ b/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/resources/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Long-Description=\
The UI allows to browse the installation and contents of registered Update Centers, to download updates or new modules and to automatically install modules.
diff --git a/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties b/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties
index 767d151..0c1ea71 100644
--- a/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties
+++ b/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/wizards/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OperationDescriptionStep_Header_Head=Welcome to the Plugin Installer
OperationDescriptionStep_Header_Content=The installer will download, verify and then install the selected plugins.
OperationDescriptionStep_TableInstall_Title=The following plugins will be installed:
diff --git a/core.execution/manifest.mf b/core.execution/manifest.mf
index 192acc7..1ed5d90 100644
--- a/core.execution/manifest.mf
+++ b/core.execution/manifest.mf
@@ -3,4 +3,4 @@ OpenIDE-Module: org.netbeans.core.execution/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/execution/resources/Bundle.properties
OpenIDE-Module-Provides: org.openide.execution.ExecutionEngine
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.41.1
+OpenIDE-Module-Specification-Version: 1.40.1
diff --git a/core.execution/src/org/netbeans/core/execution/IOTable.java b/core.execution/src/org/netbeans/core/execution/IOTable.java
index 1e7feb3..7e36bd3 100644
--- a/core.execution/src/org/netbeans/core/execution/IOTable.java
+++ b/core.execution/src/org/netbeans/core/execution/IOTable.java
@@ -199,7 +199,6 @@ final class IOTable extends Hashtable<InputOutput,TaskIO> {
if (t == null) {
return; // nothing ??
} else if (t.foreign) {
- remove(io);
return;
}
if (t.getName() != TaskIO.VOID) { // Null
diff --git a/core.execution/src/org/netbeans/core/execution/beaninfo/editors/package-info.java b/core.execution/src/org/netbeans/core/execution/beaninfo/editors/package-info.java
index 231f2d6..d88f5f8 100644
--- a/core.execution/src/org/netbeans/core/execution/beaninfo/editors/package-info.java
+++ b/core.execution/src/org/netbeans/core/execution/beaninfo/editors/package-info.java
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
@PropertyEditorSearchPath
package org.netbeans.core.execution.beaninfo.editors;
diff --git a/core.execution/src/org/netbeans/core/execution/beaninfo/package-info.java b/core.execution/src/org/netbeans/core/execution/beaninfo/package-info.java
index f7dc3bb..ffe778a 100644
--- a/core.execution/src/org/netbeans/core/execution/beaninfo/package-info.java
+++ b/core.execution/src/org/netbeans/core/execution/beaninfo/package-info.java
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
@BeanInfoSearchPath
package org.netbeans.core.execution.beaninfo;
diff --git a/core.io.ui/manifest.mf b/core.io.ui/manifest.mf
index 20650ca..43e8368 100644
--- a/core.io.ui/manifest.mf
+++ b/core.io.ui/manifest.mf
@@ -3,5 +3,5 @@ OpenIDE-Module: org.netbeans.core.io.ui/1
OpenIDE-Module-Provides: org.openide.windows.IOContainer$Provider
OpenIDE-Module-Layer: org/netbeans/core/io/ui/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/io/ui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.30.1
+OpenIDE-Module-Specification-Version: 1.29.1
diff --git a/core.io.ui/nbproject/project.xml b/core.io.ui/nbproject/project.xml
index 21988c6..f69e2de 100644
--- a/core.io.ui/nbproject/project.xml
+++ b/core.io.ui/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/core.io.ui/src/org/netbeans/core/io/ui/Bundle.properties b/core.io.ui/src/org/netbeans/core/io/ui/Bundle.properties
index e494282..d98f66f 100644
--- a/core.io.ui/src/org/netbeans/core/io/ui/Bundle.properties
+++ b/core.io.ui/src/org/netbeans/core/io/ui/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=I/O UI
#IOWindowAction
diff --git a/core.io.ui/src/org/netbeans/core/io/ui/layer.xml b/core.io.ui/src/org/netbeans/core/io/ui/layer.xml
index d3b0044..a303cd8 100644
--- a/core.io.ui/src/org/netbeans/core/io/ui/layer.xml
+++ b/core.io.ui/src/org/netbeans/core/io/ui/layer.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
<filesystem>
<folder name="Windows2">
diff --git a/core.io.ui/src/org/netbeans/core/io/ui/resources/output.settings b/core.io.ui/src/org/netbeans/core/io/ui/resources/output.settings
index face769..cc2b65d 100644
--- a/core.io.ui/src/org/netbeans/core/io/ui/resources/output.settings
+++ b/core.io.ui/src/org/netbeans/core/io/ui/resources/output.settings
@@ -1,43 +1,4 @@
<?xml version="1.0"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE settings PUBLIC "-//NetBeans//DTD Session settings 1.0//EN" "http://www.netbeans.org/dtds/sessionsettings-1_0.dtd">
<settings version="1.0">
<module name="org.netbeans.core.io.ui/1"/>
diff --git a/core.io.ui/src/org/netbeans/core/io/ui/resources/output.wstcgrp b/core.io.ui/src/org/netbeans/core/io/ui/resources/output.wstcgrp
index fc909ac..abd0a03 100644
--- a/core.io.ui/src/org/netbeans/core/io/ui/resources/output.wstcgrp
+++ b/core.io.ui/src/org/netbeans/core/io/ui/resources/output.wstcgrp
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE tc-group PUBLIC
"-//NetBeans//DTD Top Component in Group Properties 2.0//EN"
diff --git a/core.io.ui/src/org/netbeans/core/io/ui/resources/output.wstcref b/core.io.ui/src/org/netbeans/core/io/ui/resources/output.wstcref
index 57cede3..13546f1 100644
--- a/core.io.ui/src/org/netbeans/core/io/ui/resources/output.wstcref
+++ b/core.io.ui/src/org/netbeans/core/io/ui/resources/output.wstcref
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE tc-ref PUBLIC
"-//NetBeans//DTD Top Component in Mode Properties 2.0//EN"
diff --git a/core.kit/build.xml b/core.kit/build.xml
index c8bfd0c..054b2c2 100644
--- a/core.kit/build.xml
+++ b/core.kit/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="core.kit">
<description>Builds, tests, and runs the project org.netbeans.modules.core.kit</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/core.kit/manifest.mf b/core.kit/manifest.mf
index 077f9ef..d00256b 100644
--- a/core.kit/manifest.mf
+++ b/core.kit/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.core.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/core/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.30.1
+OpenIDE-Module-Specification-Version: 1.29.1
AutoUpdate-Essential-Module: true
diff --git a/core.kit/nbproject/project.properties b/core.kit/nbproject/project.properties
index 5084559..1df1860 100644
--- a/core.kit/nbproject/project.properties
+++ b/core.kit/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.6
diff --git a/core.kit/nbproject/project.xml b/core.kit/nbproject/project.xml
index 39d2799..d33278a 100644
--- a/core.kit/nbproject/project.xml
+++ b/core.kit/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/core.kit/release/VERSION.txt b/core.kit/release/VERSION.txt
index b555621..197340c 100644
--- a/core.kit/release/VERSION.txt
+++ b/core.kit/release/VERSION.txt
@@ -1,2 +1,2 @@
# cluster incompatible release version
-21
+20
diff --git a/core.kit/src/org/netbeans/modules/core/kit/Bundle.properties b/core.kit/src/org/netbeans/modules/core/kit/Bundle.properties
index dfe6ada..5969849 100644
--- a/core.kit/src/org/netbeans/modules/core/kit/Bundle.properties
+++ b/core.kit/src/org/netbeans/modules/core/kit/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=RCP Platform
OpenIDE-Module-Name=RCP Platform
OpenIDE-Module-Short-Description=NetBeans RCP Platform
diff --git a/core.multitabs/arch.xml b/core.multitabs/arch.xml
index cc2c859..720c2d9 100644
--- a/core.multitabs/arch.xml
+++ b/core.multitabs/arch.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
@@ -52,11 +13,11 @@ Contributor(s):
<!--
<question id="arch-overall" when="init">
- Describe the overall architecture.
+ Describe the overall architecture.
<hint>
- What will be API for
+ What will be API for
<a href="http://wiki.netbeans.org/API_Design#Separate_API_for_clients_from_support_API">
- clients and what support API</a>?
+ clients and what support API</a>?
What parts will be pluggable?
How will plug-ins be registered? Please use <code><api type="export"/></code>
to describe your general APIs and specify their
diff --git a/core.multitabs/build.xml b/core.multitabs/build.xml
index 96bdd58..6c9fe7d 100644
--- a/core.multitabs/build.xml
+++ b/core.multitabs/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="core.multitabs">
<description>Builds, tests, and runs the project org.netbeans.core.multitabs</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/core.multitabs/nbproject/org-netbeans-core-multitabs.sig b/core.multitabs/nbproject/org-netbeans-core-multitabs.sig
index 64ae619..2de4cfc 100644
--- a/core.multitabs/nbproject/org-netbeans-core-multitabs.sig
+++ b/core.multitabs/nbproject/org-netbeans-core-multitabs.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.11.1
+#Version 1.8.0
CLSS public abstract java.awt.Component
cons protected init()
@@ -517,8 +517,6 @@ meth public void firePropertyChange(java.lang.String,boolean,boolean)
meth public void firePropertyChange(java.lang.String,char,char)
meth public void firePropertyChange(java.lang.String,int,int)
meth public void grabFocus()
-meth public void hide()
- anno 0 java.lang.Deprecated()
meth public void paint(java.awt.Graphics)
meth public void paintImmediately(int,int,int,int)
meth public void paintImmediately(java.awt.Rectangle)
diff --git a/core.multitabs/nbproject/project.properties b/core.multitabs/nbproject/project.properties
index e82a658..bf87405 100644
--- a/core.multitabs/nbproject/project.properties
+++ b/core.multitabs/nbproject/project.properties
@@ -1,42 +1,5 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
nbm.needs.restart=true
-spec.version.base=1.12.1
+spec.version.base=1.11.1
diff --git a/core.multitabs/nbproject/project.xml b/core.multitabs/nbproject/project.xml
index cc03091..371f992 100644
--- a/core.multitabs/nbproject/project.xml
+++ b/core.multitabs/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/core.multitabs/src/org/netbeans/core/multitabs/Bundle.properties b/core.multitabs/src/org/netbeans/core/multitabs/Bundle.properties
index 8fa8c0c..0183cc5 100644
--- a/core.multitabs/src/org/netbeans/core/multitabs/Bundle.properties
+++ b/core.multitabs/src/org/netbeans/core/multitabs/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Long-Description=\
Supports alternate document tab placement (left/right/bottom), allows multiple rows of tabs etc.
diff --git a/core.multitabs/src/org/netbeans/core/multitabs/Controller.java b/core.multitabs/src/org/netbeans/core/multitabs/Controller.java
index 26b1504..9ea0b8e 100644
--- a/core.multitabs/src/org/netbeans/core/multitabs/Controller.java
+++ b/core.multitabs/src/org/netbeans/core/multitabs/Controller.java
@@ -154,7 +154,7 @@ public final class Controller implements MouseListener {
//maximize/restore
TabActionEvent tae = new TabActionEvent( displayer, TabbedContainer.COMMAND_MAXIMIZE, tabIndex );
postActionEvent( tae );
- } else if( e.getButton() == MouseEvent.BUTTON2 ) {
+ } else if( e.getClickCount() == 1 && e.getButton() == MouseEvent.BUTTON2 ) {
//close tab
TabActionEvent tae = new TabActionEvent( displayer, TabbedContainer.COMMAND_CLOSE, tabIndex );
postActionEvent( tae );
diff --git a/core.multitabs/src/org/netbeans/core/multitabs/impl/Bundle.properties b/core.multitabs/src/org/netbeans/core/multitabs/impl/Bundle.properties
index 53f8514..fcb6d48 100644
--- a/core.multitabs/src/org/netbeans/core/multitabs/impl/Bundle.properties
+++ b/core.multitabs/src/org/netbeans/core/multitabs/impl/Bundle.properties
@@ -1,39 +1,2 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
BtnClose_Tooltip=<html>Shift + click to close all documents<br>Alt + click to close other documents
diff --git a/core.multitabs/src/org/netbeans/core/multitabs/impl/TabDataRenderer.java b/core.multitabs/src/org/netbeans/core/multitabs/impl/TabDataRenderer.java
index 2001b65..499d3a3 100644
--- a/core.multitabs/src/org/netbeans/core/multitabs/impl/TabDataRenderer.java
+++ b/core.multitabs/src/org/netbeans/core/multitabs/impl/TabDataRenderer.java
@@ -47,7 +47,6 @@ import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
-import java.awt.EventQueue;
import java.awt.Graphics;
import java.awt.Point;
import java.awt.Rectangle;
@@ -191,7 +190,6 @@ public class TabDataRenderer implements TableCellRenderer {
}
void clear() {
- assert EventQueue.isDispatchThread();
label.setText( null );
label.setIcon( null );
setOpaque( true );
diff --git a/core.multitabs/src/org/netbeans/core/multitabs/layer.xml b/core.multitabs/src/org/netbeans/core/multitabs/layer.xml
index df4b346..76a951d 100644
--- a/core.multitabs/src/org/netbeans/core/multitabs/layer.xml
+++ b/core.multitabs/src/org/netbeans/core/multitabs/layer.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
<filesystem>
<folder name="OptionsDialog">
diff --git a/core.multitabs/src/org/netbeans/core/multitabs/prefs/Bundle.properties b/core.multitabs/src/org/netbeans/core/multitabs/prefs/Bundle.properties
index b019247..9520747 100644
--- a/core.multitabs/src/org/netbeans/core/multitabs/prefs/Bundle.properties
+++ b/core.multitabs/src/org/netbeans/core/multitabs/prefs/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
InnerTabsPanel.radioPlacementTop.text=T&op
InnerTabsPanel.radioPlacementLeft.text=&Left
InnerTabsPanel.radioPlacementBottom.text=&Bottom
diff --git a/core.multitabs/src/org/netbeans/core/multitabs/prefs/InnerTabsPanel.java b/core.multitabs/src/org/netbeans/core/multitabs/prefs/InnerTabsPanel.java
index 3c61aa3..0b3ea8e 100644
--- a/core.multitabs/src/org/netbeans/core/multitabs/prefs/InnerTabsPanel.java
+++ b/core.multitabs/src/org/netbeans/core/multitabs/prefs/InnerTabsPanel.java
@@ -1,41 +1,6 @@
/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
*/
package org.netbeans.core.multitabs.prefs;
diff --git a/core.multiview/arch.xml b/core.multiview/arch.xml
index abcdc06..02de9fa 100644
--- a/core.multiview/arch.xml
+++ b/core.multiview/arch.xml
@@ -530,7 +530,7 @@ Nothing is executed.
<api name="multiview.toolbarVisible" category="devel" group="preferences" type="export">
<p>
The visibility of
- <a href="@TOP@/org/netbeans/core/spi/multiview/MultiViewElement.html#getToolbarRepresentation--">toolbar</a>
+ <a href="@TOP@/org/netbeans/core/spi/multiview/MultiViewElement.html#getToolbarRepresentation()">toolbar</a>
is controlled by a preference shared with editor module.
The multiview implementation listens and uses following property:
</p>
diff --git a/core.multiview/manifest.mf b/core.multiview/manifest.mf
index a27c447..db1aa63 100644
--- a/core.multiview/manifest.mf
+++ b/core.multiview/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.core.multiview/1
-OpenIDE-Module-Specification-Version: 1.44.1
+OpenIDE-Module-Specification-Version: 1.43.1
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/multiview/resources/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/core/multiview/resources/mf-layer.xml
AutoUpdate-Essential-Module: true
diff --git a/core.multiview/nbproject/org-netbeans-core-multiview.sig b/core.multiview/nbproject/org-netbeans-core-multiview.sig
index bc214c2..feb23ee 100644
--- a/core.multiview/nbproject/org-netbeans-core-multiview.sig
+++ b/core.multiview/nbproject/org-netbeans-core-multiview.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.43.1
+#Version 1.40
CLSS public abstract interface java.io.Serializable
@@ -234,7 +234,7 @@ meth public void removeChangeListener(javax.swing.event.ChangeListener)
meth public void saveDocument() throws java.io.IOException
meth public void setMIMEType(java.lang.String)
supr org.openide.windows.CloneableOpenSupport
-hfds ERR,LOCAL_CLOSE_DOCUMENT,LOCK_PRINTING,PROP_PANE,alreadyModified,annotationsLoaded,checkModificationLock,docFilter,inUserQuestionExceptionHandler,isSaving,kit,lastReusable,lastSaveTime,lastSelected,lineSet,lineSetLineVector,listener,listeners,listeningOnEnv,lookup,mimeType,openClose,positionManager,preventModification,printing,propertyChangeSupport,reloadDialogOpened,undoRedo,warnedClasses
+hfds ERR,LOCAL_CLOSE_DOCUMENT,LOCK_PRINTING,PROP_PANE,alreadyModified,annotationsLoaded,checkModificationLock,docFilter,inUserQuestionExceptionHandler,kit,lastReusable,lastSaveTime,lastSelected,lineSet,lineSetWHM,listener,listeners,listeningOnEnv,lookup,mimeType,openClose,positionManager,preventModification,printing,propertyChangeSupport,reloadDialogOpened,undoRedo,warnedClasses
hcls DocFilter,Listener,PlainEditorKit
CLSS public abstract interface static org.openide.text.CloneableEditorSupport$Pane
diff --git a/core.multiview/src/org/netbeans/core/api/multiview/package.html b/core.multiview/src/org/netbeans/core/api/multiview/package.html
index 38101e5..262c4b4 100644
--- a/core.multiview/src/org/netbeans/core/api/multiview/package.html
+++ b/core.multiview/src/org/netbeans/core/api/multiview/package.html
@@ -2,47 +2,48 @@
<html>
<head>
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
</head>
<body>
-MultiView API lets the developers create new multiview components
+MultiView API lets the developers create new multiview components
(without specifying their content), manipulate existing multiview
components, eg. examine what is inside the component, request focus for
one of the views etc.<br>
diff --git a/core.multiview/src/org/netbeans/core/spi/multiview/package.html b/core.multiview/src/org/netbeans/core/spi/multiview/package.html
index 4e2220a..e83c132 100644
--- a/core.multiview/src/org/netbeans/core/spi/multiview/package.html
+++ b/core.multiview/src/org/netbeans/core/spi/multiview/package.html
@@ -2,43 +2,44 @@
<html>
<head>
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
</head>
<body>
@@ -49,7 +50,7 @@ influence the overall behaviour of the component.<br>
This SPI handles the lifecycle of a multiview component.<p>
<h3>Creation</h3>
New instance of MultiView TopComponent can be created by calling
-<a href="@TOP@/org/netbeans/core/spi/multiview/MultiViewFactory.html#createMultiView-org.netbeans.core.spi.multiview.MultiViewDescription:A-org.netbeans.core.spi.multiview.MultiViewDescription-">
+<a href="@TOP@/org/netbeans/core/spi/multiview/MultiViewFactory.html#createMultiView(org.netbeans.core.spi.multiview.MultiViewDescription[],%20org.netbeans.core.spi.multiview.MultiViewDescription)">
MultiViewFactory.createMultiView
</a>
<!--{@link org.netbeans.core.spi.multiview.MultiViewFactory#createMultiView}.-->
@@ -58,8 +59,8 @@ convenience. The factory method requires an array of
{@link org.netbeans.core.spi.multiview.MultiViewDescription}s that
describe the content of the view.<br>
Each description in the View shall have a unique <a
- href="@TOP@/org/netbeans/core/spi/multiview/MultiViewDescription.html#getDisplayName--">display name</a>
-and <a href="@TOP@/org/netbeans/core/spi/multiview/MultiViewDescription.html#preferredID--">preferredId</a>.
+ href="@TOP@/org/netbeans/core/spi/multiview/MultiViewDescription.html#getDisplayName()">display name</a>
+and <a href="@TOP@/org/netbeans/core/spi/multiview/MultiViewDescription.html#preferredID()">preferredId</a>.
All the descriptions shall be lightweight classes, which create the
actual visual components on demand in
{@link org.netbeans.core.spi.multiview.MultiViewDescription#createElement}<br>
diff --git a/core.multiview/src/org/netbeans/core/spi/multiview/text/package.html b/core.multiview/src/org/netbeans/core/spi/multiview/text/package.html
index f91258e..3e02a45 100644
--- a/core.multiview/src/org/netbeans/core/spi/multiview/text/package.html
+++ b/core.multiview/src/org/netbeans/core/spi/multiview/text/package.html
@@ -2,43 +2,44 @@
<html>
<head>
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
</head>
<body>
diff --git a/core.nativeaccess/build.xml b/core.nativeaccess/build.xml
index f4cc851..16cd012 100644
--- a/core.nativeaccess/build.xml
+++ b/core.nativeaccess/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="core.nativeaccess">
<description>Builds, tests, and runs the project org.netbeans.core.nativeaccess</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/core.nativeaccess/manifest.mf b/core.nativeaccess/manifest.mf
index 6cbd5d6..ab50fe6 100644
--- a/core.nativeaccess/manifest.mf
+++ b/core.nativeaccess/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.core.nativeaccess/1
-OpenIDE-Module-Specification-Version: 1.31.1
+OpenIDE-Module-Specification-Version: 1.30.1
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/nativeaccess/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.core.windows.nativeaccess.NativeWindowSystem
diff --git a/core.nativeaccess/nbproject/project.properties b/core.nativeaccess/nbproject/project.properties
index ad6938f..af38094 100644
--- a/core.nativeaccess/nbproject/project.properties
+++ b/core.nativeaccess/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.eager=true
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.6
diff --git a/core.nativeaccess/nbproject/project.xml b/core.nativeaccess/nbproject/project.xml
index 7fa7434..bd36511 100644
--- a/core.nativeaccess/nbproject/project.xml
+++ b/core.nativeaccess/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/core.netigso/manifest.mf b/core.netigso/manifest.mf
index ca94e92..e2c5cfc 100644
--- a/core.netigso/manifest.mf
+++ b/core.netigso/manifest.mf
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.core.netigso
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/netigso/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.NetigsoFramework
-OpenIDE-Module-Specification-Version: 1.31.1
+OpenIDE-Module-Specification-Version: 1.30.1
OpenIDE-Module-Needs: org.osgi.framework.launch.FrameworkFactory
AutoUpdate-Essential-Module: true
diff --git a/core.netigso/nbproject/org-netbeans-core-netigso.sig b/core.netigso/nbproject/org-netbeans-core-netigso.sig
index 30b9d80..1a8e8cc 100644
--- a/core.netigso/nbproject/org-netbeans-core-netigso.sig
+++ b/core.netigso/nbproject/org-netbeans-core-netigso.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.30.1
+#Version 1.27
CLSS public java.lang.Object
cons public init()
diff --git a/core.netigso/src/org/netbeans/core/netigso/Netigso.java b/core.netigso/src/org/netbeans/core/netigso/Netigso.java
index 640560e..d525541 100644
--- a/core.netigso/src/org/netbeans/core/netigso/Netigso.java
+++ b/core.netigso/src/org/netbeans/core/netigso/Netigso.java
@@ -634,7 +634,7 @@ implements Cloneable, Stamps.Updater {
for (Map.Entry<Object, Object> entry : p.entrySet()) {
String k = (String)entry.getKey();
String v = (String)entry.getValue();
- registered.put(k, v.trim().isEmpty() ? EMPTY : v.split(","));
+ registered.put(k, v.split(","));
LOG.log(Level.FINE, "readBundle: {0}", k);
}
} catch (IOException ex) {
diff --git a/core.netigso/src/org/netbeans/core/netigso/spi/package.html b/core.netigso/src/org/netbeans/core/netigso/spi/package.html
index 82e4c80..09860af 100644
--- a/core.netigso/src/org/netbeans/core/netigso/spi/package.html
+++ b/core.netigso/src/org/netbeans/core/netigso/spi/package.html
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<html>
<body>Special <a href="NetigsoArchive.html">hooks</a> for OSGi framework providers.</body>
</html>
\ No newline at end of file
diff --git a/core.netigso/test/unit/src/org/netbeans/core/netigso/NetigsoUtil.java b/core.netigso/test/unit/src/org/netbeans/core/netigso/NetigsoUtil.java
index 4ca10c3..3c9b3e4 100644
--- a/core.netigso/test/unit/src/org/netbeans/core/netigso/NetigsoUtil.java
+++ b/core.netigso/test/unit/src/org/netbeans/core/netigso/NetigsoUtil.java
@@ -42,7 +42,6 @@
package org.netbeans.core.netigso;
import java.lang.reflect.Method;
-import java.util.regex.Pattern;
import junit.framework.Assert;
import org.netbeans.Module;
import org.netbeans.ModuleManager;
@@ -58,8 +57,7 @@ public final class NetigsoUtil {
}
static void downgradeJDK() {
- final Pattern JDK9 = Pattern.compile("(1\\.)?9"); //NOI18N
- if (JDK9.matcher(System.getProperty("java.specification.version")).matches()) {
+ if ("1.9".equals(System.getProperty("java.specification.version"))) {
System.setProperty("java.specification.version", "1.8");
}
}
diff --git a/core.network/build.xml b/core.network/build.xml
index a4e84eb..98be5aa 100644
--- a/core.network/build.xml
+++ b/core.network/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="core.network">
<description>Builds, tests, and runs the project org.netbeans.core.network</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/core.network/manifest.mf b/core.network/manifest.mf
index 868d7e2..e9f5629 100644
--- a/core.network/manifest.mf
+++ b/core.network/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.core.network
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/network/proxy/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.core.ProxySettings.Reloader
-OpenIDE-Module-Specification-Version: 1.10.1
+OpenIDE-Module-Specification-Version: 1.9.1
diff --git a/core.network/nbproject/project.xml b/core.network/nbproject/project.xml
index 0b45e05..3ecf223 100644
--- a/core.network/nbproject/project.xml
+++ b/core.network/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/core.network/src/org/netbeans/core/network/proxy/Bundle.properties b/core.network/src/org/netbeans/core/network/proxy/Bundle.properties
index 3456f13..174ba5c 100644
--- a/core.network/src/org/netbeans/core/network/proxy/Bundle.properties
+++ b/core.network/src/org/netbeans/core/network/proxy/Bundle.properties
@@ -1,38 +1 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=Core Network Settings
diff --git a/core.network/src/org/netbeans/core/network/proxy/mac/MacCoreFoundationLibrary.java b/core.network/src/org/netbeans/core/network/proxy/mac/MacCoreFoundationLibrary.java
index 93d532a..713e7ec 100644
--- a/core.network/src/org/netbeans/core/network/proxy/mac/MacCoreFoundationLibrary.java
+++ b/core.network/src/org/netbeans/core/network/proxy/mac/MacCoreFoundationLibrary.java
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
package org.netbeans.core.network.proxy.mac;
import com.sun.jna.Library;
@@ -50,21 +11,21 @@ import com.sun.jna.Structure;
*/
public interface MacCoreFoundationLibrary extends Library {
MacCoreFoundationLibrary LIBRARY = (MacCoreFoundationLibrary) Native.loadLibrary("CoreFoundation", MacCoreFoundationLibrary.class);
-
+
public boolean CFDictionaryGetValueIfPresent(Pointer dictionary, Pointer key, Pointer[] returnValue);
-
+
public Pointer CFDictionaryGetValue(Pointer dictionary, Pointer key);
-
+
public Pointer CFStringCreateWithCString(Pointer alloc, byte[] string, Pointer encoding);
-
+
public long CFStringGetLength(Pointer cfStringRef);
-
+
public long CFStringGetMaximumSizeForEncoding(long lenght, int encoding);
-
+
public boolean CFStringGetCString(Pointer cfStringRef, Pointer buffer, long maxSize, int encoding);
-
+
public Pointer CFNumberGetType(Pointer cfNumberRef);
-
+
public boolean CFNumberGetValue(Pointer cfNumberRef, Pointer cfNumberType, Pointer value);
public long CFNumberGetByteSize(Pointer cfNumberRef);
diff --git a/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxyLibrary.java b/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxyLibrary.java
index f7eed99..3fa1d6b 100644
--- a/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxyLibrary.java
+++ b/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxyLibrary.java
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
package org.netbeans.core.network.proxy.mac;
import com.sun.jna.Library;
@@ -49,6 +10,6 @@ import com.sun.jna.Pointer;
*/
public interface MacNetworkProxyLibrary extends Library {
MacNetworkProxyLibrary LIBRARY = (MacNetworkProxyLibrary) Native.loadLibrary("CoreServices", MacNetworkProxyLibrary.class);
-
+
public Pointer CFNetworkCopySystemProxySettings();
}
diff --git a/core.osgi/build.xml b/core.osgi/build.xml
index 69ff9ab..0f1685b 100644
--- a/core.osgi/build.xml
+++ b/core.osgi/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="core.osgi">
<description>Builds, tests, and runs the project org.netbeans.core.osgi</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/core.osgi/manifest.mf b/core.osgi/manifest.mf
index 478764b..3c41ae7 100644
--- a/core.osgi/manifest.mf
+++ b/core.osgi/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.core.osgi
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/osgi/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.22.1
+OpenIDE-Module-Specification-Version: 1.21.1
AutoUpdate-Essential-Module: true
diff --git a/core.osgi/nbproject/project.properties b/core.osgi/nbproject/project.properties
index 61a3550..1337a89 100644
--- a/core.osgi/nbproject/project.properties
+++ b/core.osgi/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/core.osgi/nbproject/project.xml b/core.osgi/nbproject/project.xml
index 7300dff..75c19c4 100644
--- a/core.osgi/nbproject/project.xml
+++ b/core.osgi/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/core.osgi/src/org/netbeans/core/osgi/Bundle.properties b/core.osgi/src/org/netbeans/core/osgi/Bundle.properties
index 4f94834..8f0741d 100644
--- a/core.osgi/src/org/netbeans/core/osgi/Bundle.properties
+++ b/core.osgi/src/org/netbeans/core/osgi/Bundle.properties
@@ -1,38 +1 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=NetBeans in OSGi Runtime
diff --git a/core.output2/manifest.mf b/core.output2/manifest.mf
index 83d74fa..a3c24ae 100644
--- a/core.output2/manifest.mf
+++ b/core.output2/manifest.mf
@@ -4,5 +4,5 @@ OpenIDE-Module-Layer: org/netbeans/core/output2/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/output2/Bundle.properties
OpenIDE-Module-Provides: org.openide.windows.IOProvider org.netbeans.spi.io.InputOutputProvider
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.41.1
+OpenIDE-Module-Specification-Version: 1.40.1
diff --git a/core.output2/src/org/netbeans/core/output2/NbIO.java b/core.output2/src/org/netbeans/core/output2/NbIO.java
index 1406792..44395ea 100644
--- a/core.output2/src/org/netbeans/core/output2/NbIO.java
+++ b/core.output2/src/org/netbeans/core/output2/NbIO.java
@@ -601,11 +601,7 @@ class NbIO implements InputOutput, Lookup.Provider {
@Override
protected FoldHandleDefinition startFold(boolean expanded) {
- final OutWriter outWriter = out();
- if (outWriter == null) {
- return new DummyFoldHandleDefinition();
- }
- synchronized (outWriter) {
+ synchronized (outOrException()) {
if (currentFold != null) {
throw new IllegalStateException(
"The last fold hasn't been finished yet"); //NOI18N
@@ -615,25 +611,6 @@ class NbIO implements InputOutput, Lookup.Provider {
}
}
- /**
- * FoldHandleDefinition used when the output is already closed.
- */
- class DummyFoldHandleDefinition extends IOFolding.FoldHandleDefinition {
-
- @Override
- public void finish() {
- }
-
- @Override
- public FoldHandleDefinition startFold(boolean expanded) {
- return new DummyFoldHandleDefinition();
- }
-
- @Override
- public void setExpanded(boolean expanded) {
- }
- }
-
class NbIoFoldHandleDefinition extends IOFolding.FoldHandleDefinition {
private final NbIoFoldHandleDefinition parent;
diff --git a/core.output2/src/org/netbeans/core/output2/layer.xml b/core.output2/src/org/netbeans/core/output2/layer.xml
index 0b311ab..30f48b2 100644
--- a/core.output2/src/org/netbeans/core/output2/layer.xml
+++ b/core.output2/src/org/netbeans/core/output2/layer.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
<filesystem>
<folder name="OptionsExport">
diff --git a/core.output2/src/org/netbeans/core/output2/options/Bundle.properties b/core.output2/src/org/netbeans/core/output2/options/Bundle.properties
index 98c0361..2ea925e 100644
--- a/core.output2/src/org/netbeans/core/output2/options/Bundle.properties
+++ b/core.output2/src/org/netbeans/core/output2/options/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OutputSettingsPanel.lblFontFamily.text=&Font:
OutputSettingsPanel.lblFontSize.text=Font Si&ze:
OutputSettingsPanel.lblStandardColor.text=&Standard Color:
diff --git a/core.output2/src/org/netbeans/core/output2/ui/AbstractOutputPane.java b/core.output2/src/org/netbeans/core/output2/ui/AbstractOutputPane.java
index 0030b3b..d1148c7 100644
--- a/core.output2/src/org/netbeans/core/output2/ui/AbstractOutputPane.java
+++ b/core.output2/src/org/netbeans/core/output2/ui/AbstractOutputPane.java
@@ -792,41 +792,6 @@ public abstract class AbstractOutputPane extends JScrollPane implements Document
case KeyEvent.VK_ENTER:
enterPressed();
break;
- case KeyEvent.VK_C:
- if (keyEvent.isControlDown()) {
- askTerminate(keyEvent); // see bug 250245
- }
- break;
- }
- }
-
- @NbBundle.Messages({
- "MSG_TerminateProcess=Terminate the process?"
- })
- private void askTerminate(KeyEvent keyEvent) {
- Container parent = getParent();
- if (parent instanceof AbstractOutputTab) {
- Caret c = getCaret();
- if (c.getDot() != c.getMark()) {
- return; // some text is selected, copy action will handle this
- }
- AbstractOutputTab tab = (AbstractOutputTab) parent;
- Action[] actions = tab.getToolbarActions();
- for (Action a : actions) {
- if ("stop".equals(a.getValue("OUTPUT_ACTION_TYPE")) //NOI18N
- && a.isEnabled()) {
- NotifyDescriptor desc = new NotifyDescriptor.Confirmation(
- Bundle.MSG_TerminateProcess(),
- NotifyDescriptor.YES_NO_OPTION);
- Object res = DialogDisplayer.getDefault().notify(desc);
- if (NotifyDescriptor.YES_OPTION.equals(res)) {
- a.actionPerformed(
- new ActionEvent(this, 0, "stop")); //NOI18N
- }
- keyEvent.consume();
- break;
- }
- }
}
}
diff --git a/core.output2/test/unit/src/org/netbeans/core/output2/NbIOFoldTest.java b/core.output2/test/unit/src/org/netbeans/core/output2/NbIOFoldTest.java
index 1551b0a..91882e4 100644
--- a/core.output2/test/unit/src/org/netbeans/core/output2/NbIOFoldTest.java
+++ b/core.output2/test/unit/src/org/netbeans/core/output2/NbIOFoldTest.java
@@ -419,18 +419,4 @@ public class NbIOFoldTest {
}
assertTrue(illegalStateExceptionThrown);
}
-
- /**
- * Test for bug 255907 - IllegalStateException: No OutWriter available.
- */
- @Test
- public void testStartFoldOnDisposedIO() {
- NbIO io = new NbIO("testStartFoldingOnDisposedIO");
- io.closeInputOutput();
- FoldHandle fh = IOFolding.startFold(io, true);
- FoldHandle ch = fh.startFold(true);
- ch.setExpanded(false);
- ch.finish();
- fh.finish();
- }
}
\ No newline at end of file
diff --git a/core.startup.base/arch.xml b/core.startup.base/arch.xml
index c5fe13a..4f50285 100644
--- a/core.startup.base/arch.xml
+++ b/core.startup.base/arch.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
@@ -52,11 +13,11 @@ Contributor(s):
<!--
<question id="arch-overall" when="init">
- Describe the overall architecture.
+ Describe the overall architecture.
<hint>
- What will be API for
+ What will be API for
<a href="http://openide.netbeans.org/tutorial/api-design.html#design.apiandspi">
- clients and what support API</a>?
+ clients and what support API</a>?
What parts will be pluggable?
How will plug-ins be registered? Please use <code><api type="export"/></code>
to describe your general APIs and specify their
diff --git a/core.startup.base/build.xml b/core.startup.base/build.xml
index 021420d..f611627 100644
--- a/core.startup.base/build.xml
+++ b/core.startup.base/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="core.startup.base">
<description>Builds, tests, and runs the project org.netbeans.core.startup.base</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/core.startup.base/nbproject/project.properties b/core.startup.base/nbproject/project.properties
index 491d05b..c790bba 100644
--- a/core.startup.base/nbproject/project.properties
+++ b/core.startup.base/nbproject/project.properties
@@ -1,43 +1,6 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.62.1
+spec.version.base=1.61.1
module.jar.dir=core
module.jar.basename=core-base.jar
javadoc.arch=${basedir}/arch.xml
diff --git a/core.startup.base/nbproject/project.xml b/core.startup.base/nbproject/project.xml
index ed29735..bae10ee 100644
--- a/core.startup.base/nbproject/project.xml
+++ b/core.startup.base/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/core.startup.base/src/org/netbeans/core/startup/base/Bundle.properties b/core.startup.base/src/org/netbeans/core/startup/base/Bundle.properties
index 7b581b1..981abaa 100644
--- a/core.startup.base/src/org/netbeans/core/startup/base/Bundle.properties
+++ b/core.startup.base/src/org/netbeans/core/startup/base/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Name=Startup Base
OpenIDE-Module-Short-Description=NetBeans startup commons
diff --git a/core.startup/arch.xml b/core.startup/arch.xml
index f2444fa..0a46829 100644
--- a/core.startup/arch.xml
+++ b/core.startup/arch.xml
@@ -641,7 +641,7 @@ Portions Copyrighted 2012 Sun Microsystems, Inc.
<a href="@org-openide-filesystems@/org/openide/filesystems/FileSystem.html">FileSystem</a>
with a public default constructor. Such filesystem is then used during
initialization of writable layer of system file system (see
- <a href="@org-openide-filesystems@/org/openide/filesystems/FileUtil.html#getConfigRoot--">getConfigRoot</a>).
+ <a href="@org-openide-filesystems@/org/openide/filesystems/FileUtil.html#getConfigRoot()">getConfigRoot</a>).
The filesystem may use or may ignore value of
<code>System.getProperty("netbeans.user")</code>.
</p>
diff --git a/core.startup/nbproject/project.properties b/core.startup/nbproject/project.properties
index e38a660..8eb628e 100644
--- a/core.startup/nbproject/project.properties
+++ b/core.startup/nbproject/project.properties
@@ -46,7 +46,7 @@ javac.source=1.7
javadoc.apichanges=${basedir}/apichanges.xml
module.jar.dir=core
module.jar.basename=core.jar
-spec.version.base=1.62.1
+spec.version.base=1.61.1
# XXX using a data dir from another module means that these tests cannot be run from testdist
test-unit-sys-prop.xtest.data=${nb_all}/o.n.bootstrap/test/unit/data
diff --git a/core.startup/src/org/netbeans/core/startup/Bundle.properties b/core.startup/src/org/netbeans/core/startup/Bundle.properties
index dcb03af..31fef7c 100644
--- a/core.startup/src/org/netbeans/core/startup/Bundle.properties
+++ b/core.startup/src/org/netbeans/core/startup/Bundle.properties
@@ -1,6 +1,6 @@
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
@@ -51,7 +51,7 @@ OpenIDE-Module-Long-Description=\
# VERSIONING (TopLogging, MainWindow)
# {0} - build number
-currentVersion=NetBeans Platform 8.2 (Build {0})
+currentVersion=NetBeans Platform 8.1 (Build {0})
ERR_no_user_directory=netbeans.user is not set.\nPlease check your NetBeans startup script.
# {0} - userdir full path
diff --git a/core.startup/src/org/netbeans/core/startup/ConsistencyVerifier.java b/core.startup/src/org/netbeans/core/startup/ConsistencyVerifier.java
index 26b9440..c055d77 100644
--- a/core.startup/src/org/netbeans/core/startup/ConsistencyVerifier.java
+++ b/core.startup/src/org/netbeans/core/startup/ConsistencyVerifier.java
@@ -61,7 +61,6 @@ import org.netbeans.InvalidException;
import org.netbeans.Module;
import org.netbeans.ModuleInstaller;
import org.netbeans.ModuleManager;
-import org.openide.modules.Dependency;
/**
* Utility class permitting you to verify that a set of modules could be enabled together.
@@ -171,12 +170,6 @@ public class ConsistencyVerifier {
}
SortedSet<String> probnames = new TreeSet<String>();
for (Object prob : probs) {
- if (prob instanceof Dependency) {
- Dependency d = (Dependency) prob;
- if (Dependency.TYPE_JAVA == d.getType() && m.isAutoload()) {
- continue;
- }
- }
String description;
if (formatted) {
description = NbProblemDisplayer.messageForProblem(m, prob, false);
@@ -185,9 +178,7 @@ public class ConsistencyVerifier {
}
probnames.add(description);
}
- if (!probnames.isEmpty()) {
- problems.put(cnb, probnames);
- }
+ problems.put(cnb, probnames);
}
return problems;
}
diff --git a/core.startup/src/org/netbeans/core/startup/NbInstaller.java b/core.startup/src/org/netbeans/core/startup/NbInstaller.java
index 9e6a30e..9b8298a 100644
--- a/core.startup/src/org/netbeans/core/startup/NbInstaller.java
+++ b/core.startup/src/org/netbeans/core/startup/NbInstaller.java
@@ -79,6 +79,7 @@ import org.netbeans.ModuleManager;
import org.netbeans.Stamps;
import org.netbeans.Util;
import org.netbeans.core.startup.layers.ModuleLayeredFileSystem;
+import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.modules.Dependency;
import org.openide.modules.ModuleInfo;
@@ -88,8 +89,10 @@ import org.openide.util.NbCollections;
import org.openide.util.SharedClassObject;
import org.openide.util.NbBundle;
import org.openide.util.Task;
+import org.openide.util.TaskListener;
import org.openide.util.Utilities;
import org.openide.util.lookup.InstanceContent;
+import org.xml.sax.SAXException;
/** Concrete implementation of the module installation functionality.
@@ -615,6 +618,7 @@ final class NbInstaller extends ModuleInstaller {
assert patchesClassPath != null : "At most one resource per module: " + m; // NOI18N
Util.err.log(Level.INFO, "Using {0} as layer for {1} not {2}", new Object[]{u, m.getCodeNameBase(), en.nextElement()}); // NOI18N
}
+ break;
}
}
if (! foundSomething) {
diff --git a/core.startup/src/org/netbeans/core/startup/frame32_dark.gif b/core.startup/src/org/netbeans/core/startup/frame32_dark.gif
deleted file mode 100644
index 05a2747..0000000
Binary files a/core.startup/src/org/netbeans/core/startup/frame32_dark.gif and /dev/null differ
diff --git a/core.startup/src/org/netbeans/core/startup/frame48_dark.gif b/core.startup/src/org/netbeans/core/startup/frame48_dark.gif
deleted file mode 100644
index 60eeabd..0000000
Binary files a/core.startup/src/org/netbeans/core/startup/frame48_dark.gif and /dev/null differ
diff --git a/core.startup/src/org/netbeans/core/startup/frame_dark.gif b/core.startup/src/org/netbeans/core/startup/frame_dark.gif
deleted file mode 100644
index 415eb18..0000000
Binary files a/core.startup/src/org/netbeans/core/startup/frame_dark.gif and /dev/null differ
diff --git a/core.startup/src/org/netbeans/core/startup/module-status-1_0.dtd b/core.startup/src/org/netbeans/core/startup/module-status-1_0.dtd
index 36644b3..e2a30bd 100644
--- a/core.startup/src/org/netbeans/core/startup/module-status-1_0.dtd
+++ b/core.startup/src/org/netbeans/core/startup/module-status-1_0.dtd
@@ -41,9 +41,7 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
--->
-<!--
DTD for status of a NetBeans module.
Public ID: "-//NetBeans//DTD Module Status 1.0//EN"
diff --git a/core.startup/src/org/netbeans/core/startup/package.html b/core.startup/src/org/netbeans/core/startup/package.html
index e52b006..dab64c7 100644
--- a/core.startup/src/org/netbeans/core/startup/package.html
+++ b/core.startup/src/org/netbeans/core/startup/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
diff --git a/core.startup/src/org/netbeans/core/startup/splash.gif b/core.startup/src/org/netbeans/core/startup/splash.gif
index 8f49bab..f45541e 100644
Binary files a/core.startup/src/org/netbeans/core/startup/splash.gif and b/core.startup/src/org/netbeans/core/startup/splash.gif differ
diff --git a/core.startup/src/org/netbeans/core/startup/splash_dark.gif b/core.startup/src/org/netbeans/core/startup/splash_dark.gif
deleted file mode 100644
index 392fddc..0000000
Binary files a/core.startup/src/org/netbeans/core/startup/splash_dark.gif and /dev/null differ
diff --git a/core.startup/test/unit/src/org/netbeans/core/startup/ClassLoaderCacheContent.properties b/core.startup/test/unit/src/org/netbeans/core/startup/ClassLoaderCacheContent.properties
index ef1cb23..943a0f3 100644
--- a/core.startup/test/unit/src/org/netbeans/core/startup/ClassLoaderCacheContent.properties
+++ b/core.startup/test/unit/src/org/netbeans/core/startup/ClassLoaderCacheContent.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
META-INF/=26
org/openide/util/enum/=26
META-INF/=117
diff --git a/core.startup/test/unit/src/org/netbeans/core/startup/MistakeOnRadimsComputer.properties b/core.startup/test/unit/src/org/netbeans/core/startup/MistakeOnRadimsComputer.properties
index 1b6a8b6..639647a 100644
--- a/core.startup/test/unit/src/org/netbeans/core/startup/MistakeOnRadimsComputer.properties
+++ b/core.startup/test/unit/src/org/netbeans/core/startup/MistakeOnRadimsComputer.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
org/netbeans/modules/dbschema/=1
org/netbeans/modules/dbschema/docs/=1
org/netbeans/modules/dbschema/docs/JavaHelpSearch/=1
diff --git a/core.startup/test/unit/src/org/netbeans/core/startup/PlatformDependencySatisfiedTest.java b/core.startup/test/unit/src/org/netbeans/core/startup/PlatformDependencySatisfiedTest.java
index f813a6f..073b571 100644
--- a/core.startup/test/unit/src/org/netbeans/core/startup/PlatformDependencySatisfiedTest.java
+++ b/core.startup/test/unit/src/org/netbeans/core/startup/PlatformDependencySatisfiedTest.java
@@ -84,7 +84,6 @@ public class PlatformDependencySatisfiedTest extends SetupHid {
@Override
protected void setUp() throws Exception {
super.setUp();
- getWorkDir().toPath(); //Initialize FileSystems with correct OS.
System.setProperty("org.netbeans.core.modules.NbInstaller.noAutoDeps", "true");
clearWorkDir();
@@ -95,12 +94,7 @@ public class PlatformDependencySatisfiedTest extends SetupHid {
f.setAccessible(true);
f.set(null, -1);
}
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+
public void testWindows2000() throws Exception {
System.setProperty("os.name", "Windows 2000");
assertTrue("We are on windows", Utilities.isWindows());
diff --git a/core.startup/test/unit/src/org/netbeans/core/startup/layers/CustomWritableSystemFileSystemTest.java b/core.startup/test/unit/src/org/netbeans/core/startup/layers/CustomWritableSystemFileSystemTest.java
index 399fe98..11d5022 100644
--- a/core.startup/test/unit/src/org/netbeans/core/startup/layers/CustomWritableSystemFileSystemTest.java
+++ b/core.startup/test/unit/src/org/netbeans/core/startup/layers/CustomWritableSystemFileSystemTest.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,18 +24,9 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
* Contributor(s):
+ *
+ * Portions Copyrighted 2007 Nokia Siemens Networks Oy
*/
package org.netbeans.core.startup.layers;
diff --git a/core.ui/manifest.mf b/core.ui/manifest.mf
index 3535261..8bb2fe9 100644
--- a/core.ui/manifest.mf
+++ b/core.ui/manifest.mf
@@ -4,5 +4,5 @@ OpenIDE-Module-Localizing-Bundle: org/netbeans/core/ui/resources/Bundle.properti
OpenIDE-Module-Layer: org/netbeans/core/ui/resources/layer.xml
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.45.1
+OpenIDE-Module-Specification-Version: 1.44.1
diff --git a/core.ui/src/org/netbeans/core/ui/notifications/NotificationImpl.java b/core.ui/src/org/netbeans/core/ui/notifications/NotificationImpl.java
index 6085635..645e133 100644
--- a/core.ui/src/org/netbeans/core/ui/notifications/NotificationImpl.java
+++ b/core.ui/src/org/netbeans/core/ui/notifications/NotificationImpl.java
@@ -59,7 +59,6 @@ import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.UIManager;
import org.openide.awt.Notification;
import org.openide.awt.NotificationDisplayer.Priority;
import org.openide.xml.XMLUtil;
@@ -196,10 +195,7 @@ class NotificationImpl extends Notification implements Comparable<NotificationIm
btn.setContentAreaFilled(false);
btn.addActionListener(action);
btn.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
- Color c = UIManager.getColor("nb.html.link.foreground"); //NOI18N
- if (c != null) {
- btn.setForeground(c);
- }
+ btn.setForeground(Color.blue);
return btn;
}
}
diff --git a/core.ui/src/org/netbeans/core/ui/resources/Standard.xml b/core.ui/src/org/netbeans/core/ui/resources/Standard.xml
index aa46b10..1c42324 100644
--- a/core.ui/src/org/netbeans/core/ui/resources/Standard.xml
+++ b/core.ui/src/org/netbeans/core/ui/resources/Standard.xml
@@ -2,7 +2,7 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
Oracle and Java are registered trademarks of Oracle and/or its affiliates.
Other names may be trademarks of their respective owners.
diff --git a/core.ui/src/org/netbeans/core/ui/resources/SwingBrowser.xml b/core.ui/src/org/netbeans/core/ui/resources/SwingBrowser.xml
index 07b2df9..12fc2e0 100644
--- a/core.ui/src/org/netbeans/core/ui/resources/SwingBrowser.xml
+++ b/core.ui/src/org/netbeans/core/ui/resources/SwingBrowser.xml
@@ -1,43 +1,4 @@
<?xml version="1.0"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE settings PUBLIC "-//NetBeans//DTD Session settings 1.0//EN" "http://www.netbeans.org/dtds/sessionsettings-1_0.dtd">
<settings version="1.0">
<module name="org.netbeans.core.ui/1" spec="1.10"/>
diff --git a/core.ui/src/org/netbeans/core/ui/resources/properties.wstcgrp b/core.ui/src/org/netbeans/core/ui/resources/properties.wstcgrp
index 7870389..9d2f684 100644
--- a/core.ui/src/org/netbeans/core/ui/resources/properties.wstcgrp
+++ b/core.ui/src/org/netbeans/core/ui/resources/properties.wstcgrp
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE tc-group PUBLIC
"-//NetBeans//DTD Top Component in Group Properties 2.0//EN"
diff --git a/core.ui/src/org/netbeans/core/ui/resources/properties.wstcref b/core.ui/src/org/netbeans/core/ui/resources/properties.wstcref
index 7a589dd..e48385e 100644
--- a/core.ui/src/org/netbeans/core/ui/resources/properties.wstcref
+++ b/core.ui/src/org/netbeans/core/ui/resources/properties.wstcref
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE tc-ref PUBLIC
"-//NetBeans//DTD Top Component in Mode Properties 2.0//EN"
diff --git a/core.ui/src/org/netbeans/core/ui/resources/properties.xml b/core.ui/src/org/netbeans/core/ui/resources/properties.xml
index 7eb1b99..b7b55ac 100644
--- a/core.ui/src/org/netbeans/core/ui/resources/properties.xml
+++ b/core.ui/src/org/netbeans/core/ui/resources/properties.xml
@@ -1,43 +1,4 @@
<?xml version="1.0"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE settings PUBLIC "-//NetBeans//DTD Session settings 1.0//EN" "http://www.netbeans.org/dtds/sessionsettings-1_0.dtd">
<settings version="1.0">
<module name="org.netbeans.core.ui/1"/>
diff --git a/core.ui/src/org/netbeans/core/ui/warmup/DiagnosticTask.java b/core.ui/src/org/netbeans/core/ui/warmup/DiagnosticTask.java
index 04f4b7b..e0d8d00 100644
--- a/core.ui/src/org/netbeans/core/ui/warmup/DiagnosticTask.java
+++ b/core.ui/src/org/netbeans/core/ui/warmup/DiagnosticTask.java
@@ -52,15 +52,12 @@ import java.lang.management.MemoryMXBean;
import java.lang.management.MemoryUsage;
import java.lang.management.OperatingSystemMXBean;
import java.lang.management.RuntimeMXBean;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.text.MessageFormat;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanException;
-import javax.management.MBeanServer;
-import javax.management.ReflectionException;
import org.openide.util.NbBundle;
import org.openide.util.lookup.ServiceProvider;
@@ -94,27 +91,26 @@ public final class DiagnosticTask implements Runnable {
private void logEnv() {
try {
OperatingSystemMXBean osBean = ManagementFactory.getOperatingSystemMXBean();
- MBeanServer mserver = ManagementFactory.getPlatformMBeanServer();
// w/o dependency on Sun's JDK
- // long totalMem = ((com.sun.management.OperatingSystemMXBean)osBean).getTotalPhysicalMemorySize();
- long totalMem = (Long)mserver.getAttribute(osBean.getObjectName(), "TotalPhysicalMemorySize"); // NOI18N
- LOG.log(Level.INFO, "Total memory {0}", totalMem);
+ // long freeMem = ((com.sun.management.OperatingSystemMXBean)osBean).getTotalPhysicalMemorySize();
+ Method m = osBean.getClass().getMethod("getTotalPhysicalMemorySize");
+ m.setAccessible(true);
+ long freeMem = (Long)m.invoke(osBean);
+ LOG.log(Level.INFO, "Total memory {0}", freeMem);
LogRecord lr = new LogRecord(Level.INFO, "MEMORY");
lr.setResourceBundle(NbBundle.getBundle(DiagnosticTask.class));
- lr.setParameters(new Object[] {totalMem});
+ lr.setParameters(new Object[] {freeMem});
Logger.getLogger("org.netbeans.ui.performance").log(lr);
- } catch (SecurityException ex) {
- LOG.log(Level.INFO, null, ex);
- } catch (IllegalArgumentException ex) {
+ } catch (NoSuchMethodException ex) {
LOG.log(Level.INFO, null, ex);
- } catch (MBeanException ex) {
+ } catch (SecurityException ex) {
LOG.log(Level.INFO, null, ex);
- } catch (AttributeNotFoundException ex) {
+ } catch (IllegalAccessException ex) {
LOG.log(Level.INFO, null, ex);
- } catch (InstanceNotFoundException ex) {
+ } catch (IllegalArgumentException ex) {
LOG.log(Level.INFO, null, ex);
- } catch (ReflectionException ex) {
+ } catch (InvocationTargetException ex) {
LOG.log(Level.INFO, null, ex);
}
}
diff --git a/core.windows/arch.xml b/core.windows/arch.xml
index f9c386d..301bfbf 100644
--- a/core.windows/arch.xml
+++ b/core.windows/arch.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
@@ -52,11 +13,11 @@ Contributor(s):
<!--
<question id="arch-overall" when="init">
- Describe the overall architecture.
+ Describe the overall architecture.
<hint>
- What will be API for
+ What will be API for
<a href="http://openide.netbeans.org/tutorial/api-design.html#design.apiandspi">
- clients and what support API</a>?
+ clients and what support API</a>?
What parts will be pluggable?
How will plug-ins be registered? Please use <code><api type="export"/></code>
to describe your general APIs and specify their
diff --git a/core.windows/manifest.mf b/core.windows/manifest.mf
index a24423d..0fadd7e 100644
--- a/core.windows/manifest.mf
+++ b/core.windows/manifest.mf
@@ -6,5 +6,5 @@ OpenIDE-Module-Provides: org.netbeans.core.WindowSystem, org.openide.windows.Win
OpenIDE-Module-Recommends: org.netbeans.core.windows.nativeaccess.NativeWindowSystem
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 2.81.1
+OpenIDE-Module-Specification-Version: 2.80.1
diff --git a/core.windows/src/META-INF/netbeans/translate.names b/core.windows/src/META-INF/netbeans/translate.names
index 26c8da3..2030d97 100644
--- a/core.windows/src/META-INF/netbeans/translate.names
+++ b/core.windows/src/META-INF/netbeans/translate.names
@@ -1,38 +1 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
org.netbeans.core.NbSheet=org.netbeans.core.windows.view.ui.NbSheet
diff --git a/core.windows/src/org/netbeans/core/windows/Constants.java b/core.windows/src/org/netbeans/core/windows/Constants.java
index 9a26d7a..53c00b5 100644
--- a/core.windows/src/org/netbeans/core/windows/Constants.java
+++ b/core.windows/src/org/netbeans/core/windows/Constants.java
@@ -177,11 +177,5 @@ public abstract class Constants {
/** True means automatic iconification/deiconification of all separate frames if main window is iconified/deiconified */
public static final boolean AUTO_ICONIFY = Boolean.getBoolean("netbeans.winsys.auto_iconify"); // NOI18N
- /** Determines whether windows should receive focus when being shown or when moved to the front.
- * By default, auto-focus is true, compatible with Java default.
- * When JDK-8163591 is fixed, the default may be revisited.
- * @see java.awt.Window#isAutoRequestFocus() */
- public static final boolean AUTO_FOCUS = System.getProperty("netbeans.winsys.auto_focus") == null || Boolean.getBoolean("netbeans.winsys.auto_focus"); // NOI18N
-
private Constants() {}
}
diff --git a/core.windows/src/org/netbeans/core/windows/documentgroup/Bundle.properties b/core.windows/src/org/netbeans/core/windows/documentgroup/Bundle.properties
index db2f4df..845d07e 100644
--- a/core.windows/src/org/netbeans/core/windows/documentgroup/Bundle.properties
+++ b/core.windows/src/org/netbeans/core/windows/documentgroup/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
NewGroupPanel.cbKeepOpenedDocuments.text=Keep currently opened documents
NewGroupPanel.lblName.text=Name:
ManageGroupsPanel.btnRemove.text=Remove
diff --git a/core.windows/src/org/netbeans/core/windows/resources/toolbar.dtd b/core.windows/src/org/netbeans/core/windows/resources/toolbar.dtd
index 4bc530f..77f925e 100644
--- a/core.windows/src/org/netbeans/core/windows/resources/toolbar.dtd
+++ b/core.windows/src/org/netbeans/core/windows/resources/toolbar.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- Document Type Declaration for toolbar configuration xml files. -->
<!-- Root element of toolbar configuration. It's a list of Rows. -->
diff --git a/core.windows/src/org/netbeans/core/windows/resources/toolbar1_1.dtd b/core.windows/src/org/netbeans/core/windows/resources/toolbar1_1.dtd
index 0f84191..f6ff17f 100644
--- a/core.windows/src/org/netbeans/core/windows/resources/toolbar1_1.dtd
+++ b/core.windows/src/org/netbeans/core/windows/resources/toolbar1_1.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- Document Type Declaration for toolbar configuration xml files. -->
<!-- Root element of toolbar configuration. It's a list of Rows. -->
diff --git a/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java b/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java
index 0ded830..2ceb996 100644
--- a/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java
+++ b/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java
@@ -47,13 +47,11 @@ package org.netbeans.core.windows.services;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
-import java.awt.Container;
import java.awt.DefaultKeyboardFocusManager;
import java.awt.Dialog;
import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.FlowLayout;
-import java.awt.FocusTraversalPolicy;
import java.awt.Frame;
import java.awt.GraphicsDevice;
import java.awt.GridBagConstraints;
@@ -86,7 +84,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.AbstractAction;
import javax.swing.Action;
-import javax.swing.FocusManager;
import javax.swing.GroupLayout;
import javax.swing.GroupLayout.Alignment;
import javax.swing.Icon;
@@ -259,10 +256,7 @@ implements PropertyChangeListener, WindowListener, Mutex.Action<Void>, Comparato
// #55273: Dialogs created by DialogDisplayer are not disposed after close
setDefaultCloseOperation (WindowConstants.DISPOSE_ON_CLOSE);
}
- if (!Constants.AUTO_FOCUS) {
- setAutoRequestFocus(false);
- }
-
+
descriptor = d;
buttonListener = new ButtonListener();
@@ -289,26 +283,11 @@ implements PropertyChangeListener, WindowListener, Mutex.Action<Void>, Comparato
if(comp == null) {
return;
}
-
- if (/*!Constants.AUTO_FOCUS &&*/ FocusManager.getCurrentManager().getActiveWindow() == null) {
- // Do not steal focus if no Java window have it
- Component defComp = null;
- Container nearestRoot =
- (comp instanceof Container && ((Container) comp).isFocusCycleRoot()) ? (Container) comp : comp.getFocusCycleRootAncestor();
- if (nearestRoot != null) {
- defComp = nearestRoot.getFocusTraversalPolicy().getDefaultComponent(nearestRoot);
- }
- if (defComp != null) {
- defComp.requestFocusInWindow();
- } else {
- comp.requestFocusInWindow();
- }
- } else {
- if (!(comp instanceof JComponent)
- || !((JComponent)comp).requestDefaultFocus()) {
-
- comp.requestFocus();
- }
+
+ if(!(comp instanceof JComponent)
+ || !((JComponent)comp).requestDefaultFocus()) {
+
+ comp.requestFocus();
}
}
diff --git a/core.windows/src/org/netbeans/core/windows/view/DefaultView.java b/core.windows/src/org/netbeans/core/windows/view/DefaultView.java
index 4f420cc..e64766e 100644
--- a/core.windows/src/org/netbeans/core/windows/view/DefaultView.java
+++ b/core.windows/src/org/netbeans/core/windows/view/DefaultView.java
@@ -773,14 +773,12 @@ class DefaultView implements View, Controller, WindowDnDManager.ViewAccessor {
}
SplitAccessor splitAccessor = (SplitAccessor)hierarchy.getAccessorForView(splitView);
- // XXX PENDING #257467 Investigate how it could happen.
- if (splitAccessor != null) {
- ElementAccessor[] childrenAccessors = new ElementAccessor[childrenViews.length];
- for( int i=0; i<childrenViews.length; i++ ) {
- childrenAccessors[i] = hierarchy.getAccessorForView( childrenViews[i] );
- }
- ViewHelper.setSplitWeights(splitAccessor, childrenAccessors, splitWeights, controllerHandler);
+ ElementAccessor[] childrenAccessors = new ElementAccessor[childrenViews.length];
+ for( int i=0; i<childrenViews.length; i++ ) {
+ childrenAccessors[i] = hierarchy.getAccessorForView( childrenViews[i] );
}
+ ViewHelper.setSplitWeights(splitAccessor, childrenAccessors, splitWeights, controllerHandler);
+
// XXX PENDING
// updateSeparateBoundsForView(splitView);
}
diff --git a/core.windows/src/org/netbeans/core/windows/view/ViewHierarchy.java b/core.windows/src/org/netbeans/core/windows/view/ViewHierarchy.java
index 1c57537..a7e7d87 100644
--- a/core.windows/src/org/netbeans/core/windows/view/ViewHierarchy.java
+++ b/core.windows/src/org/netbeans/core/windows/view/ViewHierarchy.java
@@ -139,9 +139,6 @@ final class ViewHierarchy {
if( null == mainFrame ) {
mainFrame = new JFrame();
mainFrame.setName( "NbMainWindow" ); //NOI18N
- if (!Constants.AUTO_FOCUS) {
- mainFrame.setAutoRequestFocus(false);
- }
}
if( "Aqua".equals(UIManager.getLookAndFeel().getID())
&& null == System.getProperty("apple.awt.brushMetalLook") ) {//NOI18N
diff --git a/core.windows/src/org/netbeans/core/windows/view/dnd/WindowDnDManager.java b/core.windows/src/org/netbeans/core/windows/view/dnd/WindowDnDManager.java
index fece065..5364095 100644
--- a/core.windows/src/org/netbeans/core/windows/view/dnd/WindowDnDManager.java
+++ b/core.windows/src/org/netbeans/core/windows/view/dnd/WindowDnDManager.java
@@ -1053,12 +1053,9 @@ implements DropTargetGlassPane.Observer, DropTargetGlassPane.Informer {
// was probably forgotten to set the lastdrop target, was causing strange repaint side effects when 2 frames overlapped.
JComponent cp = (JComponent)droppable.getDropComponent();
- JRootPane rootPane = cp.getRootPane();
- if (rootPane != null) {
- Component glass = rootPane.getGlassPane();
- if (glass instanceof DropTargetGlassPane) {
- windowDnDManager.setLastDropTarget((DropTargetGlassPane)glass);
- }
+ Component glass = cp.getRootPane().getGlassPane();
+ if (glass instanceof DropTargetGlassPane) {
+ windowDnDManager.setLastDropTarget((DropTargetGlassPane)glass);
}
Point p = new Point(location);
SwingUtilities.convertPointFromScreen(p, droppable.getDropComponent());
diff --git a/core.windows/src/org/netbeans/core/windows/view/ui/Bundle.properties b/core.windows/src/org/netbeans/core/windows/view/ui/Bundle.properties
index 3907ad8..c6cdfbb 100644
--- a/core.windows/src/org/netbeans/core/windows/view/ui/Bundle.properties
+++ b/core.windows/src/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,6 +1,6 @@
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
@@ -48,8 +48,8 @@ LBL_EditorAreaFrameTitle=Editor
ACSD_MainWindow=Main Window
# {0} build number
# {1} project name
-CTL_MainWindow_Title=NetBeans Platform 8.2
-CTL_MainWindow_Title_No_Project=NetBeans Platform 8.2
+CTL_MainWindow_Title=NetBeans Platform 8.1
+CTL_MainWindow_Title_No_Project=NetBeans Platform 8.1
# DocumentsDlg
LBL_Documents=&Documents:
diff --git a/core.windows/src/org/netbeans/core/windows/view/ui/CloseButtonTabbedPane.java b/core.windows/src/org/netbeans/core/windows/view/ui/CloseButtonTabbedPane.java
index b5ef484..feb63f0 100644
--- a/core.windows/src/org/netbeans/core/windows/view/ui/CloseButtonTabbedPane.java
+++ b/core.windows/src/org/netbeans/core/windows/view/ui/CloseButtonTabbedPane.java
@@ -343,11 +343,6 @@ final class CloseButtonTabbedPane extends JTabbedPane implements PropertyChangeL
}
}
- private static boolean isWindows10() {
- String osName = System.getProperty ("os.name");
- return osName.indexOf("Windows 10") >= 0
- || (osName.equals( "Windows NT (unknown)" ) && "10.0".equals( System.getProperty("os.version") ));
- }
private boolean isWindowsVistaLaF() {
String osName = System.getProperty ("os.name");
@@ -554,17 +549,8 @@ final class CloseButtonTabbedPane extends JTabbedPane implements PropertyChangeL
lastText = currentText;
if (!super.getText().equals(currentText)) {
setText(currentText);
- }
- return currentText;
- }
-
- @Override
- public void setText(String text) {
- super.setText(text);
- if (isWindowsLaF() && isWindows10()) {
- int r = text.endsWith(" ") || text.endsWith(" </html>") ? 0 : 3; // NOI18N
- setBorder(BorderFactory.createEmptyBorder(0, 0, 0, r));
}
+ return currentText;
}
@Override
diff --git a/core.windows/src/org/netbeans/core/windows/view/ui/TabbedHandler.java b/core.windows/src/org/netbeans/core/windows/view/ui/TabbedHandler.java
index 35404c4..c148a30 100644
--- a/core.windows/src/org/netbeans/core/windows/view/ui/TabbedHandler.java
+++ b/core.windows/src/org/netbeans/core/windows/view/ui/TabbedHandler.java
@@ -233,7 +233,6 @@ public final class TabbedHandler implements ChangeListener, ActionListener {
tabbed.setIconAt(index, new ImageIcon(tc.getIcon()));
} else {
Logger.getLogger(TabbedHandler.class.getName()).log(Level.INFO, "TopComponent has no icon: " + tc);
- tabbed.setIconAt(index, null);
}
}
diff --git a/core.windows/test/unit/src/org/netbeans/core/windows/resources/component00.settings b/core.windows/test/unit/src/org/netbeans/core/windows/resources/component00.settings
index 9e55312..a8e58a2 100644
--- a/core.windows/test/unit/src/org/netbeans/core/windows/resources/component00.settings
+++ b/core.windows/test/unit/src/org/netbeans/core/windows/resources/component00.settings
@@ -1,43 +1,4 @@
<?xml version="1.0"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE settings PUBLIC "-//NetBeans//DTD Session settings 1.0//EN" "http://www.netbeans.org/dtds/sessionsettings-1_0.dtd">
<settings version="1.0">
<module name="org.netbeans.core.windows/2" />
diff --git a/core.windows/test/unit/src/org/netbeans/core/windows/resources/component00.wstcref b/core.windows/test/unit/src/org/netbeans/core/windows/resources/component00.wstcref
index cfc00c2..6abe085 100644
--- a/core.windows/test/unit/src/org/netbeans/core/windows/resources/component00.wstcref
+++ b/core.windows/test/unit/src/org/netbeans/core/windows/resources/component00.wstcref
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE tc-ref PUBLIC
"-//NetBeans//DTD Top Component in Mode Properties 2.0//EN"
diff --git a/core.windows/test/unit/src/org/netbeans/core/windows/view/ui/CustomMenuBarTest.java b/core.windows/test/unit/src/org/netbeans/core/windows/view/ui/CustomMenuBarTest.java
index 72806c2..80194e1 100644
--- a/core.windows/test/unit/src/org/netbeans/core/windows/view/ui/CustomMenuBarTest.java
+++ b/core.windows/test/unit/src/org/netbeans/core/windows/view/ui/CustomMenuBarTest.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,18 +24,9 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
* Contributor(s):
+ *
+ * Portions Copyrighted 2007 Nokia Siemens Networks Oy
*/
package org.netbeans.core.windows.view.ui;
diff --git a/debian/changelog b/debian/changelog
index a913c76..790940c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,25 +1,19 @@
-libnb-platform18-java (8.2+dfsg1-1) experimental; urgency=medium
+libnb-platform18-java (8.1+dfsg1-6) unstable; urgency=medium
- [ Emmanuel Bourg ]
- * Depend on libasm-java (>= 5.0) instead of libasm4-java.
-
- [ Markus Koschany ]
- * New upstream version 8.2+dfsg1.
+ * Add jna-4.4.0-compatibility.patch and fix FTBFS with JNA 4.4.0.
+ Thanks to Lucas Nussbaum for the report. (Closes: #868923)
* Switch to compat level 10.
- * Drop gcc-6-ftbfs.patch. Fixed upstream.
- * Refresh all other patches for new release.
- * Drop netbeans-platform-windowslauncher.patch.
- * Stop building the windows launcher.
- Requires too much maintenance work. Currently fails because
- Makefile-Impl.mk does not exist. The windows launcher is also rather
- optional on Linux. If you want to see it again, please consider to help
- maintaining the package.
- * Bump version to 8.2 in pom files.
- * Update jna library symlinks in debian/linked-jars.
- * Add netbeans-platform-disable-xhr4j-module.patch and disable the xhr4j
- module.
-
- -- Markus Koschany <apo at debian.org> Tue, 20 Dec 2016 19:12:37 +0100
+ * Use https for Format field.
+ * Declare compliance with Debian Policy 4.0.0.
+ * Tighten B-D on libjna-platform-java to >= 4.4.0.
+
+ -- Markus Koschany <apo at debian.org> Sun, 23 Jul 2017 17:22:32 +0200
+
+libnb-platform18-java (8.1+dfsg1-5) unstable; urgency=medium
+
+ * Use the correct name for libjna-jni library. (Closes: #858876)
+
+ -- Markus Koschany <apo at debian.org> Wed, 19 Apr 2017 21:50:21 +0200
libnb-platform18-java (8.1+dfsg1-4) unstable; urgency=medium
@@ -192,7 +186,7 @@ libnb-platform-java (6.8-0ubuntu2) lucid; urgency=low
libnb-platform-java (6.8-0ubuntu1) lucid; urgency=low
* new upstream release (LP: 517083)
- - debian/copyright and watch files are updated
+ - debian/copyright and watch files are updated
to point to the correct download location
-- Yulia Novozhilova <Yulia.Novozhilova at sun.com> Fri, 11 Dec 2009 13:44:12 +0300
@@ -215,16 +209,16 @@ libnb-platform-java (6.5-0ubuntu2) jaunty; urgency=low
libnb-platform-java (6.5-0ubuntu1) jaunty; urgency=low
* New upstream version (LP: #316793)
- * added dependency of libnb-platform-devel-java
+ * added dependency of libnb-platform-devel-java
on libnb-platform9-java (LP: #276731)
* removed version number from binary package:
- libnb-platform8-devel-java -> libnb-platform-devel-java
- * watch file and get-orig-source target are added
+ libnb-platform8-devel-java -> libnb-platform-devel-java
+ * watch file and get-orig-source target are added
-- Yulia Novozhilova <Yulia.Novozhilova at sun.com> Thu, 25 Sep 2008 22:27:16 +0400
libnb-platform-java (6.1-0ubuntu1) intrepid; urgency=low
* Initial release (LP: #252658)
-
+
-- Yulia Novozhilova <Yulia.Novozhilova at sun.com> Wed, 21 May 2008 15:52:03 +0400
diff --git a/debian/control b/debian/control
index c21e1d8..59442ea 100644
--- a/debian/control
+++ b/debian/control
@@ -11,19 +11,21 @@ Build-Depends:
antlr3 (>= 3.4),
debhelper (>= 10),
default-jdk,
+ g++-mingw-w64-i686,
+ g++-mingw-w64-x86-64,
javacc,
javahelp2,
javahelper,
junit,
junit4 (>= 4.6),
- libasm-java (>= 5.0),
+ libasm4-java,
libbindex-java,
libequinox-osgi-java,
libfelix-framework-java (>= 4.6.1),
libfelix-main-java,
libhamcrest-java,
libjemmy2-java,
- libjna-platform-java,
+ libjna-platform-java (>= 4.4.0),
libjnlp-servlet-java,
libosgi-compendium-java (>= 5.0.0),
libosgi-core-java (>= 6.0.0),
@@ -33,7 +35,7 @@ Build-Depends:
symlinks,
testng (>=6.8),
w3c-sgml-lib
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
Vcs-Git: https://anonscm.debian.org/git/pkg-java/libnb-platform-java.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libnb-platform-java.git
Homepage: http://netbeans.org/
@@ -44,7 +46,7 @@ Depends:
antlr3 (>= 3.4),
javahelp2,
junit4 (>= 4.6),
- libasm-java (>= 5.0),
+ libasm4-java,
libequinox-osgi-java,
libfelix-framework-java (>= 4.6.1),
libfelix-main-java,
diff --git a/debian/copyright b/debian/copyright
index 3c50c41..e975785 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: https://netbeans.org/downloads/zip.html
Files: *
@@ -9,7 +9,7 @@ License: CDDL-1 or GPL-2-with-classpath-exception
Files: debian/*
Copyright: 2008-2010, Yulia Novozhilova <Yulia.Novozhilova at sun.com>
2011-2012, Andrew Ross <ubuntu at rossfamily.co.uk>
- 2015-2016, Markus Koschany <apo at debian.org>
+ 2015-2017, Markus Koschany <apo at debian.org>
License: GPL-2+
Files: ./options.keymap/build.xml
diff --git a/debian/linked-jars b/debian/linked-jars
index fbfc602..d35884b 100644
--- a/debian/linked-jars
+++ b/debian/linked-jars
@@ -2,8 +2,7 @@ $JAVADIR/jna-platform.jar libs.jna.platform/external platform/modules/ext jna-pl
$JAVADIR/jhall.jar javahelp/external platform/modules/ext jhall-2.0_05.jar
$JAVADIR/antlr3.jar libs.antlr3.devel/external platform/modules/ext antlr-3.4.jar
$JAVADIR/org.apache.felix.main.jar libs.felix/external platform/modules/ext felix-4.2.1.jar
-$JAVADIR/jna-platform.jar libs.jna.platform/external platform/modules/ext jna-platform-4.2.2.jar
-$JAVADIR/jna.jar libs.jna/external platform/modules/ext jna-4.2.2.jar
+$JAVADIR/jna.jar libs.jna/external platform/modules/ext jna-4.1.0.jar
$JAVADIR/osgi.core.jar libs.osgi/external platform/modules/ext osgi.core-5.0.0.jar
$JAVADIR/osgi.compendium.jar libs.osgi/external platform/modules/ext osgi.cmpn-4.2.jar
$JAVADIR/testng.jar libs.testng/external platform/modules/ext testng-6.8.1-dist.jar
@@ -17,5 +16,5 @@ $JAVADIR/jnlp-servlet.jar apisupport.harness/external harness/jnlp jnlp-servlet.
$JAVADIR/junit4.jar libs.junit4/external platform/modules/ext junit-4.12.jar
$JAVADIR/hamcrest-core.jar libs.junit4/external platform/modules/ext hamcrest-core-1.3.jar
-$JAVADIR/asm-all.jar libs.asm/external platform/modules/ext asm-all-5.0.1.jar
+$JAVADIR/asm4-all.jar libs.asm/external platform/modules/ext asm-all-5.0.1.jar
diff --git a/debian/patches/gcc-6-ftbfs.patch b/debian/patches/gcc-6-ftbfs.patch
new file mode 100644
index 0000000..b905e7a
--- /dev/null
+++ b/debian/patches/gcc-6-ftbfs.patch
@@ -0,0 +1,51 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 28 Aug 2016 17:47:09 +0200
+Subject: gcc 6 ftbfs
+
+Fix FTBFS with GCC-6.
+
+Forwarded: no
+---
+ ide/launcher/windows/nblauncher.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/ide/launcher/windows/nblauncher.cpp b/ide/launcher/windows/nblauncher.cpp
+index a1a5967..91198f1 100644
+--- a/ide/launcher/windows/nblauncher.cpp
++++ b/ide/launcher/windows/nblauncher.cpp
+@@ -426,7 +426,7 @@ bool NbLauncher::findCacheDir(const char *str) {
+ string NbLauncher::getDefaultUserDirRoot() {
+ TCHAR defUserDirRootChar[MAX_PATH];
+ if (FAILED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, 0, defUserDirRootChar))) {
+- return false;
++ return 0;
+ }
+ defUserDirRoot = ((string) defUserDirRootChar) + NETBEANS_DIRECTORY;
+ defUserDirRoot.erase(defUserDirRoot.rfind('\\'));
+@@ -437,7 +437,7 @@ string NbLauncher::getDefaultUserDirRoot() {
+ string NbLauncher::getDefaultCacheDirRoot() {
+ TCHAR defCacheDirRootChar[MAX_PATH];
+ if (FAILED(SHGetFolderPath(NULL, CSIDL_LOCAL_APPDATA, NULL, 0, defCacheDirRootChar))) {
+- return false;
++ return 0;
+ }
+ defCacheDirRoot = ((string) defCacheDirRootChar) + NETBEANS_CACHES_DIRECTORY;
+ defCacheDirRoot.erase(defCacheDirRoot.rfind('\\'));
+@@ -458,7 +458,7 @@ bool NbLauncher::getOption(char *&str, const char *opt) {
+ logMsg("Option found: %s%s", opt, str);
+ return true;
+ }
+- return false;
++ return 0;
+ }
+
+ bool NbLauncher::parseConfigFile(const char* path) {
+@@ -466,7 +466,7 @@ bool NbLauncher::parseConfigFile(const char* path) {
+ FILE *file = fopen(path, "r");
+ if (!file) {
+ logErr(true, false, "Cannot open file \"%s\" for reading.", path);
+- return false;
++ return 0;
+ }
+
+ char line[4096] = "";
diff --git a/debian/patches/jna-4.4.0-compatibility.patch b/debian/patches/jna-4.4.0-compatibility.patch
new file mode 100644
index 0000000..6beaeb3
--- /dev/null
+++ b/debian/patches/jna-4.4.0-compatibility.patch
@@ -0,0 +1,25 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 23 Jul 2017 14:44:17 +0200
+Subject: jna 4.4.0 compatibility
+
+Fix FTBFS with libjna-java 4.4.0.
+
+Bug-Debian: https://bugs.debian.org/868923
+Forwarded: no
+---
+ .../src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java b/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java
+index fb762af..77c6a81 100644
+--- a/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java
++++ b/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java
+@@ -69,7 +69,7 @@ public interface GnomeKeyringLibrary extends Library {
+ // http://packages.ubuntu.com/search?suite=precise&arch=any&mode=exactfilename&searchon=contents&keywords=libgnome-keyring.so.0
+ private static final String EXPLICIT_ONEIRIC = "/usr/lib/libgnome-keyring.so.0";
+ @SuppressWarnings("DMI_HARDCODED_ABSOLUTE_FILENAME")
+- private static Object load(Map<?,?> options) {
++ private static Object load(Map<String,?> options) {
+ try {
+ return Native.loadLibrary(GENERIC, GnomeKeyringLibrary.class, options);
+ } catch (UnsatisfiedLinkError x) {
diff --git a/debian/patches/netbeans-platform-disable-net.java-modules.patch b/debian/patches/netbeans-platform-disable-net.java-modules.patch
index fff1ea4..9c0543b 100644
--- a/debian/patches/netbeans-platform-disable-net.java-modules.patch
+++ b/debian/patches/netbeans-platform-disable-net.java-modules.patch
@@ -1,6 +1,6 @@
From: Markus Koschany <apo at debian.org>
-Date: Sun, 23 Oct 2016 21:38:22 +0200
-Subject: netbeans platform disable-net.java modules
+Date: Tue, 15 Dec 2015 16:54:49 +0100
+Subject: netbeans platform disable net.java modules
Disable the net.java.module because it is not available in Debian.
@@ -12,7 +12,7 @@ Forwarded: not-needed
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/nbbuild/build.properties b/nbbuild/build.properties
-index e0180b6..bba3598 100644
+index 8e3826a..3c780eb 100644
--- a/nbbuild/build.properties
+++ b/nbbuild/build.properties
@@ -99,7 +99,6 @@ javadoc.packages=\
@@ -24,10 +24,10 @@ index e0180b6..bba3598 100644
api.io,\
api.knockout,\
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 15a22d6..da9364e 100644
+index fce0fcb..776c7d4 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
-@@ -205,7 +205,6 @@ nb.cluster.platform.dir=platform
+@@ -201,7 +201,6 @@ nb.cluster.platform.dir=platform
nb.cluster.platform.depends=nb.cluster.bootstrap
nb.cluster.platform=\
api.annotations.common,\
@@ -35,7 +35,7 @@ index 15a22d6..da9364e 100644
api.intent,\
api.io,\
api.progress,\
-@@ -253,13 +252,6 @@ nb.cluster.platform=\
+@@ -249,13 +248,6 @@ nb.cluster.platform=\
masterfs.nio2,\
masterfs.ui,\
masterfs.windows,\
@@ -50,10 +50,10 @@ index 15a22d6..da9364e 100644
o.jdesktop.layout,\
o.n.core,\
diff --git a/net.java.html/build.xml b/net.java.html/build.xml
-index e9476b1..b152aaf 100644
+index 9d4bc83..28f236f 100644
--- a/net.java.html/build.xml
+++ b/net.java.html/build.xml
-@@ -42,3 +42,4 @@ Contributor(s):
+@@ -3,3 +3,4 @@
<import file="../nbbuild/templates/projectized.xml"/>
<target name="jar"/>
</project>
diff --git a/debian/patches/netbeans-platform-disable-xhr4j-module.patch b/debian/patches/netbeans-platform-disable-xhr4j-module.patch
deleted file mode 100644
index 1ea325e..0000000
--- a/debian/patches/netbeans-platform-disable-xhr4j-module.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Thu, 27 Oct 2016 23:58:58 +0200
-Subject: netbeans platform disable xhr4j module
-
-Disable xhr4j module because build-dependencies are not available in Debian.
-
-Forwarded: not-needed
----
- nbbuild/cluster.properties | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index 05d3f3d..9a77701 100644
---- a/nbbuild/cluster.properties
-+++ b/nbbuild/cluster.properties
-@@ -255,7 +255,6 @@ nb.cluster.platform=\
- netbinox,\
- o.jdesktop.layout,\
- o.n.core,\
-- o.n.html.xhr4j,\
- o.n.swing.outline,\
- o.n.swing.plaf,\
- o.n.swing.tabcontrol,\
diff --git a/debian/patches/netbeans-platform-empty-binaries-list.patch b/debian/patches/netbeans-platform-empty-binaries-list.patch
index 2f5bf81..d7cc502 100644
--- a/debian/patches/netbeans-platform-empty-binaries-list.patch
+++ b/debian/patches/netbeans-platform-empty-binaries-list.patch
@@ -1,5 +1,5 @@
From: Markus Koschany <apo at debian.org>
-Date: Sun, 23 Oct 2016 19:27:56 +0200
+Date: Tue, 15 Dec 2015 01:08:12 +0100
Subject: netbeans platform empty binaries list
Empty all the binaries-list files so nothing gets downloaded.
@@ -18,7 +18,7 @@ Forwarded: not-needed
libs.junit4/external/binaries-list | 2 --
libs.osgi/external/binaries-list | 2 --
libs.testng/external/binaries-list | 2 --
- nbbuild/external/binaries-list | 1 -
+ nbbuild/external/binaries-list | 2 --
net.java.html.boot.fx/external/binaries-list | 1 -
net.java.html.boot.script/external/binaries-list | 1 -
net.java.html.boot/external/binaries-list | 1 -
@@ -26,11 +26,10 @@ Forwarded: not-needed
net.java.html.json/external/binaries-list | 1 -
net.java.html.sound/external/binaries-list | 1 -
net.java.html/external/binaries-list | 1 -
- netbinox/external/binaries-list | 1 -
+ netbinox/external/binaries-list | 2 --
o.jdesktop.layout/external/binaries-list | 3 ---
o.n.html.ko4j/external/binaries-list | 1 -
- o.n.html.xhr4j/external/binaries-list | 1 -
- 25 files changed, 36 deletions(-)
+ 24 files changed, 37 deletions(-)
diff --git a/apisupport.harness/external/binaries-list b/apisupport.harness/external/binaries-list
index fb7dd1e..e69de29 100644
@@ -88,17 +87,18 @@ index b01c319..e69de29 100644
@@ -1 +0,0 @@
-5E40984A55F6FFF704F05D511A119CA5B456DDB1 jfxrt.jar
diff --git a/libs.jna.platform/external/binaries-list b/libs.jna.platform/external/binaries-list
-index 5ff437e..e69de29 100644
+index 7373694..e69de29 100644
--- a/libs.jna.platform/external/binaries-list
+++ b/libs.jna.platform/external/binaries-list
@@ -1 +0,0 @@
--030FA67B23CF2C0327A02CFAECBEF76A20160E7B jna-platform-4.2.2.jar
+-23457AD1CF75C2C16763330DE5565A0E67B4BC0A jna-platform-4.1.0.jar
+\ No newline at end of file
diff --git a/libs.jna/external/binaries-list b/libs.jna/external/binaries-list
-index e9956c0..e69de29 100644
+index 535d54a..e69de29 100644
--- a/libs.jna/external/binaries-list
+++ b/libs.jna/external/binaries-list
@@ -1 +0,0 @@
--5012450AEE579C3118FF09461D5CE210E0CDC2A9 jna-4.2.2.jar
+-1C12D070E602EFD8021891CDD7FD18BC129372D4 jna-4.1.0.jar
diff --git a/libs.junit4/external/binaries-list b/libs.junit4/external/binaries-list
index cf7e327..e69de29 100644
--- a/libs.junit4/external/binaries-list
@@ -121,59 +121,61 @@ index 574feaa..e69de29 100644
-AC97B566699146713B3CF0ABC226B5C08EF7CF33 testng-6.8.1-dist.jar
-AF022CBCACD8CBFCF946816441D1E7568D817745 testng-6.8.1-javadoc.zip
diff --git a/nbbuild/external/binaries-list b/nbbuild/external/binaries-list
-index 64cf925..e69de29 100644
+index 3b388fb..e69de29 100644
--- a/nbbuild/external/binaries-list
+++ b/nbbuild/external/binaries-list
-@@ -1 +0,0 @@
--A7674A6D78B7FEA58AF76B357DAE6EA5E3FDFBE9 apitest.jar
+@@ -1,2 +0,0 @@
+-EAE299D9D3B1C6E2F8B030DCD3BCF0B05517FBA9 apitest.jar
+-
diff --git a/net.java.html.boot.fx/external/binaries-list b/net.java.html.boot.fx/external/binaries-list
-index 1eb90a2..e69de29 100644
+index 78768bf..e69de29 100644
--- a/net.java.html.boot.fx/external/binaries-list
+++ b/net.java.html.boot.fx/external/binaries-list
@@ -1 +0,0 @@
--5C992BAEC0111EE293BD44173140A9D8EC860765 net.java.html.boot.fx-1.3.jar
+-068B9902E65F2292C9EA30E5423E41FB6B30D8AA net.java.html.boot.fx-1.2.3.jar
diff --git a/net.java.html.boot.script/external/binaries-list b/net.java.html.boot.script/external/binaries-list
-index cbed823..e69de29 100644
+index 30f7fad..e69de29 100644
--- a/net.java.html.boot.script/external/binaries-list
+++ b/net.java.html.boot.script/external/binaries-list
@@ -1 +0,0 @@
--BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72 net.java.html.boot.script-1.3.jar
+-8621531E83EC4850DA61AA2266FE41105C304F40 net.java.html.boot.script-1.2.3.jar
diff --git a/net.java.html.boot/external/binaries-list b/net.java.html.boot/external/binaries-list
-index 9fc4a4e..e69de29 100644
+index 908358f..e69de29 100644
--- a/net.java.html.boot/external/binaries-list
+++ b/net.java.html.boot/external/binaries-list
@@ -1 +0,0 @@
--7FC91530F4395FA0D58F9539F3B40858E766BFA3 net.java.html.boot-1.3.jar
+-7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E net.java.html.boot-1.2.3.jar
diff --git a/net.java.html.geo/external/binaries-list b/net.java.html.geo/external/binaries-list
-index fd5a521..e69de29 100644
+index 79eedf2..e69de29 100644
--- a/net.java.html.geo/external/binaries-list
+++ b/net.java.html.geo/external/binaries-list
@@ -1 +0,0 @@
--10E4214A89082C70FCF9F721953001C0932037BA net.java.html.geo-1.3.jar
+-24824B1E8C2A2D3A5C471F5875BF61F27E8916DB net.java.html.geo-1.2.3.jar
diff --git a/net.java.html.json/external/binaries-list b/net.java.html.json/external/binaries-list
-index 3395074..e69de29 100644
+index 935fbbf..e69de29 100644
--- a/net.java.html.json/external/binaries-list
+++ b/net.java.html.json/external/binaries-list
@@ -1 +0,0 @@
--D97314CE1869DD3B8B8942256A70673E2991C9DD net.java.html.json-1.3.jar
+-F41518385DA4B5682C864F19B82C3BA4AF65AE83 net.java.html.json-1.2.3.jar
diff --git a/net.java.html.sound/external/binaries-list b/net.java.html.sound/external/binaries-list
-index 5036b83..e69de29 100644
+index d436017..e69de29 100644
--- a/net.java.html.sound/external/binaries-list
+++ b/net.java.html.sound/external/binaries-list
@@ -1 +0,0 @@
--6BDCE8349F83CD02F2942D4FBFA86A81A129F42A net.java.html.sound-1.3.jar
+-989A81454D4FA962EB1C158FE794D2EB060AB9F6 net.java.html.sound-1.2.3.jar
diff --git a/net.java.html/external/binaries-list b/net.java.html/external/binaries-list
-index 1326b9d..e69de29 100644
+index a23ebca..e69de29 100644
--- a/net.java.html/external/binaries-list
+++ b/net.java.html/external/binaries-list
@@ -1 +0,0 @@
--A3085BAA78C8EE7F55081E70C79ABE04CA38CE93 net.java.html-1.3.jar
+-78DD1C0B4EDC348FF4DCD0616597BB809AAE248D net.java.html-1.2.3.jar
diff --git a/netbinox/external/binaries-list b/netbinox/external/binaries-list
-index c81a802..e69de29 100644
+index a246e5c..e69de29 100644
--- a/netbinox/external/binaries-list
+++ b/netbinox/external/binaries-list
-@@ -1 +0,0 @@
--E5DDC5E827D3D62E7BE9F7E32927CA01F2839971 org.eclipse.osgi_3.9.1.v20140110-1610.jar
+@@ -1,2 +0,0 @@
+-B27F1304F18FEDE876F940AEFA6C9EB5632619D7 org.eclipse.osgi_3.9.1.v20140110-1610.jar
+-
diff --git a/o.jdesktop.layout/external/binaries-list b/o.jdesktop.layout/external/binaries-list
index 1d6b722..e69de29 100644
--- a/o.jdesktop.layout/external/binaries-list
@@ -183,14 +185,8 @@ index 1d6b722..e69de29 100644
-69D72835E165439CF7816EFDA65868FD4E0C6E2A swing-layout-1.0.4.jar
-D2503D2217868ABAE1A5E7480A9CCA1DB3522464 swing-layout-1.0.4-src.zip
diff --git a/o.n.html.ko4j/external/binaries-list b/o.n.html.ko4j/external/binaries-list
-index 6459050..e69de29 100644
+index 177b434..e69de29 100644
--- a/o.n.html.ko4j/external/binaries-list
+++ b/o.n.html.ko4j/external/binaries-list
@@ -1 +0,0 @@
--771CDCA0A3F2F3CE818E20CC2D707A3592422485 ko4j-1.3.jar
-diff --git a/o.n.html.xhr4j/external/binaries-list b/o.n.html.xhr4j/external/binaries-list
-index 78f94eb..e69de29 100644
---- a/o.n.html.xhr4j/external/binaries-list
-+++ b/o.n.html.xhr4j/external/binaries-list
-@@ -1 +0,0 @@
--CEC2829EC391CB404AD32EB2D08F879C418B745B xhr4j-1.3.jar
+-A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62 ko4j-1.2.3.jar
diff --git a/debian/patches/netbeans-platform-junitlib.patch b/debian/patches/netbeans-platform-junitlib.patch
index c28d2fd..df95cf1 100644
--- a/debian/patches/netbeans-platform-junitlib.patch
+++ b/debian/patches/netbeans-platform-junitlib.patch
@@ -1,5 +1,5 @@
From: Markus Koschany <apo at debian.org>
-Date: Sun, 23 Oct 2016 21:39:15 +0200
+Date: Tue, 15 Dec 2015 18:21:48 +0100
Subject: netbeans platform junitlib
We don't include source or javadoc jars of junit4. This is to prevent a FTBFS.
@@ -10,10 +10,10 @@ Forwarded: not-needed
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/junitlib/nbproject/project.properties b/junitlib/nbproject/project.properties
-index 987f66c..34ca737 100644
+index e6f478f..d7ba938 100644
--- a/junitlib/nbproject/project.properties
+++ b/junitlib/nbproject/project.properties
-@@ -38,8 +38,8 @@
+@@ -1,8 +1,8 @@
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/debian/patches/netbeans-platform-nbi.patch b/debian/patches/netbeans-platform-nbi.patch
index cbdd085..cfd41d1 100644
--- a/debian/patches/netbeans-platform-nbi.patch
+++ b/debian/patches/netbeans-platform-nbi.patch
@@ -1,19 +1,18 @@
From: Markus Koschany <apo at debian.org>
-Date: Sun, 23 Oct 2016 21:39:48 +0200
-Subject: netbeans-platform-nbi
-
-Don't build Netbeans' Installer modules.
+Date: Mon, 1 Jun 2015 13:42:24 +0200
+Subject: netbeans platform nbi
+Don't build the Netbeans Installer modules.
Forwarded: not-needed
---
nbbuild/cluster.properties | 2 --
1 file changed, 2 deletions(-)
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index da9364e..e044d59 100644
+index 9b1177a..fce0fcb 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
-@@ -880,8 +880,6 @@ nb.cluster.harness=\
+@@ -883,8 +883,6 @@ nb.cluster.harness=\
apisupport.harness,\
jellytools.platform,\
jemmy,\
diff --git a/debian/patches/netbeans-platform-nojnabinaries.patch b/debian/patches/netbeans-platform-nojnabinaries.patch
index 8690298..9ef4359 100644
--- a/debian/patches/netbeans-platform-nojnabinaries.patch
+++ b/debian/patches/netbeans-platform-nojnabinaries.patch
@@ -1,57 +1,69 @@
From: Markus Koschany <apo at debian.org>
-Date: Thu, 27 Oct 2016 22:45:50 +0200
+Date: Mon, 1 Jun 2015 14:21:49 +0200
Subject: netbeans platform nojnabinaries
We don't need to install any JNA binaries, since they're already installed.
-
Forwarded: not-needed
---
- libs.jna.platform/nbproject/project.properties | 1 -
- libs.jna/nbproject/project.properties | 13 -------------
+ libs.jna.platform/nbproject/project.properties | 2 +-
+ libs.jna/nbproject/project.properties | 24 +++++++++++------------
libs.jna/src/org/netbeans/libs/jna/Installer.java | 2 +-
- 3 files changed, 1 insertion(+), 15 deletions(-)
+ 3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/libs.jna.platform/nbproject/project.properties b/libs.jna.platform/nbproject/project.properties
-index c8688d8..47f4925 100644
+index b8afdb4..608ea2b 100644
--- a/libs.jna.platform/nbproject/project.properties
+++ b/libs.jna.platform/nbproject/project.properties
-@@ -42,5 +42,4 @@
+@@ -42,5 +42,5 @@
is.autoload=true
javac.source=1.6
--release.external/jna-platform-4.2.2.jar=modules/ext/jna-platform-4.2.2.jar
+-release.external/jna-platform-4.1.0.jar=modules/ext/jna-platform-4.1.0.jar
++#release.external/jna-platform-4.1.0.jar=modules/ext/jna-platform-4.1.0.jar
sigtest.gen.fail.on.error=false
diff --git a/libs.jna/nbproject/project.properties b/libs.jna/nbproject/project.properties
-index 2800236..a4ce0d9 100644
+index c6de368..0a8e520 100644
--- a/libs.jna/nbproject/project.properties
+++ b/libs.jna/nbproject/project.properties
-@@ -41,17 +41,4 @@
+@@ -41,17 +41,17 @@
# made subject to such option by the copyright holder.
javac.source=1.6
--release.external/jna-4.2.2.jar=modules/ext/jna-4.2.2.jar
--# Do not forget to rename native libs being extracted from the JAR when upgrading the JNA library, and patch org.netbeans.libs.jna.Installer as well.
--release.external/jna-4.2.2.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-422.jnilib
--release.external/jna-4.2.2.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-422.so
--release.external/jna-4.2.2.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-422.so
--release.external/jna-4.2.2.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-422.dll
--release.external/jna-4.2.2.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-422.dll
+-release.external/jna-4.1.0.jar=modules/ext/jna-4.1.0.jar
++#release.external/jna-4.1.0.jar=modules/ext/jna-4.1.0.jar
+ # Do not forget to rename native libs being extracted from the JAR when upgrading the JNA library, and patch org.netbeans.libs.jna.Installer as well.
+-release.external/jna-4.1.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-410.jnilib
+-release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-410.so
+-release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-410.so
+-release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-410.dll
+-release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-410.dll
-jnlp.verify.excludes=\
-- modules/lib/amd64/jnidispatch-422.dll,\
-- modules/lib/amd64/linux/libjnidispatch-422.so,\
-- modules/lib/i386/linux/libjnidispatch-422.so,\
-- modules/lib/x86/jnidispatch-422.dll,\
-- modules/lib/libjnidispatch-422.jnilib
+- modules/lib/amd64/jnidispatch-410.dll,\
+- modules/lib/amd64/linux/libjnidispatch-410.so,\
+- modules/lib/i386/linux/libjnidispatch-410.so,\
+- modules/lib/x86/jnidispatch-410.dll,\
+- modules/lib/libjnidispatch-410.jnilib
++#release.external/jna-4.1.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-410.jnilib
++#release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-410.so
++#release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-410.so
++#release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-410.dll
++#release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-410.dll
++#jnlp.verify.excludes=\
++# modules/lib/amd64/jnidispatch-410.dll,\
++# modules/lib/amd64/linux/libjnidispatch-410.so,\
++# modules/lib/i386/linux/libjnidispatch-410.so,\
++# modules/lib/x86/jnidispatch-410.dll,\
++# modules/lib/libjnidispatch-410.jnilib
sigtest.gen.fail.on.error=false
diff --git a/libs.jna/src/org/netbeans/libs/jna/Installer.java b/libs.jna/src/org/netbeans/libs/jna/Installer.java
-index 58c0c35..fa3201f 100644
+index cf306a7..5c1219c 100644
--- a/libs.jna/src/org/netbeans/libs/jna/Installer.java
+++ b/libs.jna/src/org/netbeans/libs/jna/Installer.java
@@ -50,6 +50,6 @@ public class Installer extends ModuleInstall {
public void validate() {
super.validate();
//#211655
-- System.setProperty( "jna.boot.library.name", "jnidispatch-422" ); //NOI18N
+- System.setProperty( "jna.boot.library.name", "jnidispatch-410" ); //NOI18N
+ System.setProperty( "jna.boot.library.name", "jnidispatch.system" ); //NOI18N
}
}
diff --git a/debian/patches/netbeans-platform-o.n.html.ko4j.patch b/debian/patches/netbeans-platform-o.n.html.ko4j.patch
index 88603f9..15467a3 100644
--- a/debian/patches/netbeans-platform-o.n.html.ko4j.patch
+++ b/debian/patches/netbeans-platform-o.n.html.ko4j.patch
@@ -1,8 +1,8 @@
From: Markus Koschany <apo at debian.org>
-Date: Sun, 23 Oct 2016 22:32:41 +0200
+Date: Tue, 15 Dec 2015 19:21:45 +0100
Subject: netbeans platform o.n.html.ko4j
-Disable the o.n.html.jo4j module.
+Disable the o.n.html.ko4j module similar to net.java.html.
Forwarded: not-needed
---
@@ -10,18 +10,18 @@ Forwarded: not-needed
1 file changed, 2 deletions(-)
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
-index e044d59..05d3f3d 100644
+index 776c7d4..4d3337a 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
-@@ -255,7 +255,6 @@ nb.cluster.platform=\
+@@ -251,7 +251,6 @@ nb.cluster.platform=\
netbinox,\
o.jdesktop.layout,\
o.n.core,\
- o.n.html.ko4j,\
- o.n.html.xhr4j,\
o.n.swing.outline,\
o.n.swing.plaf,\
-@@ -287,7 +286,6 @@ nb.cluster.platform=\
+ o.n.swing.tabcontrol,\
+@@ -282,7 +281,6 @@ nb.cluster.platform=\
spi.actions,\
spi.quicksearch,\
templates,\
diff --git a/debian/patches/netbeans-platform-windowslauncher.patch b/debian/patches/netbeans-platform-windowslauncher.patch
new file mode 100644
index 0000000..9ee464f
--- /dev/null
+++ b/debian/patches/netbeans-platform-windowslauncher.patch
@@ -0,0 +1,379 @@
+From: Markus Koschany <apo at debian.org>
+Date: Tue, 15 Dec 2015 01:23:09 +0100
+Subject: netbeans platform windowslauncher
+
+Use mingw32 to build the windows launchers. These are useful if the Netbeans
+platform is used to build another application on Debian which you want to be
+able to run on a Windows system.
+
+Forwarded: not-needed
+---
+ apisupport.harness/windows-launcher-src/Makefile | 7 ++---
+ .../nbproject/Makefile-app.exe.mk | 24 ++++++++---------
+ .../nbproject/Makefile-app64.exe.mk | 16 ++++++------
+ ide/launcher/windows/nblauncher.cpp | 1 +
+ o.n.bootstrap/launcher/windows/Makefile | 18 +++++--------
+ .../launcher/windows/nbproject/Makefile-nbexec.mk | 30 +++++++++++-----------
+ .../windows/nbproject/Makefile-nbexec64.mk | 26 +++++++++----------
+ o.n.bootstrap/launcher/windows/utilsfuncs.cpp | 1 +
+ 8 files changed, 61 insertions(+), 62 deletions(-)
+
+diff --git a/apisupport.harness/windows-launcher-src/Makefile b/apisupport.harness/windows-launcher-src/Makefile
+index c7d6f5e..f5499dc 100644
+--- a/apisupport.harness/windows-launcher-src/Makefile
++++ b/apisupport.harness/windows-launcher-src/Makefile
+@@ -17,7 +17,7 @@
+ MKDIR=mkdir
+ CP=cp
+ CCADMIN=CCadmin
+-RANLIB=ranlib
++RANLIB=i686-w64-mingw32-ranlib
+
+
+
+@@ -28,10 +28,10 @@ build: .build-post
+ # Add your pre 'build' code here...
+
+ .build-pre-app.exe: app.rc
+- windres -oapp.res -Ocoff app.rc
++ i686-w64-mingw32-windres -oapp.res -Ocoff app.rc
+
+ .build-pre-app64.exe: app.rc
+- x86_64-w64-mingw32-windres.exe -oapp64.res -Ocoff app.rc
++ x86_64-w64-mingw32-windres -oapp64.res -Ocoff app.rc
+
+ .build-post: .build-impl
+ # Add your post 'build' code here...
+@@ -40,6 +40,7 @@ build: .build-post
+
+ # clean
+ clean: .clean-post
++ -rm -f app.res app64.res
+
+ .clean-pre:
+ # Add your pre 'clean' code here...
+diff --git a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
+index c96635b..3859387 100644
+--- a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
++++ b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app.exe.mk
+@@ -13,12 +13,12 @@ CP=cp
+ GREP=grep
+ NM=nm
+ CCADMIN=CCadmin
+-RANLIB=ranlib
+-CC=gcc.exe
+-CCC=g++.exe
+-CXX=g++.exe
+-FC=gfortran
+-AS=as.exe
++RANLIB=i686-w64-mingw32-ranlib
++CC=
++CCC=i686-w64-mingw32-g++
++CXX=i686-w64-mingw32-g++
++FC=
++AS=i686-w64-mingw32-as
+
+ # Macros
+ CND_PLATFORM=Cygwin-Windows
+@@ -45,8 +45,8 @@ OBJECTFILES= \
+ CFLAGS=
+
+ # CC Compiler Flags
+-CCFLAGS=-m32 -mno-cygwin
+-CXXFLAGS=-m32 -mno-cygwin
++CCFLAGS=-m32
++CXXFLAGS=-m32
+
+ # Fortran Compiler Flags
+ FFLAGS=
+@@ -68,22 +68,22 @@ LDLIBSOPTIONS=app.res
+ ${OBJECTDIR}/applauncher.o: applauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} $@.d
+- $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/applauncher.o applauncher.cpp
++ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/applauncher.o applauncher.cpp
+
+ ${OBJECTDIR}/_ext/493252820/utilsfuncs.o: ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+ ${MKDIR} -p ${OBJECTDIR}/_ext/493252820
+ ${RM} $@.d
+- $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
++ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/493252820/utilsfuncs.o ../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+
+ ${OBJECTDIR}/_ext/216238457/nblauncher.o: ../../ide/launcher/windows/nblauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}/_ext/216238457
+ ${RM} $@.d
+- $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/216238457/nblauncher.o ../../ide/launcher/windows/nblauncher.cpp
++ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/_ext/216238457/nblauncher.o ../../ide/launcher/windows/nblauncher.cpp
+
+ ${OBJECTDIR}/app.o: app.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} $@.d
+- $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
++ $(COMPILE.cc) -O2 -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/app.o app.cpp
+
+ # Subprojects
+ .build-subprojects:
+diff --git a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
+index e35d1ac..2922e6a 100644
+--- a/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
++++ b/apisupport.harness/windows-launcher-src/nbproject/Makefile-app64.exe.mk
+@@ -13,12 +13,12 @@ CP=cp
+ GREP=grep
+ NM=nm
+ CCADMIN=CCadmin
+-RANLIB=ranlib
+-CC=x86_64-w64-mingw32-gcc.exe
+-CCC=x86_64-w64-mingw32-g++.exe
+-CXX=x86_64-w64-mingw32-g++.exe
+-FC=gfortran
+-AS=as.exe
++RANLIB=x86_64-w64-mingw32-ranlib
++CC=x86_64-w64-mingw32-gcc
++CCC=x86_64-w64-mingw32-g++
++CXX=x86_64-w64-mingw32-g++
++FC=
++AS=x86_64-w64-mingw32-as
+
+ # Macros
+ CND_PLATFORM=Cygwin64-Windows
+@@ -45,8 +45,8 @@ OBJECTFILES= \
+ CFLAGS=
+
+ # CC Compiler Flags
+-CCFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
+-CXXFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
++CCFLAGS=-m64 -static-libgcc -static-libstdc++
++CXXFLAGS=-m64 -static-libgcc -static-libstdc++
+
+ # Fortran Compiler Flags
+ FFLAGS=
+diff --git a/ide/launcher/windows/nblauncher.cpp b/ide/launcher/windows/nblauncher.cpp
+index 97c15ba..a1a5967 100644
+--- a/ide/launcher/windows/nblauncher.cpp
++++ b/ide/launcher/windows/nblauncher.cpp
+@@ -53,6 +53,7 @@
+ #include "../../../o.n.bootstrap/launcher/windows/utilsfuncs.h"
+ #include "../../../o.n.bootstrap/launcher/windows/argnames.h"
+ #include "../../../o.n.bootstrap/launcher/windows/nbexecloader.h"
++#include <stdio.h>
+
+ using namespace std;
+
+diff --git a/o.n.bootstrap/launcher/windows/Makefile b/o.n.bootstrap/launcher/windows/Makefile
+index 990aafa..2f78df1 100644
+--- a/o.n.bootstrap/launcher/windows/Makefile
++++ b/o.n.bootstrap/launcher/windows/Makefile
+@@ -15,7 +15,7 @@
+ MKDIR=mkdir
+ CP=cp
+ CCADMIN=CCadmin
+-RANLIB=ranlib
++RANLIB=i686-w64-mingw32-ranlib
+
+
+
+@@ -26,16 +26,12 @@ build: .build-post-$(CONF)
+ # Add your pre 'build' code here...
+
+ .build-post-nbexec: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc
+- windres.exe -Ocoff nbexec_exe.rc nbexec_exe.res
+- g++ -s -mno-cygwin -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -DNBEXEC_DLL=\"nbexec.dll\" nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
+- cp nbexec.exe ../../../nbbuild/netbeans/platform/lib/
+- cp nbexec.dll ../../../nbbuild/netbeans/platform/lib/
+-
++ i686-w64-mingw32-windres -Ocoff nbexec_exe.rc nbexec_exe.res
++ i686-w64-mingw32-g++ -s -DNBEXEC_DLL=\"nbexec.dll\" nbexecexe.cpp utilsfuncs.cpp nbexec_exe.res -o nbexec.exe
++
+ .build-post-nbexec64: .build-impl nbexecexe.cpp nbexecloader.h utilsfuncs.cpp nbexec_exe.rc
+- x86_64-w64-mingw32-windres.exe -Ocoff nbexec_exe.rc nbexec_exe64.res
+- x86_64-w64-mingw32-g++.exe -m64 -s -mno-cygwin -Wl,--nxcompat -Wl,--dynamicbase -DNBEXEC_DLL=\"nbexec64.dll\" -static-libgcc -static-libstdc++ nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -o nbexec64.exe
+- cp nbexec64.exe ../../../nbbuild/netbeans/platform/lib/
+- cp nbexec64.dll ../../../nbbuild/netbeans/platform/lib/
++ x86_64-w64-mingw32-windres -Ocoff nbexec_exe.rc nbexec_exe64.res
++ x86_64-w64-mingw32-g++ -m64 -s -DNBEXEC_DLL=\"nbexec64.dll\" -static-libgcc -static-libstdc++ nbexecexe.cpp utilsfuncs.cpp nbexec_exe64.res -o nbexec64.exe
+
+
+
+@@ -46,7 +42,7 @@ clean: .clean-post-$(CONF)
+ # Add your pre 'clean' code here...
+
+ .clean-post-nbexec: .clean-impl
+- rm -f nbexec_exe32.res nbexec32.exe
++ rm -f nbexec_exe32.res nbexec.exe
+
+ .clean-post-nbexec64: .clean-impl
+ rm -f nbexec_exe64.res nbexec64.exe
+diff --git a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
+index 7b5163b..961e7dc 100644
+--- a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
++++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
+@@ -13,12 +13,12 @@ CP=cp
+ GREP=grep
+ NM=nm
+ CCADMIN=CCadmin
+-RANLIB=ranlib
+-CC=gcc
+-CCC=g++
+-CXX=g++
+-FC=gfortran
+-AS=as
++RANLIB=i686-w64-mingw32-ranlib
++CC=
++CCC=i686-w64-mingw32-g++
++CXX=i686-w64-mingw32-g++
++FC=
++AS=i686-w64-mingw32-as
+
+ # Macros
+ CND_PLATFORM=Cygwin-Windows
+@@ -46,8 +46,8 @@ OBJECTFILES= \
+ CFLAGS=
+
+ # CC Compiler Flags
+-CCFLAGS=-m32 -mno-cygwin
+-CXXFLAGS=-m32 -mno-cygwin
++CCFLAGS=-m32
++CXXFLAGS=-m32
+
+ # Fortran Compiler Flags
+ FFLAGS=
+@@ -65,22 +65,22 @@ LDLIBSOPTIONS=${OBJECTDIR}/nbexec.res
+ nbexec.dll: ${OBJECTDIR}/nbexec.res
+
+ nbexec.dll: ${OBJECTFILES}
+- ${LINK.cc} -o nbexec.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -mno-cygwin -shared
++ ${LINK.cc} -o nbexec.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -shared
+
+ ${OBJECTDIR}/jvmlauncher.o: jvmlauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
++ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
+
+ ${OBJECTDIR}/nbexec.o: nbexec.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexec.o nbexec.cpp
++ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexec.o nbexec.cpp
+
+ ${OBJECTDIR}/nbexec.res: nbexec.rc version.h
+ ${MKDIR} -p ${OBJECTDIR}
+ @echo Compiling Resource files...
+- windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res
++ i686-w64-mingw32-windres -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res
+
+ : nbexec_exe.rc
+ @echo
+@@ -89,17 +89,17 @@ ${OBJECTDIR}/nbexec.res: nbexec.rc version.h
+ ${OBJECTDIR}/nbexecexe.o: nbexecexe.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
++ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
+
+ ${OBJECTDIR}/platformlauncher.o: platformlauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
++ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
+
+ ${OBJECTDIR}/utilsfuncs.o: utilsfuncs.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
++ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
+
+ # Subprojects
+ .build-subprojects:
+diff --git a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
+index 7fb819e..485127e 100644
+--- a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
++++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
+@@ -13,12 +13,12 @@ CP=cp
+ GREP=grep
+ NM=nm
+ CCADMIN=CCadmin
+-RANLIB=ranlib
+-CC=x86_64-w64-mingw32-gcc
++RANLIB=x86_64-w64-mingw32-ranlib
++CC=
+ CCC=x86_64-w64-mingw32-g++
+ CXX=x86_64-w64-mingw32-g++
+-FC=gfortran
+-AS=as
++FC=
++AS=x86_64-w64-mingw32-as
+
+ # Macros
+ CND_PLATFORM=Cygwin64-Windows
+@@ -46,8 +46,8 @@ OBJECTFILES= \
+ CFLAGS=
+
+ # CC Compiler Flags
+-CCFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
+-CXXFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
++CCFLAGS=-m64 -static-libgcc -static-libstdc++
++CXXFLAGS=-m64 -static-libgcc -static-libstdc++
+
+ # Fortran Compiler Flags
+ FFLAGS=
+@@ -65,22 +65,22 @@ LDLIBSOPTIONS=${OBJECTDIR}/nbexec64.res
+ nbexec64.dll: ${OBJECTDIR}/nbexec64.res
+
+ nbexec64.dll: ${OBJECTFILES}
+- ${LINK.cc} -o nbexec64.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -mno-cygwin -shared
++ ${LINK.cc} -o nbexec64.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -shared
+
+ ${OBJECTDIR}/jvmlauncher.o: jvmlauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
++ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
+
+ ${OBJECTDIR}/nbexec.o: nbexec.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexec.o nbexec.cpp
++ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexec.o nbexec.cpp
+
+ ${OBJECTDIR}/nbexec64.res: nbexec.rc version.h
+ ${MKDIR} -p ${OBJECTDIR}
+ @echo Compiling Resource files...
+- x86_64-w64-mingw32-windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec64.res
++ x86_64-w64-mingw32-windres -Ocoff nbexec.rc ${OBJECTDIR}/nbexec64.res
+
+ : nbexec_exe.rc
+ @echo
+@@ -89,17 +89,17 @@ ${OBJECTDIR}/nbexec64.res: nbexec.rc version.h
+ ${OBJECTDIR}/nbexecexe.o: nbexecexe.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
++ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
+
+ ${OBJECTDIR}/platformlauncher.o: platformlauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
++ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
+
+ ${OBJECTDIR}/utilsfuncs.o: utilsfuncs.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+- $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
++ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/usr/lib/jvm/default-java/include -MMD -MP -MF $@.d -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
+
+ # Subprojects
+ .build-subprojects:
+diff --git a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp b/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+index 21f947f..0193220 100644
+--- a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
++++ b/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+@@ -52,6 +52,7 @@
+ #include "argnames.h"
+ #include <tlhelp32.h>
+ #include <windows.h>
++#include <stdio.h>
+
+ using namespace std;
+
diff --git a/debian/patches/osgi-update.patch b/debian/patches/osgi-update.patch
index 39a40d0..d429140 100644
--- a/debian/patches/osgi-update.patch
+++ b/debian/patches/osgi-update.patch
@@ -13,7 +13,7 @@ Forwarded: not-needed
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java b/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
-index 8d71aef..0d8aa8b 100644
+index d97a2cd..37846b0 100644
--- a/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
+++ b/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
@@ -128,7 +128,7 @@ final class JarBundleFile extends BundleFile implements BundleContent {
@@ -26,7 +26,7 @@ index 8d71aef..0d8aa8b 100644
} catch (IOException dirEx) {
NetbinoxFactory.LOG.log(Level.WARNING,
diff --git a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
-index 64bfcd4..83e49ff 100644
+index 89c1357..77a70d3 100644
--- a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
+++ b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
@@ -61,6 +61,8 @@ import org.osgi.framework.InvalidSyntaxException;
diff --git a/debian/patches/series b/debian/patches/series
index 12ee765..3c0b466 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,12 @@
+netbeans-platform-nbi.patch
+netbeans-platform-nojnabinaries.patch
+netbeans-platform-properties.patch
+osgi-update.patch
+netbeans-platform-jemmy.patch
netbeans-platform-empty-binaries-list.patch
+netbeans-platform-windowslauncher.patch
netbeans-platform-disable-net.java-modules.patch
netbeans-platform-junitlib.patch
-netbeans-platform-nbi.patch
netbeans-platform-o.n.html.ko4j.patch
-netbeans-platform-jemmy.patch
-netbeans-platform-properties.patch
-osgi-update.patch
-netbeans-platform-nojnabinaries.patch
-netbeans-platform-disable-xhr4j-module.patch
+gcc-6-ftbfs.patch
+jna-4.4.0-compatibility.patch
diff --git a/debian/pom/openide-modules.xml b/debian/pom/openide-modules.xml
index 5b99975..840234e 100644
--- a/debian/pom/openide-modules.xml
+++ b/debian/pom/openide-modules.xml
@@ -5,17 +5,17 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-modules</artifactId>
- <version>8.2</version>
+ <version>8.1</version>
<dependencies>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util</artifactId>
- <version>8.2</version>
+ <version>8.1</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
- <version>8.2</version>
+ <version>8.1</version>
</dependency>
</dependencies>
</project>
diff --git a/debian/pom/openide-util-lookup.xml b/debian/pom/openide-util-lookup.xml
index e517ed1..5b65161 100644
--- a/debian/pom/openide-util-lookup.xml
+++ b/debian/pom/openide-util-lookup.xml
@@ -5,5 +5,5 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
- <version>8.2</version>
+ <version>8.1</version>
</project>
diff --git a/debian/pom/openide-util-ui.xml b/debian/pom/openide-util-ui.xml
index 4152ed6..21a5c94 100644
--- a/debian/pom/openide-util-ui.xml
+++ b/debian/pom/openide-util-ui.xml
@@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-ui</artifactId>
- <version>8.2</version>
+ <version>8.1</version>
<dependencies>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
- <version>8.2</version>
+ <version>8.1</version>
</dependency>
</dependencies>
</project>
diff --git a/debian/pom/openide-util.xml b/debian/pom/openide-util.xml
index fac6833..ca92155 100644
--- a/debian/pom/openide-util.xml
+++ b/debian/pom/openide-util.xml
@@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util</artifactId>
- <version>8.2</version>
+ <version>8.1</version>
<dependencies>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
- <version>8.2</version>
+ <version>8.1</version>
</dependency>
</dependencies>
</project>
diff --git a/debian/rules b/debian/rules
index 8e80ccb..bdf05d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,11 +56,14 @@ override_dh_auto_build:
ln -sf /usr/share/xml/w3c-sgml-lib/schema/dtd/REC-xhtml-modularization-20100729/xhtml* nbbuild/external/xhtml1-dtds
# link Debian's system jars
$(shell awk 'NF==4 {printf("ln -sf %s %s/%s;\n",$$1,$$2,$$4)}' debian/linked-jars)
- # Build fake windows binaries
- touch o.n.bootstrap/launcher/windows/nbexec64.exe
- touch o.n.bootstrap/launcher/windows/nbexec64.dll
- touch o.n.bootstrap/launcher/windows/nbexec.exe
- touch o.n.bootstrap/launcher/windows/nbexec.dll
+ ################################################################
+ # Build the Windows launcher
+ mkdir -p nbbuild/netbeans/platform/lib
+ cd o.n.bootstrap/launcher/windows && LDFLAGS="" CONF="nbexec" make -e
+ cd o.n.bootstrap/launcher/windows && LDFLAGS="" CONF="nbexec64" make -e
+ cd apisupport.harness/windows-launcher-src && LDFLAGS="" CONF="app.exe" make -e
+ cd apisupport.harness/windows-launcher-src && LDFLAGS="" CONF="app64.exe" make -e
+ ################################################################
# Build the platform. DISPLAY must be unset to avoid build failures.
unset DISPLAY; ant \
-Dbuildstamp=$(BUILDSTAMP) \
@@ -75,9 +78,9 @@ override_dh_auto_build:
# Build javadoc package
# Fix privacy breach logo and generic first
grep -rl "netbeans.org/favicon.ico" nbbuild/javadoctools/ | xargs sed -i \
- 's|href="http://www.netbeans.org/favicon.ico"||g' || true
+ 's|href="http://www.netbeans.org/favicon.ico"||g'
grep -rl "NetBeansPlatformForBeginners.jpg" openide*/ | xargs sed -i \
- 's|http://wiki.apidesign.org/images/0/03/NetBeansPlatformForBeginners.jpg||g' || true
+ 's|http://wiki.apidesign.org/images/0/03/NetBeansPlatformForBeginners.jpg||g'
ant \
-Dpermit.jdk8.builds=true \
-Dbuild.compiler.deprecation=false \
@@ -141,16 +144,16 @@ override_dh_auto_clean:
$(call symlink, $(JAVADIR)/$(JH_JAR), javahelp/external/$(NB_JH_JAR))
$(call symlink, $(JAVADIR)/$(JSEARCH_JAR), apisupport.harness/external/$(NB_JSEARCH_JAR))
ant -Dpermit.jdk8.builds=true -f nbbuild/build.xml clean
+ cd o.n.bootstrap/launcher/windows && CONF="nbexec" make -e clean
+ cd o.n.bootstrap/launcher/windows && CONF="nbexec64" make -e clean
+ cd apisupport.harness/windows-launcher-src && CONF="app.exe" make -e clean
+ cd apisupport.harness/windows-launcher-src && CONF="app64.exe" make -e clean
mh_clean
# remove all the symlinks to jar files we created
find . -name "*.jar" -type l -delete
$(RM) -r nbbuild/external/xhtml1-dtds
$(RM) nbbuild/nbproject/private/scan-cache-standard.ser
- $(RM) o.n.bootstrap/launcher/windows/nbexec64.exe
- $(RM) o.n.bootstrap/launcher/windows/nbexec64.dll
- $(RM) o.n.bootstrap/launcher/windows/nbexec.exe
- $(RM) o.n.bootstrap/launcher/windows/nbexec.dll
- $(RM) openide.*/arch.xml
+ $(RM) o.n.bootstrap/launcher/windows/nbexec_exe.res
override_jh_depends:
# Skipping jh_depends run - since we use symlinks to /usr/share/java then
diff --git a/editor.mimelookup.impl/arch.xml b/editor.mimelookup.impl/arch.xml
index 4b982c9..dda289c 100644
--- a/editor.mimelookup.impl/arch.xml
+++ b/editor.mimelookup.impl/arch.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
@@ -54,8 +15,8 @@ Contributor(s):
<question id="arch-what" when="init">
What is this project good for?
<hint>
- Please provide here a few lines describing the project,
- what problem it should solve, provide links to documentation,
+ Please provide here a few lines describing the project,
+ what problem it should solve, provide links to documentation,
specifications, etc.
</hint>
</question>
@@ -65,11 +26,11 @@ Contributor(s):
data from the folder hierarchy underneath the Editor/ folder on the system
filesystem.
</answer>
-
-
+
+
<!--
<question id="arch-overall" when="init">
- Describe the overall architecture.
+ Describe the overall architecture.
<hint>
What will be API for
<a href="http://openide.netbeans.org/tutorial/api-design.html#design.apiandspi">
diff --git a/editor.mimelookup.impl/manifest.mf b/editor.mimelookup.impl/manifest.mf
index f4e8216..f45f9e8 100644
--- a/editor.mimelookup.impl/manifest.mf
+++ b/editor.mimelookup.impl/manifest.mf
@@ -2,4 +2,4 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.editor.mimelookup.impl/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/mimelookup/impl/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.spi.editor.mimelookup.MimeDataProvider
-OpenIDE-Module-Specification-Version: 1.32.1
+OpenIDE-Module-Specification-Version: 1.31.1
diff --git a/editor.mimelookup/arch.xml b/editor.mimelookup/arch.xml
index 7a1d49c..515c01b 100644
--- a/editor.mimelookup/arch.xml
+++ b/editor.mimelookup/arch.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
@@ -54,16 +15,16 @@ Contributor(s):
<question id="arch-what" when="init">
What is this project good for?
<hint>
- Please provide here a few lines describing the project,
- what problem it should solve, provide links to documentation,
+ Please provide here a few lines describing the project,
+ what problem it should solve, provide links to documentation,
specifications, etc.
</hint>
</question>
-->
<answer id="arch-what">
-Each editor provides an EditorKit which controls the policy of specific MIME content type.
-The policy of content type should be easily registered and found via some lookup mechanism,
-that will provide convenient way of using it either for kit provider or base
+Each editor provides an EditorKit which controls the policy of specific MIME content type.
+The policy of content type should be easily registered and found via some lookup mechanism,
+that will provide convenient way of using it either for kit provider or base
editor infrastructure. In addition to this, the policy can be inherited, (e.g. in case of embeded
kits like JSP) and the content types need to be merged in this case. MIME Lookup API should
provide all mentioned requierements via easy lookup query, so content type policy
diff --git a/editor.mimelookup/manifest.mf b/editor.mimelookup/manifest.mf
index 45862f0..a14cbda 100644
--- a/editor.mimelookup/manifest.mf
+++ b/editor.mimelookup/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.editor.mimelookup/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/mimelookup/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.40.1
+OpenIDE-Module-Specification-Version: 1.39.1
OpenIDE-Module-Recommends: org.netbeans.spi.editor.mimelookup.MimeDataProvider
AutoUpdate-Essential-Module: true
diff --git a/editor.mimelookup/nbproject/org-netbeans-modules-editor-mimelookup.sig b/editor.mimelookup/nbproject/org-netbeans-modules-editor-mimelookup.sig
index 6aa8fa0..30cc3ae 100644
--- a/editor.mimelookup/nbproject/org-netbeans-modules-editor-mimelookup.sig
+++ b/editor.mimelookup/nbproject/org-netbeans-modules-editor-mimelookup.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.39.1
+#Version 1.36
CLSS public abstract interface !annotation java.lang.Deprecated
anno 0 java.lang.annotation.Documented()
@@ -55,7 +55,7 @@ meth public static org.netbeans.api.editor.mimelookup.MimeLookup getMimeLookup(j
meth public static org.openide.util.Lookup getLookup(java.lang.String)
meth public static org.openide.util.Lookup getLookup(org.netbeans.api.editor.mimelookup.MimePath)
supr org.openide.util.Lookup
-hfds mimePath,mimePathLookup
+hfds mimePathLookup
CLSS public final org.netbeans.api.editor.mimelookup.MimePath
fld public final static org.netbeans.api.editor.mimelookup.MimePath EMPTY
@@ -73,7 +73,6 @@ meth public static org.netbeans.api.editor.mimelookup.MimePath get(org.netbeans.
meth public static org.netbeans.api.editor.mimelookup.MimePath parse(java.lang.String)
supr java.lang.Object
hfds LOCK,LOOKUP_LOCK,LRU,MAX_LRU_SIZE,REG_NAME_PATTERN,WELL_KNOWN_TYPES,lookup,mimePaths,mimeType,mimeType2mimePathRef,path,string2mimePath
-hcls AccessorImpl
CLSS public abstract interface !annotation org.netbeans.api.editor.mimelookup.MimeRegistration
anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
@@ -128,6 +127,6 @@ meth public abstract <%0 extends java.lang.Object> org.openide.util.Lookup$Resul
meth public abstract <%0 extends java.lang.Object> {%%0} lookup(java.lang.Class<{%%0}>)
meth public static org.openide.util.Lookup getDefault()
supr java.lang.Object
-hfds LOG,defaultLookup,defaultLookupProvider
+hfds LOG,defaultLookup
hcls DefLookup,Empty
diff --git a/editor.mimelookup/src/org/netbeans/spi/editor/mimelookup/package.html b/editor.mimelookup/src/org/netbeans/spi/editor/mimelookup/package.html
index 03de556..a5b7e56 100644
--- a/editor.mimelookup/src/org/netbeans/spi/editor/mimelookup/package.html
+++ b/editor.mimelookup/src/org/netbeans/spi/editor/mimelookup/package.html
@@ -2,10 +2,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -17,14 +15,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -35,8 +39,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
diff --git a/favorites/manifest.mf b/favorites/manifest.mf
index d85928b..dab0815 100644
--- a/favorites/manifest.mf
+++ b/favorites/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.favorites/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/favorites/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.46.1
+OpenIDE-Module-Specification-Version: 1.45.1
OpenIDE-Module-Layer: org/netbeans/modules/favorites/resources/layer.xml
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
diff --git a/favorites/nbproject/project.xml b/favorites/nbproject/project.xml
index 8a7ef28..a9b3711 100644
--- a/favorites/nbproject/project.xml
+++ b/favorites/nbproject/project.xml
@@ -165,8 +165,8 @@ made subject to such option by the copyright holder.
<test-dependency>
<code-name-base>org.netbeans.core.startup</code-name-base>
<recursive/>
- <compile-dependency/>
- </test-dependency>
+ <compile-dependency/>
+ </test-dependency>
<test-dependency>
<code-name-base>org.netbeans.libs.junit4</code-name-base>
<compile-dependency/>
@@ -265,7 +265,7 @@ made subject to such option by the copyright holder.
</test-type>
</test-dependencies>
<friend-packages>
- <friend>org.netbeans.modules.cnd.remote.ui</friend>
+ <friend>org.netbeans.modules.cnd.remote</friend>
<friend>org.netbeans.modules.remotefs.versioning.api</friend>
<friend>org.netbeans.modules.team.ide</friend>
<friend>org.netbeans.modules.versioning.util</friend>
diff --git a/ide/launcher/netbeans.conf b/ide/launcher/netbeans.conf
index bfbd507..3cdd3dc 100644
--- a/ide/launcher/netbeans.conf
+++ b/ide/launcher/netbeans.conf
@@ -28,8 +28,8 @@
# Cachedir must be different from userdir. The same cachedir and userdir
# would cause problems.
#
-netbeans_default_userdir="${DEFAULT_USERDIR_ROOT}/8.2"
-netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/8.2"
+netbeans_default_userdir="${DEFAULT_USERDIR_ROOT}/8.1"
+netbeans_default_cachedir="${DEFAULT_CACHEDIR_ROOT}/8.1"
# Options used by NetBeans launcher by default:
# (can be overridden by explicit command line switches)
diff --git a/ide/launcher/unix/netbeans b/ide/launcher/unix/netbeans
index 458e7eb..8218c36 100644
--- a/ide/launcher/unix/netbeans
+++ b/ide/launcher/unix/netbeans
@@ -1,7 +1,7 @@
#!/bin/sh
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
@@ -68,6 +68,8 @@ case "`uname`" in
# set default userdir and cachedir on Mac OS X
DEFAULT_USERDIR_ROOT="${HOME}/Library/Application Support/NetBeans"
DEFAULT_CACHEDIR_ROOT=${HOME}/Library/Caches/NetBeans
+ # set DYLD_LIBRARY_PATH
+ export DYLD_LIBRARY_PATH="$basedir"/webcommon/bin:${DYLD_LIBRARY_PATH}
;;
*)
# set default userdir and cachedir on unix systems
@@ -185,6 +187,18 @@ EOF
netbeans_default_options="-J-Xmx${max_heap_size}m ${netbeans_default_options}"
fi
+if grep -v -- "-J-XX:MaxPermSize" >/dev/null <<EOF ; then
+${netbeans_default_options}
+EOF
+ netbeans_default_options="-L-XX:MaxPermSize=384m ${netbeans_default_options}"
+fi
+
+if grep -v -- "-J-XX:PermSize" >/dev/null <<EOF ; then
+${netbeans_default_options}
+EOF
+ netbeans_default_options="-L-XX:PermSize=32m ${netbeans_default_options}"
+fi
+
launchNbexec() {
nbexec=`grep -v "^#" "$basedir"/etc/netbeans.clusters | grep -v "^$" | grep platform | while read X; do
if expr "$X" : "/.*" >/dev/null; then
@@ -216,6 +230,7 @@ case "`uname`" in
Darwin*)
eval launchNbexec \
--jdkhome '"$netbeans_jdkhome"' \
+ -J-Dcom.apple.mrj.application.apple.menu.about.name=NetBeans \
-J-Xdock:name=NetBeans \
'"-J-Xdock:icon=$basedir/nb/netbeans.icns"' \
--branding nb \
diff --git a/ide/launcher/windows/Makefile b/ide/launcher/windows/Makefile
index 975af04..f3db39d 100644
--- a/ide/launcher/windows/Makefile
+++ b/ide/launcher/windows/Makefile
@@ -1,41 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 2004, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-
# Main targets can be executed directly, and they are:
#
# build build a specific configuration
diff --git a/ide/launcher/windows/cmdargs.h b/ide/launcher/windows/cmdargs.h
index ab4bf06..5c81527 100644
--- a/ide/launcher/windows/cmdargs.h
+++ b/ide/launcher/windows/cmdargs.h
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -40,8 +40,7 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- */
- /*
+ *
* Author: Tomas Holy
*/
diff --git a/ide/launcher/windows/nblauncher.cpp b/ide/launcher/windows/nblauncher.cpp
index b601ca3..97c15ba 100644
--- a/ide/launcher/windows/nblauncher.cpp
+++ b/ide/launcher/windows/nblauncher.cpp
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -40,8 +40,7 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- */
- /*
+ *
* Author: Tomas Holy
*/
@@ -551,6 +550,27 @@ void NbLauncher::adjustHeapAndPermGenSize() {
logMsg("Memory settings: -J-Xmx%dm", memory);
nbOptions += tmp;
}
+ // -XX:MaxPermSize and -XX:PermSize are passed to nbexec as
+ // launcher options, to apply them only for JDK 7. JDK 8 and
+ // newer do not support these arguments.
+ if (nbOptions.find("-J-XX:MaxPermSize") == string::npos) {
+ int memory;
+ if (areWeOn32bits())
+ memory = 256;
+ else
+ memory = 384;
+ char tmp[32];
+ logMsg("Memory settings: -L-XX:MaxPermSize=%dm", memory);
+ snprintf(tmp, 32, " -L-XX:MaxPermSize=%dm", memory);
+ nbOptions += tmp;
+ }
+ if (nbOptions.find("-J-XX:PermSize") == string::npos) {
+ int memory = 32;
+ char tmp[32];
+ logMsg("Memory settings: -L-XX:PermSize=%dm", memory);
+ snprintf(tmp, 32, " -L-XX:PermSize=%dm", memory);
+ nbOptions += tmp;
+ }
}
const char * NbLauncher::getAppName() {
diff --git a/ide/launcher/windows/nblauncher.h b/ide/launcher/windows/nblauncher.h
index 99ae03b..4d8a3b8 100644
--- a/ide/launcher/windows/nblauncher.h
+++ b/ide/launcher/windows/nblauncher.h
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -40,8 +40,7 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- */
- /*
+ *
* Author: Tomas Holy
*/
diff --git a/ide/launcher/windows/nbproject/Makefile-impl.mk b/ide/launcher/windows/nbproject/Makefile-impl.mk
new file mode 100644
index 0000000..969e0cc
--- /dev/null
+++ b/ide/launcher/windows/nbproject/Makefile-impl.mk
@@ -0,0 +1,133 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a pre- and a post- target defined where you can add customization code.
+#
+# This makefile implements macros and targets common to all configurations.
+#
+# NOCDDL
+
+
+# Building and Cleaning subprojects are done by default, but can be controlled with the SUB
+# macro. If SUB=no, subprojects will not be built or cleaned. The following macro
+# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf
+# and .clean-reqprojects-conf unless SUB has the value 'no'
+SUB_no=NO
+SUBPROJECTS=${SUB_${SUB}}
+BUILD_SUBPROJECTS_=.build-subprojects
+BUILD_SUBPROJECTS_NO=
+BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}}
+CLEAN_SUBPROJECTS_=.clean-subprojects
+CLEAN_SUBPROJECTS_NO=
+CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
+
+
+# Project Name
+PROJECTNAME=windows
+
+# Active Configuration
+DEFAULTCONF=netbeans.exe
+CONF=${DEFAULTCONF}
+
+# All Configurations
+ALLCONFS=netbeans.exe netbeans64.exe
+
+
+# build
+.build-impl: .build-pre .validate-impl .depcheck-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .build-conf
+
+
+# clean
+.clean-impl: .clean-pre .validate-impl .depcheck-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .clean-conf
+
+
+# clobber
+.clobber-impl: .clobber-pre .depcheck-impl
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ "${MAKE}" -f nbproject/Makefile-$${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .clean-conf; \
+ done
+
+# all
+.all-impl: .all-pre .depcheck-impl
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ "${MAKE}" -f nbproject/Makefile-$${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .build-conf; \
+ done
+
+# build tests
+.build-tests-impl: .build-impl .build-tests-pre
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-tests-conf
+
+# run tests
+.test-impl: .build-tests-impl .test-pre
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .test-conf
+
+# dependency checking support
+.depcheck-impl:
+ @echo "# This code depends on make tool being used" >.dep.inc
+ @if [ -n "${MAKE_VERSION}" ]; then \
+ echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES}))" >>.dep.inc; \
+ echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \
+ echo "include \$${DEPFILES}" >>.dep.inc; \
+ echo "endif" >>.dep.inc; \
+ else \
+ echo ".KEEP_STATE:" >>.dep.inc; \
+ echo ".KEEP_STATE_FILE:.make.state.\$${CONF}" >>.dep.inc; \
+ fi
+
+# configuration validation
+.validate-impl:
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ echo ""; \
+ echo "Error: can not find the makefile for configuration '${CONF}' in project ${PROJECTNAME}"; \
+ echo "See 'make help' for details."; \
+ echo "Current directory: " `pwd`; \
+ echo ""; \
+ fi
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ exit 1; \
+ fi
+
+
+# help
+.help-impl: .help-pre
+ @echo "This makefile supports the following configurations:"
+ @echo " ${ALLCONFS}"
+ @echo ""
+ @echo "and the following targets:"
+ @echo " build (default target)"
+ @echo " clean"
+ @echo " clobber"
+ @echo " all"
+ @echo " help"
+ @echo ""
+ @echo "Makefile Usage:"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] build"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] clean"
+ @echo " make [SUB=no] clobber"
+ @echo " make [SUB=no] all"
+ @echo " make help"
+ @echo ""
+ @echo "Target 'build' will build a specific configuration and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'clean' will clean a specific configuration and, unless 'SUB=no',"
+ @echo " also clean subprojects."
+ @echo "Target 'clobber' will remove all built files from all configurations and,"
+ @echo " unless 'SUB=no', also from subprojects."
+ @echo "Target 'all' will will build all configurations and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'help' prints this message."
+ @echo ""
+
diff --git a/ide/launcher/windows/nbproject/Makefile-netbeans.exe.mk b/ide/launcher/windows/nbproject/Makefile-netbeans.exe.mk
new file mode 100644
index 0000000..00d2009
--- /dev/null
+++ b/ide/launcher/windows/nbproject/Makefile-netbeans.exe.mk
@@ -0,0 +1,95 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add customized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+GREP=grep
+NM=nm
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc
+CCC=g++
+CXX=g++
+FC=gfortran
+AS=as
+
+# Macros
+CND_PLATFORM=Cygwin-Windows
+CND_DLIB_EXT=dll
+CND_CONF=netbeans.exe
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/1413142467/utilsfuncs.o \
+ ${OBJECTDIR}/nblauncher.o \
+ ${OBJECTDIR}/netbeans.o
+
+
+# C Compiler Flags
+CFLAGS=
+
+# CC Compiler Flags
+CCFLAGS=-m32 -mno-cygwin
+CXXFLAGS=-m32 -mno-cygwin
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Assembler Flags
+ASFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=netbeans.res
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS}
+ "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk netbeans.exe
+
+netbeans.exe: ${OBJECTFILES}
+ ${LINK.cc} -o netbeans.exe ${OBJECTFILES} ${LDLIBSOPTIONS} -mwindows -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh
+
+${OBJECTDIR}/_ext/1413142467/utilsfuncs.o: ../../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+ ${MKDIR} -p ${OBJECTDIR}/_ext/1413142467
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1413142467/utilsfuncs.o ../../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+
+${OBJECTDIR}/nblauncher.o: nblauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nblauncher.o nblauncher.cpp
+
+${OBJECTDIR}/netbeans.o: netbeans.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DARCHITECTURE=32 -DNBEXEC_DLL=\"/lib/nbexec.dll\" -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/netbeans.o netbeans.cpp
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf: ${CLEAN_SUBPROJECTS}
+ ${RM} -r ${CND_BUILDDIR}/${CND_CONF}
+ ${RM} netbeans.exe
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.dep.inc: .depcheck-impl
+
+include .dep.inc
diff --git a/ide/launcher/windows/nbproject/Makefile-netbeans64.exe.mk b/ide/launcher/windows/nbproject/Makefile-netbeans64.exe.mk
new file mode 100644
index 0000000..436ca7d
--- /dev/null
+++ b/ide/launcher/windows/nbproject/Makefile-netbeans64.exe.mk
@@ -0,0 +1,95 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add customized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+GREP=grep
+NM=nm
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=x86_64-w64-mingw32-gcc
+CCC=x86_64-w64-mingw32-g++
+CXX=x86_64-w64-mingw32-g++
+FC=gfortran
+AS=as
+
+# Macros
+CND_PLATFORM=Cygwin64-Windows
+CND_DLIB_EXT=dll
+CND_CONF=netbeans64.exe
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/1413142467/utilsfuncs.o \
+ ${OBJECTDIR}/nblauncher.o \
+ ${OBJECTDIR}/netbeans.o
+
+
+# C Compiler Flags
+CFLAGS=
+
+# CC Compiler Flags
+CCFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
+CXXFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Assembler Flags
+ASFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=netbeans64.res
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS}
+ "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk netbeans64.exe
+
+netbeans64.exe: ${OBJECTFILES}
+ ${LINK.cc} -o netbeans64.exe ${OBJECTFILES} ${LDLIBSOPTIONS} -mwindows -Wl,--nxcompat -Wl,--dynamicbase
+
+${OBJECTDIR}/_ext/1413142467/utilsfuncs.o: ../../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+ ${MKDIR} -p ${OBJECTDIR}/_ext/1413142467
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/_ext/1413142467/utilsfuncs.o ../../../o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+
+${OBJECTDIR}/nblauncher.o: nblauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nblauncher.o nblauncher.cpp
+
+${OBJECTDIR}/netbeans.o: netbeans.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DARCHITECTURE=64 -DNBEXEC_DLL=\"/lib/nbexec64.dll\" -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/netbeans.o netbeans.cpp
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf: ${CLEAN_SUBPROJECTS}
+ ${RM} -r ${CND_BUILDDIR}/${CND_CONF}
+ ${RM} netbeans64.exe
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.dep.inc: .depcheck-impl
+
+include .dep.inc
diff --git a/ide/launcher/windows/nbproject/Makefile-variables.mk b/ide/launcher/windows/nbproject/Makefile-variables.mk
new file mode 100644
index 0000000..bc5fd46
--- /dev/null
+++ b/ide/launcher/windows/nbproject/Makefile-variables.mk
@@ -0,0 +1,35 @@
+#
+# Generated - do not edit!
+#
+# NOCDDL
+#
+CND_BASEDIR=`pwd`
+CND_BUILDDIR=build
+CND_DISTDIR=dist
+# netbeans.exe configuration
+CND_PLATFORM_netbeans.exe=Cygwin-Windows
+CND_ARTIFACT_DIR_netbeans.exe=
+CND_ARTIFACT_NAME_netbeans.exe=netbeans.exe
+CND_ARTIFACT_PATH_netbeans.exe=netbeans.exe
+CND_PACKAGE_DIR_netbeans.exe=dist/netbeans.exe/Cygwin-Windows/package
+CND_PACKAGE_NAME_netbeans.exe=windows.tar
+CND_PACKAGE_PATH_netbeans.exe=dist/netbeans.exe/Cygwin-Windows/package/windows.tar
+# netbeans64.exe configuration
+CND_PLATFORM_netbeans64.exe=Cygwin64-Windows
+CND_ARTIFACT_DIR_netbeans64.exe=
+CND_ARTIFACT_NAME_netbeans64.exe=netbeans64.exe
+CND_ARTIFACT_PATH_netbeans64.exe=netbeans64.exe
+CND_PACKAGE_DIR_netbeans64.exe=dist/netbeans64.exe/Cygwin64-Windows/package
+CND_PACKAGE_NAME_netbeans64.exe=windows.tar
+CND_PACKAGE_PATH_netbeans64.exe=dist/netbeans64.exe/Cygwin64-Windows/package/windows.tar
+#
+# include compiler specific variables
+#
+# dmake command
+ROOT:sh = test -f nbproject/private/Makefile-variables.mk || \
+ (mkdir -p nbproject/private && touch nbproject/private/Makefile-variables.mk)
+#
+# gmake command
+.PHONY: $(shell test -f nbproject/private/Makefile-variables.mk || (mkdir -p nbproject/private && touch nbproject/private/Makefile-variables.mk))
+#
+include nbproject/private/Makefile-variables.mk
diff --git a/ide/launcher/windows/nbproject/Package-netbeans.exe.bash b/ide/launcher/windows/nbproject/Package-netbeans.exe.bash
new file mode 100644
index 0000000..a830aeb
--- /dev/null
+++ b/ide/launcher/windows/nbproject/Package-netbeans.exe.bash
@@ -0,0 +1,76 @@
+#!/bin/bash -x
+
+#
+# Generated - do not edit!
+#
+
+# Macros
+TOP=`pwd`
+CND_PLATFORM=Cygwin-Windows
+CND_CONF=netbeans.exe
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+CND_DLIB_EXT=dll
+NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
+TMPDIRNAME=tmp-packaging
+OUTPUT_PATH=netbeans.exe
+OUTPUT_BASENAME=netbeans.exe
+PACKAGE_TOP_DIR=windows/
+
+# Functions
+function checkReturnCode
+{
+ rc=$?
+ if [ $rc != 0 ]
+ then
+ exit $rc
+ fi
+}
+function makeDirectory
+# $1 directory path
+# $2 permission (optional)
+{
+ mkdir -p "$1"
+ checkReturnCode
+ if [ "$2" != "" ]
+ then
+ chmod $2 "$1"
+ checkReturnCode
+ fi
+}
+function copyFileToTmpDir
+# $1 from-file path
+# $2 to-file path
+# $3 permission
+{
+ cp "$1" "$2"
+ checkReturnCode
+ if [ "$3" != "" ]
+ then
+ chmod $3 "$2"
+ checkReturnCode
+ fi
+}
+
+# Setup
+cd "${TOP}"
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
+rm -rf ${NBTMPDIR}
+mkdir -p ${NBTMPDIR}
+
+# Copy files and create directories and links
+cd "${TOP}"
+makeDirectory "${NBTMPDIR}/windows/bin"
+copyFileToTmpDir "${OUTPUT_PATH}.exe" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}.exe" 0755
+
+
+# Generate tar file
+cd "${TOP}"
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/windows.tar
+cd ${NBTMPDIR}
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/windows.tar *
+checkReturnCode
+
+# Cleanup
+cd "${TOP}"
+rm -rf ${NBTMPDIR}
diff --git a/ide/launcher/windows/nbproject/Package-netbeans64.exe.bash b/ide/launcher/windows/nbproject/Package-netbeans64.exe.bash
new file mode 100644
index 0000000..6924049
--- /dev/null
+++ b/ide/launcher/windows/nbproject/Package-netbeans64.exe.bash
@@ -0,0 +1,76 @@
+#!/bin/bash -x
+
+#
+# Generated - do not edit!
+#
+
+# Macros
+TOP=`pwd`
+CND_PLATFORM=Cygwin64-Windows
+CND_CONF=netbeans64.exe
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+CND_DLIB_EXT=dll
+NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
+TMPDIRNAME=tmp-packaging
+OUTPUT_PATH=netbeans64.exe
+OUTPUT_BASENAME=netbeans64.exe
+PACKAGE_TOP_DIR=windows/
+
+# Functions
+function checkReturnCode
+{
+ rc=$?
+ if [ $rc != 0 ]
+ then
+ exit $rc
+ fi
+}
+function makeDirectory
+# $1 directory path
+# $2 permission (optional)
+{
+ mkdir -p "$1"
+ checkReturnCode
+ if [ "$2" != "" ]
+ then
+ chmod $2 "$1"
+ checkReturnCode
+ fi
+}
+function copyFileToTmpDir
+# $1 from-file path
+# $2 to-file path
+# $3 permission
+{
+ cp "$1" "$2"
+ checkReturnCode
+ if [ "$3" != "" ]
+ then
+ chmod $3 "$2"
+ checkReturnCode
+ fi
+}
+
+# Setup
+cd "${TOP}"
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
+rm -rf ${NBTMPDIR}
+mkdir -p ${NBTMPDIR}
+
+# Copy files and create directories and links
+cd "${TOP}"
+makeDirectory "${NBTMPDIR}/windows/bin"
+copyFileToTmpDir "${OUTPUT_PATH}.exe" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}.exe" 0755
+
+
+# Generate tar file
+cd "${TOP}"
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/windows.tar
+cd ${NBTMPDIR}
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/windows.tar *
+checkReturnCode
+
+# Cleanup
+cd "${TOP}"
+rm -rf ${NBTMPDIR}
diff --git a/ide/launcher/windows/nbproject/configurations.xml b/ide/launcher/windows/nbproject/configurations.xml
index c3f577e5..78a785e 100644
--- a/ide/launcher/windows/nbproject/configurations.xml
+++ b/ide/launcher/windows/nbproject/configurations.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<configurationDescriptor version="94">
<logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
<logicalFolder name="HeaderFiles"
diff --git a/ide/launcher/windows/nbproject/project.properties b/ide/launcher/windows/nbproject/project.properties
index 541078c..e69de29 100644
--- a/ide/launcher/windows/nbproject/project.properties
+++ b/ide/launcher/windows/nbproject/project.properties
@@ -1,37 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
diff --git a/ide/launcher/windows/nbproject/project.xml b/ide/launcher/windows/nbproject/project.xml
index 26fc5b3..f862ae0 100644
--- a/ide/launcher/windows/nbproject/project.xml
+++ b/ide/launcher/windows/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.cnd.makeproject</type>
<configuration>
diff --git a/ide/launcher/windows/netbeans.cpp b/ide/launcher/windows/netbeans.cpp
index b873660..9b68f21 100644
--- a/ide/launcher/windows/netbeans.cpp
+++ b/ide/launcher/windows/netbeans.cpp
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -40,8 +40,7 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- */
- /*
+ *
* Author: Tomas Holy
*/
diff --git a/ide/launcher/windows/netbeans.exe.manifest b/ide/launcher/windows/netbeans.exe.manifest
index f56627c..3495319 100644
--- a/ide/launcher/windows/netbeans.exe.manifest
+++ b/ide/launcher/windows/netbeans.exe.manifest
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity version="8.2.0.0"
+<assemblyIdentity version="8.1.0.0"
processorArchitecture="x86"
name="netbeans.exe"
type="win32"/>
diff --git a/ide/launcher/windows/netbeans64.exe.manifest b/ide/launcher/windows/netbeans64.exe.manifest
index 8a7382a..747d588 100644
--- a/ide/launcher/windows/netbeans64.exe.manifest
+++ b/ide/launcher/windows/netbeans64.exe.manifest
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-<assemblyIdentity version="8.2.0.0"
+<assemblyIdentity version="8.0.0.0"
processorArchitecture="ia64"
name="netbeans64.exe"
type="win32"/>
diff --git a/ide/launcher/windows/version.h b/ide/launcher/windows/version.h
index 50bc536..c6c5e7e 100644
--- a/ide/launcher/windows/version.h
+++ b/ide/launcher/windows/version.h
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2014 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -42,10 +42,10 @@
#define COMPANY "Oracle Corporation"
#define COMPONENT "NetBeans IDE"
-#define VER "8.2.0.0"
-#define FVER 8,2,0,0
-#define BUILD_ID "04152016"
+#define VER "8.1.0.0"
+#define FVER 8,1,0,0
+#define BUILD_ID "10032014"
#define INTERNAL_NAME "netbeans"
-#define COPYRIGHT "\xA9 2007, 2016 Oracle and/or its affiliates. All rights reserved."
-#define NAME "NetBeans IDE 8.2"
+#define COPYRIGHT "\xA9 2007, 2014 Oracle and/or its affiliates. All rights reserved."
+#define NAME "NetBeans IDE 8.1"
diff --git a/ide/projectopener/build.xml b/ide/projectopener/build.xml
index 3b1bb93..d7bb496 100644
--- a/ide/projectopener/build.xml
+++ b/ide/projectopener/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
@@ -50,9 +11,9 @@ Contributor(s):
</target>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
diff --git a/ide/projectopener/master.jnlp b/ide/projectopener/master.jnlp
index 0c78f94..5914e51 100644
--- a/ide/projectopener/master.jnlp
+++ b/ide/projectopener/master.jnlp
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<jnlp spec="1.0+" codebase="${jnlp.codebase}" href="launch.jnlp">
<information>
<title>${APPLICATION.TITLE}</title>
diff --git a/ide/projectopener/nbproject/configs/JWS_generated.properties b/ide/projectopener/nbproject/configs/JWS_generated.properties
index f9dcaaa..f648a79 100644
--- a/ide/projectopener/nbproject/configs/JWS_generated.properties
+++ b/ide/projectopener/nbproject/configs/JWS_generated.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
#Wed Mar 28 14:07:54 CEST 2007
$label=Web Start
$target.debug=jws-debug
diff --git a/ide/projectopener/nbproject/project.properties b/ide/projectopener/nbproject/project.properties
index 7ac1b63..fd5916a 100644
--- a/ide/projectopener/nbproject/project.properties
+++ b/ide/projectopener/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
application.desc=Application for opening projects downloaded from web in NetBeans IDE
application.homepage=http://www.netbeans.org
application.title=NetBeans Project Opener
diff --git a/ide/projectopener/nbproject/project.xml b/ide/projectopener/nbproject/project.xml
index c080f67..9aae6cb 100644
--- a/ide/projectopener/nbproject/project.xml
+++ b/ide/projectopener/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
diff --git a/ide/projectopener/src/org/netbeans/projectopener/Bundle.properties b/ide/projectopener/src/org/netbeans/projectopener/Bundle.properties
index d958bdf..1c08164 100644
--- a/ide/projectopener/src/org/netbeans/projectopener/Bundle.properties
+++ b/ide/projectopener/src/org/netbeans/projectopener/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
#
# Properties Bundle for Web Start Project opener application
#
@@ -55,7 +18,7 @@ ERR_No_NB_Userdir_Or_Installdir=Cannot locate NetBeans userdir or install dir
ERR_No_Launcher=Cannot determine NetBeans launcher name
#NOI18N
-URL_Download_NB=http://services.netbeans.org/downloads/index.php
+URL_Download_NB=http://www.netbeans.info/downloads/index.php
# Bad Proxy dialog
BadProxyLabel=Proxy Settings were not detected correctly, please specify HTTP Proxy Settings
diff --git a/javahelp/manifest.mf b/javahelp/manifest.mf
index 4fed2bd..ccd15aa 100644
--- a/javahelp/manifest.mf
+++ b/javahelp/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.javahelp/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javahelp/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.41.1
+OpenIDE-Module-Specification-Version: 2.40.1
OpenIDE-Module-Provides: org.netbeans.api.javahelp.Help
OpenIDE-Module-Requires: org.openide.modules.InstalledFileLocator, org.openide.modules.ModuleFormat2
OpenIDE-Module-Layer: org/netbeans/modules/javahelp/resources/layer.xml
diff --git a/javahelp/src/META-INF/upgrade/Help.hint b/javahelp/src/META-INF/upgrade/Help.hint
index d3f67c4..1580e84 100644
--- a/javahelp/src/META-INF/upgrade/Help.hint
+++ b/javahelp/src/META-INF/upgrade/Help.hint
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
org.openide.util.Lookup.getDefault().lookup(org.netbeans.api.javahelp.Help.class).showHelp($c)
:: $c instanceof org.openide.util.HelpCtx
=>
diff --git a/javahelp/src/org/netbeans/api/javahelp/doc-files/api.html b/javahelp/src/org/netbeans/api/javahelp/doc-files/api.html
index 0ebae17..09d3dbd 100644
--- a/javahelp/src/org/netbeans/api/javahelp/doc-files/api.html
+++ b/javahelp/src/org/netbeans/api/javahelp/doc-files/api.html
@@ -160,25 +160,25 @@ specify a <code>HelpCtx</code> in this fashion:
<ul>
-<li> <a href="@org-openide-nodes@/org/openide/nodes/Node.html#getHelpCtx--"><code>Node.getHelpCtx()</code></a>
+<li> <a href="@org-openide-nodes@/org/openide/nodes/Node.html#getHelpCtx()"><code>Node.getHelpCtx()</code></a>
-<li> <a href="@org-openide-loaders@/org/openide/loaders/DataObject.html#getHelpCtx--"><code>DataObject.getHelpCtx()</code></a>
+<li> <a href="@org-openide-loaders@/org/openide/loaders/DataObject.html#getHelpCtx()"><code>DataObject.getHelpCtx()</code></a>
-<li> <a href="@org-openide-windows@/org/openide/windows/TopComponent.html#getHelpCtx--"><code>TopComponent.getHelpCtx()</code></a>
+<li> <a href="@org-openide-windows@/org/openide/windows/TopComponent.html#getHelpCtx()"><code>TopComponent.getHelpCtx()</code></a>
-<li> <a href="@org-openide-util-ui@/org/openide/util/actions/SystemAction.html#getHelpCtx--"><code>SystemAction.getHelpCtx()</code></a>
+<li> <a href="@org-openide-util-ui@/org/openide/util/actions/SystemAction.html#getHelpCtx()"><code>SystemAction.getHelpCtx()</code></a>
-<li> <a href="@org-openide-util-ui@/org/openide/util/datatransfer/NewType.html#getHelpCtx--"><code>NewType.getHelpCtx()</code></a>
+<li> <a href="@org-openide-util-ui@/org/openide/util/datatransfer/NewType.html#getHelpCtx()"><code>NewType.getHelpCtx()</code></a>
-<li> <a href="@org-openide-util-ui@/org/openide/util/datatransfer/PasteType.html#getHelpCtx--"><code>PasteType.getHelpCtx()</code></a>
+<li> <a href="@org-openide-util-ui@/org/openide/util/datatransfer/PasteType.html#getHelpCtx()"><code>PasteType.getHelpCtx()</code></a>
-<li> <a href="@org-openide-dialogs@/org/openide/DialogDescriptor.html#getHelpCtx--"><code>DialogDescriptor.getHelpCtx()</code></a>
+<li> <a href="@org-openide-dialogs@/org/openide/DialogDescriptor.html#getHelpCtx()"><code>DialogDescriptor.getHelpCtx()</code></a>
-<li> <a href="@org-openide-dialogs@/org/openide/WizardDescriptor.Panel.html#getHelp--"><code>WizardDescriptor.Panel.getHelpCtx()</code></a>
+<li> <a href="@org-openide-dialogs@/org/openide/WizardDescriptor.Panel.html#getHelp()"><code>WizardDescriptor.Panel.getHelpCtx()</code></a>
-<li> <a href="@org-openide-options@/org/openide/options/SystemOption.html#getHelpCtx--"><code>SystemOption.getHelpCtx()</code></a>
+<li> <a href="@org-openide-options@/org/openide/options/SystemOption.html#getHelpCtx()"><code>SystemOption.getHelpCtx()</code></a>
-<li> <a href="@org-openide-util-ui@/org/openide/ServiceType.html#getHelpCtx--"><code>ServiceType.getHelpCtx()</code></a>
+<li> <a href="@org-openide-util-ui@/org/openide/ServiceType.html#getHelpCtx()"><code>ServiceType.getHelpCtx()</code></a>
(applies equally to executors and compiler types)
@@ -191,7 +191,7 @@ specify a <code>HelpCtx</code> in this fashion:
<li> On any (Swing lightweight) component you use in a GUI, by
means of
-<a href="@org-openide-util-ui@/org/openide/util/HelpCtx.html#setHelpIDString-javax.swing.JComponent-java.lang.String-"><code>HelpCtx.setHelpIDString(...)</code></a>.
+<a href="@org-openide-util-ui@/org/openide/util/HelpCtx.html#setHelpIDString(javax.swing.JComponent,%20java.lang.String)"><code>HelpCtx.setHelpIDString(...)</code></a>.
This is especially useful for custom property editor components.
@@ -211,7 +211,7 @@ or <code>*.ser</code> files)
that uses
-<a href="@org-openide-loaders@/org/openide/loaders/InstanceSupport.html#findHelp-org.openide.cookies.InstanceCookie-"><code>InstanceSupport.findHelp(...)</code></a>.
+<a href="@org-openide-loaders@/org/openide/loaders/InstanceSupport.html#findHelp(org.openide.cookies.InstanceCookie)"><code>InstanceSupport.findHelp(...)</code></a>.
<p>This technique may also be used to add context help support to
the editor kits used in the
@@ -233,7 +233,7 @@ the <code>PropertyDescriptor</code>.
<li> As the <code>helpID</code>
-<a href="@JDK@/java/beans/FeatureDescriptor.html#getValue-java.lang.String-">value</a>
+<a href="@JDK@/java/beans/FeatureDescriptor.html#getValue(java.lang.String)">value</a>
of a
@@ -283,7 +283,7 @@ the
</pre>
<p>However for most purposes you can use the simpler
-<a href="@org-openide-util-ui@/org/openide/util/HelpCtx.html#display--"><code>HelpCtx.display</code></a>
+<a href="@org-openide-util-ui@/org/openide/util/HelpCtx.html#display()"><code>HelpCtx.display</code></a>
method and avoid a direct dependency on this API entirely:</p>
<pre>
diff --git a/javahelp/src/org/netbeans/api/javahelp/doc-files/help-guide.html b/javahelp/src/org/netbeans/api/javahelp/doc-files/help-guide.html
index fdae6e2..1b12ac1 100644
--- a/javahelp/src/org/netbeans/api/javahelp/doc-files/help-guide.html
+++ b/javahelp/src/org/netbeans/api/javahelp/doc-files/help-guide.html
@@ -182,7 +182,7 @@ provided there.</p>
help ID for a dialog. There are a couple of ways to do this:
<ul>
<li> Use one of the
- <a href="@org-openide-dialogs@/org/openide/DialogDescriptor.html#DialogDescriptor-java.lang.Object-java.lang.String-boolean-int-java.lang.Object-int-org.openide.util.HelpCtx-java.awt.event.ActionListener-"><code>DialogDescriptor</code> constructors</a>
+ <a href="@org-openide-dialogs@/org/openide/DialogDescriptor.html#DialogDescriptor(java.lang.Object,%20java.lang.String,%20boolean,%20int,%20java.lang.Object,%20int,%20org.openide.util.HelpCtx,%20java.awt.event.ActionListener)"><code>DialogDescriptor</code> constructors</a>
that includes
a <code>HelpCtx</code>.
</li>
diff --git a/javahelp/src/org/netbeans/modules/javahelp/JavaHelp.java b/javahelp/src/org/netbeans/modules/javahelp/JavaHelp.java
index 11a66fa..ba2450d 100644
--- a/javahelp/src/org/netbeans/modules/javahelp/JavaHelp.java
+++ b/javahelp/src/org/netbeans/modules/javahelp/JavaHelp.java
@@ -936,8 +936,7 @@ public final class JavaHelp extends AbstractHelp implements HelpCtx.Displayer, A
return Boolean.TRUE;
}
}
- Installer.log.log(force ? Level.INFO : Level.FINE,
- "did not find id {0}", id); //NOI18N
+ Installer.log.fine("did not find id " + id);
return Boolean.FALSE;
}
} else {
diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/helpcontext-1_0.dtd b/javahelp/src/org/netbeans/modules/javahelp/resources/helpcontext-1_0.dtd
index 3763369..6a1edb7 100644
--- a/javahelp/src/org/netbeans/modules/javahelp/resources/helpcontext-1_0.dtd
+++ b/javahelp/src/org/netbeans/modules/javahelp/resources/helpcontext-1_0.dtd
@@ -1,43 +1,4 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
-<!--
-//NetBeans//DTD Help Context 1.0//EN
http://www.netbeans.org/dtds/helpcontext-1_0.dtd
A JavaHelp help ID which could be used in a menu, etc.
diff --git a/javahelp/src/org/netbeans/modules/javahelp/resources/helpsetref-1_0.dtd b/javahelp/src/org/netbeans/modules/javahelp/resources/helpsetref-1_0.dtd
index 7bc897b..adae516 100644
--- a/javahelp/src/org/netbeans/modules/javahelp/resources/helpsetref-1_0.dtd
+++ b/javahelp/src/org/netbeans/modules/javahelp/resources/helpsetref-1_0.dtd
@@ -1,43 +1,4 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
-<!--
-//NetBeans//DTD JavaHelp Help Set Reference 1.0//EN
http://www.netbeans.org/dtds/helpsetref-1_0.dtd
Reference to a JavaHelp .hs file, optionally merged into master set.
diff --git a/jellytools.platform/build.xml b/jellytools.platform/build.xml
index e84c893..7e07c08 100644
--- a/jellytools.platform/build.xml
+++ b/jellytools.platform/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="jellytools.platform">
<description>Builds, tests, and runs the project org.netbeans.modules.jellytools.platform</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/jellytools.platform/manifest.mf b/jellytools.platform/manifest.mf
index ad46fc3..4853241 100644
--- a/jellytools.platform/manifest.mf
+++ b/jellytools.platform/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.jellytools.platform/3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jellytools/platform/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.29.1
+OpenIDE-Module-Specification-Version: 3.28.1
diff --git a/jellytools.platform/nbproject/org-netbeans-modules-jellytools-platform.sig b/jellytools.platform/nbproject/org-netbeans-modules-jellytools-platform.sig
index f74055a..350d1ff 100644
--- a/jellytools.platform/nbproject/org-netbeans-modules-jellytools-platform.sig
+++ b/jellytools.platform/nbproject/org-netbeans-modules-jellytools-platform.sig
@@ -1,11 +1,5 @@
#Signature file v4.1
-#Version 3.28.1
-
-CLSS public abstract interface !annotation java.lang.Deprecated
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE])
-intf java.lang.annotation.Annotation
+#Version 3.24
CLSS public java.lang.Object
cons public init()
@@ -21,32 +15,6 @@ meth public final void wait(long,int) throws java.lang.InterruptedException
meth public int hashCode()
meth public java.lang.String toString()
-CLSS public abstract interface java.lang.annotation.Annotation
-meth public abstract boolean equals(java.lang.Object)
-meth public abstract int hashCode()
-meth public abstract java.lang.Class<? extends java.lang.annotation.Annotation> annotationType()
-meth public abstract java.lang.String toString()
-
-CLSS public abstract interface !annotation java.lang.annotation.Documented
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-
-CLSS public abstract interface !annotation java.lang.annotation.Retention
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract java.lang.annotation.RetentionPolicy value()
-
-CLSS public abstract interface !annotation java.lang.annotation.Target
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract java.lang.annotation.ElementType[] value()
-
CLSS public abstract interface java.util.EventListener
CLSS public abstract interface javax.swing.event.ChangeListener
@@ -54,7 +22,6 @@ intf java.util.EventListener
meth public abstract void stateChanged(javax.swing.event.ChangeEvent)
CLSS public junit.framework.Assert
- anno 0 java.lang.Deprecated()
cons protected init()
meth public static java.lang.String format(java.lang.String,java.lang.Object,java.lang.Object)
meth public static void assertEquals(boolean,boolean)
@@ -112,44 +79,6 @@ meth public int countTestCases()
meth public java.lang.String getName()
meth public java.lang.String toString()
meth public junit.framework.TestResult run()
-meth public static java.lang.String format(java.lang.String,java.lang.Object,java.lang.Object)
-meth public static void assertEquals(boolean,boolean)
-meth public static void assertEquals(byte,byte)
-meth public static void assertEquals(char,char)
-meth public static void assertEquals(double,double,double)
-meth public static void assertEquals(float,float,float)
-meth public static void assertEquals(int,int)
-meth public static void assertEquals(java.lang.Object,java.lang.Object)
-meth public static void assertEquals(java.lang.String,boolean,boolean)
-meth public static void assertEquals(java.lang.String,byte,byte)
-meth public static void assertEquals(java.lang.String,char,char)
-meth public static void assertEquals(java.lang.String,double,double,double)
-meth public static void assertEquals(java.lang.String,float,float,float)
-meth public static void assertEquals(java.lang.String,int,int)
-meth public static void assertEquals(java.lang.String,java.lang.Object,java.lang.Object)
-meth public static void assertEquals(java.lang.String,java.lang.String)
-meth public static void assertEquals(java.lang.String,java.lang.String,java.lang.String)
-meth public static void assertEquals(java.lang.String,long,long)
-meth public static void assertEquals(java.lang.String,short,short)
-meth public static void assertEquals(long,long)
-meth public static void assertEquals(short,short)
-meth public static void assertFalse(boolean)
-meth public static void assertFalse(java.lang.String,boolean)
-meth public static void assertNotNull(java.lang.Object)
-meth public static void assertNotNull(java.lang.String,java.lang.Object)
-meth public static void assertNotSame(java.lang.Object,java.lang.Object)
-meth public static void assertNotSame(java.lang.String,java.lang.Object,java.lang.Object)
-meth public static void assertNull(java.lang.Object)
-meth public static void assertNull(java.lang.String,java.lang.Object)
-meth public static void assertSame(java.lang.Object,java.lang.Object)
-meth public static void assertSame(java.lang.String,java.lang.Object,java.lang.Object)
-meth public static void assertTrue(boolean)
-meth public static void assertTrue(java.lang.String,boolean)
-meth public static void fail()
-meth public static void fail(java.lang.String)
-meth public static void failNotEquals(java.lang.String,java.lang.Object,java.lang.Object)
-meth public static void failNotSame(java.lang.String,java.lang.Object,java.lang.Object)
-meth public static void failSame(java.lang.String)
meth public void run(junit.framework.TestResult)
meth public void runBare() throws java.lang.Throwable
meth public void setName(java.lang.String)
@@ -590,9 +519,7 @@ cons public init(java.lang.String,java.lang.String,java.lang.String,org.netbeans
cons public init(java.lang.String,java.lang.String,javax.swing.KeyStroke)
cons public init(java.lang.String,java.lang.String,javax.swing.KeyStroke[])
cons public init(java.lang.String,java.lang.String,org.netbeans.jellytools.actions.Action$Shortcut)
- anno 0 java.lang.Deprecated()
cons public init(java.lang.String,java.lang.String,org.netbeans.jellytools.actions.Action$Shortcut[])
- anno 0 java.lang.Deprecated()
fld protected final static long AFTER_ACTION_WAIT_TIME = 0
fld protected final static long SELECTION_WAIT_TIME = 300
fld protected final static long WAIT_AFTER_SHORTCUT_TIMEOUT = 0
@@ -664,13 +591,10 @@ cons public init(java.lang.String,java.lang.String,java.lang.String)
cons public init(java.lang.String,java.lang.String,java.lang.String,javax.swing.KeyStroke)
cons public init(java.lang.String,java.lang.String,java.lang.String,javax.swing.KeyStroke[])
cons public init(java.lang.String,java.lang.String,java.lang.String,org.netbeans.jellytools.actions.Action$Shortcut)
- anno 0 java.lang.Deprecated()
cons public init(java.lang.String,java.lang.String,java.lang.String,org.netbeans.jellytools.actions.Action$Shortcut[])
- anno 0 java.lang.Deprecated()
cons public init(java.lang.String,java.lang.String,javax.swing.KeyStroke)
cons public init(java.lang.String,java.lang.String,javax.swing.KeyStroke[])
cons public init(java.lang.String,java.lang.String,org.netbeans.jellytools.actions.Action$Shortcut)
- anno 0 java.lang.Deprecated()
cons public init(java.lang.String,java.lang.String,org.netbeans.jellytools.actions.Action$Shortcut[])
meth public void performAPI()
meth public void performMenu()
diff --git a/jellytools.platform/nbproject/project.properties b/jellytools.platform/nbproject/project.properties
index ee10f2d..2fa7d8c 100644
--- a/jellytools.platform/nbproject/project.properties
+++ b/jellytools.platform/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/jellytools.platform/nbproject/project.xml b/jellytools.platform/nbproject/project.xml
index 0f04f93..59018d1 100644
--- a/jellytools.platform/nbproject/project.xml
+++ b/jellytools.platform/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/jellytools.platform/src/org/netbeans/jellytools/properties/editors/package.html b/jellytools.platform/src/org/netbeans/jellytools/properties/editors/package.html
index 4a44325..504a6b9 100644
--- a/jellytools.platform/src/org/netbeans/jellytools/properties/editors/package.html
+++ b/jellytools.platform/src/org/netbeans/jellytools/properties/editors/package.html
@@ -4,10 +4,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -19,14 +17,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -37,8 +41,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<title></title>
</head>
diff --git a/jellytools.platform/src/org/netbeans/jellytools/properties/package.html b/jellytools.platform/src/org/netbeans/jellytools/properties/package.html
index c1d62d1..a8a5545 100644
--- a/jellytools.platform/src/org/netbeans/jellytools/properties/package.html
+++ b/jellytools.platform/src/org/netbeans/jellytools/properties/package.html
@@ -4,10 +4,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -19,14 +17,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -37,8 +41,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<title></title>
</head>
@@ -51,7 +53,7 @@ of JTable with properties and optional description area. The table has two
columns showing property name and property value. Properties are grouped to
logical categories which can be collapsed or expanded when properties are
sorted by category. It is also possible to sort properties alphabetically (Sort
-by Name).
+by Name).
Property value can be changed by inline editors (text field for string values,
check box for boolean values - {@link
org.netbeans.jellytools.properties.Property#setValue(String)} and combo box for list values
diff --git a/jellytools.platform/src/org/netbeans/jellytools/util/package.html b/jellytools.platform/src/org/netbeans/jellytools/util/package.html
index dab9e33..c0c2c0a 100644
--- a/jellytools.platform/src/org/netbeans/jellytools/util/package.html
+++ b/jellytools.platform/src/org/netbeans/jellytools/util/package.html
@@ -4,10 +4,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -19,14 +17,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -37,8 +41,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<title></title>
</head>
diff --git a/jellytools.platform/src/org/netbeans/modules/jellytools/platform/Bundle.properties b/jellytools.platform/src/org/netbeans/modules/jellytools/platform/Bundle.properties
index f233491..abf491b 100644
--- a/jellytools.platform/src/org/netbeans/modules/jellytools/platform/Bundle.properties
+++ b/jellytools.platform/src/org/netbeans/modules/jellytools/platform/Bundle.properties
@@ -1,38 +1 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=Jelly Tools Platform
diff --git a/jellytools.platform/test/qa-functional/src/org/netbeans/jellytools/PlatformBundleKeysTest.properties b/jellytools.platform/test/qa-functional/src/org/netbeans/jellytools/PlatformBundleKeysTest.properties
index 576ccc2..38eee6a 100644
--- a/jellytools.platform/test/qa-functional/src/org/netbeans/jellytools/PlatformBundleKeysTest.properties
+++ b/jellytools.platform/test/qa-functional/src/org/netbeans/jellytools/PlatformBundleKeysTest.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
org.netbeans.beaninfo.editors.Bundle=CTL_Italic,CTL_Bold,CTL_Add_StringArrayCustomEditor,CTL_Change_StringArrayCustomEditor,CTL_MoveUp,CTL_Plain,CTL_MoveDown,CTL_BoldItalic,CTL_Remove
org.netbeans.core.Bundle=CTL_FMT_SavingMessage
org.netbeans.core.execution.beaninfo.editors.Bundle=CTL_NbProcessDescriptorCustomEditor.jButton1.text,CTL_FileSystemPanel.Jar_Dialog_Title,CTL_MoveUp,CTL_MoveDown,CTL_AddDirectory,CTL_FileSystemPanel.Local_Dialog_Title,CTL_Remove,CTL_AddJAR
diff --git a/jemmy/manifest.mf b/jemmy/manifest.mf
index 247d739..85bd279 100644
--- a/jemmy/manifest.mf
+++ b/jemmy/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.jemmy/3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jemmy/idemodule/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.27.1
+OpenIDE-Module-Specification-Version: 3.26.1
diff --git a/junitlib/build.xml b/junitlib/build.xml
index f954c27..383fe22 100644
--- a/junitlib/build.xml
+++ b/junitlib/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="junitlib">
<property name="license.file" location="../nbbuild/licenses/CPL-1.0"/>
<target name="-create-license.file"/>
diff --git a/junitlib/manifest.mf b/junitlib/manifest.mf
index 33ca65a..9b6109d 100644
--- a/junitlib/manifest.mf
+++ b/junitlib/manifest.mf
@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.junitlib
OpenIDE-Module-Layer: org/netbeans/modules/junitlib/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/junitlib/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.4.1
+OpenIDE-Module-Specification-Version: 1.3.1
diff --git a/junitlib/nbproject/project.properties b/junitlib/nbproject/project.properties
index 987f66c..e6f478f 100644
--- a/junitlib/nbproject/project.properties
+++ b/junitlib/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/junitlib/nbproject/project.xml b/junitlib/nbproject/project.xml
index 8c443da..4b18698 100644
--- a/junitlib/nbproject/project.xml
+++ b/junitlib/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties b/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
index 060bbd2..ec20bc9 100644
--- a/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
+++ b/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=JUnit
OpenIDE-Module-Display-Category=Java SE
OpenIDE-Module-Short-Description=Bundles the JUnit testing library.
diff --git a/junitlib/src/org/netbeans/modules/junitlib/hamcrest.xml b/junitlib/src/org/netbeans/modules/junitlib/hamcrest.xml
index 9bf3af0..ffb203e 100644
--- a/junitlib/src/org/netbeans/modules/junitlib/hamcrest.xml
+++ b/junitlib/src/org/netbeans/modules/junitlib/hamcrest.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<library version="3.0" xmlns="http://www.netbeans.org/ns/library-declaration/3">
<name>hamcrest</name>
<type>j2se</type>
@@ -52,5 +13,5 @@ Contributor(s):
<name>maven-dependencies</name>
<value>org.hamcrest:hamcrest-core:1.3:jar</value>
</property>
- </properties>
+ </properties>
</library>
diff --git a/junitlib/src/org/netbeans/modules/junitlib/junit_4.xml b/junitlib/src/org/netbeans/modules/junitlib/junit_4.xml
index 1853290..2cb982f 100644
--- a/junitlib/src/org/netbeans/modules/junitlib/junit_4.xml
+++ b/junitlib/src/org/netbeans/modules/junitlib/junit_4.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<library version="3.0" xmlns="http://www.netbeans.org/ns/library-declaration/3">
<name>junit_4</name>
<type>j2se</type>
@@ -60,5 +21,5 @@ Contributor(s):
<name>maven-dependencies</name>
<value>junit:junit:4.12:jar</value>
</property>
- </properties>
+ </properties>
</library>
diff --git a/junitlib/src/org/netbeans/modules/junitlib/layer.xml b/junitlib/src/org/netbeans/modules/junitlib/layer.xml
index fb486fe..9f882ae 100644
--- a/junitlib/src/org/netbeans/modules/junitlib/layer.xml
+++ b/junitlib/src/org/netbeans/modules/junitlib/layer.xml
@@ -1,43 +1,4 @@
<?xml version="1.0"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
<filesystem>
<folder name="org-netbeans-api-project-libraries">
diff --git a/keyring.fallback/build.xml b/keyring.fallback/build.xml
index 100a4ca..130c99e 100644
--- a/keyring.fallback/build.xml
+++ b/keyring.fallback/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="keyring.fallback">
<description>Builds, tests, and runs the project org.netbeans.modules.keyring.fallback</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/keyring.fallback/manifest.mf b/keyring.fallback/manifest.mf
index e473094..2fc8513 100644
--- a/keyring.fallback/manifest.mf
+++ b/keyring.fallback/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.keyring.fallback
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/keyring/fallback/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.8.1
+OpenIDE-Module-Specification-Version: 1.7.1
diff --git a/keyring.fallback/nbproject/project.properties b/keyring.fallback/nbproject/project.properties
index c1fa23a..17255ba 100644
--- a/keyring.fallback/nbproject/project.properties
+++ b/keyring.fallback/nbproject/project.properties
@@ -1,39 +1,2 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/keyring.fallback/nbproject/project.xml b/keyring.fallback/nbproject/project.xml
index d41d519..958511d 100644
--- a/keyring.fallback/nbproject/project.xml
+++ b/keyring.fallback/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/keyring.fallback/src/org/netbeans/modules/keyring/fallback/Bundle.properties b/keyring.fallback/src/org/netbeans/modules/keyring/fallback/Bundle.properties
index 9e0b0a7..544ae40 100644
--- a/keyring.fallback/src/org/netbeans/modules/keyring/fallback/Bundle.properties
+++ b/keyring.fallback/src/org/netbeans/modules/keyring/fallback/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Name=Keyring Fallback
FallbackProvider.sample_key.description=Sample value ensuring that decryption is working.
diff --git a/keyring.impl/build.xml b/keyring.impl/build.xml
index 1f278d4..f289bed 100644
--- a/keyring.impl/build.xml
+++ b/keyring.impl/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="keyring.impl">
<description>Builds, tests, and runs the project org.netbeans.modules.keyring.impl</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/keyring.impl/manifest.mf b/keyring.impl/manifest.mf
index 8582c5e..0363694 100644
--- a/keyring.impl/manifest.mf
+++ b/keyring.impl/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.keyring.impl
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/keyring/impl/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.24.1
+OpenIDE-Module-Specification-Version: 1.23.1
OpenIDE-Module-Provides: org.netbeans.modules.keyring.impl
diff --git a/keyring.impl/nbproject/project.properties b/keyring.impl/nbproject/project.properties
index 8f7593d..b888b40 100644
--- a/keyring.impl/nbproject/project.properties
+++ b/keyring.impl/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.eager=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/keyring.impl/nbproject/project.xml b/keyring.impl/nbproject/project.xml
index 5c7ef69..1d12de1 100644
--- a/keyring.impl/nbproject/project.xml
+++ b/keyring.impl/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/keyring.impl/src/org/netbeans/modules/keyring/impl/Bundle.properties b/keyring.impl/src/org/netbeans/modules/keyring/impl/Bundle.properties
index bdcfa74..29c1599 100644
--- a/keyring.impl/src/org/netbeans/modules/keyring/impl/Bundle.properties
+++ b/keyring.impl/src/org/netbeans/modules/keyring/impl/Bundle.properties
@@ -1,38 +1 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=Keyring Implementations
diff --git a/keyring.impl/src/org/netbeans/modules/keyring/kde/CommonKWalletProvider.java b/keyring.impl/src/org/netbeans/modules/keyring/kde/CommonKWalletProvider.java
deleted file mode 100644
index 3425209..0000000
--- a/keyring.impl/src/org/netbeans/modules/keyring/kde/CommonKWalletProvider.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2010 Sun Microsystems, Inc.
- */
-
-package org.netbeans.modules.keyring.kde;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Arrays;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.netbeans.spi.keyring.KeyringProvider;
-
-/**
- *
- * @author psychollek, ynov
- */
-class CommonKWalletProvider implements KeyringProvider{
-
- private static final Logger logger = Logger.getLogger(CommonKWalletProvider.class.getName());
- private char[] handler = "0".toCharArray();
- private boolean timeoutHappened = false;
- private char[] defaultLocalWallet = "kdewallet".toCharArray();
-
- private final String kwalletVersion;
- private final String pathVersion;
-
-
- CommonKWalletProvider(String kwalletVersion, String pathVersion) {
- assert kwalletVersion != null;
- assert pathVersion != null;
- this.kwalletVersion = kwalletVersion;
- this.pathVersion = pathVersion;
- }
-
- @Override
- public boolean enabled(){
- if (Boolean.getBoolean("netbeans.keyring.no.native")) {
- logger.fine("native keyring integration disabled");
- return false;
- }
- CommandResult result = runCommand("isEnabled");
- if(new String(result.retVal).equals("true")) {
- return updateHandler();
- }
- return false;
- };
-
- @Override
- public char[] read(String key){
- if (updateHandler()){
- CommandResult result = runCommand("readPassword", handler, getApplicationName(), key.toCharArray(), getApplicationName());
- if (result.exitCode != 0){
- warning("read action returned not 0 exitCode");
- }
- return result.retVal.length > 0 ? result.retVal : null;
- }
- return null;
- //throw new KwalletException("read");
- };
-
- @Override
- public void save(String key, char[] password, String description){
- //description is forgoten ! kdewallet dosen't have any facility to store
- //it by default and I don't want to do it by adding new fields to kwallet
- if (updateHandler()){
- CommandResult result = runCommand("writePassword", handler , getApplicationName()
- , key.toCharArray(), password , getApplicationName());
- if (result.exitCode != 0 || (new String(result.retVal)).equals("-1")){
- warning("save action failed");
- }
- return;
- }
- //throw new KwalletException("save");
- };
-
- @Override
- public void delete(String key){
- if (updateHandler()){
- CommandResult result = runCommand("removeEntry" ,handler,
- getApplicationName() , key.toCharArray() , getApplicationName());
- if (result.exitCode != 0 || (new String(result.retVal)).equals("-1")){
- warning("delete action failed");
- }
- return;
- }
- //throw new KwalletException("delete");
- };
-
- private boolean updateHandler(){
- if(timeoutHappened) {
- return false;
- }
- handler = new String(handler).equals("")? "0".toCharArray() : handler;
- CommandResult result = runCommand("isOpen",handler);
- if(new String(result.retVal).equals("true")){
- return true;
- }
- char[] localWallet = defaultLocalWallet;
- result = runCommand("localWallet");
- if(result.exitCode == 0) {
- localWallet = result.retVal;
- }
-
- if(new String(localWallet).contains(".service")) {
- //Temporary workaround for the bug in kdelibs/kdeui/util/kwallet.cpp
- //The bug was fixed http://svn.reviewboard.kde.org/r/5885/diff/
- //but many people currently use buggy kwallet
- return false;
- }
- result = runCommand("open", localWallet , "0".toCharArray(), getApplicationName());
- if(result.exitCode == 2) {
- warning("time out happened while accessing KWallet");
- //don't try to open KWallet anymore until bug https://bugs.kde.org/show_bug.cgi?id=259229 is fixed
- timeoutHappened = true;
- return false;
- }
- if(result.exitCode != 0 || new String(result.retVal).equals("-1")) {
- warning("failed to access KWallet");
- return false;
- }
- handler = result.retVal;
- return true;
- }
-
-
-
- private CommandResult runCommand(String command,char[]... commandArgs) {
- String[] argv = new String[commandArgs.length+4];
- argv[0] = "qdbus";
- argv[1] = "org.kde.kwalletd" + kwalletVersion; // NOI18N
- argv[2] = "/modules/kwalletd" + pathVersion; // NOI18N
- argv[3] = "org.kde.KWallet."+command;
- for (int i = 0; i < commandArgs.length; i++) {
- //unfortunatelly I cannot pass char[] to the exec in any way - so this poses a security issue with passwords in String() !
- //TODO: find a way to avoid changing char[] into String
- argv[i+4] = new String(commandArgs[i]);
- }
- Runtime rt = Runtime.getRuntime();
- String retVal = "";
- String errVal = "";
- int exitCode = 0;
- try {
- if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, "executing {0}", Arrays.toString(argv));
- }
- Process pr = rt.exec(argv);
-
- BufferedReader input = new BufferedReader(new InputStreamReader(pr.getInputStream()));
-
- String line;
- while((line = input.readLine()) != null) {
- if (!retVal.equals("")){
- retVal = retVal.concat("\n");
- }
- retVal = retVal.concat(line);
- }
- input.close();
- input = new BufferedReader(new InputStreamReader(pr.getErrorStream()));
-
- while((line = input.readLine()) != null) {
- if (!errVal.equals("")){
- errVal = errVal.concat("\n");
- }
- errVal = errVal.concat(line);
- }
- input.close();
-
- exitCode = pr.waitFor();
- if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, "application exit with code {0} for commandString: {1}; errVal: {2}",
- new Object[]{exitCode, Arrays.toString(argv), errVal});
- }
- } catch (InterruptedException ex) {
- logger.log(Level.FINE,
- "exception thrown while invoking the command \""+Arrays.toString(argv)+"\"",
- ex);
- } catch (IOException ex) {
- logger.log(Level.FINE,
- "exception thrown while invoking the command \""+Arrays.toString(argv)+"\"",
- ex);
- }
- return new CommandResult(exitCode, retVal.trim().toCharArray(), errVal.trim());
- }
-
- private char[] getApplicationName(){
- return "NetBeans IDE".toCharArray(); // NOI18N
- }
-
- private void warning(String descr) {
- logger.log(Level.WARNING, "Something went wrong: {0}", descr);
- }
-
- @Override
- public String toString() {
- return "CommonKWalletProvider{" + "kwalletVersion=" + kwalletVersion + ", pathVersion=" + pathVersion + '}'; // NOI18N
- }
-
- private class CommandResult {
- private int exitCode;
- private char[] retVal;
- private String errVal;
-
- public CommandResult(int exitCode, char[] retVal, String errVal) {
- this.exitCode = exitCode;
- this.retVal = retVal;
- this.errVal = errVal;
- }
- }
-
-}
diff --git a/keyring.impl/src/org/netbeans/modules/keyring/kde/KWalletProvider.java b/keyring.impl/src/org/netbeans/modules/keyring/kde/KWalletProvider.java
index edeb7bd..139c7df 100644
--- a/keyring.impl/src/org/netbeans/modules/keyring/kde/KWalletProvider.java
+++ b/keyring.impl/src/org/netbeans/modules/keyring/kde/KWalletProvider.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -36,65 +36,201 @@
* made subject to such option by the copyright holder.
*
* Contributor(s):
+ *
+ * Portions Copyrighted 2010 Sun Microsystems, Inc.
*/
+
package org.netbeans.modules.keyring.kde;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Arrays;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.netbeans.spi.keyring.KeyringProvider;
import org.openide.util.lookup.ServiceProvider;
-// #256606
- at ServiceProvider(service = KeyringProvider.class, position = 99)
-public class KWalletProvider implements KeyringProvider {
-
- private static final String KWALLET_VERSION = "netbeans.keyring.kwallet.version"; // NOI18N
- private static final String PATH_VERSION = "netbeans.keyring.kwallet.path.version"; // NOI18N
-
- private KeyringProvider keyringProvider = null;
+/**
+ *
+ * @author psychollek, ynov
+ */
+ at ServiceProvider(service=KeyringProvider.class, position=99)
+public class KWalletProvider implements KeyringProvider{
+ private static final Logger logger = Logger.getLogger(KWalletProvider.class.getName());
+ private char[] handler = "0".toCharArray();
+ private boolean timeoutHappened = false;
+ private char[] defaultLocalWallet = "kdewallet".toCharArray();
@Override
- public boolean enabled() {
- return getKeyringProvider().enabled();
- }
+ public boolean enabled(){
+ if (Boolean.getBoolean("netbeans.keyring.no.native")) {
+ logger.fine("native keyring integration disabled");
+ return false;
+ }
+ CommandResult result = runCommand("isEnabled");
+ if(new String(result.retVal).equals("true")) {
+ return updateHandler();
+ }
+ return false;
+ };
@Override
- public char[] read(String key) {
- return getKeyringProvider().read(key);
- }
+ public char[] read(String key){
+ if (updateHandler()){
+ CommandResult result = runCommand("readPassword", handler, getApplicationName(), key.toCharArray(), getApplicationName());
+ if (result.exitCode != 0){
+ warning("read action returned not 0 exitCode");
+ }
+ return result.retVal.length > 0 ? result.retVal : null;
+ }
+ return null;
+ //throw new KwalletException("read");
+ };
@Override
- public void save(String key, char[] password, String description) {
- getKeyringProvider().save(key, password, description);
- }
+ public void save(String key, char[] password, String description){
+ //description is forgoten ! kdewallet dosen't have any facility to store
+ //it by default and I don't want to do it by adding new fields to kwallet
+ if (updateHandler()){
+ CommandResult result = runCommand("writePassword", handler , getApplicationName()
+ , key.toCharArray(), password , getApplicationName());
+ if (result.exitCode != 0 || (new String(result.retVal)).equals("-1")){
+ warning("save action failed");
+ }
+ return;
+ }
+ //throw new KwalletException("save");
+ };
@Override
- public void delete(String key) {
- getKeyringProvider().delete(key);
+ public void delete(String key){
+ if (updateHandler()){
+ CommandResult result = runCommand("removeEntry" ,handler,
+ getApplicationName() , key.toCharArray() , getApplicationName());
+ if (result.exitCode != 0 || (new String(result.retVal)).equals("-1")){
+ warning("delete action failed");
+ }
+ return;
+ }
+ //throw new KwalletException("delete");
+ };
+
+ private boolean updateHandler(){
+ if(timeoutHappened) {
+ return false;
+ }
+ handler = new String(handler).equals("")? "0".toCharArray() : handler;
+ CommandResult result = runCommand("isOpen",handler);
+ if(new String(result.retVal).equals("true")){
+ return true;
+ }
+ char[] localWallet = defaultLocalWallet;
+ result = runCommand("localWallet");
+ if(result.exitCode == 0) {
+ localWallet = result.retVal;
+ }
+
+ if(new String(localWallet).contains(".service")) {
+ //Temporary workaround for the bug in kdelibs/kdeui/util/kwallet.cpp
+ //The bug was fixed http://svn.reviewboard.kde.org/r/5885/diff/
+ //but many people currently use buggy kwallet
+ return false;
+ }
+ result = runCommand("open", localWallet , "0".toCharArray(), getApplicationName());
+ if(result.exitCode == 2) {
+ warning("time out happened while accessing KWallet");
+ //don't try to open KWallet anymore until bug https://bugs.kde.org/show_bug.cgi?id=259229 is fixed
+ timeoutHappened = true;
+ return false;
+ }
+ if(result.exitCode != 0 || new String(result.retVal).equals("-1")) {
+ warning("failed to access KWallet");
+ return false;
+ }
+ handler = result.retVal;
+ return true;
}
+
+
- private KeyringProvider getKeyringProvider() {
- if (keyringProvider == null) {
- String kwalletVersion = System.getProperty(KWALLET_VERSION);
- if (kwalletVersion == null) {
- // default is KDE 5 now
- kwalletVersion = "5"; // NOI18N
- } else if (kwalletVersion.equals("4")) { // NOI18N
- // KDE 4 uses just kwallet (no version)
- kwalletVersion = ""; // NOI18N
- }
- String pathVersion = System.getProperty(PATH_VERSION);
- if (pathVersion == null) {
- pathVersion = kwalletVersion;
+ private CommandResult runCommand(String command,char[]... commandArgs) {
+ String[] argv = new String[commandArgs.length+4];
+ argv[0] = "qdbus";
+ argv[1] = "org.kde.kwalletd";
+ argv[2] = "/modules/kwalletd";
+ argv[3] = "org.kde.KWallet."+command;
+ for (int i = 0; i < commandArgs.length; i++) {
+ //unfortunatelly I cannot pass char[] to the exec in any way - so this poses a security issue with passwords in String() !
+ //TODO: find a way to avoid changing char[] into String
+ argv[i+4] = new String(commandArgs[i]);
+ }
+ Runtime rt = Runtime.getRuntime();
+ String retVal = "";
+ String errVal = "";
+ int exitCode = 0;
+ try {
+ if (logger.isLoggable(Level.FINE)) {
+ logger.log(Level.FINE, "executing {0}", Arrays.toString(argv));
}
- keyringProvider = new CommonKWalletProvider(kwalletVersion, pathVersion);
- if (!kwalletVersion.isEmpty()
- && !pathVersion.isEmpty()
- && !keyringProvider.enabled()) {
- // fallback to KDE 4
- keyringProvider = new CommonKWalletProvider("", ""); // NOI18N
+ Process pr = rt.exec(argv);
+
+ BufferedReader input = new BufferedReader(new InputStreamReader(pr.getInputStream()));
+
+ String line;
+ while((line = input.readLine()) != null) {
+ if (!retVal.equals("")){
+ retVal = retVal.concat("\n");
+ }
+ retVal = retVal.concat(line);
+ }
+ input.close();
+ input = new BufferedReader(new InputStreamReader(pr.getErrorStream()));
+
+ while((line = input.readLine()) != null) {
+ if (!errVal.equals("")){
+ errVal = errVal.concat("\n");
+ }
+ errVal = errVal.concat(line);
}
+ input.close();
+
+ exitCode = pr.waitFor();
+ if (logger.isLoggable(Level.FINE)) {
+ logger.log(Level.FINE, "application exit with code {0} for commandString: {1}; errVal: {2}",
+ new Object[]{exitCode, Arrays.toString(argv), errVal});
+ }
+ } catch (InterruptedException ex) {
+ logger.log(Level.FINE,
+ "exception thrown while invoking the command \""+Arrays.toString(argv)+"\"",
+ ex);
+ } catch (IOException ex) {
+ logger.log(Level.FINE,
+ "exception thrown while invoking the command \""+Arrays.toString(argv)+"\"",
+ ex);
}
- return keyringProvider;
+ return new CommandResult(exitCode, retVal.trim().toCharArray(), errVal.trim());
+ }
+
+ private char[] getApplicationName(){
+ return "NetBeans IDE".toCharArray(); // NOI18N
+ }
+
+ private void warning(String descr) {
+ logger.log(Level.WARNING, "Something went wrong: {0}", descr);
+ }
+
+ private class CommandResult {
+ private int exitCode;
+ private char[] retVal;
+ private String errVal;
+
+ public CommandResult(int exitCode, char[] retVal, String errVal) {
+ this.exitCode = exitCode;
+ this.retVal = retVal;
+ this.errVal = errVal;
+ }
}
}
diff --git a/keyring/arch.xml b/keyring/arch.xml
index 42821c5..aa44642 100644
--- a/keyring/arch.xml
+++ b/keyring/arch.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
@@ -52,11 +13,11 @@ Contributor(s):
<!--
<question id="arch-overall" when="init">
- Describe the overall architecture.
+ Describe the overall architecture.
<hint>
- What will be API for
+ What will be API for
<a href="http://openide.netbeans.org/tutorial/api-design.html#design.apiandspi">
- clients and what support API</a>?
+ clients and what support API</a>?
What parts will be pluggable?
How will plug-ins be registered? Please use <code><api type="export"/></code>
to describe your general APIs and specify their
diff --git a/keyring/build.xml b/keyring/build.xml
index 6952c5d..c22505b 100644
--- a/keyring/build.xml
+++ b/keyring/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="keyring">
<import file="../nbbuild/templates/projectized.xml"/>
<target name="debug" depends="netbeans">
diff --git a/keyring/manifest.mf b/keyring/manifest.mf
index 718d5e9..a563a19 100644
--- a/keyring/manifest.mf
+++ b/keyring/manifest.mf
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.keyring
OpenIDE-Module-Layer: org/netbeans/modules/keyring/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/keyring/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.24.1
+OpenIDE-Module-Specification-Version: 1.23.1
OpenIDE-Module-Recommends: org.netbeans.modules.keyring.impl
diff --git a/keyring/nbproject/org-netbeans-modules-keyring.sig b/keyring/nbproject/org-netbeans-modules-keyring.sig
index 40d6008..5aca78c 100644
--- a/keyring/nbproject/org-netbeans-modules-keyring.sig
+++ b/keyring/nbproject/org-netbeans-modules-keyring.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.23.1
+#Version 1.20
CLSS public java.lang.Object
cons public init()
diff --git a/keyring/nbproject/project.properties b/keyring/nbproject/project.properties
index ba890c9..48de18d 100644
--- a/keyring/nbproject/project.properties
+++ b/keyring/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/keyring/nbproject/project.xml b/keyring/nbproject/project.xml
index aa952bd..645ac58 100644
--- a/keyring/nbproject/project.xml
+++ b/keyring/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/keyring/src/org/netbeans/modules/keyring/Bundle.properties b/keyring/src/org/netbeans/modules/keyring/Bundle.properties
index 907174e..8eb292d 100644
--- a/keyring/src/org/netbeans/modules/keyring/Bundle.properties
+++ b/keyring/src/org/netbeans/modules/keyring/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=Keyring API
Passwords.Options.Export.displayName=Passwords
Keyring.Options.Export.displayName=Keyring & Passwords
diff --git a/keyring/src/org/netbeans/modules/keyring/layer.xml b/keyring/src/org/netbeans/modules/keyring/layer.xml
index 4c8a561..67847af 100644
--- a/keyring/src/org/netbeans/modules/keyring/layer.xml
+++ b/keyring/src/org/netbeans/modules/keyring/layer.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
<filesystem>
<folder name="OptionsExport">
diff --git a/lib.uihandler/build.xml b/lib.uihandler/build.xml
index 8059d6a..425796c 100644
--- a/lib.uihandler/build.xml
+++ b/lib.uihandler/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="lib.uihandler">
<import file="../nbbuild/templates/projectized.xml"/>
</project>
diff --git a/lib.uihandler/manifest.mf b/lib.uihandler/manifest.mf
index ca24604..d3ea2af 100644
--- a/lib.uihandler/manifest.mf
+++ b/lib.uihandler/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.lib.uihandler
_OpenIDE-Module-Layer: org/netbeans/lib/uihandler/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/uihandler/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.45.1
+OpenIDE-Module-Specification-Version: 1.44.1
diff --git a/lib.uihandler/nbproject/org-netbeans-lib-uihandler.sig b/lib.uihandler/nbproject/org-netbeans-lib-uihandler.sig
index afd694e..f1a6838 100644
--- a/lib.uihandler/nbproject/org-netbeans-lib-uihandler.sig
+++ b/lib.uihandler/nbproject/org-netbeans-lib-uihandler.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.44.1
+#Version 1.41
CLSS public abstract interface java.io.Serializable
diff --git a/lib.uihandler/nbproject/project.properties b/lib.uihandler/nbproject/project.properties
index fd32526..6e8ef30 100644
--- a/lib.uihandler/nbproject/project.properties
+++ b/lib.uihandler/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.compilerargs=-Xlint:unchecked
javac.source=1.6
diff --git a/lib.uihandler/nbproject/project.xml b/lib.uihandler/nbproject/project.xml
index a4a525f..b9dc7a1 100644
--- a/lib.uihandler/nbproject/project.xml
+++ b/lib.uihandler/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/lib.uihandler/src/org/netbeans/lib/uihandler/InputGesture.java b/lib.uihandler/src/org/netbeans/lib/uihandler/InputGesture.java
index a689d8b..24140f1 100644
--- a/lib.uihandler/src/org/netbeans/lib/uihandler/InputGesture.java
+++ b/lib.uihandler/src/org/netbeans/lib/uihandler/InputGesture.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,20 +24,9 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
* Contributor(s):
*
- * Portions Copyrighted 2006 Sun Microsystems, Inc.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
*/
package org.netbeans.lib.uihandler;
@@ -54,7 +43,7 @@ public enum InputGesture {
private static final XMLFormatter F = new XMLFormatter();
-
+
/** Finds the right InputGesture for given LogRecord.
* @param rec the record
* @return the gesture that initiated the record or <code>null</code> if unknown
diff --git a/lib.uihandler/src/org/netbeans/lib/uihandler/LogFormatter.java b/lib.uihandler/src/org/netbeans/lib/uihandler/LogFormatter.java
index d8c14be..03b6411 100644
--- a/lib.uihandler/src/org/netbeans/lib/uihandler/LogFormatter.java
+++ b/lib.uihandler/src/org/netbeans/lib/uihandler/LogFormatter.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,20 +24,9 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
* Contributor(s):
*
- * Portions Copyrighted 2006 Sun Microsystems, Inc.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
*/
package org.netbeans.lib.uihandler;
@@ -71,9 +60,9 @@ import static java.util.Calendar.*;
* @author Jindrich Sedek
*/
class LogFormatter extends XMLFormatter{
-
+
private static final int MAX_NUM_CAUSE = 20; // Do not recurse more than this number of causes during exception printing
-
+
private final Pattern javaHome;
private final Pattern userHome;
private final Pattern netbeansUserDir;
@@ -83,7 +72,7 @@ class LogFormatter extends XMLFormatter{
private final Pattern nbjclPrefix = Pattern.compile("nbjcl:", Pattern.LITERAL);
private final Pattern jarPrefix = Pattern.compile("jar:", Pattern.LITERAL);
private final Pattern hexPattern = Pattern.compile("@[0-9a-fA-F]*");
-
+
/** Creates a new instance of LogFormatter */
public LogFormatter() {
javaHome = convert(System.getProperty("java.home", ""));// NOI18N
@@ -102,7 +91,7 @@ class LogFormatter extends XMLFormatter{
installDirs = Collections.emptyList();
}
}
-
+
private Pattern convert(String str){
try{
String name = new File(str).toURI().toURL().toString();
diff --git a/lib.uihandler/src/org/netbeans/lib/uihandler/LogRecords.java b/lib.uihandler/src/org/netbeans/lib/uihandler/LogRecords.java
index dc508d9..3c3b94c 100644
--- a/lib.uihandler/src/org/netbeans/lib/uihandler/LogRecords.java
+++ b/lib.uihandler/src/org/netbeans/lib/uihandler/LogRecords.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,20 +24,9 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
* Contributor(s):
*
- * Portions Copyrighted 2006 Sun Microsystems, Inc.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
*/
package org.netbeans.lib.uihandler;
@@ -87,9 +76,9 @@ public final class LogRecords {
}
private static final Logger LOG = Logger.getLogger(LogRecords.class.getName());
-
+
private static final Formatter FORMATTER = new LogFormatter();
-
+
/** Inspects the log record and decorates its content.
* @param r the log record
* @param d callback to be called with inspected values
@@ -97,26 +86,26 @@ public final class LogRecords {
public static void decorate(LogRecord r, Decorable d) {
Decorations.decorate(r, d);
}
-
+
/**
* Writhe log record to an output stream.
* @param os the output stream
* @param rec the log record
* @throws IOException when an I/O error occurs.
*/
- public static void write(OutputStream os, LogRecord rec) throws IOException {
+ public static void write(OutputStream os, LogRecord rec) throws IOException {
String formated = FORMATTER.format(rec);
byte[] arr = formated.getBytes("utf-8");
os.write(arr);
os.flush();
}
-
+
private static class HandlerDelegate extends Handler {
-
+
private Handler hd;
private boolean afterLast;
private long lastNumber;
-
+
HandlerDelegate(Handler hd) {
this.hd = hd;
}
diff --git a/lib.uihandler/src/org/netbeans/lib/uihandler/ProjectOp.java b/lib.uihandler/src/org/netbeans/lib/uihandler/ProjectOp.java
index a21fd53..658f496 100644
--- a/lib.uihandler/src/org/netbeans/lib/uihandler/ProjectOp.java
+++ b/lib.uihandler/src/org/netbeans/lib/uihandler/ProjectOp.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,20 +24,9 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
* Contributor(s):
*
- * Portions Copyrighted 2006 Sun Microsystems, Inc.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
*/
package org.netbeans.lib.uihandler;
@@ -61,7 +50,7 @@ final class ProjectOp {
this.number = number;
this.startup = startup;
}
-
+
private static String fixName(String name, boolean isDisplayName) {
if (isDisplayName) {
if (name.indexOf("Maven") >= 0) {
@@ -70,10 +59,10 @@ final class ProjectOp {
if (name.endsWith("Project")) {
return name.substring(0, name.length() - 7);
}
- }
+ }
return name;
}
-
+
/** Human readable name of the project the operation happened on
*/
public String getProjectDisplayName() {
@@ -85,14 +74,14 @@ final class ProjectOp {
public String getProjectType() {
return type;
}
-
+
/** Number of projects of this type that has been added.
* @return positive value if some projects were open, negative if some were closed
*/
public int getDelta() {
return number;
}
-
+
/** Is this report of projects being opened on startup?
* @return true, if this is the list of projects reported on startup
* @since 1.16
@@ -100,7 +89,7 @@ final class ProjectOp {
public boolean isStartup() {
return startup;
}
-
+
/** Finds whether the record was an operation on projects.
* @param rec the record to test
* @return null if the record is of unknown format or data about the project operation
diff --git a/lib.uihandler/src/org/netbeans/lib/uihandler/layer.xml b/lib.uihandler/src/org/netbeans/lib/uihandler/layer.xml
index 4b276ea..c16a8a0 100644
--- a/lib.uihandler/src/org/netbeans/lib/uihandler/layer.xml
+++ b/lib.uihandler/src/org/netbeans/lib/uihandler/layer.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
<filesystem>
</filesystem>
diff --git a/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/LogFormatterTest.java b/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/LogFormatterTest.java
index c584326..d2eba39 100644
--- a/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/LogFormatterTest.java
+++ b/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/LogFormatterTest.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,20 +24,9 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
* Contributor(s):
*
- * Portions Copyrighted 2006 Sun Microsystems, Inc.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
*/
package org.netbeans.lib.uihandler;
@@ -68,11 +57,11 @@ import org.openide.util.io.ReaderInputStream;
* @author Jindrich Sedek
*/
public class LogFormatterTest extends NbTestCase {
-
+
public LogFormatterTest(String testName) {
super(testName);
}
-
+
public void testFormat() throws IOException {
LogRecord rec = new LogRecord(Level.SEVERE, "PROBLEM");
Throwable thrown = new NullPointerException("TESTING");
@@ -89,14 +78,14 @@ public class LogFormatterTest extends NbTestCase {
assertTrue(result.contains("<class>sun.reflect.NativeMethodAccessorImpl</class>"));
assertFalse(result.contains("<more>80</more>"));
}
-
-
+
+
public void testEasy() throws IOException {
Throwable thrown = new NullPointerException("TESTING");
thrown.initCause(new AssertionError("CAUSE PROBLEM"));
formatAndScan(thrown);
}
-
+
public void testManyCausesFormat() throws IOException{
try{
generateIOException();
@@ -104,7 +93,7 @@ public class LogFormatterTest extends NbTestCase {
formatAndScan(exc);
}
}
-
+
public void testDontPrintLocalizedMessage() throws IOException{
LogRecord log = new LogRecord(Level.INFO, "test_msg");
log.setResourceBundleName("org.netbeans.lib.uihandler.TestBundle");
diff --git a/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/ProjectOpTest.java b/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/ProjectOpTest.java
index 8bc4dc9..a5bda36 100644
--- a/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/ProjectOpTest.java
+++ b/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/ProjectOpTest.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,20 +24,9 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
* Contributor(s):
*
- * Portions Copyrighted 2006 Sun Microsystems, Inc.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
*/
package org.netbeans.lib.uihandler;
@@ -59,11 +48,11 @@ import org.netbeans.lib.uihandler.TestHandler;
*/
public class ProjectOpTest extends NbTestCase {
private Logger LOG;
-
+
public ProjectOpTest(String testName) {
super(testName);
}
-
+
@Override
protected Level logLevel() {
return null;//Level.FINEST;
diff --git a/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/TestHandler.java b/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/TestHandler.java
index 037ca82..7a5f03d 100644
--- a/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/TestHandler.java
+++ b/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/TestHandler.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,20 +24,9 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
* Contributor(s):
*
- * Portions Copyrighted 2006 Sun Microsystems, Inc.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
*/
package org.netbeans.lib.uihandler;
@@ -55,7 +44,7 @@ import java.util.logging.LogRecord;
*/
public class TestHandler extends Handler{
Queue<LogRecord> queue = new LinkedList<LogRecord>();
-
+
public TestHandler(InputStream is) throws IOException {
LogRecords.scan(is, this);
}
@@ -75,7 +64,7 @@ public class TestHandler extends Handler{
public LogRecord read(){
return queue.poll();
}
-
-
+
+
}
diff --git a/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/InputGestureTest.java b/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/InputGestureTest.java
index bfb8ccd..19ae343 100644
--- a/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/InputGestureTest.java
+++ b/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/InputGestureTest.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,20 +24,9 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
* Contributor(s):
*
- * Portions Copyrighted 2006 Sun Microsystems, Inc.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
*/
package org.netbeans.lib.uihandlerserver;
@@ -59,15 +48,15 @@ import org.netbeans.lib.uihandler.TestHandler;
*/
public class InputGestureTest extends NbTestCase {
private Logger LOG;
-
+
public InputGestureTest(String testName) {
super(testName);
}
-
+
protected Level logLevel() {
return Level.INFO;
}
-
+
protected int timeOut() {
return 0; //5000;
}
@@ -78,7 +67,7 @@ public class InputGestureTest extends NbTestCase {
protected void tearDown() throws Exception {
}
-
+
public void testIsLowLevelAction() throws Exception {
String s = "<record>n"
+ "<date>2007-03-27T18:45:54</date>n"
diff --git a/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/LogRecordsTest.java b/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/LogRecordsTest.java
index 3746a3b..c0dea35 100644
--- a/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/LogRecordsTest.java
+++ b/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/LogRecordsTest.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,20 +24,9 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
* Contributor(s):
*
- * Portions Copyrighted 2006 Sun Microsystems, Inc.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
*/
package org.netbeans.lib.uihandlerserver;
@@ -78,11 +67,11 @@ import org.xml.sax.SAXException;
*/
public class LogRecordsTest extends NbTestCase {
private Logger LOG;
-
+
public LogRecordsTest(String testName) {
super(testName);
}
-
+
protected Level logLevel() {
return Level.FINEST;
}
@@ -95,7 +84,7 @@ public class LogRecordsTest extends NbTestCase {
}
public void testParamsGetCleared() throws Exception {
- String r =
+ String r =
"<record>" +
"<date>2006-11-17T10:16:14</date>" +
"<millis>1163729774285</millis>" +
@@ -107,7 +96,7 @@ public class LogRecordsTest extends NbTestCase {
"<catalog>a.bundle.somewhere</catalog>" +
"<param>1</param>" +
"</record>" +
-
+
"<record>" +
"<date>2006-11-17T10:16:14</date>" +
"<millis>1163729774285</millis>" +
@@ -119,10 +108,10 @@ public class LogRecordsTest extends NbTestCase {
"<catalog>a.bundle.somewhere</catalog>" +
"<param>2</param>" +
"</record>";
-
+
class H extends Handler {
int cnt;
-
+
public void publish(LogRecord arg0) {
cnt++;
assertNotNull("We have params " + cnt, arg0.getParameters());
diff --git a/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/Props.properties b/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/Props.properties
index 1b5223b..a4ca394 100644
--- a/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/Props.properties
+++ b/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/Props.properties
@@ -1,6 +1,6 @@
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
@@ -23,19 +23,9 @@
# your own identifying information:
# "Portions Copyrighted [year] [name of copyright owner]"
#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
# Contributor(s):
#
-# Portions Copyrighted 2006 Sun Microsystems, Inc.
+# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+#
UI_ACTION_BUTTON_PRESS=Button {0} on {1}
diff --git a/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/ReadBigDataTest.java b/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/ReadBigDataTest.java
index b415924..1036d6c 100644
--- a/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/ReadBigDataTest.java
+++ b/lib.uihandler/test/unit/src/org/netbeans/lib/uihandlerserver/ReadBigDataTest.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,20 +24,9 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
* Contributor(s):
*
- * Portions Copyrighted 2006 Sun Microsystems, Inc.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
*/
package org.netbeans.lib.uihandlerserver;
@@ -63,11 +52,11 @@ import org.netbeans.lib.uihandler.TestHandler;
*/
public class ReadBigDataTest extends NbTestCase {
private Logger LOG;
-
+
public ReadBigDataTest(String testName) {
super(testName);
}
-
+
protected Level logLevel() {
return Level.FINEST;
}
@@ -81,13 +70,13 @@ public class ReadBigDataTest extends NbTestCase {
public void testAntonsOutOfMemExc() throws Exception {
String what = "antons.gz";
-
+
InputStream is = new GZIPInputStream(getClass().getResourceAsStream(what));
-
+
class H extends Handler {
int cnt;
LogRecord first;
-
+
public void publish(LogRecord record) {
if (cnt == 0) {
first = record;
@@ -104,12 +93,12 @@ public class ReadBigDataTest extends NbTestCase {
public void close() throws SecurityException {
}
}
-
+
H h = new H();
is = new GZIPInputStream(getClass().getResourceAsStream(what));
LogRecords.scan(is, h);
is.close();
-
+
if (h.cnt != 322) {
fail("Invalid number of records: " + h.cnt);
}
@@ -125,11 +114,11 @@ public class ReadBigDataTest extends NbTestCase {
if (arr == null) {
return;
}
-
+
int[] cnts = new int[arr.length];
int err1 = readAsAStream(cnts, arr, 0);
int err2 = readAsSAX(cnts, 0, arr);
-
+
assertEquals("No errors: " + err1 + " and no " + err2, 0, err1 + err2);
}
diff --git a/libs.asm/manifest.mf b/libs.asm/manifest.mf
index 53a4562..4418cb3 100644
--- a/libs.asm/manifest.mf
+++ b/libs.asm/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.asm
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/asm/Bundle.properties
-OpenIDE-Module-Specification-Version: 5.3.1
+OpenIDE-Module-Specification-Version: 5.2.1
diff --git a/libs.felix/build.xml b/libs.felix/build.xml
index a0802c2..fbb8776 100644
--- a/libs.felix/build.xml
+++ b/libs.felix/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="libs.felix">
<description>Builds, tests, and runs the project org.netbeans.libs.felix</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/libs.felix/manifest.mf b/libs.felix/manifest.mf
index 711157e..006522b 100644
--- a/libs.felix/manifest.mf
+++ b/libs.felix/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.felix
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/felix/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.15.1
+OpenIDE-Module-Specification-Version: 2.14.1
OpenIDE-Module-Provides: org.osgi.framework.launch.FrameworkFactory
AutoUpdate-Show-In-Client: false
Covered-Packages: META-INF,/MANIFEST.MF,org.netbeans.libs.felix,
diff --git a/libs.felix/nbproject/project.xml b/libs.felix/nbproject/project.xml
index deef711..d3cc253 100644
--- a/libs.felix/nbproject/project.xml
+++ b/libs.felix/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/libs.javafx/build.xml b/libs.javafx/build.xml
index 64da3e2..bc10a63 100644
--- a/libs.javafx/build.xml
+++ b/libs.javafx/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="libs.javafx">
<description>Builds, tests, and runs the project org.netbeans.libs.javafx</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/libs.javafx/manifest.mf b/libs.javafx/manifest.mf
index b9f0463..8f7e22c 100644
--- a/libs.javafx/manifest.mf
+++ b/libs.javafx/manifest.mf
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.javafx
OpenIDE-Module-Package-Dependencies: javafx.application[Application]
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javafx/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.7.1
+OpenIDE-Module-Specification-Version: 2.6.1
OpenIDE-Module-Needs: org.openide.modules.jre.JavaFX
Class-Path: ${java.home}/lib/ext/jfxrt.jar
diff --git a/libs.javafx/nbproject/project.xml b/libs.javafx/nbproject/project.xml
index b9bdd77..d277f20 100644
--- a/libs.javafx/nbproject/project.xml
+++ b/libs.javafx/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/libs.javafx/src/org/netbeans/libs/javafx/Bundle.properties b/libs.javafx/src/org/netbeans/libs/javafx/Bundle.properties
index 61f986b..4bfaf71 100644
--- a/libs.javafx/src/org/netbeans/libs/javafx/Bundle.properties
+++ b/libs.javafx/src/org/netbeans/libs/javafx/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=JavaFX wrapper
OpenIDE-Module-Package-Dependency-Message=JavaFX libraries are missing in your JDK. Download JDK from Oracle\n\
or continue with some modules disabled.
diff --git a/libs.jna.platform/external/binaries-list b/libs.jna.platform/external/binaries-list
index 5ff437e..7373694 100644
--- a/libs.jna.platform/external/binaries-list
+++ b/libs.jna.platform/external/binaries-list
@@ -1 +1 @@
-030FA67B23CF2C0327A02CFAECBEF76A20160E7B jna-platform-4.2.2.jar
+23457AD1CF75C2C16763330DE5565A0E67B4BC0A jna-platform-4.1.0.jar
\ No newline at end of file
diff --git a/libs.jna/external/jna-4.2.2-license.txt b/libs.jna.platform/external/jna-platform-4.1.0-license.txt
similarity index 99%
rename from libs.jna/external/jna-4.2.2-license.txt
rename to libs.jna.platform/external/jna-platform-4.1.0-license.txt
index 1f8e776..143316c 100644
--- a/libs.jna/external/jna-4.2.2-license.txt
+++ b/libs.jna.platform/external/jna-platform-4.1.0-license.txt
@@ -1,5 +1,5 @@
Name: Java Native Access
-Version: 4.2.1
+Version: 4.1.0
License: Apache-2.0
OSR: 7755
Description: Dynamically access native libraries from Java without JNI.
diff --git a/libs.jna.platform/manifest.mf b/libs.jna.platform/manifest.mf
index 4040f89..64b067b 100644
--- a/libs.jna.platform/manifest.mf
+++ b/libs.jna.platform/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.jna.platform/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jna/platform/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.14.1
+OpenIDE-Module-Specification-Version: 1.10.1
diff --git a/libs.jna.platform/nbproject/project.properties b/libs.jna.platform/nbproject/project.properties
index c8688d8..b8afdb4 100644
--- a/libs.jna.platform/nbproject/project.properties
+++ b/libs.jna.platform/nbproject/project.properties
@@ -42,5 +42,5 @@
is.autoload=true
javac.source=1.6
-release.external/jna-platform-4.2.2.jar=modules/ext/jna-platform-4.2.2.jar
+release.external/jna-platform-4.1.0.jar=modules/ext/jna-platform-4.1.0.jar
sigtest.gen.fail.on.error=false
diff --git a/libs.jna.platform/nbproject/project.xml b/libs.jna.platform/nbproject/project.xml
index 6ac9588..4b8186a 100644
--- a/libs.jna.platform/nbproject/project.xml
+++ b/libs.jna.platform/nbproject/project.xml
@@ -68,8 +68,8 @@ made subject to such option by the copyright holder.
<package>com.sun.jna.platform.wince</package>
</friend-packages>
<class-path-extension>
- <runtime-relative-path>ext/jna-platform-4.2.2.jar</runtime-relative-path>
- <binary-origin>external/jna-platform-4.2.2.jar</binary-origin>
+ <runtime-relative-path>ext/jna-platform-4.1.0.jar</runtime-relative-path>
+ <binary-origin>external/jna-platform-4.1.0.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/libs.jna/external/binaries-list b/libs.jna/external/binaries-list
index e9956c0..535d54a 100644
--- a/libs.jna/external/binaries-list
+++ b/libs.jna/external/binaries-list
@@ -1 +1 @@
-5012450AEE579C3118FF09461D5CE210E0CDC2A9 jna-4.2.2.jar
+1C12D070E602EFD8021891CDD7FD18BC129372D4 jna-4.1.0.jar
diff --git a/libs.jna.platform/external/jna-platform-4.2.2-license.txt b/libs.jna/external/jna-4.1.0-license.txt
similarity index 99%
rename from libs.jna.platform/external/jna-platform-4.2.2-license.txt
rename to libs.jna/external/jna-4.1.0-license.txt
index 1f8e776..143316c 100644
--- a/libs.jna.platform/external/jna-platform-4.2.2-license.txt
+++ b/libs.jna/external/jna-4.1.0-license.txt
@@ -1,5 +1,5 @@
Name: Java Native Access
-Version: 4.2.1
+Version: 4.1.0
License: Apache-2.0
OSR: 7755
Description: Dynamically access native libraries from Java without JNI.
diff --git a/libs.jna/manifest.mf b/libs.jna/manifest.mf
index 2f43c33..59eac46 100644
--- a/libs.jna/manifest.mf
+++ b/libs.jna/manifest.mf
@@ -4,4 +4,4 @@ OpenIDE-Module: org.netbeans.libs.jna/1
OpenIDE-Module-Install: org/netbeans/libs/jna/Installer.class
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jna/Bundle.properties
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.44.1
+OpenIDE-Module-Specification-Version: 1.41.1
diff --git a/libs.jna/nbproject/project.properties b/libs.jna/nbproject/project.properties
index 2800236..c6de368 100644
--- a/libs.jna/nbproject/project.properties
+++ b/libs.jna/nbproject/project.properties
@@ -41,17 +41,17 @@
# made subject to such option by the copyright holder.
javac.source=1.6
-release.external/jna-4.2.2.jar=modules/ext/jna-4.2.2.jar
+release.external/jna-4.1.0.jar=modules/ext/jna-4.1.0.jar
# Do not forget to rename native libs being extracted from the JAR when upgrading the JNA library, and patch org.netbeans.libs.jna.Installer as well.
-release.external/jna-4.2.2.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-422.jnilib
-release.external/jna-4.2.2.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-422.so
-release.external/jna-4.2.2.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-422.so
-release.external/jna-4.2.2.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-422.dll
-release.external/jna-4.2.2.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-422.dll
+release.external/jna-4.1.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-410.jnilib
+release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86-64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-410.so
+release.external/jna-4.1.0.jar!/com/sun/jna/linux-x86/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-410.so
+release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86-64/jnidispatch.dll=modules/lib/amd64/jnidispatch-410.dll
+release.external/jna-4.1.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-410.dll
jnlp.verify.excludes=\
- modules/lib/amd64/jnidispatch-422.dll,\
- modules/lib/amd64/linux/libjnidispatch-422.so,\
- modules/lib/i386/linux/libjnidispatch-422.so,\
- modules/lib/x86/jnidispatch-422.dll,\
- modules/lib/libjnidispatch-422.jnilib
+ modules/lib/amd64/jnidispatch-410.dll,\
+ modules/lib/amd64/linux/libjnidispatch-410.so,\
+ modules/lib/i386/linux/libjnidispatch-410.so,\
+ modules/lib/x86/jnidispatch-410.dll,\
+ modules/lib/libjnidispatch-410.jnilib
sigtest.gen.fail.on.error=false
diff --git a/libs.jna/nbproject/project.xml b/libs.jna/nbproject/project.xml
index bd72db9..1f48c5b 100644
--- a/libs.jna/nbproject/project.xml
+++ b/libs.jna/nbproject/project.xml
@@ -101,8 +101,8 @@ made subject to such option by the copyright holder.
<package>com.sun.jna.win32</package>
</friend-packages>
<class-path-extension>
- <runtime-relative-path>ext/jna-4.2.2.jar</runtime-relative-path>
- <binary-origin>external/jna-4.2.2.jar</binary-origin>
+ <runtime-relative-path>ext/jna-4.1.0.jar</runtime-relative-path>
+ <binary-origin>external/jna-4.1.0.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/libs.jna/src/org/netbeans/libs/jna/Installer.java b/libs.jna/src/org/netbeans/libs/jna/Installer.java
index 58c0c35..cf306a7 100644
--- a/libs.jna/src/org/netbeans/libs/jna/Installer.java
+++ b/libs.jna/src/org/netbeans/libs/jna/Installer.java
@@ -50,6 +50,6 @@ public class Installer extends ModuleInstall {
public void validate() {
super.validate();
//#211655
- System.setProperty( "jna.boot.library.name", "jnidispatch-422" ); //NOI18N
+ System.setProperty( "jna.boot.library.name", "jnidispatch-410" ); //NOI18N
}
}
diff --git a/libs.jsr223/manifest.mf b/libs.jsr223/manifest.mf
index 5702d41..7b4e989 100644
--- a/libs.jsr223/manifest.mf
+++ b/libs.jsr223/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.jsr223/1
-OpenIDE-Module-Specification-Version: 1.35.1
+OpenIDE-Module-Specification-Version: 1.34.1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jsr223/Bundle.properties
OpenIDE-Module-Deprecated: true
diff --git a/libs.junit4/manifest.mf b/libs.junit4/manifest.mf
index 8f1feac..e2e083c 100644
--- a/libs.junit4/manifest.mf
+++ b/libs.junit4/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.junit4
-OpenIDE-Module-Specification-Version: 1.17.1
+OpenIDE-Module-Specification-Version: 1.16.1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/junit4/Bundle.properties
diff --git a/libs.nbi.ant/build.xml b/libs.nbi.ant/build.xml
index 10320bf..07f75b5 100644
--- a/libs.nbi.ant/build.xml
+++ b/libs.nbi.ant/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
diff --git a/libs.nbi.ant/manifest.mf b/libs.nbi.ant/manifest.mf
index 9b706bb..fb3cebc 100644
--- a/libs.nbi.ant/manifest.mf
+++ b/libs.nbi.ant/manifest.mf
@@ -2,4 +2,4 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.libs.nbi.ant
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/nbi/ant/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.22.1
+OpenIDE-Module-Specification-Version: 1.21.1
diff --git a/libs.nbi.ant/nbproject/project.properties b/libs.nbi.ant/nbproject/project.properties
index 76a76a9..b658bf4 100644
--- a/libs.nbi.ant/nbproject/project.properties
+++ b/libs.nbi.ant/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/libs.nbi.ant/nbproject/project.xml b/libs.nbi.ant/nbproject/project.xml
index 0d8d00b..fdcab97 100644
--- a/libs.nbi.ant/nbproject/project.xml
+++ b/libs.nbi.ant/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/libs.nbi.ant/src/org/netbeans/libs/nbi/ant/Bundle.properties b/libs.nbi.ant/src/org/netbeans/libs/nbi/ant/Bundle.properties
index 83ba434..d41e351 100644
--- a/libs.nbi.ant/src/org/netbeans/libs/nbi/ant/Bundle.properties
+++ b/libs.nbi.ant/src/org/netbeans/libs/nbi/ant/Bundle.properties
@@ -1,39 +1,2 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Name=NBI Ant Library
diff --git a/libs.nbi.ant/stub/build.properties b/libs.nbi.ant/stub/build.properties
index 762b326..a0ebacd 100644
--- a/libs.nbi.ant/stub/build.properties
+++ b/libs.nbi.ant/stub/build.properties
@@ -1,50 +1,33 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
+#
+# The contents of this file are subject to the terms of the Common Development and
+# Distribution License (the License). You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the License at http://www.netbeans.org/cddl.html or
+# http://www.netbeans.org/cddl.txt.
+#
+# When distributing Covered Code, include this CDDL Header Notice in each file and
+# include the License file at http://www.netbeans.org/cddl.txt. If applicable, add
+# the following below the CDDL Header, with the fields enclosed by brackets []
+# replaced by your own identifying information:
+#
+# "Portions Copyrighted [year] [name of copyright owner]"
+#
+# The Original Software is NetBeans. The Initial Developer of the Original Software
+# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+# Rights Reserved.
+#
+
output.dir=${basedir}/build
jarsigner.enabled=false
pack200.enabled={pack200.enabled}
core.module.name=nbi
ext.module.name=ext
-
+
nbi.all.dir=${basedir}/nbi_all
nbi.core.dir=${nbi.all.dir}/${core.module.name}
nbi.ext.dir=${nbi.all.dir}/${ext.module.name}
-
+
temp.file=${nbi.all.dir}/temp.ant.tmp
environment.properties=${nbi.all.dir}/environment.properties
diff --git a/libs.nbi.ant/stub/build.xml b/libs.nbi.ant/stub/build.xml
index 9aeac37..2d5cfbd 100644
--- a/libs.nbi.ant/stub/build.xml
+++ b/libs.nbi.ant/stub/build.xml
@@ -1,54 +1,15 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project name="build installers" default="build" basedir=".">
<property file="${basedir}/build.properties"/>
<property file="${basedir}/custom.properties"/>
-
+
<target name="build" depends="init,-build,-generate-bundles,post-build"/>
-
+
<target name="init" depends="-clean,-checkout,-init,-init-properties,-post-init-clean"/>
<target name="-clean-cvs" unless="no.checkout">
<delete dir="${nbi.all.dir}"/>
</target>
-
+
<target name="-clean" depends="-clean-cvs" unless="no.clean">
<delete dir="${output.dir}"/>
<delete dir="${nbi.ext.dir}/products/helloworld/build"/>
@@ -62,9 +23,9 @@ Contributor(s):
<target name="post-build">
<delete dir="${output.dir}/registry-temp"/>
</target>
-
+
<target name="-checkout">
-
+
<copy todir="${nbi.all.dir}/.common">
<fileset dir="${basedir}/.common"/>
</copy>
diff --git a/libs.nbi.ant/stub/ext/components/products/helloworld/build.xml b/libs.nbi.ant/stub/ext/components/products/helloworld/build.xml
index 89dbb81..07f2eba 100644
--- a/libs.nbi.ant/stub/ext/components/products/helloworld/build.xml
+++ b/libs.nbi.ant/stub/ext/components/products/helloworld/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
@@ -51,9 +12,9 @@ Contributor(s):
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
diff --git a/libs.nbi.ant/stub/ext/components/products/helloworld/data/Bundle.properties b/libs.nbi.ant/stub/ext/components/products/helloworld/data/Bundle.properties
index 2acb796..9a914fa 100644
--- a/libs.nbi.ant/stub/ext/components/products/helloworld/data/Bundle.properties
+++ b/libs.nbi.ant/stub/ext/components/products/helloworld/data/Bundle.properties
@@ -1,39 +1,41 @@
+#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
+# The contents of this file are subject to the terms of either the GNU General Public
+# License Version 2 only ("GPL") or the Common Development and Distribution
+# License("CDDL") (collectively, the "License"). You may not use this file except in
+# compliance with the License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+# License for the specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header Notice in
+# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+# designates this particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+# If applicable, add the following below the License Header, with the fields enclosed
+# by brackets [] replaced by your own identifying information:
# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
+#
# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original Software
+# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+# Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL or only the
+# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+# this software in this distribution under the [CDDL or GPL Version 2] license." If
+# you do not indicate a single choice of license, a recipient has the option to
+# distribute your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above. However, if you
+# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+# option applies only if the new code is made subject to such option by the copyright
+# holder.
+#
+
product.display.name={product-name}
product.description={product-description}
diff --git a/libs.nbi.ant/stub/ext/components/products/helloworld/nbproject/project.properties b/libs.nbi.ant/stub/ext/components/products/helloworld/nbproject/project.properties
index 0f6aad6..638285a 100644
--- a/libs.nbi.ant/stub/ext/components/products/helloworld/nbproject/project.properties
+++ b/libs.nbi.ant/stub/ext/components/products/helloworld/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
application.title=helloworld
application.vendor=dlm198383
build.classes.dir=${build.dir}/classes
diff --git a/libs.nbi.ant/stub/ext/components/products/helloworld/nbproject/project.xml b/libs.nbi.ant/stub/ext/components/products/helloworld/nbproject/project.xml
index 5e83d29..6ca287d 100644
--- a/libs.nbi.ant/stub/ext/components/products/helloworld/nbproject/project.xml
+++ b/libs.nbi.ant/stub/ext/components/products/helloworld/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
diff --git a/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/Bundle.properties b/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/Bundle.properties
index 2e1fd1d..273df84 100644
--- a/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/Bundle.properties
+++ b/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
CL.app.name={product-simple-name}
CL.desktop.shortcut.name={product-name}
CL.desktop.shortcut.description=
diff --git a/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/ConfigurationLogic.java b/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/ConfigurationLogic.java
index c4329d0..9dc7a80 100644
--- a/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/ConfigurationLogic.java
+++ b/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/ConfigurationLogic.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,6 +24,12 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2011 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
* If you wish your version of this file to be governed by only the CDDL
* or only the GPL Version 2, indicate your decision by adding
* "[Contributor] elects to include this software in this distribution
@@ -34,9 +40,8 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- *
- * Contributor(s):
*/
+
package org.mycompany;
import java.util.List;
diff --git a/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard.xml b/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard.xml
index 9f7995f..6ce9f15 100644
--- a/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard.xml
+++ b/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard.xml
@@ -1,44 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+ Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+ Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ Other names may be trademarks of their respective owners.
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ The contents of this file are subject to the terms of either the GNU General Public
+ License Version 2 only ("GPL") or the Common Development and Distribution
+ License("CDDL") (collectively, the "License"). You may not use this file except in
+ compliance with the License. You can obtain a copy of the License at
+ http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+ License for the specific language governing permissions and limitations under the
+ License. When distributing the software, include this License Header Notice in
+ each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+ designates this particular file as subject to the "Classpath" exception as provided
+ by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+ If applicable, add the following below the License Header, with the fields enclosed
+ by brackets [] replaced by your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original Software
+ is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+ Rights Reserved.
+
+ If you wish your version of this file to be governed by only the CDDL or only the
+ GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+ this software in this distribution under the [CDDL or GPL Version 2] license." If
+ you do not indicate a single choice of license, a recipient has the option to
+ distribute your version of this file under either the CDDL, the GPL Version 2 or
+ to extend the choice of license to its licensees as provided above. However, if you
+ add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+ option applies only if the new code is made subject to such option by the copyright
+ holder.
-->
<wizard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="wizard-components.xsd">
- <component class="org.mycompany.wizard.panels.HelloWorldPanel"/>
+ <component class="org.mycompany.wizard.panels.HelloWorldPanel"/>
</wizard>
diff --git a/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard/panels/Bundle.properties b/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard/panels/Bundle.properties
index 1c1b64d..c6f3ca2 100644
--- a/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard/panels/Bundle.properties
+++ b/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard/panels/Bundle.properties
@@ -1,40 +1,43 @@
+#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
+# The contents of this file are subject to the terms of either the GNU General Public
+# License Version 2 only ("GPL") or the Common Development and Distribution
+# License("CDDL") (collectively, the "License"). You may not use this file except in
+# compliance with the License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+# License for the specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header Notice in
+# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+# designates this particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+# If applicable, add the following below the License Header, with the fields enclosed
+# by brackets [] replaced by your own identifying information:
# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
+#
# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original Software
+# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+# Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL or only the
+# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+# this software in this distribution under the [CDDL or GPL Version 2] license." If
+# you do not indicate a single choice of license, a recipient has the option to
+# distribute your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above. However, if you
+# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+# option applies only if the new code is made subject to such option by the copyright
+# holder.
+#
+
+################################################################################
# HelloWorldPanel.java
P.title={product-name} Installation
P.description=Choose destination folder.
diff --git a/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard/panels/HelloWorldPanel.java b/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard/panels/HelloWorldPanel.java
index b02c75f..6ea7574 100644
--- a/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard/panels/HelloWorldPanel.java
+++ b/libs.nbi.ant/stub/ext/components/products/helloworld/src/org/mycompany/wizard/panels/HelloWorldPanel.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,6 +24,12 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2011 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
* If you wish your version of this file to be governed by only the CDDL
* or only the GPL Version 2, indicate your decision by adding
* "[Contributor] elects to include this software in this distribution
@@ -34,9 +40,8 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- *
- * Contributor(s):
*/
+
package org.mycompany.wizard.panels;
import java.awt.GridBagConstraints;
@@ -53,6 +58,10 @@ import org.netbeans.installer.wizard.containers.SwingContainer;
import org.netbeans.installer.wizard.ui.SwingUi;
import org.netbeans.installer.wizard.ui.WizardUi;
+/**
+ *
+ * @author Dmitry Lipin
+ */
public class HelloWorldPanel extends DestinationPanel {
public HelloWorldPanel() {
diff --git a/libs.nbi.ant/stub/ext/engine/build.properties b/libs.nbi.ant/stub/ext/engine/build.properties
index 4c4e7b3..bbe1e3e 100644
--- a/libs.nbi.ant/stub/ext/engine/build.properties
+++ b/libs.nbi.ant/stub/ext/engine/build.properties
@@ -1,39 +1,41 @@
+#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
+# The contents of this file are subject to the terms of either the GNU General Public
+# License Version 2 only ("GPL") or the Common Development and Distribution
+# License("CDDL") (collectively, the "License"). You may not use this file except in
+# compliance with the License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+# License for the specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header Notice in
+# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+# designates this particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+# If applicable, add the following below the License Header, with the fields enclosed
+# by brackets [] replaced by your own identifying information:
# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
+#
# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original Software
+# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+# Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL or only the
+# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+# this software in this distribution under the [CDDL or GPL Version 2] license." If
+# you do not indicate a single choice of license, a recipient has the option to
+# distribute your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above. However, if you
+# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+# option applies only if the new code is made subject to such option by the copyright
+# holder.
+#
+
jar.contents.list=data/engine.list
jar.contents.includes=native/** org/** com/apple/** data/clioptions.list data/engine*.properties
diff --git a/libs.nbi.ant/stub/ext/engine/build.xml b/libs.nbi.ant/stub/ext/engine/build.xml
index fa05579..f49986b 100644
--- a/libs.nbi.ant/stub/ext/engine/build.xml
+++ b/libs.nbi.ant/stub/ext/engine/build.xml
@@ -1,55 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+ Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+ Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ Other names may be trademarks of their respective owners.
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ The contents of this file are subject to the terms of either the GNU General Public
+ License Version 2 only ("GPL") or the Common Development and Distribution
+ License("CDDL") (collectively, the "License"). You may not use this file except in
+ compliance with the License. You can obtain a copy of the License at
+ http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+ License for the specific language governing permissions and limitations under the
+ License. When distributing the software, include this License Header Notice in
+ each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+ designates this particular file as subject to the "Classpath" exception as provided
+ by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+ If applicable, add the following below the License Header, with the fields enclosed
+ by brackets [] replaced by your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original Software
+ is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+ Rights Reserved.
+
+ If you wish your version of this file to be governed by only the CDDL or only the
+ GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+ this software in this distribution under the [CDDL or GPL Version 2] license." If
+ you do not indicate a single choice of license, a recipient has the option to
+ distribute your version of this file under either the CDDL, the GPL Version 2 or
+ to extend the choice of license to its licensees as provided above. However, if you
+ add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+ option applies only if the new code is made subject to such option by the copyright
+ holder.
-->
<project name="Hello_World_Installer" default="default" basedir=".">
<import file="nbproject/build-impl.xml"/>
-
+
<property file="build.properties"/>
-
+
<target name="-post-compile" depends="-unjar-core-engine,create-jar-contents-list"/>
<target name="-unjar-core-engine">
<!-- Add the contents of the core engine to the engine we're building -->
- <unjar
- src="${reference.NBI_Engine.jar}"
- dest="${build.classes.dir}"
+ <unjar
+ src="${reference.NBI_Engine.jar}"
+ dest="${build.classes.dir}"
overwrite="false"/>
</target>
diff --git a/libs.nbi.ant/stub/ext/engine/nbproject/build-impl.xml b/libs.nbi.ant/stub/ext/engine/nbproject/build-impl.xml
index f2dc9cb..3e2b9c5 100644
--- a/libs.nbi.ant/stub/ext/engine/nbproject/build-impl.xml
+++ b/libs.nbi.ant/stub/ext/engine/nbproject/build-impl.xml
@@ -1179,7 +1179,7 @@ is divided into following sections:
<target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
<fail unless="run.class">Must select one file in the IDE or set run.class</fail>
<startprofiler/>
- <antcall target="run-test-with-main"/>
+ <antcal target="run-test-with-main"/>
</target>
<target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
<fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
diff --git a/libs.nbi.ant/stub/ext/engine/nbproject/project.properties b/libs.nbi.ant/stub/ext/engine/nbproject/project.properties
index c8f25ba..db715f0 100644
--- a/libs.nbi.ant/stub/ext/engine/nbproject/project.properties
+++ b/libs.nbi.ant/stub/ext/engine/nbproject/project.properties
@@ -1,40 +1,42 @@
+#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
+# The contents of this file are subject to the terms of either the GNU General Public
+# License Version 2 only ("GPL") or the Common Development and Distribution
+# License("CDDL") (collectively, the "License"). You may not use this file except in
+# compliance with the License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+# License for the specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header Notice in
+# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+# designates this particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+# If applicable, add the following below the License Header, with the fields enclosed
+# by brackets [] replaced by your own identifying information:
# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
+#
# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original Software
+# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+# Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL or only the
+# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+# this software in this distribution under the [CDDL or GPL Version 2] license." If
+# you do not indicate a single choice of license, a recipient has the option to
+# distribute your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above. However, if you
+# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+# option applies only if the new code is made subject to such option by the copyright
+# holder.
+#
+
application.title=NetBeans Installer Engine
application.vendor=ks152834
build.classes.dir=${build.dir}/classes
diff --git a/libs.nbi.ant/stub/ext/engine/nbproject/project.xml b/libs.nbi.ant/stub/ext/engine/nbproject/project.xml
index 80333f5..3d5888d 100644
--- a/libs.nbi.ant/stub/ext/engine/nbproject/project.xml
+++ b/libs.nbi.ant/stub/ext/engine/nbproject/project.xml
@@ -1,42 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+ Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+ Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ Other names may be trademarks of their respective owners.
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ The contents of this file are subject to the terms of either the GNU General Public
+ License Version 2 only ("GPL") or the Common Development and Distribution
+ License("CDDL") (collectively, the "License"). You may not use this file except in
+ compliance with the License. You can obtain a copy of the License at
+ http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+ License for the specific language governing permissions and limitations under the
+ License. When distributing the software, include this License Header Notice in
+ each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+ designates this particular file as subject to the "Classpath" exception as provided
+ by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+ If applicable, add the following below the License Header, with the fields enclosed
+ by brackets [] replaced by your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original Software
+ is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+ Rights Reserved.
+
+ If you wish your version of this file to be governed by only the CDDL or only the
+ GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+ this software in this distribution under the [CDDL or GPL Version 2] license." If
+ you do not indicate a single choice of license, a recipient has the option to
+ distribute your version of this file under either the CDDL, the GPL Version 2 or
+ to extend the choice of license to its licensees as provided above. However, if you
+ add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+ option applies only if the new code is made subject to such option by the copyright
+ holder.
-->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
diff --git a/libs.nbi.ant/stub/ext/engine/src/data/engine.properties b/libs.nbi.ant/stub/ext/engine/src/data/engine.properties
index 75212d7..bd92d3a 100644
--- a/libs.nbi.ant/stub/ext/engine/src/data/engine.properties
+++ b/libs.nbi.ant/stub/ext/engine/src/data/engine.properties
@@ -1,40 +1,43 @@
+
+#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
+# The contents of this file are subject to the terms of either the GNU General Public
+# License Version 2 only ("GPL") or the Common Development and Distribution
+# License("CDDL") (collectively, the "License"). You may not use this file except in
+# compliance with the License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+# License for the specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header Notice in
+# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+# designates this particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+# If applicable, add the following below the License Header, with the fields enclosed
+# by brackets [] replaced by your own identifying information:
# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
+#
# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original Software
+# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+# Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL or only the
+# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+# this software in this distribution under the [CDDL or GPL Version 2] license." If
+# you do not indicate a single choice of license, a recipient has the option to
+# distribute your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above. However, if you
+# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+# option applies only if the new code is made subject to such option by the copyright
+# holder.
+#
+
nbi.wizard.components.instance.uri=resource:org/mycompany/installer/wizard/wizard-components.xml
nbi.wizard.ui.swing.frame.icon=resource:org/mycompany/installer/wizard/wizard-icon.png
nbi.wizard.ui.swing.frame.title.prefix= {product-name} Installer
diff --git a/libs.nbi.ant/stub/ext/engine/src/native/launcher/unix/i18n/launcher.properties b/libs.nbi.ant/stub/ext/engine/src/native/launcher/unix/i18n/launcher.properties
index c1ed93e..ee0dedd 100644
--- a/libs.nbi.ant/stub/ext/engine/src/native/launcher/unix/i18n/launcher.properties
+++ b/libs.nbi.ant/stub/ext/engine/src/native/launcher/unix/i18n/launcher.properties
@@ -1,40 +1,42 @@
+#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
+# The contents of this file are subject to the terms of either the GNU General Public
+# License Version 2 only ("GPL") or the Common Development and Distribution
+# License("CDDL") (collectively, the "License"). You may not use this file except in
+# compliance with the License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+# License for the specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header Notice in
+# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+# designates this particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+# If applicable, add the following below the License Header, with the fields enclosed
+# by brackets [] replaced by your own identifying information:
# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
+#
# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original Software
+# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+# Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL or only the
+# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+# this software in this distribution under the [CDDL or GPL Version 2] license." If
+# you do not indicate a single choice of license, a recipient has the option to
+# distribute your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above. However, if you
+# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+# option applies only if the new code is made subject to such option by the copyright
+# holder.
+#
+
nlu.jvm.notfoundmessage=Java SE Development Kit (JDK) was not found on this computer\nJDK 7 is required for installing {product-name}. Make sure that the JDK is properly installed and run installer again.\nYou can specify valid JDK location using {0} installer argument.\n\nTo download the JDK, visit http://www.oracle.com/technetwork/java/javase/downloads/index.html
nlu.jvm.usererror=Java Runtime Environment (JRE) was not found at the specified location {0}
nlu.jvm.uncompatible=Unsupported JVM version at {0}.\nTry to specify another JVM location using parameter {1}
diff --git a/libs.nbi.ant/stub/ext/engine/src/native/launcher/windows/i18n/launcher.properties b/libs.nbi.ant/stub/ext/engine/src/native/launcher/windows/i18n/launcher.properties
index d38ed39..11c4692 100644
--- a/libs.nbi.ant/stub/ext/engine/src/native/launcher/windows/i18n/launcher.properties
+++ b/libs.nbi.ant/stub/ext/engine/src/native/launcher/windows/i18n/launcher.properties
@@ -1,40 +1,42 @@
+#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2013 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
+# The contents of this file are subject to the terms of either the GNU General Public
+# License Version 2 only ("GPL") or the Common Development and Distribution
+# License("CDDL") (collectively, the "License"). You may not use this file except in
+# compliance with the License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+# License for the specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header Notice in
+# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+# designates this particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+# If applicable, add the following below the License Header, with the fields enclosed
+# by brackets [] replaced by your own identifying information:
# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
+#
# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original Software
+# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+# Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL or only the
+# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+# this software in this distribution under the [CDDL or GPL Version 2] license." If
+# you do not indicate a single choice of license, a recipient has the option to
+# distribute your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above. However, if you
+# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+# option applies only if the new code is made subject to such option by the copyright
+# holder.
+#
+
nlw.jvm.notfoundmessage=Java SE Development Kit (JDK) was not found on this computer\nJDK 7 is required for installing {product-name}. Make sure that the JDK is properly installed and run installer again. You can specify valid JDK location using {0} installer argument.\n\nTo download the JDK, visit http://www.oracle.com/technetwork/java/javase/downloads/index.html
nlw.jvm.usererror=Java Runtime Environment (JRE) was not found\nThere is no JRE at the specified location {0}
nlw.jvm.unsupportedversion=Unsupported Java VM version\nThe Java VM at {0} has the unsupported version
diff --git a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/utils/applications/Bundle.properties b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/utils/applications/Bundle.properties
index 56afab3..ece892d 100644
--- a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/utils/applications/Bundle.properties
+++ b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/utils/applications/Bundle.properties
@@ -1,40 +1,42 @@
+#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
+# The contents of this file are subject to the terms of either the GNU General Public
+# License Version 2 only ("GPL") or the Common Development and Distribution
+# License("CDDL") (collectively, the "License"). You may not use this file except in
+# compliance with the License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+# License for the specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header Notice in
+# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+# designates this particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+# If applicable, add the following below the License Header, with the fields enclosed
+# by brackets [] replaced by your own identifying information:
# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
+#
# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original Software
+# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+# Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL or only the
+# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+# this software in this distribution under the [CDDL or GPL Version 2] license." If
+# you do not indicate a single choice of license, a recipient has the option to
+# distribute your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above. However, if you
+# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+# option applies only if the new code is made subject to such option by the copyright
+# holder.
+#
+
############################################################################
# NetBeansRCPUtils.java
diff --git a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/utils/applications/NetBeansRCPUtils.java b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/utils/applications/NetBeansRCPUtils.java
index 076cde2..27a2d8e 100644
--- a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/utils/applications/NetBeansRCPUtils.java
+++ b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/utils/applications/NetBeansRCPUtils.java
@@ -1,42 +1,42 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
*
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
+ * The contents of this file are subject to the terms of either the GNU General
+ * Public License Version 2 only ("GPL") or the Common Development and Distribution
+ * License("CDDL") (collectively, the "License"). You may not use this file except in
+ * compliance with the License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+ * License for the specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header Notice in
+ * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+ * designates this particular file as subject to the "Classpath" exception as
+ * provided by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the License Header,
+ * with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions Copyrighted [year] [name of copyright owner]"
+ *
* Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original Software
+ * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+ * Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL or only the
+ * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+ * this software in this distribution under the [CDDL or GPL Version 2] license." If
+ * you do not indicate a single choice of license, a recipient has the option to
+ * distribute your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above. However, if
+ * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
+ * the option applies only if the new code is made subject to such option by the
+ * copyright holder.
*/
+
package org.mycompany.installer.utils.applications;
import java.io.File;
@@ -54,9 +54,13 @@ import org.netbeans.installer.utils.system.WindowsNativeUtils;
import org.netbeans.installer.utils.system.WindowsNativeUtils;
import org.netbeans.installer.utils.system.windows.WindowsRegistry;
+/**
+ *
+ * @author Dmitry Lipin
+ */
public class NetBeansRCPUtils {
-
+
/**
* Get resolved application user directory
* @param appLocation Application home directory
diff --git a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/actions/Bundle.properties b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/actions/Bundle.properties
index bd18b61..12de891 100644
--- a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/actions/Bundle.properties
+++ b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/actions/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
IA.title=Installer Initialization
IA.progress.title=Initialization in progress...
IA.description=Please wait while initialization is completed.
\ No newline at end of file
diff --git a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/actions/InitializeAction.java b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/actions/InitializeAction.java
index 67dec52..be955d7 100644
--- a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/actions/InitializeAction.java
+++ b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/actions/InitializeAction.java
@@ -1,42 +1,42 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
*
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
+ * The contents of this file are subject to the terms of either the GNU General
+ * Public License Version 2 only ("GPL") or the Common Development and Distribution
+ * License("CDDL") (collectively, the "License"). You may not use this file except in
+ * compliance with the License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+ * License for the specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header Notice in
+ * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+ * designates this particular file as subject to the "Classpath" exception as
+ * provided by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the License Header,
+ * with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions Copyrighted [year] [name of copyright owner]"
+ *
* Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original Software
+ * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+ * Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL or only the
+ * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+ * this software in this distribution under the [CDDL or GPL Version 2] license." If
+ * you do not indicate a single choice of license, a recipient has the option to
+ * distribute your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above. However, if
+ * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
+ * the option applies only if the new code is made subject to such option by the
+ * copyright holder.
*/
+
package org.mycompany.installer.wizard.components.actions;
import org.netbeans.installer.product.Registry;
@@ -48,13 +48,17 @@ import org.netbeans.installer.utils.progress.Progress;
import org.netbeans.installer.wizard.components.WizardAction;
import org.netbeans.installer.wizard.components.actions.*;
+/**
+ *
+ * @author Dmitry Lipin
+ */
public class InitializeAction extends WizardAction {
/////////////////////////////////////////////////////////////////////////////////
// Instance
public InitializeAction() {
- setProperty(TITLE_PROPERTY,
+ setProperty(TITLE_PROPERTY,
DEFAULT_TITLE);
- setProperty(DESCRIPTION_PROPERTY,
+ setProperty(DESCRIPTION_PROPERTY,
DEFAULT_DESCRIPTION);
downloadLogic = new DownloadConfigurationLogicAction();
diff --git a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/Bundle.properties b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/Bundle.properties
index 186f9ae..ff0017b 100644
--- a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/Bundle.properties
+++ b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
WP.title={product-name} Introduction
WP.description={product-name} is a really good app
WP.welcome.text=<html>\
diff --git a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/PostInstallSummaryPanel.java b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/PostInstallSummaryPanel.java
index ec8c3ff..b622d68 100644
--- a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/PostInstallSummaryPanel.java
+++ b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/PostInstallSummaryPanel.java
@@ -1,41 +1,40 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
*
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
+ * The contents of this file are subject to the terms of either the GNU General
+ * Public License Version 2 only ("GPL") or the Common Development and Distribution
+ * License("CDDL") (collectively, the "License"). You may not use this file except in
+ * compliance with the License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+ * License for the specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header Notice in
+ * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+ * designates this particular file as subject to the "Classpath" exception as
+ * provided by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the License Header,
+ * with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions Copyrighted [year] [name of copyright owner]"
+ *
* Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original Software
+ * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+ * Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL or only the
+ * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+ * this software in this distribution under the [CDDL or GPL Version 2] license." If
+ * you do not indicate a single choice of license, a recipient has the option to
+ * distribute your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above. However, if
+ * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
+ * the option applies only if the new code is made subject to such option by the
+ * copyright holder.
*/
package org.mycompany.installer.wizard.components.panels;
@@ -68,6 +67,10 @@ import static org.netbeans.installer.utils.helper.DetailedStatus.UNINSTALLED_SUC
import static org.netbeans.installer.utils.helper.DetailedStatus.UNINSTALLED_WITH_WARNINGS;
import static org.netbeans.installer.utils.helper.DetailedStatus.FAILED_TO_UNINSTALL;
+/**
+ *
+ * @author Dmitry Lipin
+ */
public class PostInstallSummaryPanel extends WizardPanel {
/////////////////////////////////////////////////////////////////////////////////
// Instance
diff --git a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/PreInstallSummaryPanel.java b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/PreInstallSummaryPanel.java
index d64b60c..1edaf18 100644
--- a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/PreInstallSummaryPanel.java
+++ b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/PreInstallSummaryPanel.java
@@ -1,41 +1,40 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
*
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
+ * The contents of this file are subject to the terms of either the GNU General
+ * Public License Version 2 only ("GPL") or the Common Development and Distribution
+ * License("CDDL") (collectively, the "License"). You may not use this file except in
+ * compliance with the License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+ * License for the specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header Notice in
+ * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+ * designates this particular file as subject to the "Classpath" exception as
+ * provided by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the License Header,
+ * with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions Copyrighted [year] [name of copyright owner]"
*
* Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original Software
+ * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+ * Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL or only the
+ * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+ * this software in this distribution under the [CDDL or GPL Version 2] license." If
+ * you do not indicate a single choice of license, a recipient has the option to
+ * distribute your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above. However, if
+ * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
+ * the option applies only if the new code is made subject to such option by the
+ * copyright holder.
*/
package org.mycompany.installer.wizard.components.panels;
@@ -74,6 +73,10 @@ import org.netbeans.installer.wizard.containers.SwingContainer;
import org.netbeans.installer.wizard.ui.SwingUi;
import org.netbeans.installer.wizard.ui.WizardUi;
+/**
+ *
+ * @author Dmitry Lipin
+ */
public class PreInstallSummaryPanel extends ErrorMessagePanel {
/////////////////////////////////////////////////////////////////////////////////
// Instance
diff --git a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/WelcomePanel.java b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/WelcomePanel.java
index ee3df4f..c1cc015 100644
--- a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/WelcomePanel.java
+++ b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/panels/WelcomePanel.java
@@ -1,41 +1,40 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
*
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
+ * The contents of this file are subject to the terms of either the GNU General
+ * Public License Version 2 only ("GPL") or the Common Development and Distribution
+ * License("CDDL") (collectively, the "License"). You may not use this file except in
+ * compliance with the License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+ * License for the specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header Notice in
+ * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+ * designates this particular file as subject to the "Classpath" exception as
+ * provided by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the License Header,
+ * with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions Copyrighted [year] [name of copyright owner]"
*
* Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original Software
+ * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+ * Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL or only the
+ * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+ * this software in this distribution under the [CDDL or GPL Version 2] license." If
+ * you do not indicate a single choice of license, a recipient has the option to
+ * distribute your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above. However, if
+ * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
+ * the option applies only if the new code is made subject to such option by the
+ * copyright holder.
*/
package org.mycompany.installer.wizard.components.panels;
@@ -63,6 +62,10 @@ import org.netbeans.installer.wizard.containers.SwingContainer;
import org.netbeans.installer.wizard.ui.SwingUi;
import org.netbeans.installer.wizard.ui.WizardUi;
+/**
+ *
+ * @author Dmitry Lipin
+ */
public class WelcomePanel extends ErrorMessagePanel {
/////////////////////////////////////////////////////////////////////////////////
private Registry bundledRegistry;
diff --git a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/sequences/Bundle.properties b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/sequences/Bundle.properties
index 57bd06c..62ce479 100644
--- a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/sequences/Bundle.properties
+++ b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/sequences/Bundle.properties
@@ -1,40 +1,42 @@
+#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
+# The contents of this file are subject to the terms of either the GNU General Public
+# License Version 2 only ("GPL") or the Common Development and Distribution
+# License("CDDL") (collectively, the "License"). You may not use this file except in
+# compliance with the License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+# License for the specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header Notice in
+# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+# designates this particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+# If applicable, add the following below the License Header, with the fields enclosed
+# by brackets [] replaced by your own identifying information:
# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
+#
# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original Software
+# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+# Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL or only the
+# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+# this software in this distribution under the [CDDL or GPL Version 2] license." If
+# you do not indicate a single choice of license, a recipient has the option to
+# distribute your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above. However, if you
+# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+# option applies only if the new code is made subject to such option by the copyright
+# holder.
+#
+
#####################################################################################
# MainSequence.java
MS.IA.title=Installation
diff --git a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/sequences/MainSequence.java b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/sequences/MainSequence.java
index 8b58d9b..86534f6 100644
--- a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/sequences/MainSequence.java
+++ b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/components/sequences/MainSequence.java
@@ -1,41 +1,40 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
*
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
+ * The contents of this file are subject to the terms of either the GNU General
+ * Public License Version 2 only ("GPL") or the Common Development and Distribution
+ * License("CDDL") (collectively, the "License"). You may not use this file except in
+ * compliance with the License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+ * License for the specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header Notice in
+ * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+ * designates this particular file as subject to the "Classpath" exception as
+ * provided by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the License Header,
+ * with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions Copyrighted [year] [name of copyright owner]"
+ *
* Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original Software
+ * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+ * Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL or only the
+ * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+ * this software in this distribution under the [CDDL or GPL Version 2] license." If
+ * you do not indicate a single choice of license, a recipient has the option to
+ * distribute your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above. However, if
+ * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
+ * the option applies only if the new code is made subject to such option by the
+ * copyright holder.
*/
package org.mycompany.installer.wizard.components.sequences;
@@ -56,6 +55,10 @@ import org.netbeans.installer.wizard.components.actions.InstallAction;
import org.netbeans.installer.wizard.components.actions.UninstallAction;
import org.netbeans.installer.wizard.components.panels.LicensesPanel;
+/**
+ *
+ * @author Dmitry Lipin
+ */
public class MainSequence extends WizardSequence {
/////////////////////////////////////////////////////////////////////////////////
// Instance
diff --git a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/wizard-components.xml b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/wizard-components.xml
index c7aa60e..6b9509d 100644
--- a/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/wizard-components.xml
+++ b/libs.nbi.ant/stub/ext/engine/src/org/mycompany/installer/wizard/wizard-components.xml
@@ -1,53 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+ Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
+ Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ Other names may be trademarks of their respective owners.
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ The contents of this file are subject to the terms of either the GNU General Public
+ License Version 2 only ("GPL") or the Common Development and Distribution
+ License("CDDL") (collectively, the "License"). You may not use this file except in
+ compliance with the License. You can obtain a copy of the License at
+ http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+ License for the specific language governing permissions and limitations under the
+ License. When distributing the software, include this License Header Notice in
+ each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+ designates this particular file as subject to the "Classpath" exception as provided
+ by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+ If applicable, add the following below the License Header, with the fields enclosed
+ by brackets [] replaced by your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original Software
+ is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+ Rights Reserved.
+
+ If you wish your version of this file to be governed by only the CDDL or only the
+ GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+ this software in this distribution under the [CDDL or GPL Version 2] license." If
+ you do not indicate a single choice of license, a recipient has the option to
+ distribute your version of this file under either the CDDL, the GPL Version 2 or
+ to extend the choice of license to its licensees as provided above. However, if you
+ add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+ option applies only if the new code is made subject to such option by the copyright
+ holder.
-->
<wizard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="wizard-components.xsd">
- <component
+ <component
class="org.mycompany.installer.wizard.components.actions.InitializeAction"/>
- <component
+ <component
class="org.mycompany.installer.wizard.components.panels.WelcomePanel"/>
- <component
+ <component
class="org.mycompany.installer.wizard.components.sequences.MainSequence"/>
- <component
+ <component
class="org.netbeans.installer.wizard.components.sequences.CreateBundleSequence"/>
- <component
+ <component
class="org.netbeans.installer.wizard.components.actions.FinalizeRegistryAction"/>
</wizard>
diff --git a/libs.nbi.ant/stub/ext/infra/build/engine/build.properties b/libs.nbi.ant/stub/ext/infra/build/engine/build.properties
index 747f1ef..13c71c7 100644
--- a/libs.nbi.ant/stub/ext/infra/build/engine/build.properties
+++ b/libs.nbi.ant/stub/ext/infra/build/engine/build.properties
@@ -1,3 +1,42 @@
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#
+# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+# Other names may be trademarks of their respective owners.
+#
+# The contents of this file are subject to the terms of either the GNU General Public
+# License Version 2 only ("GPL") or the Common Development and Distribution
+# License("CDDL") (collectively, the "License"). You may not use this file except in
+# compliance with the License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+# License for the specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header Notice in
+# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+# designates this particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+# If applicable, add the following below the License Header, with the fields enclosed
+# by brackets [] replaced by your own identifying information:
+# "Portions Copyrighted [year] [name of copyright owner]"
+#
+# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original Software
+# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+# Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL or only the
+# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+# this software in this distribution under the [CDDL or GPL Version 2] license." If
+# you do not indicate a single choice of license, a recipient has the option to
+# distribute your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above. However, if you
+# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+# option applies only if the new code is made subject to such option by the copyright
+# holder.
+#
+
# path to the directory where the base build scripts library and properties
# reside
common.dir=../../../../.common
diff --git a/libs.nbi.ant/stub/ext/infra/build/engine/build.xml b/libs.nbi.ant/stub/ext/infra/build/engine/build.xml
index 7390cc3..eec305c 100644
--- a/libs.nbi.ant/stub/ext/infra/build/engine/build.xml
+++ b/libs.nbi.ant/stub/ext/infra/build/engine/build.xml
@@ -1,4 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+
+ Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ Other names may be trademarks of their respective owners.
+
+ The contents of this file are subject to the terms of either the GNU General Public
+ License Version 2 only ("GPL") or the Common Development and Distribution
+ License("CDDL") (collectively, the "License"). You may not use this file except in
+ compliance with the License. You can obtain a copy of the License at
+ http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+ License for the specific language governing permissions and limitations under the
+ License. When distributing the software, include this License Header Notice in
+ each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+ designates this particular file as subject to the "Classpath" exception as provided
+ by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+ If applicable, add the following below the License Header, with the fields enclosed
+ by brackets [] replaced by your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original Software
+ is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+ Rights Reserved.
+
+ If you wish your version of this file to be governed by only the CDDL or only the
+ GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+ this software in this distribution under the [CDDL or GPL Version 2] license." If
+ you do not indicate a single choice of license, a recipient has the option to
+ distribute your version of this file under either the CDDL, the GPL Version 2 or
+ to extend the choice of license to its licensees as provided above. However, if you
+ add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+ option applies only if the new code is made subject to such option by the copyright
+ holder.
+-->
<!--
This is the build script for the NetBeans IDE nbi engine instance.
diff --git a/libs.nbi.ant/stub/ext/infra/build/products/helloworld/build.properties b/libs.nbi.ant/stub/ext/infra/build/products/helloworld/build.properties
index 069e7a7..3037cc6 100644
--- a/libs.nbi.ant/stub/ext/infra/build/products/helloworld/build.properties
+++ b/libs.nbi.ant/stub/ext/infra/build/products/helloworld/build.properties
@@ -1,3 +1,42 @@
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#
+# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+# Other names may be trademarks of their respective owners.
+#
+# The contents of this file are subject to the terms of either the GNU General Public
+# License Version 2 only ("GPL") or the Common Development and Distribution
+# License("CDDL") (collectively, the "License"). You may not use this file except in
+# compliance with the License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+# License for the specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header Notice in
+# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+# designates this particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+# If applicable, add the following below the License Header, with the fields enclosed
+# by brackets [] replaced by your own identifying information:
+# "Portions Copyrighted [year] [name of copyright owner]"
+#
+# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original Software
+# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+# Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL or only the
+# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+# this software in this distribution under the [CDDL or GPL Version 2] license." If
+# you do not indicate a single choice of license, a recipient has the option to
+# distribute your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above. However, if you
+# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+# option applies only if the new code is made subject to such option by the copyright
+# holder.
+#
+
# path to the directory where the base build scripts library and properties
# reside
common.dir=../../../../../.common
diff --git a/libs.nbi.ant/stub/ext/infra/build/products/helloworld/build.xml b/libs.nbi.ant/stub/ext/infra/build/products/helloworld/build.xml
index aa67fe0..00fbe27 100644
--- a/libs.nbi.ant/stub/ext/infra/build/products/helloworld/build.xml
+++ b/libs.nbi.ant/stub/ext/infra/build/products/helloworld/build.xml
@@ -1,4 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+ Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+
+ Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ Other names may be trademarks of their respective owners.
+
+ The contents of this file are subject to the terms of either the GNU General Public
+ License Version 2 only ("GPL") or the Common Development and Distribution
+ License("CDDL") (collectively, the "License"). You may not use this file except in
+ compliance with the License. You can obtain a copy of the License at
+ http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+ License for the specific language governing permissions and limitations under the
+ License. When distributing the software, include this License Header Notice in
+ each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+ designates this particular file as subject to the "Classpath" exception as provided
+ by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+ If applicable, add the following below the License Header, with the fields enclosed
+ by brackets [] replaced by your own identifying information:
+ "Portions Copyrighted [year] [name of copyright owner]"
+
+ Contributor(s):
+
+ The Original Software is NetBeans. The Initial Developer of the Original Software
+ is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+ Rights Reserved.
+
+ If you wish your version of this file to be governed by only the CDDL or only the
+ GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+ this software in this distribution under the [CDDL or GPL Version 2] license." If
+ you do not indicate a single choice of license, a recipient has the option to
+ distribute your version of this file under either the CDDL, the GPL Version 2 or
+ to extend the choice of license to its licensees as provided above. However, if you
+ add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+ option applies only if the new code is made subject to such option by the copyright
+ holder.
+-->
<!--
This is the build script for the helloworld product package.
diff --git a/libs.nbi.ant/stub/tmpl.properties b/libs.nbi.ant/stub/tmpl.properties
index 231886d..e8b316a 100644
--- a/libs.nbi.ant/stub/tmpl.properties
+++ b/libs.nbi.ant/stub/tmpl.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
suite.location=C:/Documents and Settings/Lipin/My Documents/NetBeansProjects/MyApp
nbi.cluster.location=D:/space/NB-IDE/proto/nbbuild/netbeans/extra
diff --git a/libs.nbi.engine/build.xml b/libs.nbi.engine/build.xml
index 895b81b..814299d 100644
--- a/libs.nbi.engine/build.xml
+++ b/libs.nbi.engine/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
<!-- for some information on what you could do (e.g. targets to override). -->
<!-- If you delete this file and reopen the project it will be recreated. -->
diff --git a/libs.nbi.engine/manifest.mf b/libs.nbi.engine/manifest.mf
index 04be461..cef764d 100644
--- a/libs.nbi.engine/manifest.mf
+++ b/libs.nbi.engine/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.libs.nbi.engine
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/nbi/engine/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.21.1
+OpenIDE-Module-Specification-Version: 1.20.1
diff --git a/libs.nbi.engine/nbproject/project.properties b/libs.nbi.engine/nbproject/project.properties
index 018761b..e16321a 100644
--- a/libs.nbi.engine/nbproject/project.properties
+++ b/libs.nbi.engine/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/libs.nbi.engine/nbproject/project.xml b/libs.nbi.engine/nbproject/project.xml
index 23c08a9..5d681e6 100644
--- a/libs.nbi.engine/nbproject/project.xml
+++ b/libs.nbi.engine/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/libs.nbi.engine/src/org/netbeans/libs/nbi/engine/Bundle.properties b/libs.nbi.engine/src/org/netbeans/libs/nbi/engine/Bundle.properties
index 08af128..8b27e55 100644
--- a/libs.nbi.engine/src/org/netbeans/libs/nbi/engine/Bundle.properties
+++ b/libs.nbi.engine/src/org/netbeans/libs/nbi/engine/Bundle.properties
@@ -1,39 +1,2 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Name=NBI Engine Library
diff --git a/libs.osgi/build.xml b/libs.osgi/build.xml
index 727215e..6c37fdc 100644
--- a/libs.osgi/build.xml
+++ b/libs.osgi/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="libs.osgi">
<description>Builds, tests, and runs the project org.netbeans.libs.osgi</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/libs.osgi/manifest.mf b/libs.osgi/manifest.mf
index d64c019..995ae91 100644
--- a/libs.osgi/manifest.mf
+++ b/libs.osgi/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.osgi
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/osgi/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.21.1
+OpenIDE-Module-Specification-Version: 1.20.1
diff --git a/libs.osgi/nbproject/project.properties b/libs.osgi/nbproject/project.properties
index fbe2889..24ded93 100644
--- a/libs.osgi/nbproject/project.properties
+++ b/libs.osgi/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/libs.osgi/nbproject/project.xml b/libs.osgi/nbproject/project.xml
index af505de..e883b68 100644
--- a/libs.osgi/nbproject/project.xml
+++ b/libs.osgi/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/libs.osgi/src/org/netbeans/libs/osgi/Bundle.properties b/libs.osgi/src/org/netbeans/libs/osgi/Bundle.properties
index d93d508..df9d66a 100644
--- a/libs.osgi/src/org/netbeans/libs/osgi/Bundle.properties
+++ b/libs.osgi/src/org/netbeans/libs/osgi/Bundle.properties
@@ -1,38 +1 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=OSGi Specification
diff --git a/libs.testng/manifest.mf b/libs.testng/manifest.mf
index 1ccb305..4355111 100644
--- a/libs.testng/manifest.mf
+++ b/libs.testng/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.libs.testng/1
-OpenIDE-Module-Specification-Version: 1.14.1
+OpenIDE-Module-Specification-Version: 1.13.1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/testng/Bundle.properties
diff --git a/masterfs.linux/build.xml b/masterfs.linux/build.xml
index ea2bcb3..5fa716b 100644
--- a/masterfs.linux/build.xml
+++ b/masterfs.linux/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="masterfs.linux">
<description>Builds, tests, and runs the project org.netbeans.modules.masterfs.linux</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/masterfs.linux/manifest.mf b/masterfs.linux/manifest.mf
index 66c8a55..daf0594 100644
--- a/masterfs.linux/manifest.mf
+++ b/masterfs.linux/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.masterfs.linux
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/masterfs/watcher/linux/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.13.1
+OpenIDE-Module-Specification-Version: 1.12.1
OpenIDE-Module-Requires: org.openide.modules.os.Linux
OpenIDE-Module-Provides: org.netbeans.modules.masterfs.providers.Notifier
diff --git a/masterfs.linux/nbproject/project.properties b/masterfs.linux/nbproject/project.properties
index 7e9e040..085caf0 100644
--- a/masterfs.linux/nbproject/project.properties
+++ b/masterfs.linux/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/masterfs.linux/nbproject/project.xml b/masterfs.linux/nbproject/project.xml
index 5b03448..49c5c80 100644
--- a/masterfs.linux/nbproject/project.xml
+++ b/masterfs.linux/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/masterfs.linux/src/org/netbeans/modules/masterfs/watcher/linux/Bundle.properties b/masterfs.linux/src/org/netbeans/modules/masterfs/watcher/linux/Bundle.properties
index 83380b6..4fafb13 100644
--- a/masterfs.linux/src/org/netbeans/modules/masterfs/watcher/linux/Bundle.properties
+++ b/masterfs.linux/src/org/netbeans/modules/masterfs/watcher/linux/Bundle.properties
@@ -1,38 +1 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=Master Filesystem @ Linux
diff --git a/masterfs.linux/src/org/netbeans/modules/masterfs/watcher/linux/LinuxNotifier.java b/masterfs.linux/src/org/netbeans/modules/masterfs/watcher/linux/LinuxNotifier.java
index 9841386..971d796 100644
--- a/masterfs.linux/src/org/netbeans/modules/masterfs/watcher/linux/LinuxNotifier.java
+++ b/masterfs.linux/src/org/netbeans/modules/masterfs/watcher/linux/LinuxNotifier.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/masterfs.macosx/build.xml b/masterfs.macosx/build.xml
index 51ad9e1..dc2f17f 100644
--- a/masterfs.macosx/build.xml
+++ b/masterfs.macosx/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="masterfs.macosx">
<description>Builds, tests, and runs the project org.netbeans.modules.masterfs.macosx</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/masterfs.macosx/manifest.mf b/masterfs.macosx/manifest.mf
index b375e63..2c5787b 100644
--- a/masterfs.macosx/manifest.mf
+++ b/masterfs.macosx/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.masterfs.macosx
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/masterfs/watcher/macosx/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.13.1
+OpenIDE-Module-Specification-Version: 1.12.1
OpenIDE-Module-Requires: org.openide.modules.os.MacOSX
OpenIDE-Module-Provides: org.netbeans.modules.masterfs.providers.Notifier
diff --git a/masterfs.macosx/nbproject/project.properties b/masterfs.macosx/nbproject/project.properties
index 7e9e040..085caf0 100644
--- a/masterfs.macosx/nbproject/project.properties
+++ b/masterfs.macosx/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/masterfs.macosx/nbproject/project.xml b/masterfs.macosx/nbproject/project.xml
index 032d0c5..b54251a 100644
--- a/masterfs.macosx/nbproject/project.xml
+++ b/masterfs.macosx/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/masterfs.macosx/src/org/netbeans/modules/masterfs/watcher/macosx/Bundle.properties b/masterfs.macosx/src/org/netbeans/modules/masterfs/watcher/macosx/Bundle.properties
index 80b57b6..6ff2852 100644
--- a/masterfs.macosx/src/org/netbeans/modules/masterfs/watcher/macosx/Bundle.properties
+++ b/masterfs.macosx/src/org/netbeans/modules/masterfs/watcher/macosx/Bundle.properties
@@ -1,38 +1 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=Master Filesystem @ Mac OS X
diff --git a/masterfs.macosx/src/org/netbeans/modules/masterfs/watcher/macosx/OSXNotifier.java b/masterfs.macosx/src/org/netbeans/modules/masterfs/watcher/macosx/OSXNotifier.java
index b06273c..3b271df 100644
--- a/masterfs.macosx/src/org/netbeans/modules/masterfs/watcher/macosx/OSXNotifier.java
+++ b/masterfs.macosx/src/org/netbeans/modules/masterfs/watcher/macosx/OSXNotifier.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/masterfs.nio2/build.xml b/masterfs.nio2/build.xml
index fecbb15..6d2ad91 100644
--- a/masterfs.nio2/build.xml
+++ b/masterfs.nio2/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="masterfs.nio2">
<description>Builds, tests, and runs the project org.netbeans.modules.masterfs.nio2</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/masterfs.nio2/manifest.mf b/masterfs.nio2/manifest.mf
index e3caedb..6418044 100644
--- a/masterfs.nio2/manifest.mf
+++ b/masterfs.nio2/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.masterfs.nio2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/masterfs/watcher/nio2/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.15.1
+OpenIDE-Module-Specification-Version: 1.14.1
OpenIDE-Module-Provides: org.netbeans.modules.masterfs.providers.Notifier
diff --git a/masterfs.nio2/nbproject/project.properties b/masterfs.nio2/nbproject/project.properties
index 2bee84c..085caf0 100644
--- a/masterfs.nio2/nbproject/project.properties
+++ b/masterfs.nio2/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/masterfs.nio2/nbproject/project.xml b/masterfs.nio2/nbproject/project.xml
index f34d7c2..00ec2c6 100644
--- a/masterfs.nio2/nbproject/project.xml
+++ b/masterfs.nio2/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/masterfs.nio2/src/org/netbeans/modules/masterfs/watcher/nio2/Bundle.properties b/masterfs.nio2/src/org/netbeans/modules/masterfs/watcher/nio2/Bundle.properties
index 36a535f..d3adbd9 100644
--- a/masterfs.nio2/src/org/netbeans/modules/masterfs/watcher/nio2/Bundle.properties
+++ b/masterfs.nio2/src/org/netbeans/modules/masterfs/watcher/nio2/Bundle.properties
@@ -1,38 +1 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=Master Filesystem @ NIO2
diff --git a/masterfs.ui/build.xml b/masterfs.ui/build.xml
index 665a85b..81920b7 100644
--- a/masterfs.ui/build.xml
+++ b/masterfs.ui/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="masterfs.ui">
<description>Builds, tests, and runs the project org.netbeans.modules.masterfs.ui</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/masterfs.ui/nbproject/project.properties b/masterfs.ui/nbproject/project.properties
index 895179b..13ad66e 100644
--- a/masterfs.ui/nbproject/project.properties
+++ b/masterfs.ui/nbproject/project.properties
@@ -1,41 +1,4 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.eager=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=2.3.1
+spec.version.base=2.2.1
diff --git a/masterfs.ui/nbproject/project.xml b/masterfs.ui/nbproject/project.xml
index c8b23b5..c8c3533 100644
--- a/masterfs.ui/nbproject/project.xml
+++ b/masterfs.ui/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/masterfs.ui/src/org/netbeans/modules/masterfs/ui/Bundle.properties b/masterfs.ui/src/org/netbeans/modules/masterfs/ui/Bundle.properties
index a6d95f7..4202aad 100644
--- a/masterfs.ui/src/org/netbeans/modules/masterfs/ui/Bundle.properties
+++ b/masterfs.ui/src/org/netbeans/modules/masterfs/ui/Bundle.properties
@@ -1,38 +1 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=Master Filesystem - UI extensions
diff --git a/masterfs.windows/build.xml b/masterfs.windows/build.xml
index 32654c9..9a7fe7a 100644
--- a/masterfs.windows/build.xml
+++ b/masterfs.windows/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="masterfs.windows">
<description>Builds, tests, and runs the project org.netbeans.modules.masterfs.windows</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/masterfs.windows/manifest.mf b/masterfs.windows/manifest.mf
index e1e1d67..8b40f8c 100644
--- a/masterfs.windows/manifest.mf
+++ b/masterfs.windows/manifest.mf
@@ -3,5 +3,5 @@ OpenIDE-Module: org.netbeans.modules.masterfs.windows
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/masterfs/watcher/windows/Bundle.properties
OpenIDE-Module-Requires: org.openide.modules.os.Windows
OpenIDE-Module-Provides: org.netbeans.modules.masterfs.providers.Notifier
-OpenIDE-Module-Specification-Version: 1.16.1
+OpenIDE-Module-Specification-Version: 1.15.1
diff --git a/masterfs.windows/nbproject/project.properties b/masterfs.windows/nbproject/project.properties
index 7e9e040..085caf0 100644
--- a/masterfs.windows/nbproject/project.properties
+++ b/masterfs.windows/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/masterfs.windows/nbproject/project.xml b/masterfs.windows/nbproject/project.xml
index 5e0fb4a..76fae26 100644
--- a/masterfs.windows/nbproject/project.xml
+++ b/masterfs.windows/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/Bundle.properties b/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/Bundle.properties
index 79f2baa..38bfa8f 100644
--- a/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/Bundle.properties
+++ b/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/Bundle.properties
@@ -1,38 +1 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=Master Filesystem @ Windows
diff --git a/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java b/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java
index 579fa98..e2ecf6c 100644
--- a/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java
+++ b/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/masterfs/nbproject/project.properties b/masterfs/nbproject/project.properties
index 4669e1b..9b70c58 100644
--- a/masterfs/nbproject/project.properties
+++ b/masterfs/nbproject/project.properties
@@ -60,4 +60,4 @@ test.config.stableBTD.excludes=\
**/SlowRefreshAndPriorityIOTest.class,\
**/SlowRefreshSuspendableTest.class,\
**/StatFilesTest.class
-spec.version.base=2.55.1
+spec.version.base=2.54.1
diff --git a/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java b/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java
index c01e03d..9dc7010 100644
--- a/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java
+++ b/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java
@@ -59,10 +59,7 @@ import org.openide.util.Mutex;
import javax.swing.event.EventListenerList;
import java.io.*;
-import java.nio.file.DirectoryNotEmptyException;
import java.nio.file.Files;
-import java.nio.file.InvalidPathException;
-import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.AccessController;
@@ -816,7 +813,7 @@ public abstract class BaseFileObj extends FileObject {
FSException.io("EXC_InvalidLock", lock, getPath()); // NOI18N
}
- boolean deleteStatus = (deleteHandler != null) ? deleteHandler.delete(f) : deleteFile(f);
+ boolean deleteStatus = (deleteHandler != null) ? deleteHandler.delete(f) : f.delete();
if (!deleteStatus) {
FileObject parent = getExistingParent();
String parentPath = (parent != null) ? parent.getPath() : f.getParentFile().getAbsolutePath();
@@ -840,36 +837,6 @@ public abstract class BaseFileObj extends FileObject {
fireFileDeletedEvent(false);
}
-
- /**
- * Delete a file. Mimic API of {@link java.io.File} (return false on
- * failure), but log the exception if the operation was not successful.
- *
- * @param f The file to delete.
- *
- * @return True if the file was deleted, false otherwise.
- */
- private static boolean deleteFile(File f) {
- try {
- Path p = f.toPath();
- try {
- Files.delete(p);
- return true;
- } catch (NoSuchFileException ex) {
- LOG.log(Level.INFO, "File not found: " + p, ex); //NOI18N
- return false;
- } catch (DirectoryNotEmptyException ex) {
- LOG.log(Level.INFO, "Non-empty directory: " + p, ex); //NOI18N
- return false;
- } catch (IOException ex) {
- LOG.log(Level.INFO, "Cannot delete file: " + p, ex); //NOI18N
- return false;
- }
- } catch (InvalidPathException e) { // invalid Path, but valid File?
- LOG.log(Level.FINE, null, e);
- return f.delete();
- }
- }
abstract boolean checkLock(FileLock lock) throws IOException;
@@ -1057,40 +1024,24 @@ public abstract class BaseFileObj extends FileObject {
public final void delete(final String name) throws IOException {
final File file = new File(name);
- final boolean isDeleted = (file.isFile()) ? deleteFile(file) : deleteFolder(file);
+ final boolean isDeleted = (file.isFile()) ? file.delete() : deleteFolder(file);
if (isDeleted) {
FSException.io("EXC_CannotDelete", file.getName(), ""); // NOI18N
}
}
private boolean deleteFolder(final File file) throws IOException {
+ final boolean ret = file.delete();
- boolean directory = false; // true if we are sure the file is folder
- try {
- Path p = file.toPath();
- try {
- Files.delete(p);
- return true;
- } catch (DirectoryNotEmptyException ex) {
- // do not return, recurse the directory
- directory = true;
- } catch (NoSuchFileException ex) {
- LOG.log(Level.INFO, "File not found: " + p, ex); //NOI18N
- return false;
- } catch (IOException ex) {
- LOG.log(Level.INFO, "Cannot delete: " + p, ex); //NOI18N
- return false;
- }
- } catch (InvalidPathException ex) { // invalid Path, valid File?
- LOG.log(Level.FINE, null, ex);
- if (file.delete()) {
- return true;
- } else if (!FileChangedManager.getInstance().exists(file)) {
- return false;
- }
+ if (ret) {
+ return true;
+ }
+
+ if (!FileChangedManager.getInstance().exists(file)) {
+ return false;
}
- if (directory || file.isDirectory()) {
+ if (file.isDirectory()) {
// first of all delete whole content
final File[] arr = file.listFiles();
if (arr != null) { // check for null in case of I/O errors
@@ -1103,7 +1054,7 @@ public abstract class BaseFileObj extends FileObject {
}
}
- return deleteFile(file);
+ return file.delete();
}
}
diff --git a/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObjectKeeper.java b/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObjectKeeper.java
index ccb7361..0944058 100644
--- a/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObjectKeeper.java
+++ b/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FileObjectKeeper.java
@@ -71,9 +71,6 @@ import org.openide.util.Exceptions;
final class FileObjectKeeper implements FileChangeListener {
private static final Logger LOG = Logger.getLogger(FileObjectKeeper.class.getName());
private static final Object TIME_STAMP_LOCK = new Object();
- private static final int RECURSION_LIMIT = Integer.getInteger( //#256269
- "org.netbeans.modules.masterfs.filebasedfs.fileobjects" //NOI18N
- + ".FileObjectKeeper.RECURSION_LIMIT", 128); //NOI18N
/** @GuardedBy("this") */
private Set<FolderObj> kept;
@@ -220,7 +217,7 @@ final class FileObjectKeeper implements FileChangeListener {
assert Thread.holdsLock(FileObjectKeeper.this);
assert kept == null : "Already listening to " + kept + " now requested for " + root;
kept = new HashSet<FolderObj>();
- listenToAllRecursion(root, null, stop, filter, 0);
+ listenToAllRecursion(root, null, stop, filter);
}
/**
@@ -239,14 +236,8 @@ final class FileObjectKeeper implements FileChangeListener {
*/
private boolean listenToAllRecursion(FolderObj obj,
FileObjectFactory knownFactory, Callable<?> stop,
- FileFilter filter, int level) {
+ FileFilter filter) {
- if (level > RECURSION_LIMIT) {
- LOG.log(Level.INFO, "Exiting listenToAllRecursion " //NOI18N
- + "due to RECURSION_LIMIT (limit = {0}, fo = {1})", //NOI18N
- new Object[] {RECURSION_LIMIT, obj});
- return true;
- }
List<File> it = new ArrayList<File>();
listenTo(obj, true, it);
FileObjectFactory factory = knownFactory;
@@ -277,7 +268,7 @@ final class FileObjectKeeper implements FileChangeListener {
LOG.log(Level.INFO, "addRecursiveListener to {0} interrupted", child); // NOI18N
return false;
}
- if (!listenToAllRecursion(child, factory, stop, filter, level + 1)) {
+ if (!listenToAllRecursion(child, factory, stop, filter)) {
return false;
}
}
diff --git a/masterfs/src/org/netbeans/modules/masterfs/providers/Notifier.java b/masterfs/src/org/netbeans/modules/masterfs/providers/Notifier.java
index 18cdd0e..369bf00 100644
--- a/masterfs/src/org/netbeans/modules/masterfs/providers/Notifier.java
+++ b/masterfs/src/org/netbeans/modules/masterfs/providers/Notifier.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/masterfs/src/org/netbeans/modules/masterfs/watcher/Watcher.java b/masterfs/src/org/netbeans/modules/masterfs/watcher/Watcher.java
index 4ff1a13..19433f1 100644
--- a/masterfs/src/org/netbeans/modules/masterfs/watcher/Watcher.java
+++ b/masterfs/src/org/netbeans/modules/masterfs/watcher/Watcher.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/BaseFileObjectTestHid.java b/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/BaseFileObjectTestHid.java
index 2ef8ffe..c6e02fd 100644
--- a/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/BaseFileObjectTestHid.java
+++ b/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/BaseFileObjectTestHid.java
@@ -51,9 +51,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.ref.WeakReference;
-import java.nio.file.FileStore;
-import java.nio.file.Files;
-import java.nio.file.Path;
import java.util.*;
import java.util.jar.JarOutputStream;
import java.util.logging.Handler;
@@ -82,16 +79,12 @@ import org.openide.filesystems.Repository;
import org.openide.filesystems.TestBaseHid;
import org.openide.filesystems.URLMapper;
import org.openide.filesystems.test.StatFiles;
-import org.openide.util.Exceptions;
import org.openide.util.Utilities;
import org.openide.util.io.NbMarshalledObject;
public class BaseFileObjectTestHid extends TestBaseHid{
public static final HashSet<String> AUTOMOUNT_SET = new HashSet<String>(Arrays.asList("set", "shared", "net", "java", "share", "home", "ws", "ade_autofs"));
- private static final Set<String> REMOTE_FSTYPES = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(
- "nfs", "nfs4","autofs"))); //NOI18N
- private static final boolean CHECK_REMOTE_FSTYPES = true;
private FileObject root;
private Logger LOG;
@@ -238,7 +231,7 @@ public class BaseFileObjectTestHid extends TestBaseHid{
}
sb.append("\n");
for (FileObject ch : fo.getChildren()) {
- if (!skipChildren.contains(ch.getNameExt()) && !isRemoteFS(ch)) {
+ if (!skipChildren.contains(ch.getNameExt())) {
deep(ch, depth, sb, path, Collections.<String>emptySet());
}
}
@@ -1362,27 +1355,6 @@ public class BaseFileObjectTestHid extends TestBaseHid{
assertFalse("Became invalid", root.isValid());
assertFalse("Leaf is invalid as well", next.isValid());
}
-
- private static boolean isRemoteFS (FileObject fo) {
- if (!CHECK_REMOTE_FSTYPES) {
- return false;
- }
- if (!fo.isFolder()) {
- return false;
- }
- final File f = FileUtil.toFile(fo);
- if (f == null) {
- return false;
- }
- final Path p = f.toPath();
- try {
- final String fsType = Files.getFileStore(p).type();
- return REMOTE_FSTYPES.contains(fsType);
- } catch (IOException ioe) {
- Exceptions.printStackTrace(ioe);
- return false;
- }
- }
private class IgnoreDirFileSystem extends LocalFileSystem {
org.openide.filesystems.StatusDecorator status = new org.openide.filesystems.StatusDecorator() {
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
index 5e6fe4d..e0641fa 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/CustomJavac.java
@@ -54,7 +54,6 @@ import org.apache.tools.ant.taskdefs.Delete;
import org.apache.tools.ant.taskdefs.Javac;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.selectors.SelectorUtils;
import org.apache.tools.ant.util.JavaEnvUtils;
/**
@@ -216,13 +215,7 @@ public class CustomJavac extends Javac {
FileSet classes = new FileSet();
classes.setDir(d);
classes.setIncludes("**/*$*.class");
- final String whiteListRaw = getProject().getProperty("nbjavac.ignore.missing.enclosing"); //NOI18N
- final String[] whiteList = whiteListRaw == null ? new String[0] : whiteListRaw.split("\\s*,\\s*"); //NOI18N
for (String clazz : classes.getDirectoryScanner(getProject()).getIncludedFiles()) {
- if (isIgnored(whiteList, clazz)) {
- log(clazz + " ignored from the enclosing check due to ignore list", Project.MSG_VERBOSE);
- continue;
- }
int i = clazz.indexOf('$');
File enclosing = new File(d, clazz.substring(0, i) + ".class");
if (!enclosing.isFile()) {
@@ -235,15 +228,4 @@ public class CustomJavac extends Javac {
}
}
- private static boolean isIgnored(
- final String[] patterns,
- final String resource) {
- for (String pattern : patterns) {
- if (SelectorUtils.match(pattern, resource)) {
- return true;
- }
- }
- return false;
- }
-
}
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/JNLP-6.0.dtd b/nbbuild/antsrc/org/netbeans/nbbuild/JNLP-6.0.dtd
index 0dcbc0d..f0dd123 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/JNLP-6.0.dtd
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/JNLP-6.0.dtd
@@ -1,79 +1,40 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
-<!--
<!DOCTYPE jnlp PUBLIC "-//Sun Microsystems, Inc//DTD JNLP Descriptor 6.0//EN" "http://java.sun.com/dtd/JNLP-6.0.dtd">
-->
-<!--
-The root element for the JNLP file.
+<!--
+The root element for the JNLP file.
-->
-<!ELEMENT jnlp (information+, security?, update?, resources*,
+<!ELEMENT jnlp (information+, security?, update?, resources*,
(application-desc | applet-desc | component-desc | installer-desc))>
<!--
-The spec attribute of the jnlp element specifies what versions of the JNLP
+The spec attribute of the jnlp element specifies what versions of the JNLP
specification a particular JNLP file works with. The default value is "1.0+".
-->
<!ATTLIST jnlp spec CDATA #IMPLIED>
<!--
-The version attribute of the jnlp element specifies the version of the
+The version attribute of the jnlp element specifies the version of the
application being launched, as well as the version of the JNLP file itself.
-->
<!ATTLIST jnlp version CDATA #IMPLIED>
<!--
-The codebase attribute of the jnlp element specifies the codebase for the
-application. This is also used as the base URL for all relative URLs in
+The codebase attribute of the jnlp element specifies the codebase for the
+application. This is also used as the base URL for all relative URLs in
href attributes.
-->
<!ATTLIST jnlp codebase CDATA #IMPLIED>
<!--
-The href attribute of the jnlp element contains the location of the JNLP
+The href attribute of the jnlp element contains the location of the JNLP
file as a URL.
-->
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/LocFiles.java b/nbbuild/antsrc/org/netbeans/nbbuild/LocFiles.java
index 88adb76..b14423e 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/LocFiles.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/LocFiles.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java b/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java
index f979849..8c55a49 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/ParseProjectXml.java
@@ -60,7 +60,6 @@ import java.lang.reflect.Method;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
@@ -1079,17 +1078,17 @@ public final class ParseProjectXml extends Task {
deps = entry.getRuntimeDependencies();
}
}
- for (File f : entry.getClassPathExtensions()) {
- if (!additions.contains(f)) {
- additions.add(f);
- }
- }
for (String nextModule : deps) {
log(" Added dep " + nextModule + " due to " + cnb, Project.MSG_DEBUG);
File depJar = computeClasspathModuleLocation(modules, nextModule, clusterPath, excludedModules, true);
if (!additions.contains(depJar)) {
additions.add(depJar);
}
+ for (File f : entry.getClassPathExtensions()) {
+ if (!additions.contains(f)) {
+ additions.add(f);
+ }
+ }
addRecursiveDeps(additions, modules, nextModule, clusterPath, excludedModules, skipCnb, runtime);
}
}
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/package.html b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/package.html
index e627923..a04d679 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/package.html
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/package.html
@@ -1,41 +1,2 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
Various tasks to assist in the management of external binaries and their licenses for netbeans.org modules.
See <a href="http://wiki.netbeans.org/wiki/view/DevFaqExternalLibrariesUpdated">wiki</a>.
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/package.html b/nbbuild/antsrc/org/netbeans/nbbuild/package.html
index 416101c..6f73290 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/package.html
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/package.html
@@ -2,10 +2,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2003, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -17,14 +15,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -35,8 +39,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/nbbuild/build.properties b/nbbuild/build.properties
index e0180b6..8e3826a 100644
--- a/nbbuild/build.properties
+++ b/nbbuild/build.properties
@@ -1,6 +1,6 @@
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
@@ -51,9 +51,9 @@ tryme.arg.hack=-J-Dnetbeans.full.hack=true
# Information about branch of previous release
# needed to help us generate list of changes since then
-previous.release.year=2015
-previous.release.month=9
-previous.release.day=30
+previous.release.year=2014
+previous.release.month=7
+previous.release.day=31
# Useful for "always successful" build, when you don't care of some
# particular (and currently broken) modules
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index d681a03..90c7a1a 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -2,7 +2,7 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
Oracle and Java are registered trademarks of Oracle and/or its affiliates.
Other names may be trademarks of their respective owners.
@@ -62,15 +62,10 @@ made subject to such option by the copyright holder.
<target name="bootstrap" description="Bootstrap NetBeans-specific Ant extensions."
depends="-jdk-init,-load-build-properties">
- <fail message="You need to run on JDK 8+ to build NetBeans; java.home=${java.home}">
- <condition>
- <matches pattern="1\.[01234567].*" string="${java.version}"/>
- </condition>
- </fail>
- <fail message="You need JDK 8+ to build NetBeans; nbjdk.home=${nbjdk.home} java.home=${java.home}">
+ <fail message="You need JDK 7+ to build NetBeans; nbjdk.home=${nbjdk.home} java.home=${java.home}">
<condition>
<not>
- <isset property="have-jdk-1.8"/>
+ <isset property="have-jdk-1.7"/>
</not>
</condition>
</fail>
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 15a22d6..9b1177a 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -1,7 +1,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
@@ -134,7 +134,7 @@ clusters.config.jdev.list=\
nb.cluster.java,\
nb.cluster.profiler,\
nb.cluster.jira,\
- nb.cluster.odcs
+ nb.cluster.team
clusters.config.bloated.list=\
nb.cluster.identity,\
@@ -178,10 +178,6 @@ clusters.config.python.list=\
${clusters.config.minimal.list},\
nb.cluster.python
-clusters.config.odcs.list=\
- ${clusters.config.minimal.list},\
- nb.cluster.odcs
-
clusters.list=\
${clusters.config.full.list}
@@ -264,7 +260,6 @@ nb.cluster.platform=\
o.jdesktop.layout,\
o.n.core,\
o.n.html.ko4j,\
- o.n.html.xhr4j,\
o.n.swing.outline,\
o.n.swing.plaf,\
o.n.swing.tabcontrol,\
@@ -309,13 +304,13 @@ nb.cluster.ide.depends=\
nb.cluster.ide=\
api.debugger,\
api.java.classpath,\
+ api.knockout,\
api.xml,\
api.xml.ui,\
bugtracking,\
bugtracking.bridge,\
bugtracking.commons,\
bugzilla,\
- c.google.guava,\
c.googlecode.javaewah.JavaEWAH,\
c.jcraft.jsch,\
c.jcraft.jzlib,\
@@ -325,7 +320,6 @@ nb.cluster.ide=\
core.ide,\
core.multitabs.project,\
csl.api,\
- csl.types,\
css.editor,\
css.lib,\
css.model,\
@@ -345,11 +339,7 @@ nb.cluster.ide=\
derby,\
diff,\
dlight.nativeexecution,\
- dlight.nativeexecution.nb,\
dlight.terminal,\
- docker.api,\
- docker.editor,\
- docker.ui,\
editor,\
editor.actions,\
editor.bookmarks,\
@@ -386,16 +376,17 @@ nb.cluster.ide=\
extexecution.base,\
extexecution.impl,\
extexecution.process,\
- extexecution.process.jdk9,\
git,\
gototest,\
gsf.codecoverage,\
gsf.testrunner,\
gsf.testrunner.ui,\
html,\
+ html.angular,\
html.custom,\
html.editor,\
html.editor.lib,\
+ html.knockout,\
html.lexer,\
html.parser,\
html.validation,\
@@ -409,7 +400,15 @@ nb.cluster.ide=\
ide.kit,\
image,\
javascript2.debug,\
- javascript2.debug.ui,\
+ javascript2.editor,\
+ javascript2.extjs,\
+ javascript2.jade,\
+ javascript2.jquery,\
+ javascript2.kit,\
+ javascript2.knockout,\
+ javascript2.nodejs,\
+ javascript2.prototypejs,\
+ javascript2.requirejs,\
jellytools.ide,\
jumpto,\
languages,\
@@ -420,18 +419,17 @@ nb.cluster.ide=\
lexer.nbbridge,\
lib.terminalemulator,\
libs.antlr3.runtime,\
- libs.antlr4.runtime,\
libs.bytelist,\
- libs.commons_compress,\
libs.commons_net,\
libs.freemarker,\
libs.git,\
libs.ini4j,\
libs.jaxb,\
libs.jsch.agentproxy,\
- libs.json_simple,\
+ libs.json_simple,\
libs.jvyamlb,\
libs.lucene,\
+ libs.nashorn,\
libs.smack,\
libs.svnClientAdapter,\
libs.svnClientAdapter.javahl,\
@@ -471,7 +469,6 @@ nb.cluster.ide=\
o.eclipse.mylyn.tasks.core,\
o.eclipse.mylyn.wikitext.confluence.core,\
o.eclipse.mylyn.wikitext.core,\
- o.eclipse.mylyn.wikitext.markdown.core,\
o.eclipse.mylyn.wikitext.textile.core,\
o.n.swing.dirchooser,\
o.openidex.util,\
@@ -527,7 +524,6 @@ nb.cluster.ide=\
team.commons,\
team.ide,\
terminal,\
- terminal.nb,\
usersguide,\
utilities,\
utilities.project,\
@@ -540,7 +536,6 @@ nb.cluster.ide=\
versioning.util,\
web.browser.api,\
web.common,\
- web.common.ui,\
web.indent,\
web.webkit.debugging,\
xml,\
@@ -586,7 +581,6 @@ nb.cluster.java=\
debugger.jpda,\
debugger.jpda.ant,\
debugger.jpda.js,\
- debugger.jpda.jsui,\
debugger.jpda.kit,\
debugger.jpda.projects,\
debugger.jpda.projectsui,\
@@ -811,6 +805,7 @@ nb.cluster.enterprise=\
web.core.syntax,\
web.debug,\
web.el,\
+ web.examples,\
web.freeform,\
web.jsf,\
web.jsf.editor,\
@@ -970,7 +965,6 @@ nb.cluster.php=\
php.zend,\
php.zend2,\
selenium2.php,\
- spellchecker.bindings.php,\
websvc.saas.codegen.php
validation.nb.cluster.php=\
php.editor
@@ -1045,7 +1039,6 @@ nb.cluster.cnd=\
cnd.api.model,\
cnd.api.project,\
cnd.api.remote,\
- cnd.api.remote.ui,\
cnd.apt,\
cnd.asm,\
cnd.callgraph,\
@@ -1065,7 +1058,6 @@ nb.cluster.cnd=\
cnd.lexer,\
cnd.makeproject,\
cnd.makeproject.source.bridge,\
- cnd.makeproject.ui,\
cnd.model.jclank.bridge,\
cnd.model.services,\
cnd.modeldiscovery,\
@@ -1077,7 +1069,6 @@ nb.cluster.cnd=\
cnd.refactoring,\
cnd.remote,\
cnd.remote.projectui,\
- cnd.remote.ui,\
cnd.repository,\
cnd.repository.api,\
cnd.script,\
@@ -1087,10 +1078,7 @@ nb.cluster.cnd=\
cnd.spellchecker.bindings,\
cnd.testrunner,\
cnd.toolchain,\
- cnd.toolchain.ui,\
- cnd.ui,\
cnd.utils,\
- cnd.utils.ui,\
jellytools.cnd,\
libs.clank
validation.nb.cluster.cnd=\
@@ -1114,7 +1102,6 @@ nb.cluster.dlight=\
dlight.libs.common,\
dlight.remote,\
dlight.remote.impl,\
- dlight.remote.ui,\
dlight.sendto,\
git.remote,\
git.remote.cli,\
@@ -1132,6 +1119,7 @@ nb.cluster.jira=\
c.atlassian.connector.eclipse.commons.core,\
c.atlassian.connector.eclipse.jira.core,\
c.atlassian.connector.eclipse.jira.core.rest,\
+ c.google.guava,\
c.s.jersey,\
c.s.mail.javax.mail,\
javax.servlet,\
@@ -1185,31 +1173,6 @@ nb.cluster.team=\
versioning.kenai,\
versioning.system.cvss
-nb.cluster.odcs.dir=extra
-nb.cluster.odcs.depends=
-nb.cluster.odcs=\
- c.tasktop.c2c.server.cloud.api,\
- c.tasktop.c2c.server.common.api,\
- c.tasktop.c2c.server.profile.api,\
- c.tasktop.c2c.server.scm.api,\
- c.tasktop.c2c.server.tasks.api,\
- c.tasktop.c2c.server.wiki.api,\
- o.codehaus.jackson.core,\
- o.codehaus.jackson.mapper,\
- odcs,\
- odcs.git,\
- odcs.hudson,\
- odcs.kit,\
- odcs.tasks,\
- odcs.tasks.bridge,\
- odcs.ui,\
- odcs.versioning,\
- oracle.clouddev.server.profile.activity.client.api,\
- oracle.clouddev.server.profile.activity.client.rest,\
- oracle.eclipse.tools.cloud.dev.tasks,\
- team.server,\
- team.server.nb
-
nb.cluster.stableuc.dir=extra
nb.cluster.stableuc.depends=${clusters.config.full.list}
nb.cluster.stableuc=\
@@ -1219,6 +1182,7 @@ nb.cluster.stableuc=\
db.mysql.sakila,\
deployment.deviceanywhere,\
findbugs,\
+ html.ojet,\
j2me.cdc.kit,\
j2me.cdc.platform,\
j2me.cdc.platform.nokias80,\
@@ -1383,7 +1347,6 @@ nb.cluster.experimental=\
contrib/loaderswitcher,\
contrib/moduleresolver,\
contrib/mount,\
- contrib/nbignore,\
contrib/nborgsourcebrowse,\
contrib/o.jython,\
contrib/o.jython.distro,\
@@ -1412,7 +1375,6 @@ nb.cluster.experimental=\
contrib/websvc.saas.services.rtm,\
contrib/whichproject,\
debugger.jpda.truffle,\
- debugger.jpda.trufflenode,\
j2ee.websphere6,\
j2me.cdc.platform.bdj,\
j2me.cdc.project.bdj,\
@@ -1453,15 +1415,11 @@ nb.cluster.webcommon.depends=\
nb.cluster.extide,\
nb.cluster.platform
nb.cluster.webcommon=\
- api.knockout,\
cordova,\
cordova.platforms,\
cordova.platforms.android,\
cordova.platforms.ios,\
extbrowser.chrome,\
- html.angular,\
- html.knockout,\
- html.ojet,\
javascript.bower,\
javascript.cdnjs,\
javascript.grunt,\
@@ -1470,31 +1428,11 @@ nb.cluster.webcommon=\
javascript.karma,\
javascript.nodejs,\
javascript.v8debug,\
- javascript.v8debug.ui,\
- javascript2.doc,\
- javascript2.editor,\
- javascript2.extdoc,\
- javascript2.extjs,\
- javascript2.jade,\
- javascript2.jquery,\
- javascript2.jsdoc,\
- javascript2.json,\
- javascript2.kit,\
- javascript2.knockout,\
- javascript2.lexer,\
- javascript2.model,\
- javascript2.nodejs,\
- javascript2.prototypejs,\
- javascript2.react,\
- javascript2.requirejs,\
- javascript2.sdoc,\
- javascript2.source.query,\
- javascript2.types,\
languages.apacheconf,\
languages.ini,\
lib.v8debug,\
+ libs.commons_compress,\
libs.jstestdriver,\
- libs.nashorn,\
libs.plist,\
netserver,\
selenium2.webclient,\
diff --git a/nbbuild/external/binaries-list b/nbbuild/external/binaries-list
index 64cf925..3b388fb 100644
--- a/nbbuild/external/binaries-list
+++ b/nbbuild/external/binaries-list
@@ -1 +1,2 @@
-A7674A6D78B7FEA58AF76B357DAE6EA5E3FDFBE9 apitest.jar
+EAE299D9D3B1C6E2F8B030DCD3BCF0B05517FBA9 apitest.jar
+
diff --git a/nbbuild/external/findbugs/build.xml b/nbbuild/external/findbugs/build.xml
index e10b2c2..9db4e7a 100644
--- a/nbbuild/external/findbugs/build.xml
+++ b/nbbuild/external/findbugs/build.xml
@@ -51,14 +51,14 @@ made subject to such option by the copyright holder.
<property name="nbroot" value="../../.."/>
<!-- findbugs.jar checksum -->
- <property name="findbugs.md5" value="8122e8036f3e4e4bca760f8fdd2f779a"/>
+ <property name="findbugs.md5" value="d3e7c731eb2a60bf3c3c65433b3728d4"/>
<import file="${nbroot}/nbbuild/templates/projectized.xml"/>
<target name="findbugs-init">
<property name="findbugs.zip.url"
- value="http://downloads.sourceforge.net/project/findbugs/findbugs/3.0.1/findbugs-3.0.1.zip"/>
+ value="http://downloads.sourceforge.net/project/findbugs/findbugs/2.0.1/findbugs-2.0.1.zip"/>
<condition property="findbugs.downloaded">
<and>
@@ -70,11 +70,11 @@ made subject to such option by the copyright holder.
</and>
</condition>
- <property name="findbugs.name" value="findbugs-3.0.1"/>
+ <property name="findbugs.name" value="findbugs-2.0.1"/>
<property name="lib.dir" location="lib"/>
<property name="build.dir" location="build"/>
- <property name="binary.zip" location="findbugs-3.0.1.zip"/>
+ <property name="binary.zip" location="findbugs-2.0.1.zip"/>
</target>
<target name="findbugs" depends="findbugs-init,findbugs-clean,-init-proxy" unless="findbugs.downloaded">
@@ -91,18 +91,21 @@ made subject to such option by the copyright holder.
<copy todir="${lib.dir}" overwrite="true">
<fileset dir="${build.dir}/${findbugs.name}/lib">
<include name="annotations.jar"/>
- <include name="asm-debug-all-5.0.2.jar"/>
- <include name="bcel-6.0-SNAPSHOT.jar"/>
- <include name="commons-lang-2.6.jar"/>
+ <include name="asm-3.3.jar"/>
+ <include name="asm-analysis-3.3.jar"/>
+ <include name="asm-commons-3.3.jar"/>
+ <include name="asm-tree-3.3.jar"/>
+ <include name="asm-util-3.3.jar"/>
+ <include name="asm-xml-3.3.jar"/>
+ <include name="bcel.jar"/>
+ <include name="commons-lang-2.4.jar"/>
<include name="dom4j-1.6.1.jar"/>
<include name="findbugs-ant.jar"/>
<include name="findbugs.jar"/>
<include name="jFormatString.jar"/>
- <include name="jaxen-1.1.6.jar"/>
- <include name="jcip-annotations.jar"/>
+ <include name="jaxen-1.1.1.jar"/>
<include name="jdepend-2.9.jar"/>
<include name="jsr305.jar"/>
- <include name="yjp-controller-api-redist.jar"/>
</fileset>
</copy>
diff --git a/nbbuild/hudson/core-main b/nbbuild/hudson/core-main
index 8a08800..1c96dfb 100644
--- a/nbbuild/hudson/core-main
+++ b/nbbuild/hudson/core-main
@@ -1,7 +1,7 @@
#!/bin/sh
set -x
-ANT_OPTS="$ANT_OPTS -Xmx1G"
+ANT_OPTS="$ANT_OPTS -Xmx512m -XX:MaxPermSize=256m"
if [ ! -z $NB_PROXY_HOST ] && [ ! -z $NB_PROXY_PORT ]; then
ANT_OPTS="$ANT_OPTS -Dhttp.proxyHost=$NB_PROXY_HOST -Dhttp.proxyPort=$NB_PROXY_PORT"
diff --git a/nbbuild/javadoctools/apichanges.dtd b/nbbuild/javadoctools/apichanges.dtd
index a5b63ef..aa94a71 100644
--- a/nbbuild/javadoctools/apichanges.dtd
+++ b/nbbuild/javadoctools/apichanges.dtd
@@ -126,7 +126,7 @@ Date on which the change was made (in the trunk).
<!ATTLIST date
day (1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31) #REQUIRED
month (1|2|3|4|5|6|7|8|9|10|11|12) #REQUIRED
- year (1998|1999|2000|2001|2002|2003|2004|2005|2006|2007|2008|2009|2010|2011|2012|2013|2014|2015|2016) #REQUIRED
+ year (1998|1999|2000|2001|2002|2003|2004|2005|2006|2007|2008|2009|2010|2011|2012|2013|2014|2015) #REQUIRED
>
<!--
diff --git a/nbbuild/javadoctools/arch-empty.xml b/nbbuild/javadoctools/arch-empty.xml
index a8f7ffd..16e754a 100644
--- a/nbbuild/javadoctools/arch-empty.xml
+++ b/nbbuild/javadoctools/arch-empty.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2003, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
diff --git a/nbbuild/javadoctools/export2apichanges.xsl b/nbbuild/javadoctools/export2apichanges.xsl
index d97195b..1b4e2c9 100644
--- a/nbbuild/javadoctools/export2apichanges.xsl
+++ b/nbbuild/javadoctools/export2apichanges.xsl
@@ -2,7 +2,7 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
Oracle and Java are registered trademarks of Oracle and/or its affiliates.
Other names may be trademarks of their respective owners.
@@ -75,7 +75,7 @@ made subject to such option by the copyright holder.
<center>
<h1>NetBeans API Changes since Last Release</h1>
- <h3>Version 8.2</h3>
+ <h3>Version 8.1</h3>
<xsl:if test="$date" >
<xsl:value-of select="$date" />
<p/>
@@ -124,8 +124,7 @@ made subject to such option by the copyright holder.
<a href="http://bits.netbeans.org/7.3.1/javadoc/apichanges.html">release 7.3.1</a>,
<a href="http://bits.netbeans.org/7.4/javadoc/apichanges.html">release 7.4</a>,
<a href="http://bits.netbeans.org/8.0/javadoc/apichanges.html">release 8.0</a>,
- <a href="http://bits.netbeans.org/8.0.1/javadoc/apichanges.html">release 8.0.1</a>,
- <a href="http://bits.netbeans.org/8.1/javadoc/apichanges.html">release 8.1</a>.
+ <a href="http://bits.netbeans.org/8.0.1/javadoc/apichanges.html">release 8.0.1</a>.
<xsl:call-template name="do-the-table" />
</body>
</html>
diff --git a/nbbuild/javadoctools/export2html.xsl b/nbbuild/javadoctools/export2html.xsl
index d8f4375..1134817 100644
--- a/nbbuild/javadoctools/export2html.xsl
+++ b/nbbuild/javadoctools/export2html.xsl
@@ -2,7 +2,7 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2015 Oracle and/or its affiliates. All rights reserved.
Oracle and Java are registered trademarks of Oracle and/or its affiliates.
Other names may be trademarks of their respective owners.
@@ -70,7 +70,7 @@ made subject to such option by the copyright holder.
<center>
<h1>NetBeans API List</h1>
- <h3>Version 8.2</h3>
+ <h3>Version 8.1</h3>
<xsl:if test="$date" >
<xsl:value-of select="$date" />
<p/>
@@ -104,12 +104,11 @@ made subject to such option by the copyright holder.
<em>NetBeans</em> one is free to choose the set of modules and their APIs
to satisfy one's needs.
<p>
- This is a list of APIs for NetBeans 8.2 version, if you want to see
+ This is a list of APIs for NetBeans 8.1 version, if you want to see
a list of APIs for a particular version, you may want to go to:
</p>
<ul>
<li><a href="http://bits.netbeans.org/dev/javadoc/" target="_top">Dev</a> - Javadoc as released for development version</li>
- <li><a href="http://bits.netbeans.org/8.1/javadoc/" target="_top">8.1</a> - Javadoc as released for NetBeans IDE 8.1</li>
<li><a href="http://bits.netbeans.org/8.0.1/javadoc/" target="_top">8.0.1</a> - Javadoc as released for NetBeans IDE 8.0.1</li>
<li><a href="http://bits.netbeans.org/8.0/javadoc/" target="_top">8.0</a> - Javadoc as released for NetBeans IDE 8.0</li>
<li><a href="http://bits.netbeans.org/7.4/javadoc/" target="_top">7.4</a> - Javadoc as released for NetBeans IDE 7.4</li>
diff --git a/nbbuild/javadoctools/javadoc-generic.css b/nbbuild/javadoctools/javadoc-generic.css
index 3f14336..0e2327c 100644
--- a/nbbuild/javadoctools/javadoc-generic.css
+++ b/nbbuild/javadoctools/javadoc-generic.css
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2003, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
/* Javadoc style sheet */
/* Define colors, fonts and other style attributes here to override the defaults */
diff --git a/nbbuild/javadoctools/javadoc.css b/nbbuild/javadoctools/javadoc.css
index b4603f7..76fb038 100644
--- a/nbbuild/javadoctools/javadoc.css
+++ b/nbbuild/javadoctools/javadoc.css
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2003, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
/* Stylesheet used for NetBeans API Javadoc. */
/* Special things for API documentation: */
diff --git a/nbbuild/javadoctools/links.xml b/nbbuild/javadoctools/links.xml
index bf98145..485d28e 100644
--- a/nbbuild/javadoctools/links.xml
+++ b/nbbuild/javadoctools/links.xml
@@ -247,6 +247,3 @@ made subject to such option by the copyright holder.
<link href="${javadoc.docs.org-netbeans-api-htmlui}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-api-htmlui"/>
<link href="${javadoc.docs.org-netbeans-api-knockout}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-api-knockout"/>
<link href="${javadoc.docs.org-netbeans-lib-v8debug}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-lib-v8debug"/>
-<link href="${javadoc.docs.org-netbeans-modules-docker-api}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-docker-api"/>
-<link href="${javadoc.docs.org-netbeans-modules-csl-types}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-csl-types"/>
-<link href="${javadoc.docs.org-netbeans-modules-csl-api}" offline="true" packagelistloc="${netbeans.javadoc.dir}/org-netbeans-modules-csl-api"/>
diff --git a/nbbuild/javadoctools/nb-docs-stability.css b/nbbuild/javadoctools/nb-docs-stability.css
index 913e90a..be56033 100644
--- a/nbbuild/javadoctools/nb-docs-stability.css
+++ b/nbbuild/javadoctools/nb-docs-stability.css
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
/* Adding special left-hand-side border showing the API stability level. */
/* Standard things for Netbeans API documentation: */
diff --git a/nbbuild/javadoctools/nb-docs.css b/nbbuild/javadoctools/nb-docs.css
index dfe6ce9..1419ee2 100644
--- a/nbbuild/javadoctools/nb-docs.css
+++ b/nbbuild/javadoctools/nb-docs.css
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2003, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
/* Some NB-specific formatting stuff. */
.nonnormative {
diff --git a/nbbuild/javadoctools/netbeans-lite.css b/nbbuild/javadoctools/netbeans-lite.css
index afc2ba5..0389531 100644
--- a/nbbuild/javadoctools/netbeans-lite.css
+++ b/nbbuild/javadoctools/netbeans-lite.css
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2003, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
/* --- IMPORT FOR JAVADOC -- */
/* this part of css is automaticaly exported to file nb_special.css
if you need make some changes please edit into netbeans.css*/
diff --git a/nbbuild/javadoctools/netbeans.css b/nbbuild/javadoctools/netbeans.css
index 35f1d89..54dbe61 100644
--- a/nbbuild/javadoctools/netbeans.css
+++ b/nbbuild/javadoctools/netbeans.css
@@ -1,43 +1,4 @@
/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2003, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
-/*
==========================================================
CSS for NetBeans web site
Reeport problems to marek.vinar at sun.com
diff --git a/nbbuild/javadoctools/properties.xml b/nbbuild/javadoctools/properties.xml
index ea373f3..c55bb0b 100644
--- a/nbbuild/javadoctools/properties.xml
+++ b/nbbuild/javadoctools/properties.xml
@@ -245,6 +245,3 @@ made subject to such option by the copyright holder.
<property name="javadoc.docs.org-netbeans-api-htmlui" value="${javadoc.web.root}/org-netbeans-api-htmlui"/>
<property name="javadoc.docs.org-netbeans-api-knockout" value="${javadoc.web.root}/org-netbeans-api-knockout"/>
<property name="javadoc.docs.org-netbeans-lib-v8debug" value="${javadoc.web.root}/org-netbeans-lib-v8debug"/>
-<property name="javadoc.docs.org-netbeans-modules-docker-api" value="${javadoc.web.root}/org-netbeans-modules-docker-api"/>
-<property name="javadoc.docs.org-netbeans-modules-csl-types" value="${javadoc.web.root}/org-netbeans-modules-csl-types"/>
-<property name="javadoc.docs.org-netbeans-modules-csl-api" value="${javadoc.web.root}/org-netbeans-modules-csl-api"/>
diff --git a/nbbuild/javadoctools/prose.css b/nbbuild/javadoctools/prose.css
index 9e2b8cd..0c72af1 100644
--- a/nbbuild/javadoctools/prose.css
+++ b/nbbuild/javadoctools/prose.css
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2003, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
/* stylesheet used for prose docs */
@import "nb-docs.css";
diff --git a/nbbuild/javadoctools/replaces.xml b/nbbuild/javadoctools/replaces.xml
index 3ae688b..953601f 100644
--- a/nbbuild/javadoctools/replaces.xml
+++ b/nbbuild/javadoctools/replaces.xml
@@ -245,6 +245,3 @@ made subject to such option by the copyright holder.
<replacefilter token="@org-netbeans-api-htmlui@" value="${javadoc.docs.org-netbeans-api-htmlui}"/>
<replacefilter token="@org-netbeans-api-knockout@" value="${javadoc.docs.org-netbeans-api-knockout}"/>
<replacefilter token="@org-netbeans-lib-v8debug@" value="${javadoc.docs.org-netbeans-lib-v8debug}"/>
-<replacefilter token="@org-netbeans-modules-docker-api@" value="${javadoc.docs.org-netbeans-modules-docker-api}"/>
-<replacefilter token="@org-netbeans-modules-csl-types@" value="${javadoc.docs.org-netbeans-modules-csl-types}"/>
-<replacefilter token="@org-netbeans-modules-csl-api@" value="${javadoc.docs.org-netbeans-modules-csl-api}"/>
diff --git a/nbbuild/jdk.xml b/nbbuild/jdk.xml
index 76815d3..bf68741 100644
--- a/nbbuild/jdk.xml
+++ b/nbbuild/jdk.xml
@@ -128,8 +128,7 @@ made subject to such option by the copyright holder.
<available property="have-jdk-1.6" classname="java.util.ServiceLoader" classpath="${nbjdk.bootclasspath}" ignoresystemclasses="true"/>
<available property="have-jdk-1.7" classname="java.lang.ReflectiveOperationException" classpath="${nbjdk.bootclasspath}" ignoresystemclasses="true"/>
<available property="have-jdk-1.8" classname="java.lang.FunctionalInterface" classpath="${nbjdk.bootclasspath}" ignoresystemclasses="true"/>
- <available property="have-jdk-1.9" classname="java.util.zip.CRC32C" classpath="${nbjdk.bootclasspath}" ignoresystemclasses="true"/>
- <echo level="verbose">nbjdk.active=${nbjdk.active} nbjdk.home=${nbjdk.home} nbjdk.java=${nbjdk.java} nbjdk.javac=${nbjdk.javac} nbjdk.javadoc=${nbjdk.javadoc} nbjdk.bootclasspath=${nbjdk.bootclasspath} nbjdk.valid=${nbjdk.valid} have-jdk-1.4=${have-jdk-1.4} have-jdk-1.5=${have-jdk-1.5} have-jdk-1.6=${have-jdk-1.6} have-jdk-1.7=${have-jdk-1.7} have-jdk-1.8=${have-jdk-1.8} have-jdk-1.9=${have-jdk-1.9}</echo>
+ <echo level="verbose">nbjdk.active=${nbjdk.active} nbjdk.home=${nbjdk.home} nbjdk.java=${nbjdk.java} nbjdk.javac=${nbjdk.javac} nbjdk.javadoc=${nbjdk.javadoc} nbjdk.bootclasspath=${nbjdk.bootclasspath} nbjdk.valid=${nbjdk.valid} have-jdk-1.4=${have-jdk-1.4} have-jdk-1.5=${have-jdk-1.5} have-jdk-1.6=${have-jdk-1.6} have-jdk-1.7=${have-jdk-1.7} have-jdk-1.8=${have-jdk-1.8}</echo>
</target>
<target name="-jdk-warn" depends="-jdk-preinit" if="nbjdk.active-or-nbjdk.home" unless="nbjdk.valid">
@@ -233,7 +232,6 @@ made subject to such option by the copyright holder.
<available property="have-jdk-1.6" classname="java.util.ServiceLoader"/>
<available property="have-jdk-1.7" classname="java.lang.ReflectiveOperationException"/>
<available property="have-jdk-1.8" classname="java.lang.FunctionalInterface"/>
- <available property="have-jdk-1.9" classname="java.util.zip.CRC32C"/>
<property name="nbjdk.home.defaulted" value="true"/>
</target>
diff --git a/nbbuild/misc/hints-settings.xml b/nbbuild/misc/hints-settings.xml
index 63b54ca..38f465e 100644
--- a/nbbuild/misc/hints-settings.xml
+++ b/nbbuild/misc/hints-settings.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE configuration PUBLIC "-//NetBeans//DTD Tool Configuration 1.0//EN" "http://www.netbeans.org/dtds/ToolConfiguration-1_0.dtd">
<configuration>
<tool kind="hints" type="text/x-java">
@@ -249,7 +210,7 @@ Contributor(s):
<node name="org.netbeans.modules.java.hints.StaticAccess"/>
<node name="org.netbeans.modules.java.hints.FieldForUnusedParam"/>
<node name="Braces_IF">
- <attribute name="enabled" value="false"/>
+ <attribute name="enabled" value="true"/>
</node>
<node name="EmptyStatements_BLOCK"/>
<node name="org.netbeans.modules.java.hints.perf.StringBuffer2Builder"/>
diff --git a/nbbuild/nbproject/genfiles.properties b/nbbuild/nbproject/genfiles.properties
deleted file mode 100644
index 2e372db..0000000
--- a/nbbuild/nbproject/genfiles.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/jdk.xml.data.CRC32=c012a35e
-nbproject/jdk.xml.script.CRC32=5342cb35
-nbproject/jdk.xml.stylesheet.CRC32=b5c68e1e at 1.39.1
diff --git a/nbbuild/nbproject/jdk.xml b/nbbuild/nbproject/jdk.xml
deleted file mode 100644
index a886978..0000000
--- a/nbbuild/nbproject/jdk.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project name="jdk" basedir=".">
-
-
- <description>
- Permits selection of a JDK to use when building and running project.
- See: http://www.netbeans.org/issues/show_bug.cgi?id=64160
- </description>
-
- <target name="-jdk-pre-preinit">
- <condition property="nbjdk.active-or-nbjdk.home">
- <or>
- <and>
- <isset property="nbjdk.active"/>
- <not>
- <equals arg1="${nbjdk.active}" arg2="default_platform"/>
- </not>
- </and>
- <and>
- <isset property="nbjdk.home"/>
- <not>
- <isset property="nbjdk.home.defaulted"/>
- </not>
- </and>
- </or>
- </condition>
- </target>
-
- <target xmlns:common="http://java.netbeans.org/freeform/jdk.xml" name="-jdk-preinit" depends="-jdk-pre-preinit" if="nbjdk.active-or-nbjdk.home">
- <macrodef name="property" uri="http://java.netbeans.org/freeform/jdk.xml">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- <common:property name="nbjdk.home" value="platforms.${nbjdk.active}.home"/>
- <common:property name="nbjdk.javac.tmp" value="platforms.${nbjdk.active}.javac"/>
- <condition property=".exe" value=".exe">
- <os family="windows"/>
- </condition>
- <property name=".exe" value=""/>
- <condition property="nbjdk.javac" value="${nbjdk.home}/bin/javac${.exe}">
- <equals arg1="${nbjdk.javac.tmp}" arg2="$${platforms.${nbjdk.active}.javac}"/>
- </condition>
- <property name="nbjdk.javac" value="${nbjdk.javac.tmp}"/>
- <common:property name="nbjdk.java.tmp" value="platforms.${nbjdk.active}.java"/>
- <condition property="nbjdk.java" value="${nbjdk.home}/bin/java${.exe}">
- <equals arg1="${nbjdk.java.tmp}" arg2="$${platforms.${nbjdk.active}.java}"/>
- </condition>
- <property name="nbjdk.java" value="${nbjdk.java.tmp}"/>
- <common:property name="nbjdk.javadoc.tmp" value="platforms.${nbjdk.active}.javadoc"/>
- <condition property="nbjdk.javadoc" value="${nbjdk.home}/bin/javadoc${.exe}">
- <equals arg1="${nbjdk.javadoc.tmp}" arg2="$${platforms.${nbjdk.active}.javadoc}"/>
- </condition>
- <property name="nbjdk.javadoc" value="${nbjdk.javadoc.tmp}"/>
- <common:property name="nbjdk.bootclasspath.tmp" value="platforms.${nbjdk.active}.bootclasspath"/>
- <condition property="nbjdk.bootclasspath" value="${nbjdk.home}/jre/lib/rt.jar">
- <equals arg1="${nbjdk.bootclasspath.tmp}" arg2="$${platforms.${nbjdk.active}.bootclasspath}"/>
- </condition>
- <property name="nbjdk.bootclasspath" value="${nbjdk.bootclasspath.tmp}"/>
- <condition property="nbjdk.valid">
- <and>
- <available file="${nbjdk.home}" type="dir"/>
- <available file="${nbjdk.javac}" type="file"/>
- <available file="${nbjdk.java}" type="file"/>
- <available file="${nbjdk.javadoc}" type="file"/>
-
- </and>
- </condition>
- <echo level="verbose">nbjdk.active=${nbjdk.active} nbjdk.home=${nbjdk.home} nbjdk.java=${nbjdk.java} nbjdk.javac=${nbjdk.javac} nbjdk.javadoc=${nbjdk.javadoc} nbjdk.bootclasspath=${nbjdk.bootclasspath} nbjdk.valid=${nbjdk.valid} have-jdk-1.4=${have-jdk-1.4} have-jdk-1.5=${have-jdk-1.5}</echo>
- </target>
-
- <target name="-jdk-warn" depends="-jdk-preinit" if="nbjdk.active-or-nbjdk.home" unless="nbjdk.valid">
- <property name="jdkhome.presumed" location="${java.home}/.."/>
- <echo level="warning">Warning: nbjdk.active=${nbjdk.active} or nbjdk.home=${nbjdk.home} is an invalid Java platform; ignoring and using ${jdkhome.presumed}</echo>
- </target>
-
- <target name="-jdk-presetdef-basic" depends="-jdk-preinit" if="nbjdk.valid" unless="nbjdk.presetdef.basic.done">
-
-
- <macrodef name="javac-presetdef">
- <attribute name="javacval"/>
- <sequential>
- <presetdef name="javac">
- <javac fork="yes" executable="@{javacval}"/>
- </presetdef>
- </sequential>
- </macrodef>
- <javac-presetdef javacval="${nbjdk.javac}"/>
- <macrodef name="java-presetdef">
- <attribute name="javaval"/>
- <sequential>
- <presetdef name="java">
- <java fork="yes" jvm="@{javaval}"/>
- </presetdef>
- </sequential>
- </macrodef>
- <java-presetdef javaval="${nbjdk.java}"/>
- <macrodef name="javadoc-presetdef">
- <attribute name="javadocval"/>
- <sequential>
- <presetdef name="javadoc">
- <javadoc executable="@{javadocval}"/>
- </presetdef>
- </sequential>
- </macrodef>
- <javadoc-presetdef javadocval="${nbjdk.javadoc}"/>
- <macrodef name="junit-presetdef">
- <attribute name="javaval"/>
- <sequential>
- <presetdef name="junit">
- <junit fork="yes" jvm="@{javaval}"/>
- </presetdef>
- </sequential>
- </macrodef>
- <junit-presetdef javaval="${nbjdk.java}"/>
- <property name="nbjdk.presetdef.basic.done" value="true"/>
- </target>
-
- <target name="-jdk-presetdef-nbjpdastart" depends="-jdk-preinit" if="nbjdk.valid" unless="nbjdk.presetdef.nbjpdastart.done">
- <macrodef name="nbjpdastart-presetdef">
- <attribute name="bootcpval"/>
- <sequential>
- <presetdef name="nbjpdastart">
- <nbjpdastart>
- <bootclasspath>
- <path path="@{bootcpval}"/>
- </bootclasspath>
- </nbjpdastart>
- </presetdef>
- </sequential>
- </macrodef>
- <nbjpdastart-presetdef bootcpval="${nbjdk.bootclasspath}"/>
- <property name="nbjdk.presetdef.nbjpdastart.done" value="true"/>
- </target>
-
- <target name="-jdk-default" unless="nbjdk.active-or-nbjdk.home">
-
- <property name="java.home.parent" location="${java.home}/.."/>
- <condition property="nbjdk.home" value="${java.home.parent}">
- <available file="${java.home.parent}/lib/tools.jar" type="file"/>
- </condition>
- <condition property="nbjdk.home" value="${java.home}">
- <available file="${java.home}/lib/tools.jar" type="file"/>
- </condition>
-
- <condition property="nbjdk.home" value="/Library/Java/Home">
- <available file="/Library/Java/Home" type="dir"/>
- </condition>
-
- <property name="nbjdk.home" location="${java.home.parent}"/>
- <property name="nbjdk.home.defaulted" value="true"/>
- </target>
-
- <target name="-jdk-init" depends="-jdk-preinit,-jdk-warn,-jdk-presetdef-basic,-jdk-default"/>
-
-</project>
\ No newline at end of file
diff --git a/nbbuild/nbproject/nbjdk.properties b/nbbuild/nbproject/nbjdk.properties
deleted file mode 100644
index b344db0..0000000
--- a/nbbuild/nbproject/nbjdk.properties
+++ /dev/null
@@ -1 +0,0 @@
-nbjdk.active=JDK_1.7
diff --git a/nbbuild/nbproject/nbjdk.xml b/nbbuild/nbproject/nbjdk.xml
deleted file mode 100644
index b1458ad..0000000
--- a/nbbuild/nbproject/nbjdk.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir=".." name="NetBeans_Build_System">
- <property file="nbproject/nbjdk.properties"/>
- <property location="${netbeans.user}/build.properties" name="user.properties.file"/>
- <property file="${user.properties.file}"/>
- <import file="jdk.xml"/>
- <target depends="-jdk-init" name="bootstrap">
- <ant inheritall="false" target="bootstrap"/>
- </target>
- <target depends="-jdk-init" name="localclean">
- <ant inheritall="false" target="localclean"/>
- </target>
- <target depends="-jdk-init" name="localtest">
- <ant inheritall="false" target="localtest"/>
- </target>
- <target depends="-jdk-init" name="localtest-single">
- <ant inheritall="false" target="localtest-single"/>
- </target>
- <target depends="-jdk-init,-jdk-presetdef-nbjpdastart" name="localtest-single-nb-debug">
- <ant inheritall="false" target="localtest-single-nb-debug"/>
- </target>
- <target depends="-jdk-init" name="tryme">
- <ant inheritall="false" target="tryme"/>
- </target>
- <target depends="-jdk-init,-jdk-presetdef-nbjpdastart" name="tryme-debug">
- <ant inheritall="false" target="tryme-debug"/>
- </target>
-</project>
diff --git a/nbbuild/nbproject/project.xml b/nbbuild/nbproject/project.xml
index de1b7da..4f6000c 100644
--- a/nbbuild/nbproject/project.xml
+++ b/nbbuild/nbproject/project.xml
@@ -76,24 +76,19 @@ made subject to such option by the copyright holder.
</folders>
<ide-actions>
<action name="build">
- <script>nbproject/nbjdk.xml</script>
<target>bootstrap</target>
</action>
<action name="rebuild">
- <script>nbproject/nbjdk.xml</script>
<target>localclean</target>
<target>bootstrap</target>
</action>
<action name="clean">
- <script>nbproject/nbjdk.xml</script>
<target>localclean</target>
</action>
<action name="test">
- <script>nbproject/nbjdk.xml</script>
<target>localtest</target>
</action>
<action name="test.single">
- <script>nbproject/nbjdk.xml</script>
<target>localtest-single</target>
<context>
<property>test.class</property>
@@ -106,7 +101,6 @@ made subject to such option by the copyright holder.
</context>
</action>
<action name="debug.test.single">
- <script>nbproject/nbjdk.xml</script>
<target>localtest-single-nb-debug</target>
<context>
<property>test.class</property>
@@ -119,7 +113,6 @@ made subject to such option by the copyright holder.
</context>
</action>
<action name="run.single.method">
- <script>nbproject/nbjdk.xml</script>
<target>localtest-single</target>
<context>
<property>test.class</property>
@@ -132,7 +125,6 @@ made subject to such option by the copyright holder.
</context>
</action>
<action name="debug.single.method">
- <script>nbproject/nbjdk.xml</script>
<target>localtest-single-nb-debug</target>
<context>
<property>test.class</property>
@@ -145,11 +137,9 @@ made subject to such option by the copyright holder.
</context>
</action>
<action name="run">
- <script>nbproject/nbjdk.xml</script>
<target>tryme</target>
</action>
<action name="debug">
- <script>nbproject/nbjdk.xml</script>
<target>tryme-debug</target>
</action>
</ide-actions>
diff --git a/nbbuild/newbuild/build-all-components.sh b/nbbuild/newbuild/build-all-components.sh
index 6cee975..301129d 100644
--- a/nbbuild/newbuild/build-all-components.sh
+++ b/nbbuild/newbuild/build-all-components.sh
@@ -135,8 +135,8 @@ else
mv nbbuild/build/testdist.zip $DIST/zip/testdist-${BUILDNUMBER}.zip
fi
-rm -rf $NB_ALL/nbbuild/netbeans
-cp -rp $NB_ALL/nbbuild/netbeans-vanilla $NB_ALL/nbbuild/netbeans
+mv $NB_ALL/nbbuild/netbeans $NB_ALL/nbbuild/netbeans.after_commit-validation_and_test-dist
+mv $NB_ALL/nbbuild/netbeans-vanilla $NB_ALL/nbbuild/netbeans
cd $NB_ALL
#Build all NBMs for stable UC - IDE + UC-only
@@ -149,27 +149,6 @@ if [ $ERROR_CODE != 0 ]; then
exit $ERROR_CODE;
fi
-cd $NB_ALL
-
-#Rebuild ODCS NBMs for stable UC with all available locales
-ant ${CLUSTER_CONFIG:--Dcluster.config=odcs} -Dbuildnum=$BUILDNUM -Dbuildnumber=$BUILDNUMBER -Dlocales=$LOCALES,de,es,fr,it,ko,zh_TW -f nbbuild/build.xml build-nonsigned-nbms -Dbase.nbm.target.dir=${DIST}/odcs -Dkeystore=$KEYSTORE -Dstorepass=$STOREPASS -Dbuild.compiler.debuglevel=${DEBUGLEVEL}
-ERROR_CODE=$?
-
-create_test_result "build.NBMs" "Build ODCS NBMs" $ERROR_CODE
-if [ $ERROR_CODE != 0 ]; then
- echo "ERROR: $ERROR_CODE - Cannot build ODCS NBMs"
- exit $ERROR_CODE;
-fi
-
-mv ${DIST}/odcs/extra/org-netbeans-modules-odcs* ${DIST}/uc2/extra/
-mv ${DIST}/odcs/extra/org-netbeans-modules-team-server* ${DIST}/uc2/extra/
-rm -rf ${DIST}/odcs
-
-rm -rf $NB_ALL/nbbuild/netbeans
-mv $NB_ALL/nbbuild/netbeans-vanilla $NB_ALL/nbbuild/netbeans
-
-cd $NB_ALL
-
# Separate IDE nbms from stableuc nbms.
ant $CLUSTER_CONFIG -f nbbuild/build.xml move-ide-nbms -Dnbms.source.location=${DIST}/uc2 -Dnbms.target.location=${DIST}/uc
ERROR_CODE=$?
diff --git a/nbbuild/newbuild/build-mac-nbi.sh b/nbbuild/newbuild/build-mac-nbi.sh
index b4c394a..5f9805e 100644
--- a/nbbuild/newbuild/build-mac-nbi.sh
+++ b/nbbuild/newbuild/build-mac-nbi.sh
@@ -1,43 +1,4 @@
#!/bin/bash
-
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-
set -x
if [ ! -z $TIP ] ; then
diff --git a/nbbuild/newbuild/files-info.sh b/nbbuild/newbuild/files-info.sh
index 8a3f72d..02048ff 100644
--- a/nbbuild/newbuild/files-info.sh
+++ b/nbbuild/newbuild/files-info.sh
@@ -45,9 +45,9 @@ if [ 0 -eq $? ] ; then
alg=`type -p digest`
alg="$alg -a md5"
else
- type sha256sum >> /dev/null 2>&1
+ type md5sum >> /dev/null 2>&1
if [ 0 -eq $? ] ; then
- alg=`type -p sha256sum`
+ alg=`type -p md5sum`
else
type gmd5sum >> /dev/null 2>&1
if [ 0 -eq $? ] ; then
diff --git a/nbbuild/newbuild/init.sh b/nbbuild/newbuild/init.sh
index 939bb72..28c7397 100644
--- a/nbbuild/newbuild/init.sh
+++ b/nbbuild/newbuild/init.sh
@@ -122,7 +122,7 @@ fi
#JDK_BUILDS_HOST=http://jre.us.oracle.com
if [ -z ${JRE_BUILDS_PATH} ]; then
- JRE_BUILDS_PATH=java/re/jdk/8u101/promoted/
+ JRE_BUILDS_PATH=java/re/jdk/8u60/promoted/
export JRE_BUILDS_PATH
fi
@@ -132,9 +132,9 @@ if [ -z ${JDK7_BUILDS_PATH} ]; then
export JDK7_BUILDS_PATH
fi
-#JDK8_BUILDS_PATH=http://jre.us.oracle.com/java/re/jdk/8u111/promoted/all/
+#JDK8_BUILDS_PATH=http://jre.us.oracle.com/java/re/jdk/8u65/promoted/all/
if [ -z ${JDK8_BUILDS_PATH} ]; then
- JDK8_BUILDS_PATH=java/re/jdk/8u111/promoted/
+ JDK8_BUILDS_PATH=java/re/jdk/8u65/promoted/
export JDK8_BUILDS_PATH
fi
diff --git a/nbbuild/newbuild/push-remote-java-help.sh b/nbbuild/newbuild/push-remote-java-help.sh
index 20a410f..17bf6a1 100644
--- a/nbbuild/newbuild/push-remote-java-help.sh
+++ b/nbbuild/newbuild/push-remote-java-help.sh
@@ -1,43 +1,5 @@
#!/bin/sh
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-
hg pull -b $push_branch
hg up $push_branch -C
rm -rf usersguide/javahelp
diff --git a/nbbuild/newbuild/trunk-nightly.sh b/nbbuild/newbuild/trunk-nightly.sh
index a4eca58..b6080c5 100644
--- a/nbbuild/newbuild/trunk-nightly.sh
+++ b/nbbuild/newbuild/trunk-nightly.sh
@@ -2,7 +2,7 @@
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
- # Copyright 2012-2016 Oracle and/or its affiliates. All rights reserved.
+ # Copyright 2012-2015 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
@@ -46,11 +46,7 @@ set -x
DIRNAME=`dirname $0`
cd ${DIRNAME}
TRUNK_NIGHTLY_DIRNAME=`pwd`
-
-if [ -z ${BUILD_DESC} ]; then
- export BUILD_DESC=8.2
-fi
-
+export BUILD_DESC=8.1
source init.sh
rm -rf $DIST
diff --git a/nbbuild/newbuild/upload-bits.sh b/nbbuild/newbuild/upload-bits.sh
index e41c283..6d7dea2 100644
--- a/nbbuild/newbuild/upload-bits.sh
+++ b/nbbuild/newbuild/upload-bits.sh
@@ -2,7 +2,7 @@
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
- # Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ # Copyright 2015 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
@@ -46,7 +46,7 @@ set -x
DIRNAME=`dirname $0`
cd ${DIRNAME}
TRUNK_NIGHTLY_DIRNAME=`pwd`
-export BUILD_DESC=8.2
+export BUILD_DESC=8.1
source init.sh
ssh -p 222 $DIST_SERVER mkdir -p $DIST_SERVER_PATH/.$DATESTAMP
diff --git a/nbbuild/templates/common.xml b/nbbuild/templates/common.xml
index 83f1588..6525882 100644
--- a/nbbuild/templates/common.xml
+++ b/nbbuild/templates/common.xml
@@ -142,12 +142,11 @@ made subject to such option by the copyright holder.
<macrodef name="custom-javac-presetdef">
<attribute name="javacval"/>
<sequential>
- <presetdef name="custom-javac">
+ <presetdef name="custom-javac">
<custom-javac executable="@{javacval}"/>
</presetdef>
</sequential>
</macrodef>
- <custom-javac-presetdef javacval="${nbjdk.javac}"/>
</target>
<target name="-javac-init-bootclasspath-prepend" depends="build-init" if="bootclasspath.prepend">
@@ -521,8 +520,8 @@ made subject to such option by the copyright holder.
<property name="test.timeout" value="600000"/> <!-- 10min per test -->
<property name="test.run.args" value="-ea"/>
<property name="test.filter.trace" value="true"/>
- <condition property="test.bootclasspath.prepend.args" value="-Xbootclasspath/p:${run.bootclasspath.prepend}">
- <isset property="run.bootclasspath.prepend"/>
+ <condition property="test.bootclasspath.prepend.args" value="-Xbootclasspath/p:${bootclasspath.prepend}">
+ <isset property="bootclasspath.prepend"/>
</condition>
<property name="test.bootclasspath.prepend.args" value="-Dno.netbeans.bootclasspath.prepend.needed=true"/>
<macrodef name="test-init">
diff --git a/nbbuild/templates/projectized.xml b/nbbuild/templates/projectized.xml
index b867849..e9c7de0 100644
--- a/nbbuild/templates/projectized.xml
+++ b/nbbuild/templates/projectized.xml
@@ -90,15 +90,15 @@ made subject to such option by the copyright holder.
<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
</target>
- <target name="jdk-8-check" depends="-jdk-init" if="have-jdk-1.9" unless="permit.jdk9.builds">
+ <target name="jdk-7-check" depends="-jdk-init" if="have-jdk-1.8" unless="permit.jdk8.builds">
<property name="user.build.properties" location="${nb_all}/nbbuild/user.build.properties"/>
<property name=".nbbuild.properties" location="${user.home}/.nbbuild.properties"/>
- <fail>You are attempting to build NetBeans using JDK 9 (or higher).
-This is forbidden as it may lead to accidental usage of JDK 9+ APIs.
-Either run Ant with JDK 8, or set nbjdk.home=<JDK 8 home> in ${user.build.properties}
+ <fail>You are attempting to build NetBeans using JDK 8 (or higher).
+This is forbidden as it may lead to accidental usage of JDK 8+ APIs.
+Either run Ant with JDK 7, or set nbjdk.home=<JDK 7 home> in ${user.build.properties}
(can be set from IDE by opening a module project's Properties dialog and picking the right Java Platform in Libraries).
You can alternatively set this property in ${.nbbuild.properties} to affect all checkouts on this machine.
-If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds=true</fail>
+If you are sure you want to build with JDK 8+ anyway, use: -Dpermit.jdk8.builds=true</fail>
</target>
<target name="-define-custom-javac-task" unless="have-custom-javac-task">
@@ -106,7 +106,7 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds=
<property name="have-custom-javac-task" value="true" />
</target>
- <target name="build-init" depends="basic-init,jdk-8-check,set-buildnumber,-define-custom-javac-task">
+ <target name="build-init" depends="basic-init,jdk-7-check,set-buildnumber,-define-custom-javac-task">
<property name="public.package.jar.dir" location="${nb.build.dir}/public-package-jars"/>
<mkdir dir="${public.package.jar.dir}"/>
<parseprojectxml
@@ -207,17 +207,17 @@ If you are sure you want to build with JDK 9+ anyway, use: -Dpermit.jdk9.builds=
<include name="*.jar"/>
</fileset>
</pathconvert>
- <!-- When requires.nb.javac property is true, prepend javac-api and javac-impl on bootclasspath to allow override the default annotation
- processing API located in rt.jar. -->
- <condition property="bootclasspath.prepend" value="${retouche.javac.api}">
- <istrue value="${requires.nb.javac}"/>
+ <!-- When requires.nb.javac property is true, prepend javac-api on bootclasspath to allow override the default annotation
+ processing API located in rt.jar. On Mac, prepend also javac-impl, so that tests are built against correct version of javac. -->
+ <condition property="bootclasspath.prepend" value="${retouche.javac.api}:${retouche.javac.impl}">
+ <and>
+ <os family="mac"/>
+ <istrue value="${requires.nb.javac}"/>
+ </and>
</condition>
- <condition property="run.bootclasspath.prepend" value="${bootclasspath.prepend}${path.separator}${retouche.javac.impl}">
+ <condition property="bootclasspath.prepend" value="${retouche.javac.api}">
<istrue value="${requires.nb.javac}"/>
</condition>
- <condition property="run.bootclasspath.prepend" value="${bootclasspath.prepend}">
- <isset property="bootclasspath.prepend"/>
- </condition>
<fail message="Delete standalone/suite-related metadata from netbeans.org modules">
<condition>
<or>
diff --git a/nbi/engine/native/cleaner/windows/nbproject/Makefile-Debug.mk b/nbi/engine/native/cleaner/windows/nbproject/Makefile-Debug.mk
new file mode 100644
index 0000000..59a13d9
--- /dev/null
+++ b/nbi/engine/native/cleaner/windows/nbproject/Makefile-Debug.mk
@@ -0,0 +1,65 @@
+#
+# Gererated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add custumized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc.exe
+CCC=g++.exe
+CXX=g++.exe
+FC=
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Debug/Cygwin-Windows
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/src/main.o
+
+# C Compiler Flags
+CFLAGS=
+
+# CC Compiler Flags
+CCFLAGS=
+CXXFLAGS=
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=\
+ -lshell32 \
+ -lkernel32
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/cleaner.exe
+
+dist/cleaner.exe: ${OBJECTFILES}
+ ${MKDIR} -p dist
+ ${LINK.c} -mno-cygwin -mwindows -o dist/cleaner -s ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/src/main.o: src/main.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ $(COMPILE.c) -g -o ${OBJECTDIR}/src/main.o src/main.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Debug
+ ${RM} dist/cleaner.exe
+
+# Subprojects
+.clean-subprojects:
diff --git a/nbi/engine/native/cleaner/windows/nbproject/Makefile-Release.mk b/nbi/engine/native/cleaner/windows/nbproject/Makefile-Release.mk
new file mode 100644
index 0000000..287901f
--- /dev/null
+++ b/nbi/engine/native/cleaner/windows/nbproject/Makefile-Release.mk
@@ -0,0 +1,63 @@
+#
+# Gererated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add custumized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc.exe
+CCC=g++.exe
+CXX=g++.exe
+FC=
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Release/Cygwin-Windows
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/src/main.o
+
+# C Compiler Flags
+CFLAGS=
+
+# CC Compiler Flags
+CCFLAGS=
+CXXFLAGS=
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/Release/Cygwin-Windows/windows.exe
+
+dist/Release/Cygwin-Windows/windows.exe: ${OBJECTFILES}
+ ${MKDIR} -p dist/Release/Cygwin-Windows
+ ${LINK.c} -o dist/Release/Cygwin-Windows/windows ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/src/main.o: src/main.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ $(COMPILE.c) -O2 -o ${OBJECTDIR}/src/main.o src/main.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Release
+ ${RM} dist/Release/Cygwin-Windows/windows.exe
+
+# Subprojects
+.clean-subprojects:
diff --git a/nbi/engine/native/cleaner/windows/nbproject/Makefile-impl.mk b/nbi/engine/native/cleaner/windows/nbproject/Makefile-impl.mk
new file mode 100644
index 0000000..100f226
--- /dev/null
+++ b/nbi/engine/native/cleaner/windows/nbproject/Makefile-impl.mk
@@ -0,0 +1,113 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a pre- and a post- target defined where you can add customization code.
+#
+# This makefile implements macros and targets common to all configurations.
+#
+# NOCDDL
+
+
+# Building and Cleaning subprojects are done by default, but can be controlled with the SUB
+# macro. If SUB=no, subprojects will not be built or cleaned. The following macro
+# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf
+# and .clean-reqprojects-conf unless SUB has the value 'no'
+SUB_no=NO
+SUBPROJECTS=${SUB_${SUB}}
+BUILD_SUBPROJECTS_=.build-subprojects
+BUILD_SUBPROJECTS_NO=
+BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}}
+CLEAN_SUBPROJECTS_=.clean-subprojects
+CLEAN_SUBPROJECTS_NO=
+CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
+
+
+# Project Name
+PROJECTNAME=windows
+
+# Active Configuration
+ACTIVECONF=Debug
+CONF=${ACTIVECONF}
+
+# All Configurations
+ALLCONFS=Debug Release
+
+
+# build
+.build-impl: .validate-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf
+
+
+# clean
+.clean-impl: .validate-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf
+
+
+# clobber
+.clobber-impl:
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ ${MAKE} -f nbproject/Makefile-$${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf; \
+ done
+
+# all
+.all-impl:
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ ${MAKE} -f nbproject/Makefile-$${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf; \
+ done
+
+
+# configuration validation
+.validate-impl:
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ echo ""; \
+ echo "Error: can not find the makefile for configuration '${CONF}' in project ${PROJECTNAME}"; \
+ echo "See 'make help' for details."; \
+ echo "Current directory: " `pwd`; \
+ echo ""; \
+ fi
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ exit 1; \
+ fi
+
+
+# help
+.help-impl:
+ @echo "This makefile supports the following configurations:"
+ @echo " ${ALLCONFS}"
+ @echo ""
+ @echo "and the following targets:"
+ @echo " build (default target)"
+ @echo " clean"
+ @echo " clobber"
+ @echo " all"
+ @echo " help"
+ @echo ""
+ @echo "Makefile Usage:"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] build"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] clean"
+ @echo " make [SUB=no] clobber"
+ @echo " make [SUB=no] all"
+ @echo " make help"
+ @echo ""
+ @echo "Target 'build' will build a specific configuration and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'clean' will clean a specific configuration and, unless 'SUB=no',"
+ @echo " also clean subprojects."
+ @echo "Target 'clobber' will remove all built files from all configurations and,"
+ @echo " unless 'SUB=no', also from subprojects."
+ @echo "Target 'all' will will build all configurations and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'help' prints this message."
+ @echo ""
+ @echo "The active configuration (${ACTIVECONF}) is being used if the configuration is not specified."
+ @echo ""
+
diff --git a/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug.mk b/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug.mk
new file mode 100644
index 0000000..e0e3ad3
--- /dev/null
+++ b/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug.mk
@@ -0,0 +1,68 @@
+#
+# Gererated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add custumized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc
+CCC=g++
+CXX=g++
+FC=f95
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Debug/GNU-Linux-x86
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o
+
+# C Compiler Flags
+CFLAGS=-shared -m32 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# CC Compiler Flags
+CCFLAGS=-shared -m32 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CXXFLAGS=-shared -m32 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/linux.so
+
+dist/linux.so: ${OBJECTFILES}
+ ${MKDIR} -p dist
+ ${LINK.c} -shared -o dist/linux.so -s ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Debug
+ ${RM} dist/linux.so
+
+# Subprojects
+.clean-subprojects:
diff --git a/nbbuild/newbuild/files-info.sh b/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug_amd64.mk
similarity index 52%
copy from nbbuild/newbuild/files-info.sh
copy to nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug_amd64.mk
index 8a3f72d..83e9659 100644
--- a/nbbuild/newbuild/files-info.sh
+++ b/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug_amd64.mk
@@ -1,4 +1,3 @@
-#!/bin/sh
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
@@ -38,62 +37,62 @@
# holder.
#
-counter=0;
-output_file=./js/files.js
-type digest >> /dev/null 2>&1
-if [ 0 -eq $? ] ; then
- alg=`type -p digest`
- alg="$alg -a md5"
-else
- type sha256sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p sha256sum`
- else
- type gmd5sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p gmd5sum`
- else
- type md5 >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p md5`
- alg="$alg -q"
- fi
- fi
- fi
-fi
-if [ -z "$alg" ] ; then
- echo "Cannot find MD5 calculating programm"
- exit 1
-else
- echo "...getting MD5 with the help of $alg"
-fi
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc
+CCC=g++
+CXX=g++
+FC=f95
+# Include project Makefile
+include Makefile
-while [ $# != 0 ] ; do
- echo "Target directory : $1"
- for nextfile in `ls -1 "$1"` ; do
- nextfile="$1"/"$nextfile"
- if [ -f "$nextfile" ] ; then
- if [ 0 -eq $counter ] ; then
- mkdir -p `dirname "$output_file"`
- rm -f "$output_file"
- #echo "file_names = new Array();" >> "$output_file"
- #echo "file_sizes = new Array();" >> "$output_file"
- #echo "file_md5s = new Array();" >> "$output_file"
- fi
- name=`basename "$nextfile"`
- echo
- echo "... file : `basename $nextfile`"
- size=`stat -Lc %s $nextfile 2>/dev/null`
- echo "... size : $size"
- md5=`$alg "$nextfile" | sed "s/ .*//g"`
- echo "... md5 : $md5"
- #echo "file_names["$counter"]=\"$1/$name\";" >> "$output_file"
- #echo "file_sizes["$counter"]=$size;" >> "$output_file"
- #echo "file_md5s["$counter"]=\"$md5\";" >> "$output_file"
- echo "add_file(\"$1/$name\", $size, \"$md5\", \"en,$LOCALES\");" >> "$output_file"
- counter=`expr $counter + 1`
- fi
- done
- shift
-done
+# Object Directory
+OBJECTDIR=build/Debug_amd64/GNU-Linux-x86
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o
+
+# C Compiler Flags
+CFLAGS=-m64 -shared -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# CC Compiler Flags
+CCFLAGS=-m64 -shared -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CXXFLAGS=-m64 -shared -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/linux-amd64.so
+
+dist/linux-amd64.so: ${OBJECTFILES}
+ ${MKDIR} -p dist
+ ${LINK.c} -shared -o dist/linux-amd64.so -s ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Debug_amd64
+ ${RM} dist/linux-amd64.so
+
+# Subprojects
+.clean-subprojects:
diff --git a/nbi/engine/native/jnilib/linux/nbproject/Makefile-Release.mk b/nbi/engine/native/jnilib/linux/nbproject/Makefile-Release.mk
new file mode 100644
index 0000000..ac971ac
--- /dev/null
+++ b/nbi/engine/native/jnilib/linux/nbproject/Makefile-Release.mk
@@ -0,0 +1,68 @@
+#
+# Gererated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add custumized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc
+CCC=g++
+CXX=g++
+FC=f95
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Release/GNU-Linux-x86
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o
+
+# C Compiler Flags
+CFLAGS=
+
+# CC Compiler Flags
+CCFLAGS=
+CXXFLAGS=
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/Release/GNU-Linux-x86/liblinux.so
+
+dist/Release/GNU-Linux-x86/liblinux.so: ${OBJECTFILES}
+ ${MKDIR} -p dist/Release/GNU-Linux-x86
+ ${LINK.c} -shared -o dist/Release/GNU-Linux-x86/liblinux.so ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src
+ $(COMPILE.c) -O2 -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src
+ $(COMPILE.c) -O2 -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Release
+ ${RM} dist/Release/GNU-Linux-x86/liblinux.so
+
+# Subprojects
+.clean-subprojects:
diff --git a/nbi/engine/native/jnilib/linux/nbproject/Makefile-impl.mk b/nbi/engine/native/jnilib/linux/nbproject/Makefile-impl.mk
new file mode 100644
index 0000000..08716d6
--- /dev/null
+++ b/nbi/engine/native/jnilib/linux/nbproject/Makefile-impl.mk
@@ -0,0 +1,113 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a pre- and a post- target defined where you can add customization code.
+#
+# This makefile implements macros and targets common to all configurations.
+#
+# NOCDDL
+
+
+# Building and Cleaning subprojects are done by default, but can be controlled with the SUB
+# macro. If SUB=no, subprojects will not be built or cleaned. The following macro
+# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf
+# and .clean-reqprojects-conf unless SUB has the value 'no'
+SUB_no=NO
+SUBPROJECTS=${SUB_${SUB}}
+BUILD_SUBPROJECTS_=.build-subprojects
+BUILD_SUBPROJECTS_NO=
+BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}}
+CLEAN_SUBPROJECTS_=.clean-subprojects
+CLEAN_SUBPROJECTS_NO=
+CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
+
+
+# Project Name
+PROJECTNAME=linux
+
+# Active Configuration
+ACTIVECONF=Debug
+CONF=${ACTIVECONF}
+
+# All Configurations
+ALLCONFS=Debug Release Debug_amd64
+
+
+# build
+.build-impl: .validate-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf
+
+
+# clean
+.clean-impl: .validate-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf
+
+
+# clobber
+.clobber-impl:
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ ${MAKE} -f nbproject/Makefile-$${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf; \
+ done
+
+# all
+.all-impl:
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ ${MAKE} -f nbproject/Makefile-$${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf; \
+ done
+
+
+# configuration validation
+.validate-impl:
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ echo ""; \
+ echo "Error: can not find the makefile for configuration '${CONF}' in project ${PROJECTNAME}"; \
+ echo "See 'make help' for details."; \
+ echo "Current directory: " `pwd`; \
+ echo ""; \
+ fi
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ exit 1; \
+ fi
+
+
+# help
+.help-impl:
+ @echo "This makefile supports the following configurations:"
+ @echo " ${ALLCONFS}"
+ @echo ""
+ @echo "and the following targets:"
+ @echo " build (default target)"
+ @echo " clean"
+ @echo " clobber"
+ @echo " all"
+ @echo " help"
+ @echo ""
+ @echo "Makefile Usage:"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] build"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] clean"
+ @echo " make [SUB=no] clobber"
+ @echo " make [SUB=no] all"
+ @echo " make help"
+ @echo ""
+ @echo "Target 'build' will build a specific configuration and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'clean' will clean a specific configuration and, unless 'SUB=no',"
+ @echo " also clean subprojects."
+ @echo "Target 'clobber' will remove all built files from all configurations and,"
+ @echo " unless 'SUB=no', also from subprojects."
+ @echo "Target 'all' will will build all configurations and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'help' prints this message."
+ @echo ""
+ @echo "The active configuration (${ACTIVECONF}) is being used if the configuration is not specified."
+ @echo ""
+
diff --git a/nbi/engine/native/jnilib/macosx/nbproject/Makefile-Debug.mk b/nbi/engine/native/jnilib/macosx/nbproject/Makefile-Debug.mk
new file mode 100644
index 0000000..43ac847
--- /dev/null
+++ b/nbi/engine/native/jnilib/macosx/nbproject/Makefile-Debug.mk
@@ -0,0 +1,68 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add customized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc
+CCC=g++
+CXX=g++
+FC=
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Debug/GNU-MacOSX
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.unix/src/jni_UnixNativeUtils.o
+
+# C Compiler Flags
+CFLAGS=-arch i386 -arch ppc -arch ppc64 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -dynamiclib
+
+# CC Compiler Flags
+CCFLAGS=-arch i386 -arch ppc -arch ppc64 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -dynamiclib
+CXXFLAGS=-arch i386 -arch ppc -arch ppc64 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -dynamiclib
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/macosx.dylib
+
+dist/macosx.dylib: ${OBJECTFILES}
+ ${MKDIR} -p dist
+ ${LINK.c} -Wl,-syslibroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -arch ppc64 -arch x86_64 -dynamiclib -install_name macosx.dylib -o dist/macosx.dylib -fPIC ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.common/src
+ $(COMPILE.c) -s -I/Library/Java/Home/include -fPIC -o ${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.unix/src
+ $(COMPILE.c) -s -I/Library/Java/Home/include -fPIC -o ${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Debug
+ ${RM} dist/macosx.dylib
+
+# Subprojects
+.clean-subprojects:
diff --git a/nbi/engine/native/jnilib/macosx/nbproject/Makefile-Release.mk b/nbi/engine/native/jnilib/macosx/nbproject/Makefile-Release.mk
new file mode 100644
index 0000000..e95365b
--- /dev/null
+++ b/nbi/engine/native/jnilib/macosx/nbproject/Makefile-Release.mk
@@ -0,0 +1,68 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add customized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc
+CCC=g++
+CXX=g++
+FC=
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Release/GNU-MacOSX
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.unix/src/jni_UnixNativeUtils.o
+
+# C Compiler Flags
+CFLAGS=
+
+# CC Compiler Flags
+CCFLAGS=
+CXXFLAGS=
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/Release/GNU-MacOSX/libmacosx.dylib
+
+dist/Release/GNU-MacOSX/libmacosx.dylib: ${OBJECTFILES}
+ ${MKDIR} -p dist/Release/GNU-MacOSX
+ ${LINK.c} -dynamiclib -install_name libmacosx.dylib -o dist/Release/GNU-MacOSX/libmacosx.dylib -fPIC ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.common/src
+ $(COMPILE.c) -O2 -fPIC -o ${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.unix/src
+ $(COMPILE.c) -O2 -fPIC -o ${OBJECTDIR}/_ext/Users/tester/tmp/NB-IDE/main/nbi/engine/native/jnilib/macosx/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Release
+ ${RM} dist/Release/GNU-MacOSX/libmacosx.dylib
+
+# Subprojects
+.clean-subprojects:
diff --git a/nbi/engine/native/jnilib/macosx/nbproject/Makefile-impl.mk b/nbi/engine/native/jnilib/macosx/nbproject/Makefile-impl.mk
new file mode 100644
index 0000000..a08a35d
--- /dev/null
+++ b/nbi/engine/native/jnilib/macosx/nbproject/Makefile-impl.mk
@@ -0,0 +1,111 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a pre- and a post- target defined where you can add customization code.
+#
+# This makefile implements macros and targets common to all configurations.
+#
+# NOCDDL
+
+
+# Building and Cleaning subprojects are done by default, but can be controlled with the SUB
+# macro. If SUB=no, subprojects will not be built or cleaned. The following macro
+# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf
+# and .clean-reqprojects-conf unless SUB has the value 'no'
+SUB_no=NO
+SUBPROJECTS=${SUB_${SUB}}
+BUILD_SUBPROJECTS_=.build-subprojects
+BUILD_SUBPROJECTS_NO=
+BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}}
+CLEAN_SUBPROJECTS_=.clean-subprojects
+CLEAN_SUBPROJECTS_NO=
+CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
+
+
+# Project Name
+PROJECTNAME=macosx
+
+# Active Configuration
+DEFAULTCONF=Debug
+CONF=${DEFAULTCONF}
+
+# All Configurations
+ALLCONFS=Debug Release
+
+
+# build
+.build-impl: .validate-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf
+
+
+# clean
+.clean-impl: .validate-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf
+
+
+# clobber
+.clobber-impl:
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ ${MAKE} -f nbproject/Makefile-$${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf; \
+ done
+
+# all
+.all-impl:
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ ${MAKE} -f nbproject/Makefile-$${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf; \
+ done
+
+
+# configuration validation
+.validate-impl:
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ echo ""; \
+ echo "Error: can not find the makefile for configuration '${CONF}' in project ${PROJECTNAME}"; \
+ echo "See 'make help' for details."; \
+ echo "Current directory: " `pwd`; \
+ echo ""; \
+ fi
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ exit 1; \
+ fi
+
+
+# help
+.help-impl:
+ @echo "This makefile supports the following configurations:"
+ @echo " ${ALLCONFS}"
+ @echo ""
+ @echo "and the following targets:"
+ @echo " build (default target)"
+ @echo " clean"
+ @echo " clobber"
+ @echo " all"
+ @echo " help"
+ @echo ""
+ @echo "Makefile Usage:"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] build"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] clean"
+ @echo " make [SUB=no] clobber"
+ @echo " make [SUB=no] all"
+ @echo " make help"
+ @echo ""
+ @echo "Target 'build' will build a specific configuration and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'clean' will clean a specific configuration and, unless 'SUB=no',"
+ @echo " also clean subprojects."
+ @echo "Target 'clobber' will remove all built files from all configurations and,"
+ @echo " unless 'SUB=no', also from subprojects."
+ @echo "Target 'all' will will build all configurations and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'help' prints this message."
+ @echo ""
+
diff --git a/nbi/engine/native/jnilib/macosx/nbproject/configurations.xml b/nbi/engine/native/jnilib/macosx/nbproject/configurations.xml
index d08e612..bbe89c3 100644
--- a/nbi/engine/native/jnilib/macosx/nbproject/configurations.xml
+++ b/nbi/engine/native/jnilib/macosx/nbproject/configurations.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<configurationDescriptor version="45">
<logicalFolder name="root" displayName="root" projectFiles="true">
<logicalFolder name="HeaderFiles"
diff --git a/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-Debug.mk b/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-Debug.mk
new file mode 100644
index 0000000..f3fad0c
--- /dev/null
+++ b/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-Debug.mk
@@ -0,0 +1,72 @@
+#
+# Gererated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add custumized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=cc
+CCC=CC
+CXX=CC
+FC=f77
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Debug/Sun12-Solaris-Sparc
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src/jni_UnixNativeUtils.o
+
+# C Compiler Flags
+CFLAGS=-m32 -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -xO2 -Xa
+
+# CC Compiler Flags
+CCFLAGS=-m32 -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -xO2 -Xa
+CXXFLAGS=-m32 -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -xO2 -Xa
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/solaris-sparc.so
+
+dist/solaris-sparc.so: ${OBJECTFILES}
+ ${MKDIR} -p dist
+ ${LINK.c} -G -o dist/solaris-sparc.so -s -Kpic -h solaris-sparc.so ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Debug
+ ${RM} dist/solaris-sparc.so
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.KEEP_STATE:
+.KEEP_STATE_FILE:.make.state.${CONF}
diff --git a/nbbuild/newbuild/files-info.sh b/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-Debug_gnu.mk
similarity index 50%
copy from nbbuild/newbuild/files-info.sh
copy to nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-Debug_gnu.mk
index 8a3f72d..6dcc0a0 100644
--- a/nbbuild/newbuild/files-info.sh
+++ b/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-Debug_gnu.mk
@@ -1,4 +1,3 @@
-#!/bin/sh
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
@@ -38,62 +37,66 @@
# holder.
#
-counter=0;
-output_file=./js/files.js
-type digest >> /dev/null 2>&1
-if [ 0 -eq $? ] ; then
- alg=`type -p digest`
- alg="$alg -a md5"
-else
- type sha256sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p sha256sum`
- else
- type gmd5sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p gmd5sum`
- else
- type md5 >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p md5`
- alg="$alg -q"
- fi
- fi
- fi
-fi
-if [ -z "$alg" ] ; then
- echo "Cannot find MD5 calculating programm"
- exit 1
-else
- echo "...getting MD5 with the help of $alg"
-fi
-
-
-while [ $# != 0 ] ; do
- echo "Target directory : $1"
- for nextfile in `ls -1 "$1"` ; do
- nextfile="$1"/"$nextfile"
- if [ -f "$nextfile" ] ; then
- if [ 0 -eq $counter ] ; then
- mkdir -p `dirname "$output_file"`
- rm -f "$output_file"
- #echo "file_names = new Array();" >> "$output_file"
- #echo "file_sizes = new Array();" >> "$output_file"
- #echo "file_md5s = new Array();" >> "$output_file"
- fi
- name=`basename "$nextfile"`
- echo
- echo "... file : `basename $nextfile`"
- size=`stat -Lc %s $nextfile 2>/dev/null`
- echo "... size : $size"
- md5=`$alg "$nextfile" | sed "s/ .*//g"`
- echo "... md5 : $md5"
- #echo "file_names["$counter"]=\"$1/$name\";" >> "$output_file"
- #echo "file_sizes["$counter"]=$size;" >> "$output_file"
- #echo "file_md5s["$counter"]=\"$md5\";" >> "$output_file"
- echo "add_file(\"$1/$name\", $size, \"$md5\", \"en,$LOCALES\");" >> "$output_file"
- counter=`expr $counter + 1`
- fi
- done
- shift
-done
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc
+CCC=g++
+CXX=g++
+FC=
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Debug_gnu/GNU-Solaris-Sparc
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src/jni_UnixNativeUtils.o
+
+# C Compiler Flags
+CFLAGS=-m32 -fPIC -shared -static-libgcc -mimpure-text -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# CC Compiler Flags
+CCFLAGS=-m32 -fPIC -shared -static-libgcc -mimpure-text -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CXXFLAGS=-m32 -fPIC -shared -static-libgcc -mimpure-text -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/solaris-sparc.so
+
+dist/solaris-sparc.so: ${OBJECTFILES}
+ ${MKDIR} -p dist
+ ${LINK.c} -shared -o dist/solaris-sparc.so -s ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Debug_gnu
+ ${RM} dist/solaris-sparc.so
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.KEEP_STATE:
+.KEEP_STATE_FILE:.make.state.${CONF}
diff --git a/nbbuild/newbuild/files-info.sh b/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-Debug_x64.mk
similarity index 50%
copy from nbbuild/newbuild/files-info.sh
copy to nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-Debug_x64.mk
index 8a3f72d..6b85322 100644
--- a/nbbuild/newbuild/files-info.sh
+++ b/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-Debug_x64.mk
@@ -1,4 +1,3 @@
-#!/bin/sh
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
@@ -38,62 +37,66 @@
# holder.
#
-counter=0;
-output_file=./js/files.js
-type digest >> /dev/null 2>&1
-if [ 0 -eq $? ] ; then
- alg=`type -p digest`
- alg="$alg -a md5"
-else
- type sha256sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p sha256sum`
- else
- type gmd5sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p gmd5sum`
- else
- type md5 >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p md5`
- alg="$alg -q"
- fi
- fi
- fi
-fi
-if [ -z "$alg" ] ; then
- echo "Cannot find MD5 calculating programm"
- exit 1
-else
- echo "...getting MD5 with the help of $alg"
-fi
-
-
-while [ $# != 0 ] ; do
- echo "Target directory : $1"
- for nextfile in `ls -1 "$1"` ; do
- nextfile="$1"/"$nextfile"
- if [ -f "$nextfile" ] ; then
- if [ 0 -eq $counter ] ; then
- mkdir -p `dirname "$output_file"`
- rm -f "$output_file"
- #echo "file_names = new Array();" >> "$output_file"
- #echo "file_sizes = new Array();" >> "$output_file"
- #echo "file_md5s = new Array();" >> "$output_file"
- fi
- name=`basename "$nextfile"`
- echo
- echo "... file : `basename $nextfile`"
- size=`stat -Lc %s $nextfile 2>/dev/null`
- echo "... size : $size"
- md5=`$alg "$nextfile" | sed "s/ .*//g"`
- echo "... md5 : $md5"
- #echo "file_names["$counter"]=\"$1/$name\";" >> "$output_file"
- #echo "file_sizes["$counter"]=$size;" >> "$output_file"
- #echo "file_md5s["$counter"]=\"$md5\";" >> "$output_file"
- echo "add_file(\"$1/$name\", $size, \"$md5\", \"en,$LOCALES\");" >> "$output_file"
- counter=`expr $counter + 1`
- fi
- done
- shift
-done
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=cc
+CCC=CC
+CXX=CC
+FC=f77
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Debug_x64/Sun12-Solaris-Sparc
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src/jni_UnixNativeUtils.o
+
+# C Compiler Flags
+CFLAGS=-m64 -fPIC -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -xO2 -Xa
+
+# CC Compiler Flags
+CCFLAGS=-m64 -fPIC -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -xO2 -Xa
+CXXFLAGS=-m64 -fPIC -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -xO2 -Xa
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/solaris-sparcv9.so
+
+dist/solaris-sparcv9.so: ${OBJECTFILES}
+ ${MKDIR} -p dist
+ ${LINK.c} -G -o dist/solaris-sparcv9.so -s -Kpic -h solaris-sparcv9.so ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Debug_x64
+ ${RM} dist/solaris-sparcv9.so
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.KEEP_STATE:
+.KEEP_STATE_FILE:.make.state.${CONF}
diff --git a/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-Debug_x64_gnu.mk b/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-Debug_x64_gnu.mk
new file mode 100644
index 0000000..d1c7342
--- /dev/null
+++ b/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-Debug_x64_gnu.mk
@@ -0,0 +1,102 @@
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+# Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+#
+# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+# Other names may be trademarks of their respective owners.
+#
+# The contents of this file are subject to the terms of either the GNU General Public
+# License Version 2 only ("GPL") or the Common Development and Distribution
+# License("CDDL") (collectively, the "License"). You may not use this file except in
+# compliance with the License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+# License for the specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header Notice in
+# each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Oracle
+# designates this particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that accompanied this code.
+# If applicable, add the following below the License Header, with the fields enclosed
+# by brackets [] replaced by your own identifying information:
+# "Portions Copyrighted [year] [name of copyright owner]"
+#
+# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original Software
+# is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+# Rights Reserved.
+#
+# If you wish your version of this file to be governed by only the CDDL or only the
+# GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+# this software in this distribution under the [CDDL or GPL Version 2] license." If
+# you do not indicate a single choice of license, a recipient has the option to
+# distribute your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above. However, if you
+# add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
+# option applies only if the new code is made subject to such option by the copyright
+# holder.
+#
+
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc
+CCC=g++
+CXX=g++
+FC=
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Debug_x64_gnu/GNU-Solaris-Sparc
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src/jni_UnixNativeUtils.o
+
+# C Compiler Flags
+CFLAGS=-m64 -fPIC -shared -static-libgcc -mimpure-text -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# CC Compiler Flags
+CCFLAGS=-m64 -fPIC -shared -static-libgcc -mimpure-text -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CXXFLAGS=-m64 -fPIC -shared -static-libgcc -mimpure-text -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/solaris-sparcv9.so
+
+dist/solaris-sparcv9.so: ${OBJECTFILES}
+ ${MKDIR} -p dist
+ ${LINK.c} -shared -o dist/solaris-sparcv9.so -s ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Debug_x64_gnu
+ ${RM} dist/solaris-sparcv9.so
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.KEEP_STATE:
+.KEEP_STATE_FILE:.make.state.${CONF}
diff --git a/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-Release.mk b/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-Release.mk
new file mode 100644
index 0000000..41ee1a6
--- /dev/null
+++ b/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-Release.mk
@@ -0,0 +1,72 @@
+#
+# Gererated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add custumized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc
+CCC=g++
+CXX=g++
+FC=
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Release/GNU-Solaris-Sparc
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src/jni_UnixNativeUtils.o
+
+# C Compiler Flags
+CFLAGS=
+
+# CC Compiler Flags
+CCFLAGS=
+CXXFLAGS=
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/Release/GNU-Solaris-Sparc/libsolaris-sparc.so
+
+dist/Release/GNU-Solaris-Sparc/libsolaris-sparc.so: ${OBJECTFILES}
+ ${MKDIR} -p dist/Release/GNU-Solaris-Sparc
+ ${LINK.c} -shared -o dist/Release/GNU-Solaris-Sparc/libsolaris-sparc.so ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src
+ $(COMPILE.c) -O2 -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src
+ $(COMPILE.c) -O2 -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-sparc/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Release
+ ${RM} dist/Release/GNU-Solaris-Sparc/libsolaris-sparc.so
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.KEEP_STATE:
+.KEEP_STATE_FILE:.make.state.${CONF}
diff --git a/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-impl.mk b/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-impl.mk
new file mode 100644
index 0000000..77ced20
--- /dev/null
+++ b/nbi/engine/native/jnilib/solaris-sparc/nbproject/Makefile-impl.mk
@@ -0,0 +1,113 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a pre- and a post- target defined where you can add customization code.
+#
+# This makefile implements macros and targets common to all configurations.
+#
+# NOCDDL
+
+
+# Building and Cleaning subprojects are done by default, but can be controlled with the SUB
+# macro. If SUB=no, subprojects will not be built or cleaned. The following macro
+# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf
+# and .clean-reqprojects-conf unless SUB has the value 'no'
+SUB_no=NO
+SUBPROJECTS=${SUB_${SUB}}
+BUILD_SUBPROJECTS_=.build-subprojects
+BUILD_SUBPROJECTS_NO=
+BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}}
+CLEAN_SUBPROJECTS_=.clean-subprojects
+CLEAN_SUBPROJECTS_NO=
+CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
+
+
+# Project Name
+PROJECTNAME=solaris-sparc
+
+# Active Configuration
+ACTIVECONF=Debug
+CONF=${ACTIVECONF}
+
+# All Configurations
+ALLCONFS=Debug Release Debug_x64 Debug_gnu Debug_x64_gnu
+
+
+# build
+.build-impl: .validate-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf
+
+
+# clean
+.clean-impl: .validate-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf
+
+
+# clobber
+.clobber-impl:
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ ${MAKE} -f nbproject/Makefile-$${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf; \
+ done
+
+# all
+.all-impl:
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ ${MAKE} -f nbproject/Makefile-$${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf; \
+ done
+
+
+# configuration validation
+.validate-impl:
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ echo ""; \
+ echo "Error: can not find the makefile for configuration '${CONF}' in project ${PROJECTNAME}"; \
+ echo "See 'make help' for details."; \
+ echo "Current directory: " `pwd`; \
+ echo ""; \
+ fi
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ exit 1; \
+ fi
+
+
+# help
+.help-impl:
+ @echo "This makefile supports the following configurations:"
+ @echo " ${ALLCONFS}"
+ @echo ""
+ @echo "and the following targets:"
+ @echo " build (default target)"
+ @echo " clean"
+ @echo " clobber"
+ @echo " all"
+ @echo " help"
+ @echo ""
+ @echo "Makefile Usage:"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] build"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] clean"
+ @echo " make [SUB=no] clobber"
+ @echo " make [SUB=no] all"
+ @echo " make help"
+ @echo ""
+ @echo "Target 'build' will build a specific configuration and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'clean' will clean a specific configuration and, unless 'SUB=no',"
+ @echo " also clean subprojects."
+ @echo "Target 'clobber' will remove all built files from all configurations and,"
+ @echo " unless 'SUB=no', also from subprojects."
+ @echo "Target 'all' will will build all configurations and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'help' prints this message."
+ @echo ""
+ @echo "The active configuration (${ACTIVECONF}) is being used if the configuration is not specified."
+ @echo ""
+
diff --git a/nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-Debug.mk b/nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-Debug.mk
new file mode 100644
index 0000000..71791f1
--- /dev/null
+++ b/nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-Debug.mk
@@ -0,0 +1,72 @@
+#
+# Gererated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add custumized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=cc
+CCC=CC
+CXX=CC
+FC=f77
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Debug/Sun12-Solaris-x86
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src/jni_UnixNativeUtils.o
+
+# C Compiler Flags
+CFLAGS=-m32 -fPIC -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -xO2 -Xa
+
+# CC Compiler Flags
+CCFLAGS=-m32 -fPIC -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -xO2 -Xa
+CXXFLAGS=-m32 -fPIC -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -xO2 -Xa
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/solaris-x86.so
+
+dist/solaris-x86.so: ${OBJECTFILES}
+ ${MKDIR} -p dist
+ ${LINK.c} -G -o dist/solaris-x86.so -s -Kpic -h solaris-x86.so ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Debug
+ ${RM} dist/solaris-x86.so
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.KEEP_STATE:
+.KEEP_STATE_FILE:.make.state.${CONF}
diff --git a/nbbuild/newbuild/files-info.sh b/nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-Debug_gnu.mk
similarity index 50%
copy from nbbuild/newbuild/files-info.sh
copy to nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-Debug_gnu.mk
index 8a3f72d..7767d94 100644
--- a/nbbuild/newbuild/files-info.sh
+++ b/nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-Debug_gnu.mk
@@ -1,4 +1,3 @@
-#!/bin/sh
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
@@ -38,62 +37,66 @@
# holder.
#
-counter=0;
-output_file=./js/files.js
-type digest >> /dev/null 2>&1
-if [ 0 -eq $? ] ; then
- alg=`type -p digest`
- alg="$alg -a md5"
-else
- type sha256sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p sha256sum`
- else
- type gmd5sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p gmd5sum`
- else
- type md5 >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p md5`
- alg="$alg -q"
- fi
- fi
- fi
-fi
-if [ -z "$alg" ] ; then
- echo "Cannot find MD5 calculating programm"
- exit 1
-else
- echo "...getting MD5 with the help of $alg"
-fi
-
-
-while [ $# != 0 ] ; do
- echo "Target directory : $1"
- for nextfile in `ls -1 "$1"` ; do
- nextfile="$1"/"$nextfile"
- if [ -f "$nextfile" ] ; then
- if [ 0 -eq $counter ] ; then
- mkdir -p `dirname "$output_file"`
- rm -f "$output_file"
- #echo "file_names = new Array();" >> "$output_file"
- #echo "file_sizes = new Array();" >> "$output_file"
- #echo "file_md5s = new Array();" >> "$output_file"
- fi
- name=`basename "$nextfile"`
- echo
- echo "... file : `basename $nextfile`"
- size=`stat -Lc %s $nextfile 2>/dev/null`
- echo "... size : $size"
- md5=`$alg "$nextfile" | sed "s/ .*//g"`
- echo "... md5 : $md5"
- #echo "file_names["$counter"]=\"$1/$name\";" >> "$output_file"
- #echo "file_sizes["$counter"]=$size;" >> "$output_file"
- #echo "file_md5s["$counter"]=\"$md5\";" >> "$output_file"
- echo "add_file(\"$1/$name\", $size, \"$md5\", \"en,$LOCALES\");" >> "$output_file"
- counter=`expr $counter + 1`
- fi
- done
- shift
-done
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc
+CCC=g++
+CXX=g++
+FC=g77
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Debug_gnu/GNU-Solaris-x86
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src/jni_UnixNativeUtils.o
+
+# C Compiler Flags
+CFLAGS=-m32 -fPIC -static-libgcc -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# CC Compiler Flags
+CCFLAGS=-m32 -fPIC -static-libgcc -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CXXFLAGS=-m32 -fPIC -static-libgcc -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/solaris-x86.so
+
+dist/solaris-x86.so: ${OBJECTFILES}
+ ${MKDIR} -p dist
+ ${LINK.c} -shared -o dist/solaris-x86.so -s ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Debug_gnu
+ ${RM} dist/solaris-x86.so
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.KEEP_STATE:
+.KEEP_STATE_FILE:.make.state.${CONF}
diff --git a/nbbuild/newbuild/files-info.sh b/nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-Debug_x64.mk
similarity index 50%
copy from nbbuild/newbuild/files-info.sh
copy to nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-Debug_x64.mk
index 8a3f72d..83251e8 100644
--- a/nbbuild/newbuild/files-info.sh
+++ b/nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-Debug_x64.mk
@@ -1,4 +1,3 @@
-#!/bin/sh
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
@@ -38,62 +37,66 @@
# holder.
#
-counter=0;
-output_file=./js/files.js
-type digest >> /dev/null 2>&1
-if [ 0 -eq $? ] ; then
- alg=`type -p digest`
- alg="$alg -a md5"
-else
- type sha256sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p sha256sum`
- else
- type gmd5sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p gmd5sum`
- else
- type md5 >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p md5`
- alg="$alg -q"
- fi
- fi
- fi
-fi
-if [ -z "$alg" ] ; then
- echo "Cannot find MD5 calculating programm"
- exit 1
-else
- echo "...getting MD5 with the help of $alg"
-fi
-
-
-while [ $# != 0 ] ; do
- echo "Target directory : $1"
- for nextfile in `ls -1 "$1"` ; do
- nextfile="$1"/"$nextfile"
- if [ -f "$nextfile" ] ; then
- if [ 0 -eq $counter ] ; then
- mkdir -p `dirname "$output_file"`
- rm -f "$output_file"
- #echo "file_names = new Array();" >> "$output_file"
- #echo "file_sizes = new Array();" >> "$output_file"
- #echo "file_md5s = new Array();" >> "$output_file"
- fi
- name=`basename "$nextfile"`
- echo
- echo "... file : `basename $nextfile`"
- size=`stat -Lc %s $nextfile 2>/dev/null`
- echo "... size : $size"
- md5=`$alg "$nextfile" | sed "s/ .*//g"`
- echo "... md5 : $md5"
- #echo "file_names["$counter"]=\"$1/$name\";" >> "$output_file"
- #echo "file_sizes["$counter"]=$size;" >> "$output_file"
- #echo "file_md5s["$counter"]=\"$md5\";" >> "$output_file"
- echo "add_file(\"$1/$name\", $size, \"$md5\", \"en,$LOCALES\");" >> "$output_file"
- counter=`expr $counter + 1`
- fi
- done
- shift
-done
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=cc
+CCC=CC
+CXX=CC
+FC=f77
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Debug_x64/Sun12-Solaris-x86
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src/jni_UnixNativeUtils.o
+
+# C Compiler Flags
+CFLAGS=-m64 -KPIC -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -xO2 -Xa
+
+# CC Compiler Flags
+CCFLAGS=-m64 -KPIC -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -xO2 -Xa
+CXXFLAGS=-m64 -KPIC -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -xO2 -Xa
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/solaris-amd64.so
+
+dist/solaris-amd64.so: ${OBJECTFILES}
+ ${MKDIR} -p dist
+ ${LINK.c} -G -o dist/solaris-amd64.so -s -Kpic -h solaris-amd64.so ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Debug_x64
+ ${RM} dist/solaris-amd64.so
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.KEEP_STATE:
+.KEEP_STATE_FILE:.make.state.${CONF}
diff --git a/nbbuild/newbuild/files-info.sh b/nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-Debug_x64_gnu.mk
similarity index 50%
copy from nbbuild/newbuild/files-info.sh
copy to nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-Debug_x64_gnu.mk
index 8a3f72d..51ee607 100644
--- a/nbbuild/newbuild/files-info.sh
+++ b/nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-Debug_x64_gnu.mk
@@ -1,4 +1,3 @@
-#!/bin/sh
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
@@ -38,62 +37,66 @@
# holder.
#
-counter=0;
-output_file=./js/files.js
-type digest >> /dev/null 2>&1
-if [ 0 -eq $? ] ; then
- alg=`type -p digest`
- alg="$alg -a md5"
-else
- type sha256sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p sha256sum`
- else
- type gmd5sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p gmd5sum`
- else
- type md5 >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p md5`
- alg="$alg -q"
- fi
- fi
- fi
-fi
-if [ -z "$alg" ] ; then
- echo "Cannot find MD5 calculating programm"
- exit 1
-else
- echo "...getting MD5 with the help of $alg"
-fi
-
-
-while [ $# != 0 ] ; do
- echo "Target directory : $1"
- for nextfile in `ls -1 "$1"` ; do
- nextfile="$1"/"$nextfile"
- if [ -f "$nextfile" ] ; then
- if [ 0 -eq $counter ] ; then
- mkdir -p `dirname "$output_file"`
- rm -f "$output_file"
- #echo "file_names = new Array();" >> "$output_file"
- #echo "file_sizes = new Array();" >> "$output_file"
- #echo "file_md5s = new Array();" >> "$output_file"
- fi
- name=`basename "$nextfile"`
- echo
- echo "... file : `basename $nextfile`"
- size=`stat -Lc %s $nextfile 2>/dev/null`
- echo "... size : $size"
- md5=`$alg "$nextfile" | sed "s/ .*//g"`
- echo "... md5 : $md5"
- #echo "file_names["$counter"]=\"$1/$name\";" >> "$output_file"
- #echo "file_sizes["$counter"]=$size;" >> "$output_file"
- #echo "file_md5s["$counter"]=\"$md5\";" >> "$output_file"
- echo "add_file(\"$1/$name\", $size, \"$md5\", \"en,$LOCALES\");" >> "$output_file"
- counter=`expr $counter + 1`
- fi
- done
- shift
-done
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc
+CCC=g++
+CXX=g++
+FC=g77
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Debug_x64_gnu/GNU-Solaris-x86
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src/jni_UnixNativeUtils.o
+
+# C Compiler Flags
+CFLAGS=-m64 -fPIC -static-libgcc -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# CC Compiler Flags
+CCFLAGS=-m64 -fPIC -static-libgcc -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CXXFLAGS=-m64 -fPIC -static-libgcc -shared -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/solaris-amd64.so
+
+dist/solaris-amd64.so: ${OBJECTFILES}
+ ${MKDIR} -p dist
+ ${LINK.c} -shared -o dist/solaris-amd64.so -s ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/solaris -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Debug_x64_gnu
+ ${RM} dist/solaris-amd64.so
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.KEEP_STATE:
+.KEEP_STATE_FILE:.make.state.${CONF}
diff --git a/nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-Release.mk b/nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-Release.mk
new file mode 100644
index 0000000..079bf7c
--- /dev/null
+++ b/nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-Release.mk
@@ -0,0 +1,72 @@
+#
+# Gererated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add custumized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc
+CCC=g++
+CXX=g++
+FC=g77
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Release/GNU-Solaris-Sparc
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src/jni_UnixNativeUtils.o
+
+# C Compiler Flags
+CFLAGS=
+
+# CC Compiler Flags
+CCFLAGS=
+CXXFLAGS=
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/Release/GNU-Solaris-Sparc/libsolaris-x86.so
+
+dist/Release/GNU-Solaris-Sparc/libsolaris-x86.so: ${OBJECTFILES}
+ ${MKDIR} -p dist/Release/GNU-Solaris-Sparc
+ ${LINK.c} -shared -o dist/Release/GNU-Solaris-Sparc/libsolaris-x86.so ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src
+ $(COMPILE.c) -O2 -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src
+ $(COMPILE.c) -O2 -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/solaris-x86/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Release
+ ${RM} dist/Release/GNU-Solaris-Sparc/libsolaris-x86.so
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.KEEP_STATE:
+.KEEP_STATE_FILE:.make.state.${CONF}
diff --git a/nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-impl.mk b/nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-impl.mk
new file mode 100644
index 0000000..920d1f0
--- /dev/null
+++ b/nbi/engine/native/jnilib/solaris-x86/nbproject/Makefile-impl.mk
@@ -0,0 +1,113 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a pre- and a post- target defined where you can add customization code.
+#
+# This makefile implements macros and targets common to all configurations.
+#
+# NOCDDL
+
+
+# Building and Cleaning subprojects are done by default, but can be controlled with the SUB
+# macro. If SUB=no, subprojects will not be built or cleaned. The following macro
+# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf
+# and .clean-reqprojects-conf unless SUB has the value 'no'
+SUB_no=NO
+SUBPROJECTS=${SUB_${SUB}}
+BUILD_SUBPROJECTS_=.build-subprojects
+BUILD_SUBPROJECTS_NO=
+BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}}
+CLEAN_SUBPROJECTS_=.clean-subprojects
+CLEAN_SUBPROJECTS_NO=
+CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
+
+
+# Project Name
+PROJECTNAME=solaris-x86
+
+# Active Configuration
+ACTIVECONF=Debug
+CONF=${ACTIVECONF}
+
+# All Configurations
+ALLCONFS=Debug Release Debug_x64 Debug_gnu Debug_x64_gnu
+
+
+# build
+.build-impl: .validate-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf
+
+
+# clean
+.clean-impl: .validate-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf
+
+
+# clobber
+.clobber-impl:
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ ${MAKE} -f nbproject/Makefile-$${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf; \
+ done
+
+# all
+.all-impl:
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ ${MAKE} -f nbproject/Makefile-$${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf; \
+ done
+
+
+# configuration validation
+.validate-impl:
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ echo ""; \
+ echo "Error: can not find the makefile for configuration '${CONF}' in project ${PROJECTNAME}"; \
+ echo "See 'make help' for details."; \
+ echo "Current directory: " `pwd`; \
+ echo ""; \
+ fi
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ exit 1; \
+ fi
+
+
+# help
+.help-impl:
+ @echo "This makefile supports the following configurations:"
+ @echo " ${ALLCONFS}"
+ @echo ""
+ @echo "and the following targets:"
+ @echo " build (default target)"
+ @echo " clean"
+ @echo " clobber"
+ @echo " all"
+ @echo " help"
+ @echo ""
+ @echo "Makefile Usage:"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] build"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] clean"
+ @echo " make [SUB=no] clobber"
+ @echo " make [SUB=no] all"
+ @echo " make help"
+ @echo ""
+ @echo "Target 'build' will build a specific configuration and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'clean' will clean a specific configuration and, unless 'SUB=no',"
+ @echo " also clean subprojects."
+ @echo "Target 'clobber' will remove all built files from all configurations and,"
+ @echo " unless 'SUB=no', also from subprojects."
+ @echo "Target 'all' will will build all configurations and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'help' prints this message."
+ @echo ""
+ @echo "The active configuration (${ACTIVECONF}) is being used if the configuration is not specified."
+ @echo ""
+
diff --git a/nbbuild/newbuild/files-info.sh b/nbi/engine/native/jnilib/windows/nbproject/Makefile-Default-32bit.mk
similarity index 51%
copy from nbbuild/newbuild/files-info.sh
copy to nbi/engine/native/jnilib/windows/nbproject/Makefile-Default-32bit.mk
index 8a3f72d..25efc00 100644
--- a/nbbuild/newbuild/files-info.sh
+++ b/nbi/engine/native/jnilib/windows/nbproject/Makefile-Default-32bit.mk
@@ -1,4 +1,3 @@
-#!/bin/sh
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
@@ -38,62 +37,74 @@
# holder.
#
-counter=0;
-output_file=./js/files.js
-type digest >> /dev/null 2>&1
-if [ 0 -eq $? ] ; then
- alg=`type -p digest`
- alg="$alg -a md5"
-else
- type sha256sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p sha256sum`
- else
- type gmd5sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p gmd5sum`
- else
- type md5 >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p md5`
- alg="$alg -q"
- fi
- fi
- fi
-fi
-if [ -z "$alg" ] ; then
- echo "Cannot find MD5 calculating programm"
- exit 1
-else
- echo "...getting MD5 with the help of $alg"
-fi
-
-
-while [ $# != 0 ] ; do
- echo "Target directory : $1"
- for nextfile in `ls -1 "$1"` ; do
- nextfile="$1"/"$nextfile"
- if [ -f "$nextfile" ] ; then
- if [ 0 -eq $counter ] ; then
- mkdir -p `dirname "$output_file"`
- rm -f "$output_file"
- #echo "file_names = new Array();" >> "$output_file"
- #echo "file_sizes = new Array();" >> "$output_file"
- #echo "file_md5s = new Array();" >> "$output_file"
- fi
- name=`basename "$nextfile"`
- echo
- echo "... file : `basename $nextfile`"
- size=`stat -Lc %s $nextfile 2>/dev/null`
- echo "... size : $size"
- md5=`$alg "$nextfile" | sed "s/ .*//g"`
- echo "... md5 : $md5"
- #echo "file_names["$counter"]=\"$1/$name\";" >> "$output_file"
- #echo "file_sizes["$counter"]=$size;" >> "$output_file"
- #echo "file_md5s["$counter"]=\"$md5\";" >> "$output_file"
- echo "add_file(\"$1/$name\", $size, \"$md5\", \"en,$LOCALES\");" >> "$output_file"
- counter=`expr $counter + 1`
- fi
- done
- shift
-done
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc.exe
+CCC=g++.exe
+CXX=g++.exe
+FC=f77.exe
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Default-32bit/Cygwin-Windows
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/D_/work/nbi/engine/native/jnilib/windows/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/src/jni_WindowsNativeUtils.o \
+ ${OBJECTDIR}/src/jni_WindowsRegistry.o \
+ ${OBJECTDIR}/src/WindowsUtils.o
+
+# C Compiler Flags
+CFLAGS=-mno-cygwin
+
+# CC Compiler Flags
+CCFLAGS=-mno-cygwin
+CXXFLAGS=-mno-cygwin
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=\
+ -lole32 \
+ -luuid
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/windows.dll
+
+dist/windows.dll: ${OBJECTFILES}
+ ${MKDIR} -p dist
+ ${LINK.c} -Wl,--add-stdcall-alias -shared -o dist/windows.dll -s ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/D_/work/nbi/engine/native/jnilib/windows/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/D_/work/nbi/engine/native/jnilib/windows/../.common/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/win32 -o ${OBJECTDIR}/_ext/D_/work/nbi/engine/native/jnilib/windows/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/src/jni_WindowsNativeUtils.o: src/jni_WindowsNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/win32 -o ${OBJECTDIR}/src/jni_WindowsNativeUtils.o src/jni_WindowsNativeUtils.c
+
+${OBJECTDIR}/src/jni_WindowsRegistry.o: src/jni_WindowsRegistry.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/win32 -o ${OBJECTDIR}/src/jni_WindowsRegistry.o src/jni_WindowsRegistry.c
+
+${OBJECTDIR}/src/WindowsUtils.o: src/WindowsUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/win32 -o ${OBJECTDIR}/src/WindowsUtils.o src/WindowsUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Default-32bit
+ ${RM} dist/windows.dll
+
+# Subprojects
+.clean-subprojects:
diff --git a/nbbuild/newbuild/files-info.sh b/nbi/engine/native/jnilib/windows/nbproject/Makefile-Default-64bit.mk
similarity index 51%
copy from nbbuild/newbuild/files-info.sh
copy to nbi/engine/native/jnilib/windows/nbproject/Makefile-Default-64bit.mk
index 8a3f72d..87041a5 100644
--- a/nbbuild/newbuild/files-info.sh
+++ b/nbi/engine/native/jnilib/windows/nbproject/Makefile-Default-64bit.mk
@@ -1,4 +1,3 @@
-#!/bin/sh
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
@@ -38,62 +37,74 @@
# holder.
#
-counter=0;
-output_file=./js/files.js
-type digest >> /dev/null 2>&1
-if [ 0 -eq $? ] ; then
- alg=`type -p digest`
- alg="$alg -a md5"
-else
- type sha256sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p sha256sum`
- else
- type gmd5sum >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p gmd5sum`
- else
- type md5 >> /dev/null 2>&1
- if [ 0 -eq $? ] ; then
- alg=`type -p md5`
- alg="$alg -q"
- fi
- fi
- fi
-fi
-if [ -z "$alg" ] ; then
- echo "Cannot find MD5 calculating programm"
- exit 1
-else
- echo "...getting MD5 with the help of $alg"
-fi
-
-
-while [ $# != 0 ] ; do
- echo "Target directory : $1"
- for nextfile in `ls -1 "$1"` ; do
- nextfile="$1"/"$nextfile"
- if [ -f "$nextfile" ] ; then
- if [ 0 -eq $counter ] ; then
- mkdir -p `dirname "$output_file"`
- rm -f "$output_file"
- #echo "file_names = new Array();" >> "$output_file"
- #echo "file_sizes = new Array();" >> "$output_file"
- #echo "file_md5s = new Array();" >> "$output_file"
- fi
- name=`basename "$nextfile"`
- echo
- echo "... file : `basename $nextfile`"
- size=`stat -Lc %s $nextfile 2>/dev/null`
- echo "... size : $size"
- md5=`$alg "$nextfile" | sed "s/ .*//g"`
- echo "... md5 : $md5"
- #echo "file_names["$counter"]=\"$1/$name\";" >> "$output_file"
- #echo "file_sizes["$counter"]=$size;" >> "$output_file"
- #echo "file_md5s["$counter"]=\"$md5\";" >> "$output_file"
- echo "add_file(\"$1/$name\", $size, \"$md5\", \"en,$LOCALES\");" >> "$output_file"
- counter=`expr $counter + 1`
- fi
- done
- shift
-done
+# Environment
+MKDIR=mkdir
+CP=cp
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc.exe
+CCC=g++.exe
+CXX=g++.exe
+FC=f77.exe
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=build/Default-64bit/Cygwin-Windows
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/_ext/D_/work/nbi/engine/native/jnilib/windows/../.common/src/CommonUtils.o \
+ ${OBJECTDIR}/src/jni_WindowsNativeUtils.o \
+ ${OBJECTDIR}/src/jni_WindowsRegistry.o \
+ ${OBJECTDIR}/src/WindowsUtils.o
+
+# C Compiler Flags
+CFLAGS=-mno-cygwin
+
+# CC Compiler Flags
+CCFLAGS=-mno-cygwin
+CXXFLAGS=-mno-cygwin
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=\
+ -lole32 \
+ -luuid
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS} dist/windows.dll
+
+dist/windows.dll: ${OBJECTFILES}
+ ${MKDIR} -p dist
+ ${LINK.c} -Wl,--add-stdcall-alias -shared -o dist/windows.dll -s ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/_ext/D_/work/nbi/engine/native/jnilib/windows/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/_ext/D_/work/nbi/engine/native/jnilib/windows/../.common/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/win32 -o ${OBJECTDIR}/_ext/D_/work/nbi/engine/native/jnilib/windows/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
+
+${OBJECTDIR}/src/jni_WindowsNativeUtils.o: src/jni_WindowsNativeUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/win32 -o ${OBJECTDIR}/src/jni_WindowsNativeUtils.o src/jni_WindowsNativeUtils.c
+
+${OBJECTDIR}/src/jni_WindowsRegistry.o: src/jni_WindowsRegistry.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/win32 -o ${OBJECTDIR}/src/jni_WindowsRegistry.o src/jni_WindowsRegistry.c
+
+${OBJECTDIR}/src/WindowsUtils.o: src/WindowsUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/win32 -o ${OBJECTDIR}/src/WindowsUtils.o src/WindowsUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf:
+ ${RM} -r build/Default-64bit
+ ${RM} dist/windows.dll
+
+# Subprojects
+.clean-subprojects:
diff --git a/nbi/engine/native/jnilib/windows/nbproject/Makefile-impl.mk b/nbi/engine/native/jnilib/windows/nbproject/Makefile-impl.mk
new file mode 100644
index 0000000..182f388
--- /dev/null
+++ b/nbi/engine/native/jnilib/windows/nbproject/Makefile-impl.mk
@@ -0,0 +1,113 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a pre- and a post- target defined where you can add customization code.
+#
+# This makefile implements macros and targets common to all configurations.
+#
+# NOCDDL
+
+
+# Building and Cleaning subprojects are done by default, but can be controlled with the SUB
+# macro. If SUB=no, subprojects will not be built or cleaned. The following macro
+# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf
+# and .clean-reqprojects-conf unless SUB has the value 'no'
+SUB_no=NO
+SUBPROJECTS=${SUB_${SUB}}
+BUILD_SUBPROJECTS_=.build-subprojects
+BUILD_SUBPROJECTS_NO=
+BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}}
+CLEAN_SUBPROJECTS_=.clean-subprojects
+CLEAN_SUBPROJECTS_NO=
+CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
+
+
+# Project Name
+PROJECTNAME=windows
+
+# Active Configuration
+ACTIVECONF=Default-32bit
+CONF=${ACTIVECONF}
+
+# All Configurations
+ALLCONFS=Default-32bit Default-64bit
+
+
+# build
+.build-impl: .validate-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf
+
+
+# clean
+.clean-impl: .validate-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf
+
+
+# clobber
+.clobber-impl:
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ ${MAKE} -f nbproject/Makefile-$${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf; \
+ done
+
+# all
+.all-impl:
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ ${MAKE} -f nbproject/Makefile-$${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf; \
+ done
+
+
+# configuration validation
+.validate-impl:
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ echo ""; \
+ echo "Error: can not find the makefile for configuration '${CONF}' in project ${PROJECTNAME}"; \
+ echo "See 'make help' for details."; \
+ echo "Current directory: " `pwd`; \
+ echo ""; \
+ fi
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ exit 1; \
+ fi
+
+
+# help
+.help-impl:
+ @echo "This makefile supports the following configurations:"
+ @echo " ${ALLCONFS}"
+ @echo ""
+ @echo "and the following targets:"
+ @echo " build (default target)"
+ @echo " clean"
+ @echo " clobber"
+ @echo " all"
+ @echo " help"
+ @echo ""
+ @echo "Makefile Usage:"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] build"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] clean"
+ @echo " make [SUB=no] clobber"
+ @echo " make [SUB=no] all"
+ @echo " make help"
+ @echo ""
+ @echo "Target 'build' will build a specific configuration and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'clean' will clean a specific configuration and, unless 'SUB=no',"
+ @echo " also clean subprojects."
+ @echo "Target 'clobber' will remove all built files from all configurations and,"
+ @echo " unless 'SUB=no', also from subprojects."
+ @echo "Target 'all' will will build all configurations and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'help' prints this message."
+ @echo ""
+ @echo "The active configuration (${ACTIVECONF}) is being used if the configuration is not specified."
+ @echo ""
+
diff --git a/nbi/engine/native/launcher/unix/i18n/launcher.properties b/nbi/engine/native/launcher/unix/i18n/launcher.properties
index 3fbc316..1bcc510 100644
--- a/nbi/engine/native/launcher/unix/i18n/launcher.properties
+++ b/nbi/engine/native/launcher/unix/i18n/launcher.properties
@@ -37,7 +37,7 @@
# holder.
#
-nlu.jvm.notfoundmessage=Java SE Development Kit (JDK) was not found on this computer\nJDK 8 is required for installing the NetBeans IDE. Make sure that the JDK is properly installed and run installer again.\nYou can specify valid JDK location using {0} installer argument.\n\nTo download the JDK, visit http://www.oracle.com/technetwork/java/javase/downloads
+nlu.jvm.notfoundmessage=Java SE Development Kit (JDK) was not found on this computer\nJDK 7 is required for installing the NetBeans IDE. Make sure that the JDK is properly installed and run installer again.\nYou can specify valid JDK location using {0} installer argument.\n\nTo download the JDK, visit http://www.oracle.com/technetwork/java/javase/downloads
nlu.jvm.usererror=Java Runtime Environment (JRE) was not found at the specified location {0}
nlu.jvm.uncompatible=Unsupported JVM version at {0}.\nTry to specify another JVM location using parameter {1}
nlu.freespace=There is not enough free disk space to extract installation data\n{0} MB of free disk space is required in a temporary folder.\nClean up the disk space and run installer again. You can specify a temporary folder with sufficient disk space using {1} installer argument
diff --git a/nbi/engine/native/launcher/unix/src/launcher.sh b/nbi/engine/native/launcher/unix/src/launcher.sh
index 0db024b..808dce3 100644
--- a/nbi/engine/native/launcher/unix/src/launcher.sh
+++ b/nbi/engine/native/launcher/unix/src/launcher.sh
@@ -975,7 +975,7 @@ installBundledJVMs() {
searchJavaOnMacOs() {
if [ -x "/usr/libexec/java_home" ]; then
- javaOnMacHome=`/usr/libexec/java_home --version 1.8+ --failfast`
+ javaOnMacHome=`/usr/libexec/java_home --version 1.7.0_10+ --failfast`
fi
if [ ! -x "$javaOnMacHome/bin/java" -a -f "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java" ] ; then
diff --git a/nbi/engine/native/launcher/windows/i18n/launcher.properties b/nbi/engine/native/launcher/windows/i18n/launcher.properties
index c9de214..c43b1a6 100644
--- a/nbi/engine/native/launcher/windows/i18n/launcher.properties
+++ b/nbi/engine/native/launcher/windows/i18n/launcher.properties
@@ -37,7 +37,7 @@
# holder.
#
-nlw.jvm.notfoundmessage=Java SE Development Kit (JDK) was not found on this computer\nJDK 8 or newer is required for installing the NetBeans IDE. Make sure that the JDK is properly installed and run installer again. You can specify valid JDK location using {0} installer argument.\n\nTo download the JDK, visit http://www.oracle.com/technetwork/java/javase/downloads
+nlw.jvm.notfoundmessage=Java SE Development Kit (JDK) was not found on this computer\nJDK 7 or newer is required for installing the NetBeans IDE. Make sure that the JDK is properly installed and run installer again. You can specify valid JDK location using {0} installer argument.\n\nTo download the JDK, visit http://www.oracle.com/technetwork/java/javase/downloads
nlw.jvm.usererror=Java Runtime Environment (JRE) was not found\nThere is no JRE at the specified location {0}
nlw.jvm.unsupportedversion=Unsupported Java VM version\nThe Java VM at {0} has the unsupported version
nlw.freespace=There is not enough free disk space to extract installation data\n{0} MB of free disk space is required in a temporary folder. Clean up the disk space and run installer again. You can specify a temporary folder with sufficient disk space using {1} installer argument
diff --git a/nbi/engine/native/launcher/windows/nbproject/Makefile-Debug.mk b/nbi/engine/native/launcher/windows/nbproject/Makefile-Debug.mk
new file mode 100644
index 0000000..cdf5e55
--- /dev/null
+++ b/nbi/engine/native/launcher/windows/nbproject/Makefile-Debug.mk
@@ -0,0 +1,132 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add customized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+GREP=grep
+NM=nm
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc.exe
+CCC=g++.exe
+CXX=g++.exe
+FC=gfortran
+AS=as.exe
+
+# Macros
+CND_PLATFORM=Cygwin-Windows
+CND_DLIB_EXT=dll
+CND_CONF=Debug
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/src/Main.o \
+ ${OBJECTDIR}/src/StringUtils.o \
+ ${OBJECTDIR}/src/RegistryUtils.o \
+ ${OBJECTDIR}/src/SystemUtils.o \
+ ${OBJECTDIR}/src/ProcessUtils.o \
+ ${OBJECTDIR}/src/Launcher.o \
+ ${OBJECTDIR}/src/JavaUtils.o \
+ ${OBJECTDIR}/src/FileUtils.o \
+ ${OBJECTDIR}/src/ExtractUtils.o
+
+
+# C Compiler Flags
+CFLAGS=-mno-cygwin
+
+# CC Compiler Flags
+CCFLAGS=
+CXXFLAGS=
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Assembler Flags
+ASFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=-lole32 -luuid -lkernel32 -lcomctl32 -luserenv
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS}
+ "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk dist/nlw.exe
+
+dist/nlw.exe: ${OBJECTFILES}
+ ${MKDIR} -p dist
+ ${LINK.c} -mwindows -mno-cygwin build/icon.o -o dist/nlw -s ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/src/Main.o: src/Main.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -g -Werror -s -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/Main.o src/Main.c
+
+${OBJECTDIR}/src/StringUtils.o: src/StringUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -g -Werror -s -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/StringUtils.o src/StringUtils.c
+
+${OBJECTDIR}/src/RegistryUtils.o: src/RegistryUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -g -Werror -s -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/RegistryUtils.o src/RegistryUtils.c
+
+${OBJECTDIR}/src/SystemUtils.o: src/SystemUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -g -Werror -s -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/SystemUtils.o src/SystemUtils.c
+
+${OBJECTDIR}/src/ProcessUtils.o: src/ProcessUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -g -Werror -s -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/ProcessUtils.o src/ProcessUtils.c
+
+${OBJECTDIR}/src/Launcher.o: src/Launcher.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -g -Werror -s -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/Launcher.o src/Launcher.c
+
+${OBJECTDIR}/src/JavaUtils.o: src/JavaUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -g -Werror -s -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/JavaUtils.o src/JavaUtils.c
+
+${OBJECTDIR}/src/FileUtils.o: src/FileUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -g -Werror -s -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/FileUtils.o src/FileUtils.c
+
+${OBJECTDIR}/src/ExtractUtils.o: src/ExtractUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -g -Werror -s -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/ExtractUtils.o src/ExtractUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf: ${CLEAN_SUBPROJECTS}
+ ${RM} -r ${CND_BUILDDIR}/${CND_CONF}
+ ${RM} dist/nlw.exe
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.dep.inc: .depcheck-impl
+
+include .dep.inc
diff --git a/nbi/engine/native/launcher/windows/nbproject/Makefile-Release.mk b/nbi/engine/native/launcher/windows/nbproject/Makefile-Release.mk
new file mode 100644
index 0000000..9cf1f4c
--- /dev/null
+++ b/nbi/engine/native/launcher/windows/nbproject/Makefile-Release.mk
@@ -0,0 +1,132 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add customized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+GREP=grep
+NM=nm
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc.exe
+CCC=g++.exe
+CXX=g++.exe
+FC=gfortran
+AS=as.exe
+
+# Macros
+CND_PLATFORM=Cygwin-Windows
+CND_DLIB_EXT=dll
+CND_CONF=Release
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/src/Main.o \
+ ${OBJECTDIR}/src/StringUtils.o \
+ ${OBJECTDIR}/src/RegistryUtils.o \
+ ${OBJECTDIR}/src/SystemUtils.o \
+ ${OBJECTDIR}/src/ProcessUtils.o \
+ ${OBJECTDIR}/src/Launcher.o \
+ ${OBJECTDIR}/src/JavaUtils.o \
+ ${OBJECTDIR}/src/FileUtils.o \
+ ${OBJECTDIR}/src/ExtractUtils.o
+
+
+# C Compiler Flags
+CFLAGS=
+
+# CC Compiler Flags
+CCFLAGS=
+CXXFLAGS=
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Assembler Flags
+ASFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS}
+ "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/windows.exe
+
+${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/windows.exe: ${OBJECTFILES}
+ ${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
+ ${LINK.c} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/windows ${OBJECTFILES} ${LDLIBSOPTIONS}
+
+${OBJECTDIR}/src/Main.o: src/Main.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/Main.o src/Main.c
+
+${OBJECTDIR}/src/StringUtils.o: src/StringUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/StringUtils.o src/StringUtils.c
+
+${OBJECTDIR}/src/RegistryUtils.o: src/RegistryUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/RegistryUtils.o src/RegistryUtils.c
+
+${OBJECTDIR}/src/SystemUtils.o: src/SystemUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/SystemUtils.o src/SystemUtils.c
+
+${OBJECTDIR}/src/ProcessUtils.o: src/ProcessUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/ProcessUtils.o src/ProcessUtils.c
+
+${OBJECTDIR}/src/Launcher.o: src/Launcher.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/Launcher.o src/Launcher.c
+
+${OBJECTDIR}/src/JavaUtils.o: src/JavaUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/JavaUtils.o src/JavaUtils.c
+
+${OBJECTDIR}/src/FileUtils.o: src/FileUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/FileUtils.o src/FileUtils.c
+
+${OBJECTDIR}/src/ExtractUtils.o: src/ExtractUtils.c
+ ${MKDIR} -p ${OBJECTDIR}/src
+ ${RM} $@.d
+ $(COMPILE.c) -O2 -MMD -MP -MF $@.d -o ${OBJECTDIR}/src/ExtractUtils.o src/ExtractUtils.c
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf: ${CLEAN_SUBPROJECTS}
+ ${RM} -r ${CND_BUILDDIR}/${CND_CONF}
+ ${RM} ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/windows.exe
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.dep.inc: .depcheck-impl
+
+include .dep.inc
diff --git a/nbi/engine/native/launcher/windows/nbproject/Makefile-impl.mk b/nbi/engine/native/launcher/windows/nbproject/Makefile-impl.mk
new file mode 100644
index 0000000..8a91a70
--- /dev/null
+++ b/nbi/engine/native/launcher/windows/nbproject/Makefile-impl.mk
@@ -0,0 +1,133 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a pre- and a post- target defined where you can add customization code.
+#
+# This makefile implements macros and targets common to all configurations.
+#
+# NOCDDL
+
+
+# Building and Cleaning subprojects are done by default, but can be controlled with the SUB
+# macro. If SUB=no, subprojects will not be built or cleaned. The following macro
+# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf
+# and .clean-reqprojects-conf unless SUB has the value 'no'
+SUB_no=NO
+SUBPROJECTS=${SUB_${SUB}}
+BUILD_SUBPROJECTS_=.build-subprojects
+BUILD_SUBPROJECTS_NO=
+BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}}
+CLEAN_SUBPROJECTS_=.clean-subprojects
+CLEAN_SUBPROJECTS_NO=
+CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
+
+
+# Project Name
+PROJECTNAME=windows
+
+# Active Configuration
+DEFAULTCONF=Debug
+CONF=${DEFAULTCONF}
+
+# All Configurations
+ALLCONFS=Debug Release
+
+
+# build
+.build-impl: .build-pre .validate-impl .depcheck-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .build-conf
+
+
+# clean
+.clean-impl: .clean-pre .validate-impl .depcheck-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .clean-conf
+
+
+# clobber
+.clobber-impl: .clobber-pre .depcheck-impl
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ "${MAKE}" -f nbproject/Makefile-$${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .clean-conf; \
+ done
+
+# all
+.all-impl: .all-pre .depcheck-impl
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ "${MAKE}" -f nbproject/Makefile-$${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .build-conf; \
+ done
+
+# build tests
+.build-tests-impl: .build-impl .build-tests-pre
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-tests-conf
+
+# run tests
+.test-impl: .build-tests-impl .test-pre
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .test-conf
+
+# dependency checking support
+.depcheck-impl:
+ @echo "# This code depends on make tool being used" >.dep.inc
+ @if [ -n "${MAKE_VERSION}" ]; then \
+ echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES}))" >>.dep.inc; \
+ echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \
+ echo "include \$${DEPFILES}" >>.dep.inc; \
+ echo "endif" >>.dep.inc; \
+ else \
+ echo ".KEEP_STATE:" >>.dep.inc; \
+ echo ".KEEP_STATE_FILE:.make.state.\$${CONF}" >>.dep.inc; \
+ fi
+
+# configuration validation
+.validate-impl:
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ echo ""; \
+ echo "Error: can not find the makefile for configuration '${CONF}' in project ${PROJECTNAME}"; \
+ echo "See 'make help' for details."; \
+ echo "Current directory: " `pwd`; \
+ echo ""; \
+ fi
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ exit 1; \
+ fi
+
+
+# help
+.help-impl: .help-pre
+ @echo "This makefile supports the following configurations:"
+ @echo " ${ALLCONFS}"
+ @echo ""
+ @echo "and the following targets:"
+ @echo " build (default target)"
+ @echo " clean"
+ @echo " clobber"
+ @echo " all"
+ @echo " help"
+ @echo ""
+ @echo "Makefile Usage:"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] build"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] clean"
+ @echo " make [SUB=no] clobber"
+ @echo " make [SUB=no] all"
+ @echo " make help"
+ @echo ""
+ @echo "Target 'build' will build a specific configuration and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'clean' will clean a specific configuration and, unless 'SUB=no',"
+ @echo " also clean subprojects."
+ @echo "Target 'clobber' will remove all built files from all configurations and,"
+ @echo " unless 'SUB=no', also from subprojects."
+ @echo "Target 'all' will will build all configurations and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'help' prints this message."
+ @echo ""
+
diff --git a/nbi/engine/native/launcher/windows/nbproject/Makefile-variables.mk b/nbi/engine/native/launcher/windows/nbproject/Makefile-variables.mk
new file mode 100644
index 0000000..043ac28
--- /dev/null
+++ b/nbi/engine/native/launcher/windows/nbproject/Makefile-variables.mk
@@ -0,0 +1,35 @@
+#
+# Generated - do not edit!
+#
+# NOCDDL
+#
+CND_BASEDIR=`pwd`
+CND_BUILDDIR=build
+CND_DISTDIR=dist
+# Debug configuration
+CND_PLATFORM_Debug=Cygwin-Windows
+CND_ARTIFACT_DIR_Debug=dist
+CND_ARTIFACT_NAME_Debug=nlw
+CND_ARTIFACT_PATH_Debug=dist/nlw
+CND_PACKAGE_DIR_Debug=dist/Debug/Cygwin-Windows/package
+CND_PACKAGE_NAME_Debug=windows.tar
+CND_PACKAGE_PATH_Debug=dist/Debug/Cygwin-Windows/package/windows.tar
+# Release configuration
+CND_PLATFORM_Release=Cygwin-Windows
+CND_ARTIFACT_DIR_Release=dist/Release/Cygwin-Windows
+CND_ARTIFACT_NAME_Release=windows
+CND_ARTIFACT_PATH_Release=dist/Release/Cygwin-Windows/windows
+CND_PACKAGE_DIR_Release=dist/Release/Cygwin-Windows/package
+CND_PACKAGE_NAME_Release=windows.tar
+CND_PACKAGE_PATH_Release=dist/Release/Cygwin-Windows/package/windows.tar
+#
+# include compiler specific variables
+#
+# dmake command
+ROOT:sh = test -f nbproject/private/Makefile-variables.mk || \
+ (mkdir -p nbproject/private && touch nbproject/private/Makefile-variables.mk)
+#
+# gmake command
+.PHONY: $(shell test -f nbproject/private/Makefile-variables.mk || (mkdir -p nbproject/private && touch nbproject/private/Makefile-variables.mk))
+#
+include nbproject/private/Makefile-variables.mk
diff --git a/nbi/engine/native/launcher/windows/nbproject/Package-Debug.bash b/nbi/engine/native/launcher/windows/nbproject/Package-Debug.bash
new file mode 100644
index 0000000..aa4d1d6
--- /dev/null
+++ b/nbi/engine/native/launcher/windows/nbproject/Package-Debug.bash
@@ -0,0 +1,75 @@
+#!/bin/bash -x
+
+#
+# Generated - do not edit!
+#
+
+# Macros
+TOP=`pwd`
+CND_PLATFORM=Cygwin-Windows
+CND_CONF=Debug
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
+TMPDIRNAME=tmp-packaging
+OUTPUT_PATH=dist/nlw
+OUTPUT_BASENAME=nlw
+PACKAGE_TOP_DIR=windows/
+
+# Functions
+function checkReturnCode
+{
+ rc=$?
+ if [ $rc != 0 ]
+ then
+ exit $rc
+ fi
+}
+function makeDirectory
+# $1 directory path
+# $2 permission (optional)
+{
+ mkdir -p "$1"
+ checkReturnCode
+ if [ "$2" != "" ]
+ then
+ chmod $2 "$1"
+ checkReturnCode
+ fi
+}
+function copyFileToTmpDir
+# $1 from-file path
+# $2 to-file path
+# $3 permission
+{
+ cp "$1" "$2"
+ checkReturnCode
+ if [ "$3" != "" ]
+ then
+ chmod $3 "$2"
+ checkReturnCode
+ fi
+}
+
+# Setup
+cd "${TOP}"
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
+rm -rf ${NBTMPDIR}
+mkdir -p ${NBTMPDIR}
+
+# Copy files and create directories and links
+cd "${TOP}"
+makeDirectory "${NBTMPDIR}/windows/bin"
+copyFileToTmpDir "${OUTPUT_PATH}.exe" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}.exe" 0755
+
+
+# Generate tar file
+cd "${TOP}"
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/windows.tar
+cd ${NBTMPDIR}
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/windows.tar *
+checkReturnCode
+
+# Cleanup
+cd "${TOP}"
+rm -rf ${NBTMPDIR}
diff --git a/nbi/engine/native/launcher/windows/nbproject/Package-Release.bash b/nbi/engine/native/launcher/windows/nbproject/Package-Release.bash
new file mode 100644
index 0000000..4303c88
--- /dev/null
+++ b/nbi/engine/native/launcher/windows/nbproject/Package-Release.bash
@@ -0,0 +1,75 @@
+#!/bin/bash -x
+
+#
+# Generated - do not edit!
+#
+
+# Macros
+TOP=`pwd`
+CND_PLATFORM=Cygwin-Windows
+CND_CONF=Release
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
+TMPDIRNAME=tmp-packaging
+OUTPUT_PATH=${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/windows
+OUTPUT_BASENAME=windows
+PACKAGE_TOP_DIR=windows/
+
+# Functions
+function checkReturnCode
+{
+ rc=$?
+ if [ $rc != 0 ]
+ then
+ exit $rc
+ fi
+}
+function makeDirectory
+# $1 directory path
+# $2 permission (optional)
+{
+ mkdir -p "$1"
+ checkReturnCode
+ if [ "$2" != "" ]
+ then
+ chmod $2 "$1"
+ checkReturnCode
+ fi
+}
+function copyFileToTmpDir
+# $1 from-file path
+# $2 to-file path
+# $3 permission
+{
+ cp "$1" "$2"
+ checkReturnCode
+ if [ "$3" != "" ]
+ then
+ chmod $3 "$2"
+ checkReturnCode
+ fi
+}
+
+# Setup
+cd "${TOP}"
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
+rm -rf ${NBTMPDIR}
+mkdir -p ${NBTMPDIR}
+
+# Copy files and create directories and links
+cd "${TOP}"
+makeDirectory "${NBTMPDIR}/windows/bin"
+copyFileToTmpDir "${OUTPUT_PATH}.exe" "${NBTMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}.exe" 0755
+
+
+# Generate tar file
+cd "${TOP}"
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/windows.tar
+cd ${NBTMPDIR}
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/windows.tar *
+checkReturnCode
+
+# Cleanup
+cd "${TOP}"
+rm -rf ${NBTMPDIR}
diff --git a/nbi/engine/native/launcher/windows/nbproject/configurations.xml b/nbi/engine/native/launcher/windows/nbproject/configurations.xml
index a969ca9..ed38b53 100644
--- a/nbi/engine/native/launcher/windows/nbproject/configurations.xml
+++ b/nbi/engine/native/launcher/windows/nbproject/configurations.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<configurationDescriptor version="84">
<logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
<logicalFolder name="HeaderFiles"
diff --git a/nbi/engine/native/launcher/windows/resources/res.rc b/nbi/engine/native/launcher/windows/resources/res.rc
index 02860db..e068ed3 100644
--- a/nbi/engine/native/launcher/windows/resources/res.rc
+++ b/nbi/engine/native/launcher/windows/resources/res.rc
@@ -1,45 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2007 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- */
-
-
// Uncomment the following lines to add special "Vista" manifest under Cygwin using GCC and WINDRES
// Seems that tools from MS Platform SDK/MS VS C++ 2005 EE (C compiler, resource compiler and manifest tool) ignore that
// (so you can leave that uncommented for both tools at once) but I haven`t check that much.
diff --git a/nbi/engine/nbproject/genfiles.properties b/nbi/engine/nbproject/genfiles.properties
index 00bdee3..dd3a534 100644
--- a/nbi/engine/nbproject/genfiles.properties
+++ b/nbi/engine/nbproject/genfiles.properties
@@ -1,41 +1,20 @@
#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
+# The contents of this file are subject to the terms of the Common Development
+# and Distribution License (the License). You may not use this file except in
+# compliance with the License.
+#
+# You can obtain a copy of the License at http://www.netbeans.org/cddl.html
+# or http://www.netbeans.org/cddl.txt.
+#
+# When distributing Covered Code, include this CDDL Header Notice in each file
+# and include the License file at http://www.netbeans.org/cddl.txt.
+# If applicable, add the following below the CDDL Header, with the fields
+# enclosed by brackets [] replaced by your own identifying information:
# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
+#
+# The Original Software is NetBeans. The Initial Developer of the Original
+# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+# Microsystems, Inc. All Rights Reserved.
#
build.xml.data.CRC32=779659b8
build.xml.jax-ws.CRC32=749ccaa7
diff --git a/nbi/engine/nbproject/project.properties b/nbi/engine/nbproject/project.properties
index 12568dc..15d6bc0 100644
--- a/nbi/engine/nbproject/project.properties
+++ b/nbi/engine/nbproject/project.properties
@@ -78,8 +78,8 @@ javac.compilerargs=-Xlint:unchecked
javac.deprecation=true
javac.processorpath=\
${javac.classpath}
-javac.source=1.8
-javac.target=1.8
+javac.source=1.7
+javac.target=1.7
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
@@ -113,7 +113,7 @@ libs.swing-layout.classpath=../../../../../applications/NetBeans 6.0 Dev/platfor
main.class=org.netbeans.installer.Installer
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=true
+mkdist.disabled=false
platform.active=default_platform
run.classpath=\
${javac.classpath}:\
diff --git a/nbi/engine/src/org/netbeans/installer/utils/FileUtils.java b/nbi/engine/src/org/netbeans/installer/utils/FileUtils.java
index d30a4ac..b4eaad8 100644
--- a/nbi/engine/src/org/netbeans/installer/utils/FileUtils.java
+++ b/nbi/engine/src/org/netbeans/installer/utils/FileUtils.java
@@ -89,7 +89,6 @@ import org.netbeans.installer.utils.helper.FileEntry;
import org.netbeans.installer.utils.progress.CompositeProgress;
import org.netbeans.installer.utils.progress.Progress;
import org.netbeans.installer.utils.system.NativeUtils;
-import org.netbeans.installer.utils.system.WindowsNativeUtils;
/**
*
@@ -1005,26 +1004,7 @@ public final class FileUtils {
list,
progress,
0,
- childrenCount == 0 ? 1 : childrenCount,
- false);
- progress.setPercentage(Progress.COMPLETE);
-
- return list;
- }
-
- /**
- * Special method for copying nested JRE - #256122 - 8.1 RC2 IDE will not start unless run as admin
- *
- * @param source Source JRE folder
- * @param target Targer folder (in <installation folder>\bin\jre\)
- * @param progress
- * @return
- * @throws IOException
- */
- public static FilesList copyNestedJRE(final File source, final File target, final Progress progress) throws IOException {
- final FilesList list = new FilesList();
-
- copyFile(source, target, true, list, progress, 0, countChildren(source), true);
+ childrenCount == 0 ? 1 : childrenCount);
progress.setPercentage(Progress.COMPLETE);
return list;
@@ -1551,8 +1531,7 @@ public final class FileUtils {
final FilesList list,
final Progress progress,
final long start,
- final long total,
- final boolean copyNesteJre) throws IOException {
+ final long total) throws IOException {
long count = start;
if (!exists(source)) {
@@ -1589,33 +1568,16 @@ public final class FileUtils {
ERROR_DEST_NOT_WRITABLE_KEY, target));
}
- if (copyNesteJre && SystemUtils.isWindows()) {
- InputStream is = null;
- OutputStream os = null;
- try {
- is = new FileInputStream(source);
- os = new FileOutputStream(target);
- byte[] buffer = new byte[1024];
- int length;
- while ((length = is.read(buffer)) > 0) {
- os.write(buffer, 0, length);
- }
- } finally {
- is.close();
- os.close();
- }
- } else {
- Files.copy(source.toPath(), target.toPath(), StandardCopyOption.COPY_ATTRIBUTES, StandardCopyOption.REPLACE_EXISTING, LinkOption.NOFOLLOW_LINKS);
- }
+ Files.copy(source.toPath(), target.toPath(), StandardCopyOption.COPY_ATTRIBUTES, StandardCopyOption.REPLACE_EXISTING, LinkOption.NOFOLLOW_LINKS);
list.add(target);
} else {
LogManager.log("copying directory: " + source + " to: " + target + (recurse ? " with recursion" : ""));
progress.setDetail(StringUtils.format(MESSAGE_COPY_DIRECTORY, source, target));
-
+
list.add(mkdirs(target));
if (recurse) {
- for (File file : source.listFiles()) {
- count = copyFile(file, new File(target, file.getName()), recurse, list, progress, count, total, copyNesteJre);
+ for (File file: source.listFiles()) {
+ count = copyFile(file, new File(target, file.getName()), recurse, list, progress, count, total);
}
}
}
diff --git a/nbi/engine/src/org/netbeans/installer/utils/applications/JavaUtils.java b/nbi/engine/src/org/netbeans/installer/utils/applications/JavaUtils.java
index 781d520..574165d 100644
--- a/nbi/engine/src/org/netbeans/installer/utils/applications/JavaUtils.java
+++ b/nbi/engine/src/org/netbeans/installer/utils/applications/JavaUtils.java
@@ -146,13 +146,9 @@ public class JavaUtils {
}
public static JavaInfo getInfo(final File javaHome) {
- return getInfo(javaHome, false);
- }
-
- public static JavaInfo getInfo(final File javaHome, boolean ignoreKnownJdks) {
File location = FileUtils.getNormalizedPathFile(javaHome);
- if (!ignoreKnownJdks && knownJdks.get(location) != null) {
+ if (knownJdks.get(location) != null) {
return knownJdks.get(location);
}
diff --git a/nbi/engine/src/org/netbeans/installer/utils/system/launchers/impl/ExeLauncher.java b/nbi/engine/src/org/netbeans/installer/utils/system/launchers/impl/ExeLauncher.java
index 2787638..8a6e4e1 100644
--- a/nbi/engine/src/org/netbeans/installer/utils/system/launchers/impl/ExeLauncher.java
+++ b/nbi/engine/src/org/netbeans/installer/utils/system/launchers/impl/ExeLauncher.java
@@ -85,7 +85,7 @@ public class ExeLauncher extends CommonLauncher {
/**
* See <code>ShLauncher#MIN_JAVA_VERSION_UNIX</code> for details.
*/
- public static final String MIN_JAVA_VERSION_WINDOWS_ALL = "1.8.0";
+ public static final String MIN_JAVA_VERSION_WINDOWS_ALL = "1.7.0";
public static final String MIN_JAVA_VERSION_WINDOWS = "1.5.0_03";
public static final String MIN_JAVA_VERSION_WINDOWS_VISTA = "1.5.0_11";
public static final String MIN_JAVA_VERSION_WINDOWS_2K8 = "1.5.0_17";
diff --git a/nbi/infra/build/jvm/conf/common.properties b/nbi/infra/build/jvm/conf/common.properties
index 23b9bbd..06f1814 100644
--- a/nbi/infra/build/jvm/conf/common.properties
+++ b/nbi/infra/build/jvm/conf/common.properties
@@ -37,10 +37,10 @@
# holder.
#
-jvm.sub.dir=jre1.8.0_101
-jvm.file.prefix=jre-8u101
-jvm.version=8u101
-jvm.build=b13
+jvm.sub.dir=jre1.8.0_60
+jvm.file.prefix=jre-8u60
+jvm.version=8u60
+jvm.build=b27
jvm.build.type=fcs
zip.executable=zip
tar.executable=tar
diff --git a/nbi/infra/server/modules/war-admin/web/css/main.css b/nbi/infra/server/modules/war-admin/web/css/main.css
index f854bba..f515088 100644
--- a/nbi/infra/server/modules/war-admin/web/css/main.css
+++ b/nbi/infra/server/modules/war-admin/web/css/main.css
@@ -1,41 +1,37 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
+ *
+ * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU General
+ * Public License Version 2 only ("GPL") or the Common Development and Distribution
+ * License("CDDL") (collectively, the "License"). You may not use this file except in
+ * compliance with the License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
+ * License for the specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header Notice in
+ * each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP. Sun
+ * designates this particular file as subject to the "Classpath" exception as
+ * provided by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the License Header,
+ * with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions Copyrighted [year] [name of copyright owner]"
+ *
* Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original Software
+ * is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
+ * Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL or only the
+ * GPL Version 2, indicate your decision by adding "[Contributor] elects to include
+ * this software in this distribution under the [CDDL or GPL Version 2] license." If
+ * you do not indicate a single choice of license, a recipient has the option to
+ * distribute your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above. However, if
+ * you add GPL Version 2 code and therefore, elected the GPL Version 2 license, then
+ * the option applies only if the new code is made subject to such option by the
+ * copyright holder.
*/
body {
diff --git a/nbjunit/apichanges.xml b/nbjunit/apichanges.xml
index 155855a..88b0426 100644
--- a/nbjunit/apichanges.xml
+++ b/nbjunit/apichanges.xml
@@ -113,7 +113,7 @@ made subject to such option by the copyright holder.
<compatibility addition="yes"/>
<description>
<p>NbModuleSuite.Configuration now has a
- <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#addStartupArgument-java.lang.String...-">
+ <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#addStartupArgument(java.lang.String...)">
addStartupArgument</a>
method which allows one to append one or more command line
arguments which will be used to start the application.
@@ -150,9 +150,9 @@ made subject to such option by the copyright holder.
<p>
Do you need to fail the test when some wrong message or
exception is logged? Easy now with
- <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#failOnMessage-java.util.logging.Level-">
+ <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#failOnMessage(java.util.logging.Level)">
Configuration.failOnMessage(Level.WARNING)</a> and
- <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#failOnException-java.util.logging.Level-">
+ <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#failOnException(java.util.logging.Level)">
Configuration.failOnException(Level.INFO)</a>.
</p>
</description>
@@ -170,7 +170,7 @@ made subject to such option by the copyright holder.
<p>
One can decide to <b>not</b> enable autoload modules
by calling
- <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#honorAutoloadEager-boolean-">
+ <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#honorAutoloadEager(boolean)">
Configuration.honorAutoEager(true)</a>.
</p>
</description>
@@ -187,7 +187,7 @@ made subject to such option by the copyright holder.
<p>
One can decide to <b>not</b> include modules on classpath in the test
by calling
- <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#enableClasspathModules-boolean-">
+ <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#enableClasspathModules(boolean)">
Configuration.enableClasspathModules(false)</a>.
</p>
</description>
@@ -203,7 +203,7 @@ made subject to such option by the copyright holder.
<description>
<p>
It is now possible to easily enable modules in one cluster due
- to <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#enableModules-java.lang.String-java.lang.String-">
+ to <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#enableModules(java.lang.String,%20java.lang.String)">
Configuration.enableModules</a> method.
</p>
</description>
@@ -219,7 +219,7 @@ made subject to such option by the copyright holder.
<compatibility addition="yes" semantic="incompatible" binary="compatible" source="compatible" modification="yes"/>
<description>
<p>Semantics of
- <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#clusters-java.lang.String-">
+ <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#clusters(java.lang.String)">
Configuration.clusters</a> method has been extended. It can now be
called multiple times to accumulate the results.
</p>
@@ -236,7 +236,7 @@ made subject to such option by the copyright holder.
<compatibility addition="yes"/>
<description>
<p>Enhanced version of
- <a href="@TOP@/org/netbeans/junit/Log.html#assertInstances-java.lang.String-java.lang.String...-">
+ <a href="@TOP@/org/netbeans/junit/Log.html#assertInstances(java.lang.String,%20java.lang.String...)">
assertInstances(String msg, String... types)</a> added.
</p>
</description>
@@ -251,7 +251,7 @@ made subject to such option by the copyright holder.
<compatibility addition="yes"/>
<description>
<p>NbModuleSuite.Configuration now has
- <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#reuseUserDir-boolean-">reuseUserDir(boolean)</a>
+ <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#reuseUserDir(boolean)">reuseUserDir(boolean)</a>
method which enables test suite to reuse userdir from previous suite run.
</p>
</description>
@@ -266,7 +266,7 @@ made subject to such option by the copyright holder.
<compatibility addition="yes"/>
<description>
<p>NbModuleSuite.Configuration now has
- <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#addTest-java.lang.Class-">addTest(java.lang.Class)</a>
+ <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#addTest(java.lang.Class)">addTest(java.lang.Class)</a>
method which allows to add Test implementation classes into configuration
and execution of the NbModuleSuite.
</p>
@@ -282,7 +282,7 @@ made subject to such option by the copyright holder.
<compatibility addition="yes"/>
<description>
<p>NbModuleSuite now has
- <a href="@TOP@/org/netbeans/junit/NbModuleSuite.html#emptyConfiguration--">emptyConfiguration()</a>
+ <a href="@TOP@/org/netbeans/junit/NbModuleSuite.html#emptyConfiguration()">emptyConfiguration()</a>
method which returns empty, ready to be configured configuration.
</p>
</description>
@@ -297,7 +297,7 @@ made subject to such option by the copyright holder.
<compatibility addition="yes"/>
<description>
<p>NbModuleSuite.Configuration now has
- <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#addTest-java.lang.Class-java.lang.String...-">addTest(clazz, tests)</a>
+ <a href="@TOP@/org/netbeans/junit/NbModuleSuite.Configuration.html#addTest(java.lang.Class,%20java.lang.String...)">addTest(clazz, tests)</a>
method which allows to add multiple test classes into single configuration
and execution of the NbModuleSuite.
</p>
@@ -438,7 +438,7 @@ made subject to such option by the copyright holder.
<description>
<p>An excelent tool to emulate race condition, deadlock or any other
non-deterministic behaviour created in the form of
- <a href="@TOP@/org/netbeans/junit/Log.html#controlFlow-java.util.logging.Logger-java.util.logging.Logger-java.lang.String-int-">
+ <a href="@TOP@/org/netbeans/junit/Log.html#controlFlow(java.util.logging.Logger,%20java.util.logging.Logger,%20java.lang.String,%20int)">
Log.controlFlow</a> method.
</p>
</description>
@@ -457,16 +457,16 @@ made subject to such option by the copyright holder.
<compatibility addition="yes" binary="compatible" semantic="compatible" />
<description>
<p>Added two ways how to enable logging in a test case. One can
- either overwrite <a href="@TOP@/org/netbeans/junit/NbTestCase.html#logLevel--">NbTestCase.logLevel</a>
+ either overwrite <a href="@TOP@/org/netbeans/junit/NbTestCase.html#logLevel()">NbTestCase.logLevel</a>
method and return the right level to capture in the test and then
all the messages logged with the level and greater will be sent
- to <a href="@TOP@/org/netbeans/junit/NbTestCase.html#getLog--">NbTestCase.getLog()</a>
+ to <a href="@TOP@/org/netbeans/junit/NbTestCase.html#getLog()">NbTestCase.getLog()</a>
stream which is placed in working directory.
</p>
<p>
Or one can directly call
- <a href="@TOP@/org/netbeans/junit/Log.html#enable-java.lang.String-java.util.logging.Level-">Log.enable</a>
+ <a href="@TOP@/org/netbeans/junit/Log.html#enable(java.lang.String,%20java.util.logging.Level)">Log.enable</a>
to capture all the logging into a <code>CharSequence</code>
which can be later queried for its content, usually by calling <code>its.toString()</code>
method.
diff --git a/nbjunit/arch.xml b/nbjunit/arch.xml
index 12ce6d0..c4ef1e6 100644
--- a/nbjunit/arch.xml
+++ b/nbjunit/arch.xml
@@ -608,7 +608,7 @@ Please note, SimpleDiff is rather trivial implementation of diff command, so it
<a href="@TOP@/org/netbeans/junit/NbModuleSuite.html">NbModuleSuite</a>
can now be influenced by system property <code>branding.token</code>.
If it is provided (by Ant harness for example), it is used
- to call <a href="@org-openide-util@/org/openide/util/NbBundle.html#setBranding-java.lang.String-">
+ to call <a href="@org-openide-util@/org/openide/util/NbBundle.html#setBranding(java.lang.String)">
NbBundle.setBranding</a>.
</api>
</li>
diff --git a/nbjunit/manifest.mf b/nbjunit/manifest.mf
index 6dc9bdb..1e48b2c 100644
--- a/nbjunit/manifest.mf
+++ b/nbjunit/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.nbjunit/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/junit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.87.1
+OpenIDE-Module-Specification-Version: 1.86.1
diff --git a/nbjunit/nbproject/org-netbeans-modules-nbjunit.sig b/nbjunit/nbproject/org-netbeans-modules-nbjunit.sig
index 93ef0f2..f03a638 100644
--- a/nbjunit/nbproject/org-netbeans-modules-nbjunit.sig
+++ b/nbjunit/nbproject/org-netbeans-modules-nbjunit.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.86.1
+#Version 1.84
CLSS public java.io.IOException
cons public init()
@@ -24,12 +24,6 @@ cons public init(long)
supr java.lang.Error
hfds serialVersionUID
-CLSS public abstract interface !annotation java.lang.Deprecated
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE])
-intf java.lang.annotation.Annotation
-
CLSS public java.lang.Error
cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean)
cons public init()
@@ -159,7 +153,6 @@ meth public void run(junit.framework.TestResult)
supr junit.framework.Assert
CLSS public junit.framework.Assert
- anno 0 java.lang.Deprecated()
cons protected init()
meth public static java.lang.String format(java.lang.String,java.lang.Object,java.lang.Object)
meth public static void assertEquals(boolean,boolean)
@@ -223,44 +216,6 @@ meth public int countTestCases()
meth public java.lang.String getName()
meth public java.lang.String toString()
meth public junit.framework.TestResult run()
-meth public static java.lang.String format(java.lang.String,java.lang.Object,java.lang.Object)
-meth public static void assertEquals(boolean,boolean)
-meth public static void assertEquals(byte,byte)
-meth public static void assertEquals(char,char)
-meth public static void assertEquals(double,double,double)
-meth public static void assertEquals(float,float,float)
-meth public static void assertEquals(int,int)
-meth public static void assertEquals(java.lang.Object,java.lang.Object)
-meth public static void assertEquals(java.lang.String,boolean,boolean)
-meth public static void assertEquals(java.lang.String,byte,byte)
-meth public static void assertEquals(java.lang.String,char,char)
-meth public static void assertEquals(java.lang.String,double,double,double)
-meth public static void assertEquals(java.lang.String,float,float,float)
-meth public static void assertEquals(java.lang.String,int,int)
-meth public static void assertEquals(java.lang.String,java.lang.Object,java.lang.Object)
-meth public static void assertEquals(java.lang.String,java.lang.String)
-meth public static void assertEquals(java.lang.String,java.lang.String,java.lang.String)
-meth public static void assertEquals(java.lang.String,long,long)
-meth public static void assertEquals(java.lang.String,short,short)
-meth public static void assertEquals(long,long)
-meth public static void assertEquals(short,short)
-meth public static void assertFalse(boolean)
-meth public static void assertFalse(java.lang.String,boolean)
-meth public static void assertNotNull(java.lang.Object)
-meth public static void assertNotNull(java.lang.String,java.lang.Object)
-meth public static void assertNotSame(java.lang.Object,java.lang.Object)
-meth public static void assertNotSame(java.lang.String,java.lang.Object,java.lang.Object)
-meth public static void assertNull(java.lang.Object)
-meth public static void assertNull(java.lang.String,java.lang.Object)
-meth public static void assertSame(java.lang.Object,java.lang.Object)
-meth public static void assertSame(java.lang.String,java.lang.Object,java.lang.Object)
-meth public static void assertTrue(boolean)
-meth public static void assertTrue(java.lang.String,boolean)
-meth public static void fail()
-meth public static void fail(java.lang.String)
-meth public static void failNotEquals(java.lang.String,java.lang.Object,java.lang.Object)
-meth public static void failNotSame(java.lang.String,java.lang.Object,java.lang.Object)
-meth public static void failSame(java.lang.String)
meth public void run(junit.framework.TestResult)
meth public void runBare() throws java.lang.Throwable
meth public void setName(java.lang.String)
diff --git a/nbjunit/src/META-INF/upgrade/NbModuleSuite.hint b/nbjunit/src/META-INF/upgrade/NbModuleSuite.hint
index 9bcaac6..cf951e9 100644
--- a/nbjunit/src/META-INF/upgrade/NbModuleSuite.hint
+++ b/nbjunit/src/META-INF/upgrade/NbModuleSuite.hint
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
"Use suite() builder method":
org.netbeans.junit.NbModuleSuite.create($c) :: $c instanceof org.netbeans.junit.NbModuleSuite.Configuration
=>
diff --git a/net.java.html.boot.fx/build.xml b/net.java.html.boot.fx/build.xml
index f61642a..0a02e7d 100644
--- a/net.java.html.boot.fx/build.xml
+++ b/net.java.html.boot.fx/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project name="net.java.html.boot.fx" default="netbeans" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
<target name="jar"/>
diff --git a/net.java.html.boot.fx/external/binaries-list b/net.java.html.boot.fx/external/binaries-list
index 1eb90a2..78768bf 100644
--- a/net.java.html.boot.fx/external/binaries-list
+++ b/net.java.html.boot.fx/external/binaries-list
@@ -1 +1 @@
-5C992BAEC0111EE293BD44173140A9D8EC860765 net.java.html.boot.fx-1.3.jar
+068B9902E65F2292C9EA30E5423E41FB6B30D8AA net.java.html.boot.fx-1.2.3.jar
diff --git a/net.java.html.boot.fx/nbproject/project.properties b/net.java.html.boot.fx/nbproject/project.properties
index 13c1d67..4afb8de 100644
--- a/net.java.html.boot.fx/nbproject/project.properties
+++ b/net.java.html.boot.fx/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-release.external/net.java.html.boot.fx-1.3.jar=modules/net-java-html-boot-fx.jar
+release.external/net.java.html.boot.fx-1.2.3.jar=modules/net-java-html-boot-fx.jar
is.autoload=true
nbm.module.author=Jaroslav Tulach
diff --git a/net.java.html.boot.fx/nbproject/project.xml b/net.java.html.boot.fx/nbproject/project.xml
index 3a97008..2fbbba8 100644
--- a/net.java.html.boot.fx/nbproject/project.xml
+++ b/net.java.html.boot.fx/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
@@ -47,7 +8,7 @@ Contributor(s):
<public-packages/>
<class-path-extension>
<runtime-relative-path>net-java-html-boot-fx.jar</runtime-relative-path>
- <binary-origin>external/net.java.html.boot.fx-1.3.jar</binary-origin>
+ <binary-origin>external/net.java.html.boot.fx-1.2.3.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/net.java.html.boot.script/build.xml b/net.java.html.boot.script/build.xml
index 2a17c9a..21eb8b6 100644
--- a/net.java.html.boot.script/build.xml
+++ b/net.java.html.boot.script/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project name="net.java.html.boot.script" default="netbeans" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
<target name="jar"/>
diff --git a/net.java.html.boot.script/external/binaries-list b/net.java.html.boot.script/external/binaries-list
index cbed823..30f7fad 100644
--- a/net.java.html.boot.script/external/binaries-list
+++ b/net.java.html.boot.script/external/binaries-list
@@ -1 +1 @@
-BF6C9BB0FFB78A6B846ECAEB880C460D883B4F72 net.java.html.boot.script-1.3.jar
+8621531E83EC4850DA61AA2266FE41105C304F40 net.java.html.boot.script-1.2.3.jar
diff --git a/net.java.html.boot.script/nbproject/project.properties b/net.java.html.boot.script/nbproject/project.properties
index df8261a..d504435 100644
--- a/net.java.html.boot.script/nbproject/project.properties
+++ b/net.java.html.boot.script/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-release.external/net.java.html.boot.script-1.3.jar=modules/net-java-html-boot-script.jar
+release.external/net.java.html.boot.script-1.2.3.jar=modules/net-java-html-boot-script.jar
is.autoload=true
nbm.module.author=Jaroslav Tulach
diff --git a/net.java.html.boot.script/nbproject/project.xml b/net.java.html.boot.script/nbproject/project.xml
index 70ab92d..c6213b1 100644
--- a/net.java.html.boot.script/nbproject/project.xml
+++ b/net.java.html.boot.script/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
@@ -47,7 +8,7 @@ Contributor(s):
<public-packages/>
<class-path-extension>
<runtime-relative-path>net-java-html-boot-script.jar</runtime-relative-path>
- <binary-origin>external/net.java.html.boot.script-1.3.jar</binary-origin>
+ <binary-origin>external/net.java.html.boot.script-1.2.3.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/net.java.html.boot/build.xml b/net.java.html.boot/build.xml
index 39a333b..69d6b8c 100644
--- a/net.java.html.boot/build.xml
+++ b/net.java.html.boot/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project name="net.java.html.boot" default="netbeans" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
<target name="jar"/>
diff --git a/net.java.html.boot/external/binaries-list b/net.java.html.boot/external/binaries-list
index 9fc4a4e..908358f 100644
--- a/net.java.html.boot/external/binaries-list
+++ b/net.java.html.boot/external/binaries-list
@@ -1 +1 @@
-7FC91530F4395FA0D58F9539F3B40858E766BFA3 net.java.html.boot-1.3.jar
+7BA1E1C450BCD0AD9D0D2F6797A2EB50A4822E0E net.java.html.boot-1.2.3.jar
diff --git a/net.java.html.boot/nbproject/project.properties b/net.java.html.boot/nbproject/project.properties
index 6aa7bf3..ed6fa0b 100644
--- a/net.java.html.boot/nbproject/project.properties
+++ b/net.java.html.boot/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-release.external/net.java.html.boot-1.3.jar=modules/net-java-html-boot.jar
+release.external/net.java.html.boot-1.2.3.jar=modules/net-java-html-boot.jar
is.autoload=true
nbm.module.author=Jaroslav Tulach
diff --git a/net.java.html.boot/nbproject/project.xml b/net.java.html.boot/nbproject/project.xml
index d4a48f5..0014ee8 100644
--- a/net.java.html.boot/nbproject/project.xml
+++ b/net.java.html.boot/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
@@ -47,7 +8,7 @@ Contributor(s):
<public-packages/>
<class-path-extension>
<runtime-relative-path>net-java-html-boot.jar</runtime-relative-path>
- <binary-origin>external/net.java.html.boot-1.3.jar</binary-origin>
+ <binary-origin>external/net.java.html.boot-1.2.3.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/net.java.html.geo/build.xml b/net.java.html.geo/build.xml
index 79bfc4c..2e11d8b 100644
--- a/net.java.html.geo/build.xml
+++ b/net.java.html.geo/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project name="net.java.html.geo" default="netbeans" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
<target name="jar"/>
diff --git a/net.java.html.geo/external/binaries-list b/net.java.html.geo/external/binaries-list
index fd5a521..79eedf2 100644
--- a/net.java.html.geo/external/binaries-list
+++ b/net.java.html.geo/external/binaries-list
@@ -1 +1 @@
-10E4214A89082C70FCF9F721953001C0932037BA net.java.html.geo-1.3.jar
+24824B1E8C2A2D3A5C471F5875BF61F27E8916DB net.java.html.geo-1.2.3.jar
diff --git a/net.java.html.geo/nbproject/project.properties b/net.java.html.geo/nbproject/project.properties
index fbeaaf4..c0f11a3 100644
--- a/net.java.html.geo/nbproject/project.properties
+++ b/net.java.html.geo/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-release.external/net.java.html.geo-1.3.jar=modules/net-java-html-geo.jar
+release.external/net.java.html.geo-1.2.3.jar=modules/net-java-html-geo.jar
is.autoload=true
nbm.module.author=Jaroslav Tulach
diff --git a/net.java.html.geo/nbproject/project.xml b/net.java.html.geo/nbproject/project.xml
index ea47f5c..149aa4e 100644
--- a/net.java.html.geo/nbproject/project.xml
+++ b/net.java.html.geo/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
@@ -47,7 +8,7 @@ Contributor(s):
<public-packages/>
<class-path-extension>
<runtime-relative-path>net-java-html-geo.jar</runtime-relative-path>
- <binary-origin>external/net.java.html.geo-1.3.jar</binary-origin>
+ <binary-origin>external/net.java.html.geo-1.2.3.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/net.java.html.json/build.xml b/net.java.html.json/build.xml
index 8387968..7194661 100644
--- a/net.java.html.json/build.xml
+++ b/net.java.html.json/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project name="net.java.html.json" default="netbeans" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
<target name="jar"/>
diff --git a/net.java.html.json/external/binaries-list b/net.java.html.json/external/binaries-list
index 3395074..935fbbf 100644
--- a/net.java.html.json/external/binaries-list
+++ b/net.java.html.json/external/binaries-list
@@ -1 +1 @@
-D97314CE1869DD3B8B8942256A70673E2991C9DD net.java.html.json-1.3.jar
+F41518385DA4B5682C864F19B82C3BA4AF65AE83 net.java.html.json-1.2.3.jar
diff --git a/net.java.html.json/nbproject/project.properties b/net.java.html.json/nbproject/project.properties
index 5c46d05..56539ef 100644
--- a/net.java.html.json/nbproject/project.properties
+++ b/net.java.html.json/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-release.external/net.java.html.json-1.3.jar=modules/net-java-html-json.jar
+release.external/net.java.html.json-1.2.3.jar=modules/net-java-html-json.jar
is.autoload=true
nbm.module.author=Jaroslav Tulach
diff --git a/net.java.html.json/nbproject/project.xml b/net.java.html.json/nbproject/project.xml
index 91fea67..3f6e830 100644
--- a/net.java.html.json/nbproject/project.xml
+++ b/net.java.html.json/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
@@ -47,7 +8,7 @@ Contributor(s):
<public-packages/>
<class-path-extension>
<runtime-relative-path>net-java-html-json.jar</runtime-relative-path>
- <binary-origin>external/net.java.html.json-1.3.jar</binary-origin>
+ <binary-origin>external/net.java.html.json-1.2.3.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/net.java.html.sound/build.xml b/net.java.html.sound/build.xml
index c93b03d..f234b86 100644
--- a/net.java.html.sound/build.xml
+++ b/net.java.html.sound/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project name="net.java.html.sound" default="netbeans" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
<target name="jar"/>
diff --git a/net.java.html.sound/external/binaries-list b/net.java.html.sound/external/binaries-list
index 5036b83..d436017 100644
--- a/net.java.html.sound/external/binaries-list
+++ b/net.java.html.sound/external/binaries-list
@@ -1 +1 @@
-6BDCE8349F83CD02F2942D4FBFA86A81A129F42A net.java.html.sound-1.3.jar
+989A81454D4FA962EB1C158FE794D2EB060AB9F6 net.java.html.sound-1.2.3.jar
diff --git a/net.java.html.sound/nbproject/project.properties b/net.java.html.sound/nbproject/project.properties
index dc2d783..8e6113d 100644
--- a/net.java.html.sound/nbproject/project.properties
+++ b/net.java.html.sound/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-release.external/net.java.html.sound-1.3.jar=modules/net-java-html-sound.jar
+release.external/net.java.html.sound-1.2.3.jar=modules/net-java-html-sound.jar
is.autoload=true
nbm.module.author=Jaroslav Tulach
diff --git a/net.java.html.sound/nbproject/project.xml b/net.java.html.sound/nbproject/project.xml
index ab4464a..6a9989c 100644
--- a/net.java.html.sound/nbproject/project.xml
+++ b/net.java.html.sound/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
@@ -47,7 +8,7 @@ Contributor(s):
<public-packages/>
<class-path-extension>
<runtime-relative-path>net-java-html-sound.jar</runtime-relative-path>
- <binary-origin>external/net.java.html.sound-1.3.jar</binary-origin>
+ <binary-origin>external/net.java.html.sound-1.2.3.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/net.java.html/build.xml b/net.java.html/build.xml
index e9476b1..9d4bc83 100644
--- a/net.java.html/build.xml
+++ b/net.java.html/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project name="net.java.html" default="netbeans" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
<target name="jar"/>
diff --git a/net.java.html/external/binaries-list b/net.java.html/external/binaries-list
index 1326b9d..a23ebca 100644
--- a/net.java.html/external/binaries-list
+++ b/net.java.html/external/binaries-list
@@ -1 +1 @@
-A3085BAA78C8EE7F55081E70C79ABE04CA38CE93 net.java.html-1.3.jar
+78DD1C0B4EDC348FF4DCD0616597BB809AAE248D net.java.html-1.2.3.jar
diff --git a/net.java.html/nbproject/project.properties b/net.java.html/nbproject/project.properties
index cd674d4..adcff59 100644
--- a/net.java.html/nbproject/project.properties
+++ b/net.java.html/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-release.external/net.java.html-1.3.jar=modules/net-java-html.jar
+release.external/net.java.html-1.2.3.jar=modules/net-java-html.jar
is.autoload=true
nbm.module.author=Jaroslav Tulach
diff --git a/net.java.html/nbproject/project.xml b/net.java.html/nbproject/project.xml
index d9fc567..529efde 100644
--- a/net.java.html/nbproject/project.xml
+++ b/net.java.html/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
@@ -47,7 +8,7 @@ Contributor(s):
<public-packages/>
<class-path-extension>
<runtime-relative-path>net-java-html.jar</runtime-relative-path>
- <binary-origin>external/net.java.html-1.3.jar</binary-origin>
+ <binary-origin>external/net.java.html-1.2.3.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/netbinox/build.xml b/netbinox/build.xml
index 14e6334..306e3e7 100644
--- a/netbinox/build.xml
+++ b/netbinox/build.xml
@@ -38,7 +38,7 @@ made subject to such option by the copyright holder.
Contributor(s):
-Portions Copyrighted 2011 Oracle, Inc.
+Portions Copyrighted 2011 Oracle
-->
diff --git a/netbinox/external/binaries-list b/netbinox/external/binaries-list
index c81a802..a246e5c 100644
--- a/netbinox/external/binaries-list
+++ b/netbinox/external/binaries-list
@@ -1 +1,2 @@
-E5DDC5E827D3D62E7BE9F7E32927CA01F2839971 org.eclipse.osgi_3.9.1.v20140110-1610.jar
+B27F1304F18FEDE876F940AEFA6C9EB5632619D7 org.eclipse.osgi_3.9.1.v20140110-1610.jar
+
diff --git a/netbinox/manifest.mf b/netbinox/manifest.mf
index abb9342..191a073 100644
--- a/netbinox/manifest.mf
+++ b/netbinox/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.netbinox
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/netbinox/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.41.1
+OpenIDE-Module-Specification-Version: 1.39.1
OpenIDE-Module-Provides: org.osgi.framework.launch.FrameworkFactory, org.netbeans.Netbinox
OpenIDE-Module-Hide-Classpath-Packages: org.eclipse.core.runtime.**,org.eclipse.osgi.**
Covered-Packages: META-INF,org.netbeans.modules.netbinox,
diff --git a/netbinox/nbproject/project.xml b/netbinox/nbproject/project.xml
index 366d6be..fb65087 100644
--- a/netbinox/nbproject/project.xml
+++ b/netbinox/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/netbinox/src/org/netbeans/modules/netbinox/Bundle.properties b/netbinox/src/org/netbeans/modules/netbinox/Bundle.properties
index c17be73..429b246 100644
--- a/netbinox/src/org/netbeans/modules/netbinox/Bundle.properties
+++ b/netbinox/src/org/netbeans/modules/netbinox/Bundle.properties
@@ -36,5 +36,5 @@
#
# Contributor(s):
#
-# Portions Copyrighted 2011 Oracle, Inc.
+# Portions Copyrighted 2011 Oracle
OpenIDE-Module-Name=NetBeans Equinox Integration
diff --git a/netbinox/src/org/netbeans/modules/netbinox/EmptyBundleFile.java b/netbinox/src/org/netbeans/modules/netbinox/EmptyBundleFile.java
index d486224..1bfe606 100644
--- a/netbinox/src/org/netbeans/modules/netbinox/EmptyBundleFile.java
+++ b/netbinox/src/org/netbeans/modules/netbinox/EmptyBundleFile.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java b/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
index 8d71aef..d97a2cd 100644
--- a/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
+++ b/netbinox/src/org/netbeans/modules/netbinox/JarBundleFile.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
index 64bfcd4..89c1357 100644
--- a/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
+++ b/netbinox/src/org/netbeans/modules/netbinox/Netbinox.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
@@ -68,7 +68,7 @@ import org.osgi.framework.ServiceRegistration;
*/
class Netbinox extends Equinox {
private final String installArea;
-
+
public Netbinox(Map configuration) {
super(configuration);
Object ia = configuration.get("osgi.install.area"); // NOI18N
diff --git a/netbinox/src/org/netbeans/modules/netbinox/NetbinoxFactory.java b/netbinox/src/org/netbeans/modules/netbinox/NetbinoxFactory.java
index f58d5b9..1fdf894 100644
--- a/netbinox/src/org/netbeans/modules/netbinox/NetbinoxFactory.java
+++ b/netbinox/src/org/netbeans/modules/netbinox/NetbinoxFactory.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/src/org/netbeans/modules/netbinox/NetbinoxHooks.java b/netbinox/src/org/netbeans/modules/netbinox/NetbinoxHooks.java
index bfac62c..77b32b3 100644
--- a/netbinox/src/org/netbeans/modules/netbinox/NetbinoxHooks.java
+++ b/netbinox/src/org/netbeans/modules/netbinox/NetbinoxHooks.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/src/org/netbeans/modules/netbinox/NetbinoxLoader.java b/netbinox/src/org/netbeans/modules/netbinox/NetbinoxLoader.java
index 2e31171..3118702 100644
--- a/netbinox/src/org/netbeans/modules/netbinox/NetbinoxLoader.java
+++ b/netbinox/src/org/netbeans/modules/netbinox/NetbinoxLoader.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/src/org/netbeans/modules/netbinox/NetigsoBundleFile.java b/netbinox/src/org/netbeans/modules/netbinox/NetigsoBundleFile.java
index 76356b3..cd467bf 100644
--- a/netbinox/src/org/netbeans/modules/netbinox/NetigsoBundleFile.java
+++ b/netbinox/src/org/netbeans/modules/netbinox/NetigsoBundleFile.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/MockEvents.java b/netbinox/test/unit/src/org/netbeans/MockEvents.java
index 46f29ba..f9d1d41 100644
--- a/netbinox/test/unit/src/org/netbeans/MockEvents.java
+++ b/netbinox/test/unit/src/org/netbeans/MockEvents.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans;
diff --git a/netbinox/test/unit/src/org/netbeans/MockModuleInstaller.java b/netbinox/test/unit/src/org/netbeans/MockModuleInstaller.java
index 99fb4b0..3d7d1e3 100644
--- a/netbinox/test/unit/src/org/netbeans/MockModuleInstaller.java
+++ b/netbinox/test/unit/src/org/netbeans/MockModuleInstaller.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans;
diff --git a/netbinox/test/unit/src/org/netbeans/SetupHid.java b/netbinox/test/unit/src/org/netbeans/SetupHid.java
index 7582310..cfce8ce 100644
--- a/netbinox/test/unit/src/org/netbeans/SetupHid.java
+++ b/netbinox/test/unit/src/org/netbeans/SetupHid.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/BundleResourceTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/BundleResourceTest.java
index 0d6a602..8d87ba5 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/BundleResourceTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/BundleResourceTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/BundleURLConnectionTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/BundleURLConnectionTest.java
index f06e982..1fd5801 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/BundleURLConnectionTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/BundleURLConnectionTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
@@ -70,7 +70,7 @@ public class BundleURLConnectionTest extends NbTestCase {
static {
System.setProperty("java.awt.headless", "true");
}
-
+
public BundleURLConnectionTest(String name) {
super(name);
}
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingAndExternalPathsTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingAndExternalPathsTest.java
index 6b5f45a..6d8d9eb 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingAndExternalPathsTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingAndExternalPathsTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingAndExternalURLTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingAndExternalURLTest.java
index 7a9eb95..d1e3fa9 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingAndExternalURLTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingAndExternalURLTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingPreventsFileTouchesTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingPreventsFileTouchesTest.java
index 1b9e4f0..e638bd8 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingPreventsFileTouchesTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/CachingPreventsFileTouchesTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/ContextClassLoaderTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/ContextClassLoaderTest.java
index c0c8823..676936b 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/ContextClassLoaderTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/ContextClassLoaderTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
@@ -63,7 +63,7 @@ public class ContextClassLoaderTest extends NbTestCase {
static {
System.setProperty("java.awt.headless", "true");
}
-
+
public ContextClassLoaderTest(String name) {
super(name);
}
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/CountingSecurityManager.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/CountingSecurityManager.java
index fb9a7da..e99dcc1 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/CountingSecurityManager.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/CountingSecurityManager.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/EnabledAutoloadTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/EnabledAutoloadTest.java
index 7d662a1..7c85603 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/EnabledAutoloadTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/EnabledAutoloadTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/ExternalDirectoryTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/ExternalDirectoryTest.java
index 3ca7884..a01d36e 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/ExternalDirectoryTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/ExternalDirectoryTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
@@ -73,7 +73,7 @@ public class ExternalDirectoryTest extends SetupHid {
File ud = new File(getWorkDir(), "ud");
ud.mkdirs();
System.setProperty("netbeans.user", ud.getPath());
-
+
data = new File(getDataDir(), "jars");
File activate = new File(data, "activate");
assertTrue("Directory exists", activate.isDirectory());
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/ExternalJARTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/ExternalJARTest.java
index 41e7d81..93b5221 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/ExternalJARTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/ExternalJARTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
@@ -73,7 +73,7 @@ public class ExternalJARTest extends SetupHid {
File ud = new File(getWorkDir(), "ud");
ud.mkdirs();
System.setProperty("netbeans.user", ud.getPath());
-
+
data = new File(getDataDir(), "jars");
File activate = new File(data, "activate");
assertTrue("Directory exists", activate.isDirectory());
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/HookConfiguratorTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/HookConfiguratorTest.java
index f20f35e..c3c7244 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/HookConfiguratorTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/HookConfiguratorTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
@@ -63,7 +63,7 @@ public class HookConfiguratorTest extends NbTestCase {
static {
System.setProperty("java.awt.headless", "true");
}
-
+
public HookConfiguratorTest(String name) {
super(name);
}
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/IntegrationTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/IntegrationTest.java
index e440d9a..749816c 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/IntegrationTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/IntegrationTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/LoadedBytesTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/LoadedBytesTest.java
index 868b9e5..11a20ff 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/LoadedBytesTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/LoadedBytesTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
@@ -63,7 +63,7 @@ public class LoadedBytesTest extends SetupHid {
int counter;
boolean used;
private File file;
-
+
public LoadedBytesTest(String name) {
super(name);
@@ -75,7 +75,7 @@ public class LoadedBytesTest extends SetupHid {
File ud = new File(getWorkDir(), "ud");
ud.mkdirs();
System.setProperty("netbeans.user", ud.getPath());
-
+
data = new File(getDataDir(), "jars");
jars = new File(getWorkDir(), "space in path");
jars.mkdirs();
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/LogReaderServiceTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/LogReaderServiceTest.java
index 33b8b1d..98f8cca 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/LogReaderServiceTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/LogReaderServiceTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
@@ -61,7 +61,7 @@ public class LogReaderServiceTest extends NbTestCase {
public LogReaderServiceTest(String name) {
super(name);
}
-
+
public static Test suite() {
return NbModuleSuite.create(
NbModuleSuite.emptyConfiguration()
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetbinoxBuddyClassLoaderTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetbinoxBuddyClassLoaderTest.java
index 17ddf8f..f350e52 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetbinoxBuddyClassLoaderTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetbinoxBuddyClassLoaderTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetbinoxLibraryTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetbinoxLibraryTest.java
index bda86dc..4a51dd7 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetbinoxLibraryTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetbinoxLibraryTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
@@ -66,7 +66,7 @@ import org.osgi.framework.BundleContext;
public class NetbinoxLibraryTest extends SetupHid {
private static Module m1;
private static ModuleManager mgr;
-
+
public NetbinoxLibraryTest(String name) {
super(name);
}
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetbinoxUseSystemPropertiesTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetbinoxUseSystemPropertiesTest.java
index e5cf4bb..6904a1d 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetbinoxUseSystemPropertiesTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetbinoxUseSystemPropertiesTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
@@ -51,7 +51,7 @@ import org.netbeans.SetupHid;
import org.osgi.framework.BundleContext;
/**
- * Are system properties properly initialized when specifying
+ * Are system properties properly initialized when specifying
* osgi.framework.useSystemProperties?
*
* @author Jaroslav Tulach
@@ -73,7 +73,7 @@ public class NetbinoxUseSystemPropertiesTest extends SetupHid {
File ud = new File(getWorkDir(), "ud");
ud.mkdirs();
System.setProperty("netbeans.user", ud.getPath());
-
+
data = new File(getDataDir(), "jars");
jars = new File(getWorkDir(), "space in path");
jars.mkdirs();
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoActivationTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoActivationTest.java
index a2a7872..f5b9ddd 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoActivationTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoActivationTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
@@ -66,7 +66,7 @@ import org.osgi.framework.BundleContext;
public class NetigsoActivationTest extends SetupHid {
private static Module m1;
private static ModuleManager mgr;
-
+
public NetigsoActivationTest(String name) {
super(name);
}
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoActivationWithAllDirsTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoActivationWithAllDirsTest.java
index e83b1b4..1f5c4a4 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoActivationWithAllDirsTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoActivationWithAllDirsTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoDashnamesTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoDashnamesTest.java
index 192f1fc..f967aa2 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoDashnamesTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoDashnamesTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoHasSAXParserTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoHasSAXParserTest.java
index c4ad70e..4c5983c 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoHasSAXParserTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoHasSAXParserTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
@@ -60,7 +60,7 @@ public class NetigsoHasSAXParserTest extends NbTestCase {
public NetigsoHasSAXParserTest(String name) {
super(name);
}
-
+
public static Test suite() {
return NbModuleSuite.create(
NbModuleSuite.emptyConfiguration().addTest(
@@ -71,7 +71,7 @@ public class NetigsoHasSAXParserTest extends NbTestCase {
.gui(false)
);
}
-
+
protected @Override void setUp() throws Exception {
Locale.setDefault(Locale.US);
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoHid.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoHid.java
index e71fcd4..d88a68d 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoHid.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoHid.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
@@ -69,7 +69,7 @@ import org.openide.filesystems.FileUtil;
*/
public class NetigsoHid extends SetupHid {
File simpleModule;
-
+
public NetigsoHid(String name) {
super(name);
}
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoLayerTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoLayerTest.java
index 7bb33bf..e7187e1 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoLayerTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoLayerTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoLoggingTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoLoggingTest.java
index e4bdeac..94db090 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoLoggingTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoLoggingTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoOSGiActivationVisibleTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoOSGiActivationVisibleTest.java
index ebf54b6..510fdc8 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoOSGiActivationVisibleTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoOSGiActivationVisibleTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
@@ -69,7 +69,7 @@ public class NetigsoOSGiActivationVisibleTest extends SetupHid {
public NetigsoOSGiActivationVisibleTest(String name) {
super(name);
}
-
+
protected boolean autoload() {
return false;
}
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoOSGiCanDependTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoOSGiCanDependTest.java
index b422592..1e28d59 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoOSGiCanDependTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoOSGiCanDependTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoOSGiCanRequestTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoOSGiCanRequestTest.java
index 1a96bcc..ebac93d 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoOSGiCanRequestTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoOSGiCanRequestTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoTest.java
index a755276..a61d5cc 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoUsesSwingTest.java b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoUsesSwingTest.java
index 79a34ec..4e67062 100644
--- a/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoUsesSwingTest.java
+++ b/netbinox/test/unit/src/org/netbeans/modules/netbinox/NetigsoUsesSwingTest.java
@@ -37,7 +37,7 @@
*
* Contributor(s):
*
- * Portions Copyrighted 2011 Oracle, Inc.
+ * Portions Copyrighted 2011 Oracle
*/
package org.netbeans.modules.netbinox;
diff --git a/o.jdesktop.layout/manifest.mf b/o.jdesktop.layout/manifest.mf
index c3a9467..1bee3e0 100644
--- a/o.jdesktop.layout/manifest.mf
+++ b/o.jdesktop.layout/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.jdesktop.layout/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/layoutext/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.33.1
+OpenIDE-Module-Specification-Version: 1.32.1
AutoUpdate-Essential-Module: true
OpenIDE-Module-Deprecated: true
diff --git a/o.n.bootstrap/launcher/unix/nbexec b/o.n.bootstrap/launcher/unix/nbexec
index c27adf1..97b6bf8 100644
--- a/o.n.bootstrap/launcher/unix/nbexec
+++ b/o.n.bootstrap/launcher/unix/nbexec
@@ -1,7 +1,7 @@
#!/bin/sh
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
#
-# Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright 1997-2014 Oracle and/or its affiliates. All rights reserved.
#
# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
# Other names may be trademarks of their respective owners.
@@ -76,6 +76,8 @@ jargs="$jargs -Dnetbeans.home=\"$plathome\""
args=""
+launcher_args=""
+
prefixcp=""
postfixcp=""
@@ -138,6 +140,7 @@ EOF
-psn*)
shift;
;;
+ -L*) lopt=`expr "X-$1" : 'X--L\(.*\)'`; launcher_args="$launcher_args '$lopt'";;
-J*) jopt=`expr "X-$1" : 'X--J\(.*\)'`; jargs="$jargs '$jopt'";;
*) args="$args \"$1\"" ;;
esac
@@ -158,11 +161,11 @@ if [ -z "$jdkhome" ] ; then
Darwin*)
# read Java Preferences
if [ -x "/usr/libexec/java_home" ]; then
- jdkhome=`/usr/libexec/java_home --version 1.8.0+ --failfast`
+ jdkhome=`/usr/libexec/java_home --version 1.7.0_10+ --failfast`
- # JDK1.8 as a fallback
- elif [ -f "/Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/bin/java" ] ; then
- jdkhome="/Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home"
+ # JDK1.7 Update 10 as a fallback
+ elif [ -f "/Library/Java/JavaVirtualMachines/jdk1.7.0_10.jdk/Contents/Home/bin/java" ] ; then
+ jdkhome="/Library/Java/JavaVirtualMachines/jdk1.7.0_10.jdk/Contents/Home"
fi
# JRE fallback
@@ -190,6 +193,18 @@ if [ ! -x "${jdkhome}/bin/java" ] ; then
exit 2
fi
+if [ -n "$launcher_args" ] ; then
+ case "`uname`" in
+ SunOS*) awk=nawk ;;
+ *) awk=awk ;;
+ esac
+ jdk_version=$("${jdkhome}/bin/java" -version 2>&1 | "/usr/bin/${awk}" -F '"' '/version/ {print substr($2, 1, 3)}')
+ if [ "$jdk_version" = "1.7" ] ; then
+ jargs="$jargs $launcher_args"
+ fi
+fi
+
+
# Make sure native code libraries of jdk7 are found
# setting of the LD_LIBRARY_PATH is unnecessary on JDK8, and should be removed when only JDK8 is supported:
case "`uname`" in
@@ -210,17 +225,6 @@ if [ `uname` = "Darwin" ] ; then
fi
fi
-# addExports for JDK9
-case "`uname`" in
- Darwin*)
- addExports="-DaddExports:java.desktop/com.apple.eawt=ALL-UNNAMED -DaddExports:java.desktop/sun.awt=ALL-UNNAMED -DaddExports:java.base/jdk.internal.jrtfs=ALL-UNNAMED -DaddExports:java.desktop/apple.laf=ALL-UNNAMED -DaddExports:java.desktop/java.awt.peer=ALL-UNNAMED -DaddExports:java.desktop/com.sun.beans.editors=ALL-UNNAMED -DaddExports:java.desktop/sun.awt.im=ALL-UNNAMED -DaddExports:java.management/sun.management=ALL-UNNAMED"
- ;;
- *)
- addExports="-DaddExports:java.desktop/sun.awt=ALL-UNNAMED -DaddExports:java.base/jdk.internal.jrtfs=ALL-UNNAMED -DaddExports:java.desktop/java.awt.peer=ALL-UNNAMED -DaddExports:java.desktop/com.sun.beans.editors=ALL-UNNAMED -DaddExports:java.desktop/sun.awt.im=ALL-UNNAMED -DaddExports:java.desktop/com.sun.java.swing.plaf.gtk=ALL-UNNAMED -DaddExports:java.management/sun.management=ALL-UNNAMED"
- ;;
-esac
-jargs="$jargs $addExports"
-
jargs="$jargs -XX:+HeapDumpOnOutOfMemoryError"
if [ -z "`echo $jargs | grep -- "-XX:HeapDumpPath="`" ] ; then
jargs="$jargs -XX:HeapDumpPath=\"${userdir}/var/log/heapdump.hprof\""
diff --git a/o.n.bootstrap/launcher/windows/Makefile b/o.n.bootstrap/launcher/windows/Makefile
index d0c66a4..990aafa 100644
--- a/o.n.bootstrap/launcher/windows/Makefile
+++ b/o.n.bootstrap/launcher/windows/Makefile
@@ -1,41 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-
# Main targets can be executed directly, and they are:
#
# build build a specific configuration
diff --git a/o.n.bootstrap/launcher/windows/argnames.h b/o.n.bootstrap/launcher/windows/argnames.h
index 615797d..2453df3 100644
--- a/o.n.bootstrap/launcher/windows/argnames.h
+++ b/o.n.bootstrap/launcher/windows/argnames.h
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
diff --git a/o.n.bootstrap/launcher/windows/jvmlauncher.cpp b/o.n.bootstrap/launcher/windows/jvmlauncher.cpp
index 688fc12..e083698 100644
--- a/o.n.bootstrap/launcher/windows/jvmlauncher.cpp
+++ b/o.n.bootstrap/launcher/windows/jvmlauncher.cpp
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -40,8 +40,7 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- */
- /*
+ *
* Author: Tomas Holy
*/
@@ -108,6 +107,7 @@ bool JvmLauncher::checkJava(const char *path, const char *prefix) {
javawExePath.clear();
javaClientDllPath.clear();
javaServerDllPath.clear();
+ javaVersion.clear();
return false;
}
@@ -127,6 +127,38 @@ bool JvmLauncher::getJavaPath(string &path) {
return !javaPath.empty();
}
+/**
+ * Checks Java version - if 1.7 then PermSize and
+ * MaxPermSize are supported
+ *
+ * Should be removed as soon as 1.7 is not supported
+ *
+ * @return
+ */
+bool JvmLauncher::isPermSizeSupported() {
+ // Read "release" file only if the version is unknown
+ // unknown - it's when Java is specified in netbeans.conf
+ // or by --jdkhome
+ if (javaVersion.empty()) {
+ string releaseFilePath = javaPath + "\\release";
+ ifstream releaseFile(releaseFilePath.c_str());
+ if (releaseFile.is_open()) {
+ string line;
+ if (getline(releaseFile, line)) {
+ if (line.size() > 17) {
+ return line.substr(14, 3) == "1.7";
+ }
+ }
+ }
+ } else {
+ if (javaVersion.size() >= 3) {
+ return javaVersion.substr(0, 3) == "1.7";
+ }
+ }
+
+ return false;
+}
+
bool JvmLauncher::start(const char *mainClassName, const list<string> &args, const list<string> &options, bool &separateProcess, DWORD *retCode) {
assert(mainClassName);
logMsg("JvmLauncher::start()\n\tmainClassName: %s\n\tseparateProcess: %s",
@@ -466,6 +498,11 @@ bool JvmLauncher::findJava(const char *javaKey, const char *prefix, const char *
}
}
}
- // probably also need to check 32bit registry when launcher becomes 64-bit but is not the case now.
+ // probably also need to check 32bit registry when launcher becomes 64-bit but is not the case now.
+
+ if (result) {
+ javaVersion = value;
+ }
+
return result;
}
diff --git a/o.n.bootstrap/launcher/windows/jvmlauncher.h b/o.n.bootstrap/launcher/windows/jvmlauncher.h
index 5452cd9..1db185a 100644
--- a/o.n.bootstrap/launcher/windows/jvmlauncher.h
+++ b/o.n.bootstrap/launcher/windows/jvmlauncher.h
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -40,8 +40,7 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- */
- /*
+ *
* Author: Tomas Holy
*/
@@ -75,6 +74,7 @@ public:
bool initialize(const char *javaPathOrMinVersion);
bool getJavaPath(std::string &path);
+ bool isPermSizeSupported();
bool start(const char *mainClassName, const std::list<std::string> &args, const std::list<std::string> &options, bool &separateProcess, DWORD *retCode);
void setSuppressConsole(bool val) {
@@ -102,6 +102,7 @@ private:
std::string javaServerDllPath;
std::string javaPath;
std::string javaBinPath;
+ std::string javaVersion;
class PrepareDllPath {
public:
diff --git a/o.n.bootstrap/launcher/windows/nbexec.cpp b/o.n.bootstrap/launcher/windows/nbexec.cpp
index 7e211b5..fcb38a3 100644
--- a/o.n.bootstrap/launcher/windows/nbexec.cpp
+++ b/o.n.bootstrap/launcher/windows/nbexec.cpp
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -40,8 +40,7 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- */
- /*
+ *
* Author: Tomas Holy
*/
diff --git a/o.n.bootstrap/launcher/windows/nbexecexe.cpp b/o.n.bootstrap/launcher/windows/nbexecexe.cpp
index 60efe1c..c0faba0 100644
--- a/o.n.bootstrap/launcher/windows/nbexecexe.cpp
+++ b/o.n.bootstrap/launcher/windows/nbexecexe.cpp
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -40,8 +40,7 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- */
- /*
+ *
* Author: Tomas Holy
*/
diff --git a/o.n.bootstrap/launcher/windows/nbexecloader.h b/o.n.bootstrap/launcher/windows/nbexecloader.h
index 17336fd..249152a 100644
--- a/o.n.bootstrap/launcher/windows/nbexecloader.h
+++ b/o.n.bootstrap/launcher/windows/nbexecloader.h
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2011 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
diff --git a/o.n.bootstrap/launcher/windows/nbproject/Makefile-impl.mk b/o.n.bootstrap/launcher/windows/nbproject/Makefile-impl.mk
new file mode 100644
index 0000000..19f89e5
--- /dev/null
+++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-impl.mk
@@ -0,0 +1,133 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a pre- and a post- target defined where you can add customization code.
+#
+# This makefile implements macros and targets common to all configurations.
+#
+# NOCDDL
+
+
+# Building and Cleaning subprojects are done by default, but can be controlled with the SUB
+# macro. If SUB=no, subprojects will not be built or cleaned. The following macro
+# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf
+# and .clean-reqprojects-conf unless SUB has the value 'no'
+SUB_no=NO
+SUBPROJECTS=${SUB_${SUB}}
+BUILD_SUBPROJECTS_=.build-subprojects
+BUILD_SUBPROJECTS_NO=
+BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}}
+CLEAN_SUBPROJECTS_=.clean-subprojects
+CLEAN_SUBPROJECTS_NO=
+CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
+
+
+# Project Name
+PROJECTNAME=windows
+
+# Active Configuration
+DEFAULTCONF=nbexec
+CONF=${DEFAULTCONF}
+
+# All Configurations
+ALLCONFS=nbexec nbexec64
+
+
+# build
+.build-impl: .build-pre .validate-impl .depcheck-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .build-conf
+
+
+# clean
+.clean-impl: .clean-pre .validate-impl .depcheck-impl
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .clean-conf
+
+
+# clobber
+.clobber-impl: .clobber-pre .depcheck-impl
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ "${MAKE}" -f nbproject/Makefile-$${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .clean-conf; \
+ done
+
+# all
+.all-impl: .all-pre .depcheck-impl
+ @#echo "=> Running $@..."
+ for CONF in ${ALLCONFS}; \
+ do \
+ "${MAKE}" -f nbproject/Makefile-$${CONF}.mk QMAKE=${QMAKE} SUBPROJECTS=${SUBPROJECTS} .build-conf; \
+ done
+
+# build tests
+.build-tests-impl: .build-impl .build-tests-pre
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-tests-conf
+
+# run tests
+.test-impl: .build-tests-impl .test-pre
+ @#echo "=> Running $@... Configuration=$(CONF)"
+ "${MAKE}" -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .test-conf
+
+# dependency checking support
+.depcheck-impl:
+ @echo "# This code depends on make tool being used" >.dep.inc
+ @if [ -n "${MAKE_VERSION}" ]; then \
+ echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES}))" >>.dep.inc; \
+ echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \
+ echo "include \$${DEPFILES}" >>.dep.inc; \
+ echo "endif" >>.dep.inc; \
+ else \
+ echo ".KEEP_STATE:" >>.dep.inc; \
+ echo ".KEEP_STATE_FILE:.make.state.\$${CONF}" >>.dep.inc; \
+ fi
+
+# configuration validation
+.validate-impl:
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ echo ""; \
+ echo "Error: can not find the makefile for configuration '${CONF}' in project ${PROJECTNAME}"; \
+ echo "See 'make help' for details."; \
+ echo "Current directory: " `pwd`; \
+ echo ""; \
+ fi
+ @if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
+ then \
+ exit 1; \
+ fi
+
+
+# help
+.help-impl: .help-pre
+ @echo "This makefile supports the following configurations:"
+ @echo " ${ALLCONFS}"
+ @echo ""
+ @echo "and the following targets:"
+ @echo " build (default target)"
+ @echo " clean"
+ @echo " clobber"
+ @echo " all"
+ @echo " help"
+ @echo ""
+ @echo "Makefile Usage:"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] build"
+ @echo " make [CONF=<CONFIGURATION>] [SUB=no] clean"
+ @echo " make [SUB=no] clobber"
+ @echo " make [SUB=no] all"
+ @echo " make help"
+ @echo ""
+ @echo "Target 'build' will build a specific configuration and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'clean' will clean a specific configuration and, unless 'SUB=no',"
+ @echo " also clean subprojects."
+ @echo "Target 'clobber' will remove all built files from all configurations and,"
+ @echo " unless 'SUB=no', also from subprojects."
+ @echo "Target 'all' will will build all configurations and, unless 'SUB=no',"
+ @echo " also build subprojects."
+ @echo "Target 'help' prints this message."
+ @echo ""
+
diff --git a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
new file mode 100644
index 0000000..7b5163b
--- /dev/null
+++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec.mk
@@ -0,0 +1,120 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add customized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+GREP=grep
+NM=nm
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=gcc
+CCC=g++
+CXX=g++
+FC=gfortran
+AS=as
+
+# Macros
+CND_PLATFORM=Cygwin-Windows
+CND_DLIB_EXT=dll
+CND_CONF=nbexec
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/jvmlauncher.o \
+ ${OBJECTDIR}/nbexec.o \
+ ${OBJECTDIR}/nbexecexe.o \
+ ${OBJECTDIR}/platformlauncher.o \
+ ${OBJECTDIR}/utilsfuncs.o
+
+
+# C Compiler Flags
+CFLAGS=
+
+# CC Compiler Flags
+CCFLAGS=-m32 -mno-cygwin
+CXXFLAGS=-m32 -mno-cygwin
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Assembler Flags
+ASFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=${OBJECTDIR}/nbexec.res
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS}
+ "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk nbexec.dll
+
+nbexec.dll: ${OBJECTDIR}/nbexec.res
+
+nbexec.dll: ${OBJECTFILES}
+ ${LINK.cc} -o nbexec.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-seh -mno-cygwin -shared
+
+${OBJECTDIR}/jvmlauncher.o: jvmlauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
+
+${OBJECTDIR}/nbexec.o: nbexec.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexec.o nbexec.cpp
+
+${OBJECTDIR}/nbexec.res: nbexec.rc version.h
+ ${MKDIR} -p ${OBJECTDIR}
+ @echo Compiling Resource files...
+ windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec.res
+
+: nbexec_exe.rc
+ @echo
+
+
+${OBJECTDIR}/nbexecexe.o: nbexecexe.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
+
+${OBJECTDIR}/platformlauncher.o: platformlauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
+
+${OBJECTDIR}/utilsfuncs.o: utilsfuncs.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf: ${CLEAN_SUBPROJECTS}
+ ${RM} -r ${CND_BUILDDIR}/${CND_CONF}
+ ${RM} nbexec.dll
+ ${RM} ${OBJECTDIR}/nbexec.res
+ ${RM}
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.dep.inc: .depcheck-impl
+
+include .dep.inc
diff --git a/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
new file mode 100644
index 0000000..7fb819e
--- /dev/null
+++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-nbexec64.mk
@@ -0,0 +1,120 @@
+#
+# Generated Makefile - do not edit!
+#
+# Edit the Makefile in the project folder instead (../Makefile). Each target
+# has a -pre and a -post target defined where you can add customized code.
+#
+# This makefile implements configuration specific macros and targets.
+
+
+# Environment
+MKDIR=mkdir
+CP=cp
+GREP=grep
+NM=nm
+CCADMIN=CCadmin
+RANLIB=ranlib
+CC=x86_64-w64-mingw32-gcc
+CCC=x86_64-w64-mingw32-g++
+CXX=x86_64-w64-mingw32-g++
+FC=gfortran
+AS=as
+
+# Macros
+CND_PLATFORM=Cygwin64-Windows
+CND_DLIB_EXT=dll
+CND_CONF=nbexec64
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+
+# Include project Makefile
+include Makefile
+
+# Object Directory
+OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
+
+# Object Files
+OBJECTFILES= \
+ ${OBJECTDIR}/jvmlauncher.o \
+ ${OBJECTDIR}/nbexec.o \
+ ${OBJECTDIR}/nbexecexe.o \
+ ${OBJECTDIR}/platformlauncher.o \
+ ${OBJECTDIR}/utilsfuncs.o
+
+
+# C Compiler Flags
+CFLAGS=
+
+# CC Compiler Flags
+CCFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
+CXXFLAGS=-m64 -mno-cygwin -static-libgcc -static-libstdc++
+
+# Fortran Compiler Flags
+FFLAGS=
+
+# Assembler Flags
+ASFLAGS=
+
+# Link Libraries and Options
+LDLIBSOPTIONS=${OBJECTDIR}/nbexec64.res
+
+# Build Targets
+.build-conf: ${BUILD_SUBPROJECTS}
+ "${MAKE}" -f nbproject/Makefile-${CND_CONF}.mk nbexec64.dll
+
+nbexec64.dll: ${OBJECTDIR}/nbexec64.res
+
+nbexec64.dll: ${OBJECTFILES}
+ ${LINK.cc} -o nbexec64.dll ${OBJECTFILES} ${LDLIBSOPTIONS} -Wl,--nxcompat -Wl,--dynamicbase -mno-cygwin -shared
+
+${OBJECTDIR}/jvmlauncher.o: jvmlauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/jvmlauncher.o jvmlauncher.cpp
+
+${OBJECTDIR}/nbexec.o: nbexec.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexec.o nbexec.cpp
+
+${OBJECTDIR}/nbexec64.res: nbexec.rc version.h
+ ${MKDIR} -p ${OBJECTDIR}
+ @echo Compiling Resource files...
+ x86_64-w64-mingw32-windres.exe -Ocoff nbexec.rc ${OBJECTDIR}/nbexec64.res
+
+: nbexec_exe.rc
+ @echo
+
+
+${OBJECTDIR}/nbexecexe.o: nbexecexe.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/nbexecexe.o nbexecexe.cpp
+
+${OBJECTDIR}/platformlauncher.o: platformlauncher.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/platformlauncher.o platformlauncher.cpp
+
+${OBJECTDIR}/utilsfuncs.o: utilsfuncs.cpp
+ ${MKDIR} -p ${OBJECTDIR}
+ ${RM} "$@.d"
+ $(COMPILE.cc) -O2 -s -DNBEXEC_DLL=\"nbexec64.dll\" -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include -I/cygdrive/C/Program\ Files/Java/jdk1.7.0_67/include/win32 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/utilsfuncs.o utilsfuncs.cpp
+
+# Subprojects
+.build-subprojects:
+
+# Clean Targets
+.clean-conf: ${CLEAN_SUBPROJECTS}
+ ${RM} -r ${CND_BUILDDIR}/${CND_CONF}
+ ${RM} nbexec64.dll
+ ${RM} ${OBJECTDIR}/nbexec64.res
+ ${RM}
+
+# Subprojects
+.clean-subprojects:
+
+# Enable dependency checking
+.dep.inc: .depcheck-impl
+
+include .dep.inc
diff --git a/o.n.bootstrap/launcher/windows/nbproject/Makefile-variables.mk b/o.n.bootstrap/launcher/windows/nbproject/Makefile-variables.mk
new file mode 100644
index 0000000..7eaa078
--- /dev/null
+++ b/o.n.bootstrap/launcher/windows/nbproject/Makefile-variables.mk
@@ -0,0 +1,35 @@
+#
+# Generated - do not edit!
+#
+# NOCDDL
+#
+CND_BASEDIR=`pwd`
+CND_BUILDDIR=build
+CND_DISTDIR=dist
+# nbexec configuration
+CND_PLATFORM_nbexec=Cygwin-Windows
+CND_ARTIFACT_DIR_nbexec=
+CND_ARTIFACT_NAME_nbexec=nbexec.dll
+CND_ARTIFACT_PATH_nbexec=nbexec.dll
+CND_PACKAGE_DIR_nbexec=dist/nbexec/Cygwin-Windows/package
+CND_PACKAGE_NAME_nbexec=libwindows.dll.tar
+CND_PACKAGE_PATH_nbexec=dist/nbexec/Cygwin-Windows/package/libwindows.dll.tar
+# nbexec64 configuration
+CND_PLATFORM_nbexec64=Cygwin64-Windows
+CND_ARTIFACT_DIR_nbexec64=
+CND_ARTIFACT_NAME_nbexec64=nbexec64.dll
+CND_ARTIFACT_PATH_nbexec64=nbexec64.dll
+CND_PACKAGE_DIR_nbexec64=dist/nbexec64/Cygwin64-Windows/package
+CND_PACKAGE_NAME_nbexec64=libwindows.dll.tar
+CND_PACKAGE_PATH_nbexec64=dist/nbexec64/Cygwin64-Windows/package/libwindows.dll.tar
+#
+# include compiler specific variables
+#
+# dmake command
+ROOT:sh = test -f nbproject/private/Makefile-variables.mk || \
+ (mkdir -p nbproject/private && touch nbproject/private/Makefile-variables.mk)
+#
+# gmake command
+.PHONY: $(shell test -f nbproject/private/Makefile-variables.mk || (mkdir -p nbproject/private && touch nbproject/private/Makefile-variables.mk))
+#
+include nbproject/private/Makefile-variables.mk
diff --git a/o.n.bootstrap/launcher/windows/nbproject/Package-nbexec.bash b/o.n.bootstrap/launcher/windows/nbproject/Package-nbexec.bash
new file mode 100644
index 0000000..24e2f8b
--- /dev/null
+++ b/o.n.bootstrap/launcher/windows/nbproject/Package-nbexec.bash
@@ -0,0 +1,76 @@
+#!/bin/bash -x
+
+#
+# Generated - do not edit!
+#
+
+# Macros
+TOP=`pwd`
+CND_PLATFORM=Cygwin-Windows
+CND_CONF=nbexec
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+CND_DLIB_EXT=dll
+NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
+TMPDIRNAME=tmp-packaging
+OUTPUT_PATH=nbexec.dll
+OUTPUT_BASENAME=nbexec.dll
+PACKAGE_TOP_DIR=libwindows.dll/
+
+# Functions
+function checkReturnCode
+{
+ rc=$?
+ if [ $rc != 0 ]
+ then
+ exit $rc
+ fi
+}
+function makeDirectory
+# $1 directory path
+# $2 permission (optional)
+{
+ mkdir -p "$1"
+ checkReturnCode
+ if [ "$2" != "" ]
+ then
+ chmod $2 "$1"
+ checkReturnCode
+ fi
+}
+function copyFileToTmpDir
+# $1 from-file path
+# $2 to-file path
+# $3 permission
+{
+ cp "$1" "$2"
+ checkReturnCode
+ if [ "$3" != "" ]
+ then
+ chmod $3 "$2"
+ checkReturnCode
+ fi
+}
+
+# Setup
+cd "${TOP}"
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
+rm -rf ${NBTMPDIR}
+mkdir -p ${NBTMPDIR}
+
+# Copy files and create directories and links
+cd "${TOP}"
+makeDirectory "${NBTMPDIR}/libwindows.dll/lib"
+copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}lib/${OUTPUT_BASENAME}" 0644
+
+
+# Generate tar file
+cd "${TOP}"
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libwindows.dll.tar
+cd ${NBTMPDIR}
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libwindows.dll.tar *
+checkReturnCode
+
+# Cleanup
+cd "${TOP}"
+rm -rf ${NBTMPDIR}
diff --git a/o.n.bootstrap/launcher/windows/nbproject/Package-nbexec64.bash b/o.n.bootstrap/launcher/windows/nbproject/Package-nbexec64.bash
new file mode 100644
index 0000000..2179ccd
--- /dev/null
+++ b/o.n.bootstrap/launcher/windows/nbproject/Package-nbexec64.bash
@@ -0,0 +1,76 @@
+#!/bin/bash -x
+
+#
+# Generated - do not edit!
+#
+
+# Macros
+TOP=`pwd`
+CND_PLATFORM=Cygwin64-Windows
+CND_CONF=nbexec64
+CND_DISTDIR=dist
+CND_BUILDDIR=build
+CND_DLIB_EXT=dll
+NBTMPDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}/tmp-packaging
+TMPDIRNAME=tmp-packaging
+OUTPUT_PATH=nbexec64.dll
+OUTPUT_BASENAME=nbexec64.dll
+PACKAGE_TOP_DIR=libwindows.dll/
+
+# Functions
+function checkReturnCode
+{
+ rc=$?
+ if [ $rc != 0 ]
+ then
+ exit $rc
+ fi
+}
+function makeDirectory
+# $1 directory path
+# $2 permission (optional)
+{
+ mkdir -p "$1"
+ checkReturnCode
+ if [ "$2" != "" ]
+ then
+ chmod $2 "$1"
+ checkReturnCode
+ fi
+}
+function copyFileToTmpDir
+# $1 from-file path
+# $2 to-file path
+# $3 permission
+{
+ cp "$1" "$2"
+ checkReturnCode
+ if [ "$3" != "" ]
+ then
+ chmod $3 "$2"
+ checkReturnCode
+ fi
+}
+
+# Setup
+cd "${TOP}"
+mkdir -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package
+rm -rf ${NBTMPDIR}
+mkdir -p ${NBTMPDIR}
+
+# Copy files and create directories and links
+cd "${TOP}"
+makeDirectory "${NBTMPDIR}/libwindows.dll/lib"
+copyFileToTmpDir "${OUTPUT_PATH}" "${NBTMPDIR}/${PACKAGE_TOP_DIR}lib/${OUTPUT_BASENAME}" 0644
+
+
+# Generate tar file
+cd "${TOP}"
+rm -f ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libwindows.dll.tar
+cd ${NBTMPDIR}
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/package/libwindows.dll.tar *
+checkReturnCode
+
+# Cleanup
+cd "${TOP}"
+rm -rf ${NBTMPDIR}
diff --git a/o.n.bootstrap/launcher/windows/nbproject/configurations.xml b/o.n.bootstrap/launcher/windows/nbproject/configurations.xml
index 02350a6..3142b55 100644
--- a/o.n.bootstrap/launcher/windows/nbproject/configurations.xml
+++ b/o.n.bootstrap/launcher/windows/nbproject/configurations.xml
@@ -1,44 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
-<configurationDescriptor version="95">
+<configurationDescriptor version="94">
<logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
<logicalFolder name="HeaderFiles"
displayName="Header Files"
@@ -72,11 +33,6 @@ Contributor(s):
projectFiles="false">
<itemPath>Makefile</itemPath>
</logicalFolder>
- <logicalFolder name="ExternalFiles"
- displayName="Important Files"
- projectFiles="false">
- <itemPath>Makefile</itemPath>
- </logicalFolder>
</logicalFolder>
<projectmakefile>Makefile</projectmakefile>
<confs>
@@ -96,8 +52,8 @@ Contributor(s):
<stripSymbols>true</stripSymbols>
<architecture>1</architecture>
<incDir>
- <pElem>C:/Program Files/Java/jdk1.8.0_77/include</pElem>
- <pElem>C:/Program Files/Java/jdk1.8.0_77/include/win32</pElem>
+ <pElem>C:/Program Files/Java/jdk1.7.0_67/include</pElem>
+ <pElem>C:/Program Files/Java/jdk1.7.0_67/include/win32</pElem>
</incDir>
<commandLine>-mno-cygwin</commandLine>
<preprocessorList>
@@ -168,8 +124,8 @@ Contributor(s):
<stripSymbols>true</stripSymbols>
<architecture>2</architecture>
<incDir>
- <pElem>C:/Program Files/Java/jdk1.8.0_77/include</pElem>
- <pElem>C:/Program Files/Java/jdk1.8.0_77/include/win32</pElem>
+ <pElem>C:/Program Files/Java/jdk1.7.0_67/include</pElem>
+ <pElem>C:/Program Files/Java/jdk1.7.0_67/include/win32</pElem>
</incDir>
<commandLine>-mno-cygwin -static-libgcc -static-libstdc++</commandLine>
<preprocessorList>
diff --git a/o.n.bootstrap/launcher/windows/nbproject/project.properties b/o.n.bootstrap/launcher/windows/nbproject/project.properties
index 6e98dfd..e69de29 100644
--- a/o.n.bootstrap/launcher/windows/nbproject/project.properties
+++ b/o.n.bootstrap/launcher/windows/nbproject/project.properties
@@ -1,37 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
diff --git a/o.n.bootstrap/launcher/windows/nbproject/project.xml b/o.n.bootstrap/launcher/windows/nbproject/project.xml
index ceffa6a..74f9e5c 100644
--- a/o.n.bootstrap/launcher/windows/nbproject/project.xml
+++ b/o.n.bootstrap/launcher/windows/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.cnd.makeproject</type>
<configuration>
diff --git a/o.n.bootstrap/launcher/windows/platformlauncher.cpp b/o.n.bootstrap/launcher/windows/platformlauncher.cpp
index 1d45959..dd51e8e 100644
--- a/o.n.bootstrap/launcher/windows/platformlauncher.cpp
+++ b/o.n.bootstrap/launcher/windows/platformlauncher.cpp
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -40,8 +40,7 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- */
- /*
+ *
* Author: Tomas Holy
*/
@@ -66,7 +65,7 @@ General options:\n\
--trace <path> path for launcher log (for trouble shooting)\n\
\n";
-const char *PlatformLauncher::REQ_JAVA_VERSION = "1.8";
+const char *PlatformLauncher::REQ_JAVA_VERSION = "1.7";
const char *PlatformLauncher::OPT_JDK_HOME = "-Djdk.home=";
const char *PlatformLauncher::OPT_NB_PLATFORM_HOME = "-Dnetbeans.home=";
@@ -79,14 +78,6 @@ const char *PlatformLauncher::OPT_KEEP_WORKING_SET_ON_MINIMIZE = "-Dsun.awt.keep
const char *PlatformLauncher::OPT_CLASS_PATH = "-Djava.class.path=";
const char *PlatformLauncher::OPT_SPLASH = "-splash:";
const char *PlatformLauncher::OPT_SPLASH_PATH = "\\var\\cache\\splash.png";
-const int PlatformLauncher::OPT_JIGSAW_ARGS_LENGTH = 7;
-const char *PlatformLauncher::OPT_JIGSAW_ARGS [OPT_JIGSAW_ARGS_LENGTH] = {"-Djdk.launcher.addexports.0=java.desktop/sun.awt=ALL-UNNAMED",
- "-Djdk.launcher.addexports.1=java.base/jdk.internal.jrtfs=ALL-UNNAMED",
- "-Djdk.launcher.addexports.2=java.desktop/java.awt.peer=ALL-UNNAMED",
- "-Djdk.launcher.addexports.3=java.desktop/com.sun.beans.editors=ALL-UNNAMED",
- "-Djdk.launcher.addexports.3=java.desktop/sun.awt.im=ALL-UNNAMED",
- "-Djdk.launcher.addexports.4=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED",
- "-Djdk.launcher.addexports.5=java.management/sun.management=ALL-UNNAMED"};
const char *PlatformLauncher::HEAP_DUMP_PATH = "\\var\\log\\heapdump.hprof";
const char *PlatformLauncher::RESTART_FILE_PATH = "\\var\\restart";
@@ -121,6 +112,12 @@ bool PlatformLauncher::start(char* argv[], int argc, DWORD *retCode) {
}
}
jvmLauncher.getJavaPath(jdkhome);
+
+ if (!launcherOptions.empty() && jvmLauncher.isPermSizeSupported()) {
+ for (list<string>::iterator launcherOption = launcherOptions.begin(); launcherOption != launcherOptions.end(); launcherOption++) {
+ javaOptions.push_back(*launcherOption);
+ }
+ }
deleteNewClustersFile();
prepareOptions();
@@ -302,7 +299,9 @@ bool PlatformLauncher::parseArgs(int argc, char *argv[]) {
javaOptions.push_back(argv[i] + 2);
if (strncmp(argv[i] + 2, OPT_HEAP_DUMP_PATH, strlen(OPT_HEAP_DUMP_PATH)) == 0) {
heapDumpPathOptFound = true;
- }
+ }
+ } else if (strncmp("-L", argv[i], 2) == 0) {
+ launcherOptions.push_back(argv[i] + 2);
} else {
if (strcmp(argv[i], "-h") == 0
|| strcmp(argv[i], "-help") == 0
@@ -565,11 +564,6 @@ void PlatformLauncher::prepareOptions() {
javaOptions.push_back(OPT_SPLASH + splashPath);
}
}
-
- for (int i = 0; i < OPT_JIGSAW_ARGS_LENGTH; i++) {
- option = OPT_JIGSAW_ARGS[i];
- javaOptions.push_back(option);
- }
option = OPT_NB_PLATFORM_HOME;
option += platformDir;
diff --git a/o.n.bootstrap/launcher/windows/platformlauncher.h b/o.n.bootstrap/launcher/windows/platformlauncher.h
index 1417666..b01b39f 100644
--- a/o.n.bootstrap/launcher/windows/platformlauncher.h
+++ b/o.n.bootstrap/launcher/windows/platformlauncher.h
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2012 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -40,8 +40,7 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- */
- /*
+ *
* Author: Tomas Holy
*/
@@ -71,8 +70,6 @@ class PlatformLauncher {
static const char *OPT_CLASS_PATH;
static const char *OPT_SPLASH;
static const char *OPT_SPLASH_PATH;
- static const int OPT_JIGSAW_ARGS_LENGTH;
- static const char *OPT_JIGSAW_ARGS[];
static const char *UPDATER_MAIN_CLASS;
static const char *IDE_MAIN_CLASS;
diff --git a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp b/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
index a43453b..21f947f 100644
--- a/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
+++ b/o.n.bootstrap/launcher/windows/utilsfuncs.cpp
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -40,8 +40,7 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- */
- /*
+ *
* Author: Tomas Holy
*/
diff --git a/o.n.bootstrap/launcher/windows/utilsfuncs.h b/o.n.bootstrap/launcher/windows/utilsfuncs.h
index f87e299..fde4111 100644
--- a/o.n.bootstrap/launcher/windows/utilsfuncs.h
+++ b/o.n.bootstrap/launcher/windows/utilsfuncs.h
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -40,8 +40,7 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
- */
- /*
+ *
* Author: Tomas Holy
*/
diff --git a/o.n.bootstrap/launcher/windows/version.h b/o.n.bootstrap/launcher/windows/version.h
index 89d58ce..da11232 100644
--- a/o.n.bootstrap/launcher/windows/version.h
+++ b/o.n.bootstrap/launcher/windows/version.h
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2014 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -42,10 +42,10 @@
#define COMPANY "Oracle Corporation"
#define COMPONENT "NetBeans Platform Launcher"
-#define VER "8.2.0.0"
-#define FVER 8,2,0,0
-#define BUILD_ID "04152016"
+#define VER "8.1.0.0"
+#define FVER 8,1,0,0
+#define BUILD_ID "10032014"
#define INTERNAL_NAME "nbexec"
-#define COPYRIGHT "\xA9 2007, 2016 Oracle and/or its affiliates. All rights reserved."
-#define NAME "NetBeans Platform Launcher"
+#define COPYRIGHT "\xA9 2007, 2014 Oracle and/or its affiliates. All rights reserved."
+#define NAME "NetBeans Platform Launcher 8.1"
diff --git a/o.n.bootstrap/manifest.mf b/o.n.bootstrap/manifest.mf
index 74f0287..84e4b0a 100644
--- a/o.n.bootstrap/manifest.mf
+++ b/o.n.bootstrap/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.bootstrap/1
-OpenIDE-Module-Specification-Version: 2.76.1
+OpenIDE-Module-Specification-Version: 2.74.1
OpenIDE-Module-Localizing-Bundle: org/netbeans/Bundle.properties
OpenIDE-Module-Recommends: org.netbeans.NetigsoFramework
diff --git a/o.n.bootstrap/src/org/netbeans/CLIHandler.java b/o.n.bootstrap/src/org/netbeans/CLIHandler.java
index 50fcb7d..bc96904 100644
--- a/o.n.bootstrap/src/org/netbeans/CLIHandler.java
+++ b/o.n.bootstrap/src/org/netbeans/CLIHandler.java
@@ -1023,7 +1023,7 @@ public abstract class CLIHandler extends Object {
/** Is open? True if the connection is still alive. Can be
* used with long running computations to find out if the
- * consumer of the output has not been interrupted.
+ * consumer of the output has not been interupted.
*
* @return true if the connection is still alive
*/
@@ -1038,7 +1038,7 @@ public abstract class CLIHandler extends Object {
private static final class Server extends Thread {
private Closeable unlock;
private byte[] key;
- private volatile ServerSocket socket;
+ private ServerSocket socket;
private Integer block;
private Collection<? extends CLIHandler> handlers;
private Socket work;
@@ -1094,9 +1094,6 @@ public abstract class CLIHandler extends Object {
return;
}
- // by default wait 100ms after exception from socket.accept()
- long acceptFailDelay = 100;
-
while (socket != null) {
try {
enterState(65, block);
@@ -1108,12 +1105,9 @@ public abstract class CLIHandler extends Object {
s.close();
continue;
}
- acceptFailDelay = 100;
// spans new request handler
new Server(s, key, block, handlers, failOnUnknownOptions);
- // and re-run the while loop
- continue;
} catch (InterruptedIOException ex) {
if (socket != null) {
ex.printStackTrace();
@@ -1126,18 +1120,6 @@ public abstract class CLIHandler extends Object {
}
} catch (IOException ex) {
ex.printStackTrace();
- }
- // common error handling below
- // socket.accept() failed with exception, wait for some time
- // to prevent messages.log and memory overflow caused by a large
- // number of ex.printStackTrace() invocations
- if (socket != null) {
- try {
- Thread.sleep(acceptFailDelay);
- } catch (InterruptedException ex) {
- ex.printStackTrace();
- }
- acceptFailDelay *= 2;
}
}
diff --git a/o.n.bootstrap/src/org/netbeans/ModuleManager.java b/o.n.bootstrap/src/org/netbeans/ModuleManager.java
index f60c2a8..0cde2e8 100644
--- a/o.n.bootstrap/src/org/netbeans/ModuleManager.java
+++ b/o.n.bootstrap/src/org/netbeans/ModuleManager.java
@@ -79,7 +79,6 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.jar.Manifest;
import java.util.logging.Level;
-import java.util.logging.Logger;
import org.openide.modules.Dependency;
import org.openide.modules.ModuleInfo;
import org.openide.modules.Modules;
@@ -474,13 +473,7 @@ public final class ModuleManager extends Modules {
// has not been called with some other special classloader.
if (force || (ts[i].getContextClassLoader() instanceof SystemClassLoader)) {
//Util.err.fine("Setting ctxt CL on " + ts[i].getName() + " to " + l);
- try {
- ts[i].setContextClassLoader(l);
- } catch (SecurityException se) {
- if (Util.err.isLoggable(Level.FINE)) {
- Util.err.fine("Cannot set context ClassLoader to the Thread: "+ts[i]); // NOI18N
- }
- }
+ ts[i].setContextClassLoader(l);
} else {
if (Util.err.isLoggable(Level.FINE)) {
Util.err.fine("Not touching context class loader " + ts[i].getContextClassLoader() + " on thread " + ts[i].getName());
@@ -705,20 +698,14 @@ public final class ModuleManager extends Modules {
@Override
synchronized Enumeration<URL> getResourcesImpl(String name) throws IOException {
- if (JRE_PROVIDED_FACTORIES.contains(name)) {
- // #146082: prefer JRE versions of JAXP factories when available.
- // #147082: use empty file rather than null (~ delegation to ClassLoader.systemClassLoader) to work around JAXP #6723276
- return parents.systemCL().getResources(name);
+ Enumeration<URL> first = super.getResourcesImpl(name);
+ ClassLoader l = netigso.findFallbackLoader();
+ if (l != null && l != this) {
+ return Enumerations.removeDuplicates(
+ Enumerations.concat(first, l.getResources(name))
+ );
} else {
- Enumeration<URL> first = super.getResourcesImpl(name);
- ClassLoader l = netigso.findFallbackLoader();
- if (l != null && l != this) {
- return Enumerations.removeDuplicates(
- Enumerations.concat(first, l.getResources(name))
- );
- } else {
- return first;
- }
+ return first;
}
}
diff --git a/o.n.bootstrap/src/org/netbeans/PatchByteCode.java b/o.n.bootstrap/src/org/netbeans/PatchByteCode.java
index b541f95..3401e78 100644
--- a/o.n.bootstrap/src/org/netbeans/PatchByteCode.java
+++ b/o.n.bootstrap/src/org/netbeans/PatchByteCode.java
@@ -214,12 +214,10 @@ public final class PatchByteCode {
case 10: // CONSTANT_Methodref
case 11: // CONSTANT_InterfaceMethodref
case 12: // CONSTANT_NameAndType
- case 18: //CONSTANT_InvokeDynamic
pos += 4;
break;
case 7: // CONSTANT_Class
case 8: // CONSTANT_String
- case 16: //CONSTANT_MethodType
pos += 2;
break;
case 5: // CONSTANT_Long
@@ -227,9 +225,6 @@ public final class PatchByteCode {
pos += 8;
i++; // next entry is ignored
break;
- case 15: //CONSTANT_MethodHandle
- pos +=3;
- break;
default:
throw new IllegalArgumentException("illegal constant pool tag " + tag + " at index " + i + " out of " + constant_pool_count);
}
diff --git a/o.n.bootstrap/src/org/netbeans/ProxyClassLoader.java b/o.n.bootstrap/src/org/netbeans/ProxyClassLoader.java
index 90abadd..8fce05f 100644
--- a/o.n.bootstrap/src/org/netbeans/ProxyClassLoader.java
+++ b/o.n.bootstrap/src/org/netbeans/ProxyClassLoader.java
@@ -476,14 +476,11 @@ public class ProxyClassLoader extends ClassLoader {
if (!recurse) {
return null;
}
- String path = name.replace('.', '/');
for (ProxyClassLoader par : this.parents.loaders()) {
- if (!shouldDelegateResource(path, par))
- continue;
pkg = par.getPackageFast(name, false);
if (pkg != null) break;
}
- if (pkg == null && shouldDelegateResource(path, null)) {
+ if (pkg == null) {
// Cannot access either Package.getSystemPackages nor ClassLoader.getPackage
// from here, so do the best we can though it will cause unnecessary
// duplication of the package cache (PCL.packages vs. CL.packages):
diff --git a/o.n.bootstrap/src/org/netbeans/TopSecurityManager.java b/o.n.bootstrap/src/org/netbeans/TopSecurityManager.java
index a5b864a..e1c4aa9 100644
--- a/o.n.bootstrap/src/org/netbeans/TopSecurityManager.java
+++ b/o.n.bootstrap/src/org/netbeans/TopSecurityManager.java
@@ -753,18 +753,11 @@ LOOP: for (int i = 0; i < ctx.length; i++) {
/** Throws exception if accessed from javax.swing.TransferHandler class
*/
private void checkWhetherAccessedFromSwingTransfer () throws SecurityException {
- boolean throwExc = false;
for (Class<?> c : getClassContext()) {
- if (c.getName().equals("org.netbeans.editor.BaseCaret")) { // NOI18N
- return;
- }
- if (c.getName().equals("javax.swing.TransferHandler$TransferAction")) { // NOI18N
- throwExc = true;
+ if (c.getName().equals("javax.swing.TransferHandler$TransferAction")) {
+ throw new SecurityException ("All swing access to clipboard should be redirected to ExClipboard"); // NOI18N
}
}
- if (throwExc) {
- throw new SecurityException("All swing access to clipboard should be redirected to ExClipboard"); // NOI18N
- }
}
diff --git a/o.n.core/manifest.mf b/o.n.core/manifest.mf
index 359fb0c..31f5720 100644
--- a/o.n.core/manifest.mf
+++ b/o.n.core/manifest.mf
@@ -5,5 +5,5 @@ OpenIDE-Module-Layer: org/netbeans/core/resources/mf-layer.xml
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
OpenIDE-Module-Recommends: org.netbeans.core.ProxySettings.Reloader
-OpenIDE-Module-Specification-Version: 3.51.1
+OpenIDE-Module-Specification-Version: 3.49.1
diff --git a/o.n.core/src/org/netbeans/beaninfo/editors/package-info.java b/o.n.core/src/org/netbeans/beaninfo/editors/package-info.java
index bfa1117..52c67e9 100644
--- a/o.n.core/src/org/netbeans/beaninfo/editors/package-info.java
+++ b/o.n.core/src/org/netbeans/beaninfo/editors/package-info.java
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
@PropertyEditorSearchPath
package org.netbeans.beaninfo.editors;
diff --git a/o.n.core/src/org/netbeans/beaninfo/package-info.java b/o.n.core/src/org/netbeans/beaninfo/package-info.java
index 9b6d1c9..034040b 100644
--- a/o.n.core/src/org/netbeans/beaninfo/package-info.java
+++ b/o.n.core/src/org/netbeans/beaninfo/package-info.java
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
@BeanInfoSearchPath
package org.netbeans.beaninfo;
diff --git a/o.n.core/src/org/netbeans/core/NotifyExcPanel.java b/o.n.core/src/org/netbeans/core/NotifyExcPanel.java
index 6625255..843db83 100644
--- a/o.n.core/src/org/netbeans/core/NotifyExcPanel.java
+++ b/o.n.core/src/org/netbeans/core/NotifyExcPanel.java
@@ -71,7 +71,6 @@ import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import javax.swing.BorderFactory;
-import javax.swing.FocusManager;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JComponent;
@@ -114,7 +113,6 @@ public final class NotifyExcPanel extends JPanel implements ActionListener {
/** preferred height of this component */
private static final int SIZE_PREFERRED_HEIGHT=250;
private static final int MAX_STORED_EXCEPTIONS = 500;
- private static final boolean AUTO_FOCUS = Boolean.getBoolean("netbeans.winsys.auto_focus"); // NOI18N
/** enumeration of NbExceptionManager.Exc to notify */
static ArrayListPos exceptions;
@@ -426,9 +424,7 @@ public final class NotifyExcPanel extends JPanel implements ActionListener {
//another dialog, which will trigger another exception, endlessly.
//Catch any exceptions and append them to the list instead.
ensurePreferredSize();
- if (!dialog.isVisible()) {
- dialog.setVisible(true);
- }
+ dialog.setVisible(true);
//throw new RuntimeException ("I am not so exceptional"); //uncomment to test
} catch (Exception e) {
exceptions.add(NbErrorManager.createExc(
@@ -493,12 +489,7 @@ public final class NotifyExcPanel extends JPanel implements ActionListener {
current.printStackTrace(new PrintWriter(wr, true));
output.setText(wr.toString());
output.getCaret().setDot(0);
- if (!AUTO_FOCUS && FocusManager.getCurrentManager().getActiveWindow() == null) {
- // Do not steal focus if no Java window have it
- output.requestFocusInWindow();
- } else {
- output.requestFocus ();
- }
+ output.requestFocus ();
}
});
} else {
diff --git a/o.n.html.ko4j/build.xml b/o.n.html.ko4j/build.xml
index 8020b1a..8f178e2 100644
--- a/o.n.html.ko4j/build.xml
+++ b/o.n.html.ko4j/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project name="o.n.html.ko4j" default="netbeans" basedir=".">
<import file="../nbbuild/templates/projectized.xml"/>
<target name="jar"/>
diff --git a/o.n.html.ko4j/external/binaries-list b/o.n.html.ko4j/external/binaries-list
index 6459050..177b434 100644
--- a/o.n.html.ko4j/external/binaries-list
+++ b/o.n.html.ko4j/external/binaries-list
@@ -1 +1 @@
-771CDCA0A3F2F3CE818E20CC2D707A3592422485 ko4j-1.3.jar
+A3432F57D9B3B4AD62CB0B294EEC43D12FCF3F62 ko4j-1.2.3.jar
diff --git a/o.n.html.ko4j/nbproject/project.properties b/o.n.html.ko4j/nbproject/project.properties
index cc7fa05..b7f26ff 100644
--- a/o.n.html.ko4j/nbproject/project.properties
+++ b/o.n.html.ko4j/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-release.external/ko4j-1.3.jar=modules/org-netbeans-html-ko4j.jar
+release.external/ko4j-1.2.3.jar=modules/org-netbeans-html-ko4j.jar
nbm.module.author=Jaroslav Tulach
is.autoload=true
diff --git a/o.n.html.ko4j/nbproject/project.xml b/o.n.html.ko4j/nbproject/project.xml
index 54cfd6d..4380a90 100644
--- a/o.n.html.ko4j/nbproject/project.xml
+++ b/o.n.html.ko4j/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
@@ -47,7 +8,7 @@ Contributor(s):
<public-packages/>
<class-path-extension>
<runtime-relative-path>org-netbeans-html-ko4j.jar</runtime-relative-path>
- <binary-origin>external/ko4j-1.3.jar</binary-origin>
+ <binary-origin>external/ko4j-1.2.3.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/o.n.html.xhr4j/build.xml b/o.n.html.xhr4j/build.xml
deleted file mode 100644
index aa3f745..0000000
--- a/o.n.html.xhr4j/build.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
-<project name="o.n.html.xhr4j" default="netbeans" basedir=".">
- <import file="../nbbuild/templates/projectized.xml"/>
- <target name="jar"/>
-</project>
diff --git a/o.n.html.xhr4j/external/binaries-list b/o.n.html.xhr4j/external/binaries-list
deleted file mode 100644
index 78f94eb..0000000
--- a/o.n.html.xhr4j/external/binaries-list
+++ /dev/null
@@ -1 +0,0 @@
-CEC2829EC391CB404AD32EB2D08F879C418B745B xhr4j-1.3.jar
diff --git a/o.n.html.xhr4j/manifest.mf b/o.n.html.xhr4j/manifest.mf
deleted file mode 100644
index 0ecc6c8..0000000
--- a/o.n.html.xhr4j/manifest.mf
+++ /dev/null
@@ -1 +0,0 @@
-OpenIDE-Module: org.netbeans.html.xhr4j
diff --git a/o.n.html.xhr4j/nbproject/project.properties b/o.n.html.xhr4j/nbproject/project.properties
deleted file mode 100644
index 4a387d2..0000000
--- a/o.n.html.xhr4j/nbproject/project.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-release.external/xhr4j-1.3.jar=modules/org-netbeans-html-xhr4j.jar
-nbm.module.author=Jaroslav Tulach
-is.autoload=true
diff --git a/o.n.html.xhr4j/nbproject/project.xml b/o.n.html.xhr4j/nbproject/project.xml
deleted file mode 100644
index 0499c1e..0000000
--- a/o.n.html.xhr4j/nbproject/project.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.apisupport.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/nb-module-project/2">
- <code-name-base>org.netbeans.html.xhr4j</code-name-base>
- <module-dependencies/>
- <public-packages/>
- <class-path-extension>
- <runtime-relative-path>org-netbeans-html-xhr4j.jar</runtime-relative-path>
- <binary-origin>external/xhr4j-1.3.jar</binary-origin>
- </class-path-extension>
- </data>
- </configuration>
-</project>
diff --git a/o.n.insane/nbproject/project.properties b/o.n.insane/nbproject/project.properties
index 9c546c3..3104519 100644
--- a/o.n.insane/nbproject/project.properties
+++ b/o.n.insane/nbproject/project.properties
@@ -43,6 +43,6 @@
is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.6
-spec.version.base=1.29.1
+spec.version.base=1.28.1
test.config.stableBTD.includes=**/*Test.class
diff --git a/o.n.swing.outline/build.xml b/o.n.swing.outline/build.xml
index f12fcde..f8b4f87 100644
--- a/o.n.swing.outline/build.xml
+++ b/o.n.swing.outline/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="o.n.swing.outline">
<description>Builds, tests, and runs the project org.netbeans.swing.outline</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/o.n.swing.outline/manifest.mf b/o.n.swing.outline/manifest.mf
index 2109b46..c15e0c5 100644
--- a/o.n.swing.outline/manifest.mf
+++ b/o.n.swing.outline/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.swing.outline
OpenIDE-Module-Localizing-Bundle: org/netbeans/swing/outline/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.34.1
+OpenIDE-Module-Specification-Version: 1.32.1
diff --git a/o.n.swing.outline/nbproject/org-netbeans-swing-outline.sig b/o.n.swing.outline/nbproject/org-netbeans-swing-outline.sig
index 608f5d8..30ccdf4 100644
--- a/o.n.swing.outline/nbproject/org-netbeans-swing-outline.sig
+++ b/o.n.swing.outline/nbproject/org-netbeans-swing-outline.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.32.1
+#Version 1.30
CLSS public abstract java.awt.Component
cons protected init()
@@ -542,8 +542,6 @@ meth public void firePropertyChange(java.lang.String,boolean,boolean)
meth public void firePropertyChange(java.lang.String,char,char)
meth public void firePropertyChange(java.lang.String,int,int)
meth public void grabFocus()
-meth public void hide()
- anno 0 java.lang.Deprecated()
meth public void paint(java.awt.Graphics)
meth public void paintImmediately(int,int,int,int)
meth public void paintImmediately(java.awt.Rectangle)
@@ -1179,7 +1177,7 @@ meth public void tableChanged(javax.swing.event.TableModelEvent)
meth public void unsetQuickFilter()
meth public void writeSettings(java.util.Properties,java.lang.String)
supr javax.swing.JTable
-hfds ACTION_FOCUS_NEXT,COMPUTING_TOOLTIP,DEFAULT,DEFAULT_COLUMNS_ICON,FULLY_EDITABLE,FULLY_NONEDITABLE,LOG,SEARCH_COLUMN,SEARCH_FIELD_PREFERRED_SIZE,SEARCH_FIELD_SPACE,columnHidingAllowed,columnSelectionMouseListener,columnSelectionOnMouseClick,columnSelectionOnMouseClickLock,columnSelector,defaultColumnSelector,editing,filteredRowCount,headerMouseListener,heightOfTextField,inEditRequest,inRemoveRequest,maxPrefix,quickFilterColumn,quickFilterFormatStrings,quickFilterObject,searchColumn,s [...]
+hfds ACTION_FOCUS_NEXT,COMPUTING_TOOLTIP,DEFAULT,DEFAULT_COLUMNS_ICON,FULLY_EDITABLE,FULLY_NONEDITABLE,SEARCH_COLUMN,SEARCH_FIELD_PREFERRED_SIZE,SEARCH_FIELD_SPACE,columnHidingAllowed,columnSelectionMouseListener,columnSelectionOnMouseClick,columnSelectionOnMouseClickLock,columnSelector,defaultColumnSelector,editing,filteredRowCount,headerMouseListener,heightOfTextField,inEditRequest,inRemoveRequest,maxPrefix,quickFilterColumn,quickFilterFormatStrings,quickFilterObject,searchColumn,searc [...]
hcls CTRLTabAction,CancelEditAction,ColumnSelectionMouseListener,CompareQuickFilter,EditAction,EnterAction,EqualsQuickFilter,HeaderMouseListener,NavigationAction,OriginalRowComparator,STPolicy,SearchComboListener,SearchFieldListener,SearchTextField,SelectedRows
CLSS public final static !enum org.netbeans.swing.etable.ETable$ColumnSelection
@@ -1308,8 +1306,8 @@ meth public final void setBorder(javax.swing.border.Border)
meth public java.awt.Component getTableCellRendererComponent(javax.swing.JTable,java.lang.Object,boolean,boolean,int,int)
meth public java.lang.String getToolTipText()
supr javax.swing.table.DefaultTableCellRenderer
-hfds checkBox,expanded,expansionBorder,expansionHandleHeight,expansionHandleWidth,fakeCellRendererPane,htmlRenderer,htmlRendererClass,labelTextGap,lastRenderedValueRef,lastRendererRef,leaf,nestingDepth,showHandle,swingRendering,theCheckBox
-hcls ExpansionHandleBorder,HtmlRenderer,RestrictedInsetsBorder
+hfds checkBox,expanded,expansionBorder,expansionHandleHeight,expansionHandleWidth,fakeCellRendererPane,htmlRenderer,htmlRendererClass,lastRenderedValueRef,lastRendererRef,leaf,nestingDepth,showHandle,swingRendering,theCheckBox
+hcls ExpansionHandleBorder,HtmlRenderer
CLSS public org.netbeans.swing.outline.DefaultOutlineModel
cons protected init(javax.swing.tree.TreeModel,javax.swing.table.TableModel,boolean,java.lang.String)
@@ -1381,7 +1379,7 @@ meth public void setRowHeight(int)
meth public void setRowHeight(int,int)
meth public void tableChanged(javax.swing.event.TableModelEvent)
supr org.netbeans.swing.etable.ETable
-hfds MAX_TOOLTIP_LENGTH,cachedRootVisible,componentListener,initialized,lastEditPosition,lastProcessedKeyStroke,renderDataProvider,rowHeightIsSet,selectedRow,selectionDisabled,tempSortMap,tempSortMapLock,toolTip
+hfds cachedRootVisible,componentListener,initialized,lastEditPosition,lastProcessedKeyStroke,renderDataProvider,rowHeightIsSet,selectedRow,selectionDisabled,tempSortMap,tempSortMapLock,toolTip
hcls ExpandAction,ND,SizeManager,TreeCellEditorBorder
CLSS protected org.netbeans.swing.outline.Outline$OutlineColumn
diff --git a/o.n.swing.outline/nbproject/project.properties b/o.n.swing.outline/nbproject/project.properties
index a2c951c..8080101 100644
--- a/o.n.swing.outline/nbproject/project.properties
+++ b/o.n.swing.outline/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/o.n.swing.outline/nbproject/project.xml b/o.n.swing.outline/nbproject/project.xml
index 9d901ae..f59369f 100644
--- a/o.n.swing.outline/nbproject/project.xml
+++ b/o.n.swing.outline/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java b/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java
index e656f62..13f9f59 100644
--- a/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java
+++ b/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java
@@ -132,6 +132,10 @@ import org.netbeans.swing.outline.DefaultOutlineModel;
* certain rows from the model (see setQuickFilter()). </LI>
* </UL>
*
+ * <p><b>Note:</b> This API is still under development and may change even in
+ * incompatible way during its stabilization phase. The API will be finalized in
+ * NetBeans version 6.5.</p>
+ *
* @author David Strupl
*/
public class ETable extends JTable {
@@ -426,7 +430,7 @@ public class ETable extends JTable {
}
/*
- * Overridden to call convertRowIndexToModel(...).
+ * Overriden to call convertRowIndexToModel(...).
* @see javax.swing.JTable#getCellRenderer(int, int)
*
* NOT NECESSARY - JTable does not use the "row" argument.
@@ -439,7 +443,7 @@ public class ETable extends JTable {
*/
/*
- * Overridden to call convertRowIndexToModel(...).
+ * Overriden to call convertRowIndexToModel(...).
* @see javax.swing.JTable#getCellEditor(int, int)
*
* NOT NECESSARY - JTable does not use the "row" argument.
@@ -755,7 +759,7 @@ public class ETable extends JTable {
}
/**
- * Overridden to use ETableColumnModel as TableColumnModel.
+ * Overriden to use ETableColumnModel as TableColumnModel.
* @see javax.swing.JTable#createDefaultColumnModel()
*/
@Override
@@ -764,7 +768,7 @@ public class ETable extends JTable {
}
/**
- * Overridden to call convertRowIndexToModel(...).
+ * Overriden to call convertRowIndexToModel(...).
* @see javax.swing.JTable#getValueAt(int, int)
*/
@Override
@@ -774,7 +778,7 @@ public class ETable extends JTable {
}
/**
- * Overridden to call convertRowIndexToModel(...).
+ * Overriden to call convertRowIndexToModel(...).
* @see javax.swing.JTable#setValueAt(Object, int, int)
*/
@Override
@@ -798,10 +802,10 @@ public class ETable extends JTable {
}
/**
- * Makes the table display only the rows that match the given "quick-filter".
+ * Makes the table disply only the rows that match the given "quick-filter".
* Filtering is done according to values from column with index column and
* according to filterObject. There are 2 possibilities for the filterObject
- * parameter
+ * paramterer
* <OL> <LI> filterObject implements <strong>QuickFilter</strong>
* interface: the method <code>accept(Object)</code>
* of the QuickFilter is called to determine whether the
@@ -854,8 +858,8 @@ public class ETable extends JTable {
}
/**
- * Overridden to update the header listeners and also to adjust the
- * preferred width of the columns.
+ * Overriden to update the header listeners and also to adjust the
+ * preferred width of the collumns.
* @see javax.swing.JTable#setModel(TableModel)
*/
@Override
@@ -875,7 +879,7 @@ public class ETable extends JTable {
}
/**
- * Overridden to make a speed optimization.
+ * Overriden to make a speed optimization.
*/
@Override
public String getToolTipText(MouseEvent event) {
@@ -968,7 +972,7 @@ public class ETable extends JTable {
}
/**
- * Overridden to implement CTRL-+ for resizing of all columns,
+ * Overriden to implement CTRL-+ for resizing of all columns,
* CTRL-- for clearing the quick filter and CTRL-* for invoking the
* column selection dialog.
* @see javax.swing.JTable#processKeyBinding(KeyStroke, KeyEvent, int, boolean)
@@ -1389,9 +1393,8 @@ public class ETable extends JTable {
filteredRowCount = -1;
//System.err.println("selected rows in model = "+Arrays.toString(selectedRowsWhenTableChanged.rowsInModel));
}
- TableModelEvent se = e;
- /* Not necessary to transform, as we're still in the UI coordinates.
int[] invSortPermutation = sortingPermutationsWhenTableChanged[1];
+ TableModelEvent se = e;
if (invSortPermutation != null) {
int fr = e.getFirstRow();
if (fr >= 0 && fr < invSortPermutation.length) {
@@ -1402,7 +1405,7 @@ public class ETable extends JTable {
lr = invSortPermutation[lr];
}
se = new TableModelEvent((TableModel) e.getSource(), fr, lr, e.getColumn(), e.getType());
- }*/
+ }
super.tableChanged(se);
int first = e.getFirstRow();
int last = e.getLastRow();
@@ -2649,7 +2652,7 @@ public class ETable extends JTable {
boolean clear = ((me.getModifiers() & InputEvent.SHIFT_MASK) != InputEvent.SHIFT_MASK);
etcm.toggleSortedColumn(etc, clear);
resetPermutation ();
- ETable.super.tableChanged(new TableModelEvent(getModel(), 0, getRowCount() - 1));
+ ETable.super.tableChanged(new TableModelEvent(getModel(), 0, getRowCount()));
if (selectedRows != null) {
changeSelectionInModel(selectedRows, wasSelectedColumn);
}
diff --git a/o.n.swing.outline/src/org/netbeans/swing/outline/Outline.java b/o.n.swing.outline/src/org/netbeans/swing/outline/Outline.java
index f80eac4..8565d03 100644
--- a/o.n.swing.outline/src/org/netbeans/swing/outline/Outline.java
+++ b/o.n.swing.outline/src/org/netbeans/swing/outline/Outline.java
@@ -206,7 +206,11 @@ import org.netbeans.swing.etable.ETableColumnModel;
* }
* </pre>
*
- *
+ *
+ * <p><b>Note:</b> This API is still under development and may change even in
+ * incompatible way during its stabilization phase. The API will be finalized in
+ * NetBeans version 6.5.</p>
+ *
* @author Tim Boudreau
*/
public class Outline extends ETable {
diff --git a/o.n.swing.plaf/manifest.mf b/o.n.swing.plaf/manifest.mf
index fe46aee..69b03fe 100644
--- a/o.n.swing.plaf/manifest.mf
+++ b/o.n.swing.plaf/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module-Localizing-Bundle: org/netbeans/swing/plaf/Bundle.properties
OpenIDE-Module: org.netbeans.swing.plaf
-OpenIDE-Module-Specification-Version: 1.41.1
+OpenIDE-Module-Specification-Version: 1.40.1
AutoUpdate-Show-In-Client: false
diff --git a/o.n.swing.plaf/nbproject/project.properties b/o.n.swing.plaf/nbproject/project.properties
index fac048f..5dc7fde 100644
--- a/o.n.swing.plaf/nbproject/project.properties
+++ b/o.n.swing.plaf/nbproject/project.properties
@@ -41,6 +41,6 @@
# made subject to such option by the copyright holder.
javac.compilerargs=-Xlint:unchecked
-javac.source=1.7
+javac.source=1.6
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java b/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java
index 7c2e3df..8c24f74 100644
--- a/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java
+++ b/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java
@@ -115,52 +115,25 @@ public final class Startup {
* references to LF customizers for supported LFs.
*/
private void initialize() {
- LFInstanceOrName lfon = getLookAndFeel();
+ LookAndFeel lf = getLookAndFeel();
boolean forceLaf = false;
- if (lfon.lf instanceof MetalLookAndFeel) {
+ if (lf instanceof MetalLookAndFeel) {
//Metal theme must be assigned before using the look and feel
- forceLaf = installTheme(lfon.lf);
+ forceLaf = installTheme(lf);
}
// overall defaults for all LFs
// defaults for supported LFs
try {
- if (forceLaf ||
- (lfon.lf != null && lfon.lf != UIManager.getLookAndFeel()) ||
- (lfon.lfClassName != null && !lfon.lfClassName.equals(UIManager.getLookAndFeel().getClass().getName()))) {
- if (lfon.lf != null) {
- UIManager.setLookAndFeel(lfon.lf);
- uiClass = lfon.lf.getClass();
- } else {
- boolean success = false;
- try {
- UIManager.setLookAndFeel(lfon.lfClassName);
- success = true;
- uiClass = UIManager.getLookAndFeel().getClass();
- } catch (ClassNotFoundException ex) {
- System.err.println("Custom UI class " + lfon.lfClassName + " not found."); // NOI18N
- } catch (IllegalAccessException ex) {
- System.err.println("Custom UI class " + lfon.lfClassName + " not possible to access."); // NOI18N
- } catch (InstantiationException ex) {
- System.err.println("Custom UI class " + lfon.lfClassName + " not possible to instantiate."); // NOI18N
- } catch (UnsupportedLookAndFeelException ex) {
- System.err.println("Custom UI class " + lfon.lfClassName + " not supported as a look & feel."); // NOI18N
- }
- if (!success) {
- //#144402 - try fallback to Metal L&F
- LookAndFeel mlf = new MetalLookAndFeel();
- installTheme(mlf);
- UIManager.setLookAndFeel(mlf);
- uiClass = MetalLookAndFeel.class;
- }
- }
+ if (lf != UIManager.getLookAndFeel() || forceLaf) {
+ UIManager.setLookAndFeel (lf);
}
} catch (Exception e) {
- System.err.println ("Could not install look and feel " + lfon.getClassName());
+ System.err.println ("Could not install look and feel " + lf);
}
}
- private LFInstanceOrName getLookAndFeel() {
+ private LookAndFeel getLookAndFeel() {
// related to #118534 - log info about Nimbus L&F
if (uiClass != null && uiClass.getName().contains(NIMBUS)) {
Logger.getLogger(getClass().getName()).warning(
@@ -174,22 +147,39 @@ public final class Startup {
if ("default".equals(uiClassName)) { // NOI18N
uiClassName = defaultLaF();
}
- if (uiClassName.equals(MetalLookAndFeel.class.getName())) {
- return new LFInstanceOrName(new MetalLookAndFeel());
- } else {
- return new LFInstanceOrName(uiClassName);
- }
- } else {
- LookAndFeel lf = UIManager.getLookAndFeel();
- if (uiClass != lf.getClass()) {
+ try {
+ uiClass = UIUtils.classForName(uiClassName);
+ } catch (ClassNotFoundException e) {
+ System.err.println("Custom UI class " + uiClassName + " not on classpath."); // NOI18N
+
+ //#144402 - try fallback to Metal L&F
try {
- lf = (LookAndFeel) uiClass.newInstance();
- } catch (IllegalAccessException | InstantiationException ex) {
- return new LFInstanceOrName(uiClass.getName());
+ uiClass = UIUtils.classForName("javax.swing.plaf.metal.MetalLookAndFeel"); //NOI18N
+ } catch( Exception newEx) {
+ newEx.printStackTrace();
}
+ } catch (Exception e) {
+ System.err.println("While loading: " + uiClassName); // NOI18N
+ e.printStackTrace();
}
- return new LFInstanceOrName(lf);
}
+ LookAndFeel result = null;
+ if (uiClass != null) {
+ try {
+
+ LookAndFeel lf = UIManager.getLookAndFeel();
+ if (uiClass != lf.getClass()) {
+ result = (LookAndFeel) uiClass.newInstance();
+ } else {
+ result = UIManager.getLookAndFeel();
+ }
+ } catch (Exception e) {
+ System.err.println("Cannot load custom UI class " + uiClass); //NOI18N
+ e.printStackTrace();
+ result = UIManager.getLookAndFeel();
+ }
+ }
+ return result;
}
/** Default NetBeans logic for finding out the right L&F.
@@ -624,28 +614,4 @@ public final class Startup {
}
}
}
-
- private static final class LFInstanceOrName {
- final LookAndFeel lf;
- final String lfClassName;
-
- public LFInstanceOrName(LookAndFeel lf) {
- this.lf = lf;
- this.lfClassName = null;
- }
-
- public LFInstanceOrName(String lfClassName) {
- this.lf = null;
- this.lfClassName = lfClassName;
- }
-
- public String getClassName() {
- if (lf != null) {
- return lf.getClass().getName();
- } else {
- return lfClassName;
- }
- }
- }
-
}
diff --git a/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/StatusLineBorder.java b/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/StatusLineBorder.java
index 3681db8..ecb7c11 100644
--- a/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/StatusLineBorder.java
+++ b/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/StatusLineBorder.java
@@ -40,6 +40,10 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
+ /*
+ * StatusLineBorder.java
+ *
+ * Created on March 14, 2004, 4:36 AM
*/
package org.netbeans.swing.plaf.metal;
diff --git a/o.n.swing.plaf/src/org/netbeans/swing/plaf/nimbus/StatusLineBorder.java b/o.n.swing.plaf/src/org/netbeans/swing/plaf/nimbus/StatusLineBorder.java
index 69fb02a..2b9c382 100644
--- a/o.n.swing.plaf/src/org/netbeans/swing/plaf/nimbus/StatusLineBorder.java
+++ b/o.n.swing.plaf/src/org/netbeans/swing/plaf/nimbus/StatusLineBorder.java
@@ -40,6 +40,10 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
+ /*
+ * StatusLineBorder.java
+ *
+ * Created on March 14, 2004, 4:36 AM
*/
package org.netbeans.swing.plaf.nimbus;
diff --git a/o.n.swing.plaf/src/org/netbeans/swing/plaf/package.html b/o.n.swing.plaf/src/org/netbeans/swing/plaf/package.html
index 41344d2..bd49b1c 100644
--- a/o.n.swing.plaf/src/org/netbeans/swing/plaf/package.html
+++ b/o.n.swing.plaf/src/org/netbeans/swing/plaf/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html><head><title>The NetBeans look and feel customization library</title></head><body>
@@ -49,7 +51,7 @@ be customized to match the UI specification for different platforms/look and fee
<p>
This library centralizes the installation and setup of such custom values. It also:
<ul>
-<li>Handles the setup of custom font sizes for look and feels (other than GTK, which
+<li>Handles the setup of custom font sizes for look and feels (other than GTK, which
gets its font sizes from the operating system theme), by replacing the font entries in UIDefaults with those
of the requested font size</li>
<li>Allows UIDefaults values to be guaranteed to be present for look and feels (GTK) which do not
diff --git a/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/StatusLineBorder.java b/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/StatusLineBorder.java
index 0d59f37..33b79b6 100644
--- a/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/StatusLineBorder.java
+++ b/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/StatusLineBorder.java
@@ -40,6 +40,10 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
+ /*
+ * StatusLineBorder.java
+ *
+ * Created on March 14, 2004, 4:36 AM
*/
package org.netbeans.swing.plaf.winclassic;
diff --git a/o.n.swing.plaf/src/org/netbeans/swing/plaf/windows8/StatusLineBorder.java b/o.n.swing.plaf/src/org/netbeans/swing/plaf/windows8/StatusLineBorder.java
index daa8b67..f991784 100644
--- a/o.n.swing.plaf/src/org/netbeans/swing/plaf/windows8/StatusLineBorder.java
+++ b/o.n.swing.plaf/src/org/netbeans/swing/plaf/windows8/StatusLineBorder.java
@@ -40,6 +40,10 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
+ /*
+ * StatusLineBorder.java
+ *
+ * Created on March 14, 2004, 4:36 AM
*/
package org.netbeans.swing.plaf.windows8;
diff --git a/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/StatusLineBorder.java b/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/StatusLineBorder.java
index 16c6d18..57e2ef4 100644
--- a/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/StatusLineBorder.java
+++ b/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/StatusLineBorder.java
@@ -40,6 +40,10 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
+ /*
+ * StatusLineBorder.java
+ *
+ * Created on March 14, 2004, 4:36 AM
*/
package org.netbeans.swing.plaf.winvista;
diff --git a/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/StatusLineBorder.java b/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/StatusLineBorder.java
index 11cf3d7..8ba1bf8 100644
--- a/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/StatusLineBorder.java
+++ b/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/StatusLineBorder.java
@@ -40,6 +40,10 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
+ /*
+ * StatusLineBorder.java
+ *
+ * Created on March 14, 2004, 4:36 AM
*/
package org.netbeans.swing.plaf.winxp;
diff --git a/o.n.swing.tabcontrol/manifest.mf b/o.n.swing.tabcontrol/manifest.mf
index 70d0126..a94362b 100644
--- a/o.n.swing.tabcontrol/manifest.mf
+++ b/o.n.swing.tabcontrol/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module-Localizing-Bundle: org/netbeans/swing/tabcontrol/Bundle.properties
OpenIDE-Module: org.netbeans.swing.tabcontrol
-OpenIDE-Module-Specification-Version: 1.56.1
+OpenIDE-Module-Specification-Version: 1.54.1
AutoUpdate-Essential-Module: true
diff --git a/o.n.swing.tabcontrol/nbproject/org-netbeans-swing-tabcontrol.sig b/o.n.swing.tabcontrol/nbproject/org-netbeans-swing-tabcontrol.sig
index 409d3ed..3276fda 100644
--- a/o.n.swing.tabcontrol/nbproject/org-netbeans-swing-tabcontrol.sig
+++ b/o.n.swing.tabcontrol/nbproject/org-netbeans-swing-tabcontrol.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.54.1
+#Version 1.51
CLSS public abstract java.awt.AWTEvent
cons public init(java.awt.Event)
@@ -776,7 +776,7 @@ meth public void setAccessibleDescription(java.lang.String)
meth public void setAccessibleName(java.lang.String)
meth public void setAccessibleParent(javax.accessibility.Accessible)
supr java.lang.Object
-hfds accessibleChangeSupport,nativeAXResource,relationSet,targetAppContext
+hfds accessibleChangeSupport,nativeAXResource,relationSet
CLSS public abstract interface javax.accessibility.AccessibleExtendedComponent
intf javax.accessibility.AccessibleComponent
@@ -1089,8 +1089,6 @@ meth public void firePropertyChange(java.lang.String,boolean,boolean)
meth public void firePropertyChange(java.lang.String,char,char)
meth public void firePropertyChange(java.lang.String,int,int)
meth public void grabFocus()
-meth public void hide()
- anno 0 java.lang.Deprecated()
meth public void paint(java.awt.Graphics)
meth public void paintImmediately(int,int,int,int)
meth public void paintImmediately(java.awt.Rectangle)
@@ -1144,6 +1142,7 @@ hcls ActionStandin,IntVector,KeyboardState,ReadObjectCallback
CLSS public abstract javax.swing.JComponent$AccessibleJComponent
outer javax.swing.JComponent
cons protected init(javax.swing.JComponent)
+fld protected java.awt.event.ContainerListener accessibleContainerHandler
fld protected java.awt.event.FocusListener accessibleFocusHandler
innr protected AccessibleContainerHandler
innr protected AccessibleFocusHandler
diff --git a/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/package.html b/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/package.html
index 6e08245..a3001d2 100644
--- a/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/package.html
+++ b/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html><body>
<h2>TabDisplayer and TabbedControl</h2>
diff --git a/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BasicScrollingTabDisplayerUI.java b/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BasicScrollingTabDisplayerUI.java
index 0ac2926..beefe32 100644
--- a/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BasicScrollingTabDisplayerUI.java
+++ b/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BasicScrollingTabDisplayerUI.java
@@ -435,9 +435,6 @@ public abstract class BasicScrollingTabDisplayerUI extends BasicTabDisplayerUI {
public Dimension getMinimumSize(JComponent c) {
int index = displayer.getSelectionModel().getSelectedIndex();
TabDataModel model = displayer.getModel();
- if (model.size() == 0) {
- return new Dimension(0, 0);
- }
if( index < 0 || index >= model.size() )
index = 0;
Component comp = model.getTab(index).getComponent();
diff --git a/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BasicSlidingTabDisplayerUI.java b/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BasicSlidingTabDisplayerUI.java
index c05bf46..f857527 100644
--- a/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BasicSlidingTabDisplayerUI.java
+++ b/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/BasicSlidingTabDisplayerUI.java
@@ -40,6 +40,10 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
+/*
+ * BasicSlidingTabDisplayerUI.java
+ *
+ * Created on March 27, 2004, 7:14 AM
*/
package org.netbeans.swing.tabcontrol.plaf;
diff --git a/openide.actions/manifest.mf b/openide.actions/manifest.mf
index 520c06b..18989c4 100644
--- a/openide.actions/manifest.mf
+++ b/openide.actions/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
OpenIDE-Module: org.openide.actions
OpenIDE-Module-Localizing-Bundle: org/openide/actions/Bundle.properties
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 6.39.1
+OpenIDE-Module-Specification-Version: 6.38.1
diff --git a/openide.actions/nbproject/org-openide-actions.sig b/openide.actions/nbproject/org-openide-actions.sig
index 0e21ae7..fa89f48 100644
--- a/openide.actions/nbproject/org-openide-actions.sig
+++ b/openide.actions/nbproject/org-openide-actions.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 6.38.1
+#Version 6.35
CLSS public abstract interface java.awt.event.ActionListener
intf java.util.EventListener
diff --git a/openide.actions/src/org/openide/actions/UndoRedoAction.java b/openide.actions/src/org/openide/actions/UndoRedoAction.java
index b93e315..52f50e7 100644
--- a/openide.actions/src/org/openide/actions/UndoRedoAction.java
+++ b/openide.actions/src/org/openide/actions/UndoRedoAction.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/openide.actions/src/org/openide/actions/doc-files/api.html b/openide.actions/src/org/openide/actions/doc-files/api.html
index ab06d4f..7cee092 100644
--- a/openide.actions/src/org/openide/actions/doc-files/api.html
+++ b/openide.actions/src/org/openide/actions/doc-files/api.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
@@ -55,7 +57,7 @@ Common, global actions such as Cut or Copy are to be found in the
<a href="../package-summary.html"><code>org.openide.actions</code></a>
package. The base classes used to create new actions reside in
<a href="@org-openide-util-ui@/org/openide/util/actions/package-summary.html"><code>org.openide.util.actions</code></a>
-(you need these only if you want to affect a global action's behavior or
+(you need these only if you want to affect a global action's behavior or
provide a context-sensitive action which is disabled or enabled depending on
what is selected).
@@ -153,7 +155,7 @@ The typical usage pattern for these is along the lines of:
<pre>
ActionMap actionMap = topComponent.getActionMap();
CallbackSystemAction a = SystemAction.get(SomeAction.class);
-actionMap.put(<a href="@org-openide-util-ui@/org/openide/util/actions/CallbackSystemAction.html#getActionMapKey--">a.getActionMapKey()</a>, new MyAction());
+actionMap.put(<a href="@org-openide-util-ui@/org/openide/util/actions/CallbackSystemAction.html#getActionMapKey()">a.getActionMapKey()</a>, new MyAction());
</pre>
or directly
<pre>
@@ -169,7 +171,7 @@ recent versions of NetBeans, this is abstracted into an instance of
<a href="@org-openide-util-lookup@/org/openide/util/Lookup.html"><code>Lookup</code></a> (which may be the result of
the selected <code>Node</code>'s <code>getLookup()</code> method, or a merge of several
selected <code>Node</code>s' <code>Lookup</code>s). This <code>Lookup</code> instance is found via
-<a href="@org-openide-util-ui@/org/openide/util/Utilities.html#actionsGlobalContext--"><code>Utilities.actionsGlobalContext</code></a>.
+<a href="@org-openide-util-ui@/org/openide/util/Utilities.html#actionsGlobalContext()"><code>Utilities.actionsGlobalContext</code></a>.
So typically, an action will be enabled or disabled depending on the presence
or absence of a given object in the global action context - which is typically
the <code>Lookup</code> of the <i>selected <code>Node</code>(s)</i> for whichever <i><code>TopComponent</code></i> has
@@ -230,16 +232,16 @@ may be subclassed. First decide what, if any, state the action
needs; if it does need some, this should be stored in the class
itself, rather than in the instance, as it should be a
singleton. Conventionally,
-<a href="@org-openide-util-ui@/org/openide/util/actions/SystemAction.html#getValue-java.lang.String-"><code>SystemAction.getValue(...)</code></a>
+<a href="@org-openide-util-ui@/org/openide/util/actions/SystemAction.html#getValue(java.lang.String)"><code>SystemAction.getValue(...)</code></a>
and
<a
-href="@org-openide-util-ui@/org/openide/util/actions/SystemAction.html#putValue-java.lang.String-java.lang.Object-"><code>SystemAction.putValue(...)</code></a>
+href="@org-openide-util-ui@/org/openide/util/actions/SystemAction.html#putValue(java.lang.String,%20java.lang.Object)"><code>SystemAction.putValue(...)</code></a>
are used for storage.
-<p><a href="@org-openide-util-ui@/org/openide/util/actions/SystemAction.html#getName--"><code>SystemAction.getName()</code></a>,
-<a href="@org-openide-util-ui@/org/openide/util/actions/SystemAction.html#getHelpCtx--"><code>SystemAction.getHelpCtx()</code></a>,
+<p><a href="@org-openide-util-ui@/org/openide/util/actions/SystemAction.html#getName()"><code>SystemAction.getName()</code></a>,
+<a href="@org-openide-util-ui@/org/openide/util/actions/SystemAction.html#getHelpCtx()"><code>SystemAction.getHelpCtx()</code></a>,
and
-<a href="@org-openide-util-ui@/org/openide/util/actions/SystemAction.html#iconResource--"><code>SystemAction.iconResource()</code></a>
+<a href="@org-openide-util-ui@/org/openide/util/actions/SystemAction.html#iconResource()"><code>SystemAction.iconResource()</code></a>
should all be overridden to provide basic information about how to
display the action in its presenters.
@@ -248,7 +250,7 @@ to indicate a desired mnemonic position. E.g.
<samp>My Act&ion</samp> should use the <samp>i</samp> as a
mnemonic. The default menu and popup presenters honor these mnemonics.
-<p><a href="@org-openide-util-ui@/org/openide/util/actions/CallbackSystemAction.html#setSurviveFocusChange-boolean-"><code>CallbackSystemAction.setSurviveFocusChange(...)</code></a>
+<p><a href="@org-openide-util-ui@/org/openide/util/actions/CallbackSystemAction.html#setSurviveFocusChange(boolean)"><code>CallbackSystemAction.setSurviveFocusChange(...)</code></a>
might be called in the <code>initialize</code> method if it needs to
be changed.
@@ -365,7 +367,7 @@ An action that does not have global scope and sensitivity should
usually be explicitly attached to components that can use it. For
example,
-<a href="@org-openide-loaders@/org/openide/loaders/DataLoader.html#actionsContext--"><code>DataLoader.actionsContext()</code></a>
+<a href="@org-openide-loaders@/org/openide/loaders/DataLoader.html#actionsContext()"><code>DataLoader.actionsContext()</code></a>
may be used to provide context-menu actions appropriate to all <code>DataObject</code>s
created by that loader, e.g.:
@@ -415,13 +417,13 @@ provide a usable
<li><p>Nodes may attach actions by overriding
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getActions-boolean-"><code>Node.getActions(...)</code></a>
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getActions(boolean)"><code>Node.getActions(...)</code></a>
or
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getPreferredAction--"><code>Node.getPreferredAction()</code></a>.
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getPreferredAction()"><code>Node.getPreferredAction()</code></a>.
<li><p><code>TopComponent</code>s (dockable, window-like tabs) may attach actions
by overriding
-<a href="@org-openide-windows@/org/openide/windows/TopComponent.html#getActions--"><code>TopComponent.getActions()</code></a>.
+<a href="@org-openide-windows@/org/openide/windows/TopComponent.html#getActions()"><code>TopComponent.getActions()</code></a>.
For example, Editor windows provide a few right-click actions in the
Editor tab, such as Save and Close.
@@ -541,7 +543,7 @@ the action in question, and place it in the <samp>Shortcuts/</samp>
folder. The file name will give the keyboard sequence, named
according to the method
-<a href="@org-openide-util-ui@/org/openide/util/Utilities.html#keyToString-javax.swing.KeyStroke-"><code>Utilities.keyToString(KeyStroke)</code></a>.
+<a href="@org-openide-util-ui@/org/openide/util/Utilities.html#keyToString(javax.swing.KeyStroke)"><code>Utilities.keyToString(KeyStroke)</code></a>.
Such instances will be used to create the
global keymap used as a fallback for all components.
diff --git a/openide.actions/src/org/openide/actions/doc-files/toolbarsAdvanced.html b/openide.actions/src/org/openide/actions/doc-files/toolbarsAdvanced.html
index 83dc6d7..0ef42d5 100644
--- a/openide.actions/src/org/openide/actions/doc-files/toolbarsAdvanced.html
+++ b/openide.actions/src/org/openide/actions/doc-files/toolbarsAdvanced.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<head>
@@ -62,7 +64,7 @@ given as the toolbar presenter of an action.
</ol>
<p>A toolbar as created when a folder is encountered is actually an instance
-of
+of
<a href="@org-openide-loaders@/org/openide/awt/Toolbar.html"><code>Toolbar</code></a>,
which is a subclass of
<a href="@JDK@/javax/swing/JToolBar.html"><code>JToolBar</code></a>
@@ -77,7 +79,7 @@ rather than a subfolder.
folder-scanning mechanism or whether custom written, are available
using
-<a href="@org-openide-loaders@/org/openide/awt/ToolbarPool.html#getToolbars--"><code>ToolbarPool.getToolbars()</code></a>.
+<a href="@org-openide-loaders@/org/openide/awt/ToolbarPool.html#getToolbars()"><code>ToolbarPool.getToolbars()</code></a>.
However, at any given time not all of these are visible. All of this
information is controlled by a
@@ -86,7 +88,7 @@ information is controlled by a
object. All available configurations are listed in
-<a href="@org-openide-loaders@/org/openide/awt/ToolbarPool.html#getConfigurations--"><code>ToolbarPool.getConfigurations()</code></a>,
+<a href="@org-openide-loaders@/org/openide/awt/ToolbarPool.html#getConfigurations()"><code>ToolbarPool.getConfigurations()</code></a>,
and <code>ToolbarPool</code> also permits the current configuration
to be retrieved and set. Please note that even though there are two
diff --git a/openide.actions/src/org/openide/actions/package.html b/openide.actions/src/org/openide/actions/package.html
index 673e2b9..cc75f44 100644
--- a/openide.actions/src/org/openide/actions/package.html
+++ b/openide.actions/src/org/openide/actions/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/openide.actions/test/unit/src/org/openide/actions/UndoRedoActionTest.java b/openide.actions/test/unit/src/org/openide/actions/UndoRedoActionTest.java
index 3db777d..43ab5d4 100644
--- a/openide.actions/test/unit/src/org/openide/actions/UndoRedoActionTest.java
+++ b/openide.actions/test/unit/src/org/openide/actions/UndoRedoActionTest.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/openide.awt/apichanges.xml b/openide.awt/apichanges.xml
index a11ea31..e285697 100644
--- a/openide.awt/apichanges.xml
+++ b/openide.awt/apichanges.xml
@@ -262,7 +262,7 @@ made subject to such option by the copyright holder.
<p>
New attributes (popupText, menuText) in @ActionRegistration annotation to provide
text for menu items or popup menu items according to the
- <a href="@TOP@/org/openide/awt/Actions.html#connect-javax.swing.JMenuItem-javax.swing.Action-boolean-">Actions.connect</a>
+ <a href="@TOP@/org/openide/awt/Actions.html#connect(javax.swing.JMenuItem,%20javax.swing.Action,%20boolean)">Actions.connect</a>
method.
</p>
</description>
@@ -313,7 +313,7 @@ made subject to such option by the copyright holder.
<compatibility addition="yes" binary="compatible" deletion="no" semantic="compatible"/>
<description>
<p>
- <a href="@org-openide-awt@/org/openide/awt/Actions.html#context-java.lang.Class-boolean-boolean-org.openide.util.ContextAwareAction-java.lang.String-java.lang.String-java.lang.String-boolean-">
+ <a href="@org-openide-awt@/org/openide/awt/Actions.html#context(java.lang.Class,%20boolean,%20boolean,%20org.openide.util.ContextAwareAction,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20boolean)">
Action.context</a>, when used from layer accepts <code>"context"</code>
attribute.
</p>
@@ -346,7 +346,7 @@ made subject to such option by the copyright holder.
<compatibility addition="yes" binary="compatible" deletion="no" semantic="compatible"/>
<description>
<p>Instead of registering actions in layer as advocated by various
- <a href="@TOP@/org/openide/awt/Actions.html#alwaysEnabled-java.awt.event.ActionListener-java.lang.String-java.lang.String-boolean-">
+ <a href="@TOP@/org/openide/awt/Actions.html#alwaysEnabled(java.awt.event.ActionListener,%20java.lang.String,%20java.lang.String,%20boolean)">
action factory methods</a> one can use newly created
<a href="@TOP@/org/openide/awt/ActionRegistration.html">annotations</a>.
</p>
@@ -416,7 +416,7 @@ made subject to such option by the copyright holder.
<author login="mmetelka"/>
<compatibility addition="yes" binary="compatible" semantic="compatible" deprecation="no" deletion="no" modification="no"/>
<description>
- <a href="@TOP@/org/openide/awt/Actions.html#checkbox-java.lang.String-java.lang.String-java.lang.String-java.lang.String-boolean-">
+ <a href="@TOP@/org/openide/awt/Actions.html#checkbox(java.lang.String,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20boolean)">
checkbox</a>
added to create an action that represents a key in Preferences.
</description>
@@ -431,7 +431,7 @@ made subject to such option by the copyright holder.
<author login="mmetelka"/>
<compatibility addition="yes" binary="compatible" semantic="compatible" deprecation="no" deletion="no" modification="no"/>
<description>
- <a href="@TOP@/org/openide/awt/Actions.html#alwaysEnabled-java.awt.event.ActionListener-java.lang.String-java.lang.String-boolean-">
+ <a href="@TOP@/org/openide/awt/Actions.html#alwaysEnabled(java.awt.event.ActionListener,%20java.lang.String,%20java.lang.String,%20boolean)">
alwaysEnabledAction</a>
was enhanced to understand
<code><attr name="PreferencesKey" stringvalue="boolean-key-name"/></code>
@@ -496,13 +496,13 @@ made subject to such option by the copyright holder.
<compatibility addition="yes" binary="compatible" semantic="compatible" deprecation="no" deletion="no" modification="no"/>
<description>
The layer definition used by factory methods for
- <a href="@TOP@/org/openide/awt/Actions.html#context-java.lang.Class-boolean-boolean-org.openide.util.ContextAwareAction-java.lang.String-java.lang.String-java.lang.String-boolean-">
+ <a href="@TOP@/org/openide/awt/Actions.html#context(java.lang.Class,%20boolean,%20boolean,%20org.openide.util.ContextAwareAction,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20boolean)">
context</a>
and
- <a href="@TOP@/org/openide/awt/Actions.html#callback-java.lang.String-javax.swing.Action-boolean-java.lang.String-java.lang.String-boolean-">
+ <a href="@TOP@/org/openide/awt/Actions.html#callback(java.lang.String,%20javax.swing.Action,%20boolean,%20java.lang.String,%20java.lang.String,%20boolean)">
callback</a>
and
- <a href="@TOP@/org/openide/awt/Actions.html#alwaysEnabled-java.awt.event.ActionListener-java.lang.String-java.lang.String-boolean-">
+ <a href="@TOP@/org/openide/awt/Actions.html#alwaysEnabled(java.awt.event.ActionListener,%20java.lang.String,%20java.lang.String,%20boolean)">
alwaysEnabledAction</a>
were enhanced to understand <code><attr name="asynchronous" boolvalue="true"/></code>
attribute. This extends these new factories with capabilities
@@ -539,10 +539,10 @@ made subject to such option by the copyright holder.
<description>
<p>
Two new factory methods for creating
- <a href="@TOP@/org/openide/awt/Actions.html#context-java.lang.Class-boolean-boolean-org.openide.util.ContextAwareAction-java.lang.String-java.lang.String-java.lang.String-boolean-">
+ <a href="@TOP@/org/openide/awt/Actions.html#context(java.lang.Class,%20boolean,%20boolean,%20org.openide.util.ContextAwareAction,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20boolean)">
context</a>
and
- <a href="@TOP@/org/openide/awt/Actions.html#callback-java.lang.String-javax.swing.Action-boolean-java.lang.String-java.lang.String-boolean-">
+ <a href="@TOP@/org/openide/awt/Actions.html#callback(java.lang.String,%20javax.swing.Action,%20boolean,%20java.lang.String,%20java.lang.String,%20boolean)">
callback</a>
actions and bunch of
<a href="@TOP@/org/netbeans/api/actions/package-summary.html">
@@ -655,7 +655,7 @@ made subject to such option by the copyright holder.
<author login="jtulach"/>
<compatibility addition="yes" binary="compatible" source="compatible" semantic="compatible" deprecation="yes" deletion="no" modification="no"/>
<description>
- In order to allow dynamic names of actions, the <a href="@TOP@/org/openide/awt/Actions.html#connect-javax.swing.JMenuItem-javax.swing.Action-boolean-">Actions.connect</a>
+ In order to allow dynamic names of actions, the <a href="@TOP@/org/openide/awt/Actions.html#connect(javax.swing.JMenuItem,%20javax.swing.Action,%20boolean)">Actions.connect</a>
method now understands additional properties that influence the text
of menu items or popup menu items build for this action.
</description>
diff --git a/openide.awt/arch.xml b/openide.awt/arch.xml
index 7ce85a7..d734848 100644
--- a/openide.awt/arch.xml
+++ b/openide.awt/arch.xml
@@ -471,10 +471,10 @@ made subject to such option by the copyright holder.
<answer id="exec-component">
<ul>
<li>
- <api name="menuText" category="stable" type="export" group="property" url="@TOP@/org/openide/awt/Actions.html#connect-javax.swing.JMenuItem-javax.swing.Action-boolean-"/>
+ <api name="menuText" category="stable" type="export" group="property" url="@TOP@/org/openide/awt/Actions.html#connect(javax.swing.JMenuItem,%20javax.swing.Action,%20boolean)"/>
</li>
<li>
- <api name="popupText" category="stable" type="export" group="property" url="@TOP@/org/openide/awt/Actions.html#connect-javax.swing.JMenuItem-javax.swing.Action-boolean-"/>
+ <api name="popupText" category="stable" type="export" group="property" url="@TOP@/org/openide/awt/Actions.html#connect(javax.swing.JMenuItem,%20javax.swing.Action,%20boolean)"/>
</li>
<li>
<api name="USE_MNEMONICS" category="stable" type="export" group="branding">
@@ -989,11 +989,11 @@ made subject to such option by the copyright holder.
<api name="Actions.factories" type="export" group="layer" category="stable"
url="@TOP@/org/openide/awt/Actions.html">
Many action factories
- (<a href="org/openide/awt/Actions.html#alwaysEnabled-java.awt.event.ActionListener-java.lang.String-java.lang.String-boolean-">alwaysEnabled</a>,
- <a href="org/openide/awt/Actions.html#context-java.lang.Class-boolean-boolean-org.openide.util.ContextAwareAction-java.lang.String-java.lang.String-java.lang.String-boolean-">
+ (<a href="org/openide/awt/Actions.html#alwaysEnabled(java.awt.event.ActionListener,%20java.lang.String,%20java.lang.String,%20boolean)">alwaysEnabled</a>,
+ <a href="org/openide/awt/Actions.html#context(java.lang.Class,%20boolean,%20boolean,%20org.openide.util.ContextAwareAction,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20boolean)">
context</a>
and
- <a href="org/openide/awt/Actions.html#callback-java.lang.String-javax.swing.Action-boolean-java.lang.String-java.lang.String-boolean-">
+ <a href="org/openide/awt/Actions.html#callback(java.lang.String,%20javax.swing.Action,%20boolean,%20java.lang.String,%20java.lang.String,%20boolean)">
callback</a>,
etc.)
diff --git a/openide.awt/manifest.mf b/openide.awt/manifest.mf
index ef565aa..9d623b6 100644
--- a/openide.awt/manifest.mf
+++ b/openide.awt/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
OpenIDE-Module: org.openide.awt
OpenIDE-Module-Localizing-Bundle: org/openide/awt/Bundle.properties
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 7.67.1
+OpenIDE-Module-Specification-Version: 7.65.1
diff --git a/openide.awt/nbproject/org-openide-awt.sig b/openide.awt/nbproject/org-openide-awt.sig
index 4226aef..0af31e8 100644
--- a/openide.awt/nbproject/org-openide-awt.sig
+++ b/openide.awt/nbproject/org-openide-awt.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 7.65.1
+#Version 7.62
CLSS public java.awt.Canvas
cons public init()
@@ -808,7 +808,6 @@ intf java.awt.ItemSelectable
intf java.awt.event.ActionListener
intf javax.accessibility.Accessible
intf javax.swing.event.ListDataListener
-meth protected boolean processKeyBinding(javax.swing.KeyStroke,java.awt.event.KeyEvent,int,boolean)
meth protected java.beans.PropertyChangeListener createActionPropertyChangeListener(javax.swing.Action)
meth protected java.lang.String paramString()
meth protected javax.swing.JComboBox$KeySelectionManager createDefaultKeySelectionManager()
@@ -992,8 +991,6 @@ meth public void firePropertyChange(java.lang.String,boolean,boolean)
meth public void firePropertyChange(java.lang.String,char,char)
meth public void firePropertyChange(java.lang.String,int,int)
meth public void grabFocus()
-meth public void hide()
- anno 0 java.lang.Deprecated()
meth public void paint(java.awt.Graphics)
meth public void paintImmediately(int,int,int,int)
meth public void paintImmediately(java.awt.Rectangle)
@@ -1998,7 +1995,7 @@ meth public void processKeyEvent(java.awt.event.KeyEvent)
meth public void setAlwaysShown(boolean)
meth public void setEnabled(boolean)
supr java.lang.Object
-hfds CLIENT_PROPERTY_KEY,ICON_FIND,ICON_FIND_WITH_MENU,alwaysShown,animationTimer,asynchronous,callback,component,constraints,enabled,hasSearchText,popupMenu,quickSearchKeyAdapter,rp,searchFieldListener,searchPanel,searchTextField
+hfds CLIENT_PROPERTY_KEY,ICON_FIND,ICON_FIND_WITH_MENU,alwaysShown,animationTimer,asynchronous,callback,component,constraints,enabled,popupMenu,quickSearchKeyAdapter,rp,searchFieldListener,searchPanel,searchTextField
hcls AnimationTimer,LazyFire,QS_FIRE,SearchFieldListener,SearchPanel,SearchTextField
CLSS public abstract interface static org.openide.awt.QuickSearch$Callback
diff --git a/openide.awt/src/org/netbeans/api/actions/package.html b/openide.awt/src/org/netbeans/api/actions/package.html
index 0ff8cca..b2f2e41 100644
--- a/openide.awt/src/org/netbeans/api/actions/package.html
+++ b/openide.awt/src/org/netbeans/api/actions/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
@@ -49,7 +50,7 @@ Usually
one adds implementation of these interfaces into publically known
<a href="@org-openide-util-lookup@/org/openide/util/Lookup.html">Lookup</a> (like
those provided by <a href="@org-openide-nodes@/org/openide/nodes/Node.html">nodes</a>). These interfaces
-are primarily designed for use with <a href="@TOP@/org/openide/awt/Actions.html#context-java.lang.Class-boolean-boolean-org.openide.util.ContextAwareAction-java.lang.String-java.lang.String-java.lang.String-boolean-">
+are primarily designed for use with <a href="@TOP@/org/openide/awt/Actions.html#context(java.lang.Class,%20boolean,%20boolean,%20org.openide.util.ContextAwareAction,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20boolean)">
context actions</a>.
</body>
</html>
diff --git a/openide.awt/src/org/netbeans/modules/openide/awt/ActionProcessor.java b/openide.awt/src/org/netbeans/modules/openide/awt/ActionProcessor.java
index 8ddc9e7..d9c2197 100644
--- a/openide.awt/src/org/netbeans/modules/openide/awt/ActionProcessor.java
+++ b/openide.awt/src/org/netbeans/modules/openide/awt/ActionProcessor.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/openide.awt/src/org/netbeans/spi/actions/package.html b/openide.awt/src/org/netbeans/spi/actions/package.html
index 1a2a47a..6c74aa6 100644
--- a/openide.awt/src/org/netbeans/spi/actions/package.html
+++ b/openide.awt/src/org/netbeans/spi/actions/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/openide.awt/src/org/openide/awt/ActionID.java b/openide.awt/src/org/openide/awt/ActionID.java
index c3149af..5bfa501 100644
--- a/openide.awt/src/org/openide/awt/ActionID.java
+++ b/openide.awt/src/org/openide/awt/ActionID.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/openide.awt/src/org/openide/awt/ActionReference.java b/openide.awt/src/org/openide/awt/ActionReference.java
index b2a3bc0..5aa80f5 100644
--- a/openide.awt/src/org/openide/awt/ActionReference.java
+++ b/openide.awt/src/org/openide/awt/ActionReference.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/openide.awt/src/org/openide/awt/ActionReferences.java b/openide.awt/src/org/openide/awt/ActionReferences.java
index 8b082c7..5368784 100644
--- a/openide.awt/src/org/openide/awt/ActionReferences.java
+++ b/openide.awt/src/org/openide/awt/ActionReferences.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/openide.awt/src/org/openide/awt/ActionRegistration.java b/openide.awt/src/org/openide/awt/ActionRegistration.java
index b597874..0bb455c 100644
--- a/openide.awt/src/org/openide/awt/ActionRegistration.java
+++ b/openide.awt/src/org/openide/awt/ActionRegistration.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/openide.awt/src/org/openide/awt/CloseButtonFactory.java b/openide.awt/src/org/openide/awt/CloseButtonFactory.java
index 21dc8f0..88ff970 100644
--- a/openide.awt/src/org/openide/awt/CloseButtonFactory.java
+++ b/openide.awt/src/org/openide/awt/CloseButtonFactory.java
@@ -117,22 +117,12 @@ public final class CloseButtonFactory{
private static boolean isWindows8LaF() {
return isWindowsLaF() && isWindows8() && isWindowsXPLaF();
}
-
- private static boolean isWindows10LaF() {
- return isWindowsLaF() && isWindows10() && isWindowsXPLaF();
- }
private static boolean isWindowsVista() {
String osName = System.getProperty ("os.name");
return osName.indexOf("Vista") >= 0
|| (osName.equals( "Windows NT (unknown)" ) && "6.0".equals( System.getProperty("os.version") ));
}
-
- private static boolean isWindows10() {
- String osName = System.getProperty ("os.name");
- return osName.indexOf("Windows 10") >= 0
- || (osName.equals( "Windows NT (unknown)" ) && "10.0".equals( System.getProperty("os.version") ));
- }
private static boolean isWindows8() {
String osName = System.getProperty ("os.name");
@@ -173,7 +163,7 @@ public final class CloseButtonFactory{
}
}
if( null == closeTabImage ) {
- if( isWindows8LaF() || isWindows10LaF() ) {
+ if( isWindows8LaF() ) {
closeTabImage = ImageUtilities.loadImageIcon("org/openide/awt/resources/win8_bigclose_enabled.png", true); // NOI18N
} else if( isWindowsVistaLaF() ) {
closeTabImage = ImageUtilities.loadImageIcon("org/openide/awt/resources/vista_close_enabled.png", true); // NOI18N
@@ -200,7 +190,7 @@ public final class CloseButtonFactory{
}
}
if( null == closeTabPressedImage ) {
- if( isWindows8LaF() || isWindows10LaF() ) {
+ if( isWindows8LaF() ) {
closeTabPressedImage = ImageUtilities.loadImageIcon("org/openide/awt/resources/win8_bigclose_pressed.png", true); // NOI18N
} else if( isWindowsVistaLaF() ) {
closeTabPressedImage = ImageUtilities.loadImageIcon("org/openide/awt/resources/vista_close_pressed.png", true); // NOI18N
@@ -227,7 +217,7 @@ public final class CloseButtonFactory{
}
}
if( null == closeTabMouseOverImage ) {
- if( isWindows8LaF() || isWindows10LaF() ) {
+ if( isWindows8LaF() ) {
closeTabMouseOverImage = ImageUtilities.loadImageIcon("org/openide/awt/resources/win8_bigclose_rollover.png", true); // NOI18N
} else if( isWindowsVistaLaF() ) {
closeTabMouseOverImage = ImageUtilities.loadImageIcon("org/openide/awt/resources/vista_close_rollover.png", true); // NOI18N
@@ -255,7 +245,7 @@ public final class CloseButtonFactory{
}
}
if( null == bigCloseTabImage ) {
- if( isWindows8LaF() || isWindows10LaF() ) {
+ if( isWindows8LaF() ) {
bigCloseTabImage = ImageUtilities.loadImageIcon("org/openide/awt/resources/win8_bigclose_enabled.png", true); // NOI18N
} else if( isWindowsVistaLaF() ) {
bigCloseTabImage = ImageUtilities.loadImageIcon("org/openide/awt/resources/vista_bigclose_enabled.png", true); // NOI18N
@@ -282,7 +272,7 @@ public final class CloseButtonFactory{
}
}
if( null == bigCloseTabPressedImage ) {
- if( isWindows8LaF() || isWindows10LaF() ) {
+ if( isWindows8LaF() ) {
bigCloseTabPressedImage = ImageUtilities.loadImageIcon("org/openide/awt/resources/win8_bigclose_pressed.png", true); // NOI18N
} else if( isWindowsVistaLaF() ) {
bigCloseTabPressedImage = ImageUtilities.loadImageIcon("org/openide/awt/resources/vista_bigclose_pressed.png", true); // NOI18N
@@ -309,7 +299,7 @@ public final class CloseButtonFactory{
}
}
if( null == bigCloseTabMouseOverImage ) {
- if( isWindows8LaF() || isWindows10LaF() ) {
+ if( isWindows8LaF() ) {
bigCloseTabMouseOverImage = ImageUtilities.loadImageIcon("org/openide/awt/resources/win8_bigclose_rollover.png", true); // NOI18N
} else if( isWindowsVistaLaF() ) {
bigCloseTabMouseOverImage = ImageUtilities.loadImageIcon("org/openide/awt/resources/vista_bigclose_rollover.png", true); // NOI18N
diff --git a/openide.awt/src/org/openide/awt/HtmlRendererImpl.java b/openide.awt/src/org/openide/awt/HtmlRendererImpl.java
index 1d25b9e..84176e0 100644
--- a/openide.awt/src/org/openide/awt/HtmlRendererImpl.java
+++ b/openide.awt/src/org/openide/awt/HtmlRendererImpl.java
@@ -100,7 +100,6 @@ class HtmlRendererImpl extends JLabel implements HtmlRenderer.Renderer {
/** Restore the renderer to a pristine state */
public void reset() {
- assert SwingUtilities.isEventDispatchThread();
parentFocused = false;
setCentered(false);
html = null;
@@ -303,14 +302,12 @@ class HtmlRendererImpl extends JLabel implements HtmlRenderer.Renderer {
}
boolean isHtml() {
- Boolean isHtml = html;
- if (isHtml == null) {
+ if (html == null) {
String s = getText();
- isHtml = checkHtml(s);
- html = isHtml;
+ html = checkHtml(s);
}
- return isHtml.booleanValue();
+ return html.booleanValue();
}
private Boolean checkHtml(String s) {
diff --git a/openide.awt/src/org/openide/awt/Mnemonics.java b/openide.awt/src/org/openide/awt/Mnemonics.java
index 56915a1..611c24b 100644
--- a/openide.awt/src/org/openide/awt/Mnemonics.java
+++ b/openide.awt/src/org/openide/awt/Mnemonics.java
@@ -41,8 +41,6 @@
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
*
- */
-/*
* Contributors: Maxym Mykhalchuk
*/
package org.openide.awt;
diff --git a/openide.awt/src/org/openide/awt/Mnemonics.properties b/openide.awt/src/org/openide/awt/Mnemonics.properties
index 49025a4..614c0c4 100644
--- a/openide.awt/src/org/openide/awt/Mnemonics.properties
+++ b/openide.awt/src/org/openide/awt/Mnemonics.properties
@@ -39,8 +39,8 @@
# However, if you add GPL Version 2 code and therefore, elected the GPL
# Version 2 license, then the option applies only if the new code is
# made subject to such option by the copyright holder.
-
-# Contributor(s): Maxym Mykhalchuk
+#
+# Contributors: Maxym Mykhalchuk
# public static final int VK_BACK_QUOTE 192
#NOI18N
diff --git a/openide.awt/src/org/openide/awt/QuickSearch.java b/openide.awt/src/org/openide/awt/QuickSearch.java
index 11416e1..9dc0e88 100644
--- a/openide.awt/src/org/openide/awt/QuickSearch.java
+++ b/openide.awt/src/org/openide/awt/QuickSearch.java
@@ -306,8 +306,8 @@ public class QuickSearch {
rp.post(new LazyFire(QS_FIRE.UPDATE, searchText));
} else {
callback.quickSearchUpdate(searchText);
+ hasSearchText = true;
}
- hasSearchText = true;
}
private void fireShowNextSelection(boolean forward) {
@@ -611,6 +611,7 @@ public class QuickSearch {
try {
switch (fire) {
case UPDATE: callback.quickSearchUpdate(searchText);//fireQuickSearchUpdate(qsls, searchText);
+ hasSearchText = true;
break;
case NEXT: callback.showNextSelection(forward);//fireShowNextSelection(qsls, forward);
break;
diff --git a/openide.awt/src/org/openide/awt/ToolbarWithOverflow.java b/openide.awt/src/org/openide/awt/ToolbarWithOverflow.java
index d58d40f..6bc7592 100644
--- a/openide.awt/src/org/openide/awt/ToolbarWithOverflow.java
+++ b/openide.awt/src/org/openide/awt/ToolbarWithOverflow.java
@@ -58,7 +58,6 @@ import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JPopupMenu;
import javax.swing.JToolBar;
-import javax.swing.UIManager;
import org.openide.util.ImageUtilities;
import org.openide.util.Mutex;
@@ -140,7 +139,7 @@ public class ToolbarWithOverflow extends JToolBar {
popup.setBorder(BorderFactory.createEmptyBorder());
overflowToolbar = new SafeToolBar("overflowToolbar", orientation == HORIZONTAL ? VERTICAL : HORIZONTAL);
overflowToolbar.setFloatable(false);
- overflowToolbar.setBorder(BorderFactory.createLineBorder(UIManager.getColor("controlShadow"), 1));
+ overflowToolbar.setBorder(BorderFactory.createLineBorder(Color.LIGHT_GRAY, 1));
}
private ComponentListener getComponentListener() {
diff --git a/openide.awt/src/org/openide/awt/package.html b/openide.awt/src/org/openide/awt/package.html
index e434688..d8f4286 100644
--- a/openide.awt/src/org/openide/awt/package.html
+++ b/openide.awt/src/org/openide/awt/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
diff --git a/openide.awt/test/unit/src/org/netbeans/modules/openide/awt/ActionProcessorTest.java b/openide.awt/test/unit/src/org/netbeans/modules/openide/awt/ActionProcessorTest.java
index baa5cd9..681e23d 100644
--- a/openide.awt/test/unit/src/org/netbeans/modules/openide/awt/ActionProcessorTest.java
+++ b/openide.awt/test/unit/src/org/netbeans/modules/openide/awt/ActionProcessorTest.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/openide.awt/test/unit/src/org/openide/awt/UndoRedoTest.java b/openide.awt/test/unit/src/org/openide/awt/UndoRedoTest.java
index bb9a441..c05a1e1 100644
--- a/openide.awt/test/unit/src/org/openide/awt/UndoRedoTest.java
+++ b/openide.awt/test/unit/src/org/openide/awt/UndoRedoTest.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/openide.compat/manifest.mf b/openide.compat/manifest.mf
index 3d8b4ad..f233c2b 100644
--- a/openide.compat/manifest.mf
+++ b/openide.compat/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.compat
-OpenIDE-Module-Specification-Version: 6.39.1
+OpenIDE-Module-Specification-Version: 6.37.1
OpenIDE-Module-Deprecated: true
OpenIDE-Module-Localizing-Bundle: org/openide/compat/Bundle.properties
AutoUpdate-Essential-Module: true
diff --git a/openide.compat/test/unit/src/org/openide/explorer/FindHelpTest.java b/openide.compat/test/unit/src/org/openide/explorer/FindHelpTest.java
index 97ff88a..89f50e4 100644
--- a/openide.compat/test/unit/src/org/openide/explorer/FindHelpTest.java
+++ b/openide.compat/test/unit/src/org/openide/explorer/FindHelpTest.java
@@ -75,11 +75,6 @@ public class FindHelpTest extends NbTestCase {
private static Node[] nodes;
private static Node root;
- @Override
- protected boolean runInEQ() {
- return true;
- }
-
protected void setUp() throws Exception {
Children kids = new Children.Array();
nodes = new Node[] {
diff --git a/openide.dialogs/apichanges.xml b/openide.dialogs/apichanges.xml
index 349d231..fd819bd 100644
--- a/openide.dialogs/apichanges.xml
+++ b/openide.dialogs/apichanges.xml
@@ -308,7 +308,7 @@ made subject to such option by the copyright holder.
Now it is simple to display a message box described by
<a href="@TOP@/org/openide/NotifyDescriptor.html">NotifyDescriptor</a>
asynchronously using
- <a href="@TOP@/org/openide/DialogDisplayer.html#notifyLater-org.openide.NotifyDescriptor-">
+ <a href="@TOP@/org/openide/DialogDisplayer.html#notifyLater(org.openide.NotifyDescriptor)">
DialogDisplayer.notifyLater
</a>.
</description>
diff --git a/openide.dialogs/arch.xml b/openide.dialogs/arch.xml
index 3f671e5..9eba1e2 100644
--- a/openide.dialogs/arch.xml
+++ b/openide.dialogs/arch.xml
@@ -67,7 +67,7 @@ made subject to such option by the copyright holder.
-->
<answer id="arch-what">
The
-<api name="DialogsAPI" category="official" type="export" url="@org-openide-dialogs@/org/openide/package-summary.html#package.description" group="java" />
+<api name="DialogsAPI" category="official" type="export" url="@org-openide-dialogs@/org/openide/package-summary.html#package_description" group="java" />
allows creating a user notification, a dialog's description
and also permits it to be displayed. The wizard framework allows create a sequence
of panels which leads a user through the steps to complete any task.
@@ -91,7 +91,7 @@ of frequently asked questions and their answers:
</em>
<p>
<b>A:</b> You can change the format of your wizard's title by
- <a href="@TOP at org/openide/WizardDescriptor.html#setTitleFormat-java.text.MessageFormat-">WizardDescriptor.setTitleFormat(MessageFormat format)</a>
+ <a href="@TOP at org/openide/WizardDescriptor.html#setTitleFormat(java.text.MessageFormat)">WizardDescriptor.setTitleFormat(MessageFormat format)</a>
and rid of 'wizard' word in the default wizard's title.
</p>
</usecase>
diff --git a/openide.dialogs/manifest.mf b/openide.dialogs/manifest.mf
index ab30d5a..be0080d 100644
--- a/openide.dialogs/manifest.mf
+++ b/openide.dialogs/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.dialogs
-OpenIDE-Module-Specification-Version: 7.42.1
+OpenIDE-Module-Specification-Version: 7.41.1
OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
AutoUpdate-Essential-Module: true
diff --git a/openide.dialogs/nbproject/org-openide-dialogs.sig b/openide.dialogs/nbproject/org-openide-dialogs.sig
index c32379b..afdd7f8 100644
--- a/openide.dialogs/nbproject/org-openide-dialogs.sig
+++ b/openide.dialogs/nbproject/org-openide-dialogs.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 7.41.1
+#Version 7.37
CLSS public abstract interface java.io.Serializable
@@ -118,7 +118,6 @@ CLSS public abstract org.openide.DialogDisplayer
cons protected init()
meth public abstract java.awt.Dialog createDialog(org.openide.DialogDescriptor)
meth public abstract java.lang.Object notify(org.openide.NotifyDescriptor)
-meth public java.awt.Dialog createDialog(org.openide.DialogDescriptor,java.awt.Frame)
meth public static org.openide.DialogDisplayer getDefault()
meth public void notifyLater(org.openide.NotifyDescriptor)
supr java.lang.Object
diff --git a/openide.dialogs/src/org/openide/NotifyDescriptor.java b/openide.dialogs/src/org/openide/NotifyDescriptor.java
index e83b839..9da8914 100644
--- a/openide.dialogs/src/org/openide/NotifyDescriptor.java
+++ b/openide.dialogs/src/org/openide/NotifyDescriptor.java
@@ -46,7 +46,6 @@ package org.openide;
import java.awt.Component;
import java.awt.Dimension;
-import java.awt.Window;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
@@ -270,7 +269,6 @@ public class NotifyDescriptor extends Object {
public NotifyDescriptor(
Object message, String title, int optionType, int messageType, Object[] options, Object initialValue
) {
- checkMessageValidity(message);
this.message = message;
this.messageType = messageType;
this.options = options;
@@ -349,7 +347,6 @@ public class NotifyDescriptor extends Object {
* @see #getMessage
*/
public void setMessage(Object newMessage) {
- checkMessageValidity(newMessage);
Object oldMessage = message;
if (newMessage instanceof String) {
@@ -371,13 +368,6 @@ public class NotifyDescriptor extends Object {
firePropertyChange(PROP_MESSAGE, oldMessage, newMessage);
}
- private void checkMessageValidity(Object message) {
- if (message instanceof Window) {
- // See https://netbeans.org/bugzilla/show_bug.cgi?id=267337
- throw new IllegalArgumentException("The message must not be a window. message = "+message);
- }
- }
-
/**
* Get the message object.
* @see #setMessage
diff --git a/openide.dialogs/src/org/openide/doc-files/wizard-guidebook.html b/openide.dialogs/src/org/openide/doc-files/wizard-guidebook.html
index 8222772..ce061e6 100644
--- a/openide.dialogs/src/org/openide/doc-files/wizard-guidebook.html
+++ b/openide.dialogs/src/org/openide/doc-files/wizard-guidebook.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -99,7 +100,7 @@ set initialization properties.
<h2>Wizard panel initialization</h2>
Use
-<a href="../WizardDescriptor.html#putProperty-java.lang.String-java.lang.Object-">
+<a href="../WizardDescriptor.html#putProperty(java.lang.String,%20java.lang.Object)">
<code>WizardDescriptor.putProperty()</code></a> to set following initialization
properties.
<ul>
@@ -120,13 +121,13 @@ Name <b> <code>"WizardPanel_autoWizardStyle"</code></b>, type <b> <code>Boolean<
<br>
<br>
Also set to <code>Boolean.TRUE</code> to turn on subtitle creation from
-<a href="../WizardDescriptor.Panel.html#getComponent--">
+<a href="../WizardDescriptor.Panel.html#getComponent()">
<code>WizardDesriptor.Panel.getComponent()</code></a><code>.getName()</code>
as first and
-<a href="../WizardDescriptor.Iterator.html#name--">
+<a href="../WizardDescriptor.Iterator.html#name()">
<code>WizardDescriptor.Iterator.name()</code></a> as second parameter in subtitle
format set with
-<a href="../WizardDescriptor.html#setTitleFormat-java.text.MessageFormat-">
+<a href="../WizardDescriptor.html#setTitleFormat(java.text.MessageFormat)">
<code>WizardDesriptor.setTitleFormat()</code></a>.
Default subtitle format is <code>"{0} wizard ({1})"</code> and name of default
@@ -217,7 +218,7 @@ Set image displayed as background of content.
<li><tt>
Set subtitle (!!!) format with
-<a href="../WizardDescriptor.html#setTitleFormat-java.text.MessageFormat-">
+<a href="../WizardDescriptor.html#setTitleFormat(java.text.MessageFormat)">
<code>WizardDescriptor.setTitleFormat()</code></a>.
</tt></li>
@@ -226,7 +227,7 @@ Set subtitle (!!!) format with
<li><tt>
Set title of the wizard with
-<a href="../NotifyDescriptor.html#setTitle-java.lang.String-">
+<a href="../NotifyDescriptor.html#setTitle(java.lang.String)">
<code>WizardDescriptor.setTitle()</code></a>.
</tt></li>
<br><br>
@@ -276,21 +277,21 @@ Set name of panel <code>JComponent.setName("First wizard panel")</code>,
used as first part of subtitle, second
is
-<a href="../WizardDescriptor.Iterator.html#name--">
+<a href="../WizardDescriptor.Iterator.html#name()">
<code>WizardDescriptor.Panel.name()</code></a> when you use <code>"{0}{1}"</code> message format.
</tt></li>
</ul>
All properties could be set with
-both alternatives (<a href="../WizardDescriptor.html#putProperty-java.lang.String-java.lang.Object-"><code>WizardDescriptor.putProperty()</code></a> or
+both alternatives (<a href="../WizardDescriptor.html#putProperty(java.lang.String,%20java.lang.Object)"><code>WizardDescriptor.putProperty()</code></a> or
<code>JComponent.putClientProperty()</code>)
except <b><code>"WizardPanel_helpURL"</code></b> which can be set only with
<code>JComponent.putClientProperty()</code> and the property <b><code>"WizardPanel_errorMessage"</code></b> which can be set only by
-<a href="../WizardDescriptor.html#putProperty-java.lang.String-java.lang.Object-"><code>WizardDescriptor.putProperty()</code></a>.
+<a href="../WizardDescriptor.html#putProperty(java.lang.String,%20java.lang.Object)"><code>WizardDescriptor.putProperty()</code></a>.
<br>
If both are used at the same time then
-<a href="../WizardDescriptor.html#putProperty-java.lang.String-java.lang.Object-">
+<a href="../WizardDescriptor.html#putProperty(java.lang.String,%20java.lang.Object)">
<code>WizardDescriptor.putProperty()</code></a> matters.
<a href="../WizardDescriptor.html">
<code>WizardDescriptor</code></a> listens on property changes of not initialization properties
diff --git a/openide.dialogs/src/org/openide/package.html b/openide.dialogs/src/org/openide/package.html
index 2074d39..808e56f 100644
--- a/openide.dialogs/src/org/openide/package.html
+++ b/openide.dialogs/src/org/openide/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/openide.execution.compat8/build.xml b/openide.execution.compat8/build.xml
index 41b3b6f..ca753e9 100644
--- a/openide.execution.compat8/build.xml
+++ b/openide.execution.compat8/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="openide.execution.compat8">
<description>Builds, tests, and runs the project org.openide.execution.compat8</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/openide.execution.compat8/manifest.mf b/openide.execution.compat8/manifest.mf
index 10fbfc3..cf8c003 100644
--- a/openide.execution.compat8/manifest.mf
+++ b/openide.execution.compat8/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.execution.compat8
OpenIDE-Module-Localizing-Bundle: org/openide/execution/compat8/Bundle.properties
-OpenIDE-Module-Specification-Version: 9.2.1
+OpenIDE-Module-Specification-Version: 9.1.1
OpenIDE-Module-Fragment-Host: org.openide.execution
diff --git a/openide.execution.compat8/nbproject/project.properties b/openide.execution.compat8/nbproject/project.properties
index b2e4d49..085caf0 100644
--- a/openide.execution.compat8/nbproject/project.properties
+++ b/openide.execution.compat8/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/openide.execution.compat8/nbproject/project.xml b/openide.execution.compat8/nbproject/project.xml
index fbf15c2..372180e 100644
--- a/openide.execution.compat8/nbproject/project.xml
+++ b/openide.execution.compat8/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/openide.execution.compat8/src/org/openide/execution/compat8/Bundle.properties b/openide.execution.compat8/src/org/openide/execution/compat8/Bundle.properties
index dd5fa35..e940393 100644
--- a/openide.execution.compat8/src/org/openide/execution/compat8/Bundle.properties
+++ b/openide.execution.compat8/src/org/openide/execution/compat8/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=Execution API 8.0 Compatibility
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Short-Description=Compatibility support for clients compiled against Execution API \
diff --git a/openide.execution/manifest.mf b/openide.execution/manifest.mf
index 4da0c43..c72f263 100644
--- a/openide.execution/manifest.mf
+++ b/openide.execution/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.execution
-OpenIDE-Module-Specification-Version: 9.3.1
+OpenIDE-Module-Specification-Version: 9.2.1
OpenIDE-Module-Localizing-Bundle: org/openide/execution/Bundle.properties
OpenIDE-Module-Recommends: org.openide.execution.ExecutionEngine
AutoUpdate-Essential-Module: true
diff --git a/openide.execution/nbproject/org-openide-execution.sig b/openide.execution/nbproject/org-openide-execution.sig
index 85d7008..11667ce 100644
--- a/openide.execution/nbproject/org-openide-execution.sig
+++ b/openide.execution/nbproject/org-openide-execution.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 9.2.1
+#Version 1.36
CLSS public abstract interface java.io.Closeable
intf java.lang.AutoCloseable
diff --git a/openide.execution/src/org/openide/execution/doc-files/api.html b/openide.execution/src/org/openide/execution/doc-files/api.html
index 02eb4e3..55ae56c 100644
--- a/openide.execution/src/org/openide/execution/doc-files/api.html
+++ b/openide.execution/src/org/openide/execution/doc-files/api.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
@@ -83,20 +85,20 @@ an external process whose output you wish to capture should
generally have its streams redirected to the Output Window, e.g. by
using
-<a href="@JDK@/java/lang/Process.html#getInputStream--"><code>Process.getInputStream()</code></a>.
+<a href="@JDK@/java/lang/Process.html#getInputStream()"><code>Process.getInputStream()</code></a>.
The streams on the Output Window may be obtained from the execution
engine (see below), using
-<a href="../ExecutorTask.html#getInputOutput--"><code>ExecutorTask.getInputOutput()</code></a>
+<a href="../ExecutorTask.html#getInputOutput()"><code>ExecutorTask.getInputOutput()</code></a>
on the task returned from
-<a href="../ExecutionEngine.html#execute-java.lang.String-java.lang.Runnable-org.openide.windows.InputOutput-"><code>ExecutionEngine.execute(...)</code></a>,
+<a href="../ExecutionEngine.html#execute(java.lang.String,%20java.lang.Runnable,%20org.openide.windows.InputOutput)"><code>ExecutionEngine.execute(...)</code></a>,
and then
-<a href="@org-openide-io@/org/openide/windows/InputOutput.html#getOut--"><code>InputOutput.getOut()</code></a>
+<a href="@org-openide-io@/org/openide/windows/InputOutput.html#getOut()"><code>InputOutput.getOut()</code></a>
and so on. Now you can just copy characters from one stream to the
other.
@@ -129,12 +131,12 @@ codes mean.
about <em>how</em> to substitute these codes, if there are
any. Rather, it presents ways to create a running process from itself:
-<a href="../NbProcessDescriptor.html#exec--"><code>NbProcessDescriptor.exec()</code></a>
+<a href="../NbProcessDescriptor.html#exec()"><code>NbProcessDescriptor.exec()</code></a>
simply runs the literally supplied string, assuming it does not need
any substitutions; but
-<a href="../NbProcessDescriptor.html#exec-java.text.Format-"><code>NbProcessDescriptor.exec(Format)</code></a>
+<a href="../NbProcessDescriptor.html#exec(java.text.Format)"><code>NbProcessDescriptor.exec(Format)</code></a>
applies a (textual) format to the command name and arguments list
before invoking <code>Runtime.exec</code>. The format can in principle
@@ -189,14 +191,14 @@ implementation:
<li>You may use
-<a href="@org-openide-io@/org/openide/windows/IOProvider.html#getIO-java.lang.String-boolean-"><code>IOProvider.getIO(String,boolean)</code></a>
+<a href="@org-openide-io@/org/openide/windows/IOProvider.html#getIO(java.lang.String,%20boolean)"><code>IOProvider.getIO(String,boolean)</code></a>
to create an Output Window tab with a specified name and return its
<code>InputOutput</code> representative. Or, try to reuse an existing tab of the same name, if there is one.
<li>If
-<a href="../ExecutionEngine.html#execute-java.lang.String-java.lang.Runnable-org.openide.windows.InputOutput-"><code>ExecutionEngine.execute(...,InputOutput)</code></a>
+<a href="../ExecutionEngine.html#execute(java.lang.String,%20java.lang.Runnable,%20org.openide.windows.InputOutput)"><code>ExecutionEngine.execute(...,InputOutput)</code></a>
is called and its third argument is <code>null</code>, this signifies
that the engine itself should choose an appropriate Output Window tab,
@@ -204,7 +206,7 @@ probably named after the supplied task name. The returned
<code>ExecutorTask</code> will then already be using the proper
<code>InputOutput</code>, and this may be retrieved if needed using
-<a href="../ExecutorTask.html#getInputOutput--"><code>ExecutorTask.getInputOutput()</code></a>.
+<a href="../ExecutorTask.html#getInputOutput()"><code>ExecutorTask.getInputOutput()</code></a>.
<li>You may use the constant
@@ -232,13 +234,13 @@ be trapped.
<ol>
-<li><a href="../ExecutionEngine.html#execute-java.lang.String-java.lang.Runnable-org.openide.windows.InputOutput-"><code>ExecutionEngine.execute(...)</code></a>
+<li><a href="../ExecutionEngine.html#execute(java.lang.String,%20java.lang.Runnable,%20org.openide.windows.InputOutput)"><code>ExecutionEngine.execute(...)</code></a>
is the primitive means for providing I/O services to a block of code
using dynamic scope.
(You may obtain the <code>ExecutionEngine</code> via
-<code>ExecutionEngine.<a href="../ExecutionEngine.html#getDefault--">getDefault</a>()</code>.)
+<code>ExecutionEngine.<a href="../ExecutionEngine.html#getDefault()">getDefault</a>()</code>.)
The supplied <code>Runnable</code> is run
asynchronously in its own thread and thread group, i.e. well-isolated
@@ -251,7 +253,7 @@ supplied runnable; it will all be handled. Runnable-spawned code which
is destined for other thread groups will not be handled, however; for
example,
-<a href="@org-openide-util@/org/openide/util/RequestProcessor.html#post-java.lang.Runnable-"><code>RequestProcessor.post(Runnable)</code></a>
+<a href="@org-openide-util@/org/openide/util/RequestProcessor.html#post(java.lang.Runnable)"><code>RequestProcessor.post(Runnable)</code></a>
will execute code in NetBeans' main thread group, not the one created
by the execution engine.
@@ -285,17 +287,17 @@ exit status (since the execution engine is not aware of such codes).
<p>The dynamic scope of <code>execute(...)</code> also covers
attempted uses of
-<a href="@JDK@/java/lang/System.html#exit-int-"><code>System.exit(int)</code></a>
+<a href="@JDK@/java/lang/System.html#exit(int)"><code>System.exit(int)</code></a>
(or
-<a href="@JDK@/java/lang/Runtime.html#exit-int-"><code>Runtime.exit(int)</code></a>).
+<a href="@JDK@/java/lang/Runtime.html#exit(int)"><code>Runtime.exit(int)</code></a>).
If an exit is attempted within the task's dynamic scope (i.e. thread
group), this is caught by the NetBeans security manager implementation,
and the task is instead stopped (as if by
-<a href="../ExecutorTask.html#stop--"><code>ExecutorTask.stop()</code></a>).
+<a href="../ExecutorTask.html#stop()"><code>ExecutorTask.stop()</code></a>).
In practice this means that all living threads in the thread group
will receive
@@ -312,7 +314,7 @@ or because of an explicit use of <code>ExecutorTask.stop()</code>.
(Note that there is no way to recover the exit status which the
attempted exit call used.)
-<li><a href="../NbClassLoader.html#NbClassLoader-org.openide.windows.InputOutput-"><code>new NbClassLoader(InputOutput)</code></a>
+<li><a href="../NbClassLoader.html#NbClassLoader(org.openide.windows.InputOutput)"><code>new NbClassLoader(InputOutput)</code></a>
creates a special classloader that is aware of an
<code>InputOutput</code> obtained as above. Normally
@@ -352,7 +354,7 @@ is subject to the security manager. Such "untrusted" code is probably
restricted from security-sensitive calls (but do not count on it).
Such code can still call
-<a href="@org-openide-util-ui@/org/openide/LifecycleManager.html#exit--"><code>LifecycleManager.exit()</code></a>
+<a href="@org-openide-util-ui@/org/openide/LifecycleManager.html#exit()"><code>LifecycleManager.exit()</code></a>
to explicitly exit NetBeans.
diff --git a/openide.execution/src/org/openide/execution/package.html b/openide.execution/src/org/openide/execution/package.html
index e364577..37b7dae 100644
--- a/openide.execution/src/org/openide/execution/package.html
+++ b/openide.execution/src/org/openide/execution/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
diff --git a/openide.explorer/apichanges.xml b/openide.explorer/apichanges.xml
index 46c34cd..0de0030 100644
--- a/openide.explorer/apichanges.xml
+++ b/openide.explorer/apichanges.xml
@@ -121,9 +121,9 @@ made subject to such option by the copyright holder.
<author login="mentlicher"/>
<compatibility binary="compatible" source="compatible" deprecation="no" deletion="no" addition="yes"/>
<description>
- Added <a href="@TOP@/org/openide/explorer/view/OutlineView.html#isQuickSearchAllowed--">OutlineView.isQuickSearchAllowed()</a>,
- <a href="@TOP@/org/openide/explorer/view/OutlineView.html#setQuickSearchAllowed-boolean-">OutlineView.setQuickSearchAllowed()</a>
- and <a href="@TOP@/org/openide/explorer/view/OutlineView.html#setQuickSearchTableFilter-org.openide.explorer.view.QuickSearchTableFilter-boolean-">OutlineView.setQuickSearchTableFilter()</a>
+ Added <a href="@TOP@/org/openide/explorer/view/OutlineView.html#isQuickSearchAllowed()">OutlineView.isQuickSearchAllowed()</a>,
+ <a href="@TOP@/org/openide/explorer/view/OutlineView.html#setQuickSearchAllowed(boolean)">OutlineView.setQuickSearchAllowed()</a>
+ and <a href="@TOP@/org/openide/explorer/view/OutlineView.html#setQuickSearchTableFilter(org.openide.explorer.view.QuickSearchTableFilter, boolean)">OutlineView.setQuickSearchTableFilter()</a>
methods to control quick search functionality on OutlineView.
Interface <a href="@TOP@/org/openide/explorer/view/QuickSearchTableFilter.html">QuickSearchTableFilter</a>
introduced to provide custom table cell data for quick search.
@@ -140,7 +140,7 @@ made subject to such option by the copyright holder.
<author login="tpavek"/>
<compatibility binary="compatible" source="compatible" deprecation="no" deletion="no" addition="yes"/>
<description>
- Added <a href="@TOP@/org/openide/explorer/propertysheet/PropertyEnv.html#create-java.beans.FeatureDescriptor-java.lang.Object...-">PropertyEnv.create</a>
+ Added <a href="@TOP@/org/openide/explorer/propertysheet/PropertyEnv.html#create(java.beans.FeatureDescriptor,%20java.lang.Object...)">PropertyEnv.create</a>
method for creating an instance of PropertyEnv for given property and beans (nodes).
To be used when there is a need to initialize an ExPropertyEditor instance independently from
PropertySheet or PropertyPanel infrastructure (e.g. before the property appears in UI).
@@ -236,7 +236,7 @@ made subject to such option by the copyright holder.
<compatibility binary="compatible" source="compatible" deprecation="no" deletion="no" addition="yes"/>
<description>
To simplify navigation "up" in the <code>ListView</code> one
- can turn on <a href="@TOP@/org/openide/explorer/view/ListView.html#setShowParentNode-boolean-">showParentNode</a>
+ can turn on <a href="@TOP@/org/openide/explorer/view/ListView.html#setShowParentNode(boolean)">showParentNode</a>
property.
</description>
<class package="org.openide.explorer.view" name="ListView"/>
@@ -310,7 +310,7 @@ made subject to such option by the copyright holder.
<description>Nodes can be removed outside of AWT thread while e.g. view can
try to select them. This generated IllegalArgumentException during checking if
such a node is under root context. Now
- <a href="@TOP@/org/openide/explorer/ExplorerManager.html#setSelectedNodes-org.openide.nodes.Node:A-"><code>setSelectedNodes()</code></a>.
+ <a href="@TOP@/org/openide/explorer/ExplorerManager.html#setSelectedNodes(org.openide.nodes.Node[])"><code>setSelectedNodes()</code></a>.
does partial selection
of valid nodes instead of throwing IllegalArgumentException.
</description>
diff --git a/openide.explorer/arch.xml b/openide.explorer/arch.xml
index 5e1567f..6cb666c 100644
--- a/openide.explorer/arch.xml
+++ b/openide.explorer/arch.xml
@@ -469,11 +469,11 @@ and to Actions API to allow use Explorer API as standalone library.
<answer id="format-clipboard">
The module servers as a bridge between nodes and the clipboard. It takes what
Nodes provide
-(<a href="@org-openide-nodes@/org/openide/nodes/Node.html#clipboardCopy--">Node.clipboardCopy</a>,
- <a href="@org-openide-nodes@/org/openide/nodes/Node.html#clipboardCut--">Node.clipboardCut</a>) and
+(<a href="@org-openide-nodes@/org/openide/nodes/Node.html#clipboardCopy()">Node.clipboardCopy</a>,
+ <a href="@org-openide-nodes@/org/openide/nodes/Node.html#clipboardCut()">Node.clipboardCut</a>) and
inserts them into clipboard (as part of Copy/Cut action) and also retrive the
content of clipboard and pases it to
- <a href="@org-openide-nodes@/org/openide/nodes/Node.html#getPasteTypes-java.awt.datatransfer.Transferable-">Node.getPasteTypes(Transferable)</a>)
+ <a href="@org-openide-nodes@/org/openide/nodes/Node.html#getPasteTypes(java.awt.datatransfer.Transferable)">Node.getPasteTypes(Transferable)</a>)
during paste action.
</answer>
diff --git a/openide.explorer/manifest.mf b/openide.explorer/manifest.mf
index e16c926..e5330f9 100644
--- a/openide.explorer/manifest.mf
+++ b/openide.explorer/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
OpenIDE-Module: org.openide.explorer
OpenIDE-Module-Localizing-Bundle: org/openide/explorer/Bundle.properties
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 6.62.1
+OpenIDE-Module-Specification-Version: 6.61.1
diff --git a/openide.explorer/nbproject/org-openide-explorer.sig b/openide.explorer/nbproject/org-openide-explorer.sig
index 9cc4f0a..88e9232 100644
--- a/openide.explorer/nbproject/org-openide-explorer.sig
+++ b/openide.explorer/nbproject/org-openide-explorer.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 6.61.1
+#Version 6.57
CLSS public abstract java.awt.Component
cons protected init()
@@ -635,7 +635,6 @@ intf java.awt.ItemSelectable
intf java.awt.event.ActionListener
intf javax.accessibility.Accessible
intf javax.swing.event.ListDataListener
-meth protected boolean processKeyBinding(javax.swing.KeyStroke,java.awt.event.KeyEvent,int,boolean)
meth protected java.beans.PropertyChangeListener createActionPropertyChangeListener(javax.swing.Action)
meth protected java.lang.String paramString()
meth protected javax.swing.JComboBox$KeySelectionManager createDefaultKeySelectionManager()
@@ -819,8 +818,6 @@ meth public void firePropertyChange(java.lang.String,boolean,boolean)
meth public void firePropertyChange(java.lang.String,char,char)
meth public void firePropertyChange(java.lang.String,int,int)
meth public void grabFocus()
-meth public void hide()
- anno 0 java.lang.Deprecated()
meth public void paint(java.awt.Graphics)
meth public void paintImmediately(int,int,int,int)
meth public void paintImmediately(java.awt.Rectangle)
@@ -1390,7 +1387,7 @@ meth public void setModel(org.openide.explorer.propertysheet.PropertyModel)
meth public void setPreferences(int)
meth public void updateValue()
supr javax.swing.JComponent
-hfds beans,changeImmediate,displayer,ignoreCommit,initializing,inner,isGtk,listener,model,preferences,prop,reusableEnv,reusableModel,settingModel
+hfds beans,changeImmediate,displayer,initializing,inner,isGtk,listener,model,preferences,prop,reusableEnv,reusableModel,settingModel
hcls AccessiblePropertyPanel,BridgeAccessor,CustomEditorProxyAction,Listener
CLSS public org.openide.explorer.propertysheet.PropertySheet
@@ -1705,14 +1702,12 @@ cons public init(boolean)
anno 0 java.lang.Deprecated()
intf javax.swing.ListCellRenderer
intf javax.swing.tree.TreeCellRenderer
-meth public final boolean isShowIcons()
-meth public final void setShowIcons(boolean)
meth public java.awt.Component getListCellRendererComponent(javax.swing.JList,java.lang.Object,int,boolean,boolean)
meth public java.awt.Component getTreeCellRendererComponent(javax.swing.JTree,java.lang.Object,boolean,boolean,boolean,int,boolean)
meth public static org.openide.explorer.view.NodeRenderer sharedInstance()
anno 0 java.lang.Deprecated()
supr java.lang.Object
-hfds bigIcons,draggedOver,instance,labelGap,renderer,showIcons
+hfds bigIcons,draggedOver,instance,renderer
CLSS public org.openide.explorer.view.NodeTableModel
cons public init()
@@ -1751,13 +1746,11 @@ meth public boolean isExpanded(org.openide.nodes.Node)
meth public boolean isPopupAllowed()
meth public boolean isQuickSearchAllowed()
meth public boolean requestFocusInWindow()
-meth public final boolean isShowNodeIcons()
meth public final boolean removePropertyColumn(java.lang.String)
meth public final void addPropertyColumn(java.lang.String,java.lang.String)
meth public final void addPropertyColumn(java.lang.String,java.lang.String,java.lang.String)
meth public final void setPropertyColumnAttribute(java.lang.String,java.lang.String,java.lang.Object)
meth public final void setPropertyColumnDescription(java.lang.String,java.lang.String)
-meth public final void setShowNodeIcons(boolean)
meth public int getAllowedDragActions()
meth public int getAllowedDropActions()
meth public int getHorizontalScrollBarPolicy()
@@ -1790,7 +1783,7 @@ meth public void setTreeHorizontalScrollBarPolicy(int)
meth public void setTreeSortable(boolean)
meth public void writeSettings(java.util.Properties,java.lang.String)
supr javax.swing.JScrollPane
-hfds REVALIDATING_RP,TREE_HORIZONTAL_SCROLLBAR,allowedDragActions,allowedDropActions,defaultTreeActionListener,dragActive,dragSupport,dropActive,dropSupport,dropTargetPopupAllowed,hScrollBar,horizontalScrollBarIsNeeded,isTreeHScrollBar,listener,logger,manager,managerListener,managerLock,model,nodeRenderer,outline,popupFactory,popupListener,qsKeyListener,quickSearch,rowModel,searchConstraints,searchPanel,selection,treeHorizontalScrollBarPolicy,treeModel,wlpc,wlvc
+hfds REVALIDATING_RP,TREE_HORIZONTAL_SCROLLBAR,allowedDragActions,allowedDropActions,defaultTreeActionListener,dragActive,dragSupport,dropActive,dropSupport,dropTargetPopupAllowed,hScrollBar,horizontalScrollBarIsNeeded,isTreeHScrollBar,listener,logger,manager,managerListener,managerLock,model,outline,popupFactory,popupListener,qsKeyListener,quickSearch,rowModel,searchConstraints,searchPanel,selection,treeHorizontalScrollBarPolicy,treeModel,wlpc,wlvc
hcls DefaultTreeAction,NodeOutlineModel,OutlinePopupFactory,OutlineScrollLayout,OutlineViewOutline,PopupAction,PopupAdapter,PrototypeProperty,ScrollListener,Selection,TableSelectionListener
CLSS public abstract interface org.openide.explorer.view.QuickSearchTableFilter
diff --git a/openide.explorer/src/META-INF/upgrade/TreeView.hint b/openide.explorer/src/META-INF/upgrade/TreeView.hint
index 9417737..ffd9320 100644
--- a/openide.explorer/src/META-INF/upgrade/TreeView.hint
+++ b/openide.explorer/src/META-INF/upgrade/TreeView.hint
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
"Useless API call":
$v.setUseSubstringInQuickSearch($b) :: $v instanceof org.openide.explorer.view.TreeView
=>
diff --git a/openide.explorer/src/org/netbeans/modules/openide/explorer/ExplorerActionsImpl.java b/openide.explorer/src/org/netbeans/modules/openide/explorer/ExplorerActionsImpl.java
index 41fb4c7..444efa2 100644
--- a/openide.explorer/src/org/netbeans/modules/openide/explorer/ExplorerActionsImpl.java
+++ b/openide.explorer/src/org/netbeans/modules/openide/explorer/ExplorerActionsImpl.java
@@ -48,7 +48,6 @@ import java.awt.EventQueue;
import java.awt.GraphicsEnvironment;
import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.FlavorEvent;
import java.awt.datatransfer.FlavorListener;
import java.awt.datatransfer.StringSelection;
@@ -81,7 +80,6 @@ import org.openide.util.WeakListeners;
import org.openide.util.datatransfer.ExTransferable;
import org.openide.util.datatransfer.MultiTransferObject;
import org.openide.util.datatransfer.PasteType;
-import org.openide.util.lookup.Lookups;
/**
* This class contains the default implementation of reactions to the standard
@@ -337,7 +335,7 @@ public final class ExplorerActionsImpl {
if (actionStateUpdater != null) {
Transferable trans = actionStateUpdater.getTransferable();
if (trans != null) {
- updatePasteTypes(wrapTransferable(trans, node), node);
+ updatePasteTypes(trans, node);
}
} else {
LOG.fine("#126145: caused by http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6322854");
@@ -346,49 +344,6 @@ public final class ExplorerActionsImpl {
}
}
- /**
- * Wrap transferable to an instance that can hold information about node on
- * which the operation was invoked. (And thus its parent node and context
- * are known). See comment at o.o.loaders.DataNode.getPasteTypesFromParent()
- * and bug 250134.
- *
- * @param trans The Transferable object.
- * @param node The node on which the paste operation would be invoked.
- */
- private Transferable wrapTransferable(Transferable trans, Node node) {
- class ExplorerTransferable implements Transferable, Lookup.Provider {
- private final Transferable delegate;
- private final Lookup lookup;
-
- public ExplorerTransferable(Transferable delegate, Node node) {
- this.delegate = delegate;
- this.lookup = Lookups.singleton(node);
- }
-
- @Override
- public DataFlavor[] getTransferDataFlavors() {
- return delegate.getTransferDataFlavors();
- }
-
- @Override
- public boolean isDataFlavorSupported(DataFlavor flavor) {
- return delegate.isDataFlavorSupported(flavor);
- }
-
- @Override
- public Object getTransferData(DataFlavor flavor)
- throws UnsupportedFlavorException, IOException {
- return delegate.getTransferData(flavor);
- }
-
- @Override
- public Lookup getLookup() {
- return lookup;
- }
- }
- return new ExplorerTransferable(trans, node);
- }
-
/** Actually updates paste types. */
private void updatePasteTypes(Transferable trans, Node pan) {
if (trans != null) {
diff --git a/openide.explorer/src/org/openide/explorer/doc-files/api.html b/openide.explorer/src/org/openide/explorer/doc-files/api.html
index b602228..ed3f78a 100644
--- a/openide.explorer/src/org/openide/explorer/doc-files/api.html
+++ b/openide.explorer/src/org/openide/explorer/doc-files/api.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
@@ -124,7 +126,7 @@ window of some type, browsing some set of nodes.
<h3><a name="show-expl">Displaying a new Explorer window</a></h3>
Probably the easiest way to show an Explorer window is just to call
-<a href="@org-openide-nodes@/org/openide/nodes/NodeOperation.html#explore-org.openide.nodes.Node-"><code>NodeOperation.explore(...)</code></a>.
+<a href="@org-openide-nodes@/org/openide/nodes/NodeOperation.html#explore(org.openide.nodes.Node)"><code>NodeOperation.explore(...)</code></a>.
This will simply show a node and its subtree (if any) in a new window
using the normal tree-style Explorer view. It does not permit any
@@ -185,7 +187,7 @@ Once you have created an Explorer component, your code will not typically
interact directly with it - rather it will call methods on its ExplorerManager
to set selection, etc.</li>
-<li>Lastly you'll call <a href="../ExplorerManager.html#setRootContext-org.openide.nodes.Node-">ExplorerManager.setRootContext</a>
+<li>Lastly you'll call <a href="../ExplorerManager.html#setRootContext(org.openide.nodes.Node)">ExplorerManager.setRootContext</a>
to actually set what node the view will be displaying.
</li>
@@ -240,35 +242,35 @@ of the represented nodes which are likely to be visually mirrored:
<li>The node's
-<a href="@JDK@/java/beans/FeatureDescriptor.html#getDisplayName--">display name</a>
+<a href="@JDK@/java/beans/FeatureDescriptor.html#getDisplayName()">display name</a>
and
-<a href="@JDK@/java/beans/FeatureDescriptor.html#getShortDescription--">short description</a>
+<a href="@JDK@/java/beans/FeatureDescriptor.html#getShortDescription()">short description</a>
ought to be used by views to display the node and provide (e.g.) tool tips.
<li>The
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getIcon-int-">icon</a>
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getIcon(int)">icon</a>
is used in most views alongside the display name. Non-leaf nodes upon
expansion will show the
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getOpenedIcon-int-">opened icon</a>.
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getOpenedIcon(int)">opened icon</a>.
<li>Some or all of the node's
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getChildren--">children</a>
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getChildren()">children</a>
are typically displayed (except of course if it is a
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#isLeaf--">leaf</a>).
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#isLeaf()">leaf</a>).
Normally they will be in the same order as
the node itself
-<a href="@org-openide-nodes@/org/openide/nodes/Children.html#getNodes--">specifies</a>,
+<a href="@org-openide-nodes@/org/openide/nodes/Children.html#getNodes()">specifies</a>,
though a view might provide special display characteristics for
certain children lists such as
@@ -279,13 +281,13 @@ Generally nodes may allow their children to be
<a href="@org-openide-nodes@/org/openide/nodes/Index.html">reordered</a>.
-<li><a href="@org-openide-nodes@/org/openide/nodes/Node.html#getActions--"><code>Node.getActions()</code></a>,
+<li><a href="@org-openide-nodes@/org/openide/nodes/Node.html#getActions()"><code>Node.getActions()</code></a>,
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getContextActions--"><code>Node.getContextActions()</code></a>,
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getContextActions()"><code>Node.getContextActions()</code></a>,
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getDefaultAction--"><code>Node.getDefaultAction()</code></a>,
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getDefaultAction()"><code>Node.getDefaultAction()</code></a>,
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getContextMenu--"><code>Node.getContextMenu()</code></a>,
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getContextMenu()"><code>Node.getContextMenu()</code></a>,
etc. are typically used to build an event-handling system for the
visual representation of the nodes.
@@ -293,18 +295,18 @@ visual representation of the nodes.
<li>Standard actions are generally enabled on nodes in the Explorer,
so that
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#hasCustomizer--"><code>Node.hasCustomizer()</code></a>,
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#hasCustomizer()"><code>Node.hasCustomizer()</code></a>,
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getLookup--"><code>Node.getLookup().lookup(...)</code></a>,
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getLookup()"><code>Node.getLookup().lookup(...)</code></a>,
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getNewTypes--"><code>Node.getNewTypes()</code></a>,
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getNewTypes()"><code>Node.getNewTypes()</code></a>,
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getPasteTypes-java.awt.datatransfer.Transferable-"><code>Node.getPasteTypes(...)</code></a>,
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getPasteTypes(java.awt.datatransfer.Transferable)"><code>Node.getPasteTypes(...)</code></a>,
and so on affect other UI components (such as toolbars) which may hold
action presenters.
-<li><a href="@org-openide-nodes@/org/openide/nodes/Node.html#getPropertySets--"><code>Node.getPropertySets()</code></a>
+<li><a href="@org-openide-nodes@/org/openide/nodes/Node.html#getPropertySets()"><code>Node.getPropertySets()</code></a>
is of course used by the Property Sheet view.
@@ -313,13 +315,13 @@ system actions present in popup menus, e.g.) for moving nodes,
renaming them in place, etc. - these will use the standard node hooks
such as
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#canRename--"><code>Node.canRename()</code></a>,
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#canRename()"><code>Node.canRename()</code></a>,
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#cloneNode--"><code>Node.cloneNode()</code></a>,
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#cloneNode()"><code>Node.cloneNode()</code></a>,
or
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#clipboardCut--"><code>Node.clipboardCut()</code></a>.
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#clipboardCut()"><code>Node.clipboardCut()</code></a>.
</ul>
diff --git a/openide.explorer/src/org/openide/explorer/doc-files/customExplorerViews.html b/openide.explorer/src/org/openide/explorer/doc-files/customExplorerViews.html
index b09f7b5..86a4b11 100644
--- a/openide.explorer/src/org/openide/explorer/doc-files/customExplorerViews.html
+++ b/openide.explorer/src/org/openide/explorer/doc-files/customExplorerViews.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
@@ -61,28 +63,28 @@ it need not implement any particular interface, etc. However, the
convention is that it keep track of the Explorer manager that controls
it; this manager should be located when it is
-<a href="@JDK@/java/awt/Component.html#addNotify--">added</a>
+<a href="@JDK@/java/awt/Component.html#addNotify()">added</a>
to a parent component, by calling
-<a href="../ExplorerManager.html#find-java.awt.Component-"><code>ExplorerManager.find(...)</code></a>,
+<a href="../ExplorerManager.html#find(java.awt.Component)"><code>ExplorerManager.find(...)</code></a>,
and then use that manager's properties to control it; the view should
also stop consulting the manager when the component is
-<a href="@JDK@/java/awt/Component.html#removeNotify--">removed</a>
+<a href="@JDK@/java/awt/Component.html#removeNotify()">removed</a>
from its parent.
<p>The view will want to use a
-<a href="../ExplorerManager.html#addPropertyChangeListener-java.beans.PropertyChangeListener-">property change listener</a>
+<a href="../ExplorerManager.html#addPropertyChangeListener(java.beans.PropertyChangeListener)">property change listener</a>
to keep track of what the manager expects it to do;
possibly it could also
-<a href="../ExplorerManager.html#addVetoableChangeListener-java.beans.VetoableChangeListener-">veto</a>
+<a href="../ExplorerManager.html#addVetoableChangeListener(java.beans.VetoableChangeListener)">veto</a>
certain changes.
diff --git a/openide.explorer/src/org/openide/explorer/doc-files/propertySheetReference.html b/openide.explorer/src/org/openide/explorer/doc-files/propertySheetReference.html
index e6a8743..58828f5 100644
--- a/openide.explorer/src/org/openide/explorer/doc-files/propertySheetReference.html
+++ b/openide.explorer/src/org/openide/explorer/doc-files/propertySheetReference.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<head>
@@ -52,7 +54,7 @@ Nodes and such.
<h2><a name="jvmflags">System properties that affect the behavior of the Property Sheet</a></h2>
<p>Note that generally these flags may or may not be supported in
future versions. The following flags may be passed to the JVM
-in the form <code>runide -J-Dsome.property=true</code> which
+in the form <code>runide -J-Dsome.property=true</code> which
affect the user interface of the Property Sheet. Generally they
represent either cases where different applications have different
requirements, or where there is some contention about which style
diff --git a/openide.explorer/src/org/openide/explorer/doc-files/propertyViewCustomization.html b/openide.explorer/src/org/openide/explorer/doc-files/propertyViewCustomization.html
index 3914a63..0404507 100644
--- a/openide.explorer/src/org/openide/explorer/doc-files/propertyViewCustomization.html
+++ b/openide.explorer/src/org/openide/explorer/doc-files/propertyViewCustomization.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
@@ -428,7 +430,7 @@ Module authors will sometimes want to make use of the fact that
such an editor exists when creating JavaBean-related code; most
commonly, this means that
-<a href="@org-openide-nodes@/org/openide/nodes/Node.Property.html#getPropertyEditor--">node properties</a>
+<a href="@org-openide-nodes@/org/openide/nodes/Node.Property.html#getPropertyEditor()">node properties</a>
and
@@ -515,7 +517,7 @@ available in the package
but these are all deprecated; modules are encouraged to
instead rely solely on the default editor search path, and to add needed configuration
-<a href="@JDK@/java/beans/FeatureDescriptor.html#setValue-java.lang.String-java.lang.Object-">parameters</a>
+<a href="@JDK@/java/beans/FeatureDescriptor.html#setValue(java.lang.String,%20java.lang.Object)">parameters</a>
to their
@@ -527,7 +529,7 @@ or
so as to be accessible from
-<a href="../propertysheet/PropertyEnv.html#getFeatureDescriptor--"><code>PropertyEnv</code></a>
+<a href="../propertysheet/PropertyEnv.html#getFeatureDescriptor()"><code>PropertyEnv</code></a>
as used by
diff --git a/openide.explorer/src/org/openide/explorer/package.html b/openide.explorer/src/org/openide/explorer/package.html
index 6abafa4..76fbc55 100644
--- a/openide.explorer/src/org/openide/explorer/package.html
+++ b/openide.explorer/src/org/openide/explorer/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/openide.explorer/src/org/openide/explorer/propertysheet/PropertyPanel.java b/openide.explorer/src/org/openide/explorer/propertysheet/PropertyPanel.java
index 93b620a..a777e6c 100644
--- a/openide.explorer/src/org/openide/explorer/propertysheet/PropertyPanel.java
+++ b/openide.explorer/src/org/openide/explorer/propertysheet/PropertyPanel.java
@@ -1228,16 +1228,6 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
return getProperty() != null;
}
}
-
- @Override
- public Object getValue(String key) {
- if (SMALL_ICON.equals(key)) {
- // Provide the icon for those who use this action
- return PropUtils.getCustomButtonIcon();
- } else {
- return super.getValue(key);
- }
- }
}
private class AccessiblePropertyPanel extends AccessibleJComponent {
diff --git a/openide.explorer/src/org/openide/explorer/propertysheet/editors/package-info.java b/openide.explorer/src/org/openide/explorer/propertysheet/editors/package-info.java
index 74335fd..44640bf 100644
--- a/openide.explorer/src/org/openide/explorer/propertysheet/editors/package-info.java
+++ b/openide.explorer/src/org/openide/explorer/propertysheet/editors/package-info.java
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
@PropertyEditorSearchPath
package org.openide.explorer.propertysheet.editors;
diff --git a/openide.explorer/src/org/openide/explorer/propertysheet/package.html b/openide.explorer/src/org/openide/explorer/propertysheet/package.html
index a3724f9..2a20312 100644
--- a/openide.explorer/src/org/openide/explorer/propertysheet/package.html
+++ b/openide.explorer/src/org/openide/explorer/propertysheet/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/openide.explorer/src/org/openide/explorer/view/CustomPopupFactory.java b/openide.explorer/src/org/openide/explorer/view/CustomPopupFactory.java
deleted file mode 100644
index 52e08bd..0000000
--- a/openide.explorer/src/org/openide/explorer/view/CustomPopupFactory.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-
-package org.openide.explorer.view;
-
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Point;
-import java.awt.Rectangle;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JWindow;
-import javax.swing.Popup;
-import javax.swing.PopupFactory;
-import javax.swing.SwingUtilities;
-
-
-
-/**
- * Custom popup factory to create popup menus without the background shadow.
- *
- * Copied and modified from org.netbeans.modules.applemenu.ApplePopupFactory
- * which only worked for Mac OS X, while the background was present in other
- * GUIs like Linux/GTK.
- *
- * @see org.openide.explorer.view.ViewTooltips
- *
- * @author Tim Boudreau
- * @author Jiri Sedlacek
- */
-class CustomPopupFactory extends PopupFactory {
-
- CustomPopupFactory() {
- }
-
- @Override
- public Popup getPopup(Component owner, Component contents,
- int x, int y) throws IllegalArgumentException {
- assert owner instanceof JComponent;
- Dimension d = contents.getPreferredSize();
- Container c = ((JComponent) owner).getTopLevelAncestor();
- if (c == null) {
- throw new IllegalArgumentException ("Not onscreen: " + owner);
- }
- Point p = new Point (x, y);
- SwingUtilities.convertPointFromScreen(p, c);
- Rectangle r = new Rectangle (p.x, p.y, d.width, d.height);
- if (c.getBounds().contains(r)) {
- //XXX need API to determine if editor area comp is heavyweight,
- //and if so, return a "medium weight" popup of a java.awt.Component
- //that embeds the passed contents component
- return new LWPopup (owner, contents, x, y);
- } else {
- return new HWPopup (owner, contents, x, y);
- }
- }
-
- private static abstract class OurPopup extends Popup {
- protected Component owner = null;
- protected Component contents = null;
- protected int x = -1;
- protected int y = -1;
- public OurPopup (Component owner, Component contents, int x, int y) {
- configure (owner, contents, x, y);
- }
-
- final void configure (Component owner, Component contents, int x, int y) {
- this.owner = owner;
- this.contents = contents;
- this.x = x;
- this.y = y;
- }
-
- protected abstract void prepareResources();
- protected abstract void doShow();
- public abstract boolean isShowing();
- protected abstract void doHide();
-
- @Override
- public final void show() {
- prepareResources();
- doShow();
- }
-
- @Override
- public final void hide() {
- doHide();
- }
-
- void dispose() {
- owner = null;
- contents = null;
- x = -1;
- y = -1;
- }
-
- private boolean canReuse = false;
- public final void clear() {
- canReuse = true;
- dispose();
- }
-
- boolean isInUse() {
- return canReuse;
- }
- }
-
- private static class LWPopup extends OurPopup {
- public LWPopup (Component owner, Component contents, int x, int y) {
- super (owner, contents, x, y);
- }
-
- private Rectangle bounds = null;
- @Override
- protected void prepareResources() {
- JComponent jc = (JComponent) owner;
- Container w = jc.getTopLevelAncestor();
- JComponent pane = null;
- if (w instanceof JFrame) {
- pane = (JComponent) ((JFrame) w).getGlassPane();
- } else if (w instanceof JDialog) {
- pane = (JComponent) ((JDialog) w).getGlassPane();
- } else if (w instanceof JWindow) {
- pane = (JComponent) ((JWindow) w).getGlassPane();
- }
- if (w == null) {
- throw new IllegalArgumentException ("Not a JFrame/" + //NOI18N
- "JWindow/JDialog: " + owner); //NOI18N
- }
- Point p = new Point (x, y);
- SwingUtilities.convertPointFromScreen(p, pane);
- if (pane.getLayout() != null) {
- pane.setLayout (null);
- }
- pane.setVisible(true);
- contents.setVisible (false);
- Dimension d = contents.getPreferredSize();
- pane.add (contents);
- bounds = new Rectangle (p.x, p.y, d.width, d.height);
- contents.setBounds (p.x, p.y, d.width, d.height);
- }
-
- @Override
- protected void doShow() {
- contents.setVisible (true);
- }
-
- @Override
- public boolean isShowing() {
- return contents != null && contents.isShowing();
- }
-
- @Override
- protected void doHide() {
- Container parent = contents.getParent();
- if (parent != null) {
- contents.getParent().remove (contents);
- parent.repaint(bounds.x, bounds.y, bounds.width, bounds.height);
- parent.setVisible(false);
- }
- //If doShow() was never called, we've modified the visibility
- //of the contents component, which could cause problems elsewhere
- contents.setVisible (true);
- }
- }
-
- private static class HWPopup extends OurPopup {
- private JWindow window = null;
- public HWPopup (Component owner, Component contents, int x, int y) {
- super (owner, contents, x, y);
- }
-
- @Override
- public boolean isShowing() {
- return window != null && window.isShowing();
- }
-
- @Override
- void dispose() {
- window = null;
- super.dispose();
- }
-
- @Override
- protected void prepareResources() {
- window = new JWindow(SwingUtilities.getWindowAncestor(owner));
- window.setType(JWindow.Type.POPUP);
- window.getContentPane().add (contents);
- window.setLocation (new Point (x, y));
- window.pack();
- disableShadow(window);
- }
-
- @Override
- protected void doShow() {
- window.setVisible(true);
- }
-
- @Override
- protected void doHide() {
- if (window != null) {
- window.setVisible(false);
- window.getContentPane().remove (contents);
- //Try to force a reset
- dispose();
- }
- }
- }
-
- private static void disableShadow(JWindow win) {
- win.setBackground (new java.awt.Color (255, 255, 255, 0)); // Linux
- win.getRootPane().putClientProperty("Window.shadow", Boolean.FALSE.toString()); // Mac OS X // NOI18N
- }
-
-}
diff --git a/openide.explorer/src/org/openide/explorer/view/NodeRenderer.java b/openide.explorer/src/org/openide/explorer/view/NodeRenderer.java
index 63c9b3b..6e2b74a 100644
--- a/openide.explorer/src/org/openide/explorer/view/NodeRenderer.java
+++ b/openide.explorer/src/org/openide/explorer/view/NodeRenderer.java
@@ -48,7 +48,6 @@ import org.openide.awt.ListPane;
import org.openide.nodes.Node;
import java.awt.Component;
import java.awt.Container;
-import java.awt.EventQueue;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -137,7 +136,6 @@ public class NodeRenderer extends Object implements TreeCellRenderer, ListCellRe
public Component getTreeCellRendererComponent(
JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus
) {
- assertEDTAccess();
VisualizerNode vis = findVisualizerNode(value);
if (vis == draggedOver) {
@@ -172,7 +170,6 @@ public class NodeRenderer extends Object implements TreeCellRenderer, ListCellRe
public Component getListCellRendererComponent(
JList list, Object value, int index, boolean sel, boolean cellHasFocus
) {
- assertEDTAccess();
VisualizerNode vis = findVisualizerNode(value);
if (vis == draggedOver) {
@@ -293,21 +290,4 @@ public class NodeRenderer extends Object implements TreeCellRenderer, ListCellRe
static void dragExit() {
draggedOver = null;
}
-
- private void assertEDTAccess () {
- boolean check = false;
- assert check = true;
- if (check && !EventQueue.isDispatchThread() && System.getProperty("nbjunit.workdir") == null) {
- StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
- boolean whitespaced = false;
- for (int i = 0; i < stackTrace.length; ++i) {
- StackTraceElement elem = stackTrace[i];
- if ("org.openide.explorer.view.TreeView".equals(elem.getClassName()) && "<init>".equals(elem.getMethodName())) {
- whitespaced = true;
- break;
- }
- }
- assert whitespaced || EventQueue.isDispatchThread() : "Should be called in EDT only!";
- }
- }
}
diff --git a/openide.explorer/src/org/openide/explorer/view/TreeView.java b/openide.explorer/src/org/openide/explorer/view/TreeView.java
index e509e9b..3ee3fe0 100644
--- a/openide.explorer/src/org/openide/explorer/view/TreeView.java
+++ b/openide.explorer/src/org/openide/explorer/view/TreeView.java
@@ -53,6 +53,7 @@ import org.openide.nodes.NodeOp;
import org.openide.util.ContextAwareAction;
import org.openide.util.Lookup;
import org.openide.util.Mutex;
+import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;
import org.openide.util.Utilities;
import org.openide.util.WeakListeners;
@@ -63,11 +64,14 @@ import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.Font;
+import java.awt.GradientPaint;
import java.awt.Graphics;
+import java.awt.Graphics2D;
import java.awt.GraphicsEnvironment;
import java.awt.Insets;
import java.awt.Point;
import java.awt.Rectangle;
+import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
@@ -78,7 +82,9 @@ import java.awt.event.ActionListener;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.awt.event.InputEvent;
+import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent;
@@ -99,18 +105,25 @@ import javax.accessibility.AccessibleContext;
import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
import javax.swing.JComponent;
+import javax.swing.JLabel;
import javax.swing.JMenu;
+import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JRootPane;
import javax.swing.JScrollPane;
+import javax.swing.JTextField;
import javax.swing.JTree;
+import javax.swing.JViewport;
import javax.swing.KeyStroke;
import javax.swing.ScrollPaneLayout;
import javax.swing.SwingUtilities;
import javax.swing.ToolTipManager;
import javax.swing.TransferHandler;
import javax.swing.UIManager;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
import javax.swing.event.TreeExpansionEvent;
import javax.swing.event.TreeExpansionListener;
import javax.swing.event.TreeModelEvent;
@@ -118,6 +131,7 @@ import javax.swing.event.TreeModelListener;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.event.TreeWillExpandListener;
+import javax.swing.plaf.TreeUI;
import javax.swing.plaf.UIResource;
import javax.swing.tree.ExpandVetoException;
import javax.swing.tree.RowMapper;
@@ -617,11 +631,13 @@ public abstract class TreeView extends JScrollPane {
/** Expands all paths.
*/
public void expandAll() {
+ TreeUI treeUI = tree.getUI();
try {
tree.setUI(null);
TreeNode root = (TreeNode) tree.getModel().getRoot();
expandOrCollapseAll(new TreePath(root), true);
} finally {
+ tree.setUI(treeUI);
tree.updateUI();
}
}
diff --git a/openide.explorer/src/org/openide/explorer/view/ViewTooltips.java b/openide.explorer/src/org/openide/explorer/view/ViewTooltips.java
index cb8fd54..a316e67 100644
--- a/openide.explorer/src/org/openide/explorer/view/ViewTooltips.java
+++ b/openide.explorer/src/org/openide/explorer/view/ViewTooltips.java
@@ -50,7 +50,6 @@ import java.awt.Container;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
-import java.awt.Image;
import java.awt.Insets;
import java.awt.KeyboardFocusManager;
import java.awt.Point;
@@ -87,6 +86,7 @@ import javax.swing.event.TreeModelListener;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.TreePath;
+import org.openide.util.Lookup;
import org.openide.util.Utilities;
/**
@@ -396,10 +396,32 @@ final class ViewTooltips extends MouseAdapter implements MouseMotionListener {
}
}
- private static PopupFactory popupFactory;
private static PopupFactory getPopupFactory() {
- if (popupFactory == null) popupFactory = new CustomPopupFactory();
- return popupFactory;
+ if (Utilities.isMac()) {
+
+ // See ide/applemenu/src/org/netbeans/modules/applemenu/ApplePopupFactory
+ // We have a custom PopupFactory that will consistently use
+ // lightweight popups on Mac OS, since HW popups get a drop
+ // shadow. By default, popups returned when a heavyweight popup
+ // is needed (SDI mode) are no-op popups, since some hacks
+ // are necessary to make it really work.
+
+ // To enable heavyweight popups which have no drop shadow
+ // *most* of the time on mac os, run with
+ // -J-Dnb.explorer.hw.completions=true
+
+ // To enable heavyweight popups which have no drop shadow
+ // *ever* on mac os, you need to put the cocoa classes on the
+ // classpath - modify netbeans.conf to add
+ // System/Library/Java on the bootclasspath. *Then*
+ // run with the above line switch and
+ // -J-Dnb.explorer.hw.cocoahack=true
+
+ PopupFactory result = Lookup.getDefault().lookup (PopupFactory.class);
+ return result == null ? PopupFactory.getSharedInstance() : result;
+ } else {
+ return PopupFactory.getSharedInstance();
+ }
}
private Hider hider = null;
@@ -430,7 +452,7 @@ final class ViewTooltips extends MouseAdapter implements MouseMotionListener {
* renderer.
*/
private static final class ImgComp extends JComponent {
- private Image img;
+ private BufferedImage img;
private Dimension d = null;
private Color bg = Color.WHITE;
@@ -446,7 +468,7 @@ final class ViewTooltips extends MouseAdapter implements MouseMotionListener {
/**
* Create a clone with a specified backing image
*/
- ImgComp (Image img, Rectangle off, boolean right) {
+ ImgComp (BufferedImage img, Rectangle off, boolean right) {
this.img = img;
at = AffineTransform.getTranslateInstance(-off.x, 0);
d = new Dimension (off.width, off.height);
@@ -472,7 +494,7 @@ final class ViewTooltips extends MouseAdapter implements MouseMotionListener {
boolean lead = path.equals(tree.getSelectionModel().getLeadSelectionPath());
renderer = tree.getCellRenderer().getTreeCellRendererComponent(tree, nd, sel, exp, leaf, row, lead);
if (renderer != null) {
- setComponent (renderer, tree);
+ setComponent (renderer);
}
return true;
}
@@ -488,7 +510,7 @@ final class ViewTooltips extends MouseAdapter implements MouseMotionListener {
list.getSelectionModel().isSelectedIndex(row);
renderer = list.getCellRenderer().getListCellRendererComponent(list, nd, row, sel, false);
if (renderer != null) {
- setComponent (renderer, list);
+ setComponent (renderer);
}
return true;
}
@@ -515,23 +537,23 @@ final class ViewTooltips extends MouseAdapter implements MouseMotionListener {
/**
* Set the cell renderer we will proxy.
*/
- public void setComponent (Component jc, JComponent owner) {
- Dimension dd = jc.getPreferredSize();
+ public void setComponent (Component jc) {
+ Dimension d = jc.getPreferredSize();
Rectangle currentScreenBounds = Utilities.getUsableScreenBounds();
// get some reasonable limit for the width
- int width = Math.min(dd.width, 2 * currentScreenBounds.width);
- int height = Math.min(dd.height + 2, 2 * currentScreenBounds.height);
- Image nue = !Utilities.isMac() ? owner.createVolatileImage(width, height) :
- new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
- Graphics g = nue.getGraphics();
+ int width = Math.min(d.width, 2 * currentScreenBounds.width);
+ int height = Math.min(d.height + 2, 2 * currentScreenBounds.height);
+ BufferedImage nue = new BufferedImage (width, height,
+ BufferedImage.TYPE_INT_ARGB_PRE);
+ Graphics2D g = nue.createGraphics();
g.setColor (bg);
- g.fillRect (0, 0, width, dd.height + 2);
+ g.fillRect (0, 0, width, d.height + 2);
if( jc instanceof Container && !jc.isValid() ) {
//#214739
- jc.setSize( width, dd.height );
+ jc.setSize( width, d.height );
jc.doLayout();
}
- SwingUtilities.paintComponent(g, jc, this, 0, 0, width, dd.height + 2);
+ SwingUtilities.paintComponent(g, jc, this, 0, 0, width, d.height + 2);
g.dispose();
setImage (nue);
}
@@ -542,7 +564,7 @@ final class ViewTooltips extends MouseAdapter implements MouseMotionListener {
return new Rectangle (0, 0, dd.width, dd.height);
}
- private void setImage(Image img) {
+ private void setImage(BufferedImage img) {
this.img = img;
d = null;
}
@@ -550,7 +572,7 @@ final class ViewTooltips extends MouseAdapter implements MouseMotionListener {
@Override
public Dimension getPreferredSize() {
if (d == null) {
- d = new Dimension (img.getWidth(null), img.getHeight(null));
+ d = new Dimension (img.getWidth(), img.getHeight());
}
return d;
}
@@ -563,7 +585,7 @@ final class ViewTooltips extends MouseAdapter implements MouseMotionListener {
@Override
public void paint (Graphics g) {
Graphics2D g2d = (Graphics2D) g;
- g2d.drawImage (img, at, null);
+ g2d.drawRenderedImage (img, at);
g.setColor (Color.GRAY);
g.drawLine (0, 0, d.width, 0);
g.drawLine (0, d.height-1, d.width, d.height-1);
diff --git a/openide.explorer/src/org/openide/explorer/view/package.html b/openide.explorer/src/org/openide/explorer/view/package.html
index a5f6601..52a2daf 100644
--- a/openide.explorer/src/org/openide/explorer/view/package.html
+++ b/openide.explorer/src/org/openide/explorer/view/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/NodeDeletionTest.java b/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/NodeDeletionTest.java
index c083f52..b859f49 100644
--- a/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/NodeDeletionTest.java
+++ b/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/NodeDeletionTest.java
@@ -152,19 +152,12 @@ public class NodeDeletionTest extends NbTestCase {
tn.destroy();
Thread.currentThread().yield();
Thread.currentThread().sleep(500);
- final int [] postCountRef = new int[] { count };
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
- int rc = ps.table.getRowCount();
- synchronized (postCountRef) {
- postCountRef[0] = rc;
- }
+ System.currentTimeMillis();
}
});
- int postCount;
- synchronized (postCountRef) {
- postCount = postCountRef[0];
- }
+ int postCount = ps.table.getRowCount();
assertTrue("Property sheet should synchronously reflect node destruction" +
" even if destroyed on a non EQ thread", postCount == 0);
}
diff --git a/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertySheetQuickSearchEnablementTest.java b/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertySheetQuickSearchEnablementTest.java
index 7fa3e71..8b39131 100644
--- a/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertySheetQuickSearchEnablementTest.java
+++ b/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertySheetQuickSearchEnablementTest.java
@@ -1,7 +1,6 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2011, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2011 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -35,9 +34,9 @@
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
*
- */
-/*
- * Contributor(s): Tom Wheeler
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2011 Tom Wheeler
*/
package org.openide.explorer.propertysheet;
diff --git a/openide.explorer/test/unit/src/org/openide/explorer/view/AnotherSetKeysBeforeEventsProcessedTest.java b/openide.explorer/test/unit/src/org/openide/explorer/view/AnotherSetKeysBeforeEventsProcessedTest.java
index d1bea78..af6a7b1 100644
--- a/openide.explorer/test/unit/src/org/openide/explorer/view/AnotherSetKeysBeforeEventsProcessedTest.java
+++ b/openide.explorer/test/unit/src/org/openide/explorer/view/AnotherSetKeysBeforeEventsProcessedTest.java
@@ -110,17 +110,13 @@ public class AnotherSetKeysBeforeEventsProcessedTest extends NbTestCase {
class AwtRun implements Runnable {
VisualizerNode visNode;
- Panel p;
- BeanTreeView btv;
- JFrame f;
- JTree tree;
+ Panel p = new Panel();
+ BeanTreeView btv = new BeanTreeView();
+ JFrame f = new JFrame();
+ JTree tree = btv.tree;
boolean ok;
public void run() {
- p = new Panel();
- btv = new BeanTreeView();
- f = new JFrame();
- tree = btv.tree;
try {
root.setName("test root");
p.getExplorerManager().setRootContext(root);
diff --git a/openide.explorer/test/unit/src/org/openide/explorer/view/BeanTreeViewTest.java b/openide.explorer/test/unit/src/org/openide/explorer/view/BeanTreeViewTest.java
index 8931734..d29cf65 100644
--- a/openide.explorer/test/unit/src/org/openide/explorer/view/BeanTreeViewTest.java
+++ b/openide.explorer/test/unit/src/org/openide/explorer/view/BeanTreeViewTest.java
@@ -50,16 +50,12 @@ import java.awt.GraphicsEnvironment;
import java.beans.PropertyVetoException;
import java.io.IOException;
import java.lang.ref.WeakReference;
-import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.TimeUnit;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JTree;
@@ -73,7 +69,6 @@ import org.openide.explorer.ExplorerManager;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.Children;
import org.openide.nodes.Node;
-import org.openide.util.RequestProcessor;
/**
* Tests for class BeanTreeViewTest
@@ -93,7 +88,7 @@ public class BeanTreeViewTest extends NbTestCase {
public BeanTreeViewTest(String name) {
super(name);
}
-
+
public void testOnlyChildRemoveCausesSelectionOfParent() throws Throwable {
ExplorerManager em = doChildRemovalTest("one", "one");
final List<Node> arr = Arrays.asList(em.getSelectedNodes());
@@ -128,33 +123,25 @@ public class BeanTreeViewTest extends NbTestCase {
}
children = arr.toArray(new Node[0]);
}
- Panel p;
- BeanTreeView btv;
- JFrame f;
- JTree tree;
+ Panel p = new Panel();
+ BeanTreeView btv = new BeanTreeView();
+ JFrame f = new JFrame();
+ JTree tree = btv.tree;
Node operateOn;
- private void initUI() {
- if (p == null) {
- p = new Panel();
- btv = new BeanTreeView();
- f = new JFrame();
- tree = btv.tree;
- root.setName("test root");
- root.getChildren().add(children);
- p.getExplorerManager().setRootContext(root);
- p.add(BorderLayout.CENTER, btv);
- f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- f.getContentPane().add(BorderLayout.CENTER, p);
- f.setVisible(true);
- }
+ {
+ root.setName("test root");
+ root.getChildren().add(children);
+ p.getExplorerManager().setRootContext(root);
+ p.add(BorderLayout.CENTER, btv);
+ f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ f.getContentPane().add(BorderLayout.CENTER, p);
+ f.setVisible(true);
}
@Override
public void run() {
- initUI();
-
for (int i = 0;; i++) {
if (name.equals(children[i].getName())) {
// this should select a sibling of the removed node
@@ -235,28 +222,11 @@ public class BeanTreeViewTest extends NbTestCase {
}
children = arr.toArray(new Node[0]);
}
- AbstractNode root = new AbstractNode(new RefreshableChildren());
- Panel p;
- BeanTreeView btv;
- JFrame f;
- JTree tree;
+ Panel p = new Panel();
+ BeanTreeView btv = new BeanTreeView();
+ JFrame f = new JFrame();
+ JTree tree = btv.tree;
Node operateOn;
-
- private void initUI() {
- if (p == null) {
- p = new Panel();
- btv = new BeanTreeView();
- f = new JFrame();
- tree = btv.tree;
- ((RefreshableChildren) root.getChildren()).refreshKeys(childrenNames);
- root.setName("test root");
- p.getExplorerManager().setRootContext(root);
- p.add(BorderLayout.CENTER, btv);
- f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- f.getContentPane().add(BorderLayout.CENTER, p);
- f.setVisible(true);
- }
- }
// children must be Children.Keys(lazy)
class RefreshableChildren extends Children.Keys<String> {
@@ -281,12 +251,21 @@ public class BeanTreeViewTest extends NbTestCase {
super.setKeys(keys);
}
}
+ AbstractNode root = new AbstractNode(new RefreshableChildren());
+
+ {
+ ((RefreshableChildren) root.getChildren()).refreshKeys(childrenNames);
+ root.setName("test root");
+ p.getExplorerManager().setRootContext(root);
+ p.add(BorderLayout.CENTER, btv);
+ f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ f.getContentPane().add(BorderLayout.CENTER, p);
+ f.setVisible(true);
+ }
@Override
public void run() {
- initUI();
-
List<Node> selection = new ArrayList<Node>();
for (int i = 0; i < children.length; i++) {
@@ -337,61 +316,8 @@ public class BeanTreeViewTest extends NbTestCase {
});
WeakReference<Node> wref = new WeakReference<Node>(operateOn);
operateOn = null;
- RequestProcessor selectionProcessor;
- int delay;
- try {
- Method getSelectionProcessorMethod = ExplorerManager.class.getDeclaredMethod("getSelectionProcessor");
- getSelectionProcessorMethod.setAccessible(true);
- selectionProcessor = (RequestProcessor) getSelectionProcessorMethod.invoke(null);
- Field delayField = ExplorerManager.class.getDeclaredField("SELECTION_SYNC_DELAY");
- delayField.setAccessible(true);
- delay = (Integer) delayField.get(null);
-
- // Wait for the task in selectionProcessor to start up:
- Class ticTacClass = Class.forName(RequestProcessor.class.getName()+"$TickTac");
- Field tickField = ticTacClass.getDeclaredField("TICK");
- tickField.setAccessible(true);
- Object tick = tickField.get(null);
- if (tick != null) {
- // Waiting for the tick queue to become empty (scheduled tasks removed)
- Field queueField = ticTacClass.getDeclaredField("queue");
- queueField.setAccessible(true);
- Queue queue = (Queue) queueField.get(tick);
- while (hasOwnersOf(tick, queue, selectionProcessor)) {
- //System.err.println("Waiting for queue "+Integer.toHexString(System.identityHashCode(queue))+" to become empty... peek = "+queue.peek()+" is empty = "+queue.isEmpty());
- Thread.sleep(2*delay); // Wait for the queue with scheduled tasks to become empty
- }
- }
- } catch (IllegalAccessException ex) {
- throw new InvocationTargetException(ex);
- } catch (NoSuchMethodException ex) {
- throw new InvocationTargetException(ex);
- } catch (NoSuchFieldException ex) {
- throw new InvocationTargetException(ex);
- } catch (ClassNotFoundException ex) {
- throw new InvocationTargetException(ex);
- }
-
- // Wait for the task, removed from tick queue, to be attached to a processor...
- Thread.sleep(2*delay); // No reliable way :-(
- // Wait for the task in selectionProcessor to finish
- selectionProcessor.awaitTermination(60, TimeUnit.SECONDS);
assertGC("Node should be released.", wref);
}
- private boolean hasOwnersOf(Object tick, Queue q, RequestProcessor rp) throws NoSuchFieldException, IllegalArgumentException, IllegalAccessException, ClassNotFoundException {
- Class itemClass = Class.forName(RequestProcessor.class.getName()+"$Item");
- Field ownerField = itemClass.getDeclaredField("owner");
- ownerField.setAccessible(true);
- synchronized (tick) {
- for (Object o : q) {
- Object ownerRP = ownerField.get(o);
- if (rp.equals(ownerRP)) {
- return true;
- }
- }
- }
- return false;
- }
}
AWTTst awt = new AWTTst();
holder = awt;
@@ -421,30 +347,23 @@ public class BeanTreeViewTest extends NbTestCase {
createLeaf("bla")
};
VisualizerNode[] visNodes;
- Panel p;
- BeanTreeView btv;
- JFrame f;
- JTree tree;
-
- private void initUI() {
- if (p == null) {
- p = new Panel();
- btv = new BeanTreeView();
- f = new JFrame();
- tree = btv.tree;
- root.setName("test root");
- root.getChildren().add(children);
- p.getExplorerManager().setRootContext(root);
- p.add(BorderLayout.CENTER, btv);
- f.setDefaultCloseOperation(f.EXIT_ON_CLOSE);
- f.getContentPane().add(BorderLayout.CENTER, p);
- f.setVisible(true);
- }
+ Panel p = new Panel();
+ BeanTreeView btv = new BeanTreeView();
+ JFrame f = new JFrame();
+ JTree tree = btv.tree;
+
+ {
+ root.setName("test root");
+ root.getChildren().add(children);
+ p.getExplorerManager().setRootContext(root);
+ p.add(BorderLayout.CENTER, btv);
+ f.setDefaultCloseOperation(f.EXIT_ON_CLOSE);
+ f.getContentPane().add(BorderLayout.CENTER, p);
+ f.setVisible(true);
}
public void run() {
- initUI();
try {
p.getExplorerManager().setSelectedNodes(children);
@@ -503,29 +422,22 @@ public class BeanTreeViewTest extends NbTestCase {
AbstractNode root = new AbstractNode(new Children.Array());
VisualizerNode visNode;
- Panel p;
- BeanTreeView btv;
- JFrame f;
- JTree tree;
-
- private void initUI() {
- if (p == null) {
- p = new Panel();
- btv = new BeanTreeView();
- f = new JFrame();
- tree = btv.tree;
- root.setName("test root");
- p.getExplorerManager().setRootContext(root);
- p.add(BorderLayout.CENTER, btv);
- f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- f.getContentPane().add(BorderLayout.CENTER, p);
- f.setVisible(true);
- }
+ Panel p = new Panel();
+ BeanTreeView btv = new BeanTreeView();
+ JFrame f = new JFrame();
+ JTree tree = btv.tree;
+
+ {
+ root.setName("test root");
+ p.getExplorerManager().setRootContext(root);
+ p.add(BorderLayout.CENTER, btv);
+ f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ f.getContentPane().add(BorderLayout.CENTER, p);
+ f.setVisible(true);
}
@Override
public void run() {
- initUI();
try {
btv.selectionChanged(new Node[] { root }, p.getExplorerManager());
} catch (PropertyVetoException ex) {
@@ -555,30 +467,23 @@ public class BeanTreeViewTest extends NbTestCase {
createLeaf("bla")
};
VisualizerNode visNode;
- Panel p;
- BeanTreeView btv;
- JFrame f;
- JTree tree;
-
- private void initUI() {
- if (p == null) {
- p = new Panel();
- btv = new BeanTreeView();
- f = new JFrame();
- tree = btv.tree;
- root.setName("test root");
- root.getChildren().add(children);
- p.getExplorerManager().setRootContext(root);
- p.add(BorderLayout.CENTER, btv);
- f.setDefaultCloseOperation(f.EXIT_ON_CLOSE);
- f.getContentPane().add(BorderLayout.CENTER, p);
- f.setVisible(true);
- }
+ Panel p = new Panel();
+ BeanTreeView btv = new BeanTreeView();
+ JFrame f = new JFrame();
+ JTree tree = btv.tree;
+
+ {
+ root.setName("test root");
+ root.getChildren().add(children);
+ p.getExplorerManager().setRootContext(root);
+ p.add(BorderLayout.CENTER, btv);
+ f.setDefaultCloseOperation(f.EXIT_ON_CLOSE);
+ f.getContentPane().add(BorderLayout.CENTER, p);
+ f.setVisible(true);
}
public void run() {
- initUI();
try {
p.getExplorerManager().setSelectedNodes(new Node[] {children[0]});
diff --git a/openide.explorer/test/unit/src/org/openide/explorer/view/ContextTreeViewTest.java b/openide.explorer/test/unit/src/org/openide/explorer/view/ContextTreeViewTest.java
index 7f411cc..9fc76fb 100644
--- a/openide.explorer/test/unit/src/org/openide/explorer/view/ContextTreeViewTest.java
+++ b/openide.explorer/test/unit/src/org/openide/explorer/view/ContextTreeViewTest.java
@@ -86,21 +86,21 @@ public class ContextTreeViewTest extends NbTestCase {
createLeaf("huk"),
});
+ Panel p = new Panel();
+ p.getExplorerManager().setRootContext(root);
+
+ ContextTreeView ctv = new ContextTreeView();
+ p.add(BorderLayout.CENTER, ctv);
+
+ JFrame f = new JFrame();
+ f.setDefaultCloseOperation(f.EXIT_ON_CLOSE);
+ f.getContentPane().add(BorderLayout.CENTER, p);
+ f.setVisible(true);
+
+ final JTree tree = ctv.tree;
+
class AWTTst implements Runnable {
public void run() {
- Panel p = new Panel();
- p.getExplorerManager().setRootContext(root);
-
- ContextTreeView ctv = new ContextTreeView();
- p.add(BorderLayout.CENTER, ctv);
-
- JFrame f = new JFrame();
- f.setDefaultCloseOperation(f.EXIT_ON_CLOSE);
- f.getContentPane().add(BorderLayout.CENTER, p);
- f.setVisible(true);
-
- final JTree tree = ctv.tree;
-
// wait a while till the frame is realized and ctv.addNotify called
Object r = tree.getModel().getRoot();
assertEquals("There is root", Visualizer.findVisualizer(root), r);
diff --git a/openide.explorer/test/unit/src/org/openide/explorer/view/TreeTableMemoryLeakTest.java b/openide.explorer/test/unit/src/org/openide/explorer/view/TreeTableMemoryLeakTest.java
index 0671d99..2771986 100644
--- a/openide.explorer/test/unit/src/org/openide/explorer/view/TreeTableMemoryLeakTest.java
+++ b/openide.explorer/test/unit/src/org/openide/explorer/view/TreeTableMemoryLeakTest.java
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
package org.openide.explorer.view;
import java.awt.GraphicsEnvironment;
diff --git a/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewExpandAllTest.java b/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewExpandAllTest.java
index c338183..5c87579 100644
--- a/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewExpandAllTest.java
+++ b/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewExpandAllTest.java
@@ -88,15 +88,15 @@ public class TreeViewExpandAllTest extends NbTestCase {
public void doTestExpandAll() throws InterruptedException, InvocationTargetException {
+ final BeanTreeView beanTreeView = new BeanTreeView();
+ final ExplorerWindow testWindow = new ExplorerWindow();
+ testWindow.getContentPane().add(beanTreeView);
+ // Node which has 7 levels 0-6
+ testWindow.getExplorerManager().setRootContext(new LevelNode(6));
+
EventQueue.invokeAndWait(new Runnable() {
public void run() {
- final BeanTreeView beanTreeView = new BeanTreeView();
- final ExplorerWindow testWindow = new ExplorerWindow();
- testWindow.getContentPane().add(beanTreeView);
- // Node which has 7 levels 0-6
- testWindow.getExplorerManager().setRootContext(new LevelNode(6));
-
testWindow.pack();
testWindow.setVisible(true);
beanTreeView.expandAll();
diff --git a/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewQuickSearchTest.java b/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewQuickSearchTest.java
index 3e965b8..73a453e 100644
--- a/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewQuickSearchTest.java
+++ b/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewQuickSearchTest.java
@@ -84,11 +84,6 @@ public class TreeViewQuickSearchTest extends NbTestCase {
}
@Override
- protected void setUp() throws Exception {
- f = null;
- }
-
- @Override
protected void tearDown() throws Exception {
while (f != null && f.isShowing()) {
f.setVisible(false);
@@ -109,33 +104,25 @@ public class TreeViewQuickSearchTest extends NbTestCase {
root.getChildren().add(children);
+ final Panel p = new Panel();
+ p.getExplorerManager().setRootContext(root);
+
+ final BeanTreeView btv = new BeanTreeView();
+ p.add(BorderLayout.CENTER, btv);
+
+ f = new JFrame();
+ f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ f.getContentPane().add(BorderLayout.CENTER, p);
+ f.pack();
+ f.setVisible(true);
+
+ final JTree tree = btv.tree;
final Exception[]problem = new Exception[1];
final Integer[] phase = new Integer[1];
phase[0] = 0;
class AWTTst implements Runnable {
-
- private Panel p;
- private BeanTreeView btv;
- private JTree tree;
-
- private void initFrame() {
- if (f == null) {
- p = new Panel();
- p.getExplorerManager().setRootContext(root);
- btv = new BeanTreeView();
- p.add(BorderLayout.CENTER, btv);
- tree = btv.tree;
- f = new JFrame();
- f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- f.getContentPane().add(BorderLayout.CENTER, p);
- f.pack();
- f.setVisible(true);
- }
- }
-
@Override
public void run() {
- initFrame();
try {
if (phase[0] == 0) {
btv.tree.requestFocus();
@@ -206,34 +193,27 @@ public class TreeViewQuickSearchTest extends NbTestCase {
root.getChildren().add(children);
- final BeanTreeView[] btvPtr = new BeanTreeView[] { null };
+ final Panel p = new Panel();
+ p.getExplorerManager().setRootContext(root);
+
+ final BeanTreeView btv = new BeanTreeView();
+ p.add(BorderLayout.CENTER, btv);
+
+
+ f = new JFrame();
+ f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ f.getContentPane().add(BorderLayout.CENTER, p);
+ f.pack();
+ f.setVisible(true);
+
+
final Exception[] problem = new Exception[1];
final Integer[] phase = new Integer[1];
phase[0] = 0;
class AWTTst implements Runnable {
- private Panel p;
- private BeanTreeView btv;
-
- private void initFrame() {
- if (f == null) {
- p = new Panel();
- p.getExplorerManager().setRootContext(root);
- btv = new BeanTreeView();
- btvPtr[0] = btv;
- p.add(BorderLayout.CENTER, btv);
- f = new JFrame();
- f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- f.getContentPane().add(BorderLayout.CENTER, p);
- f.pack();
- f.setVisible(true);
-
- }
- }
-
@Override
public void run() {
- initFrame();
if (phase[0] == 0) {
btv.tree.requestFocus();
try {
@@ -262,14 +242,14 @@ public class TreeViewQuickSearchTest extends NbTestCase {
}
Thread.sleep(1000);
phase[0] = 1;
- btvPtr[0].setQuickSearchAllowed(true);
+ btv.setQuickSearchAllowed(true);
SwingUtilities.invokeAndWait(awt);
if (problem[0] != null) {
throw problem[0];
}
Thread.sleep(1000);
- btvPtr[0].setQuickSearchAllowed(false);
+ btv.setQuickSearchAllowed(false);
SwingUtilities.invokeAndWait(awt);
}
@@ -300,33 +280,26 @@ public class TreeViewQuickSearchTest extends NbTestCase {
};
mainRoot.getChildren().add(mainChildren);
+ final Panel p = new Panel();
+ p.getExplorerManager().setRootContext(mainRoot);
+
+ final BeanTreeView btv = new BeanTreeView();
+ p.add(BorderLayout.CENTER, btv);
+
+ f = new JFrame();
+ f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ f.getContentPane().add(BorderLayout.CENTER, p);
+ f.pack();
+ f.setVisible(true);
+
+ final JTree tree = btv.tree;
final Exception[] problem = new Exception[1];
final Integer[] phase = new Integer[1];
phase[0] = 0;
class AWTTst implements Runnable {
- private Panel p;
- private BeanTreeView btv;
- private JTree tree;
-
- private void initFrame() {
- if (f == null) {
- p = new Panel();
- p.getExplorerManager().setRootContext(mainRoot);
- btv = new BeanTreeView();
- p.add(BorderLayout.CENTER, btv);
- tree = btv.tree;
- f = new JFrame();
- f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- f.getContentPane().add(BorderLayout.CENTER, p);
- f.pack();
- f.setVisible(true);
- }
- }
-
@Override
public void run() {
- initFrame();
try {
if (phase[0] == 0) {
btv.tree.requestFocus();
diff --git a/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java b/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java
index 90c91cf..3bfc430 100644
--- a/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java
+++ b/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java
@@ -103,11 +103,6 @@ public final class TreeViewTest extends NbTestCase {
}
@Override
- protected void setUp() throws Exception {
- testWindow = null;
- }
-
- @Override
protected void runTest() throws Throwable {
VisualizerNode.LOG.setLevel(Level.FINE);
log = Log.enable(VisualizerNode.LOG.getName(), Level.FINE);
@@ -123,7 +118,7 @@ public final class TreeViewTest extends NbTestCase {
* <code>TreeView.TreePropertyListener.treeExpanded(...)</code>.
*/
@RandomlyFails // NB-Core-Build #8278: Check the view has scrolled
- public void testAutoscrollOnOff() throws InterruptedException, InvocationTargetException {
+ public void testAutoscrollOnOff() throws InterruptedException {
assert !EventQueue.isDispatchThread();
class Detector implements Runnable {
@@ -161,12 +156,7 @@ public final class TreeViewTest extends NbTestCase {
}
}
}
- SwingUtilities.invokeAndWait(new Runnable() {
- @Override
- public void run() {
- testWindow = new ExplorerWindow();
- }
- });
+ testWindow = new ExplorerWindow();
testWindow.showWindow();
EventQueue.invokeLater(new Tester(true, 1));
Thread.sleep(2000); //wait for update of the screen
@@ -219,12 +209,7 @@ public final class TreeViewTest extends NbTestCase {
final OutOfAWT ch = new OutOfAWT(false, "A", "B", "C");
AbstractNode an = new AbstractNode(ch);
root.getChildren().add(new Node[] { an });
- SwingUtilities.invokeAndWait(new Runnable() {
- @Override
- public void run() {
- testWindow = new ExplorerWindow();
- }
- });
+ testWindow = new ExplorerWindow();
testWindow.showWindow();
testWindow.getExplorerManager().setRootContext(root);
@@ -519,12 +504,7 @@ public final class TreeViewTest extends NbTestCase {
node.setName(getName());
AbstractNode root = node;
- SwingUtilities.invokeAndWait(new Runnable() {
- @Override
- public void run() {
- testWindow = new ExplorerWindow();
- }
- });
+ testWindow = new ExplorerWindow();
testWindow.showWindow();
testWindow.getExplorerManager().setRootContext(root);
assertSame("Root is OK", root, testWindow.getExplorerManager().getRootContext());
@@ -553,16 +533,16 @@ public final class TreeViewTest extends NbTestCase {
}
@RandomlyFails // http://deadlock.netbeans.org/job/NB-Core-Build/9880/testReport/
- public void testNodesGCedAfterSetChildrenLazy() throws Exception {
+ public void testNodesGCedAfterSetChildrenLazy() {
doTestNodesGCedAfterSetChildren(true);
}
@RandomlyFails // NB-Core-Build #9918: Unstable, NB-Core-Build #9919 on the same sources passed
- public void testNodesGCedAfterSetChildrenEager() throws Exception {
+ public void testNodesGCedAfterSetChildrenEager() {
doTestNodesGCedAfterSetChildren(false);
}
- void doTestNodesGCedAfterSetChildren(boolean lazy) throws Exception {
+ void doTestNodesGCedAfterSetChildren(boolean lazy) {
Keys keys = new Keys(lazy, "A", "B", "C");
class MyNode extends AbstractNode {
@@ -575,12 +555,7 @@ public final class TreeViewTest extends NbTestCase {
}
MyNode root = new MyNode(keys);
root.setName(getName());
- SwingUtilities.invokeAndWait(new Runnable() {
- @Override
- public void run() {
- testWindow = new ExplorerWindow();
- }
- });
+ testWindow = new ExplorerWindow();
testWindow.showWindow();
testWindow.getExplorerManager().setRootContext(root);
testWindow.getExplorerManager().setExploredContext(root);
@@ -615,12 +590,7 @@ public final class TreeViewTest extends NbTestCase {
node.setName(getName());
final AbstractNode root = node;
- SwingUtilities.invokeAndWait(new Runnable() {
- @Override
- public void run() {
- testWindow = new ExplorerWindow();
- }
- });
+ testWindow = new ExplorerWindow();
testWindow.getExplorerManager().setRootContext(root);
testWindow.showWindow();
@@ -676,12 +646,7 @@ public final class TreeViewTest extends NbTestCase {
node.setName(getName());
final AbstractNode root = node;
- SwingUtilities.invokeAndWait(new Runnable() {
- @Override
- public void run() {
- testWindow = new ExplorerWindow();
- }
- });
+ testWindow = new ExplorerWindow();
testWindow.getExplorerManager().setRootContext(root);
testWindow.showWindow();
testWindow.getExplorerManager().setRootContext(root);
diff --git a/openide.filesystems.compat8/arch.xml b/openide.filesystems.compat8/arch.xml
index aefcbe2..9742eba 100644
--- a/openide.filesystems.compat8/arch.xml
+++ b/openide.filesystems.compat8/arch.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
diff --git a/openide.filesystems.compat8/build.xml b/openide.filesystems.compat8/build.xml
index 2bb1f3d..91e1b85 100644
--- a/openide.filesystems.compat8/build.xml
+++ b/openide.filesystems.compat8/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="openide.filesystems.compat8">
<description>Builds, tests, and runs the project org.openide.filesystems.compat8</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/openide.filesystems.compat8/manifest.mf b/openide.filesystems.compat8/manifest.mf
index f1b4041..8a5d451 100644
--- a/openide.filesystems.compat8/manifest.mf
+++ b/openide.filesystems.compat8/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.filesystems.compat8
OpenIDE-Module-Localizing-Bundle: org/openide/filesystems/compat8/Bundle.properties
-OpenIDE-Module-Specification-Version: 9.9.1
+OpenIDE-Module-Specification-Version: 9.7.1
OpenIDE-Module-Fragment-Host: org.openide.filesystems
diff --git a/openide.filesystems.compat8/nbproject/project.properties b/openide.filesystems.compat8/nbproject/project.properties
index dc8eca8..625bd7a 100644
--- a/openide.filesystems.compat8/nbproject/project.properties
+++ b/openide.filesystems.compat8/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
module.jar.dir=core
diff --git a/openide.filesystems.compat8/nbproject/project.xml b/openide.filesystems.compat8/nbproject/project.xml
index ed1ab02..59feec1 100644
--- a/openide.filesystems.compat8/nbproject/project.xml
+++ b/openide.filesystems.compat8/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/openide.filesystems.compat8/src/org/openide/filesystems/compat8/Bundle.properties b/openide.filesystems.compat8/src/org/openide/filesystems/compat8/Bundle.properties
index d2e633d..367fbfb 100644
--- a/openide.filesystems.compat8/src/org/openide/filesystems/compat8/Bundle.properties
+++ b/openide.filesystems.compat8/src/org/openide/filesystems/compat8/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Long-Description=\
After NetBeans 8.0 release, deprecated and obsolete features were removed from the FileSystem API mainline. \
diff --git a/openide.filesystems.nb/build.xml b/openide.filesystems.nb/build.xml
index 2a6422d..773eef3 100644
--- a/openide.filesystems.nb/build.xml
+++ b/openide.filesystems.nb/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="openide.filesystems.nb">
<description>Builds, tests, and runs the project openide.filesystems.nb</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/openide.filesystems.nb/manifest.mf b/openide.filesystems.nb/manifest.mf
index 60c1fc8..813074d 100644
--- a/openide.filesystems.nb/manifest.mf
+++ b/openide.filesystems.nb/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.filesystems.nb
OpenIDE-Module-Localizing-Bundle: org/openide/filesystems/nb/Bundle.properties
-OpenIDE-Module-Specification-Version: 9.9.1
+OpenIDE-Module-Specification-Version: 9.7.1
diff --git a/openide.filesystems.nb/nbproject/org-openide-filesystems-nb.sig b/openide.filesystems.nb/nbproject/org-openide-filesystems-nb.sig
index 468155c..13fa45d 100644
--- a/openide.filesystems.nb/nbproject/org-openide-filesystems-nb.sig
+++ b/openide.filesystems.nb/nbproject/org-openide-filesystems-nb.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 9.7.1
+#Version 8.11
CLSS public java.io.IOException
cons public init()
@@ -11,8 +11,11 @@ hfds serialVersionUID
CLSS public abstract interface java.io.Serializable
-CLSS public abstract interface java.lang.AutoCloseable
-meth public abstract void close() throws java.lang.Exception
+CLSS public abstract interface !annotation java.lang.Deprecated
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE])
+intf java.lang.annotation.Annotation
CLSS public java.lang.Exception
cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean)
@@ -98,6 +101,28 @@ meth public java.lang.String toString()
supr java.lang.Object
hfds serialVersionUID
+CLSS public abstract javax.annotation.processing.AbstractProcessor
+cons protected init()
+fld protected javax.annotation.processing.ProcessingEnvironment processingEnv
+intf javax.annotation.processing.Processor
+meth protected boolean isInitialized()
+meth public abstract boolean process(java.util.Set<? extends javax.lang.model.element.TypeElement>,javax.annotation.processing.RoundEnvironment)
+meth public java.lang.Iterable<? extends javax.annotation.processing.Completion> getCompletions(javax.lang.model.element.Element,javax.lang.model.element.AnnotationMirror,javax.lang.model.element.ExecutableElement,java.lang.String)
+meth public java.util.Set<java.lang.String> getSupportedAnnotationTypes()
+meth public java.util.Set<java.lang.String> getSupportedOptions()
+meth public javax.lang.model.SourceVersion getSupportedSourceVersion()
+meth public void init(javax.annotation.processing.ProcessingEnvironment)
+supr java.lang.Object
+hfds initialized
+
+CLSS public abstract interface javax.annotation.processing.Processor
+meth public abstract boolean process(java.util.Set<? extends javax.lang.model.element.TypeElement>,javax.annotation.processing.RoundEnvironment)
+meth public abstract java.lang.Iterable<? extends javax.annotation.processing.Completion> getCompletions(javax.lang.model.element.Element,javax.lang.model.element.AnnotationMirror,javax.lang.model.element.ExecutableElement,java.lang.String)
+meth public abstract java.util.Set<java.lang.String> getSupportedAnnotationTypes()
+meth public abstract java.util.Set<java.lang.String> getSupportedOptions()
+meth public abstract javax.lang.model.SourceVersion getSupportedSourceVersion()
+meth public abstract void init(javax.annotation.processing.ProcessingEnvironment)
+
CLSS public abstract org.openide.filesystems.AbstractFileSystem
cons public init()
fld protected org.openide.filesystems.AbstractFileSystem$Attr attr
@@ -109,7 +134,6 @@ innr public abstract interface static Attr
innr public abstract interface static Change
innr public abstract interface static Info
innr public abstract interface static List
-innr public abstract interface static SymlinkInfo
innr public abstract interface static Transfer
meth protected <%0 extends org.openide.filesystems.FileObject> java.lang.ref.Reference<{%%0}> createReference({%%0})
meth protected boolean canRead(java.lang.String)
@@ -123,11 +147,13 @@ meth protected final void refreshResource(java.lang.String,boolean)
meth protected final void setRefreshTime(int)
meth protected void markImportant(java.lang.String,boolean)
meth public abstract java.lang.String getDisplayName()
+meth public org.openide.filesystems.FileObject find(java.lang.String,java.lang.String,java.lang.String)
+ anno 0 java.lang.Deprecated()
meth public org.openide.filesystems.FileObject findResource(java.lang.String)
meth public org.openide.filesystems.FileObject getRoot()
meth public void refresh(boolean)
supr org.openide.filesystems.FileSystem
-hfds lastEnum,refresher,root,serialVersionUID
+hfds NO_SYSTEM_ACTIONS,SYSTEM_ACTIONS,lastEnum,refresher,root,serialVersionUID
CLSS public abstract interface static org.openide.filesystems.AbstractFileSystem$Attr
outer org.openide.filesystems.AbstractFileSystem
@@ -173,13 +199,6 @@ fld public final static long serialVersionUID = -6242105832891012528
intf java.io.Serializable
meth public abstract java.lang.String[] children(java.lang.String)
-CLSS public abstract interface static org.openide.filesystems.AbstractFileSystem$SymlinkInfo
- outer org.openide.filesystems.AbstractFileSystem
-intf java.io.Serializable
-meth public abstract boolean isSymbolicLink(java.lang.String) throws java.io.IOException
-meth public abstract java.lang.String getCanonicalName(java.lang.String) throws java.io.IOException
-meth public abstract java.lang.String readSymbolicLink(java.lang.String) throws java.io.IOException
-
CLSS public abstract interface static org.openide.filesystems.AbstractFileSystem$Transfer
outer org.openide.filesystems.AbstractFileSystem
fld public final static long serialVersionUID = -8945397853892302838
@@ -301,9 +320,7 @@ CLSS public org.openide.filesystems.FileLock
cons public init()
fld protected java.lang.Throwable lockedBy
fld public final static org.openide.filesystems.FileLock NONE
-intf java.lang.AutoCloseable
meth public boolean isValid()
-meth public void close()
meth public void finalize()
meth public void releaseLock()
supr java.lang.Object
@@ -312,7 +329,6 @@ hfds locked
CLSS public abstract org.openide.filesystems.FileObject
cons public init()
fld public final static java.lang.String DEFAULT_LINE_SEPARATOR_ATTR = "default-line-separator"
-fld public final static java.lang.String DEFAULT_PATHNAME_SEPARATOR_ATTR = "default-pathname-separator"
intf java.io.Serializable
intf org.openide.util.Lookup$Provider
meth protected void fireFileAttributeChangedEvent(java.util.Enumeration<org.openide.filesystems.FileChangeListener>,org.openide.filesystems.FileAttributeEvent)
@@ -354,7 +370,6 @@ meth public boolean canRead()
meth public boolean canWrite()
meth public boolean existsExt(java.lang.String)
meth public boolean isLocked()
-meth public boolean isSymbolicLink() throws java.io.IOException
meth public boolean isVirtual()
meth public byte[] asBytes() throws java.io.IOException
meth public final boolean canRevert()
@@ -376,7 +391,6 @@ meth public java.lang.String getPackageName(char)
meth public java.lang.String getPackageNameExt(char,char)
anno 0 java.lang.Deprecated()
meth public java.lang.String getPath()
-meth public java.lang.String readSymbolicLinkPath() throws java.io.IOException
meth public java.lang.String toString()
meth public java.util.Enumeration<? extends org.openide.filesystems.FileObject> getChildren(boolean)
meth public java.util.Enumeration<? extends org.openide.filesystems.FileObject> getData(boolean)
@@ -385,10 +399,8 @@ meth public java.util.List<java.lang.String> asLines() throws java.io.IOExceptio
meth public java.util.List<java.lang.String> asLines(java.lang.String) throws java.io.IOException
meth public org.openide.filesystems.FileObject copy(org.openide.filesystems.FileObject,java.lang.String,java.lang.String) throws java.io.IOException
meth public org.openide.filesystems.FileObject createData(java.lang.String) throws java.io.IOException
-meth public org.openide.filesystems.FileObject getCanonicalFileObject() throws java.io.IOException
meth public org.openide.filesystems.FileObject getFileObject(java.lang.String)
meth public org.openide.filesystems.FileObject move(org.openide.filesystems.FileLock,org.openide.filesystems.FileObject,java.lang.String,java.lang.String) throws java.io.IOException
-meth public org.openide.filesystems.FileObject readSymbolicLink() throws java.io.IOException
meth public org.openide.util.Lookup getLookup()
meth public void addRecursiveListener(org.openide.filesystems.FileChangeListener)
meth public void refresh()
@@ -468,36 +480,27 @@ meth public org.openide.filesystems.FileObject createTempFile(org.openide.filesy
meth public org.openide.filesystems.FileObject find(java.lang.String,java.lang.String,java.lang.String)
anno 0 java.lang.Deprecated()
meth public org.openide.filesystems.FileObject getTempFolder() throws java.io.IOException
-meth public org.openide.filesystems.StatusDecorator getDecorator()
-meth public org.openide.util.Lookup findExtrasFor(java.util.Set<org.openide.filesystems.FileObject>)
meth public void addNotify()
meth public void refresh(boolean)
meth public void removeNotify()
supr java.lang.Object
-hfds LOG,SFS_STATUS,STATUS_NONE,assigned,changeSupport,defFS,fclSupport,fileStatusList,internLock,repository,serialVersionUID,statusResult,systemName,thrLocal,valid,vetoableChangeList
+hfds LOG,PROP_CAPABILITIES,SFS_STATUS,STATUS_NONE,assigned,capability,capabilityListener,changeSupport,fclSupport,fileStatusList,hidden,internLock,repository,serialVersionUID,systemName,thrLocal,valid,vetoableChangeList
hcls AsyncAtomicAction,EventDispatcher,FileStatusDispatcher
CLSS public abstract interface static org.openide.filesystems.FileSystem$AtomicAction
outer org.openide.filesystems.FileSystem
meth public abstract void run() throws java.io.IOException
-CLSS public final org.openide.filesystems.FileUIUtils
-meth public static org.openide.filesystems.ImageDecorator getImageDecorator(org.openide.filesystems.FileSystem)
-supr java.lang.Object
-hfds DUMMY_DECORATOR
-
CLSS public final org.openide.filesystems.FileUtil
meth public !varargs static java.lang.String getMIMEType(org.openide.filesystems.FileObject,java.lang.String[])
meth public !varargs static void refreshFor(java.io.File[])
meth public final static void runAtomicAction(java.lang.Runnable)
meth public final static void runAtomicAction(org.openide.filesystems.FileSystem$AtomicAction) throws java.io.IOException
meth public static <%0 extends java.lang.Object> {%%0} getConfigObject(java.lang.String,java.lang.Class<{%%0}>)
-meth public static <%0 extends java.lang.Object> {%%0} getSystemConfigObject(java.lang.String,java.lang.Class<{%%0}>)
meth public static boolean affectsOrder(org.openide.filesystems.FileAttributeEvent)
meth public static boolean isArchiveFile(java.net.URL)
meth public static boolean isArchiveFile(org.openide.filesystems.FileObject)
meth public static boolean isParentOf(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject)
-meth public static boolean isRecursiveSymbolicLink(org.openide.filesystems.FileObject) throws java.io.IOException
meth public static java.io.File archiveOrDirForURL(java.net.URL)
meth public static java.io.File normalizeFile(java.io.File)
meth public static java.io.File toFile(org.openide.filesystems.FileObject)
@@ -529,8 +532,6 @@ meth public static org.openide.filesystems.FileObject getArchiveFile(org.openide
meth public static org.openide.filesystems.FileObject getArchiveRoot(org.openide.filesystems.FileObject)
meth public static org.openide.filesystems.FileObject getConfigFile(java.lang.String)
meth public static org.openide.filesystems.FileObject getConfigRoot()
-meth public static org.openide.filesystems.FileObject getSystemConfigFile(java.lang.String)
-meth public static org.openide.filesystems.FileObject getSystemConfigRoot()
meth public static org.openide.filesystems.FileObject moveFile(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.lang.String) throws java.io.IOException
meth public static org.openide.filesystems.FileObject toFileObject(java.io.File)
meth public static org.openide.filesystems.FileObject[] fromFile(java.io.File)
@@ -556,10 +557,7 @@ meth public static void setMIMEType(java.lang.String,java.lang.String)
meth public static void setOrder(java.util.List<org.openide.filesystems.FileObject>) throws java.io.IOException
supr java.lang.Object
hfds LOG,REFRESH_RP,ZIP_HEADER_1,ZIP_HEADER_2,archiveFileCache,diskFileSystem,normalizedRef,refreshTask,transientAttributes
-hcls NonCanonicalizingFile
-
-CLSS public abstract interface org.openide.filesystems.ImageDecorator
-meth public abstract java.awt.Image annotateIcon(java.awt.Image,int,java.util.Set<? extends org.openide.filesystems.FileObject>)
+hcls NonCanonicalizingFile,NonCanonicalizingFileSystemView
CLSS public org.openide.filesystems.JarFileSystem
cons public init()
@@ -661,15 +659,11 @@ cons public init(org.openide.filesystems.LocalFileSystem)
intf org.openide.filesystems.AbstractFileSystem$Change
intf org.openide.filesystems.AbstractFileSystem$Info
intf org.openide.filesystems.AbstractFileSystem$List
-intf org.openide.filesystems.AbstractFileSystem$SymlinkInfo
meth public boolean folder(java.lang.String)
-meth public boolean isSymbolicLink(java.lang.String) throws java.io.IOException
meth public boolean readOnly(java.lang.String)
meth public java.io.InputStream inputStream(java.lang.String) throws java.io.FileNotFoundException
meth public java.io.OutputStream outputStream(java.lang.String) throws java.io.IOException
-meth public java.lang.String getCanonicalName(java.lang.String) throws java.io.IOException
meth public java.lang.String mimeType(java.lang.String)
-meth public java.lang.String readSymbolicLink(java.lang.String) throws java.io.IOException
meth public java.lang.String[] children(java.lang.String)
meth public java.util.Date lastModified(java.lang.String)
meth public long size(java.lang.String)
@@ -767,10 +761,8 @@ hfds MASK,WRITE_SYSTEM_INDEX,insideWritableLayer,propagateMasks,root,rootAttribu
CLSS public org.openide.filesystems.Repository
cons public init(org.openide.filesystems.FileSystem)
innr public abstract static LayerProvider
-innr public abstract static LocalProvider
intf java.io.Serializable
meth protected final java.util.List<? extends java.net.URL> findLayers(org.openide.filesystems.Repository$LayerProvider)
-meth protected final static void provideLayers(java.lang.ClassLoader,java.util.List<java.net.URL>) throws java.io.IOException
meth protected void refreshAdditionalLayers()
meth public final java.util.Enumeration<? extends org.openide.filesystems.FileObject> findAll(java.lang.String,java.lang.String,java.lang.String)
anno 0 java.lang.Deprecated()
@@ -810,7 +802,7 @@ meth public final void writeExternal(java.io.ObjectOutput) throws java.io.IOExce
anno 0 java.lang.Deprecated()
meth public static org.openide.filesystems.Repository getDefault()
supr java.lang.Object
-hfds ADD_FS,NO_PROVIDER,fclSupport,fileSystems,fileSystemsClone,lastDefLookup,lastLocalProvider,listeners,names,propListener,repository,serialVersionUID,system,vetoListener
+hfds ADD_FS,fclSupport,fileSystems,fileSystemsClone,listeners,names,propListener,repository,serialVersionUID,system,vetoListener
hcls MainFS,Replacer
CLSS public abstract static org.openide.filesystems.Repository$LayerProvider
@@ -820,13 +812,6 @@ meth protected abstract void registerLayers(java.util.Collection<? super java.ne
meth protected final void refresh()
supr java.lang.Object
-CLSS public abstract static org.openide.filesystems.Repository$LocalProvider
- outer org.openide.filesystems.Repository
-cons public init()
-meth protected final org.openide.filesystems.Repository delayFilesystemAttach(java.util.concurrent.Callable<org.openide.filesystems.Repository>) throws java.io.IOException
-meth public abstract org.openide.filesystems.Repository getRepository() throws java.io.IOException
-supr java.lang.Object
-
CLSS public org.openide.filesystems.RepositoryAdapter
cons public init()
intf org.openide.filesystems.RepositoryListener
@@ -856,10 +841,6 @@ meth public org.openide.filesystems.Repository getRepository()
supr java.util.EventObject
hfds perm,serialVersionUID
-CLSS public abstract interface org.openide.filesystems.StatusDecorator
-meth public abstract java.lang.String annotateName(java.lang.String,java.util.Set<? extends org.openide.filesystems.FileObject>)
-meth public abstract java.lang.String annotateNameHtml(java.lang.String,java.util.Set<? extends org.openide.filesystems.FileObject>)
-
CLSS public abstract org.openide.filesystems.URLMapper
cons public init()
fld public final static int EXTERNAL = 1
@@ -924,6 +905,69 @@ meth public void writeAttribute(java.lang.String,java.lang.String,java.lang.Obje
supr java.lang.Object
hfds fs,serialVersionUID
+CLSS public final org.openide.filesystems.annotations.LayerBuilder
+innr public final File
+meth public javax.tools.FileObject validateResource(java.lang.String,javax.lang.model.element.Element,java.lang.annotation.Annotation,java.lang.String,boolean) throws org.openide.filesystems.annotations.LayerGenerationException
+meth public org.openide.filesystems.annotations.LayerBuilder$File file(java.lang.String)
+meth public org.openide.filesystems.annotations.LayerBuilder$File folder(java.lang.String)
+meth public org.openide.filesystems.annotations.LayerBuilder$File instanceFile(java.lang.String,java.lang.String) throws org.openide.filesystems.annotations.LayerGenerationException
+meth public org.openide.filesystems.annotations.LayerBuilder$File instanceFile(java.lang.String,java.lang.String,java.lang.Class<?>) throws org.openide.filesystems.annotations.LayerGenerationException
+meth public org.openide.filesystems.annotations.LayerBuilder$File instanceFile(java.lang.String,java.lang.String,java.lang.Class<?>,java.lang.annotation.Annotation,java.lang.String) throws org.openide.filesystems.annotations.LayerGenerationException
+meth public org.openide.filesystems.annotations.LayerBuilder$File instanceFile(java.lang.String,java.lang.String,java.lang.annotation.Annotation,java.lang.String) throws org.openide.filesystems.annotations.LayerGenerationException
+meth public org.openide.filesystems.annotations.LayerBuilder$File shadowFile(java.lang.String,java.lang.String,java.lang.String)
+meth public static java.lang.String absolutizeResource(javax.lang.model.element.Element,java.lang.String) throws org.openide.filesystems.annotations.LayerGenerationException
+supr java.lang.Object
+hfds doc,originatingElement,processingEnv,unwrittenFiles
+
+CLSS public final org.openide.filesystems.annotations.LayerBuilder$File
+ outer org.openide.filesystems.annotations.LayerBuilder
+meth public java.lang.String getPath()
+meth public org.openide.filesystems.annotations.LayerBuilder write()
+meth public org.openide.filesystems.annotations.LayerBuilder$File boolvalue(java.lang.String,boolean)
+meth public org.openide.filesystems.annotations.LayerBuilder$File bundlevalue(java.lang.String,java.lang.String) throws org.openide.filesystems.annotations.LayerGenerationException
+meth public org.openide.filesystems.annotations.LayerBuilder$File bundlevalue(java.lang.String,java.lang.String,java.lang.String)
+meth public org.openide.filesystems.annotations.LayerBuilder$File bundlevalue(java.lang.String,java.lang.String,java.lang.annotation.Annotation,java.lang.String) throws org.openide.filesystems.annotations.LayerGenerationException
+meth public org.openide.filesystems.annotations.LayerBuilder$File bytevalue(java.lang.String,byte)
+meth public org.openide.filesystems.annotations.LayerBuilder$File charvalue(java.lang.String,char)
+meth public org.openide.filesystems.annotations.LayerBuilder$File contents(java.lang.String)
+meth public org.openide.filesystems.annotations.LayerBuilder$File doublevalue(java.lang.String,double)
+meth public org.openide.filesystems.annotations.LayerBuilder$File floatvalue(java.lang.String,float)
+meth public org.openide.filesystems.annotations.LayerBuilder$File instanceAttribute(java.lang.String,java.lang.Class<?>) throws org.openide.filesystems.annotations.LayerGenerationException
+meth public org.openide.filesystems.annotations.LayerBuilder$File instanceAttribute(java.lang.String,java.lang.Class<?>,java.lang.annotation.Annotation,java.lang.String) throws org.openide.filesystems.annotations.LayerGenerationException
+meth public org.openide.filesystems.annotations.LayerBuilder$File intvalue(java.lang.String,int)
+meth public org.openide.filesystems.annotations.LayerBuilder$File longvalue(java.lang.String,long)
+meth public org.openide.filesystems.annotations.LayerBuilder$File methodvalue(java.lang.String,java.lang.String,java.lang.String)
+meth public org.openide.filesystems.annotations.LayerBuilder$File newvalue(java.lang.String,java.lang.String)
+meth public org.openide.filesystems.annotations.LayerBuilder$File position(int)
+meth public org.openide.filesystems.annotations.LayerBuilder$File serialvalue(java.lang.String,byte[])
+meth public org.openide.filesystems.annotations.LayerBuilder$File shortvalue(java.lang.String,short)
+meth public org.openide.filesystems.annotations.LayerBuilder$File stringvalue(java.lang.String,java.lang.String)
+meth public org.openide.filesystems.annotations.LayerBuilder$File url(java.lang.String)
+meth public org.openide.filesystems.annotations.LayerBuilder$File urlvalue(java.lang.String,java.lang.String) throws org.openide.filesystems.annotations.LayerGenerationException
+meth public org.openide.filesystems.annotations.LayerBuilder$File urlvalue(java.lang.String,java.net.URI) throws org.openide.filesystems.annotations.LayerGenerationException
+supr java.lang.Object
+hfds attrs,contents,folder,path,url
+
+CLSS public abstract org.openide.filesystems.annotations.LayerGeneratingProcessor
+cons protected init()
+meth protected !varargs final org.openide.filesystems.annotations.LayerBuilder layer(javax.lang.model.element.Element[])
+meth protected abstract boolean handleProcess(java.util.Set<? extends javax.lang.model.element.TypeElement>,javax.annotation.processing.RoundEnvironment) throws org.openide.filesystems.annotations.LayerGenerationException
+meth public final boolean process(java.util.Set<? extends javax.lang.model.element.TypeElement>,javax.annotation.processing.RoundEnvironment)
+supr javax.annotation.processing.AbstractProcessor
+hfds ENTITY_RESOLVER,ERROR_HANDLER,GENERATED_LAYER,LOCAL_DTD_RESOURCE,NETWORK_DTD_URL,PUBLIC_DTD_ID,createdBuilders,generatedLayerByProcessor,originatingElementsByProcessor
+
+CLSS public org.openide.filesystems.annotations.LayerGenerationException
+cons public init(java.lang.String)
+cons public init(java.lang.String,javax.lang.model.element.Element)
+cons public init(java.lang.String,javax.lang.model.element.Element,javax.annotation.processing.ProcessingEnvironment,java.lang.annotation.Annotation)
+cons public init(java.lang.String,javax.lang.model.element.Element,javax.annotation.processing.ProcessingEnvironment,java.lang.annotation.Annotation,java.lang.String)
+cons public init(java.lang.String,javax.lang.model.element.Element,javax.lang.model.element.AnnotationMirror)
+cons public init(java.lang.String,javax.lang.model.element.Element,javax.lang.model.element.AnnotationMirror,javax.lang.model.element.AnnotationValue)
+supr java.lang.Exception
+hfds erroneousAnnotation,erroneousAnnotationValue,erroneousElement
+
+CLSS abstract interface org.openide.filesystems.annotations.package-info
+
CLSS public abstract org.openide.util.Lookup
cons public init()
fld public final static org.openide.util.Lookup EMPTY
@@ -938,7 +982,7 @@ meth public abstract <%0 extends java.lang.Object> org.openide.util.Lookup$Resul
meth public abstract <%0 extends java.lang.Object> {%%0} lookup(java.lang.Class<{%%0}>)
meth public static org.openide.util.Lookup getDefault()
supr java.lang.Object
-hfds LOG,defaultLookup,defaultLookupProvider
+hfds LOG,defaultLookup
hcls DefLookup,Empty
CLSS public abstract interface static org.openide.util.Lookup$Provider
diff --git a/openide.filesystems.nb/nbproject/project.properties b/openide.filesystems.nb/nbproject/project.properties
index 3aeb1d0..3d05bb2 100644
--- a/openide.filesystems.nb/nbproject/project.properties
+++ b/openide.filesystems.nb/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/openide.filesystems.nb/nbproject/project.xml b/openide.filesystems.nb/nbproject/project.xml
index e3fcd51..8081400 100644
--- a/openide.filesystems.nb/nbproject/project.xml
+++ b/openide.filesystems.nb/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/openide.filesystems.nb/src/org/openide/filesystems/nb/Bundle.properties b/openide.filesystems.nb/src/org/openide/filesystems/nb/Bundle.properties
index e19296a..e210e01 100644
--- a/openide.filesystems.nb/src/org/openide/filesystems/nb/Bundle.properties
+++ b/openide.filesystems.nb/src/org/openide/filesystems/nb/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=RCP Platform
OpenIDE-Module-Long-Description=\
The FileSystems API should remain independent of desktop (most notably javax.swing) dependencies in order to be used as a support library in arbitrary deployment. \
diff --git a/openide.filesystems/apichanges.xml b/openide.filesystems/apichanges.xml
index be1ad20..f56f6ba 100644
--- a/openide.filesystems/apichanges.xml
+++ b/openide.filesystems/apichanges.xml
@@ -49,23 +49,6 @@ made subject to such option by the copyright holder.
<apidef name="filesystems">Filesystems API</apidef>
</apidefs>
<changes>
- <change id="ArchiveRootProvider">
- <api name="filesystems"/>
- <summary>Pluggable archive files support for FileUtil</summary>
- <version major="9" minor="10"/>
- <date year="2015" month="5" day="28"/>
- <author login="tzezula"/>
- <compatibility addition="yes" semantic="compatible" binary="compatible"/>
- <description>
- To support JDK 9 image file as an archive the FileUtil's method
- <code>getArchiveFile</code>,<code>getArchiveRoot</code> and <code>isArchiveFile</code>
- are pluggable using a new SPI <code>ArchiveFileProvider</code>.
- In addition to these methods a new method <code>isArchiveArtifact</code> was added.
- This method can be used if given <code>URL</code> points into an archive.
- </description>
- <class name="FileUtil" package="org.openide.filesystems"/>
- <class name="ArchiveRootProvider" package="org.openide.filesystems.spi"/>
- </change>
<change id="repository.multiuser">
<api name="filesystems"/>
<summary>Support for multi-user environments</summary>
@@ -182,7 +165,7 @@ made subject to such option by the copyright holder.
of splitting filesystems API into UI (e.g. depending
on Swing) and non-UI part (that can run on JDK8 compact
profile). Introducing general replacement
- <a href="@TOP at org/openide/filesystems/FileSystem.html#findExtrasFor-java.util.Set-">findExtrasFor</a>
+ <a href="@TOP at org/openide/filesystems/FileSystem.html#findExtrasFor(java.util.Set)">findExtrasFor</a>
instead...
</p>
</description>
@@ -219,7 +202,7 @@ made subject to such option by the copyright holder.
<compatibility addition="yes" deprecation="no"/>
<description>
<p>
- Added <a href="@org-openide-filesystems-nb@/org/openide/filesystems/FileChooserBuilder.html#setAcceptAllFileFilterUsed-boolean-">
+ Added <a href="@org-openide-filesystems-nb@/org/openide/filesystems/FileChooserBuilder.html#setAcceptAllFileFilterUsed(boolean)">
new method</a> to <code>FileChooserBuilder</code> that determines whether the <code>AcceptAll FileFilter</code>
should be used in the created file chooser.
</p>
@@ -236,14 +219,14 @@ made subject to such option by the copyright holder.
<compatibility addition="yes" deprecation="no"/>
<description>
<p>
- Added <a href="@org-openide-filesystems-nb@/org/openide/filesystems/FileChooserBuilder.html#addDefaultFileFilters--">
+ Added <a href="@org-openide-filesystems-nb@/org/openide/filesystems/FileChooserBuilder.html#addDefaultFileFilters()">
new method</a> to <code>FileChooserBuilder</code> that adds all default
<code>FileFilter</code>s to created file chooser.
</p>
<p>
Default filters are registered using new parameters in annotations
- <a href="@TOP at org/openide/filesystems/MIMEResolver.Registration.html#showInFileChooser--">MimeResolver.Registration</a>
- and <a href="@TOP at org/openide/filesystems/MIMEResolver.ExtensionRegistration.html#showInFileChooser--">MimeResolver.ExtensionRegistration</a>.
+ <a href="@TOP at org/openide/filesystems/MIMEResolver.Registration.html#showInFileChooser()">MimeResolver.Registration</a>
+ and <a href="@TOP at org/openide/filesystems/MIMEResolver.ExtensionRegistration.html#showInFileChooser()">MimeResolver.ExtensionRegistration</a>.
</p>
</description>
<class package="org.openide.filesystems" name="FileChooserBuilder" link="no"/>
@@ -261,7 +244,7 @@ made subject to such option by the copyright holder.
<p>
<code>FileObject</code> now implements <code>Lookup.Provider</code>
and thus has new
- <a href="@TOP at org/openide/filesystems/FileObject.html#getLookup--">
+ <a href="@TOP at org/openide/filesystems/FileObject.html#getLookup()">
getLookup</a>() method.
</p>
</description>
@@ -277,7 +260,7 @@ made subject to such option by the copyright holder.
<compatibility addition="yes" deprecation="no"/>
<description>
<p>
- Added <a href="@TOP at org/openide/filesystems/FileUtil.html#addRecursiveListener-org.openide.filesystems.FileChangeListener-java.io.File-java.io.FileFilter-java.util.concurrent.Callable-">
+ Added <a href="@TOP at org/openide/filesystems/FileUtil.html#addRecursiveListener(org.openide.filesystems.FileChangeListener,%20java.io.File,%20java.io.FileFilter,%20java.util.concurrent.Callable)">
new method</a> variant to register recursive listener
and control whether to recurse into a subtree or not via
<code>FileFilter</code>.
@@ -312,7 +295,7 @@ made subject to such option by the copyright holder.
<description>
<p>
Those who wish to influence content of
- <a href="@TOP@/org/openide/filesystems/FileUtil.html#getConfigRoot--">
+ <a href="@TOP@/org/openide/filesystems/FileUtil.html#getConfigRoot()">
configuration file system</a> have an easier
<a href="@TOP@/org/openide/filesystems/Repository.LayerProvider.html">
way</a> now.
@@ -438,7 +421,7 @@ made subject to such option by the copyright holder.
<compatibility addition="yes"/>
<description>
<p>
- Introducing <a href="@TOP@/org/openide/filesystems/FileObject.html#getMIMEType-java.lang.String...-">
+ Introducing <a href="@TOP@/org/openide/filesystems/FileObject.html#getMIMEType(java.lang.String...)">
FileObject.getMIMEType(String...)
</a> that can be overriden by different implementations
of file system API.
@@ -496,7 +479,7 @@ made subject to such option by the copyright holder.
<p>
One can convert files in SystemFileSystem to Object with
a
- <a href="@TOP at org/openide/filesystems/FileUtil.html#getConfigObject-java.lang.String-java.lang.Class-">
+ <a href="@TOP at org/openide/filesystems/FileUtil.html#getConfigObject(java.lang.String,%20java.lang.Class)">
single utility method</a>.
</p>
</description>
@@ -513,7 +496,7 @@ made subject to such option by the copyright holder.
<description>
<p>
Semantic of
- <a href="@TOP@/org/openide/filesystems/FileObject.html#getFileObject-java.lang.String-">
+ <a href="@TOP@/org/openide/filesystems/FileObject.html#getFileObject(java.lang.String)">
getFileObject
</a> method has been clarified to accept "..".
</p>
@@ -531,7 +514,7 @@ made subject to such option by the copyright holder.
<description>
<p>
You can use prefix <code>"methodvalue:"</code> to
- <a href="@TOP@/org/openide/filesystems/FileObject.html#setAttribute-java.lang.String-java.lang.Object-">
+ <a href="@TOP@/org/openide/filesystems/FileObject.html#setAttribute(java.lang.String,%20java.lang.Object)">
setAttribute
</a>
with type of <a href="@JDK@/java/lang/reflect/Method.html">Method</a>.
@@ -574,7 +557,7 @@ made subject to such option by the copyright holder.
<description>
<p>
Create a file and write its content (almost) atomically using the new
- <a href="@TOP@/org/openide/filesystems/FileObject.html#createAndOpen-java.lang.String-">FileObject.createAndOpen</a>
+ <a href="@TOP@/org/openide/filesystems/FileObject.html#createAndOpen(java.lang.String)">FileObject.createAndOpen</a>
method.
</p>
</description>
@@ -698,7 +681,7 @@ made subject to such option by the copyright holder.
<p>
One can register a recursive listener on a file object by
calling
- <a href="@TOP@/org/openide/filesystems/FileObject.html#addRecursiveListener-org.openide.filesystems.FileChangeListener-">FileObject.addRecursiveListener(FileChangeListener)</a>.
+ <a href="@TOP@/org/openide/filesystems/FileObject.html#addRecursiveListener(org.openide.filesystems.FileChangeListener)">FileObject.addRecursiveListener(FileChangeListener)</a>.
</p>
</description>
<class package="org.openide.filesystems" name="FileObject"/>
@@ -767,7 +750,7 @@ made subject to such option by the copyright holder.
<compatibility addition="yes" binary="compatible" source="compatible" semantic="compatible" deprecation="no" deletion="no" modification="no"/>
<description>
<p>
- <a href="org/openide/filesystems/FileEvent.html#runWhenDeliveryOver-java.lang.Runnable-">
+ <a href="org/openide/filesystems/FileEvent.html#runWhenDeliveryOver(java.lang.Runnable)">
FileEvent.runWhenDeliveryOver(Runnable)</a> method added to support
easier processing of <em>batch</em> sets of events.
</p>
@@ -802,11 +785,11 @@ made subject to such option by the copyright holder.
<compatibility addition="yes"/>
<description>
<p>
- Added <a href="@TOP@/org/openide/filesystems/FileObject.html#asBytes--">
+ Added <a href="@TOP@/org/openide/filesystems/FileObject.html#asBytes()">
asBytes()</a>,
- <a href="@TOP@/org/openide/filesystems/FileObject.html#asText-java.lang.String-">
+ <a href="@TOP@/org/openide/filesystems/FileObject.html#asText(java.lang.String)">
asText(encoding)</a>,
- and <a href="@TOP@/org/openide/filesystems/FileObject.html#asLines-java.lang.String-">
+ and <a href="@TOP@/org/openide/filesystems/FileObject.html#asLines(java.lang.String)">
asLines(encoding)</a> methods into
<a href="@TOP@/org/openide/filesystems/FileObject.html">FileObject</a>
to simplify reading of its content.
@@ -823,9 +806,9 @@ made subject to such option by the copyright holder.
<compatibility addition="yes"/>
<description>
<p>
- Added <a href="@TOP@/org/openide/filesystems/FileUtil.html#addFileChangeListener-org.openide.filesystems.FileChangeListener-java.io.File-">
+ Added <a href="@TOP@/org/openide/filesystems/FileUtil.html#addFileChangeListener(org.openide.filesystems.FileChangeListener,%20java.io.File)">
FileUtil.addFileChangeListener(FileChangeListener listener, File path)</a>
- and <a href="@TOP@/org/openide/filesystems/FileUtil.html#removeFileChangeListener-org.openide.filesystems.FileChangeListener-java.io.File-">
+ and <a href="@TOP@/org/openide/filesystems/FileUtil.html#removeFileChangeListener(org.openide.filesystems.FileChangeListener,%20java.io.File)">
FileUtil.addFileChangeListener(FileChangeListener listener, File path)</a>.
It permits you to listen to a file which does not yet exist,
or continue listening to it after it is deleted and recreated, etc.
@@ -846,7 +829,7 @@ made subject to such option by the copyright holder.
Rather than having to call
<code>Repository.getDefault().getDefaultFileSystem().getRoot().getFileObject("foo/bar")</code>,
you can simply call
- <a href="@TOP@/org/openide/filesystems/FileUtil.html#getConfigFile-java.lang.String-">FileUtil.getConfigFile("foo/bar")</a>.
+ <a href="@TOP@/org/openide/filesystems/FileUtil.html#getConfigFile(java.lang.String)">FileUtil.getConfigFile("foo/bar")</a>.
</p>
</description>
<class package="org.openide.filesystems" name="FileUtil"/>
@@ -861,11 +844,11 @@ made subject to such option by the copyright holder.
<compatibility addition="yes" modification="yes"/>
<description>
<p>
- Method <a href="@TOP@/org/openide/filesystems/FileUtil.html#setMIMEType-java.lang.String-java.lang.String-">
+ Method <a href="@TOP@/org/openide/filesystems/FileUtil.html#setMIMEType(java.lang.String,%20java.lang.String)">
FileUtil.setMIMEType(String extension, String mimeType)</a>
resurrected to register file extension for specified MIME type.
It is persisted in userdir contrary to previous implementation.
- Added method <a href="@TOP@/org/openide/filesystems/FileUtil.html#getMIMETypeExtensions-java.lang.String-">
+ Added method <a href="@TOP@/org/openide/filesystems/FileUtil.html#getMIMETypeExtensions(java.lang.String)">
FileUtil.getMIMETypeExtensions(String mimeType)</a>
to get list of file extensions associated with specified MIME type.
</p>
@@ -948,7 +931,7 @@ made subject to such option by the copyright holder.
<description>
<p>
To speed up MIME type recognition it is added an extra parameter
- to method <a href="@TOP@/org/openide/filesystems/FileUtil.html#getMIMEType-org.openide.filesystems.FileObject-java.lang.String...-">FileUtil.getMIMEType(FileObject, String...)</a>.
+ to method <a href="@TOP@/org/openide/filesystems/FileUtil.html#getMIMEType(org.openide.filesystems.FileObject,%20java.lang.String...)">FileUtil.getMIMEType(FileObject, String...)</a>.
We can supply one or more MIME types which we are only interested in.
Module writers have to override
<a href="@TOP@/org/openide/filesystems/MIMEResolver.html">MIMEResolver</a>
diff --git a/openide.filesystems/arch.xml b/openide.filesystems/arch.xml
index 0df94e1..4671bb6 100644
--- a/openide.filesystems/arch.xml
+++ b/openide.filesystems/arch.xml
@@ -466,7 +466,7 @@ Periodic refresh can be set.
</question>
-->
<answer id="exec-reflection">
-<api type="export" group="layer" category="stable" name="methodvalue-newvalue" url="@TOP@/org/openide/filesystems/FileObject.html#setAttribute-java.lang.String-java.lang.Object-">
+<api type="export" group="layer" category="stable" name="methodvalue-newvalue" url="@TOP@/org/openide/filesystems/FileObject.html#setAttribute(java.lang.String,%20java.lang.Object)">
When special form of <code>setAttribute</code> is supported by the filesystem, the
<code>getAttribute</code> can behave like
<a href="@TOP@/org/openide/filesystems/XMLFileSystem.html">XMLFileSystem</a>'s
diff --git a/openide.filesystems/manifest.mf b/openide.filesystems/manifest.mf
index 89a1756..991a2e2 100644
--- a/openide.filesystems/manifest.mf
+++ b/openide.filesystems/manifest.mf
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
OpenIDE-Module: org.openide.filesystems
OpenIDE-Module-Localizing-Bundle: org/openide/filesystems/Bundle.properties
OpenIDE-Module-Layer: org/openide/filesystems/resources/layer.xml
-OpenIDE-Module-Specification-Version: 9.10.1
+OpenIDE-Module-Specification-Version: 9.8.1
diff --git a/openide.filesystems/nbproject/org-openide-filesystems.sig b/openide.filesystems/nbproject/org-openide-filesystems.sig
index d4b0099..369e57b 100644
--- a/openide.filesystems/nbproject/org-openide-filesystems.sig
+++ b/openide.filesystems/nbproject/org-openide-filesystems.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 9.8.1
+#Version 8.11
CLSS public java.io.IOException
cons public init()
@@ -11,8 +11,11 @@ hfds serialVersionUID
CLSS public abstract interface java.io.Serializable
-CLSS public abstract interface java.lang.AutoCloseable
-meth public abstract void close() throws java.lang.Exception
+CLSS public abstract interface !annotation java.lang.Deprecated
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE])
+intf java.lang.annotation.Annotation
CLSS public java.lang.Exception
cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean)
@@ -131,7 +134,6 @@ innr public abstract interface static Attr
innr public abstract interface static Change
innr public abstract interface static Info
innr public abstract interface static List
-innr public abstract interface static SymlinkInfo
innr public abstract interface static Transfer
meth protected <%0 extends org.openide.filesystems.FileObject> java.lang.ref.Reference<{%%0}> createReference({%%0})
meth protected boolean canRead(java.lang.String)
@@ -145,11 +147,13 @@ meth protected final void refreshResource(java.lang.String,boolean)
meth protected final void setRefreshTime(int)
meth protected void markImportant(java.lang.String,boolean)
meth public abstract java.lang.String getDisplayName()
+meth public org.openide.filesystems.FileObject find(java.lang.String,java.lang.String,java.lang.String)
+ anno 0 java.lang.Deprecated()
meth public org.openide.filesystems.FileObject findResource(java.lang.String)
meth public org.openide.filesystems.FileObject getRoot()
meth public void refresh(boolean)
supr org.openide.filesystems.FileSystem
-hfds lastEnum,refresher,root,serialVersionUID
+hfds NO_SYSTEM_ACTIONS,SYSTEM_ACTIONS,lastEnum,refresher,root,serialVersionUID
CLSS public abstract interface static org.openide.filesystems.AbstractFileSystem$Attr
outer org.openide.filesystems.AbstractFileSystem
@@ -195,13 +199,6 @@ fld public final static long serialVersionUID = -6242105832891012528
intf java.io.Serializable
meth public abstract java.lang.String[] children(java.lang.String)
-CLSS public abstract interface static org.openide.filesystems.AbstractFileSystem$SymlinkInfo
- outer org.openide.filesystems.AbstractFileSystem
-intf java.io.Serializable
-meth public abstract boolean isSymbolicLink(java.lang.String) throws java.io.IOException
-meth public abstract java.lang.String getCanonicalName(java.lang.String) throws java.io.IOException
-meth public abstract java.lang.String readSymbolicLink(java.lang.String) throws java.io.IOException
-
CLSS public abstract interface static org.openide.filesystems.AbstractFileSystem$Transfer
outer org.openide.filesystems.AbstractFileSystem
fld public final static long serialVersionUID = -8945397853892302838
@@ -285,9 +282,7 @@ CLSS public org.openide.filesystems.FileLock
cons public init()
fld protected java.lang.Throwable lockedBy
fld public final static org.openide.filesystems.FileLock NONE
-intf java.lang.AutoCloseable
meth public boolean isValid()
-meth public void close()
meth public void finalize()
meth public void releaseLock()
supr java.lang.Object
@@ -296,7 +291,6 @@ hfds locked
CLSS public abstract org.openide.filesystems.FileObject
cons public init()
fld public final static java.lang.String DEFAULT_LINE_SEPARATOR_ATTR = "default-line-separator"
-fld public final static java.lang.String DEFAULT_PATHNAME_SEPARATOR_ATTR = "default-pathname-separator"
intf java.io.Serializable
intf org.openide.util.Lookup$Provider
meth protected void fireFileAttributeChangedEvent(java.util.Enumeration<org.openide.filesystems.FileChangeListener>,org.openide.filesystems.FileAttributeEvent)
@@ -338,7 +332,6 @@ meth public boolean canRead()
meth public boolean canWrite()
meth public boolean existsExt(java.lang.String)
meth public boolean isLocked()
-meth public boolean isSymbolicLink() throws java.io.IOException
meth public boolean isVirtual()
meth public byte[] asBytes() throws java.io.IOException
meth public final boolean canRevert()
@@ -360,7 +353,6 @@ meth public java.lang.String getPackageName(char)
meth public java.lang.String getPackageNameExt(char,char)
anno 0 java.lang.Deprecated()
meth public java.lang.String getPath()
-meth public java.lang.String readSymbolicLinkPath() throws java.io.IOException
meth public java.lang.String toString()
meth public java.util.Enumeration<? extends org.openide.filesystems.FileObject> getChildren(boolean)
meth public java.util.Enumeration<? extends org.openide.filesystems.FileObject> getData(boolean)
@@ -369,10 +361,8 @@ meth public java.util.List<java.lang.String> asLines() throws java.io.IOExceptio
meth public java.util.List<java.lang.String> asLines(java.lang.String) throws java.io.IOException
meth public org.openide.filesystems.FileObject copy(org.openide.filesystems.FileObject,java.lang.String,java.lang.String) throws java.io.IOException
meth public org.openide.filesystems.FileObject createData(java.lang.String) throws java.io.IOException
-meth public org.openide.filesystems.FileObject getCanonicalFileObject() throws java.io.IOException
meth public org.openide.filesystems.FileObject getFileObject(java.lang.String)
meth public org.openide.filesystems.FileObject move(org.openide.filesystems.FileLock,org.openide.filesystems.FileObject,java.lang.String,java.lang.String) throws java.io.IOException
-meth public org.openide.filesystems.FileObject readSymbolicLink() throws java.io.IOException
meth public org.openide.util.Lookup getLookup()
meth public void addRecursiveListener(org.openide.filesystems.FileChangeListener)
meth public void refresh()
@@ -452,31 +442,28 @@ meth public org.openide.filesystems.FileObject createTempFile(org.openide.filesy
meth public org.openide.filesystems.FileObject find(java.lang.String,java.lang.String,java.lang.String)
anno 0 java.lang.Deprecated()
meth public org.openide.filesystems.FileObject getTempFolder() throws java.io.IOException
-meth public org.openide.filesystems.StatusDecorator getDecorator()
-meth public org.openide.util.Lookup findExtrasFor(java.util.Set<org.openide.filesystems.FileObject>)
meth public void addNotify()
meth public void refresh(boolean)
meth public void removeNotify()
supr java.lang.Object
-hfds LOG,SFS_STATUS,STATUS_NONE,assigned,changeSupport,defFS,fclSupport,fileStatusList,internLock,repository,serialVersionUID,statusResult,systemName,thrLocal,valid,vetoableChangeList
+hfds LOG,PROP_CAPABILITIES,SFS_STATUS,STATUS_NONE,assigned,capability,capabilityListener,changeSupport,fclSupport,fileStatusList,hidden,internLock,repository,serialVersionUID,systemName,thrLocal,valid,vetoableChangeList
hcls AsyncAtomicAction,EventDispatcher,FileStatusDispatcher
CLSS public abstract interface static org.openide.filesystems.FileSystem$AtomicAction
outer org.openide.filesystems.FileSystem
meth public abstract void run() throws java.io.IOException
+
CLSS public final org.openide.filesystems.FileUtil
meth public !varargs static java.lang.String getMIMEType(org.openide.filesystems.FileObject,java.lang.String[])
meth public !varargs static void refreshFor(java.io.File[])
meth public final static void runAtomicAction(java.lang.Runnable)
meth public final static void runAtomicAction(org.openide.filesystems.FileSystem$AtomicAction) throws java.io.IOException
meth public static <%0 extends java.lang.Object> {%%0} getConfigObject(java.lang.String,java.lang.Class<{%%0}>)
-meth public static <%0 extends java.lang.Object> {%%0} getSystemConfigObject(java.lang.String,java.lang.Class<{%%0}>)
meth public static boolean affectsOrder(org.openide.filesystems.FileAttributeEvent)
meth public static boolean isArchiveFile(java.net.URL)
meth public static boolean isArchiveFile(org.openide.filesystems.FileObject)
meth public static boolean isParentOf(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject)
-meth public static boolean isRecursiveSymbolicLink(org.openide.filesystems.FileObject) throws java.io.IOException
meth public static java.io.File archiveOrDirForURL(java.net.URL)
meth public static java.io.File normalizeFile(java.io.File)
meth public static java.io.File toFile(org.openide.filesystems.FileObject)
@@ -508,8 +495,6 @@ meth public static org.openide.filesystems.FileObject getArchiveFile(org.openide
meth public static org.openide.filesystems.FileObject getArchiveRoot(org.openide.filesystems.FileObject)
meth public static org.openide.filesystems.FileObject getConfigFile(java.lang.String)
meth public static org.openide.filesystems.FileObject getConfigRoot()
-meth public static org.openide.filesystems.FileObject getSystemConfigFile(java.lang.String)
-meth public static org.openide.filesystems.FileObject getSystemConfigRoot()
meth public static org.openide.filesystems.FileObject moveFile(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.lang.String) throws java.io.IOException
meth public static org.openide.filesystems.FileObject toFileObject(java.io.File)
meth public static org.openide.filesystems.FileObject[] fromFile(java.io.File)
@@ -535,7 +520,7 @@ meth public static void setMIMEType(java.lang.String,java.lang.String)
meth public static void setOrder(java.util.List<org.openide.filesystems.FileObject>) throws java.io.IOException
supr java.lang.Object
hfds LOG,REFRESH_RP,ZIP_HEADER_1,ZIP_HEADER_2,archiveFileCache,diskFileSystem,normalizedRef,refreshTask,transientAttributes
-hcls NonCanonicalizingFile
+hcls NonCanonicalizingFile,NonCanonicalizingFileSystemView
CLSS public org.openide.filesystems.JarFileSystem
cons public init()
@@ -637,15 +622,11 @@ cons public init(org.openide.filesystems.LocalFileSystem)
intf org.openide.filesystems.AbstractFileSystem$Change
intf org.openide.filesystems.AbstractFileSystem$Info
intf org.openide.filesystems.AbstractFileSystem$List
-intf org.openide.filesystems.AbstractFileSystem$SymlinkInfo
meth public boolean folder(java.lang.String)
-meth public boolean isSymbolicLink(java.lang.String) throws java.io.IOException
meth public boolean readOnly(java.lang.String)
meth public java.io.InputStream inputStream(java.lang.String) throws java.io.FileNotFoundException
meth public java.io.OutputStream outputStream(java.lang.String) throws java.io.IOException
-meth public java.lang.String getCanonicalName(java.lang.String) throws java.io.IOException
meth public java.lang.String mimeType(java.lang.String)
-meth public java.lang.String readSymbolicLink(java.lang.String) throws java.io.IOException
meth public java.lang.String[] children(java.lang.String)
meth public java.util.Date lastModified(java.lang.String)
meth public long size(java.lang.String)
@@ -743,10 +724,8 @@ hfds MASK,WRITE_SYSTEM_INDEX,insideWritableLayer,propagateMasks,root,rootAttribu
CLSS public org.openide.filesystems.Repository
cons public init(org.openide.filesystems.FileSystem)
innr public abstract static LayerProvider
-innr public abstract static LocalProvider
intf java.io.Serializable
meth protected final java.util.List<? extends java.net.URL> findLayers(org.openide.filesystems.Repository$LayerProvider)
-meth protected final static void provideLayers(java.lang.ClassLoader,java.util.List<java.net.URL>) throws java.io.IOException
meth protected void refreshAdditionalLayers()
meth public final java.util.Enumeration<? extends org.openide.filesystems.FileObject> findAll(java.lang.String,java.lang.String,java.lang.String)
anno 0 java.lang.Deprecated()
@@ -786,7 +765,7 @@ meth public final void writeExternal(java.io.ObjectOutput) throws java.io.IOExce
anno 0 java.lang.Deprecated()
meth public static org.openide.filesystems.Repository getDefault()
supr java.lang.Object
-hfds ADD_FS,NO_PROVIDER,fclSupport,fileSystems,fileSystemsClone,lastDefLookup,lastLocalProvider,listeners,names,propListener,repository,serialVersionUID,system,vetoListener
+hfds ADD_FS,fclSupport,fileSystems,fileSystemsClone,listeners,names,propListener,repository,serialVersionUID,system,vetoListener
hcls MainFS,Replacer
CLSS public abstract static org.openide.filesystems.Repository$LayerProvider
@@ -796,13 +775,6 @@ meth protected abstract void registerLayers(java.util.Collection<? super java.ne
meth protected final void refresh()
supr java.lang.Object
-CLSS public abstract static org.openide.filesystems.Repository$LocalProvider
- outer org.openide.filesystems.Repository
-cons public init()
-meth protected final org.openide.filesystems.Repository delayFilesystemAttach(java.util.concurrent.Callable<org.openide.filesystems.Repository>) throws java.io.IOException
-meth public abstract org.openide.filesystems.Repository getRepository() throws java.io.IOException
-supr java.lang.Object
-
CLSS public org.openide.filesystems.RepositoryAdapter
cons public init()
intf org.openide.filesystems.RepositoryListener
@@ -832,10 +804,6 @@ meth public org.openide.filesystems.Repository getRepository()
supr java.util.EventObject
hfds perm,serialVersionUID
-CLSS public abstract interface org.openide.filesystems.StatusDecorator
-meth public abstract java.lang.String annotateName(java.lang.String,java.util.Set<? extends org.openide.filesystems.FileObject>)
-meth public abstract java.lang.String annotateNameHtml(java.lang.String,java.util.Set<? extends org.openide.filesystems.FileObject>)
-
CLSS public abstract org.openide.filesystems.URLMapper
cons public init()
fld public final static int EXTERNAL = 1
@@ -963,9 +931,6 @@ hfds erroneousAnnotation,erroneousAnnotationValue,erroneousElement
CLSS abstract interface org.openide.filesystems.annotations.package-info
-CLSS public abstract interface org.openide.filesystems.spi.CustomInstanceFactory
-meth public abstract <%0 extends java.lang.Object> {%%0} createInstance(java.lang.Class<{%%0}>)
-
CLSS public abstract org.openide.util.Lookup
cons public init()
fld public final static org.openide.util.Lookup EMPTY
@@ -980,7 +945,7 @@ meth public abstract <%0 extends java.lang.Object> org.openide.util.Lookup$Resul
meth public abstract <%0 extends java.lang.Object> {%%0} lookup(java.lang.Class<{%%0}>)
meth public static org.openide.util.Lookup getDefault()
supr java.lang.Object
-hfds LOG,defaultLookup,defaultLookupProvider
+hfds LOG,defaultLookup
hcls DefLookup,Empty
CLSS public abstract interface static org.openide.util.Lookup$Provider
diff --git a/openide.filesystems/nbproject/project.properties b/openide.filesystems/nbproject/project.properties
index 6a202fd..c32cf47 100644
--- a/openide.filesystems/nbproject/project.properties
+++ b/openide.filesystems/nbproject/project.properties
@@ -41,7 +41,7 @@
# made subject to such option by the copyright holder.
javac.compilerargs=-Xlint -Xlint:-serial
-javac.source=1.8
+javac.source=1.7
module.jar.dir=core
javadoc.main.page=org/openide/filesystems/doc-files/api.html
javadoc.arch=${basedir}/arch.xml
diff --git a/openide.filesystems/src/META-INF/upgrade/FileObject.hint b/openide.filesystems/src/META-INF/upgrade/FileObject.hint
index ae5efae..626c12b 100644
--- a/openide.filesystems/src/META-INF/upgrade/FileObject.hint
+++ b/openide.filesystems/src/META-INF/upgrade/FileObject.hint
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
"Deprecated API call":
$f.isReadOnly() :: $f instanceof org.openide.filesystems.FileObject
=>
diff --git a/openide.filesystems/src/META-INF/upgrade/FileUtil.hint b/openide.filesystems/src/META-INF/upgrade/FileUtil.hint
index 19bbd2e..3b8106b 100644
--- a/openide.filesystems/src/META-INF/upgrade/FileUtil.hint
+++ b/openide.filesystems/src/META-INF/upgrade/FileUtil.hint
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
"Obsolete bug workaround":
javax.swing.JFileChooser $c = new javax.swing.JFileChooser();
org.openide.filesystems.FileUtil.preventFileChooserSymlinkTraversal($c, null)
@@ -49,23 +10,3 @@ org.openide.filesystems.FileUtil.preventFileChooserSymlinkTraversal($c, $d)
=>
$c.setCurrentDirectory($d)
;;
-
-//"jar".equals($url.getProtocol()) :: $url instanceof java.net.URL
-//=>
-//org.openide.filesystems.FileUtil.isArchiveArtifact($url)
-//;;
-
-//$url.getProtocol().equals("jar") :: $url instanceof java.net.URL
-//=>
-//org.openide.filesystems.FileUtil.isArchiveArtifact($url)
-//;;
-
-//"jar".equals($uri.getScheme()) :: $uri instanceof java.net.URI
-//=>
-//org.openide.filesystems.FileUtil.isArchiveArtifact($uri.toURL())
-//;;
-
-//$uri.getScheme().equals("jar") :: $uri instanceof java.net.URI
-//=>
-//org.openide.filesystems.FileUtil.isArchiveArtifact($uri.toURL())
-//;;
diff --git a/openide.filesystems/src/META-INF/upgrade/Repository.hint b/openide.filesystems/src/META-INF/upgrade/Repository.hint
index d74c17e..233d70e 100644
--- a/openide.filesystems/src/META-INF/upgrade/Repository.hint
+++ b/openide.filesystems/src/META-INF/upgrade/Repository.hint
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
"Use FileUtil to access configuration":
org.openide.filesystems.Repository.getDefault().getDefaultFileSystem().findResource($p) :: $p instanceof java.lang.String
=>
diff --git a/openide.filesystems/src/org/netbeans/modules/openide/filesystems/RecognizeInstanceFiles.java b/openide.filesystems/src/org/netbeans/modules/openide/filesystems/RecognizeInstanceFiles.java
index 584aa04..3652019 100644
--- a/openide.filesystems/src/org/netbeans/modules/openide/filesystems/RecognizeInstanceFiles.java
+++ b/openide.filesystems/src/org/netbeans/modules/openide/filesystems/RecognizeInstanceFiles.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,18 +24,44 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc.
+ *
+ * Portions Copyrighted 2007 Sun Microsystems, Inc.
+ *//*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
*
* Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc.
+ *
+ * Portions Copyrighted 2007 Sun Microsystems, Inc.
*/
package org.netbeans.modules.openide.filesystems;
diff --git a/openide.filesystems/src/org/openide/filesystems/FileUtil.java b/openide.filesystems/src/org/openide/filesystems/FileUtil.java
index 187f355..20634e8 100644
--- a/openide.filesystems/src/org/openide/filesystems/FileUtil.java
+++ b/openide.filesystems/src/org/openide/filesystems/FileUtil.java
@@ -56,10 +56,10 @@ import java.lang.ref.SoftReference;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URI;
-import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLStreamHandler;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Enumeration;
@@ -71,26 +71,22 @@ import java.util.Map;
import java.util.Set;
import java.util.Stack;
import java.util.StringTokenizer;
+import java.util.WeakHashMap;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.netbeans.modules.openide.filesystems.declmime.MIMEResolverImpl;
import org.openide.filesystems.FileSystem.AtomicAction;
-import org.openide.filesystems.spi.ArchiveRootProvider;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.openide.util.Parameters;
import org.openide.util.RequestProcessor;
import org.openide.util.BaseUtilities;
-import org.openide.util.Lookup;
import org.openide.util.WeakListeners;
-import org.openide.util.lookup.Lookups;
-import org.openide.util.lookup.ProxyLookup;
import org.openide.util.lookup.implspi.NamedServicesProvider;
/** Common utilities for handling files.
@@ -103,6 +99,11 @@ public final class FileUtil extends Object {
private static final Logger LOG = Logger.getLogger(FileUtil.class.getName());
+ /** Normal header for ZIP files. */
+ private static byte[] ZIP_HEADER_1 = {0x50, 0x4b, 0x03, 0x04};
+ /** Also seems to be used at least in apisupport/project/test/unit/data/example-external-projects/suite3/nbplatform/random/modules/ext/stuff.jar; not known why */
+ private static byte[] ZIP_HEADER_2 = {0x50, 0x4b, 0x05, 0x06};
+
/** transient attributes which should not be copied
* of type Set<String>
*/
@@ -124,6 +125,8 @@ public final class FileUtil extends Object {
transientAttributes.add(MultiFileObject.WEIGHT_ATTRIBUTE); // NOI18N
}
+ /** Cache for {@link #isArchiveFile(FileObject)}. */
+ private static final Map<FileObject, Boolean> archiveFileCache = new WeakHashMap<FileObject,Boolean>();
private static FileSystem diskFileSystem;
static String toDebugString(File file) {
@@ -1832,41 +1835,35 @@ public final class FileUtil extends Object {
* Returns a FileObject representing the root folder of an archive.
* Clients may need to first call {@link #isArchiveFile(FileObject)} to determine
* if the file object refers to an archive file.
- * @param fo a java archive file, by default ZIP and JAR are supported
+ * @param fo a ZIP- (or JAR-) format archive file
* @return a virtual archive root folder, or null if the file is not actually an archive
* @since 4.48
*/
public static FileObject getArchiveRoot(FileObject fo) {
- for (ArchiveRootProvider provider : getArchiveRootProviders()) {
- if (provider.isArchiveFile(fo, false)) {
- final FileObject root = provider.getArchiveRoot(fo);
- if (root != null) {
- return root;
- }
- }
+ URL archiveURL = URLMapper.findURL(fo, URLMapper.EXTERNAL);
+
+ if (archiveURL == null) {
+ return null;
}
- return null;
+
+ return URLMapper.findFileObject(getArchiveRoot(archiveURL));
}
/**
* Returns a URL representing the root of an archive.
* Clients may need to first call {@link #isArchiveFile(URL)} to determine if the URL
* refers to an archive file.
- * @param url of a java archive file, by default ZIP and JAR are supported
- * @return the archive (eg. <code>jar</code>) protocol URL of the root of the archive.
+ * @param url of a ZIP- (or JAR-) format archive file
+ * @return the <code>jar</code>-protocol URL of the root of the archive
* @since 4.48
*/
public static URL getArchiveRoot(URL url) {
- for (ArchiveRootProvider provider : getArchiveRootProviders()) {
- if (provider.isArchiveFile(url, false)) {
- final URL root = provider.getArchiveRoot(url);
- if (root != null) {
- return root;
- }
- }
+ try {
+ // XXX TBD whether the url should ever be escaped...
+ return new URL("jar:" + url + "!/"); // NOI18N
+ } catch (MalformedURLException e) {
+ throw new AssertionError(e);
}
- //For compatibility reason never return null but return the jar URL.
- return getArchiveRootProviders().iterator().next().getArchiveRoot(url);
}
/**
@@ -1874,107 +1871,161 @@ public final class FileUtil extends Object {
* FileObject given by the parameter.
* <strong>Remember</strong> that any path within the archive is discarded
* so you may need to check for non-root entries.
- * @param fo a file in an archive filesystem
+ * @param fo a file in a JAR filesystem
* @return the file corresponding to the archive itself,
* or null if <code>fo</code> is not an archive entry
* @since 4.48
*/
public static FileObject getArchiveFile(FileObject fo) {
Parameters.notNull("fo", fo); //NOI18N
- for (ArchiveRootProvider provider : getArchiveRootProviders()) {
- if (provider.isArchiveArtifact(fo)) {
- final FileObject file = provider.getArchiveFile(fo);
- if (file != null) {
- return file;
- }
+ try {
+ FileSystem fs = fo.getFileSystem();
+
+ if (fs instanceof JarFileSystem) {
+ File jarFile = ((JarFileSystem) fs).getJarFile();
+
+ return toFileObject(jarFile);
}
+ } catch (FileStateInvalidException e) {
+ Exceptions.printStackTrace(e);
}
+
return null;
}
/**
* Returns the URL of the archive file containing the file
- * referred to by an archive (eg. <code>jar</code>) protocol URL.
+ * referred to by a <code>jar</code>-protocol URL.
* <strong>Remember</strong> that any path within the archive is discarded
* so you may need to check for non-root entries.
* @param url a URL
- * @return the embedded archive URL, or null if the URL is not an
- * archive protocol URL containing <code>!/</code>
+ * @return the embedded archive URL, or null if the URL is not a
+ * <code>jar</code>-protocol URL containing <code>!/</code>
* @since 4.48
*/
public static URL getArchiveFile(URL url) {
- for (ArchiveRootProvider provider : getArchiveRootProviders()) {
- if (provider.isArchiveArtifact(url)) {
- final URL file = provider.getArchiveFile(url);
- if (file != null) {
- return file;
+ String protocol = url.getProtocol();
+
+ if ("jar".equals(protocol)) { //NOI18N
+
+ String path = url.getPath();
+ int index = path.indexOf("!/"); //NOI18N
+
+ if (index >= 0) {
+ String jarPath = null;
+ try {
+ jarPath = path.substring(0, index);
+ if (jarPath.indexOf("file://") > -1 && jarPath.indexOf("file:////") == -1) { //NOI18N
+ /* Replace because JDK application classloader wrongly recognizes UNC paths. */
+ jarPath = jarPath.replaceFirst("file://", "file:////"); //NOI18N
+ }
+ return new URL(jarPath);
+
+ } catch (MalformedURLException mue) {
+ LOG.log(
+ Level.WARNING,
+ "Invalid URL ({0}): {1}, jarPath: {2}", //NOI18N
+ new Object[] {
+ mue.getMessage(),
+ url.toExternalForm(),
+ jarPath
+ });
}
}
}
+
return null;
}
/**
- * Tests if a file represents a java archive.
- * By default the JAR or ZIP archives are supported.
+ * Tests if a file represents a JAR or ZIP archive.
* @param fo the file to be tested
- * @return true if the file looks like a java archive
+ * @return true if the file looks like a ZIP-format archive
* @since 4.48
*/
public static boolean isArchiveFile(FileObject fo) {
Parameters.notNull("fileObject", fo); //NOI18N
- for (ArchiveRootProvider provider : getArchiveRootProviders()) {
- if (provider.isArchiveFile(fo, true)) {
- return true;
+
+ if (!fo.isValid()) {
+ return isArchiveFile(fo.getPath());
+ }
+ // XXX Special handling of virtual file objects: try to determine it using its name, but don't cache the
+ // result; when the file is checked out the more correct method can be used
+ if (fo.isVirtual()) {
+ return isArchiveFile(fo.getPath());
+ }
+
+ if (fo.isFolder()) {
+ return false;
+ }
+
+ // First check the cache.
+ Boolean b = archiveFileCache.get(fo);
+
+ if (b == null) {
+ // Need to check it.
+ try {
+ InputStream in = fo.getInputStream();
+
+ try {
+ byte[] buffer = new byte[4];
+ int len = in.read(buffer, 0, 4);
+
+ if (len == 4) {
+ // Got a header, see if it is a ZIP file.
+ b = Boolean.valueOf(Arrays.equals(ZIP_HEADER_1, buffer) || Arrays.equals(ZIP_HEADER_2, buffer));
+ } else {
+ //If the length is less than 4, it can be either
+ //broken (empty) archive file or other empty file.
+ //Return false and don't cache it, when the archive
+ //file will be written and closed its length will change
+ return false;
+ }
+ } finally {
+ in.close();
+ }
+ } catch (IOException ioe) {
+ // #160507 - ignore exception (e.g. permission denied)
+ LOG.log(Level.FINE, null, ioe);
}
+
+ if (b == null) {
+ b = isArchiveFile(fo.getPath());
+ }
+
+ archiveFileCache.put(fo, b);
}
- return false;
+
+ return b.booleanValue();
}
/**
- * Tests if a URL represents a java archive.
- * By default the JAR or ZIP archives are supported.
+ * Tests if a URL represents a JAR or ZIP archive.
* If there is no such file object, the test is done by heuristic: any URL with an extension is
* treated as an archive.
* @param url a URL to a file
- * @return true if the URL seems to represent a java archive
+ * @return true if the URL seems to represent a ZIP-format archive
* @since 4.48
*/
public static boolean isArchiveFile(URL url) {
Parameters.notNull("url", url); //NOI18N
- return isArchiveFileImpl(url, true);
- }
- /**
- * Tests if an file is inside an archive.
- * @param fo the file to be tested
- * @return true if the file is inside an archive
- * @since 9.10
- */
- public static boolean isArchiveArtifact(FileObject fo) {
- Parameters.notNull("fileObject", fo); //NOI18N
- for (ArchiveRootProvider provider : getArchiveRootProviders()) {
- if (provider.isArchiveArtifact(fo)) {
- return true;
- }
+ if ("jar".equals(url.getProtocol())) { //NOI18N
+
+ //Already inside archive, return false
+ return false;
}
- return false;
- }
- /**
- * Tests if an {@link URL} denotes a file inside an archive.
- * @param url the url to be tested
- * @return true if the url points inside an archive
- * @since 9.10
- */
- public static boolean isArchiveArtifact(URL url) {
- Parameters.notNull("url", url); //NOI18N
- for (ArchiveRootProvider provider : getArchiveRootProviders()) {
- if (provider.isArchiveArtifact(url)) {
- return true;
+ FileObject fo = URLMapper.findFileObject(url);
+
+ if ((fo != null) && !fo.isVirtual()) {
+ if (LOG.isLoggable(Level.FINEST)) {
+ LOG.log(Level.FINEST, "isArchiveFile_FILE_RESOLVED", fo); //NOI18N, used by FileUtilTest.testIsArchiveFileRace
}
+ return isArchiveFile(fo);
+ } else {
+ return isArchiveFile(url.getPath());
}
- return false;
}
/**
@@ -1997,7 +2048,7 @@ public final class FileUtil extends Object {
u = BaseUtilities.toURI(entry).toURL();
isDir = entry.isDirectory();
} while (wasDir ^ isDir);
- if (isArchiveFileImpl(u, false)) {
+ if (isArchiveFile(u) || entry.isFile() && entry.length() < 4) {
return getArchiveRoot(u);
} else if (isDir) {
assert u.toExternalForm().endsWith("/"); //NOI18N
@@ -2027,23 +2078,9 @@ public final class FileUtil extends Object {
* @since org.openide.filesystems 7.8
*/
public static File archiveOrDirForURL(URL entry) {
- final String u = entry.toString();
- if (isArchiveArtifact(entry)) {
- entry = getArchiveFile(entry);
- try {
- return u.endsWith("!/") && entry != null && "file".equals(entry.getProtocol()) ? //NOI18N
- BaseUtilities.toFile(entry.toURI()):
- null;
- } catch (URISyntaxException e) {
- LOG.log(
- Level.WARNING,
- "Invalid URI: {0} ({1})", //NOI18N
- new Object[]{
- entry,
- e.getMessage()
- });
- return null;
- }
+ String u = entry.toString();
+ if (u.startsWith("jar:file:") && u.endsWith("!/")) { // NOI18N
+ return BaseUtilities.toFile(URI.create(u.substring(4, u.length() - 2)));
} else if (u.startsWith("file:")) { // NOI18N
return BaseUtilities.toFile(URI.create(u));
} else {
@@ -2324,27 +2361,13 @@ public final class FileUtil extends Object {
}
}
- private static boolean isArchiveFileImpl(final URL url, final boolean strict) {
- for (ArchiveRootProvider provider : getArchiveRootProviders()) {
- if (provider.isArchiveFile(url, strict)) {
- return true;
- }
- }
- return false;
- }
-
- private static Iterable<? extends ArchiveRootProvider> getArchiveRootProviders() {
- Lookup.Result<ArchiveRootProvider> res = archiveRootProviders.get();
- if (res == null) {
- res = new ProxyLookup(
- Lookups.singleton(new JarArchiveRootProvider()),
- Lookup.getDefault()).lookupResult(ArchiveRootProvider.class);
- if (!archiveRootProviders.compareAndSet(null, res)) {
- res = archiveRootProviders.get();
- }
- }
- return res.allInstances();
+ /**
+ * Tests if a non existent path represents a file.
+ * @param path to be tested, separated by '/'.
+ * @return true if the file has '.' after last '/'.
+ */
+ private static boolean isArchiveFile (final String path) {
+ int index = path.lastIndexOf('.'); //NOI18N
+ return (index != -1) && (index > path.lastIndexOf('/') + 1); //NOI18N
}
-
- private static final AtomicReference<Lookup.Result<ArchiveRootProvider>> archiveRootProviders = new AtomicReference<>();
}
diff --git a/openide.filesystems/src/org/openide/filesystems/JarArchiveRootProvider.java b/openide.filesystems/src/org/openide/filesystems/JarArchiveRootProvider.java
deleted file mode 100644
index 8b21a1d..0000000
--- a/openide.filesystems/src/org/openide/filesystems/JarArchiveRootProvider.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2015 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2015 Sun Microsystems, Inc.
- */
-package org.openide.filesystems;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
-import java.util.WeakHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.openide.filesystems.spi.ArchiveRootProvider;
-import org.openide.util.Exceptions;
-
-/**
- *
- * @author Tomas Zezula
- */
-final class JarArchiveRootProvider implements ArchiveRootProvider {
- private static final String PROTOCOL = "jar"; //NOI18N
- /** Normal header for ZIP files. */
- private static byte[] ZIP_HEADER_1 = {0x50, 0x4b, 0x03, 0x04};
- /** Also seems to be used at least in apisupport/project/test/unit/data/example-external-projects/suite3/nbplatform/random/modules/ext/stuff.jar; not known why */
- private static byte[] ZIP_HEADER_2 = {0x50, 0x4b, 0x05, 0x06};
- private static final Logger LOG = Logger.getLogger(JarArchiveRootProvider.class.getName());
- /** Cache for {@link #isArchiveFile(FileObject)}. */
- private static final Map</*@GuardedBy("archiveFileCache")*/FileObject, Boolean> archiveFileCache = Collections.synchronizedMap(new WeakHashMap<FileObject,Boolean>());
-
- @Override
- public boolean isArchiveFile(URL url, boolean strict) {
- if (PROTOCOL.equals(url.getProtocol())) { //NOI18N
- //Already inside archive, return false
- return false;
- }
- FileObject fo = URLMapper.findFileObject(url);
- if ((fo != null) && !fo.isVirtual()) {
- if (LOG.isLoggable(Level.FINEST)) {
- LOG.log(Level.FINEST, "isArchiveFile_FILE_RESOLVED", fo); //NOI18N, used by FileUtilTest.testIsArchiveFileRace
- }
- return isArchiveFile(fo, strict);
- } else {
- return isArchiveFile(url.getPath());
- }
- }
-
- @Override
- public boolean isArchiveFile(FileObject fo, boolean strict) {
- if (!fo.isValid()) {
- return isArchiveFile(fo.getPath());
- }
- // XXX Special handling of virtual file objects: try to determine it using its name, but don't cache the
- // result; when the file is checked out the more correct method can be used
- if (fo.isVirtual()) {
- return isArchiveFile(fo.getPath());
- }
-
- if (fo.isFolder()) {
- return false;
- }
-
- // First check the cache.
- Boolean b = archiveFileCache.get(fo);
- if (b == null) {
- // Need to check it.
- try {
- InputStream in = fo.getInputStream();
-
- try {
- byte[] buffer = new byte[4];
- int len = in.read(buffer, 0, 4);
-
- if (len == 4) {
- // Got a header, see if it is a ZIP file.
- b = Boolean.valueOf(Arrays.equals(ZIP_HEADER_1, buffer) || Arrays.equals(ZIP_HEADER_2, buffer));
- } else {
- //If the length is less than 4, it can be either
- //broken (empty) archive file or other empty file.
- //Return false and don't cache it, when the archive
- //file will be written and closed its length will change
- return !strict;
- }
- } finally {
- in.close();
- }
- } catch (IOException ioe) {
- // #160507 - ignore exception (e.g. permission denied)
- LOG.log(Level.FINE, null, ioe);
- }
- if (b == null) {
- b = isArchiveFile(fo.getPath());
- }
- archiveFileCache.put(fo, b);
- }
- return b.booleanValue();
- }
-
-
- @Override
- public boolean isArchiveArtifact(URL url) {
- return PROTOCOL.equals(url.getProtocol());
- }
-
- @Override
- public URL getArchiveFile(URL url) {
- String protocol = url.getProtocol();
-
- if (PROTOCOL.equals(protocol)) { //NOI18N
-
- String path = url.getPath();
- int index = path.indexOf("!/"); //NOI18N
-
- if (index >= 0) {
- String jarPath = null;
- try {
- jarPath = path.substring(0, index);
- if (jarPath.indexOf("file://") > -1 && jarPath.indexOf("file:////") == -1) { //NOI18N
- /* Replace because JDK application classloader wrongly recognizes UNC paths. */
- jarPath = jarPath.replaceFirst("file://", "file:////"); //NOI18N
- }
- return new URL(jarPath);
-
- } catch (MalformedURLException mue) {
- LOG.log(
- Level.WARNING,
- "Invalid URL ({0}): {1}, jarPath: {2}", //NOI18N
- new Object[] {
- mue.getMessage(),
- url.toExternalForm(),
- jarPath
- });
- }
- }
- }
- return null;
- }
-
- @Override
- public FileObject getArchiveFile(FileObject fo) {
- try {
- final FileSystem fs = fo.getFileSystem();
- if (fs instanceof JarFileSystem) {
- final File jarFile = ((JarFileSystem) fs).getJarFile();
- return FileUtil.toFileObject(jarFile);
- }
- } catch (FileStateInvalidException e) {
- Exceptions.printStackTrace(e);
- }
- return null;
- }
-
- @Override
- public URL getArchiveRoot(final URL url) {
- try {
- // XXX TBD whether the url should ever be escaped...
- return new URL("jar:" + url + "!/"); // NOI18N
- } catch (MalformedURLException e) {
- throw new AssertionError(e);
- }
- }
-
- /**
- * Tests if a non existent path represents a file.
- * @param path to be tested, separated by '/'.
- * @return true if the file has '.' after last '/'.
- */
- private static boolean isArchiveFile (final String path) {
- int index = path.lastIndexOf('.'); //NOI18N
- return (index != -1) && (index > path.lastIndexOf('/') + 1); //NOI18N
- }
-
-}
diff --git a/openide.filesystems/src/org/openide/filesystems/attributes.dtd b/openide.filesystems/src/org/openide/filesystems/attributes.dtd
index 1c050b2..a8c7e12 100644
--- a/openide.filesystems/src/org/openide/filesystems/attributes.dtd
+++ b/openide.filesystems/src/org/openide/filesystems/attributes.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD DefaultAttributes 1.0//EN -->
<!-- XML representation of DefaultAttributes -->
<!-- as for example a module layer. -->
diff --git a/openide.filesystems/src/org/openide/filesystems/doc-files/HOWTO-MIME.html b/openide.filesystems/src/org/openide/filesystems/doc-files/HOWTO-MIME.html
index 5f8c071..4e2a3ef 100644
--- a/openide.filesystems/src/org/openide/filesystems/doc-files/HOWTO-MIME.html
+++ b/openide.filesystems/src/org/openide/filesystems/doc-files/HOWTO-MIME.html
@@ -2,10 +2,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -17,14 +15,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -35,8 +39,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<HTML>
diff --git a/openide.filesystems/src/org/openide/filesystems/doc-files/api.html b/openide.filesystems/src/org/openide/filesystems/doc-files/api.html
index 916933a..1b461e1 100644
--- a/openide.filesystems/src/org/openide/filesystems/doc-files/api.html
+++ b/openide.filesystems/src/org/openide/filesystems/doc-files/api.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html><head>
@@ -110,7 +112,7 @@ which abstracts away most of the details of files and presents data in
terms of <a href="@org-openide-loaders@/org/openide/loaders/DataObject.html">DataObject</a>s,
which typically represent the parsed content of a file and provide
objects to programmatically access that content via
-<a href="@org-openide-loaders@/org/openide/loaders/DataObject.html#getCookie-java.lang.Class-">DataObject.getCookie()</a>.
+<a href="@org-openide-loaders@/org/openide/loaders/DataObject.html#getCookie(java.lang.Class)">DataObject.getCookie()</a>.
<h2><a name="basic-usage">Common Tasks</a></h2>
@@ -138,7 +140,7 @@ which represents it.
<p>If you need to get a file object corresponding to a file on disk, use:
<pre>
-fileObject = FileUtil.<a href="../FileUtil.html#toFileObject-java.io.File-">toFileObject</a>(new File("/some/path/to/file.txt"));
+fileObject = FileUtil.<a href="../FileUtil.html#toFileObject(java.io.File)">toFileObject</a>(new File("/some/path/to/file.txt"));
</pre>
<p><code>FileUtil</code> also has methods for working with archive (ZIP/JAR) entries. File objects corresponding
@@ -149,15 +151,15 @@ To find all the folders and files directly contained in this
folder, you may use:
<pre>
-FileObject children[]=folder.<a href="../FileObject.html#getChildren--">getChildren</a>();
+FileObject children[]=folder.<a href="../FileObject.html#getChildren()">getChildren</a>();
</pre>
Occasionally you may need to present a given file object as a URL; for example, to display it in
a web browser. This is straightforward:
<pre>
-URL url = <a href="../FileObject.html#getURL--">file.getURL()</a>;
-HtmlBrowser.URLDisplayer.getDefault().<a href="@org-openide-awt@/org/openide/awt/HtmlBrowser.URLDisplayer.html#showURL-java.net.URL-">showURL</a>(url);
+URL url = <a href="../FileObject.html#getURL()">file.getURL()</a>;
+HtmlBrowser.URLDisplayer.getDefault().<a href="@org-openide-awt@/org/openide/awt/HtmlBrowser.URLDisplayer.html#showURL(java.net.URL)">showURL</a>(url);
</pre>
<h3><a name="create-delete-rename">Creating, deleting, and renaming files and folders</a></h3>
@@ -166,8 +168,8 @@ This example creates a subfolder and then a new file within that
subfolder:
<pre>
-FileObject subfolder=folder.<a href="../FileObject.html#createFolder-java.lang.String-">createFolder</a>("sub");
-FileObject newfile=subfolder.<a href="../FileObject.html#createData-java.lang.String-java.lang.String-">createData</a>("NewSource", "java");
+FileObject subfolder=folder.<a href="../FileObject.html#createFolder(java.lang.String)">createFolder</a>("sub");
+FileObject newfile=subfolder.<a href="../FileObject.html#createData(java.lang.String,%20java.lang.String)">createData</a>("NewSource", "java");
</pre>
<p>You can delete a file easily:</p>
@@ -186,16 +188,16 @@ at the same time. Then you may rename it:
<pre>
FileLock lock = null;
try {
- lock=newfile.<a href="../FileObject.html#lock--">lock</a>();
+ lock=newfile.<a href="../FileObject.html#lock()">lock</a>();
} catch (<a href="../FileAlreadyLockedException.html">FileAlreadyLockedException</a> e) {
// Try again later; perhaps display a warning dialog.
return;
}
try {
- newfile.<a href="../FileObject.html#rename-org.openide.filesystems.FileLock-java.lang.String-java.lang.String-">rename</a>(lock, "NewSrc", "java");
+ newfile.<a href="../FileObject.html#rename(org.openide.filesystems.FileLock,%20java.lang.String,%20java.lang.String)">rename</a>(lock, "NewSrc", "java");
} finally {
// Always put this in a finally block!
- lock.<a href="../FileLock.html#releaseLock--">releaseLock</a>();
+ lock.<a href="../FileLock.html#releaseLock()">releaseLock</a>();
}
</pre>
@@ -206,7 +208,7 @@ to use a NetBeans helper method:
<pre>
FileObject someFile;
FileObject whereTo;
-<a href="@TOP@/org/openide/filesystems/FileUtil.html#moveFile-org.openide.filesystems.FileObject-org.openide.filesystems.FileObject-java.lang.String-">FileUtil.moveFile</a>(someFile, whereTo, "YourSource");
+<a href="@TOP@/org/openide/filesystems/FileUtil.html#moveFile(org.openide.filesystems.FileObject,%20org.openide.filesystems.FileObject,%20java.lang.String)">FileUtil.moveFile</a>(someFile, whereTo, "YourSource");
</pre>
Note that in the current API set, it is neither possible nor
@@ -233,7 +235,7 @@ facilities for
Reading and writing the contents of a data file is straightforward:
<pre>
-BufferedReader from=new BufferedReader(new InputStreamReader(someFile.<a href="../FileObject.html#getInputStream--">getInputStream</a>()));
+BufferedReader from=new BufferedReader(new InputStreamReader(someFile.<a href="../FileObject.html#getInputStream()">getInputStream</a>()));
try {
String line;
while ((line=from.readLine()) != null) {
@@ -249,7 +251,7 @@ try {
return;
}
try {
- PrintWriter to=new PrintWriter(someFile.<a href="../FileObject.html#getOutputStream-org.openide.filesystems.FileLock-">getOutputStream</a>(lock));
+ PrintWriter to=new PrintWriter(someFile.<a href="../FileObject.html#getOutputStream(org.openide.filesystems.FileLock)">getOutputStream</a>(lock));
try {
to.println("testing...");
to.println("1..2..3..");
@@ -267,12 +269,12 @@ If you need to keep track of what is being done to a file by other
components, you can monitor it using normal Java events:
<pre>
-someFile.<a href="../FileObject.html#addFileChangeListener-org.openide.filesystems.FileChangeListener-">addFileChangeListener</a>(new <a href="../FileChangeAdapter.html">FileChangeAdapter</a>() {
- public void <a href="../FileChangeAdapter.html#fileChanged-org.openide.filesystems.FileEvent-">fileChanged</a>(<a href="../FileEvent.html">FileEvent</a> ev) {
+someFile.<a href="../FileObject.html#addFileChangeListener(org.openide.filesystems.FileChangeListener)">addFileChangeListener</a>(new <a href="../FileChangeAdapter.html">FileChangeAdapter</a>() {
+ public void <a href="../FileChangeAdapter.html#fileChanged(org.openide.filesystems.FileEvent)">fileChanged</a>(<a href="../FileEvent.html">FileEvent</a> ev) {
System.out.println("Contents changed.");
}
- public void <a href="../FileChangeAdapter.html#fileAttributeChanged-org.openide.filesystems.FileAttributeEvent-">fileAttributeChanged</a>(<a href="../FileAttributeEvent.html">FileAttributeEvent</a> ev) {
- System.out.println(ev.<a href="../FileAttributeEvent.html#getName--">getName</a>() + ": " + ev.<a href="../FileAttributeEvent.html#getOldValue--">getOldValue</a>() + " -> " + ev.<a href="../FileAttributeEvent.html#getNewValue--">getNewValue</a>());
+ public void <a href="../FileChangeAdapter.html#fileAttributeChanged(org.openide.filesystems.FileAttributeEvent)">fileAttributeChanged</a>(<a href="../FileAttributeEvent.html">FileAttributeEvent</a> ev) {
+ System.out.println(ev.<a href="../FileAttributeEvent.html#getName()">getName</a>() + ": " + ev.<a href="../FileAttributeEvent.html#getOldValue()">getOldValue</a>() + " -> " + ev.<a href="../FileAttributeEvent.html#getNewValue()">getNewValue</a>());
}
});
</pre>
@@ -283,12 +285,12 @@ just want to listen on the parent folder. Also, file creation events
are fired on the folder only, of course:
<pre>
-FileObject someFolder=someFile.<a href="../FileObject.html#getParent--">getParent</a>();
+FileObject someFolder=someFile.<a href="../FileObject.html#getParent()">getParent</a>();
someFolder.addFileChangeListener(new FileChangeAdapter() {
public void fileChanged(FileEvent ev) {
- System.out.println("Contents of " + ev.<a href="../FileEvent.html#getFile--">getFile</a>() + " changed.");
+ System.out.println("Contents of " + ev.<a href="../FileEvent.html#getFile()">getFile</a>() + " changed.");
}
- public void <a href="../FileChangeAdapter.html#fileDataCreated-org.openide.filesystems.FileEvent-">fileDataCreated</a>(FileEvent ev) {
+ public void <a href="../FileChangeAdapter.html#fileDataCreated(org.openide.filesystems.FileEvent)">fileDataCreated</a>(FileEvent ev) {
System.out.println("File " + ev.getFile() + " created.");
}
});
diff --git a/openide.filesystems/src/org/openide/filesystems/doc-files/resolverDocumentation.html b/openide.filesystems/src/org/openide/filesystems/doc-files/resolverDocumentation.html
index 37da41c..52b1301 100644
--- a/openide.filesystems/src/org/openide/filesystems/doc-files/resolverDocumentation.html
+++ b/openide.filesystems/src/org/openide/filesystems/doc-files/resolverDocumentation.html
@@ -1,43 +1,44 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/openide.filesystems/src/org/openide/filesystems/filesystem.dtd b/openide.filesystems/src/org/openide/filesystems/filesystem.dtd
index c73f164..7c82025 100644
--- a/openide.filesystems/src/org/openide/filesystems/filesystem.dtd
+++ b/openide.filesystems/src/org/openide/filesystems/filesystem.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Filesystem 1.0//EN -->
<!-- XML representation of a fixed filesystem -->
<!-- as for example a module layer. -->
diff --git a/openide.filesystems/src/org/openide/filesystems/filesystem1_1.dtd b/openide.filesystems/src/org/openide/filesystems/filesystem1_1.dtd
index d48e725..e079280 100644
--- a/openide.filesystems/src/org/openide/filesystems/filesystem1_1.dtd
+++ b/openide.filesystems/src/org/openide/filesystems/filesystem1_1.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Filesystem 1.1//EN -->
<!-- XML representation of a fixed filesystem -->
<!-- as for example a module layer. -->
diff --git a/openide.filesystems/src/org/openide/filesystems/filesystem1_2.dtd b/openide.filesystems/src/org/openide/filesystems/filesystem1_2.dtd
index f6ee121..771b0be 100644
--- a/openide.filesystems/src/org/openide/filesystems/filesystem1_2.dtd
+++ b/openide.filesystems/src/org/openide/filesystems/filesystem1_2.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- -//NetBeans//DTD Filesystem 1.2//EN -->
<!-- XML representation of a fixed filesystem -->
<!-- as for example a module layer. -->
diff --git a/openide.filesystems/src/org/openide/filesystems/package.html b/openide.filesystems/src/org/openide/filesystems/package.html
index d2818fd..775e6c2 100644
--- a/openide.filesystems/src/org/openide/filesystems/package.html
+++ b/openide.filesystems/src/org/openide/filesystems/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/openide.filesystems/src/org/openide/filesystems/spi/ArchiveRootProvider.java b/openide.filesystems/src/org/openide/filesystems/spi/ArchiveRootProvider.java
deleted file mode 100644
index e472e01..0000000
--- a/openide.filesystems/src/org/openide/filesystems/spi/ArchiveRootProvider.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2015 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2015 Sun Microsystems, Inc.
- */
-package org.openide.filesystems.spi;
-
-import java.net.URL;
-import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileUtil;
-import org.openide.filesystems.URLMapper;
-
-/**
- * A possibility to plug a support for java archives into FileUtil.
- * The interface is used by {@link FileUtil.isArchiveArtifact}, {@link FileUtil.isArchiveFile},
- * {@link FileUtil.getArchiveRoot}, {@link FileUtil.getArchiveFile}.
- * The implementations are registered in global lookup.
- * @author Tomas Zezula
- * @since 9.10
- */
-public interface ArchiveRootProvider {
-
- /**
- * Tests if a file represents an java archive.
- * @param url the file to be tested
- * @param strict when false the detection may not be precise, for example
- * an empty archive missing the archive header is treated as an archive
- * @return true if the file looks like an archive
- */
- boolean isArchiveFile(URL url, boolean strict);
-
- /**
- * Tests if a file represents an java archive.
- * The default implementation delegates to {@link ArchiveRootProvider#isArchiveFile(URL, boolean)},
- * it can be overridden by an implementation in more efficient way.
- * @param fo the file to be tested
- * @param strict when false the detection may not be precise, for example
- * an empty archive missing the archive header is treated as an archive
- * @return true if the file looks like an archive
- */
- default boolean isArchiveFile(FileObject fo, boolean strict) {
- final URL url = URLMapper.findURL(fo, URLMapper.EXTERNAL);
- return url == null ? false : isArchiveFile(url, strict);
- }
-
- /**
- * Tests if an {@link URL} denotes a file inside an archive.
- * @param url the url to be tested
- * @return true if the url points inside an archive
- */
- boolean isArchiveArtifact(URL url);
-
- /**
- * Tests if an file is inside an archive.
- * The default implementation delegates to {@link ArchiveRootProvider#isArchiveArtifact(URL)},
- * it can be overridden by an implementation in more efficient way.
- * @param fo the file to be tested
- * @return true if the file is inside an archive
- */
- default boolean isArchiveArtifact(FileObject fo) {
- final URL url = URLMapper.findURL(fo, URLMapper.EXTERNAL);
- return url == null ? false : isArchiveArtifact(url);
- }
-
- /**
- * Returns the URL of the archive file containing the file
- * referred to by a archive-protocol URL.
- * <strong>Remember</strong> that any path within the archive is discarded
- * so you may need to check for non-root entries.
- * @param url a URL
- * @return the embedded archive URL, or null if the URL is not an
- * archive-protocol URL containing <code>!/</code>
- */
- URL getArchiveFile(URL url);
-
- /**
- * Returns a FileObject representing an archive file containing the
- * FileObject given by the parameter.
- * <strong>Remember</strong> that any path within the archive is discarded
- * so you may need to check for non-root entries.
- * The default implementation delegates to {@link ArchiveRootProvider#getArchiveFile(URL)},
- * it can be overridden by an implementation in more efficient way.
- * @param fo a file in a archive filesystem
- * @return the file corresponding to the archive itself,
- * or null if <code>fo</code> is not an archive entry
- */
- default FileObject getArchiveFile(FileObject fo) {
- final URL rootURL = URLMapper.findURL(fo, URLMapper.EXTERNAL);
- if (rootURL == null) {
- return null;
- }
- return URLMapper.findFileObject(FileUtil.getArchiveFile(rootURL));
- }
-
- /**
- * Returns an URL representing the root of an archive.
- * Clients may need to first call {@link #isArchiveFile(URL)} to determine if the URL
- * refers to an archive file.
- * @param url of an java archive file
- * @return the archive-protocol URL of the root of the archive
- */
- URL getArchiveRoot(URL url);
-
- /**
- * Returns a FileObject representing the root folder of an archive.
- * Clients may need to first call {@link #isArchiveFile(FileObject)} to determine
- * if the file object refers to an archive file.
- * The default implementation delegates to {@link ArchiveRootProvider#getArchiveRoot(URL)},
- * it can be overridden by an implementation in more efficient way.
- * @param fo an java archive file
- * @return a virtual archive root folder, or null if the file is not actually an archive
- */
- default FileObject getArchiveRoot(FileObject fo) {
- final URL archiveURL = URLMapper.findURL(fo, URLMapper.EXTERNAL);
- if (archiveURL == null) {
- return null;
- }
- return URLMapper.findFileObject(FileUtil.getArchiveRoot(archiveURL));
- }
-}
diff --git a/openide.filesystems/test/unit/src/org/openide/filesystems/FileUtilTest.java b/openide.filesystems/test/unit/src/org/openide/filesystems/FileUtilTest.java
index b25175f..522b33e 100644
--- a/openide.filesystems/test/unit/src/org/openide/filesystems/FileUtilTest.java
+++ b/openide.filesystems/test/unit/src/org/openide/filesystems/FileUtilTest.java
@@ -276,7 +276,7 @@ public class FileUtilTest extends NbTestCase {
final File testFile = new File (wd,"test.jar"); //NOI18N
FileUtil.createData(testFile);
- final Logger log = Logger.getLogger(JarArchiveRootProvider.class.getName());
+ final Logger log = Logger.getLogger(FileUtil.class.getName());
log.setLevel(Level.FINEST);
final Handler handler = new Handler() {
@Override
diff --git a/openide.filesystems/test/unit/src/org/openide/filesystems/JarFileSystemHidden.java b/openide.filesystems/test/unit/src/org/openide/filesystems/JarFileSystemHidden.java
index e574ff4..4f74e9d 100644
--- a/openide.filesystems/test/unit/src/org/openide/filesystems/JarFileSystemHidden.java
+++ b/openide.filesystems/test/unit/src/org/openide/filesystems/JarFileSystemHidden.java
@@ -53,7 +53,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PrintStream;
-import java.lang.reflect.Method;
import java.net.URL;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
@@ -66,6 +65,7 @@ import org.netbeans.junit.Log;
import org.netbeans.junit.MockServices;
import org.netbeans.junit.NbTestCase;
import org.openide.util.Lookup;
+import sun.security.tools.KeyTool;
/**
*
@@ -160,21 +160,14 @@ public class JarFileSystemHidden extends NbTestCase {
}
try {
// create a key store
- final String[] args = new String[]{"-genkey",
+ KeyTool.main(new String[]{"-genkey",
"-alias", "t_alias",
"-keyalg", "RSA",
"-storepass", "testpass",
"-keypass", "testpass",
"-dname", "CN=Test, OU=QA, O=Test Org, L=Test Village,"
+ " S=Testonia, C=Test Republic",
- "-keystore", keystoreFile.getAbsolutePath()};
- //sun.security.tools.keytool.Main not public API and no more in
- //ct.sym, compilation requires -XDignore.symbol.file which will not work in JDK 9.
- //Better to use reflection
- final Class<?> clz = Class.forName("sun.security.tools.keytool.Main");
- final Method m = clz.getDeclaredMethod("main", args.getClass());
- m.setAccessible(true); //JDK9 requires
- m.invoke(null, (Object)args);
+ "-keystore", keystoreFile.getAbsolutePath()});
} catch (Exception ex) {
ex.printStackTrace(System.out);
return;
@@ -182,7 +175,7 @@ public class JarFileSystemHidden extends NbTestCase {
// sign the jar
try {
- sun.security.tools.jarsigner.Main.main(new String[]{
+ sun.security.tools.JarSigner.main(new String[]{
"-keystore", keystoreFile.getAbsolutePath(),
"-storepass", "testpass",
jarFile.getAbsolutePath(),
diff --git a/openide.filesystems/test/unit/src/org/openide/filesystems/annotations/LayerBuilderTest.java b/openide.filesystems/test/unit/src/org/openide/filesystems/annotations/LayerBuilderTest.java
index c2a39c7..3d9e820 100644
--- a/openide.filesystems/test/unit/src/org/openide/filesystems/annotations/LayerBuilderTest.java
+++ b/openide.filesystems/test/unit/src/org/openide/filesystems/annotations/LayerBuilderTest.java
@@ -48,7 +48,6 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.Serializable;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -239,10 +238,6 @@ public class LayerBuilderTest extends NbTestCase {
public @Override Element getEnclosingElement() {return null;}
public @Override List<? extends Element> getEnclosedElements() {return null;}
public @Override <R, P> R accept(ElementVisitor<R, P> v, P p) {return null;}
- @Override
- public <A extends Annotation> A[] getAnnotationsByType(Class<A> annotationType) {
- return (A[]) Array.newInstance(annotationType, 0);
- }
}, null);
b.folder("f").write();
assertEquals("<filesystem><folder name='f'><!--originating.Type--></folder></filesystem>", dump());
diff --git a/openide.io/apichanges.xml b/openide.io/apichanges.xml
index bd22fe4..7754f4a 100644
--- a/openide.io/apichanges.xml
+++ b/openide.io/apichanges.xml
@@ -239,22 +239,22 @@ is the proper place.
<p>
After fixing bug#185209
<code>
- <a href="@TOP@/org/openide/windows/IOContainer.html#select-javax.swing.JComponent-">IOContainer.select()</a>
+ <a href="@TOP@/org/openide/windows/IOContainer.html#select(javax.swing.JComponent)">IOContainer.select()</a>
</code>
no longer performs these operations for us so implementations of IOProvider
have to do them:
<code>
- <a href="@TOP@/org/openide/windows/IOContainer.html#open--">IOContainer.open()</a>
+ <a href="@TOP@/org/openide/windows/IOContainer.html#open()">IOContainer.open()</a>
</code>
,
<code>
- <a href="@TOP@/org/openide/windows/IOContainer.html#requestVisible--">IOContainer.requestVisible()</a>
+ <a href="@TOP@/org/openide/windows/IOContainer.html#requestVisible()">IOContainer.requestVisible()</a>
</code>
.
</p>
<p>
Existing implementation of
- <a href="@TOP@/org/openide/windows/InputOutput.html#select--">InputOutput.select()</a>
+ <a href="@TOP@/org/openide/windows/InputOutput.html#select()">InputOutput.select()</a>
has been adjusted and is still compatible.
</p>
</description>
@@ -311,14 +311,14 @@ is the proper place.
<author login="t_h"/>
<compatibility addition="yes" binary="compatible" semantic="compatible" />
<description>
- <p>Added static <a href="@TOP@/org/openide/windows/IOProvider.html#get-java.lang.String-">
+ <p>Added static <a href="@TOP@/org/openide/windows/IOProvider.html#get(java.lang.String)">
<code>IOProvider.get(String name)</code></a> to get specific implementation of IOProvider. Added
- <a href="@TOP@/org/openide/windows/IOProvider.html#getName--"><code>IOProvider.getName()</code></a>
+ <a href="@TOP@/org/openide/windows/IOProvider.html#getName()"><code>IOProvider.getName()</code></a>
which should be overriden by subclasses to provide its name (ID).
</p>
<p><a href="@TOP@/org/openide/windows/IOContainer.html"><code>IOContainer</code></a>
was introduced as an accessor to "parent container" for IO components (tab).
- <a href="@TOP@/org/openide/windows/IOProvider.html#getIO-java.lang.String-javax.swing.Action:A-org.openide.windows.IOContainer-">
+ <a href="@TOP@/org/openide/windows/IOProvider.html#getIO(java.lang.String, javax.swing.Action[], org.openide.windows.IOContainer)">
<code>IOProvider.getIO(String name, Action[] additionalActions, IOContainer ioContainer)</code></a>
can be used to specify alternative container.
</p>
diff --git a/openide.io/manifest.mf b/openide.io/manifest.mf
index 6272051..abaeb9b 100644
--- a/openide.io/manifest.mf
+++ b/openide.io/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.io
-OpenIDE-Module-Specification-Version: 1.49.1
+OpenIDE-Module-Specification-Version: 1.48.1
OpenIDE-Module-Localizing-Bundle: org/openide/io/Bundle.properties
OpenIDE-Module-Recommends: org.openide.windows.IOProvider, org.openide.windows.IOContainer$Provider
AutoUpdate-Essential-Module: true
diff --git a/openide.io/nbproject/org-openide-io.sig b/openide.io/nbproject/org-openide-io.sig
index d9822f0..05b8da8 100644
--- a/openide.io/nbproject/org-openide-io.sig
+++ b/openide.io/nbproject/org-openide-io.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.48.1
+#Version 1.45
CLSS public abstract interface java.io.Closeable
intf java.lang.AutoCloseable
diff --git a/openide.io/src/org/openide/windows/package.html b/openide.io/src/org/openide/windows/package.html
index 0aac05f..11b1412 100644
--- a/openide.io/src/org/openide/windows/package.html
+++ b/openide.io/src/org/openide/windows/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
@@ -49,7 +51,7 @@ Java parser.
<p>The Output Window is organized into tabs, each of which is
capable of handling both input and output.
-<a href="IOProvider.html#getIO-java.lang.String-boolean-"><code>IOProvider.getIO(String, boolean)</code></a>
+<a href="IOProvider.html#getIO(java.lang.String,%20boolean)"><code>IOProvider.getIO(String, boolean)</code></a>
will get the
diff --git a/openide.loaders/apichanges.xml b/openide.loaders/apichanges.xml
index aa0685c..5c9a854 100644
--- a/openide.loaders/apichanges.xml
+++ b/openide.loaders/apichanges.xml
@@ -109,25 +109,6 @@ is the proper place.
<!-- ACTUAL CHANGES BEGIN HERE: -->
<changes>
- <change id="org.openide.loaders.DataFolder.SortMode.NATURAL">
- <api name="loaders"/>
- <summary>Introduces SortMode for natural sorting.</summary>
- <version major="7" minor="65"/>
- <date day="21" month="10" year="2015"/>
- <author login="jhavlin"/>
- <compatibility addition="yes" binary="compatible" source="compatible"
- semantic="compatible" deprecation="no" deletion="no"
- modification="no"/>
- <description>
- <p>
- Added support for natural sorting of DataObjects. This means
- that the sort is case insensitive and number sequences are
- sorted by value rather than lexicographically.
- </p>
- </description>
- <class package="org.openide.loaders" name="DataFolder"/>
- <issue number="242226"/>
- </change>
<change id="templates.separation">
<api name="loaders"/>
<summary>Separate template handling</summary>
@@ -337,10 +318,10 @@ is the proper place.
<description>
<p>
New way to subclass <code>MultiDataObject</code>: override
- <a href="@TOP@/org/openide/loaders/MultiDataObject.html#associateLookup--">
+ <a href="@TOP@/org/openide/loaders/MultiDataObject.html#associateLookup()">
int associateLookup()
</a> to return <code>1</code>. In constructor call
- <a href="@TOP@/org/openide/loaders/MultiDataObject.html#registerEditor-java.lang.String-boolean-">
+ <a href="@TOP@/org/openide/loaders/MultiDataObject.html#registerEditor(java.lang.String,%20boolean)">
registerEditor("your/mimetype", ...)</a> to get default
editor support. No need to override any other methods to get
well performing <code>MultiDataObject</code>.
@@ -590,7 +571,7 @@ is the proper place.
<p>
There is new method to register new DataObject types without
the need to write own DataLoader. Use
- <a href="@TOP@/org/openide/loaders/DataLoaderPool.html#factory-java.lang.Class-java.lang.String-java.awt.Image-">
+ <a href="@TOP@/org/openide/loaders/DataLoaderPool.html#factory(java.lang.Class,%20java.lang.String,%20java.awt.Image)">
DataLoaderPool.factory</a> method.
</p>
</description>
@@ -642,7 +623,7 @@ is the proper place.
<p>
When <a href="@TOP@/org/openide/loaders/TemplateWizard.html">TemplateWizard</a> invokes
<a href="@TOP@/org/openide/loaders/DataObject.html">DataObject</a>.createFromTemplate,
- it passes as argument all its <a href="@org-openide-dialogs@/org/openide/WizardDescriptor.html#getProperties--">properties</a>
+ it passes as argument all its <a href="@org-openide-dialogs@/org/openide/WizardDescriptor.html#getProperties()">properties</a>
to it with <code>wizard.</code> as a prefix. That way they are available to
underlying <a href="@TOP@/architecture-summary.html#script">scripting and templating
engines</a>.
@@ -763,14 +744,14 @@ is the proper place.
<p>
Since now, each DataNode constructed without using own lookup,
shall have <code>FileObject</code>(s) associated with its
- <a href="@TOP@/org/openide/loaders/DataObject.html#files--">DataObject</a>
+ <a href="@TOP@/org/openide/loaders/DataObject.html#files()">DataObject</a>
available in its own lookup.
Also a
<a href="@TOP@/org/openide/loaders/DataObject.html">DataObject</a>
has been retrofitted to implement a
<a href="@org-openide-util-lookup@/org/openide/util/Lookup.Provider.html">Lookup.Provider</a>
interface and thus have its
- <a href="@TOP@/org/openide/loaders/DataObject.html#getLookup--">getLookup</a>
+ <a href="@TOP@/org/openide/loaders/DataObject.html#getLookup()">getLookup</a>
method that can be used instead of the old <code>getCookie</code> one.
</p>
</description>
diff --git a/openide.loaders/arch.xml b/openide.loaders/arch.xml
index 7aa690a..7c95c74 100644
--- a/openide.loaders/arch.xml
+++ b/openide.loaders/arch.xml
@@ -84,7 +84,7 @@ made subject to such option by the copyright holder.
<p>
Often many people require ability to create a "clever" template - e.g.
write piece of simple text and at the time of its
- <a href="@TOP@/org/openide/loaders/DataObject.html#createFromTemplate-org.openide.loaders.DataFolder-java.lang.String-java.util.Map-">
+ <a href="@TOP@/org/openide/loaders/DataObject.html#createFromTemplate(org.openide.loaders.DataFolder,%20java.lang.String,%20java.util.Map)">
processing
</a>
do some advanced changes to it using either
@@ -561,7 +561,7 @@ for more information about this.
<api group="property" category="stable" name="wizard.anything" type="export" >
When <a href="@TOP@/org/openide/loaders/TemplateWizard.html">TemplateWizard</a> invokes
<a href="@TOP@/org/openide/loaders/DataObject.html">DataObject</a>.createFromTemplate,
- it passes as argument all its <a href="@org-openide-dialogs@/org/openide/WizardDescriptor.html#getProperties--">properties</a>
+ it passes as argument all its <a href="@org-openide-dialogs@/org/openide/WizardDescriptor.html#getProperties()">properties</a>
to it with prefix <code>wizard.</code>. That way they are available to
underlaying <a href="@TOP@/architecture-summary.html#script">scripting and templating
engines</a>.
@@ -867,7 +867,7 @@ about used templates.
Since version 7.44 one can attach <code>property-prefix</code> attribute
to every folder. Then all the file attributes are scanned and if some
of them start with the specified prefix they are placed a
- <a href="@JDK@/javax/swing/JComponent.html#putClientProperty-java.lang.Object-java.lang.Object-">
+ <a href="@JDK@/javax/swing/JComponent.html#putClientProperty(java.lang.Object,%20java.lang.Object)">
client
properties</a> on the <a href="@JDK@/javax/swing/JMenu.html">JMenu</a>
instance (after stripping the prefix off).
diff --git a/openide.loaders/manifest.mf b/openide.loaders/manifest.mf
index 5d3d2bf..9995843 100644
--- a/openide.loaders/manifest.mf
+++ b/openide.loaders/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.loaders
-OpenIDE-Module-Specification-Version: 7.66.1
+OpenIDE-Module-Specification-Version: 7.63.1
OpenIDE-Module-Localizing-Bundle: org/openide/loaders/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.templates.v1_0
OpenIDE-Module-Layer: org/netbeans/modules/openide/loaders/layer.xml
diff --git a/openide.loaders/nbproject/org-openide-loaders.sig b/openide.loaders/nbproject/org-openide-loaders.sig
index 4cb74a8..918d631 100644
--- a/openide.loaders/nbproject/org-openide-loaders.sig
+++ b/openide.loaders/nbproject/org-openide-loaders.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 7.63.2
+#Version 7.57
CLSS public java.awt.Canvas
cons public init()
@@ -936,7 +936,6 @@ intf java.awt.ItemSelectable
intf java.awt.event.ActionListener
intf javax.accessibility.Accessible
intf javax.swing.event.ListDataListener
-meth protected boolean processKeyBinding(javax.swing.KeyStroke,java.awt.event.KeyEvent,int,boolean)
meth protected java.beans.PropertyChangeListener createActionPropertyChangeListener(javax.swing.Action)
meth protected java.lang.String paramString()
meth protected javax.swing.JComboBox$KeySelectionManager createDefaultKeySelectionManager()
@@ -1120,8 +1119,6 @@ meth public void firePropertyChange(java.lang.String,boolean,boolean)
meth public void firePropertyChange(java.lang.String,char,char)
meth public void firePropertyChange(java.lang.String,int,int)
meth public void grabFocus()
-meth public void hide()
- anno 0 java.lang.Deprecated()
meth public void paint(java.awt.Graphics)
meth public void paintImmediately(int,int,int,int)
meth public void paintImmediately(java.awt.Rectangle)
@@ -1629,10 +1626,6 @@ meth public abstract void removeDocumentListener(javax.swing.event.DocumentListe
meth public abstract void removeUndoableEditListener(javax.swing.event.UndoableEditListener)
meth public abstract void render(java.lang.Runnable)
-CLSS public abstract interface javax.swing.text.Position
-innr public final static Bias
-meth public abstract int getOffset()
-
CLSS public abstract interface javax.swing.text.StyledDocument
intf javax.swing.text.Document
meth public abstract java.awt.Color getBackground(javax.swing.text.AttributeSet)
@@ -1742,12 +1735,27 @@ meth public abstract void open()
CLSS public abstract interface org.netbeans.api.actions.Printable
meth public abstract void print()
-CLSS public abstract org.netbeans.api.templates.CreateFromTemplateHandler
-cons public init()
-meth protected abstract boolean accept(org.netbeans.api.templates.CreateDescriptor)
-meth protected abstract java.util.List<org.openide.filesystems.FileObject> createFromTemplate(org.netbeans.api.templates.CreateDescriptor) throws java.io.IOException
- anno 0 org.netbeans.api.annotations.common.NonNull()
-supr java.lang.Object
+CLSS public abstract interface !annotation org.netbeans.api.templates.TemplateRegistration
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE, METHOD, PACKAGE])
+intf java.lang.annotation.Annotation
+meth public abstract !hasdefault boolean requireProject()
+meth public abstract !hasdefault int position()
+meth public abstract !hasdefault java.lang.String description()
+meth public abstract !hasdefault java.lang.String displayName()
+meth public abstract !hasdefault java.lang.String iconBase()
+meth public abstract !hasdefault java.lang.String id()
+meth public abstract !hasdefault java.lang.String scriptEngine()
+meth public abstract !hasdefault java.lang.String targetName()
+meth public abstract !hasdefault java.lang.String[] category()
+meth public abstract !hasdefault java.lang.String[] content()
+meth public abstract java.lang.String folder()
+
+CLSS public abstract interface !annotation org.netbeans.api.templates.TemplateRegistrations
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE, METHOD, PACKAGE])
+intf java.lang.annotation.Annotation
+meth public abstract org.netbeans.api.templates.TemplateRegistration[] value()
CLSS public org.openide.DialogDescriptor
cons public init(java.lang.Object,java.lang.String)
@@ -2314,7 +2322,6 @@ meth public java.lang.String iconResource()
anno 0 java.lang.Deprecated()
meth public org.openide.util.HelpCtx getHelpCtx()
supr org.openide.util.actions.NodeAction
-hfds SCRIPT_ENGINE_ATTR
hcls FolderNodeAcceptor
CLSS public org.openide.actions.ToolsAction
@@ -2839,7 +2846,7 @@ meth public void processKeyEvent(java.awt.event.KeyEvent)
meth public void setAlwaysShown(boolean)
meth public void setEnabled(boolean)
supr java.lang.Object
-hfds CLIENT_PROPERTY_KEY,ICON_FIND,ICON_FIND_WITH_MENU,alwaysShown,animationTimer,asynchronous,callback,component,constraints,enabled,hasSearchText,popupMenu,quickSearchKeyAdapter,rp,searchFieldListener,searchPanel,searchTextField
+hfds CLIENT_PROPERTY_KEY,ICON_FIND,ICON_FIND_WITH_MENU,alwaysShown,animationTimer,asynchronous,callback,component,constraints,enabled,popupMenu,quickSearchKeyAdapter,rp,searchFieldListener,searchPanel,searchTextField
hcls AnimationTimer,LazyFire,QS_FIRE,SearchFieldListener,SearchPanel,SearchTextField
CLSS public abstract interface static org.openide.awt.QuickSearch$Callback
@@ -3077,7 +3084,7 @@ meth public void setDnDListener(org.openide.awt.Toolbar$DnDListener)
meth public void setUI(javax.swing.plaf.ToolBarUI)
meth public void setVisible(boolean)
supr org.openide.awt.ToolbarWithOverflow
-hfds LOG,backingFolder,displayName,emptyAction,emptyInsets,isMetalLaF,label,processor,serialVersionUID
+hfds LOG,backingFolder,displayName,emptyInsets,isMetalLaF,label,processor,serialVersionUID
hcls DefaultIconButton,Folder
CLSS public static org.openide.awt.Toolbar$DnDEvent
@@ -3320,9 +3327,7 @@ cons public init()
fld public final static java.lang.String FREE_FILE_EXTENSION = "freeFileExtension"
meth protected abstract boolean accept(org.openide.filesystems.FileObject)
meth protected abstract org.openide.filesystems.FileObject createFromTemplate(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.lang.String,java.util.Map<java.lang.String,java.lang.Object>) throws java.io.IOException
-meth protected java.util.List<org.openide.filesystems.FileObject> createFromTemplate(org.netbeans.api.templates.CreateDescriptor) throws java.io.IOException
-meth public boolean accept(org.netbeans.api.templates.CreateDescriptor)
-supr org.netbeans.api.templates.CreateFromTemplateHandler
+supr java.lang.Object
CLSS public abstract interface org.openide.loaders.DataFilter
fld public final static long serialVersionUID = 0
@@ -3581,7 +3586,7 @@ meth public void removeVetoableChangeListener(java.beans.VetoableChangeListener)
meth public void setModified(boolean)
meth public void setValid(boolean) throws java.beans.PropertyVetoException
supr java.lang.Object
-hfds BEING_CREATED,EA_ASSIGNED_LOADER,EA_ASSIGNED_LOADER_MODULE,LOCK,LOG,OBJ_LOG,PROGRESS_INFO_TL,REGISTRY_INSTANCE,changeSupport,changeSupportUpdater,item,loader,modif,modified,nodeDelegate,serialVersionUID,syncModified,synchObject,vetoableChangeSupport,warnedClasses
+hfds EA_ASSIGNED_LOADER,EA_ASSIGNED_LOADER_MODULE,LOG,OBJ_LOG,PROGRESS_INFO_TL,REGISTRY_INSTANCE,changeSupport,item,listenersMethodLock,loader,modif,modified,nodeCreationLock,nodeDelegate,serialVersionUID,syncModified,synchObject,vetoableChangeSupport,warnedClasses
hcls CreateAction,DOSavable,ModifiedRegistry,ProgressInfo,Replace
CLSS public abstract interface static org.openide.loaders.DataObject$Container
@@ -4632,7 +4637,7 @@ meth public void removeChangeListener(javax.swing.event.ChangeListener)
meth public void saveDocument() throws java.io.IOException
meth public void setMIMEType(java.lang.String)
supr org.openide.windows.CloneableOpenSupport
-hfds ERR,LOCAL_CLOSE_DOCUMENT,LOCK_PRINTING,PROP_PANE,alreadyModified,annotationsLoaded,checkModificationLock,docFilter,inUserQuestionExceptionHandler,isSaving,kit,lastReusable,lastSaveTime,lastSelected,lineSet,lineSetLineVector,listener,listeners,listeningOnEnv,lookup,mimeType,openClose,positionManager,preventModification,printing,propertyChangeSupport,reloadDialogOpened,undoRedo,warnedClasses
+hfds ERR,LOCAL_CLOSE_DOCUMENT,LOCK_PRINTING,PROP_PANE,alreadyModified,annotationsLoaded,checkModificationLock,docFilter,inUserQuestionExceptionHandler,kit,lastReusable,lastSaveTime,lastSelected,lineSet,lineSetWHM,listener,listeners,listeningOnEnv,lookup,mimeType,openClose,positionManager,preventModification,printing,propertyChangeSupport,reloadDialogOpened,undoRedo,warnedClasses
hcls DocFilter,Listener,PlainEditorKit
CLSS public abstract interface static org.openide.text.CloneableEditorSupport$Env
@@ -4704,7 +4709,7 @@ meth public java.util.Date getTime()
meth public void markModified() throws java.io.IOException
meth public void unmarkModified()
supr org.openide.loaders.OpenSupport$Env
-hfds BIG_FILE_THRESHOLD_MB,action,canWrite,fileLock,fileObject,sentBigFileInfo,serialVersionUID,warnedFiles
+hfds BIG_FILE_THRESHOLD_MB,action,canWrite,fileLock,fileObject,serialVersionUID,warnedFiles
hcls ME,SaveAsCapableImpl
CLSS public abstract org.openide.text.DocumentLine
@@ -4732,7 +4737,7 @@ meth public void unmarkCurrentLine()
meth public void unmarkError()
anno 0 java.lang.Deprecated()
supr org.openide.text.Line
-hfds assigned,breakpoint,current,dlEqualsCounter,docL,error,lineParts,listener,serialVersionUID
+hfds assigned,breakpoint,current,docL,error,lineParts,listener,serialVersionUID
hcls FindAnnotationPosition,LR,Part
CLSS public abstract static org.openide.text.DocumentLine$Set
@@ -4745,7 +4750,6 @@ meth public org.openide.text.Line getCurrent(int)
meth public org.openide.text.Line getOriginal(int)
supr org.openide.text.Line$Set
hfds list,listener
-hcls OffsetLineCreator
CLSS public org.openide.text.EditorSupport
anno 0 java.lang.Deprecated()
@@ -4953,7 +4957,7 @@ meth public abstract org.openide.text.Line getOriginal(int)
meth public final java.util.Date getDate()
meth public int getOriginalLineNumber(org.openide.text.Line)
supr java.lang.Object
-hfds date,lineVector
+hfds date,whm
CLSS public final static !enum org.openide.text.Line$ShowOpenType
outer org.openide.text.Line
@@ -5067,7 +5071,6 @@ hfds begin,end,serialVersionUID
CLSS public final org.openide.text.PositionRef
intf java.io.Serializable
-intf javax.swing.text.Position
meth public int getColumn() throws java.io.IOException
meth public int getLine() throws java.io.IOException
meth public int getOffset()
@@ -5076,7 +5079,7 @@ meth public javax.swing.text.Position getPosition() throws java.io.IOException
meth public javax.swing.text.Position$Bias getPositionBias()
meth public org.openide.text.CloneableEditorSupport getCloneableEditorSupport()
supr java.lang.Object
-hfds LOG,insertAfter,kind,manager,serialVersionUID
+hfds insertAfter,kind,manager,serialVersionUID
hcls Manager
CLSS public final org.openide.text.PrintPreferences
@@ -5176,7 +5179,7 @@ meth public abstract <%0 extends java.lang.Object> org.openide.util.Lookup$Resul
meth public abstract <%0 extends java.lang.Object> {%%0} lookup(java.lang.Class<{%%0}>)
meth public static org.openide.util.Lookup getDefault()
supr java.lang.Object
-hfds LOG,defaultLookup,defaultLookupProvider
+hfds LOG,defaultLookup
hcls DefLookup,Empty
CLSS public abstract interface static org.openide.util.Lookup$Provider
diff --git a/openide.loaders/src/META-INF/upgrade/org.openide.loaders.DataObject.hint b/openide.loaders/src/META-INF/upgrade/org.openide.loaders.DataObject.hint
index 9385652..9d12daf 100644
--- a/openide.loaders/src/META-INF/upgrade/org.openide.loaders.DataObject.hint
+++ b/openide.loaders/src/META-INF/upgrade/org.openide.loaders.DataObject.hint
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
'DataObject.getCookie is obsolete':
$this.getCookie($class) :: $this instanceof org.openide.loaders.DataObject && $class instanceof java.lang.Class
=> $this.getLookup().lookup($class)
diff --git a/openide.loaders/src/org/netbeans/modules/openide/loaders/EntityCatalog.dtd b/openide.loaders/src/org/netbeans/modules/openide/loaders/EntityCatalog.dtd
index 616981d..697258d 100644
--- a/openide.loaders/src/org/netbeans/modules/openide/loaders/EntityCatalog.dtd
+++ b/openide.loaders/src/org/netbeans/modules/openide/loaders/EntityCatalog.dtd
@@ -1,43 +1,4 @@
<?xml encoding="UTF-8" ?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!-- Optional namespace space prefix -->
diff --git a/openide.loaders/src/org/netbeans/modules/openide/loaders/layer.xml b/openide.loaders/src/org/netbeans/modules/openide/loaders/layer.xml
index 18fbfde..8131dc4 100644
--- a/openide.loaders/src/org/netbeans/modules/openide/loaders/layer.xml
+++ b/openide.loaders/src/org/netbeans/modules/openide/loaders/layer.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
<filesystem>
<folder name="xml">
diff --git a/openide.loaders/src/org/netbeans/modules/openide/loaders/xmlinfo.dtd b/openide.loaders/src/org/netbeans/modules/openide/loaders/xmlinfo.dtd
index b1bd6a4..7e3b13d 100644
--- a/openide.loaders/src/org/netbeans/modules/openide/loaders/xmlinfo.dtd
+++ b/openide.loaders/src/org/netbeans/modules/openide/loaders/xmlinfo.dtd
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!ELEMENT Info (Processor*,Icon?)>
<!ELEMENT Processor EMPTY>
diff --git a/openide.loaders/src/org/netbeans/modules/templates/Bundle.properties b/openide.loaders/src/org/netbeans/modules/templates/Bundle.properties
index 904aec1..6244e06 100644
--- a/openide.loaders/src/org/netbeans/modules/templates/Bundle.properties
+++ b/openide.loaders/src/org/netbeans/modules/templates/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Long-Description=\
This module binds the Datasystems API with Scripting API. \
diff --git a/openide.loaders/src/org/openide/awt/MenuBar.java b/openide.loaders/src/org/openide/awt/MenuBar.java
index 375815b..29c0b45 100644
--- a/openide.loaders/src/org/openide/awt/MenuBar.java
+++ b/openide.loaders/src/org/openide/awt/MenuBar.java
@@ -54,21 +54,16 @@ import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.logging.Logger;
import javax.swing.Action;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
@@ -303,7 +298,6 @@ public class MenuBar extends JMenuBar implements Externalizable {
private final class MenuBarFolder extends FolderInstance {
/** List of the components this FolderInstance manages. */
private ArrayList<Component> managed;
- private List<Object> instances;
/** Creates a new menubar folder on the specified <code>DataFolder</code>.
* @param folder a <code>DataFolder</code> to work with
@@ -329,39 +323,12 @@ public class MenuBar extends JMenuBar implements Externalizable {
/** Adds the component to the MenuBar after the last added one */
private void addComponent (Component c) {
- if (c == null) {
- c = createNoComponent();
- }
synchronized (getTreeLock()) {
MenuBar.this.add(c, getManaged().size());
getManaged().add(c);
}
}
- private void addComponent (Component c, int index) {
- if (c == null) {
- c = createNoComponent();
- }
- synchronized (getTreeLock()) {
- MenuBar.this.add(c, index);
- getManaged().add(index, c);
- }
- }
-
- private void removeComponent (int index) {
- synchronized (getTreeLock()) {
- getManaged().remove(index);
- MenuBar.this.remove(index);
- }
- }
-
- private Component createNoComponent() {
- JComponent noComponent = new JComponent() {};
- noComponent.setSize(0, 0);
- noComponent.setVisible(false);
- return noComponent;
- }
-
/** Full name of the data folder's primary file separated by dots.
* @return the name
*/
@@ -418,63 +385,29 @@ public class MenuBar extends JMenuBar implements Externalizable {
*/
protected Object createInstance(InstanceCookie[] cookies)
throws IOException, ClassNotFoundException {
- final List<Object> ll = new ArrayList<Object>(cookies.length);
+ final LinkedList<Object> ll = new LinkedList<Object>();
allInstances(cookies, ll);
final MenuBar mb = MenuBar.this;
- List<Object> lo = instances;
- if (lo == null) {
- lo = Collections.EMPTY_LIST;
+ if (ll.equals(Arrays.asList(mb.getComponents()))) {
+ return mb;
}
- boolean modified = false;
- int i = 0, j = 0;
+
+ cleanUp(); //remove the stuff we've added last time
try {
- for ( ; i < lo.size() && j < ll.size(); i++, j++) {
- if (Objects.equals(lo.get(i), ll.get(j))) {
- continue;
- }
- Object instance = ll.get(j);
- // has lo instance?
- int k;
- for (k = i+1; k < lo.size(); k++) {
- if (Objects.equals(lo.get(k), instance)) {
- break;
- }
+ // fill with new content
+ for (Object o: ll) {
+ Component component = convertToComponent(o);
+ if (component != null) {
+ addComponent(component);
}
- if (k < lo.size()) {
- // Remove all components <i, k)
- while (i < k) {
- removeComponent(j);
- i++;
- }
- } else {
- // a new instance
- Component component = convertToComponent(instance);
- addComponent(component, j);
- i--;
- }
- modified = true;
- }
- while (i < lo.size()) {
- removeComponent(j);
- i++;
- modified = true;
- }
- while (j < ll.size()) {
- Component component = convertToComponent(ll.get(j));
- addComponent(component);
- j++;
- modified = true;
}
} finally {
cookiesToObjects.clear();
}
- instances = ll;
- if (modified) {
- mb.validate();
- mb.repaint();
- }
+ mb.validate();
+ mb.repaint();
return mb;
}
diff --git a/openide.loaders/src/org/openide/loaders/Bundle.properties b/openide.loaders/src/org/openide/loaders/Bundle.properties
index fd8f826..965977e 100644
--- a/openide.loaders/src/org/openide/loaders/Bundle.properties
+++ b/openide.loaders/src/org/openide/loaders/Bundle.properties
@@ -110,7 +110,6 @@ VALUE_sort_folder_names=By Name (Packages First)
VALUE_sort_last_modified=By Modification Time
VALUE_sort_size=By File Size
VALUE_sort_extensions=By Extension
-VALUE_sort_natural=Naturally By Name
#
diff --git a/openide.loaders/src/org/openide/loaders/DataFolder.java b/openide.loaders/src/org/openide/loaders/DataFolder.java
index 3ff4030..242423f 100644
--- a/openide.loaders/src/org/openide/loaders/DataFolder.java
+++ b/openide.loaders/src/org/openide/loaders/DataFolder.java
@@ -1108,15 +1108,6 @@ public class DataFolder extends MultiDataObject implements DataObject.Container
*/
public static final SortMode EXTENSIONS = new FolderComparator(FolderComparator.EXTENSIONS);
- /**
- * Folder go first (sorted naturally by name) followed by files sorted
- * by natural name and extension. Natural means that number sequences
- * are evaluated and compared by value rather than lexicographically.
- *
- * @since org.openide.loaders 7.65
- */
- public static final SortMode NATURAL = new FolderComparator(FolderComparator.NATURAL);
-
/** Method to write the sort mode to a folder's attributes.
* @param folder folder write this mode to
*/
@@ -1135,10 +1126,6 @@ public class DataFolder extends MultiDataObject implements DataObject.Container
x = "M"; // NOI18N
} else if (this == SIZE) {
x = "S"; // NOI18N
- } else if (this == EXTENSIONS) {
- x = "X"; // NOI18N
- } else if (this == NATURAL) {
- x = "L"; // NOI18N
} else {
x = "O"; // NOI18N
}
@@ -1161,8 +1148,6 @@ public class DataFolder extends MultiDataObject implements DataObject.Container
case 'O': return NONE;
case 'M': return LAST_MODIFIED;
case 'S': return SIZE;
- case 'X': return EXTENSIONS;
- case 'L': return NATURAL;
case 'F':
default:
return FOLDER_NAMES;
diff --git a/openide.loaders/src/org/openide/loaders/DataNode.java b/openide.loaders/src/org/openide/loaders/DataNode.java
index 3ef019a..c79be76 100644
--- a/openide.loaders/src/org/openide/loaders/DataNode.java
+++ b/openide.loaders/src/org/openide/loaders/DataNode.java
@@ -60,7 +60,6 @@ import org.openide.nodes.*;
import org.openide.util.*;
import org.openide.util.actions.SystemAction;
import org.openide.util.datatransfer.ExTransferable;
-import org.openide.util.datatransfer.PasteType;
/** Standard node representing a data object.
*
@@ -330,101 +329,6 @@ public class DataNode extends AbstractNode {
return obj.isMoveAllowed ();
}
- @Override
- protected void createPasteTypes(Transferable t, List<PasteType> s) {
- super.createPasteTypes(t, s);
- if (!(this instanceof DataFolder.FolderNode)) {
- s.addAll(getPasteTypesFromParent(t)); // #250134
- }
- }
-
- /**
- * Get paste types from parent folder. To be able to achieve this, we need
- * to know on which node the paste operation was originally invoked (it is
- * usually some FilterNode, not this DataNode), otherwise information about
- * parent node is not available. Thus, Transferable passed from
- * o.n.m.openide.explorer.ExplorerActionsImpl.updatePasteTypes implements
- * Lookup.Provider, and getLookup(Node.class) invoked on it returns the
- * original node. See bug 250134.
- *
- * @param t The transferable.
- * @return List of parent node's paste types (can be empty).
- */
- private List<PasteType> getPasteTypesFromParent(Transferable t) {
- if (t instanceof Lookup.Provider) {
- Lookup l = ((Lookup.Provider) t).getLookup();
- Node n = l.lookup(Node.class);
- if (n != null) {
- Node parentNode = n.getParentNode();
- if (parentNode != null && DataNode.isNodeForFolder(parentNode)) {
- PasteType[] pts = parentNode.getPasteTypes(t);
- PasteType[] updated = updateParentPasteTypes(pts);
- return Arrays.asList(updated);
- }
- }
- }
- return Collections.emptyList();
- }
-
- /**
- * Check whether a node represents a file-system folder.
- * <p>
- * Note: Simply checking type for FolderNode is not sufficient, as we need
- * to support also FolderNodes wrapped in FilterNodes.
- * </p>
- *
- * @param node Node to check.
- * @return True if the node represents a folder, false otherwise.
- */
- private static boolean isNodeForFolder(Node node) {
- Collection<? extends FileObject> fos = node.getLookup().lookupAll(FileObject.class);
- if (fos.size() == 1) {
- FileObject fo = fos.iterator().next();
- if (fo.isFolder()) {
- return true;
- }
- }
- Collection<? extends DataObject> dos = node.getLookup().lookupAll(DataObject.class);
- if (dos.size() == 1) {
- DataObject dob = dos.iterator().next();
- if (dob.getPrimaryFile().isFolder()) {
- return true;
- }
- }
- return false;
- }
-
- @NbBundle.Messages({
- "# Text appended to action name so that it is clear that the action",
- "# will be invoked on parent node. For example:",
- "# Paste -> Copy (to parent); Paste -> Refactory Copy... (to parent)",
- "# Please note the leading space.",
- "LBL_PasteToParent= (to parent)"
- })
- private PasteType[] updateParentPasteTypes(PasteType[] parentTypes) {
- PasteType[] ret = new PasteType[parentTypes.length];
- for (int i = 0; i < parentTypes.length; i++) {
- final PasteType parentType = parentTypes[i];
- ret[i] = new PasteType() {
- @Override
- public Transferable paste() throws IOException {
- return parentType.paste();
- }
-
- @Override
- public String getName() {
- return parentType.getName() + Bundle.LBL_PasteToParent();
- }
-
- @Override
- public HelpCtx getHelpCtx() {
- return parentType.getHelpCtx();
- }
- };
- }
- return ret;
- }
-
/** This method returns null to signal that actions
* provide by DataLoader.getActions should be returned from
* method getActions. If overriden to provide some actions,
@@ -678,7 +582,7 @@ public class DataNode extends AbstractNode {
DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message(message));
return;
}
- DataNodeUtils.reqProcessor(obj.getPrimaryFile()).post(new Runnable() { // #232671
+ DataNodeUtils.reqProcessor().post(new Runnable() { // #232671
@Override
public void run() {
setNewExt(newExt);
@@ -937,36 +841,20 @@ public class DataNode extends AbstractNode {
if ( refresh ) {
// refresh current nodes display name
- Map<RequestProcessor, List<DataObject>> mapping
- = new HashMap<RequestProcessor, List<DataObject>>();
- Iterator it = DataObjectPool.getPOOL().getActiveDataObjects();
-
- // Assign DataNodes to RequestProcessors. See bug 252073 comment 17.
- while (it.hasNext()) {
- DataObject obj = ((DataObjectPool.Item) it.next()).getDataObjectOrNull();
- if (obj != null && obj.getNodeDelegate() instanceof DataNode) {
- RequestProcessor rp = DataNodeUtils.reqProcessor(obj.getPrimaryFile());
- List<DataObject> list = mapping.get(rp);
- if (list == null) {
- list = new ArrayList<DataObject>();
- mapping.put(rp, list);
- }
- list.add(obj);
- }
- }
-
- for (Map.Entry<RequestProcessor, List<DataObject>> e : mapping.entrySet()) {
- final List<DataObject> list = e.getValue();
- e.getKey().post(new Runnable() {
- @Override
- public void run() {
- for (DataObject obj: list) {
- ((DataNode) obj.getNodeDelegate()).updateDisplayName();
+ DataNodeUtils.reqProcessor().post(new Runnable() {
+ @Override
+ public void run () {
+ Iterator it = DataObjectPool.getPOOL().getActiveDataObjects();
+ while ( it.hasNext() ) {
+ DataObject obj = ((DataObjectPool.Item)it.next()).getDataObjectOrNull();
+ if ( obj != null && obj.getNodeDelegate() instanceof DataNode ) {
+ ((DataNode)obj.getNodeDelegate()).updateDisplayName();
}
- }
- }, 300, Thread.MIN_PRIORITY);
- }
- }
+ }
+ }
+ }, 300, Thread.MIN_PRIORITY);
+ }
+
}
private static Class defaultLookup;
@@ -1117,55 +1005,14 @@ public class DataNode extends AbstractNode {
}
refreshNamesIconsRunning = false;
}
- // refresh name nodes
- for (final Map.Entry<RequestProcessor, List<DataNode>> e
- : groupByRP(_refreshNameNodes).entrySet()) {
- e.getKey().post(new Runnable() { // post list to assigned RP
- @Override
- public void run() {
- for (DataNode n: e.getValue()) {
- n.fireChangeAccess(false, true);
- }
- }
- });
- }
- // refresh icon nodes
- for (final Map.Entry<RequestProcessor, List<DataNode>> e
- : groupByRP(_refreshIconNodes).entrySet()) {
- e.getKey().post(new Runnable() { // post list to assigned RP
- @Override
- public void run() {
- for (DataNode n: e.getValue()) {
- n.fireChangeAccess(true, false);
- }
- }
- });
+ for (int i = 0; i < _refreshNameNodes.length; i++) {
+ _refreshNameNodes[i].fireChangeAccess(false, true);
}
- }
-
- /**
- * Group array of nodes by assigned RequestProcessors.
- *
- * @param nodes
- * @return Mapping from RequestProcessor to list of nodes assigned to
- * it.
- */
- private Map<RequestProcessor, List<DataNode>> groupByRP(DataNode nodes[]) {
- Map<RequestProcessor, List<DataNode>> mapping
- = new HashMap<RequestProcessor, List<DataNode>>();
- for (DataNode node : nodes) {
- DataObject dob = node.getDataObject();
- FileObject fo = dob == null ? null : dob.getPrimaryFile();
- RequestProcessor rp = DataNodeUtils.reqProcessor(fo);
- List<DataNode> set = mapping.get(rp);
- if (set == null) {
- set = new ArrayList<DataNode>();
- mapping.put(rp, set);
- }
- set.add(node);
+ for (int i = 0; i < _refreshIconNodes.length; i++) {
+ _refreshIconNodes[i].fireChangeAccess(true, false);
}
- return mapping;
}
+
}
/** Handle for data object nodes */
diff --git a/openide.loaders/src/org/openide/loaders/FolderChildren.java b/openide.loaders/src/org/openide/loaders/FolderChildren.java
index aac0cfc..f4346f7 100644
--- a/openide.loaders/src/org/openide/loaders/FolderChildren.java
+++ b/openide.loaders/src/org/openide/loaders/FolderChildren.java
@@ -133,6 +133,10 @@ implements PropertyChangeListener, ChangeListener, FileChangeListener {
this.pairs = pairs;
}
+ static void waitRefresh() {
+ DataNodeUtils.reqProcessor().post(Task.EMPTY, 0, Thread.MIN_PRIORITY).waitFinished();
+ }
+
/** If the folder changed its children we change our nodes.
*/
@Override
@@ -581,7 +585,7 @@ implements PropertyChangeListener, ChangeListener, FileChangeListener {
}
final synchronized void scheduleRefresh(String by) {
- task = DataNodeUtils.reqProcessor(pair.primaryFile).post(this);
+ task = DataNodeUtils.reqProcessor().post(this);
err.log(Level.FINE, "Task initialized by {0} to {1} for {2}", new Object[] { by, task, this });
}
}
diff --git a/openide.loaders/src/org/openide/loaders/FolderComparator.java b/openide.loaders/src/org/openide/loaders/FolderComparator.java
index 8523f35..9e68fbe 100644
--- a/openide.loaders/src/org/openide/loaders/FolderComparator.java
+++ b/openide.loaders/src/org/openide/loaders/FolderComparator.java
@@ -69,8 +69,6 @@ class FolderComparator extends DataFolder.SortMode {
public static final int SIZE = 5;
/** by extension, then name */
public static final int EXTENSIONS = 6;
- /** by natural name (f10.txt > f9.txt) */
- public static final int NATURAL = 7;
/** mode to use */
@@ -112,8 +110,6 @@ class FolderComparator extends DataFolder.SortMode {
return compareSize(obj1, obj2);
case EXTENSIONS:
return compareExtensions(obj1, obj2);
- case NATURAL:
- return compareNatural(obj1, obj2);
default:
assert false : mode;
return 0;
@@ -272,124 +268,4 @@ class FolderComparator extends DataFolder.SortMode {
return fo1.getNameExt().compareTo(fo2.getNameExt());
}
}
-
- private static int compareNatural(Object o1, Object o2) {
-
- FileObject fo1 = findFileObject(o1);
- FileObject fo2 = findFileObject(o2);
-
- // Folders first.
- boolean f1 = fo1.isFolder();
- boolean f2 = fo2.isFolder();
- if (f1 != f2) {
- return f1 ? -1 : 1;
- }
-
- int res = compareFileNameNatural(fo1.getNameExt(), fo2.getNameExt());
- return res;
- }
-
- private static int compareFileNameNatural(String name1, String name2) {
-
- String n1 = name1.toLowerCase();
- String n2 = name2.toLowerCase();
-
- int p1; // pointer to first string
- int p2; // pointer to second string
-
- for (p1 = 0, p2 = 0; p1 < n1.length() && p2 < n2.length(); ) {
- char c1 = n1.charAt(p1);
- char c2 = n2.charAt(p2);
-
- ReadNumericValueResult nv1 = readNumericValue(n1, p1);
- ReadNumericValueResult nv2 = readNumericValue(n2, p2);
-
- if (nv1 != null && nv2 != null) {
- if (nv1.getValue() == nv2.getValue()) {
- p1 = nv1.getEndPos();
- p2 = nv2.getEndPos();
- } else {
- return nv1.getValue() - nv2.getValue();
- }
- } else {
- if (c1 != c2) {
- return c1 - c2;
- } else {
- p1 ++;
- p2 ++;
- }
- }
- }
- boolean unfinished1 = p1 < n1.length();
- boolean unfinished2 = p2 < n2.length();
- if (!unfinished1 && !unfinished2) {
- return name1.compareTo(name2);
- } else if (unfinished1) {
- return 1; // first string is longer (prefix of second string)
- } else if (unfinished2) {
- return -1; // second string is longer (prefix of first string)
- } else {
- assert false : "Invalid state in natural comparator"; //NOI18N
- return n1.compareTo(n2);
- }
- }
-
- /**
- * Read numeric value token starting at position {@code pos}. It can be
- * delimited by whitespace (so it supports values in strings like "a1b", "a
- * 1b", "a1 b", "a 1 b").
- *
- * @param s Input string.
- * @param pos Position in the input string.
- *
- * @return The numeric value starting at that position and end position in
- * the string, or null if there is no numeric value (e.g. there is a
- * white-space only.).
- */
- private static ReadNumericValueResult readNumericValue(String s, int pos) {
- int val = 0;
- boolean num = false; // some number value was read
- boolean afterNum = false; // we are reading trailing whitespace
- int len = s.length();
- for (int i = pos; i < len; i++) {
- char c = s.charAt(i);
- if (c >= '0' && c <= '9') {
- if (afterNum) { // new, separated number encountered
- return new ReadNumericValueResult(val, i);
- }
- val = val * 10 + (c - '0');
- num = true;
- } else if (Character.isWhitespace(c)) { // leading or trailing space
- if (num) {
- afterNum = true; // in trailing whitespace after number
- }
- } else {
- return num ? new ReadNumericValueResult(val, i) : null;
- }
- }
- return num ? new ReadNumericValueResult(val, len) : null;
- }
-
- /**
- * Class for representing result returned from
- * {@link #readNumericValue(String, int)}.
- */
- private static class ReadNumericValueResult {
-
- private final int value;
- private final int endPos;
-
- public ReadNumericValueResult(int value, int endPos) {
- this.value = value;
- this.endPos = endPos;
- }
-
- public int getValue() {
- return value;
- }
-
- public int getEndPos() {
- return endPos;
- }
- }
}
diff --git a/openide.loaders/src/org/openide/loaders/FolderOrder.java b/openide.loaders/src/org/openide/loaders/FolderOrder.java
index 70ad805..152922e 100644
--- a/openide.loaders/src/org/openide/loaders/FolderOrder.java
+++ b/openide.loaders/src/org/openide/loaders/FolderOrder.java
@@ -169,24 +169,7 @@ final class FolderOrder extends Object implements Comparator<Object> {
}
// compare by the provided comparator
- SortMode comparator = getSortMode();
- if (comparator instanceof FolderComparator) {
- return ((FolderComparator) comparator).doCompare(obj1, obj2);
- } else if ((obj1 instanceof DataObject) // Also support custom
- && (obj2 instanceof DataObject)) { // comparators, #242226.
- return comparator.compare(
- (DataObject) obj1, (DataObject) obj2);
- } else {
- FileObject fo1 = FolderComparator.findFileObject(obj1);
- FileObject fo2 = FolderComparator.findFileObject(obj2);
- try {
- return comparator.compare(
- DataObject.find(fo1), DataObject.find(fo2));
- } catch (DataObjectNotFoundException ex) {
- throw new IllegalArgumentException("Expected " //NOI18N
- + "DataObjects or Nodes."); //NOI18N
- }
- }
+ return ((FolderComparator)(getSortMode())).doCompare(obj1, obj2);
} else {
if (i2 == null) {
return -1;
diff --git a/openide.loaders/src/org/openide/loaders/SortModeEditor.java b/openide.loaders/src/org/openide/loaders/SortModeEditor.java
index cb3b95e..176d4cc 100644
--- a/openide.loaders/src/org/openide/loaders/SortModeEditor.java
+++ b/openide.loaders/src/org/openide/loaders/SortModeEditor.java
@@ -58,8 +58,7 @@ class SortModeEditor extends PropertyEditorSupport {
DataFolder.SortMode.FOLDER_NAMES,
DataFolder.SortMode.LAST_MODIFIED,
DataFolder.SortMode.SIZE,
- DataFolder.SortMode.EXTENSIONS,
- DataFolder.SortMode.NATURAL
+ DataFolder.SortMode.EXTENSIONS
};
/** Names for modes. First is for displaying files */
@@ -70,8 +69,7 @@ class SortModeEditor extends PropertyEditorSupport {
DataObject.getString ("VALUE_sort_folder_names"),
DataObject.getString ("VALUE_sort_last_modified"),
DataObject.getString ("VALUE_sort_size"),
- DataObject.getString ("VALUE_sort_extensions"),
- DataObject.getString ("VALUE_sort_natural")
+ DataObject.getString ("VALUE_sort_extensions")
};
/** @return names of the two possible modes */
diff --git a/openide.loaders/src/org/openide/loaders/doc-files/api.html b/openide.loaders/src/org/openide/loaders/doc-files/api.html
index b426a4b..2f8d528 100644
--- a/openide.loaders/src/org/openide/loaders/doc-files/api.html
+++ b/openide.loaders/src/org/openide/loaders/doc-files/api.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html><head>
@@ -191,13 +193,13 @@ Like the loader used by the Form Editor, they are able to recognize
multiple files at once and create a data object from them. All data
objects have a
-<a href="../DataObject.html#getPrimaryFile--">primary file</a>
+<a href="../DataObject.html#getPrimaryFile()">primary file</a>
which is representative of the data object;
e.g. <code>myform.java</code> in the previous example. As well, these
multi loaders may have any number of
-<a href="../DataObject.html#files--">secondary files</a>.
+<a href="../DataObject.html#files()">secondary files</a>.
<p>The basic mechanism a multi-file loader uses, is that the loader
pool will pass it file objects to recognize in an arbitrary order; the
@@ -280,7 +282,7 @@ the Explorer as nodes, and user actions will trigger use of the data
object. However, if you do need to retrieve the data object for a file
object you may do so using
-<a href="../DataObject.html#find-org.openide.filesystems.FileObject-"><code>DataObject.find(...)</code></a>,
+<a href="../DataObject.html#find(org.openide.filesystems.FileObject)"><code>DataObject.find(...)</code></a>,
which will create a new data object for the file if it needs to,
otherwise will return the existing one. (Catch
@@ -298,7 +300,7 @@ Data objects have separate, but associated,
which represent them in the Explorer and present a meaningful
interface to the user. You may use
-<a href="../DataObject.html#getNodeDelegate--"><code>DataObject.getNodeDelegate()</code></a>
+<a href="../DataObject.html#getNodeDelegate()"><code>DataObject.getNodeDelegate()</code></a>
to retrieve the node delegate for a data object, if necessary.
@@ -320,7 +322,7 @@ to appropriate MIME type. If the
href="@org-openide-filesystems@/org/openide/filesystems/FileObject.html">FileObject</a>
of your interest returns for example <code>text/xml+acme</code> from its
<a
- href="@org-openide-filesystems@/org/openide/filesystems/FileObject.html#getMIMEType--">getMIMEType()</a>
+ href="@org-openide-filesystems@/org/openide/filesystems/FileObject.html#getMIMEType()">getMIMEType()</a>
method, then you shall register its
<a href="../DataLoader.html">DataLoader</a> or other configured
<a href="../DataObject.Factory.html">DataObject.Factory</a> into layer file
@@ -382,7 +384,7 @@ to deal with a single primary file.
For a single-file loader, handling file recognition is quite straightforward from the point of view of the API: you just need to override
-<a href="../UniFileLoader.html#findPrimaryFile-org.openide.filesystems.FileObject-"><code>UniFileLoader.findPrimaryFile(...)</code></a>
+<a href="../UniFileLoader.html#findPrimaryFile(org.openide.filesystems.FileObject)"><code>UniFileLoader.findPrimaryFile(...)</code></a>
to return its argument if this file is of the type that should be
handled by your loader, or <code>null</code> if it is not.
@@ -395,7 +397,7 @@ this method at all; simply create an appropriate
and call
-<a href="../UniFileLoader.html#setExtensions-org.openide.loaders.ExtensionList-"><code>UniFileLoader.setExtensions(...)</code></a>
+<a href="../UniFileLoader.html#setExtensions(org.openide.loaders.ExtensionList)"><code>UniFileLoader.setExtensions(...)</code></a>
in your loader's constructor.
@@ -403,7 +405,7 @@ in your loader's constructor.
but still NetBeans takes care of most of the work for you. You should
implement
-<a href="../MultiFileLoader.html#findPrimaryFile-org.openide.filesystems.FileObject-"><code>MultiFileLoader.findPrimaryFile(...)</code></a>
+<a href="../MultiFileLoader.html#findPrimaryFile(org.openide.filesystems.FileObject)"><code>MultiFileLoader.findPrimaryFile(...)</code></a>
as follows:
@@ -418,7 +420,7 @@ file which it should be associated with, and return that. For this
purpose, you may find it useful to call
<a
-href="@org-openide-filesystems@/org/openide/filesystems/FileUtil.html#findBrother-org.openide.filesystems.FileObject-java.lang.String-"><code>FileUtil.findBrother(...)</code></a>,
+href="@org-openide-filesystems@/org/openide/filesystems/FileUtil.html#findBrother(org.openide.filesystems.FileObject,%20java.lang.String)"><code>FileUtil.findBrother(...)</code></a>,
or perform a similar lookup by hand.
@@ -436,7 +438,7 @@ file first - the implementation in NetBeans takes care of this for you.
The most interesting part of the loader is that which actually creates
the data object from the underlying file object. You must implement
-<a href="../MultiFileLoader.html#createMultiObject-org.openide.filesystems.FileObject-"><code>MultiFileLoader.createMultiObject(...)</code></a>
+<a href="../MultiFileLoader.html#createMultiObject(org.openide.filesystems.FileObject)"><code>MultiFileLoader.createMultiObject(...)</code></a>
in order to do this. The method will be passed the correct primary
file object for you to work with.
@@ -460,19 +462,19 @@ data object from being renamed or otherwise tampered with, if doing so
would make it useless or corrupted in some way; just return
<code>false</code> from e.g.
-<a href="../MultiDataObject.html#isRenameAllowed--"><code>MultiDataObject.isRenameAllowed()</code></a>.
+<a href="../MultiDataObject.html#isRenameAllowed()"><code>MultiDataObject.isRenameAllowed()</code></a>.
<p>Or, if e.g. moves are to be permitted but require special
treatment, you may override e.g.
-<a href="../MultiDataObject.html#handleMove-org.openide.loaders.DataFolder-"><code>MultiDataObject.handleMove(...)</code></a>.
+<a href="../MultiDataObject.html#handleMove(org.openide.loaders.DataFolder)"><code>MultiDataObject.handleMove(...)</code></a>.
<h4>Choosing entry types</h4>
For single-file loaders, the default implementation of
<a
-href="../UniFileLoader.html#createPrimaryEntry-org.openide.loaders.MultiDataObject-org.openide.filesystems.FileObject-"><code>UniFileLoader.createPrimaryEntry(...)</code></a>
+href="../UniFileLoader.html#createPrimaryEntry(org.openide.loaders.MultiDataObject,%20org.openide.filesystems.FileObject)"><code>UniFileLoader.createPrimaryEntry(...)</code></a>
just produces a
@@ -484,12 +486,12 @@ which is most likely what you want.
by implementing
<a
-href="../MultiFileLoader.html#createPrimaryEntry-org.openide.loaders.MultiDataObject-org.openide.filesystems.FileObject-"><code>MultiFileLoader.createPrimaryEntry(...)</code></a>
+href="../MultiFileLoader.html#createPrimaryEntry(org.openide.loaders.MultiDataObject,%20org.openide.filesystems.FileObject)"><code>MultiFileLoader.createPrimaryEntry(...)</code></a>
and
<a
-href="../MultiFileLoader.html#createSecondaryEntry-org.openide.loaders.MultiDataObject-org.openide.filesystems.FileObject-"><code>MultiFileLoader.createSecondaryEntry(...)</code></a>.
+href="../MultiFileLoader.html#createSecondaryEntry(org.openide.loaders.MultiDataObject,%20org.openide.filesystems.FileObject)"><code>MultiFileLoader.createSecondaryEntry(...)</code></a>.
<p>Typically, the primary entry will be a <code>FileEntry</code>, and
will behave normally. The secondary entry might also be a
@@ -505,7 +507,7 @@ be discarded (for example, this would be useful for compiled
<code>*.class</code> files, cached indices, etc.). For such dummy
files, you will generally also want to use
-<a href="@org-openide-filesystems@/org/openide/filesystems/FileObject.html#setImportant-boolean-"><code>FileObject.setImportant(...)</code></a>
+<a href="@org-openide-filesystems@/org/openide/filesystems/FileObject.html#setImportant(boolean)"><code>FileObject.setImportant(...)</code></a>
to prevent the file from being considered by a version control
system, for example.
@@ -526,7 +528,7 @@ is a convenient entry type to use if you wish to perform substitution of some ty
of token when creating the file from template. Typically the method
<a
-href="../FileEntry.Format.html#createFormat-org.openide.filesystems.FileObject-java.lang.String-java.lang.String-"><code>FileEntry.Format.createFormat(...)</code></a>
+href="../FileEntry.Format.html#createFormat(org.openide.filesystems.FileObject,%20java.lang.String,%20java.lang.String)"><code>FileEntry.Format.createFormat(...)</code></a>
will be implemented to return an instance of
@@ -554,11 +556,11 @@ wish to associate any properties with a data loader, you should:
<li> Implement getter and setter methods to call
-<a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#getProperty-java.lang.Object-"><code>SharedClassObject.getProperty(key)</code></a>
+<a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#getProperty(java.lang.Object)"><code>SharedClassObject.getProperty(key)</code></a>
and
-<a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#putProperty-java.lang.String-java.lang.Object-boolean-"><code>SharedClassObject.putProperty(key, value, true)</code></a>
+<a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#putProperty(java.lang.String,%20java.lang.Object,%20boolean)"><code>SharedClassObject.putProperty(key, value, true)</code></a>
(the latter will automatically fire property changes and synchronize for you).
@@ -569,17 +571,17 @@ your property values from the stream. Please always first call the super methods
<p>You should use the method
-<a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#initialize--"><code>SharedClassObject.initialize()</code></a>
+<a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#initialize()"><code>SharedClassObject.initialize()</code></a>
to set up the shared instance, including both your own properties, and standard ones such as
-<a href="../DataLoader.html#setDisplayName-java.lang.String-"><code>DataLoader.setDisplayName(String)</code></a>,
+<a href="../DataLoader.html#setDisplayName(java.lang.String)"><code>DataLoader.setDisplayName(String)</code></a>,
-<a href="../DataLoader.html#setActions-org.openide.util.actions.SystemAction:A-"><code>DataLoader.setActions(SystemAction[])</code></a>,
+<a href="../DataLoader.html#setActions(org.openide.util.actions.SystemAction[])"><code>DataLoader.setActions(SystemAction[])</code></a>,
and
-<a href="../UniFileLoader.html#setExtensions-org.openide.loaders.ExtensionList-"><code>UniFileLoader.setExtensions(ExtensionList)</code></a>.
+<a href="../UniFileLoader.html#setExtensions(org.openide.loaders.ExtensionList)"><code>UniFileLoader.setExtensions(ExtensionList)</code></a>.
<p>Finally, data loaders will be customized by the user as Beans (and persisted using
externalization). For this reason, they should have an associated bean info class
@@ -614,12 +616,12 @@ and there is no way to alter the set of cookies provided in this way.
<p>A better technique is to provide cookies explicitly from
-<a href="../DataObject.html#getCookie-java.lang.Class-"><code>DataObject.getCookie(...)</code></a>.
+<a href="../DataObject.html#getCookie(java.lang.Class)"><code>DataObject.getCookie(...)</code></a>.
Assuming that you are subclassing <code>MultiDataObject</code>, you
need not override this method yourself, but rather should use
-<a href="../MultiDataObject.html#getCookieSet--"><code>MultiDataObject.getCookieSet()</code></a>
+<a href="../MultiDataObject.html#getCookieSet()"><code>MultiDataObject.getCookieSet()</code></a>
in the constructor and add the cookies you
want to provide by default. Then it is possible to extend this set
@@ -632,11 +634,11 @@ later, and to more easily examine its contents.
to the nodes <a href="#create-delegate">associated</a> with your data
objects. The easiest way to do this is to call
-<a href="../DataLoader.html#setActions-org.openide.util.actions.SystemAction:A-"><code>DataLoader.setActions(...)</code></a>
+<a href="../DataLoader.html#setActions(org.openide.util.actions.SystemAction[])"><code>DataLoader.setActions(...)</code></a>
in your loader's
-<a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#initialize--"><code>SharedClassObject.initialize()</code></a>
+<a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#initialize()"><code>SharedClassObject.initialize()</code></a>
method, which lets you provide a set of
actions appropriate to all data objects created by this
@@ -648,7 +650,7 @@ their positioning.
<p>Or, you may wish to selectively attach actions to certain data
objects' nodes and not others. If you need to do this, please override
-<a href="../DataNode.html#getActions-boolean-"><code>DataNode.getActions(boolean)</code></a>
+<a href="../DataNode.html#getActions(boolean)"><code>DataNode.getActions(boolean)</code></a>
when creating your node delegate; you probably want to call the super
method and append any additional actions this particular node should
@@ -660,7 +662,7 @@ double-click on the node; this should do something safe and obvious on
the node, such as opening it for editing, running it if executable,
etc. To do so, your node delegate should override
-<a href="../DataNode.html#getPreferredAction--"><code>DataNode.getPreferredAction()</code></a>.
+<a href="../DataNode.html#getPreferredAction()"><code>DataNode.getPreferredAction()</code></a>.
If unspecified, NetBeans may still provide a generic default action,
such as displaying properties of the object.
@@ -670,7 +672,7 @@ templates, so you may override this. However, if there is a chance
this data object might serve as a template, for UI consistency this
default action should be preserved; you may check
-<a href="../DataObject.html#isTemplate--"><code>DataObject.isTemplate()</code></a>,
+<a href="../DataObject.html#isTemplate()"><code>DataObject.isTemplate()</code></a>,
and if true, provide
@@ -687,12 +689,12 @@ You must create a
to represent your data object in the Explorer hierarchy, so that the
user may interact with it visually. The method
-<a href="../DataObject.html#createNodeDelegate--"><code>DataObject.createNodeDelegate()</code></a>
+<a href="../DataObject.html#createNodeDelegate()"><code>DataObject.createNodeDelegate()</code></a>
controls what sort of node should be created. To control the icon, you
should use
-<a href="@org-openide-nodes@/org/openide/nodes/AbstractNode.html#setIconBaseWithExtension-java.lang.String-"><code>AbstractNode.setIconBaseWithExtension(...)</code></a>
+<a href="@org-openide-nodes@/org/openide/nodes/AbstractNode.html#setIconBaseWithExtension(java.lang.String)"><code>AbstractNode.setIconBaseWithExtension(...)</code></a>
on the newly created <code>DataNode</code>, either in its constructor
(if subclassing) or in <code>DataObject.createNodeDelegate()</code>.
@@ -712,7 +714,7 @@ cookies, and common actions without doing so.
NetBeans installs a few extra "hidden" loaders into the loader pool, as
are returned by
-<a href="../DataLoaderPool.html#allLoaders--"><code>DataLoaderPool.allLoaders()</code></a>.
+<a href="../DataLoaderPool.html#allLoaders()"><code>DataLoaderPool.allLoaders()</code></a>.
Currently, these include among other things:
@@ -803,7 +805,7 @@ an opaque callback object.
<p>Originally there used to be a marker interface
<a href="@org-openide-nodes@/org/openide/nodes/Node.Cookie.html"><code>Node.Cookie</code></a>,
however it is no longer necessary to use it. Rather rely on
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getLookup--">getLookup</a>
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getLookup()">getLookup</a>
method which can deal with plain Java objects.
As such there are no requirements as to what makes a valid
@@ -813,7 +815,7 @@ such as "opening", "compiling", "searching", etc.
<p>Uses of cookies on nodes are not much different from uses on data
objects; the initial cookie detection is done by
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getLookup--"><code>Node.getLookup().lookup(...)</code></a>;
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#getLookup()"><code>Node.getLookup().lookup(...)</code></a>;
however the default data node provides
@@ -821,14 +823,14 @@ however the default data node provides
that looks inside
-<a href="../MultiDataObject.html#getCookieSet--"><code>MultiDataObject.getCookieSet()</code></a>.
+<a href="../MultiDataObject.html#getCookieSet()"><code>MultiDataObject.getCookieSet()</code></a>.
<h4><a name="attach-retrieve">Attaching and retrieving cookies</a></h4>
<p>In short, there are a number of ways to attach cookies to either a
node or data object (and you may listen for changes in the set of
supported cookies, etc.). In all cases, the
-<a href="@org-openide-util-lookup@/org/openide/util/Lookup.html#lookup-java.lang.Class-">lookup(Class)</a>
+<a href="@org-openide-util-lookup@/org/openide/util/Lookup.html#lookup(java.lang.Class)">lookup(Class)</a>
method
is used by the system to
determine whether or not a given cookie is supported: thus, cookies
@@ -859,7 +861,7 @@ cookie appropriate once more, at which time the folder re-adds the
cookie to its cookie set and
<a href="@org-openide-util-lookup@/org/openide/util/LookupListener.html">LookupListener</a>
may observer the
-<a href="@org-openide-nodes@/org/openide/nodes/Node.html#fireCookieChange--">fired changes</a>
+<a href="@org-openide-nodes@/org/openide/nodes/Node.html#fireCookieChange()">fired changes</a>
to this effect.
<h4>Cookie Usage Scenarios</h4>
@@ -1097,7 +1099,7 @@ as principal argument, so as to encourage its use in the context of a
loader; the file entry of course gives easy access to the file object
it represents, as well as the data object via
-<a href="../MultiDataObject.Entry.html#getDataObject--"><code>MultiDataObject.Entry.getDataObject()</code></a>.
+<a href="../MultiDataObject.Entry.html#getDataObject()"><code>MultiDataObject.Entry.getDataObject()</code></a>.
<p>If the support is designed to be usable from someone else's loader,
and it is not obvious for which data objects using the support is
@@ -1116,11 +1118,11 @@ Using an existing support is generally straightforward - assuming your
data object is a subclass of <code>MultiDataObject</code>, you may
just add a new instance of the support using
-<a href="../MultiDataObject.html#setCookieSet-org.openide.nodes.CookieSet-"><code>MultiDataObject.setCookieSet(...)</code></a>
+<a href="../MultiDataObject.html#setCookieSet(org.openide.nodes.CookieSet)"><code>MultiDataObject.setCookieSet(...)</code></a>
in the constructor, passing in the primary entry (most likely) from
-<a href="../MultiDataObject.html#getPrimaryEntry--"><code>MultiDataObject.getPrimaryEntry()</code></a>.
+<a href="../MultiDataObject.html#getPrimaryEntry()"><code>MultiDataObject.getPrimaryEntry()</code></a>.
@@ -1169,7 +1171,7 @@ The extended clipboard supports Java Event-based notification of
changes in the contents of the clipboard. Just register your listener
with
-<a href="@org-openide-util-ui@/org/openide/util/datatransfer/ExClipboard.html#addClipboardListener-org.openide.util.datatransfer.ClipboardListener-"><code>ExClipboard.addClipboardListener(...)</code></a>.
+<a href="@org-openide-util-ui@/org/openide/util/datatransfer/ExClipboard.html#addClipboardListener(org.openide.util.datatransfer.ClipboardListener)"><code>ExClipboard.addClipboardListener(...)</code></a>.
<h3><a name="multi-transfer">Multi-transfers</a></h3>
diff --git a/openide.loaders/src/org/openide/loaders/package.html b/openide.loaders/src/org/openide/loaders/package.html
index 52a9995..5fb5d48 100644
--- a/openide.loaders/src/org/openide/loaders/package.html
+++ b/openide.loaders/src/org/openide/loaders/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/openide.loaders/test/unit/src/META-INF/netbeans/translate.names b/openide.loaders/test/unit/src/META-INF/netbeans/translate.names
index 556dd9f..16960e8 100644
--- a/openide.loaders/test/unit/src/META-INF/netbeans/translate.names
+++ b/openide.loaders/test/unit/src/META-INF/netbeans/translate.names
@@ -1,39 +1,2 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
origFolder/regularFileName.txt.old=origFolder/regularFileName.txt
dead-file-location.old=origFolder3/moved-here.txt
diff --git a/openide.loaders/test/unit/src/org/openide/awt/MenuBarCNFETest.java b/openide.loaders/test/unit/src/org/openide/awt/MenuBarCNFETest.java
index d0c37bc..d914a42 100644
--- a/openide.loaders/test/unit/src/org/openide/awt/MenuBarCNFETest.java
+++ b/openide.loaders/test/unit/src/org/openide/awt/MenuBarCNFETest.java
@@ -44,7 +44,6 @@
package org.openide.awt;
-import java.awt.Component;
import java.awt.event.ActionEvent;
import java.awt.event.ContainerEvent;
import java.awt.event.ContainerListener;
@@ -104,14 +103,7 @@ public class MenuBarCNFETest extends NbTestCase implements ContainerListener {
MenuBar menuBar = new MenuBar(dataFolder);
menuBar.waitFinished();
- int componentCount = 0;
- for (Component c : menuBar.getComponents()) {
- if (!c.isVisible()) {
- continue;
- }
- componentCount++;
- }
- assertEquals("No instances", 0, componentCount);
+ assertEquals("No instances", 0, menuBar.getComponentCount());
AWTTaskTest.waitEQ();
diff --git a/openide.loaders/test/unit/src/org/openide/awt/MenuBarTest.java b/openide.loaders/test/unit/src/org/openide/awt/MenuBarTest.java
index c159d14..a73e54b 100644
--- a/openide.loaders/test/unit/src/org/openide/awt/MenuBarTest.java
+++ b/openide.loaders/test/unit/src/org/openide/awt/MenuBarTest.java
@@ -54,10 +54,6 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.AbstractAction;
@@ -67,11 +63,9 @@ import javax.swing.JPanel;
import org.netbeans.junit.Log;
import org.netbeans.junit.NbTestCase;
import org.netbeans.junit.RandomlyFails;
-import org.openide.actions.EditAction;
import org.openide.actions.OpenAction;
import org.openide.cookies.InstanceCookie;
import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileStateInvalidException;
import org.openide.filesystems.FileSystem;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.XMLFileSystem;
@@ -172,30 +166,28 @@ public class MenuBarTest extends NbTestCase implements ContainerListener {
class Atom implements FileSystem.AtomicAction {
FileObject m1, m2;
- InstanceDataObject m3;
public void run() throws IOException {
m1 = FileUtil.createFolder(df.getPrimaryFile(), "m1");
m2 = FileUtil.createFolder(df.getPrimaryFile(), "m2");
- m3 = InstanceDataObject.create(df, "m3", OpenAction.class);
}
}
Atom atom = new Atom();
df.getPrimaryFile().getFileSystem().runAtomicAction(atom);
mb.waitFinished();
- assertEquals("Three children there", 3, mb.getComponentCount());
+ assertEquals("Two children there", 2, mb.getComponentCount());
assertEquals("Programatic names deduced from the folder", "m1", mb.getComponent(0).getName());
assertEquals("Programatic names deduced from the folder", "m2", mb.getComponent(1).getName());
assertEquals("No removals", 0, remove);
- assertEquals("Three additions", 3, add);
+ assertEquals("Two additions", 2, add);
DataFolder f1 = DataFolder.findFolder(atom.m1);
InstanceDataObject.create(f1, "Kuk", OpenAction.class);
mb.waitFinished();
- assertEquals("Three children there", 3, mb.getComponentCount());
+ assertEquals("Two children there", 2, mb.getComponentCount());
Object o1 = mb.getComponent(0);
if (!(o1 instanceof JMenu)) {
fail("It has to be menu: " + o1);
@@ -205,154 +197,8 @@ public class MenuBarTest extends NbTestCase implements ContainerListener {
java.awt.Component[] content = m1.getPopupMenu().getComponents();
assertEquals("Now it has one child", 1, content.length);
- mb.waitFinished();
-
assertEquals("Still No removals in MenuBar", 0, remove);
- assertEquals("Still Two additions in MenuBar", 3, add);
-
- class Atom3 implements FileSystem.AtomicAction {
- InstanceDataObject m3;
-
- @Override
- public void run() throws IOException {
- m3 = InstanceDataObject.create(df, "m4", EditAction.class);
- }
- }
- Atom3 atom3 = new Atom3();
- df.getPrimaryFile().getFileSystem().runAtomicAction(atom3);
- mb.waitFinished();
- assertEquals("Four children there", 4, mb.getComponentCount());
- assertEquals("No removals", 0, remove);
- assertEquals("Four additions", 4, add);
- }
-
- public void testComponentsHeavyUpdates() throws Exception {
- mb.addContainerListener(this);
- assertEquals("No children now", 0, mb.getComponentCount());
-
- final List<FileObject> items = new ArrayList<FileObject>();
- final List<String> toAdd = new ArrayList<String>();
- final List<String> toRemove = new ArrayList<String>();
- final AtomicInteger numAdds = new AtomicInteger(0);
- final AtomicInteger numRemoves = new AtomicInteger(0);
- class Atom implements FileSystem.AtomicAction {
- @Override public void run() throws IOException {
- FileObject root = df.getPrimaryFile();
- for (String add : toAdd) {
- FileUtil.createFolder(root, add);
- }
- for (String remove : toRemove) {
- root.getFileObject(remove).delete();
- }
- numAdds.addAndGet(toAdd.size());
- numRemoves.addAndGet(toRemove.size());
- items.clear();
- FileObject[] children = root.getChildren();
- Arrays.sort(children, new Comparator<FileObject>() {
- @Override
- public int compare(FileObject o1, FileObject o2) {
- return o1.getName().compareTo(o2.getName());
- }
- });
- items.addAll(Arrays.asList(children));
- toAdd.clear();
- toRemove.clear();
- }
- }
- final Atom atom = new Atom();
- class Check {
- public void check() throws FileStateInvalidException, IOException {
- df.getPrimaryFile().getFileSystem().runAtomicAction(atom);
- mb.waitFinished();
- assertEquals("Correct number of components", items.size(), mb.getComponentCount());
- List<String> itemNames = new ArrayList<String>(items.size());
- for (int i = 0; i < items.size(); i++) {
- itemNames.add(items.get(i).getName());
- }
- List<String> componentNames = new ArrayList<String>(items.size());
- for (int i = 0; i < items.size(); i++) {
- componentNames.add(mb.getComponent(i).getName());
- }
- for (int i = 0; i < items.size(); i++) {
- assertEquals("Correct component name ["+i+"]\n"+
- "All items = "+itemNames+"\n"+
- "All cmpnts= "+componentNames, items.get(i).getName(), mb.getComponent(i).getName());
- }
- assertEquals("Correct additions", numAdds.get(), add);
- assertEquals("Correct removals", numRemoves.get(), remove);
- }
- }
- Check check = new Check();
- toAdd.add("m1");
- check.check();
- toRemove.add("m1");
- check.check();
- // Empty
- for (int i = 0; i < 10; i++) {
- toAdd.add("m"+i);
- }
- check.check();
- for (int i = 0; i < 10; i++) {
- if ((i % 2) == 0) {
- toRemove.add("m"+i);
- }
- }
- check.check();
- for (int i = 0; i < 10; i++) {
- if ((i % 2) != 0) {
- toRemove.add("m"+i);
- }
- }
- check.check();
- // Empty
- for (int i = 0; i < 10; i++) {
- toAdd.add("m"+i);
- }
- check.check();
- for (int i = 0; i < 10; i++) {
- if ((i % 2) != 0) {
- toRemove.add("m"+i);
- }
- }
- check.check();
- for (int i = 0; i < 10; i++) {
- if ((i % 2) != 0) {
- toAdd.add("m"+i);
- }
- }
- check.check();
- for (int i = 5; i < 10; i++) {
- toRemove.add("m"+i);
- }
- check.check();
- for (int i = 5; i <= 10; i++) {
- if ((i % 2) == 0) {
- toAdd.add("m"+i);
- }
- }
- check.check();
- for (int i = 0; i < 5; i++) {
- if ((i % 2) != 0) {
- toRemove.add("m"+i);
- }
- }
- check.check();
- for (int i = 0; i <= 10; i++) {
- if ((i % 2) == 0) {
- toRemove.add("m"+i);
- }
- check.check();
- }
- // Empty
- for (int i = 0; i <= 10; i++) {
- toAdd.add("m"+i);
- check.check();
- }
- for (int i = 10; i >= 0; i--) {
- toRemove.add("m"+i);
- check.check();
- }
- // Empty
+ assertEquals("Still Two additions in MenuBar", 2, add);
}
diff --git a/openide.loaders/test/unit/src/org/openide/loaders/Deadlock60917Test.java b/openide.loaders/test/unit/src/org/openide/loaders/Deadlock60917Test.java
index fce2fcf..637049d 100644
--- a/openide.loaders/test/unit/src/org/openide/loaders/Deadlock60917Test.java
+++ b/openide.loaders/test/unit/src/org/openide/loaders/Deadlock60917Test.java
@@ -56,7 +56,6 @@ import java.util.Arrays;
import java.util.logging.Level;
import javax.swing.text.Document;
import org.netbeans.junit.*;
-import org.netbeans.modules.editor.mimelookup.SharedMimeLookupCache;
import org.netbeans.modules.openide.util.NbMutexEventProvider;
import org.openide.cookies.OpenCookie;
@@ -252,7 +251,6 @@ public class Deadlock60917Test extends NbTestCase {
ic.add(new Pool ());
ic.add(new DD());
ic.add(new NbMutexEventProvider());
- ic.add(new SharedMimeLookupCache()); // Fixed failing MimePath.getLookup()
}
}
diff --git a/openide.loaders/test/unit/src/org/openide/loaders/FolderComparatorTest.java b/openide.loaders/test/unit/src/org/openide/loaders/FolderComparatorTest.java
deleted file mode 100644
index 62b9890..0000000
--- a/openide.loaders/test/unit/src/org/openide/loaders/FolderComparatorTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2015 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2015 Sun Microsystems, Inc.
- */
-package org.openide.loaders;
-
-import java.awt.EventQueue;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
-import org.junit.Test;
-import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileSystem;
-import org.openide.filesystems.FileUtil;
-
-/**
- *
- * @author jhavlin
- */
-public class FolderComparatorTest {
-
- public FolderComparatorTest() {
- }
-
- @Test
- public void testNaturalComparatorBasic() throws IOException {
- testNaturalComparator(new String[]{
- "b 10.txt",
- "b 9.txt",
- "a2.txt",
- "a 4 9.txt",
- "a10.txt",
- "b0070.txt",
- "a 3.txt",
- "b08.txt"
- }, new String[]{
- "a2.txt",
- "a 3.txt",
- "a 4 9.txt",
- "a10.txt",
- "b08.txt",
- "b 9.txt",
- "b 10.txt",
- "b0070.txt"
- });
- }
-
- @Test
- public void testNaturalComparatorWithSuffixes() throws IOException {
- testNaturalComparator(new String[]{
- "a01b",
- "a2x",
- "a02",
- "a1"
- }, new String[]{
- "a1",
- "a01b",
- "a02",
- "a2x"
- });
- }
-
- @Test
- public void testUseCustomComparator() throws IOException,
- InterruptedException, InvocationTargetException {
-
- FileSystem fs = FileUtil.createMemoryFileSystem();
-
- fs.getRoot().createData("aaaa.txt");
- fs.getRoot().createData("bbb.txt");
- fs.getRoot().createData("cc.txt");
- fs.getRoot().createData("d.txt");
- fs.getRoot().refresh();
-
- DataFolder.SortMode custom = new DataFolder.SortMode() {
- @Override
- public int compare(DataObject o1, DataObject o2) {
- return o1.getName().length() - o2.getName().length();
- }
- };
-
- DataFolder df = DataFolder.findFolder(fs.getRoot());
- df.setSortMode(custom);
- EventQueue.invokeAndWait(new Runnable() {
- @Override
- public void run() {
- }
- });
- DataObject[] children = df.getChildren();
- assertEquals("d.txt", children[0].getName());
- assertEquals("cc.txt", children[1].getName());
- assertEquals("bbb.txt", children[2].getName());
- assertEquals("aaaa.txt", children[3].getName());
- }
-
- @Test
- public void testNaturalComparatorFallback() throws IOException {
- testNaturalComparator(new String[]{
- "a01.txt",
- "a001.txt",
- "A1.txt"
- }, new String[]{
- "A1.txt",
- "a001.txt",
- "a01.txt"
- });
- }
-
- private void testNaturalComparator(String[] fileNames,
- String[] expectedOrder) throws IOException {
- FolderComparator c = new FolderComparator(FolderComparator.NATURAL);
- FileSystem fs = FileUtil.createMemoryFileSystem();
- FileObject root = fs.getRoot();
- List<DataObject> list = new ArrayList<DataObject>();
- for (String n : fileNames) {
- FileObject fo = root.createData(n);
- assertNotNull(fo);
- list.add(DataObject.find(fo));
- }
-
- Collections.sort(list, c);
- for (int i = 0; i < expectedOrder.length; i++) {
- assertEquals(expectedOrder[i], list.get(i).getName());
- }
- }
-}
diff --git a/openide.modules/apichanges.xml b/openide.modules/apichanges.xml
index dda23ba..e6e348a 100644
--- a/openide.modules/apichanges.xml
+++ b/openide.modules/apichanges.xml
@@ -157,7 +157,7 @@ made subject to such option by the copyright holder.
</compatibility>
<description>
<p>
- <a href="@TOP@/org/openide/modules/Dependency.html#create-int-java.lang.String-">Dependency.create</a>
+ <a href="@TOP@/org/openide/modules/Dependency.html#create(int,%20java.lang.String)">Dependency.create</a>
now allows code name base where dot is followed by number
(like <em>org.apache.servicemix.specs.jsr303_api_1.0.0</em>).
This increases the inter-operability with OSGi bundles
@@ -183,8 +183,8 @@ made subject to such option by the copyright holder.
<p>
Each module provides by default a token composed from its
code name base and fixed prefix:
- <code>"cnb." + <a href="@TOP@/org/openide/modules/ModuleInfo.html#getCodeNameBase--">getCodeNameBase()</a></code>
- from its <a href="@TOP@/org/openide/modules/ModuleInfo.html#getProvides--">getProvides()</a>
+ <code>"cnb." + <a href="@TOP@/org/openide/modules/ModuleInfo.html#getCodeNameBase()">getCodeNameBase()</a></code>
+ from its <a href="@TOP@/org/openide/modules/ModuleInfo.html#getProvides()">getProvides()</a>
method.
</p>
</description>
@@ -475,7 +475,7 @@ javax.xml.ws</pre>
<compatibility binary="compatible" source="compatible" semantic="compatible" deprecation="no" addition="no" deletion="no" modification="no"/>
<description>
Rewritten to use Java5 features, especially generics.
- Affects internal code and <a href="@TOP at org/openide/modules/Dependency.html#create-int-java.lang.String-">one public signature</a>.
+ Affects internal code and <a href="@TOP at org/openide/modules/Dependency.html#create(int,%20java.lang.String)">one public signature</a>.
</description>
<class package="org.openide.modules" name="Dependency"/>
</change>
diff --git a/openide.modules/manifest.mf b/openide.modules/manifest.mf
index 5311efb..b5ca14a 100644
--- a/openide.modules/manifest.mf
+++ b/openide.modules/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.modules
OpenIDE-Module-Localizing-Bundle: org/openide/modules/Bundle.properties
-OpenIDE-Module-Specification-Version: 7.48.1
+OpenIDE-Module-Specification-Version: 7.47.1
diff --git a/openide.modules/nbproject/org-openide-modules.sig b/openide.modules/nbproject/org-openide-modules.sig
index 475e766..201cc1f 100644
--- a/openide.modules/nbproject/org-openide-modules.sig
+++ b/openide.modules/nbproject/org-openide-modules.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 7.47.1
+#Version 7.43
CLSS public abstract interface java.io.Externalizable
intf java.io.Serializable
@@ -51,12 +51,6 @@ CLSS public abstract interface !annotation java.lang.annotation.Target
intf java.lang.annotation.Annotation
meth public abstract java.lang.annotation.ElementType[] value()
-CLSS public abstract interface !annotation org.openide.modules.ConstructorDelegate
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=CLASS)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[METHOD])
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault int[] delegateParams()
-
CLSS public final org.openide.modules.Dependency
fld public final static int COMPARE_ANY = 3
fld public final static int COMPARE_IMPL = 2
@@ -157,13 +151,6 @@ CLSS public abstract interface !annotation org.openide.modules.OnStop
anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE])
intf java.lang.annotation.Annotation
-CLSS public abstract interface !annotation org.openide.modules.PatchFor
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=CLASS)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE])
-fld public final static java.lang.String MANIFEST_FRAGMENT_HOST = "OpenIDE-Module-Fragment-Host"
-intf java.lang.annotation.Annotation
-meth public abstract java.lang.Class<?> value()
-
CLSS public abstract interface !annotation org.openide.modules.PatchedPublic
anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=CLASS)
anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[METHOD, CONSTRUCTOR])
diff --git a/openide.modules/src/org/openide/modules/doc-files/api.html b/openide.modules/src/org/openide/modules/doc-files/api.html
index 800c980..355f77a 100644
--- a/openide.modules/src/org/openide/modules/doc-files/api.html
+++ b/openide.modules/src/org/openide/modules/doc-files/api.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
@@ -316,7 +318,7 @@ only handle the exceptional parts.
base class. Your class must be able to be
-<a href="@JDK@/java/beans/Beans.html#instantiate-java.lang.ClassLoader-java.lang.String-">instantiated as a JavaBean</a>.
+<a href="@JDK@/java/beans/Beans.html#instantiate(java.lang.ClassLoader,%20java.lang.String)">instantiated as a JavaBean</a>.
There are several methods which you may override, and may do anything
which is required to make the module cleanly enter and exit NetBeans.</p>
@@ -332,7 +334,7 @@ import org.openide.filesystems.FileUtil;
import java.net.*;
public class ModuleHandler extends <a href="../ModuleInstall.html">ModuleInstall</a> {
- public void <a href="../ModuleInstall.html#installed--">installed</a>() {
+ public void <a href="../ModuleInstall.html#installed()">installed</a>() {
// This module has been installed for the first time! Notify authors.
HttpURLConnection conn = (HttpURLConnection)
(new URL ("http://www.modulemakers.com/clip_disp/installed.cgi").openConnection ());
@@ -343,15 +345,15 @@ public class ModuleHandler extends <a href="../ModuleInstall.html">ModuleInstall
}
// Nothing special required here.
- // public void <a href="../ModuleInstall.html#restored--">restored</a>() {
+ // public void <a href="../ModuleInstall.html#restored()">restored</a>() {
// }
// Do not need to do anything special on uninstall.
// Tools action will be removed automatically.
- // public void <a href="../ModuleInstall.html#uninstalled--">uninstalled</a>() {
+ // public void <a href="../ModuleInstall.html#uninstalled()">uninstalled</a>() {
// }
- public boolean <a href="../ModuleInstall.html#closing--">closing</a>() {
+ public boolean <a href="../ModuleInstall.html#closing()">closing</a>() {
// Ask the user to save any open, modified clipboard contents.
// If the user selects "Cancel" on one of these dialogs, don't exit yet!
return DisplayClipboardAction.askAboutExiting ();
@@ -373,7 +375,7 @@ acceptable to use in <code>restored</code>, including
<p>The
-<a href="../ModuleInstall.html#updated-int-java.lang.String-"><code>ModuleInstall.updated(...)</code></a>
+<a href="../ModuleInstall.html#updated(int,%20java.lang.String)"><code>ModuleInstall.updated(...)</code></a>
method will be called just once when
a module is updated to a new version - when the new version is loaded
@@ -389,7 +391,7 @@ in order for it to be used. For example, an external application may need
to be installed in order for it to do anything. Or it may require a valid
license key. In such cases, the
-<a href="../ModuleInstall.html#validate--"><code>ModuleInstall.validate()</code></a>
+<a href="../ModuleInstall.html#validate()"><code>ModuleInstall.validate()</code></a>
method may be overridden to check for this external resource and throw
a (preferably politely localized) <code>IllegalStateException</code>
@@ -489,7 +491,7 @@ understood by <code>XMLFileSystem</code>.
Its contents specify some files that the module will add to the
-<a href="@org-openide-filesystems@/org/openide/filesystems/Repository.html#getDefaultFileSystem--">system filesystem</a>
+<a href="@org-openide-filesystems@/org/openide/filesystems/Repository.html#getDefaultFileSystem()">system filesystem</a>
controlling much of NetBeans' configuration. This filesystem is composed of many read-only XML layer filesystems
as well as a writable layer corresponding to the <code>config</code> subdirectory of the user directory.</p>
@@ -574,7 +576,7 @@ for example, menus are
in the order the instance-bearing data objects occur in the data
folder. The call
-<a href="@org-openide-loaders@/org/openide/loaders/DataFolder.html#setOrder-org.openide.loaders.DataObject:A-"><code>DataFolder.setOrder(DataObject[])</code></a>
+<a href="@org-openide-loaders@/org/openide/loaders/DataFolder.html#setOrder(org.openide.loaders.DataObject[])"><code>DataFolder.setOrder(DataObject[])</code></a>
suffices to arbitrarily change folder order, but usually it is
desirable to create the proper order declaratively in the XML. For
@@ -583,7 +585,7 @@ this reason, <code>DataFolder</code> understands special attributes
Specifically: if there are data objects A and B in the folder,
represented by
-<a href="@org-openide-loaders@/org/openide/loaders/DataObject.html#getPrimaryFile--">primary files</a>
+<a href="@org-openide-loaders@/org/openide/loaders/DataObject.html#getPrimaryFile()">primary files</a>
<samp>afile</samp> and <samp>bfile</samp>,
and <samp>afile</samp> has an attribute named <code>position</code> whose numeric value is less
@@ -618,7 +620,7 @@ any bearing on the ordering.
<p>There is also an older, now-deprecated system based on relative ordering attributes.</p>
-<p>More details are available in <a href="@org-openide-filesystems@/org/openide/filesystems/FileUtil.html#getOrder-java.util.Collection-boolean-"><code>FileUtil.getOrder</code></a>.</p>
+<p>More details are available in <a href="@org-openide-filesystems@/org/openide/filesystems/FileUtil.html#getOrder(java.util.Collection,%20boolean)"><code>FileUtil.getOrder</code></a>.</p>
<p>The resource path pointing to the layer is automatically localized
by NetBeans every time the module is installed or restored; if there
@@ -640,7 +642,7 @@ files installed by the core.
<p>NetBeans recognizes several special file attributes, typically set in layers, which can control UI.
For example, the labels of menus created from folders beneath <samp>Menu/</samp>
are derived from the "localized display name" of the layer folder, when defined.
-See <a href="@org-openide-filesystems@/org/openide/filesystems/FileSystem.html#getDecorator--"><code>FileSystem.getDecorator()</code></a>
+See <a href="@org-openide-filesystems@/org/openide/filesystems/FileSystem.html#getDecorator()"><code>FileSystem.getDecorator()</code></a>
(formerly <code>getStatus()</code>)for details.</p>
<h4>Reverting user's modifications</h4>
@@ -1251,7 +1253,7 @@ missing a valid license key), simply use
<p>When rewriting the module XML be sure to use
-<a href="@org-openide-filesystems@/org/openide/filesystems/FileSystem.html#runAtomicAction-org.openide.filesystems.FileSystem.AtomicAction-"><code>FileSystem.runAtomic(FileSystem.AtomicAction)</code></a>
+<a href="@org-openide-filesystems@/org/openide/filesystems/FileSystem.html#runAtomicAction(org.openide.filesystems.FileSystem.AtomicAction)"><code>FileSystem.runAtomic(FileSystem.AtomicAction)</code></a>
to wrap the reading of the old XML and the writing of the new, to
prevent file changes from being fired halfway through.</p>
diff --git a/openide.modules/src/org/openide/modules/doc-files/classpath.html b/openide.modules/src/org/openide/modules/doc-files/classpath.html
index e7d1636..0eb3996 100644
--- a/openide.modules/src/org/openide/modules/doc-files/classpath.html
+++ b/openide.modules/src/org/openide/modules/doc-files/classpath.html
@@ -2,10 +2,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -17,14 +15,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -35,8 +39,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -457,7 +459,7 @@ OpenIDE-Module-Module-Dependencies: org.netbeans.modules.a = 1.0-alpha-2
</pre>
<p>
This class loader is also the
- <a href="@JDK@/java/lang/Thread.html#getContextClassLoader--">context class loader</a>
+ <a href="@JDK@/java/lang/Thread.html#getContextClassLoader()">context class loader</a>
for every thread in the NetBeans VM, unless that thread (or a parent)
explicitly set some other context class loader. Since many libraries which are
independent of NetBeans (including in the JRE) are written to assume that all
@@ -519,7 +521,7 @@ OpenIDE-Module-Module-Dependencies: org.netbeans.modules.a = 1.0-alpha-2
There is also a related protocol <code>nbresloc</code> which loads from the
system class loader but additionally performs automatic localization and
branding of the resource you specify. Various
- <a href="@org-openide-util@/org/openide/util/NbBundle.html#getLocalizingSuffixes--">suffixes</a>
+ <a href="@org-openide-util@/org/openide/util/NbBundle.html#getLocalizingSuffixes()">suffixes</a>
are inserted between the base name and the extension of the resource
(beginning with the last dot in the path, if it is in the last path
component), according to the current locale and branding. For example:
diff --git a/openide.modules/src/org/openide/modules/doc-files/i18n-branding.html b/openide.modules/src/org/openide/modules/doc-files/i18n-branding.html
index df45e4e..5bd878c 100644
--- a/openide.modules/src/org/openide/modules/doc-files/i18n-branding.html
+++ b/openide.modules/src/org/openide/modules/doc-files/i18n-branding.html
@@ -2,10 +2,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -17,14 +15,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -35,8 +39,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
diff --git a/openide.modules/src/org/openide/modules/package.html b/openide.modules/src/org/openide/modules/package.html
index 07b2629..1bb3eb6 100644
--- a/openide.modules/src/org/openide/modules/package.html
+++ b/openide.modules/src/org/openide/modules/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/openide.nodes/apichanges.xml b/openide.nodes/apichanges.xml
index 86a6b53..34e71a2 100644
--- a/openide.nodes/apichanges.xml
+++ b/openide.nodes/apichanges.xml
@@ -49,30 +49,6 @@ made subject to such option by the copyright holder.
<apidef name="nodes">Nodes API</apidef>
</apidefs>
<changes>
- <change id="ChildFactory.DestroyableNodes">
- <api name="nodes"/>
- <summary>Adding ChildFactory.Detachable to allow ChildFactory implementations to
- attach and detach listeners more easily
- </summary>
- <version major="7" minor="45"/>
- <date day="18" month="2" year="2016"/>
- <author login="phejl"/>
- <compatibility addition="yes" binary="compatible" source="compatible" semantic="compatible"/>
- <description>
- <a href="@TOP@/org/openide/nodes/ChildFactory.html">ChildFactory</a>
- is useful for creating node children lazily on a background thread,
- and for simplifying working with Children.Keys. One oversight in
- the original API was providing for notification that the nodes created
- by the ChildFactory are no longer in use and should clean up any
- resources.
- <p>
- DestroyableNodesFactory is an abstract class which adds
- destroyNodes methods to ChildFactory.Detachable.
- </p>
- </description>
- <class package="org.openide.nodes" name="DestroyableNodesFactory"/>
- <issue number="257941"/>
- </change>
<change id="BeanInfoSearchPath">
<api name="nodes"/>
<summary>Adding <code>@BeanInfoSearchPath</code> annotation</summary>
@@ -278,7 +254,7 @@ made subject to such option by the copyright holder.
Added the class
<a href="@TOP@/org/openide/nodes/ChildFactory.html">ChildFactory</a>
and the method
- <a href="@TOP@/org/openide/nodes/Children.html#create-org.openide.nodes.ChildFactory-boolean-">Children.create(ChildFactory factory, boolean asynchronous)</a>
+ <a href="@TOP@/org/openide/nodes/Children.html#create(org.openide.nodes.ChildFactory, boolean)">Children.create(ChildFactory factory, boolean asynchronous)</a>
to the API. This simplifies creation of Node children which need
to be computed on a background thread for performance reasons.
Anyone wishing to do this can simply extend ChildFactory and
@@ -305,7 +281,7 @@ made subject to such option by the copyright holder.
<author login="jtulach"/>
<compatibility addition="yes" binary="compatible" source="compatible" semantic="compatible" deprecation="no" deletion="no" modification="no"/>
<description>
- New method <a href="@TOP@/org/openide/nodes/CookieSet.html#createGeneric-org.openide.nodes.CookieSet.Before-">
+ New method <a href="@TOP@/org/openide/nodes/CookieSet.html#createGeneric(org.openide.nodes.CookieSet.Before)">
CookieSet.createGeneric</a> has been added. It allows to create
an instance of <a href="@TOP@/org/openide/nodes/CookieSet.html">
CookieSet</a> that can contain any object, not just
@@ -316,7 +292,7 @@ made subject to such option by the copyright holder.
Lookup.Provider</a> and thus has a method <code>getLookup</code> to
allow queries for of its content.
Also there is a new method
- <a href="@TOP@/org/openide/nodes/CookieSet.html#assign-java.lang.Class-T...-">
+ <a href="@TOP@/org/openide/nodes/CookieSet.html#assign(java.lang.Class,%20T...)">
assign(clazz, instances)</a> that allows to add/remove
plain old java objects to the <code>CookieSet</code>.
</description>
diff --git a/openide.nodes/arch.xml b/openide.nodes/arch.xml
index 5a60456..ddd9f86 100644
--- a/openide.nodes/arch.xml
+++ b/openide.nodes/arch.xml
@@ -425,9 +425,9 @@ the test uses reflection to retrieve the <code>ProjectManager.mutex()</code> ins
<answer id="format-clipboard">
Nodes provide default implementation of clipboard operations on nodes. This
can be extendeded by specific implementation of nodes by overloading:
-<a href="@TOP@/org/openide/nodes/Node.html#clipboardCopy--">Node.clipboardCopy()</a>,
-<a href="@TOP@/org/openide/nodes/Node.html#clipboardCut--">Node.cliboardCut()</a>,
-<a href="@TOP@/org/openide/nodes/Node.html#getPasteTypes-java.awt.datatransfer.Transferable-">Node.getPasteTypes()</a>
+<a href="@TOP@/org/openide/nodes/Node.html#clipboardCopy()">Node.clipboardCopy()</a>,
+<a href="@TOP@/org/openide/nodes/Node.html#clipboardCut()">Node.cliboardCut()</a>,
+<a href="@TOP@/org/openide/nodes/Node.html#getPasteTypes(java.awt.datatransfer.Transferable)">Node.getPasteTypes()</a>
Default Transferables for nodes can be obtained using.
<a href="@TOP@/org/openide/nodes/NodeTransfer.html">NodeTransfer</a> class
@@ -448,8 +448,8 @@ provides own DataFlavor transfering indices.
<answer id="format-dnd">
Nodes provide default implementation of d'n'd operations on nodes. This
can be extendeded by specific implementation of nodes by overloading:
-<a href="@TOP@/org/openide/nodes/Node.html#drag--">Node.drag()</a>
-<a href="@TOP@/org/openide/nodes/Node.html#getDropType-java.awt.datatransfer.Transferable-int-int-">Node.getDropTye()</a>
+<a href="@TOP@/org/openide/nodes/Node.html#drag()">Node.drag()</a>
+<a href="@TOP@/org/openide/nodes/Node.html#getDropType(java.awt.datatransfer.Transferable,%20int,%20int)">Node.getDropTye()</a>
Default Transferables for nodes can be obtained using.
<a href="@TOP@/org/openide/nodes/NodeTransfer.html">NodeTransfer</a> class
diff --git a/openide.nodes/manifest.mf b/openide.nodes/manifest.mf
index 176c4a9..c00ca9b 100644
--- a/openide.nodes/manifest.mf
+++ b/openide.nodes/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
OpenIDE-Module: org.openide.nodes
OpenIDE-Module-Localizing-Bundle: org/openide/nodes/Bundle.properties
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 7.45.1
+OpenIDE-Module-Specification-Version: 7.42.1
diff --git a/openide.nodes/nbproject/org-openide-nodes.sig b/openide.nodes/nbproject/org-openide-nodes.sig
index 92c3511..22aab68 100644
--- a/openide.nodes/nbproject/org-openide-nodes.sig
+++ b/openide.nodes/nbproject/org-openide-nodes.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 7.42.1
+#Version 7.39
CLSS public abstract java.awt.Component
cons protected init()
@@ -1719,7 +1719,7 @@ meth public abstract <%0 extends java.lang.Object> org.openide.util.Lookup$Resul
meth public abstract <%0 extends java.lang.Object> {%%0} lookup(java.lang.Class<{%%0}>)
meth public static org.openide.util.Lookup getDefault()
supr java.lang.Object
-hfds LOG,defaultLookup,defaultLookupProvider
+hfds LOG,defaultLookup
hcls DefLookup,Empty
CLSS public abstract interface static org.openide.util.Lookup$Provider
diff --git a/openide.nodes/src/META-INF/upgrade/org.openides.nodes.Node.hint b/openide.nodes/src/META-INF/upgrade/org.openides.nodes.Node.hint
index fa0de90..f3900fb 100644
--- a/openide.nodes/src/META-INF/upgrade/org.openides.nodes.Node.hint
+++ b/openide.nodes/src/META-INF/upgrade/org.openides.nodes.Node.hint
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
'Node.getCookie is obsolete':
$this.getCookie($class) :: $this instanceof org.openide.nodes.Node && $class instanceof java.lang.Class
=> $this.getLookup().lookup($class)
diff --git a/openide.nodes/src/org/openide/cookies/package.html b/openide.nodes/src/org/openide/cookies/package.html
index 0b6cf44..708eef9 100644
--- a/openide.nodes/src/org/openide/cookies/package.html
+++ b/openide.nodes/src/org/openide/cookies/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/openide.nodes/src/org/openide/nodes/AsynchChildren.java b/openide.nodes/src/org/openide/nodes/AsynchChildren.java
index 31a5d49..bb2d147 100644
--- a/openide.nodes/src/org/openide/nodes/AsynchChildren.java
+++ b/openide.nodes/src/org/openide/nodes/AsynchChildren.java
@@ -161,12 +161,6 @@ final class AsynchChildren <T> extends Children.Keys <Object> implements
}
}
- @Override
- protected void destroyNodes(Node[] arr) {
- super.destroyNodes(arr);
- factory.destroyNodes(arr);
- }
-
volatile boolean cancelled = false;
volatile boolean notified;
private final Object notifyLock = new Object();
diff --git a/openide.nodes/src/org/openide/nodes/ChildFactory.java b/openide.nodes/src/org/openide/nodes/ChildFactory.java
index 82a6527..48e75e9 100644
--- a/openide.nodes/src/org/openide/nodes/ChildFactory.java
+++ b/openide.nodes/src/org/openide/nodes/ChildFactory.java
@@ -220,10 +220,6 @@ public abstract class ChildFactory <T> {
//do nothing
}
- void destroyNodes(Node[] arr) {
- //do nothing
- }
-
interface Observer {
public void refresh(boolean immediate);
}
@@ -274,5 +270,4 @@ public abstract class ChildFactory <T> {
}
}
-
}
diff --git a/openide.nodes/src/org/openide/nodes/DestroyableNodesFactory.java b/openide.nodes/src/org/openide/nodes/DestroyableNodesFactory.java
deleted file mode 100644
index 383b0fd..0000000
--- a/openide.nodes/src/org/openide/nodes/DestroyableNodesFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2016 Sun Microsystems, Inc.
- */
-package org.openide.nodes;
-
-/**
- * Subclass of {@link Detachable} with lifecycle method invoked when
- * nodes created by the factory are no longer needed.
- *
- * @param <T> The key type for this child factory
- * @since org.openide.nodes 7.45
- */
-public abstract class DestroyableNodesFactory<T> extends ChildFactory.Detachable<T> {
-
- /**
- * Called when nodes created previously by this factory are no longer
- * present in the node hierarchy.
- *
- * @param arr nodes which are no longer needed
- */
- @Override
- protected void destroyNodes(Node[] arr) {
- //do nothing
- }
-
-}
diff --git a/openide.nodes/src/org/openide/nodes/EntrySupportLazy.java b/openide.nodes/src/org/openide/nodes/EntrySupportLazy.java
index 0065e90..c3684fe 100644
--- a/openide.nodes/src/org/openide/nodes/EntrySupportLazy.java
+++ b/openide.nodes/src/org/openide/nodes/EntrySupportLazy.java
@@ -700,39 +700,11 @@ class EntrySupportLazy extends EntrySupport {
return null;
}
Set<Entry> entriesToRemove = new HashSet<Entry>(state.getEntries());
- removeAllOpt(entriesToRemove, newEntries);
+ entriesToRemove.removeAll(newEntries);
return entriesToRemove;
}
}
- /**
- * Optimized version of removeAll for HashSets. The implementation in
- * {@link java.util.AbstractSet#removeAll(java.util.Collection)} (at least
- * in Java 8) calls toRemove.contains(x) for each element x in base if
- * base.size() <= toRemove.size(), which is very slow if toRemove is big
- * ArrayList, whose complexity of method "contains" is linear.
- *
- * See bug 230180.
- *
- * @param base A set from which the elements will be removed.
- * @param toRemove A collection with elements to remove.
- *
- * @return True if the base collection was modified, false otherwise.
- */
- private static boolean removeAllOpt(
- Set<Entry> base, Collection<? extends Entry> toRemove) {
-
- if ((toRemove instanceof ArrayList
- && toRemove.size() > 100
- && toRemove.size() >= base.size())) {
- HashSet<Entry> toRemoveAsSet = new HashSet<Entry>();
- toRemoveAsSet.addAll(toRemove);
- return base.removeAll(toRemoveAsSet);
- } else {
- return base.removeAll(toRemove);
- }
- }
-
/** holds node for entry; 1:1 mapping */
/** Dummy node class for entries without any node */
diff --git a/openide.nodes/src/org/openide/nodes/SynchChildren.java b/openide.nodes/src/org/openide/nodes/SynchChildren.java
index 4a059aa..2f7c660 100644
--- a/openide.nodes/src/org/openide/nodes/SynchChildren.java
+++ b/openide.nodes/src/org/openide/nodes/SynchChildren.java
@@ -79,13 +79,6 @@ final class SynchChildren<T> extends Children.Keys<T> implements ChildFactory.Ob
protected Node[] createNodes(T key) {
return factory.createNodesForKey(key);
}
-
- @Override
- protected void destroyNodes(Node[] arr) {
- super.destroyNodes(arr);
- factory.destroyNodes(arr);
- }
-
public void refresh(boolean immediate) {
if (active) {
diff --git a/openide.nodes/src/org/openide/nodes/doc-files/api.html b/openide.nodes/src/org/openide/nodes/doc-files/api.html
index 996849f..08a0219 100644
--- a/openide.nodes/src/org/openide/nodes/doc-files/api.html
+++ b/openide.nodes/src/org/openide/nodes/doc-files/api.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
@@ -291,7 +293,7 @@ you are likely to want to override:
<ul>
-<li><a href="../AbstractNode.html#canCopy--"><code>AbstractNode.canCopy()</code></a>
+<li><a href="../AbstractNode.html#canCopy()"><code>AbstractNode.canCopy()</code></a>
and related methods (for cutting, renaming, and destroying) are all
true by default, so that the node may be moved around somewhat
@@ -311,11 +313,11 @@ reconstituting a node after serialization.
<p>You may set these explicitly with
-<a href="../Node.html#setName-java.lang.String-"><code>Node.setName(...)</code></a>
+<a href="../Node.html#setName(java.lang.String)"><code>Node.setName(...)</code></a>
and
-<a href="../Node.html#setDisplayName-java.lang.String-"><code>Node.setDisplayName(...)</code></a>,
+<a href="../Node.html#setDisplayName(java.lang.String)"><code>Node.setDisplayName(...)</code></a>,
or you may want to take advantage of <code>AbstractNode</code>'s
ability to have the display name be calculated implicitly from the
@@ -325,7 +327,7 @@ system name by means of a
There is also a
-<a href="../Node.html#setShortDescription-java.lang.String-">short description</a>
+<a href="../Node.html#setShortDescription(java.lang.String)">short description</a>
which is intended for things such as tool tips on the node.
@@ -334,7 +336,7 @@ specify a set of icons according to whether small or large icons are
to be used, whether the node's hierarchy (if applicable) is expanded
or collapsed, etc. The best approach is to use
-<a href="../AbstractNode.html#setIconBaseWithExtension-java.lang.String-"><code>AbstractNode.setIconBaseWithExtension(...)</code></a>
+<a href="../AbstractNode.html#setIconBaseWithExtension(java.lang.String)"><code>AbstractNode.setIconBaseWithExtension(...)</code></a>
to set the base name for the icon image resources.
@@ -371,12 +373,12 @@ same form component may also have a normal Bean property set
Nodes are only required to cluster properties into sets, by
implementing
-<a href="../Node.html#getPropertySets--"><code>Node.getPropertySets()</code></a>;
+<a href="../Node.html#getPropertySets()"><code>Node.getPropertySets()</code></a>;
but sheets are convenient to handle, and they may be used from an
<code>AbstractNode</code>, for example by overriding
-<a href="../AbstractNode.html#createSheet--"><code>AbstractNode.createSheet()</code></a>
+<a href="../AbstractNode.html#createSheet()"><code>AbstractNode.createSheet()</code></a>
to provide the basic list of property sets desired for the
node. (You should get the sheet set you need from it, checking
@@ -391,27 +393,27 @@ effect.)
<li>It has a name, frequently corresponding to a Bean property name,
obtainable from
-<a href="@JDK@/java/beans/FeatureDescriptor.html#getName--"><code>FeatureDescriptor.getName()</code></a>.
+<a href="@JDK@/java/beans/FeatureDescriptor.html#getName()"><code>FeatureDescriptor.getName()</code></a>.
It may also have a display name, similarly.
<li>It may be read-only, read-write, or (rarely) write-only, according
to
-<a href="../Node.Property.html#canRead--"><code>Node.Property.canRead()</code></a>
+<a href="../Node.Property.html#canRead()"><code>Node.Property.canRead()</code></a>
and
-<a href="../Node.Property.html#canWrite--"><code>Node.Property.canWrite()</code></a>.
+<a href="../Node.Property.html#canWrite()"><code>Node.Property.canWrite()</code></a>.
<li>It has a defined value type, to which its actual value must be
assignable, as determined by
-<a href="../Node.Property.html#getValueType--"><code>Node.Property.getValueType()</code></a>.
+<a href="../Node.Property.html#getValueType()"><code>Node.Property.getValueType()</code></a>.
There may also be a
-<a href="../Node.Property.html#supportsDefaultValue--">default value</a>.
+<a href="../Node.Property.html#supportsDefaultValue()">default value</a>.
<li>It may be indexed (i.e. be an array type with access to the
individual elements).
@@ -459,7 +461,7 @@ descriptors, and so may have internal and display names, etc.
may automatically create a sheet with some useful properties on it;
then this sheet should generally be appended to by overriding
-<a href="../AbstractNode.html#createSheet--"><code>AbstractNode.createSheet()</code></a>
+<a href="../AbstractNode.html#createSheet()"><code>AbstractNode.createSheet()</code></a>
and calling the superclass method first.
@@ -469,11 +471,11 @@ edit individual properties, especially without getting a holistic
preview. If this is the case, a customizing GUI component may be
returned from
-<a href="../Node.html#getCustomizer--"><code>Node.getCustomizer()</code></a>,
+<a href="../Node.html#getCustomizer()"><code>Node.getCustomizer()</code></a>,
and
-<a href="../Node.html#hasCustomizer--"><code>Node.hasCustomizer()</code></a>
+<a href="../Node.html#hasCustomizer()"><code>Node.hasCustomizer()</code></a>
turned on. The exact way in which the customizer will be displayed is
determined by NetBeans, but typically it will be popped up in a dialog
@@ -483,7 +485,7 @@ however appropriate.
<p>If a full customizer is not required, individual properties may
still have a custom editing style associated with them;
-<a href="../Node.Property.html#getPropertyEditor--"><code>Node.Property.getPropertyEditor()</code></a>
+<a href="../Node.Property.html#getPropertyEditor()"><code>Node.Property.getPropertyEditor()</code></a>
is used to look for a property editor, defaulting to the standard
JavaBeans property editor for the appropriate type.
@@ -528,7 +530,7 @@ and structure of children under it.
You need only create it with the default constructor, and add child
nodes to it (at any time, or remove them later for that matter) using
-<a href="../Children.html#add-org.openide.nodes.Node:A-"><code>Children.add(...)</code></a>.
+<a href="../Children.html#add(org.openide.nodes.Node[])"><code>Children.add(...)</code></a>.
<p>If it is desirable that the children be sorted when displayed, you can use e.g.
@@ -580,7 +582,7 @@ cookie on your node, which exists to handle this case. This cookie provides ways
for the user to move particular children around, or to undertake a
complete rearrangement using a
-<a href="../Index.Support.html#showIndexedCustomizer-org.openide.nodes.Index-">dialog box</a>.
+<a href="../Index.Support.html#showIndexedCustomizer(org.openide.nodes.Index)">dialog box</a>.
There is a generic
@@ -620,7 +622,7 @@ API describes these defaults.)
implement certain behaviors, is quite straightforward. The basic
interface for retrieving a cookie is
-<a href="../Node.html#getCookie-java.lang.Class-"><code>Node.getCookie(...)</code></a>.
+<a href="../Node.html#getCookie(java.lang.Class)"><code>Node.getCookie(...)</code></a>.
However, this is abstract in <code>Node</code>, and also
<code>Node</code> itself does not set any policy for settings up the
@@ -629,7 +631,7 @@ cookies for a node or changing them.
<p>Rather, if you are subclassing <code>AbstractNode</code>, you may
use
-<a href="../AbstractNode.html#setCookieSet-org.openide.nodes.CookieSet-"><code>AbstractNode.setCookieSet(...)</code></a>
+<a href="../AbstractNode.html#setCookieSet(org.openide.nodes.CookieSet)"><code>AbstractNode.setCookieSet(...)</code></a>
to specify a set of cookies to be returned by the node (and you should
merge your cookies with those provided by the superclass, as a
@@ -643,16 +645,16 @@ for implementing <code>getCookie(...)</code>.
<p>To attach actions to a node, which are listed by
-<a href="../Node.html#getActions--"><code>Node.getActions()</code></a>
+<a href="../Node.html#getActions()"><code>Node.getActions()</code></a>
(and sometimes a primary and obvious action in
-<a href="../Node.html#getDefaultAction--"><code>Node.getDefaultAction()</code></a>),
+<a href="../Node.html#getDefaultAction()"><code>Node.getDefaultAction()</code></a>),
you should merge the superclass' actions into your own (if desired),
and override e.g.
-<a href="../AbstractNode.html#createActions--"><code>AbstractNode.createActions()</code></a>,
+<a href="../AbstractNode.html#createActions()"><code>AbstractNode.createActions()</code></a>,
which is called to set up the actions list when
<code>getActions()</code> is first called.
@@ -661,17 +663,17 @@ which is called to set up the actions list when
associate commands with the node, e.g. by providing them in a pop-up
menu.
-<a href="../Node.html#getDefaultAction--"><code>Node.getDefaultAction()</code></a>
+<a href="../Node.html#getDefaultAction()"><code>Node.getDefaultAction()</code></a>
and
-<a href="../Node.html#getContextActions--"><code>Node.getContextActions()</code></a>
+<a href="../Node.html#getContextActions()"><code>Node.getContextActions()</code></a>
provide more refined variants of the actions list which may be
appropriate for different presentations. Nodes with unusual needs for
action presentation can override
-<a href="../Node.html#getContextMenu--"><code>Node.getContextMenu()</code></a>
+<a href="../Node.html#getContextMenu()"><code>Node.getContextMenu()</code></a>
to define a particular UI for this presentation.
@@ -737,11 +739,11 @@ special serializable handle which represents the node by its position
in the hierarchy, and permits finding the original node again after
deserialization (if it still exists). To create a handle, just call
-<a href="../Node.html#getHandle--"><code>Node.getHandle()</code></a>,
+<a href="../Node.html#getHandle()"><code>Node.getHandle()</code></a>,
and to restore the node call
-<a href="../Node.Handle.html#getNode--"><code>Node.Handle.getNode()</code></a>.
+<a href="../Node.Handle.html#getNode()"><code>Node.Handle.getNode()</code></a>.
<p>Creation of a usable handle is implemented in
<code>AbstractNode</code>, and you should not need to override
@@ -755,7 +757,7 @@ reconstructing your root from scratch, and return it from
<p>The methods in <code>NodeOp</code> such as
-<a href="../NodeOp.html#findPath-org.openide.nodes.Node-java.lang.String:A-"><code>NodeOp.findPath(...)</code></a>
+<a href="../NodeOp.html#findPath(org.openide.nodes.Node,%20java.lang.String[])"><code>NodeOp.findPath(...)</code></a>
may also be used for general-purpose navigation along the hierarchy,
should this be necessary.
@@ -773,7 +775,7 @@ on.
<p>Since most of this behavior is automatic and driven by the
JavaBeans API, you need do little to use it: just create a node using
-<a href="../BeanNode.html#BeanNode-java.lang.Object-"><code>new BeanNode(...)</code></a>.
+<a href="../BeanNode.html#BeanNode(java.lang.Object)"><code>new BeanNode(...)</code></a>.
<p class="nonnormative">Do not confuse such a bean node, which may be any sort of node that
just happens to use the JavaBeans API to implement its behavior, with
@@ -802,13 +804,13 @@ node; this may be used when the visual organization of a hierarchy
requires one object to appear in more than one place. In such a case,
you may use
-<a href="../FilterNode.html#FilterNode-org.openide.nodes.Node-"><code>new FilterNode(...)</code></a>
+<a href="../FilterNode.html#FilterNode(org.openide.nodes.Node)"><code>new FilterNode(...)</code></a>
to create such a proxy.
<p>Or, you may use
-<a href="../AbstractNode.html#cloneNode--"><code>AbstractNode.cloneNode()</code></a>
+<a href="../AbstractNode.html#cloneNode()"><code>AbstractNode.cloneNode()</code></a>
to create the filter if the node does not intrinsically support
@@ -833,7 +835,7 @@ Event Model, as is routine in the IDE:
<li>Changes to the basic structure or presence of nodes may be
listened to. Attach a listener with
-<a href="../Node.html#addNodeListener-org.openide.nodes.NodeListener-"><code>Node.addNodeListener(...)</code></a>.
+<a href="../Node.html#addNodeListener(org.openide.nodes.NodeListener)"><code>Node.addNodeListener(...)</code></a>.
This will report the changes mentioned directly in
<code>NodeListener</code>, as well as several varieties of standard
@@ -845,19 +847,19 @@ values), and icons.
<li>Changes to the values of node properties may be listened to;
attach to
-<a href="../Node.html#addPropertyChangeListener-java.beans.PropertyChangeListener-"><code>Node.addPropertyChangeListener(...)</code></a>.
+<a href="../Node.html#addPropertyChangeListener(java.beans.PropertyChangeListener)"><code>Node.addPropertyChangeListener(...)</code></a>.
This will report only changes relating to the exposed Bean-like
properties of the node, <em>not</em> intrinsic properties like the
parent.
-<li><a href="../CookieSet.html#addChangeListener-javax.swing.event.ChangeListener-">Cookie sets</a>,
+<li><a href="../CookieSet.html#addChangeListener(javax.swing.event.ChangeListener)">Cookie sets</a>,
-<a href="../Sheet.Set.html#addPropertyChangeListener-java.beans.PropertyChangeListener-">property sets</a>,
+<a href="../Sheet.Set.html#addPropertyChangeListener(java.beans.PropertyChangeListener)">property sets</a>,
and
-<a href="../Sheet.html#addPropertyChangeListener-java.beans.PropertyChangeListener-">property sheets</a>
+<a href="../Sheet.html#addPropertyChangeListener(java.beans.PropertyChangeListener)">property sheets</a>
may all have listeners attached to them individually, although generally it
is easier just to listen to the node holding them.
@@ -874,11 +876,11 @@ operations.
<p>There are some simple node-level operations which do not need to
use data transfer.
-<a href="../AbstractNode.html#setName-java.lang.String-"><code>AbstractNode.setName(...)</code></a>
+<a href="../AbstractNode.html#setName(java.lang.String)"><code>AbstractNode.setName(...)</code></a>
and
-<a href="../Node.html#destroy--"><code>Node.destroy()</code></a>
+<a href="../Node.html#destroy()"><code>Node.destroy()</code></a>
may simply be overridden to handle customized renames and
deletes. (Or, you could attach a <code>NodeListener</code> to take
@@ -886,12 +888,12 @@ action after the fact, if that suffices.)
<p>Supporting creation of fresh children is possible by overriding
-<a href="../Node.html#getNewTypes--"><code>Node.getNewTypes()</code></a>
+<a href="../Node.html#getNewTypes()"><code>Node.getNewTypes()</code></a>
to provide a list of new types of data which can be created under your
node. Each of these should implement
-<a href="@org-openide-util-ui@/org/openide/util/datatransfer/NewType.html#create--"><code>NewType.create()</code></a>
+<a href="@org-openide-util-ui@/org/openide/util/datatransfer/NewType.html#create()"><code>NewType.create()</code></a>
to actually create a new child. Make sure that you include
@@ -899,7 +901,7 @@ to actually create a new child. Make sure that you include
in your
-<a href="../Node.html#getActions--">list of actions</a>.
+<a href="../Node.html#getActions()">list of actions</a>.
<h4>Data transfer</h4>
@@ -947,7 +949,7 @@ arbitrary Node A.
is enabled (from a context menu, the Edit menu, etc.), because node A
indicated it could be copied using
-<a href="../Node.html#canCopy--"><code>Node.canCopy()</code></a>
+<a href="../Node.html#canCopy()"><code>Node.canCopy()</code></a>
(turned on in <code>AbstractNode</code>).
@@ -961,17 +963,17 @@ provides the regular implementation of <code>CopyAction</code> for any
<li>The user invokes the Copy action.
-<a href="../AbstractNode.html#clipboardCopy--"><code>AbstractNode.clipboardCopy()</code></a>
+<a href="../AbstractNode.html#clipboardCopy()"><code>AbstractNode.clipboardCopy()</code></a>
is called. It creates a transferable supporting only one flavor, which is invisible
to the APIs. The creation of this transferable is done by a special utility method which
hides the data flavor and transferables contents:
-<a href="../NodeTransfer.html#transferable-org.openide.nodes.Node-int-"><code>NodeTransfer.transferable(...)</code></a>.
+<a href="../NodeTransfer.html#transferable(org.openide.nodes.Node,%20int)"><code>NodeTransfer.transferable(...)</code></a>.
The copy action
-<a href="@JDK@/java/awt/datatransfer/Clipboard.html#setContents-java.awt.datatransfer.Transferable-java.awt.datatransfer.ClipboardOwner-">sets</a>
+<a href="@JDK@/java/awt/datatransfer/Clipboard.html#setContents(java.awt.datatransfer.Transferable,%20java.awt.datatransfer.ClipboardOwner)">sets</a>
that transferable to the clipboard.
@@ -983,11 +985,11 @@ holding children. One effect of the change in selection is that the
action checks to see if it should be enabled. To do so, it checks node
B's
-<a href="../AbstractNode.html#getPasteTypes-java.awt.datatransfer.Transferable-"><code>AbstractNode.getPasteTypes(...)</code></a>,
+<a href="../AbstractNode.html#getPasteTypes(java.awt.datatransfer.Transferable)"><code>AbstractNode.getPasteTypes(...)</code></a>,
which in turns calls
-<a href="../AbstractNode.html#createPasteTypes-java.awt.datatransfer.Transferable-java.util.List-"><code>AbstractNode.createPasteTypes(...)</code></a>
+<a href="../AbstractNode.html#createPasteTypes(java.awt.datatransfer.Transferable,%20java.util.List)"><code>AbstractNode.createPasteTypes(...)</code></a>
to do the work.
@@ -996,7 +998,7 @@ to do the work.
accepted by the node (so-called "intelligent pastes"); this flavor is
hidden from the APIs but can be tested for in a transferable using
-<a href="../NodeTransfer.html#findPaste-java.awt.datatransfer.Transferable-"><code>NodeTransfer.findPaste(Transferable)</code></a>.
+<a href="../NodeTransfer.html#findPaste(java.awt.datatransfer.Transferable)"><code>NodeTransfer.findPaste(Transferable)</code></a>.
This is not the flavor that was provided by the copy, so no paste type
is created in the super method. However, Node B
@@ -1088,11 +1090,11 @@ displayed in the same order as they were added.
<li>Since <code>AbstractNode</code> by default just looks for the secret data
flavor represented by
-<a href="../NodeTransfer.html#createPaste-org.openide.nodes.NodeTransfer.Paste-"><code>NodeTransfer.createPaste(Paste)</code></a>
+<a href="../NodeTransfer.html#createPaste(org.openide.nodes.NodeTransfer.Paste)"><code>NodeTransfer.createPaste(Paste)</code></a>
and
-<a href="../NodeTransfer.html#findPaste-java.awt.datatransfer.Transferable-"><code>NodeTransfer.findPaste(Transferable)</code></a>,
+<a href="../NodeTransfer.html#findPaste(java.awt.datatransfer.Transferable)"><code>NodeTransfer.findPaste(Transferable)</code></a>,
any part of the
system that wants to be able to paste to nodes can do so without
@@ -1135,13 +1137,13 @@ or added as an alternate flavor to any transferable already there.
pasted to from nodes may do so by accepting transferables in the
clipboard satisfying
-<a href="../NodeTransfer.html#node-java.awt.datatransfer.Transferable-int-"><code>NodeTransfer.node(...)</code></a>,
+<a href="../NodeTransfer.html#node(java.awt.datatransfer.Transferable,%20int)"><code>NodeTransfer.node(...)</code></a>,
-<a href="../NodeTransfer.html#nodes-java.awt.datatransfer.Transferable-int-"><code>NodeTransfer.nodes(...)</code></a>,
+<a href="../NodeTransfer.html#nodes(java.awt.datatransfer.Transferable,%20int)"><code>NodeTransfer.nodes(...)</code></a>,
or
-<a href="../NodeTransfer.html#cookie-java.awt.datatransfer.Transferable-int-java.lang.Class-"><code>NodeTransfer.cookie(...)</code></a>;
+<a href="../NodeTransfer.html#cookie(java.awt.datatransfer.Transferable,%20int,%20java.lang.Class)"><code>NodeTransfer.cookie(...)</code></a>;
then no special
cooperation is required from the node (provided it is an
diff --git a/openide.nodes/src/org/openide/nodes/package.html b/openide.nodes/src/org/openide/nodes/package.html
index 7c4dbc9..cb57adc 100644
--- a/openide.nodes/src/org/openide/nodes/package.html
+++ b/openide.nodes/src/org/openide/nodes/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
diff --git a/openide.nodes/src/org/openide/util/actions/CookieAction.java b/openide.nodes/src/org/openide/util/actions/CookieAction.java
index 54ccab3..b5ad2ea 100644
--- a/openide.nodes/src/org/openide/util/actions/CookieAction.java
+++ b/openide.nodes/src/org/openide/util/actions/CookieAction.java
@@ -56,7 +56,7 @@ import java.util.*;
/** Not the preferred solution anymore, rather use
-* <a href="@org-openide-awt@/org/openide/awt/Actions.html#context-java.lang.Class-boolean-boolean-org.openide.util.ContextAwareAction-java.lang.String-java.lang.String-java.lang.String-boolean-">Actions.context</a>.
+* <a href="@org-openide-awt@/org/openide/awt/Actions.html#context(java.lang.Class,%20boolean,%20boolean,%20org.openide.util.ContextAwareAction,%20java.lang.String,%20java.lang.String,%20java.lang.String,%20boolean)">Actions.context</a>.
* To replace your action
* <a href="@org-openide-modules@/org/openide/modules/doc-files/api.html#how-layer">
* layer definition</a> use more delarative way:
diff --git a/openide.nodes/test/unit/src/org/netbeans/modules/openide/nodes/package-info.java b/openide.nodes/test/unit/src/org/netbeans/modules/openide/nodes/package-info.java
index 068f9ff..9f26fd5 100644
--- a/openide.nodes/test/unit/src/org/netbeans/modules/openide/nodes/package-info.java
+++ b/openide.nodes/test/unit/src/org/netbeans/modules/openide/nodes/package-info.java
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
@PropertyEditorSearchPath
@BeanInfoSearchPath
package org.netbeans.modules.openide.nodes;
diff --git a/openide.nodes/test/unit/src/org/openide/nodes/ChildFactoryTest.java b/openide.nodes/test/unit/src/org/openide/nodes/ChildFactoryTest.java
index f195404..0452691 100644
--- a/openide.nodes/test/unit/src/org/openide/nodes/ChildFactoryTest.java
+++ b/openide.nodes/test/unit/src/org/openide/nodes/ChildFactoryTest.java
@@ -278,47 +278,6 @@ public class ChildFactoryTest extends NbTestCase {
ch = Children.create(b, true);
assertEquals(4, ch.getNodesCount(true));
}
-
- public void testDestroyNodesSynch() throws Exception {
- DestroyableImpl r = new DestroyableImpl();
- Children ch = Children.create(r, false);
- new AbstractNode (ch);
- Node[] n = ch.getNodes(true);
- assertEquals (2, n.length);
- assertEquals ("foo", n[0].getDisplayName());
- assertEquals ("bar", n[1].getDisplayName());
- r.refresh(true);
- n = ch.getNodes(true);
- assertEquals (0, n.length);
- Set<Node> destroyed = r.getDestroyed();
- Set<String> expected = new HashSet<String>();
- Collections.addAll(expected, "foo", "bar");
- for (Node node : destroyed) {
- assertTrue(node.getDisplayName(), expected.contains(node.getDisplayName()));
- }
- }
-
- public void testDestroyNodesAsynch() throws Exception {
- DestroyableImpl r = new DestroyableImpl();
- Children ch = Children.create(r, true);
- new AbstractNode (ch);
- Node[] n = ch.getNodes(true);
- assertEquals (2, n.length);
- assertEquals ("foo", n[0].getDisplayName());
- assertEquals ("bar", n[1].getDisplayName());
- r.refresh(false);
- synchronized(r) {
- r.wait(1000);
- }
- n = ch.getNodes(true);
- assertEquals (0, n.length);
- Set<Node> destroyed = r.getDestroyed();
- Set<String> expected = new HashSet<String>();
- Collections.addAll(expected, r.createWaitNode().getDisplayName(), "foo", "bar");
- for (Node node : destroyed) {
- assertTrue(node.getDisplayName(), expected.contains(node.getDisplayName()));
- }
- }
public void testIncrementalDisplay() throws Exception { // #206556
final Semaphore s1 = new Semaphore(0);
@@ -715,46 +674,4 @@ public class ChildFactoryTest extends NbTestCase {
assertTrue (removed);
}
}
-
- private static final class DestroyableImpl extends DestroyableNodesFactory<String> {
-
- private boolean empty;
-
- private final Set<Node> destroyed = Collections.synchronizedSet(new HashSet<Node>());
-
- @Override
- protected boolean createKeys(List<String> toPopulate) {
- if (empty) {
- return true;
- }
-
- toPopulate.add("foo");
- toPopulate.add("bar");
- synchronized (this) {
- notifyAll();
- }
- empty = true;
- return true;
- }
-
- @Override
- protected Node createNodeForKey(String key) {
- AbstractNode nd = new AbstractNode(Children.LEAF);
- nd.setDisplayName(key);
- return nd;
- }
-
- @Override
- protected void destroyNodes(Node[] arr) {
- synchronized (destroyed) {
- Collections.addAll(destroyed, arr);
- }
- }
-
- public Set<Node> getDestroyed() {
- synchronized (destroyed) {
- return new HashSet<Node>(destroyed);
- }
- }
- }
}
diff --git a/openide.options/manifest.mf b/openide.options/manifest.mf
index 80880a0..f839406 100644
--- a/openide.options/manifest.mf
+++ b/openide.options/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.options
-OpenIDE-Module-Specification-Version: 6.37.1
+OpenIDE-Module-Specification-Version: 6.36.1
OpenIDE-Module-Localizing-Bundle: org/openide/options/Bundle.properties
OpenIDE-Module-Deprecated: true
AutoUpdate-Essential-Module: true
diff --git a/openide.options/src/org/openide/options/doc-files/api.html b/openide.options/src/org/openide/options/doc-files/api.html
index b45f85c..9e053a0 100644
--- a/openide.options/src/org/openide/options/doc-files/api.html
+++ b/openide.options/src/org/openide/options/doc-files/api.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
@@ -116,7 +118,7 @@ providing them, and ought to end in <code>Settings</code>: e.g.,
<code>MyModuleSettings</code>. This does not affect display, however;
every option must implement
-<a href="../SystemOption.html#displayName--"><code>SystemOption.displayName()</code></a>
+<a href="../SystemOption.html#displayName()"><code>SystemOption.displayName()</code></a>
to provide a reasonable name to present to users in the Control Panel.
@@ -152,13 +154,13 @@ it is more convenient to use the automatically-managed state provided by
<pre>
public Color getForeground () {
// Retrieves from class-wide state:
- return (Color) <a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#getProperty-java.lang.Object-">getProperty</a> (PROPERTY_FOREGROUND);
+ return (Color) <a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#getProperty(java.lang.Object)">getProperty</a> (PROPERTY_FOREGROUND);
}
public void setForeground (Color fg) {
// make sure it is sane...
if (fg == null) throw new NullPointerException ();
// Stores in class-wide state and fires property changes if needed:
- <a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#putProperty-java.lang.String-java.lang.Object-boolean-">putProperty</a> (PROPERTY_FOREGROUND, fg, true);
+ <a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#putProperty(java.lang.String,%20java.lang.Object,%20boolean)">putProperty</a> (PROPERTY_FOREGROUND, fg, true);
}
</pre>
@@ -239,7 +241,7 @@ a regular one, but each child should also be a valid system option in
its own right, and they should be added to the parent (e.g. in the
parent's constructor) using
-<a href="../ContextSystemOption.html#addOption-org.openide.options.SystemOption-"><code>ContextSystemOption.addOption(...)</code></a>.
+<a href="../ContextSystemOption.html#addOption(org.openide.options.SystemOption)"><code>ContextSystemOption.addOption(...)</code></a>.
<p>Such a cluster should be used for any system options for which one
property list would be unwieldy; or if it makes sense to have multiple
@@ -258,7 +260,7 @@ other part of the module.
<p>When such a property is set, it should fire its change using
-<a href="../VetoSystemOption.html#fireVetoableChange-java.lang.String-java.lang.Object-java.lang.Object-"><code>VetoSystemOption.fireVetoableChange(...)</code></a>
+<a href="../VetoSystemOption.html#fireVetoableChange(java.lang.String, java.lang.Object, java.lang.Object)"><code>VetoSystemOption.fireVetoableChange(...)</code></a>
and be prepared to revoke the change if a veto occurs.
@@ -283,7 +285,7 @@ made by the user in the Control Panel.
<p>If it necessary to access some other option, you may use:
<pre>
-OtherOption oo = (OtherOption) <a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#findObject-java.lang.Class-boolean-">SystemOption.findObject</a>(OtherOption.class, true);
+OtherOption oo = (OtherOption) <a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#findObject(java.lang.Class,%20boolean)">SystemOption.findObject</a>(OtherOption.class, true);
</pre>
You may also use this method to obtain the default instance for local use.
diff --git a/openide.options/src/org/openide/options/package.html b/openide.options/src/org/openide/options/package.html
index a362d9d..c531b58 100644
--- a/openide.options/src/org/openide/options/package.html
+++ b/openide.options/src/org/openide/options/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/openide.text/apichanges.xml b/openide.text/apichanges.xml
index a4ad9d7..4e51aa1 100644
--- a/openide.text/apichanges.xml
+++ b/openide.text/apichanges.xml
@@ -171,7 +171,7 @@ made subject to such option by the copyright holder.
<p>
Subclasses of <code>CloneableEditor</code> can manually request own
initialization by calling its
- <a href="@TOP@/org/openide/text/CloneableEditor.html#initializeBySupport--">initializeBySupport</a>
+ <a href="@TOP@/org/openide/text/CloneableEditor.html#initializeBySupport()">initializeBySupport</a>
method.
</p>
</description>
diff --git a/openide.text/arch.xml b/openide.text/arch.xml
index abb6ddc..35e6736 100644
--- a/openide.text/arch.xml
+++ b/openide.text/arch.xml
@@ -470,7 +470,7 @@ in methods
</question>
-->
<answer id="exec-reflection">
-Yes, it calls protected method <a href="@org-openide-loaders@/org/openide/loaders/MultiDataObject.html#getCookieSet--">MultiDataObject.getCookieSet()</a>.
+Yes, it calls protected method <a href="@org-openide-loaders@/org/openide/loaders/MultiDataObject.html#getCookieSet()">MultiDataObject.getCookieSet()</a>.
The class which calls this is deprecated, but it is still in use by clients.
<p/>
Another reflection is used in QuietEditorPane, where DelegatingTransferHandler delegates
@@ -791,7 +791,7 @@ No.
The Editor module operate with plain Swing <a href="http://java.sun.com/j2se/1.4/docs/api/javax/swing/text/Document.html">Document</a> in
its APIs and checks whether the document does not implement some of the Netbeans extensions defined in
<a href="@org-openide-text@/org/openide/text/NbDocument.html">NbDocument</a>.
-It also tries to retype <a href="@org-openide-windows@/org/openide/windows/CloneableTopComponent.Ref.html#getComponents--">CloneableTopComponent.Ref.getComponents()</a>
+It also tries to retype <a href="@org-openide-windows@/org/openide/windows/CloneableTopComponent.Ref.html#getComponents()">CloneableTopComponent.Ref.getComponents()</a>
to its <a href="@org-openide-text@/org/openide/text/CloneableEditor.html">CloneableEditor</a>. If some document does not implement
<a href="@JDK@/javax/swing/text/StyledDocument.html">StyledDocument</a>,
it is wrapped into <a href="@org-openide-text@/org/openide/text/FilterDocument.html">FilterDocument</a> which implements limited StyledDocument functionality.
diff --git a/openide.text/manifest.mf b/openide.text/manifest.mf
index f4a397e..a004bb0 100644
--- a/openide.text/manifest.mf
+++ b/openide.text/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
OpenIDE-Module: org.openide.text
OpenIDE-Module-Localizing-Bundle: org/openide/text/Bundle.properties
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 6.67.1
+OpenIDE-Module-Specification-Version: 6.66.1
diff --git a/openide.text/nbproject/org-openide-text.sig b/openide.text/nbproject/org-openide-text.sig
index cfe5e2b..8daf242 100644
--- a/openide.text/nbproject/org-openide-text.sig
+++ b/openide.text/nbproject/org-openide-text.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 6.66.3
+#Version 6.62
CLSS public abstract java.awt.Component
cons protected init()
@@ -625,8 +625,6 @@ meth public void firePropertyChange(java.lang.String,boolean,boolean)
meth public void firePropertyChange(java.lang.String,char,char)
meth public void firePropertyChange(java.lang.String,int,int)
meth public void grabFocus()
-meth public void hide()
- anno 0 java.lang.Deprecated()
meth public void paint(java.awt.Graphics)
meth public void paintImmediately(int,int,int,int)
meth public void paintImmediately(java.awt.Rectangle)
@@ -698,10 +696,6 @@ meth public abstract void removeDocumentListener(javax.swing.event.DocumentListe
meth public abstract void removeUndoableEditListener(javax.swing.event.UndoableEditListener)
meth public abstract void render(java.lang.Runnable)
-CLSS public abstract interface javax.swing.text.Position
-innr public final static Bias
-meth public abstract int getOffset()
-
CLSS public abstract interface javax.swing.text.StyledDocument
intf javax.swing.text.Document
meth public abstract java.awt.Color getBackground(javax.swing.text.AttributeSet)
@@ -1143,7 +1137,7 @@ meth public void removeChangeListener(javax.swing.event.ChangeListener)
meth public void saveDocument() throws java.io.IOException
meth public void setMIMEType(java.lang.String)
supr org.openide.windows.CloneableOpenSupport
-hfds ERR,LOCAL_CLOSE_DOCUMENT,LOCK_PRINTING,PROP_PANE,alreadyModified,annotationsLoaded,checkModificationLock,docFilter,inUserQuestionExceptionHandler,isSaving,kit,lastReusable,lastSaveTime,lastSelected,lineSet,lineSetLineVector,listener,listeners,listeningOnEnv,lookup,mimeType,openClose,positionManager,preventModification,printing,propertyChangeSupport,reloadDialogOpened,undoRedo,warnedClasses
+hfds ERR,LOCAL_CLOSE_DOCUMENT,LOCK_PRINTING,PROP_PANE,alreadyModified,annotationsLoaded,checkModificationLock,docFilter,inUserQuestionExceptionHandler,kit,lastReusable,lastSaveTime,lastSelected,lineSet,lineSetWHM,listener,listeners,listeningOnEnv,lookup,mimeType,openClose,positionManager,preventModification,printing,propertyChangeSupport,reloadDialogOpened,undoRedo,warnedClasses
hcls DocFilter,Listener,PlainEditorKit
CLSS public abstract interface static org.openide.text.CloneableEditorSupport$Env
@@ -1193,7 +1187,7 @@ meth public void unmarkCurrentLine()
meth public void unmarkError()
anno 0 java.lang.Deprecated()
supr org.openide.text.Line
-hfds assigned,breakpoint,current,dlEqualsCounter,docL,error,lineParts,listener,serialVersionUID
+hfds assigned,breakpoint,current,docL,error,lineParts,listener,serialVersionUID
hcls FindAnnotationPosition,LR,Part
CLSS public abstract static org.openide.text.DocumentLine$Set
@@ -1206,7 +1200,6 @@ meth public org.openide.text.Line getCurrent(int)
meth public org.openide.text.Line getOriginal(int)
supr org.openide.text.Line$Set
hfds list,listener
-hcls OffsetLineCreator
CLSS public org.openide.text.FilterDocument
cons public init(javax.swing.text.Document)
@@ -1348,7 +1341,7 @@ meth public abstract org.openide.text.Line getOriginal(int)
meth public final java.util.Date getDate()
meth public int getOriginalLineNumber(org.openide.text.Line)
supr java.lang.Object
-hfds date,lineVector
+hfds date,whm
CLSS public final static !enum org.openide.text.Line$ShowOpenType
outer org.openide.text.Line
@@ -1462,7 +1455,6 @@ hfds begin,end,serialVersionUID
CLSS public final org.openide.text.PositionRef
intf java.io.Serializable
-intf javax.swing.text.Position
meth public int getColumn() throws java.io.IOException
meth public int getLine() throws java.io.IOException
meth public int getOffset()
@@ -1471,7 +1463,7 @@ meth public javax.swing.text.Position getPosition() throws java.io.IOException
meth public javax.swing.text.Position$Bias getPositionBias()
meth public org.openide.text.CloneableEditorSupport getCloneableEditorSupport()
supr java.lang.Object
-hfds LOG,insertAfter,kind,manager,serialVersionUID
+hfds insertAfter,kind,manager,serialVersionUID
hcls Manager
CLSS public final org.openide.text.PrintPreferences
@@ -1567,7 +1559,7 @@ meth public abstract <%0 extends java.lang.Object> org.openide.util.Lookup$Resul
meth public abstract <%0 extends java.lang.Object> {%%0} lookup(java.lang.Class<{%%0}>)
meth public static org.openide.util.Lookup getDefault()
supr java.lang.Object
-hfds LOG,defaultLookup,defaultLookupProvider
+hfds LOG,defaultLookup
hcls DefLookup,Empty
CLSS public abstract interface static org.openide.util.Lookup$Provider
diff --git a/openide.text/src/org/openide/text/CloneableEditorInitializer.java b/openide.text/src/org/openide/text/CloneableEditorInitializer.java
index f841c52..edb322d 100644
--- a/openide.text/src/org/openide/text/CloneableEditorInitializer.java
+++ b/openide.text/src/org/openide/text/CloneableEditorInitializer.java
@@ -413,7 +413,6 @@ final class CloneableEditorInitializer implements Runnable {
}
try {
- ces.prepareDocument(); // Ensure prepareDocument() is called when existing component is deserialized after IDE restart
setDocument(ces.openDocument());
ces.getPositionManager().documentOpened(new WeakReference<StyledDocument>(doc));
assert (doc != null) : "ces.openDocument() returned null"; // NOI18N
diff --git a/openide.text/src/org/openide/text/CloneableEditorSupport.java b/openide.text/src/org/openide/text/CloneableEditorSupport.java
index 7ed0a04..92994b7 100644
--- a/openide.text/src/org/openide/text/CloneableEditorSupport.java
+++ b/openide.text/src/org/openide/text/CloneableEditorSupport.java
@@ -228,12 +228,10 @@ public abstract class CloneableEditorSupport extends CloneableOpenSupport {
private boolean inUserQuestionExceptionHandler;
- /**
- * Reference to LineVector that is used by all Line.Sets created
+ /** Reference to WeakHashMap that is used by all Line.Sets created
* for this CloneableEditorSupport.
*/
- private LineVector lineSetLineVector;
-
+ private Map<Line,Reference<Line>> lineSetWHM;
private boolean annotationsLoaded;
private DocFilter docFilter;
@@ -970,20 +968,20 @@ public abstract class CloneableEditorSupport extends CloneableOpenSupport {
return updateLineSet(false);
}
- /**
- * Lazily creates or finds line vector for internal use.
+ /** Lazyly creates or finds already created map for internal use.
*/
- final LineVector findLineVector() {
+ final Map<Line,Reference<Line>> findWeakHashMap() {
// any lock not hold for too much time will do as we do not
// call outside in the sync block
synchronized (LOCK_PRINTING) {
- if (lineSetLineVector != null) {
- return lineSetLineVector;
+ if (lineSetWHM != null) {
+ Line.LOG.log(Level.FINE, "CloneableEditorSupport.findWeakHashMap() whm.size()={0}", lineSetWHM.size());
+ return lineSetWHM;
}
- lineSetLineVector = new LineVector();
+ lineSetWHM = new WeakHashMap<Line,Reference<Line>>();
- return lineSetLineVector;
+ return lineSetWHM;
}
}
diff --git a/openide.text/src/org/openide/text/DocumentLine.java b/openide.text/src/org/openide/text/DocumentLine.java
index ac85997..41ec064 100644
--- a/openide.text/src/org/openide/text/DocumentLine.java
+++ b/openide.text/src/org/openide/text/DocumentLine.java
@@ -53,7 +53,6 @@ import java.util.*;
import javax.swing.event.*;
import javax.swing.text.*;
-import org.openide.util.Exceptions;
/** Implementation of a line in a {@link StyledDocument}.
@@ -246,7 +245,7 @@ public abstract class DocumentLine extends Line {
return pos.getCloneableEditorSupport().hashCode();
}
- static int dlEqualsCounter; // Counter for Line.Set.whm iterations
+ private static int dlEqualsCounter; // Counter for Line.Set.whm iterations
@Override
public boolean equals(Object o) {
@@ -325,21 +324,9 @@ public abstract class DocumentLine extends Line {
/** Register line.
*/
Object readResolve() throws ObjectStreamException {
- try {
- // return Set.registerLine (this);
- //Set.registerPendingLine(this);
- return this.pos.getCloneableEditorSupport().getLineSet().findOrCreateLine(pos.getLine(),
- new LineVector.LineCreator() {
- @Override
- public Line createLine(int line) {
- return DocumentLine.this;
- }
- }
- );
- } catch (IOException ex) {
- Exceptions.printStackTrace(ex);
- return this;
- }
+ // return Set.registerLine (this);
+ //Set.registerPendingLine(this);
+ return this.pos.getCloneableEditorSupport().getLineSet().registerLine(this);
}
/** Add annotation to this Annotatable class
@@ -1000,8 +987,20 @@ public abstract class DocumentLine extends Line {
/** Gets the lines with line number whitin the range inclusive.
* @return <code>List</code> of lines from range inclusive */
private List<Line> getLinesFromRange(int startLineNumber, int endLineNumber) {
- LineVector lineVector = findLineVector();
- return lineVector.getLinesInRange(startLineNumber, endLineNumber);
+ List<Line> linesInRange = new ArrayList<Line>(10);
+
+ Map<Line,Reference<Line>> whm = findWeakHashMap();
+ synchronized (whm) {
+ for (Line line : whm.keySet()) {
+ int lineNumber = line.getLineNumber();
+
+ if ((startLineNumber <= lineNumber) && (lineNumber <= endLineNumber)) {
+ linesInRange.add(line);
+ }
+ }
+ }
+
+ return linesInRange;
}
/* Returns an unmodifiable set of Lines sorted by their
@@ -1027,7 +1026,7 @@ public abstract class DocumentLine extends Line {
*/
public Line getOriginal(int line) throws IndexOutOfBoundsException {
int newLine = listener.getLine(line);
- return safelyFindOrCreateLine(newLine, new OffsetLineCreator());
+ return safelyRegisterLine(createLine(offset(newLine)));
}
@Override
@@ -1071,7 +1070,8 @@ public abstract class DocumentLine extends Line {
* @exception IndexOutOfBoundsException if <code>line</code> is invalid.
*/
public Line getCurrent(int line) throws IndexOutOfBoundsException {
- return safelyFindOrCreateLine(line, new OffsetLineCreator());
+
+ return safelyRegisterLine(createLine(offset(line)));
}
private int offset(int line) {
@@ -1094,12 +1094,13 @@ public abstract class DocumentLine extends Line {
* @param line line we want to register
* @return the line or some line that already was registered
*/
- private Line safelyFindOrCreateLine(final int lineIndex, final LineVector.LineCreator lineCreator) {
+ private Line safelyRegisterLine(final Line line) {
+ assert line != null;
class DocumentRenderer implements Runnable {
public Line result;
public void run() {
- result = DocumentLine.Set.super.findOrCreateLine(lineIndex, lineCreator);
+ result = DocumentLine.Set.super.registerLine(line);
}
}
StyledDocument doc = listener.support.getDocument();
@@ -1112,19 +1113,5 @@ public abstract class DocumentLine extends Line {
return renderer.result;
}
-
- private final class OffsetLineCreator implements LineVector.LineCreator {
-
- @Override
- public Line createLine(int lineIndex) {
- Line line = Set.this.createLine(offset(lineIndex));
- if (line instanceof DocumentLine) {
- ((DocumentLine) line).init();
- }
- return line;
- }
-
- }
-
}
}
diff --git a/openide.text/src/org/openide/text/DocumentOpenClose.java b/openide.text/src/org/openide/text/DocumentOpenClose.java
index 0f43add..c1f679f 100644
--- a/openide.text/src/org/openide/text/DocumentOpenClose.java
+++ b/openide.text/src/org/openide/text/DocumentOpenClose.java
@@ -501,16 +501,14 @@ final class DocumentOpenClose {
}
}
- void updateLines(final StyledDocument doc, final boolean close) {
- LineVector lineVector = ces.findLineVector();
- lineVector.updateLines(new LineVector.LineUpdater() {
- @Override
- public void updateLine(Line line) {
- if (line instanceof DocumentLine) {
- ((DocumentLine)line).documentOpenedClosed(doc, close);
- }
+ void updateLines(StyledDocument doc, boolean close) {
+ Map<Line, Reference<Line>> lineMap = ces.findWeakHashMap();
+ for (Map.Entry<Line, Reference<Line>> entry : lineMap.entrySet()) {
+ Line line = entry.getKey();
+ if (line instanceof DocumentLine) {
+ ((DocumentLine)line).documentOpenedClosed(doc, close);
}
- });
+ }
}
IllegalStateException invalidStatus() {
diff --git a/openide.text/src/org/openide/text/EditorSupportLineSet.java b/openide.text/src/org/openide/text/EditorSupportLineSet.java
index 1df4c67..c5a71fb 100644
--- a/openide.text/src/org/openide/text/EditorSupportLineSet.java
+++ b/openide.text/src/org/openide/text/EditorSupportLineSet.java
@@ -75,8 +75,8 @@ final class EditorSupportLineSet extends DocumentLine.Set {
/** Shares the whm with other line sets based on the same support.
*/
@Override
- LineVector findLineVector() {
- return support.findLineVector();
+ Map<Line,Reference<Line>> findWeakHashMap() {
+ return support.findWeakHashMap();
}
/** Creates a Line for given offset.
@@ -185,7 +185,6 @@ final class EditorSupportLineSet extends DocumentLine.Set {
* @author Jaroslav Tulach
*/
static class Closed extends Line.Set implements ChangeListener {
-
/** support we are attached to */
private CloneableEditorSupport support;
@@ -206,8 +205,8 @@ final class EditorSupportLineSet extends DocumentLine.Set {
/** Shares the whm with other line sets based on the same support.
*/
@Override
- LineVector findLineVector() {
- return support.findLineVector();
+ Map<Line,Reference<Line>> findWeakHashMap() {
+ return support.findWeakHashMap();
}
/** Returns a set of line objects sorted by their
@@ -248,7 +247,12 @@ final class EditorSupportLineSet extends DocumentLine.Set {
* @exception IndexOutOfBoundsException if <code>line</code> is an invalid index for the original set of lines
*/
public Line getCurrent(int line) throws IndexOutOfBoundsException {
- return findLineVector().findOrCreateLine(line, new SupportLineCreator());
+ PositionRef ref = new PositionRef(support.getPositionManager(), line, 0, Position.Bias.Forward);
+
+ // obj can be null, sorry...
+ org.openide.util.Lookup obj = support.getLookup();
+
+ return this.registerLine(new SupportLine(obj, ref, support));
}
/** Arrives when the document is opened.
@@ -266,21 +270,6 @@ final class EditorSupportLineSet extends DocumentLine.Set {
}
}
}
-
- private final class SupportLineCreator implements LineVector.LineCreator {
-
- @Override
- public Line createLine(int lineIndex) {
- PositionRef ref = new PositionRef(support.getPositionManager(), lineIndex, 0, Position.Bias.Forward);
- // obj can be null, sorry...
- org.openide.util.Lookup obj = support.getLookup();
- SupportLine line = new SupportLine(obj, ref, support);
- line.init();
- return line;
- }
-
- }
-
}
// <editor-fold defaultstate="collapsed" desc="COSHack">
diff --git a/openide.text/src/org/openide/text/Line.java b/openide.text/src/org/openide/text/Line.java
index 9624148..79e0ade 100644
--- a/openide.text/src/org/openide/text/Line.java
+++ b/openide.text/src/org/openide/text/Line.java
@@ -474,10 +474,14 @@ public abstract class Line extends Annotatable implements Serializable {
/** date when the object has been created */
private Date date;
- /**
- * Binary-searchable vector of lines.
- */
- private LineVector lineVector;
+ /** <code>Map</code> which contains all lines as keys and
+ * values weakReferences on itself. There woudl be better use
+ * set but there is missing get method, returning equal object.
+ * belonging to this <code>Line.Set</code>.
+ * @see DocumentLine#hashCode
+ * @see DocumentLine#equals
+ * @see #registerLine */
+ private Map<Line,Reference<Line>> whm;
/** Create a new snapshot. Remembers the date when it was created. */
public Set() {
@@ -528,18 +532,18 @@ public abstract class Line extends Annotatable implements Serializable {
return computeOriginal(this, line);
}
- /**
- * Lazily creates or finds binary-searchable vector of registered lines.
+ /** Lazyly creates or finds already created map for internal use.
*/
- LineVector findLineVector() {
+ Map<Line,Reference<Line>> findWeakHashMap() {
synchronized (date) {
- if (lineVector != null) {
- return lineVector;
+ if (whm != null) {
+ LOG.log(Level.FINE, "Line.Set.findWeakHashMap() whm.size()={0}", whm.size());
+ return whm;
}
- lineVector = new LineVector();
+ whm = new WeakHashMap<Line,Reference<Line>>();
- return lineVector;
+ return whm;
}
}
@@ -548,14 +552,29 @@ public abstract class Line extends Annotatable implements Serializable {
* @return registered <code>Line</code>. <em>Note:</em> the retruned
* <code>Line</code> could be different (identityHashCode not equal)
* from the one passed in */
- final Line findOrCreateLine(int lineIndex, LineVector.LineCreator lineCreator) {
+ final Line registerLine(Line line) {
// beware of null argument
- if (lineCreator == null) {
+ if (line == null) {
throw new NullPointerException();
}
- LineVector lineVector = findLineVector();
- return lineVector.findOrCreateLine(lineIndex, lineCreator);
+ Map<Line,Reference<Line>> lines = findWeakHashMap();
+
+ synchronized (lines) {
+ Reference<Line> r = lines.get(line);
+ Line in = r != null ? r.get() : null;
+
+ if (in == null) {
+ if (line instanceof DocumentLine) {
+ ((DocumentLine) line).init();
+ }
+
+ lines.put(line, new WeakReference<Line>(line));
+ in = line;
+ }
+
+ return in;
+ }
}
/** Finds whether a line equal to provided is already registered.
@@ -563,8 +582,13 @@ public abstract class Line extends Annotatable implements Serializable {
* @return the registered line equal to line or null
*/
final Line findLine(Line line) {
- LineVector lineVector = findLineVector();
- return lineVector.findOrCreateLine(line.getLineNumber(), null);
+ Map<Line,Reference<Line>> lines = findWeakHashMap();
+ synchronized (lines) {
+ Reference<Line> r = lines.get(line);
+ Line in = r != null ? r.get() : null;
+
+ return in;
+ }
}
/** A method that for a given Line.Set and a line computes the best
diff --git a/openide.text/src/org/openide/text/LineVector.java b/openide.text/src/org/openide/text/LineVector.java
deleted file mode 100644
index 21e03f6..0000000
--- a/openide.text/src/org/openide/text/LineVector.java
+++ /dev/null
@@ -1,492 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2015 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- *
- * Portions Copyrighted 2015 Sun Microsystems, Inc.
- */
-package org.openide.text;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Binary searchable list of document lines.
- * <br/>
- * Member lines are weakly held.
- * <br/>
- * Replacement of Line.Set.whm which contains ALL the registered lines in a SINGLE BUCKET
- * (thank to DocumentLine.hashcode()) and is an inappropriate storage type for this
- * kind of information.
- *
- * @author Miloslav Metelka
- */
-final class LineVector {
-
- // -J-Dorg.openide.text.LineVector.level=FINE
- private static final Logger LOG = Logger.getLogger(LineVector.class.getName());
-
- private Ref[] refArray;
-
- /**
- * Index of gap inside lineRefs array.
- */
- private int gapStart;
-
- /**
- * Size of the gap.
- */
- private int gapLength;
-
- /**
- * Number of line refs that were garbage collected. Once it reaches emptyRefsThreshold
- * a task is run that removes empty refs from lineRefs array.
- * If empty refs is more than 1/32 of total ref count then the empty refs are removed
- */
- private int disposedRefCount;
-
- /**
- * If true then something went wrong and the array of references is not sorted properly
- * and therefore binary search cannot be used and the array must be traversed sequentially.
- */
- private boolean refArrayUnsorted;
-
- private Thread lockThread;
-
- private int lockDepth;
-
- /**
- * Line updater that should update lines once the current request completes.
- */
- private List<LineUpdater> pendingLineUpdaters = new ArrayList(2);
-
- LineVector() {
- this.refArray = new Ref[4];
- this.gapLength = this.refArray.length;
- }
-
- Line findOrCreateLine(int findLineIndex, LineCreator lineCreator) {
- lockCheckUpdate();
- try {
- int last = refCount() - 1;
- int low = 0;
- int high = last;
- if (!refArrayUnsorted) {
- int lowLineIndex = -1;
- int highLineIndex = Integer.MAX_VALUE;
- while (low <= high) {
- int mid = (low + high) >>> 1; // mid in the binary search
- Ref ref = refArray[rawIndex(mid)];
- Line line = ref.get();
- if (line == null) {
- int index = mid - 1;
- while (index >= 0) {
- ref = refArray[rawIndex(index)];
- line = ref.get();
- if (line != null) {
- break;
- }
- index--;
- }
- }
- int lineIndex = (line != null) ? line.getLineNumber() : -1;
- if (lineIndex < lowLineIndex || lineIndex > highLineIndex) { // Array became unsorted
- if (LOG.isLoggable(Level.FINE)) {
- String msg = "!!!LineVector: ARRAY BECAME UNSORTED!!!\n " +
- toStringDetail() + " lineIndex=" + lineIndex + // NOI18N
- ", lowLineIndex=" + lowLineIndex + ", highLineIndex=" + highLineIndex + // NOI18N
- "\n low=" + low + ", high=" + high + ", mid=" + mid + "\n"; // NOI18N
- LOG.log(Level.INFO, msg, new Throwable());
- }
- refArrayUnsorted = true;
- break; // Iterate again this time sequential search will be used
- }
- if (lineIndex < findLineIndex) {
- low = mid + 1;
- lowLineIndex = lineIndex;
- } else if (lineIndex > findLineIndex) {
- high = mid - 1;
- highLineIndex = lineIndex;
- } else { // line numbers equal
- return line;
- }
- }
- }
- if (refArrayUnsorted) { // Unsorted array => use sequential search
- for (; low <= last; low++) {
- Ref ref = refArray[rawIndex(low)];
- Line line = ref.get();
- if (line != null && line.getLineNumber() == findLineIndex) {
- return line;
- }
- }
- low = gapStart; // Insert anywhere since the array is no longer sorted
- }
-
- // Create line at index "low"
- return (lineCreator != null)
- ? addLine(low, lineCreator.createLine(findLineIndex))
- : null;
- } finally {
- unlockCheckUpdate();
- }
- }
-
- void updateLines(LineUpdater lineUpdater) {
- synchronized (this) {
- pendingLineUpdaters.add(lineUpdater);
- if (lockThread == null) { // No locker -> do synchronously now
- lockCheckUpdate(); // Lock to ensure no recursive locking would happen
- try {
- } finally {
- unlockCheckUpdate(); // Perform updateLinesCheck()
- }
- } // else: the locker will perform update lines upon unlockCheckUpdate()
- }
- }
-
- private void updateLinesCheck() {
- List<LineUpdater> lineUpdaters;
- synchronized (this) {
- if (pendingLineUpdaters.size() > 0) {
- lineUpdaters = new ArrayList(pendingLineUpdaters);
- pendingLineUpdaters.clear();
- } else {
- lineUpdaters = null;
- }
- }
-
- if (lineUpdaters != null) {
- for (LineUpdater lineUpdater : lineUpdaters) {
- for (int rawIndex = 0; rawIndex < gapStart; rawIndex++) {
- Line line = refArray[rawIndex].get();
- lineUpdater.updateLine(line);
- }
- for (int rawIndex = gapStart + gapLength; rawIndex < refArray.length; rawIndex++) {
- Line line = refArray[rawIndex].get();
- lineUpdater.updateLine(line);
- }
- }
- }
- }
-
- List<Line> getLinesInRange(int startLineIndex, int endLineIndex) {
- lockCheckUpdate();
- try {
- List<Line> lines = new ArrayList<Line>();
- int last = refCount() - 1;
- int low = 0;
- int high = last;
- if (!refArrayUnsorted) {
- int lowLineIndex = -1;
- int highLineIndex = Integer.MAX_VALUE;
- while (low <= high) {
- int mid = (low + high) >>> 1; // mid in the binary search
- Ref ref = refArray[rawIndex(mid)];
- Line line = ref.get();
- if (line == null) {
- int index = mid - 1;
- while (index >= 0) {
- ref = refArray[rawIndex(index)];
- line = ref.get();
- if (line != null) {
- break;
- }
- index--;
- }
- }
- int lineIndex = (line != null) ? line.getLineNumber() : -1;
- if (lineIndex < lowLineIndex || lineIndex > highLineIndex) { // Array became unsorted
- refArrayUnsorted = true;
- if (LOG.isLoggable(Level.FINE)) {
- String msg = "!!!LineVector: ARRAY BECAME UNSORTED!!!\n " +
- toStringDetail() + " lineIndex=" + lineIndex + // NOI18N
- ", lowLineIndex=" + lowLineIndex + ", highLineIndex=" + highLineIndex + // NOI18N
- "\n low=" + low + ", high=" + high + ", mid=" + mid + "\n"; // NOI18N
- LOG.log(Level.INFO, msg, new Throwable());
- }
- break; // Iterate again this time sequential search will be used
- }
- if (lineIndex < startLineIndex) {
- low = mid + 1;
- lowLineIndex = lineIndex;
- } else if (lineIndex > startLineIndex) {
- high = mid - 1;
- highLineIndex = lineIndex;
- } else { // line numbers equal -> find first one
- while (--mid >= 0) {
- ref = refArray[rawIndex(mid)];
- line = ref.get();
- if (line != null && line.getLineNumber() < startLineIndex) {
- break;
- }
- }
- low = mid + 1;
- break;
- }
- }
- if (!refArrayUnsorted) {
- for (; low <= last; low++) {
- Line line = refArray[rawIndex(low)].get();
- if (line != null) {
- int lineIndex = line.getLineNumber();
- if (startLineIndex <= lineIndex && lineIndex <= endLineIndex) {
- lines.add(line);
- } else {
- break;
- }
- }
- }
- }
- }
- if (refArrayUnsorted) { // Unsorted array => use sequential search
- for (; low <= last; low++) {
- Line line = refArray[rawIndex(low)].get();
- if (line != null) {
- int lineIndex = line.getLineNumber();
- if (startLineIndex <= lineIndex && lineIndex <= endLineIndex) {
- lines.add(line);
- }
- }
- }
- }
- return lines;
- } finally {
- unlockCheckUpdate();
- }
- }
-
- private Line addLine(int index, Line line) {
- moveGap(index);
- if (gapLength == 0) {
- reallocate((refArray.length + 8) >> 2);
- }
- refArray[gapStart++] = new Ref(line);
- gapLength--;
- return line;
- }
-
- private int refCount() {
- return refArray.length - gapLength;
- }
-
- private int rawIndex(int index) {
- return (index < gapStart)
- ? index
- : index + gapLength;
- }
-
- private void moveGap(int index) {
- // No need to clear the no-longer occupied space in refs array after arraycopy()
- // since these are only refs still present in the array and in the end removeEmptyRefsLockAcquired() will clean them
- if (index <= gapStart) { // move gap down
- int moveSize = gapStart - index;
- System.arraycopy(refArray, index, refArray, gapStart + gapLength - moveSize, moveSize);
- } else { // above gap
- int moveSize = index - gapStart;
- System.arraycopy(refArray, gapStart + gapLength, refArray, gapStart, moveSize);
- }
- gapStart = index;
- }
-
- synchronized void refGC() {
- disposedRefCount++;
- }
-
- private void checkRemoveEmptyRefs() {
- int cnt;
- synchronized (this) {
- cnt = disposedRefCount;
- }
- if (cnt > 4 && cnt > (refCount() >>> 3)) {
- removeEmptyRefs();
- }
- }
-
- private void removeEmptyRefs() {
- int rawIndex = 0;
- int validIndex = 0;
- int emptyCount = 0;
- int gapEnd = gapStart + gapLength;
- // Only retain refs with valid lines
- while (rawIndex < gapStart) {
- Ref ref = refArray[rawIndex];
- if (ref.get() != null) {
- if (rawIndex != validIndex) {
- refArray[validIndex] = ref;
- }
- validIndex++;
- } else {
- emptyCount++;
- }
- rawIndex++;
- }
- gapStart = validIndex;
-
- // Go back from end till gap end
- rawIndex = refArray.length;
- int topValidIndex = rawIndex; // validIndex points to first valid ref above gap
- while (--rawIndex >= gapEnd) {
- Ref ref = refArray[rawIndex];
- if (ref.get() != null) {
- if (rawIndex != --topValidIndex) {
- refArray[topValidIndex] = ref;
- }
- } else {
- emptyCount++;
- }
- }
- int newGapLength = topValidIndex - gapStart;
- gapLength = newGapLength;
- // Clear the area between valid indices (also because moveGap() does not clear the stale areas)
- while (validIndex < topValidIndex) {
- refArray[validIndex++] = null;
- }
- if (LOG.isLoggable(Level.FINE)) {
- LOG.fine("LineVector.removeDisposedRefsLockAcquired() refCount=" + refCount() + ", emptyCount=" + emptyCount + "\n");
- }
- synchronized (this) {
- disposedRefCount -= emptyCount;
- }
- }
-
- private void reallocate(int newGapLength) {
- int gapEnd = gapStart + gapLength;
- int aboveGapLength = refArray.length - gapEnd;
- int newLength = gapStart + aboveGapLength + newGapLength;
- Ref[] newRefArray = new Ref[newLength];
- System.arraycopy(refArray, 0, newRefArray, 0, gapStart);
- System.arraycopy(refArray, gapEnd, newRefArray, newLength - aboveGapLength, aboveGapLength);
- if (LOG.isLoggable(Level.FINE)) {
- LOG.fine("LineVector.reallocate() from refArray.length=" + refArray.length + " to newLength=" + newLength + "\n");
- }
- // gapStart is same
- gapLength = newGapLength;
- refArray = newRefArray;
- }
-
- private void lockCheckUpdate() {
- lock();
- checkRemoveEmptyRefs();
- }
-
- private synchronized void lock() {
- Thread currentThread = Thread.currentThread();
- while (lockThread != null && currentThread != lockThread) {
- try {
- wait();
- } catch (InterruptedException e) {
- throw new Error("Interrupted attempt to aquire lock");
- }
- }
- if (lockThread != null) { // Recursive lock
- throw new IllegalStateException("Recursive line vector locking prohibited. LineVector: " + this);
- }
- lockThread = currentThread;
- lockDepth++;
- }
-
- private void unlockCheckUpdate() {
- // Check pending lines update
- updateLinesCheck();
- unlock();
- }
-
- private synchronized void unlock() {
- lockDepth--;
- if (lockDepth == 0) {
- lockThread = null;
- notifyAll();
- }
- }
-
- @Override
- public String toString() {
- return "refArray.length=" + refArray.length + ", gapStart=" + gapStart + ", gapLength=" + gapLength + // NOI18N
- ", disposedRefCount=" + disposedRefCount + ", activeRefCount=" + (refCount()-disposedRefCount) +
- "\n refArrayUnsorted=" + refArrayUnsorted + // NOI18N
- ", lockThread=" + lockThread + ", lockDepth=" + lockDepth + // NOI18N
- ", pendingLineUpdaters=" + pendingLineUpdaters; // NOI18N
- }
-
- private String toStringDetail() {
- StringBuilder sb = new StringBuilder(256);
- lock();
- try {
- sb.append(this.toString()).append('\n');
- for (int i = 0; i < refCount(); i++) {
- Ref ref = refArray[rawIndex(i)];
- Line line = ref.get();
- sb.append("[").append(i).append("]:\t").append(line).append('\n');
- }
- } finally {
- unlock();
- }
- return sb.toString();
- }
-
-
- private final class Ref extends WeakReference<Line> implements Runnable {
-
- public Ref(Line line) {
- super(line, org.openide.util.BaseUtilities.activeReferenceQueue()); // The queue calls run() when unreachable
- }
-
- @Override
- public void run() {
- refGC();
- }
-
-
- }
-
- interface LineCreator {
-
- Line createLine(int line);
-
- }
-
- interface LineUpdater {
-
- void updateLine(Line line);
-
- }
-
-}
diff --git a/openide.text/src/org/openide/text/QuietEditorPane.java b/openide.text/src/org/openide/text/QuietEditorPane.java
index ff5d299..29f376d 100644
--- a/openide.text/src/org/openide/text/QuietEditorPane.java
+++ b/openide.text/src/org/openide/text/QuietEditorPane.java
@@ -142,7 +142,7 @@ final class QuietEditorPane extends JEditorPane {
ctx.setAccessibleDescription(
NbBundle.getMessage(
CloneableEditor.class, "ACSD_CloneableEditor_QuietEditorPane",
- this.getName()
+ ctx.getAccessibleDescription()
)
);
}
@@ -318,13 +318,6 @@ final class QuietEditorPane extends JEditorPane {
LOG.log(Level.FINE, null, ex);
} catch (ClassNotFoundException ex) {
LOG.log(Level.FINE, null, ex);
- } catch (RuntimeException ex) {
- if ("java.lang.reflect.InaccessibleObjectException".equals(ex.getClass().getName())) {
- LOG.log(Level.FINE, null, ex); // On JDK9 the patch is not currently working until a better solution is found
- } else {
- throw ex; // Re-throw all other runtime exceptions
- }
-
}
}
};
@@ -380,15 +373,9 @@ final class QuietEditorPane extends JEditorPane {
@Override
public boolean importData(JComponent comp, Transferable t) {
- return delegator.importData(comp, t);
- }
-
- @Override
- public boolean importData(TransferSupport t) {
try {
if (t.isDataFlavorSupported(ActiveEditorDrop.FLAVOR)){
- Object obj = t.getTransferable().getTransferData(ActiveEditorDrop.FLAVOR);
- final JComponent comp = (JComponent) t.getComponent();
+ Object obj = t.getTransferData(ActiveEditorDrop.FLAVOR);
if (obj instanceof ActiveEditorDrop && comp instanceof JTextComponent){
boolean success = false;
try {
@@ -403,7 +390,7 @@ final class QuietEditorPane extends JEditorPane {
} catch (Exception exc){
exc.printStackTrace();
}
- return delegator.importData(t);
+ return delegator.importData(comp, t);
}
private void requestFocus(JComponent comp) {
@@ -425,21 +412,15 @@ final class QuietEditorPane extends JEditorPane {
comp.requestFocus();
}
}
-
- @Override
- public boolean canImport(JComponent comp, DataFlavor[] transferFlavors) {
- return delegator.canImport(comp, transferFlavors);
- }
@Override
- public boolean canImport(TransferSupport support) {
- DataFlavor[] transferFlavors = support.getDataFlavors();
+ public boolean canImport(JComponent comp, DataFlavor[] transferFlavors) {
for (int i=0; i<transferFlavors.length; i++){
if (transferFlavors[i] == ActiveEditorDrop.FLAVOR){
return true;
}
}
- return delegator.canImport(support);
+ return delegator.canImport(comp, transferFlavors);
}
@Override
diff --git a/openide.text/src/org/openide/text/doc-files/api.html b/openide.text/src/org/openide/text/doc-files/api.html
index f90d9e6..a865b4c 100644
--- a/openide.text/src/org/openide/text/doc-files/api.html
+++ b/openide.text/src/org/openide/text/doc-files/api.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html><head>
@@ -203,7 +205,7 @@ and
<p>If not, a new <code>JEditorPane</code> is
-<a href="@JDK@/javax/swing/JEditorPane.html#getEditorKitForContentType-java.lang.String-">asked</a>
+<a href="@JDK@/javax/swing/JEditorPane.html#getEditorKitForContentType(java.lang.String)">asked</a>
to create an editor for the Java source content type (typically
<code>text/x-java</code>). Now, the Form Editor's data loader is an
@@ -216,7 +218,7 @@ in the source code, which are the markers used to indicate guarded
areas in saved source code. When it finds one, rather than inserting
the marker into the document, it uses
-<a href="../NbDocument.html#insertGuarded-javax.swing.text.StyledDocument-int-java.lang.String-"><code>NbDocument.insertGuarded(...)</code></a>
+<a href="../NbDocument.html#insertGuarded(javax.swing.text.StyledDocument,%20int,%20java.lang.String)"><code>NbDocument.insertGuarded(...)</code></a>
to insert the enclosed text area, making it read-only to the user.
@@ -240,15 +242,15 @@ loaded into the Form Editor.
<p>Note that the Form Editor directly or indirectly calls
-<a href="@JDK@/javax/swing/text/Document.html#insertString-int-java.lang.String-javax.swing.text.AttributeSet-"><code>Document.insertString(...)</code></a>
+<a href="@JDK@/javax/swing/text/Document.html#insertString(int,%20java.lang.String,%20javax.swing.text.AttributeSet)"><code>Document.insertString(...)</code></a>
(or
-<a href="../NbDocument.html#insertGuarded-javax.swing.text.StyledDocument-int-java.lang.String-"><code>NbDocument.insertGuarded(...)</code></a>)
+<a href="../NbDocument.html#insertGuarded(javax.swing.text.StyledDocument,%20int,%20java.lang.String)"><code>NbDocument.insertGuarded(...)</code></a>)
and
-<a href="@JDK@/javax/swing/text/Document.html#remove-int-int-"><code>Document.remove(...)</code></a>
+<a href="@JDK@/javax/swing/text/Document.html#remove(int,%20int)"><code>Document.remove(...)</code></a>
to do this work, so it is itself unaffected by guard blocks.
@@ -265,7 +267,7 @@ corresponding update in the source; but in this case, the
rename or otherwise affect members used by the Form Editor without its
consent! NetBeans actions implementing such modifications will use
-<a href="../NbDocument.WriteLockable.html#runAtomicAsUser-java.lang.Runnable-"><code>NbDocument.WriteLockable.runAtomicAsUser(...)</code></a>
+<a href="../NbDocument.WriteLockable.html#runAtomicAsUser(java.lang.Runnable)"><code>NbDocument.WriteLockable.runAtomicAsUser(...)</code></a>
to make sure that the guard blocks are properly honored.
@@ -302,8 +304,8 @@ scratch. Also, exception handling is not illustrated here.
<span class="type">FileObject</span> <span class="variable-name">fo</span> = FileUtil.fromFile(f)[0];
<span class="type">DataObject</span> <span class="variable-name">d</span> = DataObject.find(fo);
<span class="type">EditorCookie</span> <span class="variable-name">ec</span> = (<span class="type">EditorCookie</span>)d.getCookie(EditorCookie.<span class="keyword">class</span>);
-ec.<a href="../../cookies/EditorCookie.html#open--">open</a>();
-<span class="type">StyledDocument</span> <span class="variable-name">doc</span> = ec.<a href="../../cookies/EditorCookie.html#openDocument--">openDocument</a>();
+ec.<a href="../../cookies/EditorCookie.html#open()">open</a>();
+<span class="type">StyledDocument</span> <span class="variable-name">doc</span> = ec.<a href="../../cookies/EditorCookie.html#openDocument()">openDocument</a>();
</pre>
<h3><a name="modification">Common operations on resulting document</a></h3>
@@ -311,13 +313,13 @@ ec.<a href="../../cookies/EditorCookie.html#open--">open</a>();
You can check such things as whether or not the file is modified in the Editor:
<pre>
-if (ec.<a href="../../cookies/EditorCookie.html#isModified--">isModified</a>()) ...
+if (ec.<a href="../../cookies/EditorCookie.html#isModified()">isModified</a>()) ...
</pre>
Then see what the current contents of line 26 are (zero-based):
<pre>
-int start=<a href="../NbDocument.html#findLineOffset-javax.swing.text.StyledDocument-int-">NbDocument.findLineOffset</a>(doc, 25);
+int start=<a href="../NbDocument.html#findLineOffset(javax.swing.text.StyledDocument,%20int)">NbDocument.findLineOffset</a>(doc, 25);
int end=NbDocument.findLineOffset(doc, 26);
String contents=doc.getText(start, end-start);
</pre>
@@ -325,14 +327,14 @@ String contents=doc.getText(start, end-start);
And display this line in the Editor window:
<pre>
-ec.<a href="../../cookies/LineCookie.html#getLineSet--">getLineSet</a>().<a href="../Line.Set.html#getCurrent-int-">getCurrent</a>(25).<a href="../Line.html#show-int-">show</a>(<a href="../Line.html#SHOW_TRY_SHOW">Line.SHOW_TRY_SHOW</a>);
+ec.<a href="../../cookies/LineCookie.html#getLineSet()">getLineSet</a>().<a href="../Line.Set.html#getCurrent(int)">getCurrent</a>(25).<a href="../Line.html#show(int)">show</a>(<a href="../Line.html#SHOW_TRY_SHOW">Line.SHOW_TRY_SHOW</a>);
</pre>
Now insert a new line here after it:
<pre>
<span class="keyword">final</span> <span class="type">BadLocationException</span>[] <span class="variable-name">exc</span> = <span class="keyword">new</span> <span class="type">BadLocationException</span>[] {<span class="constant">null</span>};
-NbDocument.<a href="../NbDocument.html#runAtomicAsUser-javax.swing.text.StyledDocument-java.lang.Runnable-">runAtomicAsUser</a>(doc, <span class="keyword">new</span> <span class="type">Runnable</span>() {
+NbDocument.<a href="../NbDocument.html#runAtomicAsUser(javax.swing.text.StyledDocument,%20java.lang.Runnable)">runAtomicAsUser</a>(doc, <span class="keyword">new</span> <span class="type">Runnable</span>() {
<span class="keyword">public</span> <span class="type">void</span> <span class="function-name">run</span>() {
<span class="keyword">try</span> {
doc.insertString(NbDocument.findLineOffset(doc, 26),
@@ -349,7 +351,7 @@ NbDocument.<a href="../NbDocument.html#runAtomicAsUser-javax.swing.text.StyledDo
All done! Prompt to save the file, and close the editor window:
<pre>
-ec.<a href="../../cookies/EditorCookie.html#close--">close</a>();
+ec.<a href="../../cookies/EditorCookie.html#close()">close</a>();
</pre>
<h2><a name="automation">Advanced Editor Automation</a></h2>
@@ -370,41 +372,41 @@ recreated by other means), can do so.
<li>To create a guard block over an existing area of text, you may use
-<a href="../NbDocument.html#markGuarded-javax.swing.text.StyledDocument-int-int-"><code>NbDocument.markGuarded(...)</code></a>;
+<a href="../NbDocument.html#markGuarded(javax.swing.text.StyledDocument,%20int,%20int)"><code>NbDocument.markGuarded(...)</code></a>;
the guard block may subsequently be removed using
-<a href="../NbDocument.html#unmarkGuarded-javax.swing.text.StyledDocument-int-int-"><code>NbDocument.unmarkGuarded(...)</code></a>.
+<a href="../NbDocument.html#unmarkGuarded(javax.swing.text.StyledDocument,%20int,%20int)"><code>NbDocument.unmarkGuarded(...)</code></a>.
<p>Typically you will want to remember the positions of the guard
blocks you added using a position, so that user edits in the vicinity
of the guard block will be taken into consideration. You may create
such a position using
-<a href="../NbDocument.html#createPosition-javax.swing.text.Document-int-javax.swing.text.Position.Bias-"><code>NbDocument.createPosition(...)</code></a>,
+<a href="../NbDocument.html#createPosition(javax.swing.text.Document,%20int,%20javax.swing.text.Position.Bias)"><code>NbDocument.createPosition(...)</code></a>,
and retrieve its current offset when needed using
-<a href="@JDK@/javax/swing/text/Position.html#getOffset--"><code>Position.getOffset()</code></a>.
+<a href="@JDK@/javax/swing/text/Position.html#getOffset()"><code>Position.getOffset()</code></a>.
<li>To insert a new guarded block of text, you may use
-<a href="../NbDocument.html#insertGuarded-javax.swing.text.StyledDocument-int-java.lang.String-"><code>NbDocument.insertGuarded(...)</code></a>.
+<a href="../NbDocument.html#insertGuarded(javax.swing.text.StyledDocument,%20int,%20java.lang.String)"><code>NbDocument.insertGuarded(...)</code></a>.
<li>To change the contents of part of the document, without regard to
the presence of guard blocks (this assumes you know what you are doing
and what the guard blocks are being used for), you may use the
standard Swing
-<a href="@JDK@/javax/swing/text/Document.html#insertString-int-java.lang.String-javax.swing.text.AttributeSet-"><code>Document.insertString(...)</code></a>
+<a href="@JDK@/javax/swing/text/Document.html#insertString(int,%20java.lang.String,%20javax.swing.text.AttributeSet)"><code>Document.insertString(...)</code></a>
and
-<a href="@JDK@/javax/swing/text/Document.html#remove-int-int-"><code>Document.remove(...)</code></a>.
+<a href="@JDK@/javax/swing/text/Document.html#remove(int,%20int)"><code>Document.remove(...)</code></a>.
You probably want to use
-<a href="../NbDocument.html#runAtomic-javax.swing.text.StyledDocument-java.lang.Runnable-"><code>NbDocument.runAtomic(...)</code></a>
+<a href="../NbDocument.html#runAtomic(javax.swing.text.StyledDocument,%20java.lang.Runnable)"><code>NbDocument.runAtomic(...)</code></a>
to prevent errors in threaded code.
@@ -413,7 +415,7 @@ accidentally touching a guard block, i.e. if your module was not the
creator of the guard block (or you are not even sure if there any in
the document), please use
-<a href="../NbDocument.html#runAtomicAsUser-javax.swing.text.StyledDocument-java.lang.Runnable-"><code>NbDocument.runAtomicAsUser(...)</code></a>
+<a href="../NbDocument.html#runAtomicAsUser(javax.swing.text.StyledDocument,%20java.lang.Runnable)"><code>NbDocument.runAtomicAsUser(...)</code></a>
instead.
@@ -492,10 +494,10 @@ the annotation. For example:
<font class="keyword">public</font> <font class="type">SomeAnnotation</font>(<font class="type">String</font> <font class="variable-name">error</font>) {
<font class="keyword">this</font>.error = error;
}
- <font class="keyword">public</font> <font class="type">String</font> <a href="../Annotation.html#getAnnotationType--"><font class="function-name">getAnnotationType</font></a>() {
+ <font class="keyword">public</font> <font class="type">String</font> <a href="../Annotation.html#getAnnotationType()"><font class="function-name">getAnnotationType</font></a>() {
<font class="keyword">return</font> <font class="string">"org-nb-modules-foo-some-annotation"</font>;
}
- <font class="keyword">public</font> <font class="type">String</font> <a href="../Annotation.html#getShortDescription--"><font class="function-name">getShortDescription</font></a>() {
+ <font class="keyword">public</font> <font class="type">String</font> <a href="../Annotation.html#getShortDescription()"><font class="function-name">getShortDescription</font></a>() {
<font class="comment">// Localize this with NbBundle:</font>
<font class="keyword">return</font> <font class="string">"The error was: "</font> + error;
}
@@ -533,9 +535,9 @@ representing a section of a line. For example:
<font class="type">DataObject</font> <font class="variable-name">objWithError</font> = DataObject.find(fileWithError);
<a href="../../cookies/LineCookie.html"><font class="type">LineCookie</font></a> <font class="variable-name">cookie</font> = (<font class="type">LineCookie</font>)objWithError.getCookie(LineCookie.<font class="keyword">class</font>);
<a href="../Line.Set.html"><font class="type">Line.Set</font></a> <font class="variable-name">lineSet</font> = cookie.getLineSet();
-<font class="keyword">final</font> <a href="../Line.html"><font class="type">Line</font></a> <font class="variable-name">line</font> = lineSet.<a href="../Line.Set.html#getOriginal-int-">getOriginal</a>(123);
+<font class="keyword">final</font> <a href="../Line.html"><font class="type">Line</font></a> <font class="variable-name">line</font> = lineSet.<a href="../Line.Set.html#getOriginal(int)">getOriginal</a>(123);
<font class="keyword">final</font> <font class="type">Annotation</font> <font class="variable-name">ann</font> = <font class="keyword">new</font> <font class="type">SomeAnnotation</font>(<font class="string">"You made a mistake"</font>);
-ann.<a href="../Annotation.html#attach-org.openide.text.Annotatable-">attach</a>(line);
+ann.<a href="../Annotation.html#attach(org.openide.text.Annotatable)">attach</a>(line);
</pre>
</li>
@@ -577,7 +579,7 @@ them. If this is the case it may be helpful to force the editor to
move your annotation in front of any others:</p>
<pre>
-ann.<a href="../Annotation.html#moveToFront--">moveToFront</a>();
+ann.<a href="../Annotation.html#moveToFront()">moveToFront</a>();
</pre>
<p>NetBeans presents GUI settings to the user in which it is possible to
@@ -810,11 +812,11 @@ and use this subclass to implement cookies such as
Now just provide appropriate implementations of
-<a href="../CloneableEditorSupport.html#loadFromStreamToKit-javax.swing.text.StyledDocument-java.io.InputStream-javax.swing.text.EditorKit-"><code>CloneableEditorSupport.loadFromStreamToKit(...)</code></a>
+<a href="../CloneableEditorSupport.html#loadFromStreamToKit(javax.swing.text.StyledDocument,%20java.io.InputStream,%20javax.swing.text.EditorKit)"><code>CloneableEditorSupport.loadFromStreamToKit(...)</code></a>
(to interpret special markings in the saved file and convert them into document attributes); and
-<a href="../CloneableEditorSupport.html#saveFromKitToStream-javax.swing.text.StyledDocument-javax.swing.text.EditorKit-java.io.OutputStream-"><code>CloneableEditorSupport.saveFromKitToStream(...)</code></a>
+<a href="../CloneableEditorSupport.html#saveFromKitToStream(javax.swing.text.StyledDocument,%20javax.swing.text.EditorKit,%20java.io.OutputStream)"><code>CloneableEditorSupport.saveFromKitToStream(...)</code></a>
(to translate these attributes back into ASCII markings).
@@ -890,15 +892,15 @@ which will be set to <code>Boolean.TRUE</code> for guarded characters,
and <code>Boolean.FALSE</code> (or unset) for others; it is typically
placed on the document by means of the
-<a href="../NbDocument.html#markGuarded-javax.swing.text.StyledDocument-int-int-"><code>NbDocument.markGuarded(...)</code></a>
+<a href="../NbDocument.html#markGuarded(javax.swing.text.StyledDocument,%20int,%20int)"><code>NbDocument.markGuarded(...)</code></a>
and
-<a href="../NbDocument.html#unmarkGuarded-javax.swing.text.StyledDocument-int-int-"><code>NbDocument.unmarkGuarded(...)</code></a>
+<a href="../NbDocument.html#unmarkGuarded(javax.swing.text.StyledDocument,%20int,%20int)"><code>NbDocument.unmarkGuarded(...)</code></a>
methods, which just call
-<a href="@JDK@/javax/swing/text/StyledDocument.html#setCharacterAttributes-int-int-javax.swing.text.AttributeSet-boolean-"><code>StyledDocument.setCharacterAttributes(...)</code></a>.
+<a href="@JDK@/javax/swing/text/StyledDocument.html#setCharacterAttributes(int,%20int,%20javax.swing.text.AttributeSet,%20boolean)"><code>StyledDocument.setCharacterAttributes(...)</code></a>.
Very likely you will want to override this method, calling its
superclass method but first checking to see if the attribute setting
@@ -910,7 +912,7 @@ general and would rather just query this attribute when it is
needed. If overriding <code>setCharacterAttributes</code> for this
purpose, also remember to check the attributes on
-<a href="@JDK@/javax/swing/text/Document.html#insertString-int-java.lang.String-javax.swing.text.AttributeSet-"><code>insertString</code></a>,
+<a href="@JDK@/javax/swing/text/Document.html#insertString(int,%20java.lang.String,%20javax.swing.text.AttributeSet)"><code>insertString</code></a>,
etc.
@@ -926,11 +928,11 @@ otherwise a half-guarded line would be created.
<em>only</em> to user modifications, i.e. those undertaken in the
context of a user-initiated Swing action, or by
-<a href="../NbDocument.html#runAtomicAsUser-javax.swing.text.StyledDocument-java.lang.Runnable-"><code>NbDocument.runAtomicAsUser(...)</code></a>.
+<a href="../NbDocument.html#runAtomicAsUser(javax.swing.text.StyledDocument,%20java.lang.Runnable)"><code>NbDocument.runAtomicAsUser(...)</code></a>.
Internal NetBeans module code may freely insert or remove text (typically using
-<a href="../NbDocument.html#insertGuarded-javax.swing.text.StyledDocument-int-java.lang.String-"><code>NbDocument.insertGuarded(...)</code></a>
+<a href="../NbDocument.html#insertGuarded(javax.swing.text.StyledDocument,%20int,%20java.lang.String)"><code>NbDocument.insertGuarded(...)</code></a>
and <code>Document.remove(...)</code>). For example, this would be
done by the Form Editor component while adding a new event
@@ -956,7 +958,7 @@ colorize based on this attribute yourself.</p>
It is highly recommended that all of the Swing actions (such as those
returned by
-<a href="@JDK@/javax/swing/text/EditorKit.html#getActions--"><code>EditorKit.getActions()</code></a>)
+<a href="@JDK@/javax/swing/text/EditorKit.html#getActions()"><code>EditorKit.getActions()</code></a>)
applicable to your editor kit be reviewed for the possibility that
they might attempt to change the content of the document (so, not only
@@ -994,7 +996,7 @@ which might involve buffer modification - or, to be conservative, just
all actions. For each of these, create a new action which calls the
original
-<a href="@JDK@/java/awt/event/ActionListener.html#actionPerformed-java.awt.event.ActionEvent-"><code>actionPerformed</code></a>,
+<a href="@JDK@/java/awt/event/ActionListener.html#actionPerformed(java.awt.event.ActionEvent)"><code>actionPerformed</code></a>,
but "dynamically binds" some special flag stored with the document to
true - dynamic binding here means that it should be restored (turned
@@ -1026,11 +1028,11 @@ simply beep.
<li>Try to run a beep action to alert the user (using
-<a href="@JDK@/java/awt/Toolkit.html#beep--"><code>Toolkit.beep()</code></a>).
+<a href="@JDK@/java/awt/Toolkit.html#beep()"><code>Toolkit.beep()</code></a>).
This would probably need to be done with
-<a href="@JDK@/javax/swing/SwingUtilities.html#invokeLater-java.lang.Runnable-"><code>SwingUtilities.invokeLater(...)</code></a>.
+<a href="@JDK@/javax/swing/SwingUtilities.html#invokeLater(java.lang.Runnable)"><code>SwingUtilities.invokeLater(...)</code></a>.
</ul>
@@ -1067,12 +1069,12 @@ may be efficient.</p>
<p>Furthermore you should ensure that the
-<a href="@JDK@/javax/swing/text/Document.html#getDefaultRootElement--">default root element</a>
+<a href="@JDK@/javax/swing/text/Document.html#getDefaultRootElement()">default root element</a>
of the document has child elements corresponding to all text lines;
and if using <code>StyledDocument</code>, that
-<a href="@JDK@/javax/swing/text/StyledDocument.html#getParagraphElement-int-">"paragraph" elements</a>
+<a href="@JDK@/javax/swing/text/StyledDocument.html#getParagraphElement(int)">"paragraph" elements</a>
again correspond to text lines. Proper use of elements corresponding
to lines will enable the APIs to accurately translate between buffer
@@ -1153,7 +1155,7 @@ desirable for the <code>StyledDocument</code> to implement
which will allow it to specify exactly how it wants to be printed. The
method
-<a href="../NbDocument.Printable.html#createPrintIterators--"><code>NbDocument.Printable.createPrintIterators(...)</code></a>
+<a href="../NbDocument.Printable.html#createPrintIterators()"><code>NbDocument.Printable.createPrintIterators(...)</code></a>
should return a list of
@@ -1189,7 +1191,7 @@ implement
and its
-<a href="../NbDocument.WriteLockable.html#runAtomic-java.lang.Runnable-"><code>runAtomic(...)</code></a>
+<a href="../NbDocument.WriteLockable.html#runAtomic(java.lang.Runnable)"><code>runAtomic(...)</code></a>
method. The <code>Runnable</code> passed in this way should be
executed with all other write actions (and reads) disabled,
@@ -1202,11 +1204,11 @@ i.e. blocked.
please note that just enclosing the <code>Runnable</code> block in
calls to
-<a href="@JDK@/javax/swing/text/AbstractDocument.html#writeLock--"><code>writeLock()</code></a>
+<a href="@JDK@/javax/swing/text/AbstractDocument.html#writeLock()"><code>writeLock()</code></a>
and
-<a href="@JDK@/javax/swing/text/AbstractDocument.html#writeUnlock--"><code>writeUnlock()</code></a>
+<a href="@JDK@/javax/swing/text/AbstractDocument.html#writeUnlock()"><code>writeUnlock()</code></a>
will not do the trick - these calls do take out exclusive locks,
however they specifically do not nest. This means that you cannot
@@ -1218,7 +1220,7 @@ this, e.g. your own locks.
<p>You must also implement
-<a href="../NbDocument.WriteLockable.html#runAtomicAsUser-java.lang.Runnable-"><code>NbDocument.WriteLockable.runAtomicAsUser(...)</code></a>,
+<a href="../NbDocument.WriteLockable.html#runAtomicAsUser(java.lang.Runnable)"><code>NbDocument.WriteLockable.runAtomicAsUser(...)</code></a>,
which is very similar but is invoked on behalf of user actions
unrelated to whatever component created the guard blocks - e.g., this
@@ -1258,7 +1260,7 @@ Please consider implementing
and its
-<a href="../NbDocument.PositionBiasable.html#createPosition-int-javax.swing.text.Position.Bias-"><code>createPosition(...)</code></a>
+<a href="../NbDocument.PositionBiasable.html#createPosition(int,%20javax.swing.text.Position.Bias)"><code>createPosition(...)</code></a>
method, to create a position marker which not only moves freely with
insertions and deletions in nearby text, but also specifies the
@@ -1273,7 +1275,7 @@ position.
given line will be displayed. You should not need to do anything
special to support this;
-<a href="@JDK@/javax/swing/text/Caret.html#setDot-int-"><code>Caret.setDot()</code></a>
+<a href="@JDK@/javax/swing/text/Caret.html#setDot(int)"><code>Caret.setDot()</code></a>
will be called and ought to perform the scrolling appropriately.
@@ -1316,7 +1318,7 @@ inappropriate to install into the main control window.
<p>You do not need to do much to support this editor toolbar: in the
-<a href="@JDK@/javax/swing/text/EditorKit.html#getActions--"><code>getActions()</code></a>
+<a href="@JDK@/javax/swing/text/EditorKit.html#getActions()"><code>getActions()</code></a>
method of your editor kit, if there are any actions which are also
@@ -1345,7 +1347,7 @@ names. Default instances of these are also available in the
<code>DefaultEditorKit</code> class, but your actions will be
recognized based on a call to
-<code><a href="@JDK@/javax/swing/Action.html#getValue-java.lang.String-">getValue</a>(<a href="@JDK@/javax/swing/Action.html#NAME">Action.NAME</a>)</code>:</p>
+<code><a href="@JDK@/javax/swing/Action.html#getValue(java.lang.String)">getValue</a>(<a href="@JDK@/javax/swing/Action.html#NAME">Action.NAME</a>)</code>:</p>
<table border=1 summary="action name to DefaultEditorKit field mappings">
<tr><th>Name</th><th>Static field in
@@ -1384,7 +1386,7 @@ standard invocations such as from the system toolbar, will
automatically invoke these actions on your document, if you supply
them. You should use
-<a href="@JDK@/javax/swing/Action.html#isEnabled--"><code>Action.isEnabled()</code></a>
+<a href="@JDK@/javax/swing/Action.html#isEnabled()"><code>Action.isEnabled()</code></a>
to indicate whether your action is ready, and thus whether or not the
corresponding UI elements should be grayed out.
@@ -1415,7 +1417,7 @@ you will make a JAR file containing a manifest with attributes
recognized by NetBeans as constituting a <a
href="@org-openide-modules@/org/openide/modules/doc-files/api.html">module</a>, and just call
-<a href="@JDK@/javax/swing/JEditorPane.html#registerEditorKitForContentType-java.lang.String-java.lang.String-"><code>javax.swing.JEditorPane.registerEditorKitForContentType(...)</code></a>,
+<a href="@JDK@/javax/swing/JEditorPane.html#registerEditorKitForContentType(java.lang.String,%20java.lang.String)"><code>javax.swing.JEditorPane.registerEditorKitForContentType(...)</code></a>,
and NetBeans should subsequently use it.
@@ -1427,7 +1429,7 @@ and NetBeans should subsequently use it.
API for registering editors. Although doing it manually in the
module's
-<a href="@org-openide-modules@/org/openide/modules/ModuleInstall.html#installed--"><code>installed()</code></a>
+<a href="@org-openide-modules@/org/openide/modules/ModuleInstall.html#installed()"><code>installed()</code></a>
method is not difficult, properly the module should also restore the
original editor kit for each content type upon an uninstall, and
@@ -1456,7 +1458,7 @@ currently recognized, you may wish to use the
infrastructure in the Filesystems API to help your files be
recognized. Additionally,
-<a href="../CloneableEditorSupport.html#setMIMEType-java.lang.String-"><code>CloneableEditorSupport.setMIMEType(String)</code></a>
+<a href="../CloneableEditorSupport.html#setMIMEType(java.lang.String)"><code>CloneableEditorSupport.setMIMEType(String)</code></a>
may be used to control the MIME type of an editor kit regardless of
the type of the underlying file.
diff --git a/openide.text/src/org/openide/text/package.html b/openide.text/src/org/openide/text/package.html
index 4a4d909..39da62b 100644
--- a/openide.text/src/org/openide/text/package.html
+++ b/openide.text/src/org/openide/text/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
diff --git a/openide.text/test/unit/src/org/openide/text/LineSetTest.java b/openide.text/test/unit/src/org/openide/text/LineSetTest.java
index 75006c9..a00066f 100644
--- a/openide.text/test/unit/src/org/openide/text/LineSetTest.java
+++ b/openide.text/test/unit/src/org/openide/text/LineSetTest.java
@@ -46,7 +46,6 @@ package org.openide.text;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
-import java.util.List;
import org.netbeans.junit.NbTestCase;
import org.openide.util.Lookup;
import org.openide.util.lookup.AbstractLookup;
@@ -422,43 +421,6 @@ public class LineSetTest extends NbTestCase implements CloneableEditorSupport.En
assertEquals ("But it is of course empty", 0, part.getText ().length ());
}
- public void testManyLineInstances() throws Exception {
- long tm = System.currentTimeMillis();
- int lineCount = 1000;
- StringBuilder contentBuilder = new StringBuilder(lineCount * 10);
- for (int i = 0; i < lineCount; i++) {
- contentBuilder.append("Line ").append(i).append("\n");
- }
- content = contentBuilder.toString();
- javax.swing.text.Document doc = support.openDocument();
-
- // Create and hold a line instance on each line
- List<Line> lines = new ArrayList<Line>();
- Line.Set lineSet = support.getLineSet();
- for (int i = 0; i < lineCount; i++) {
- lines.add(lineSet.getCurrent(i));
- }
-
-// System.err.println("testManyLineInstances lineCount=" + lineCount + ", elapsed time: " + (System.currentTimeMillis() - tm));
-
- // Test searching for the line instances in a backward direction
- for (int i = lineCount - 1; i >= 0; i--) {
- assertSame("Line instances differ at index=" + i, lines.get(i), lineSet.getCurrent(i));
- }
-
- // Original impl with weak hash map will roughly do N^2 line comparisons :-(
- // Each comparison needs a binary search todetermine the line number.
- assertTrue("Line.equals() count=" + DocumentLine.dlEqualsCounter + " too high",
- DocumentLine.dlEqualsCounter < 5000);
-
- // Release several lines at the end of list to test the binary search skipping the empty slots
- for (int i = lineCount - 3; i < lineCount; i++) {
- lines.set(i, null);
- }
- System.gc();
- lineSet.getCurrent(lineCount - 1);
- }
-
private void assertNumberOfLines (int cnt, Line.Set set) throws Exception {
class MF implements org.netbeans.junit.MemoryFilter {
private java.util.HashSet<Line> counted = new java.util.HashSet<Line>();
diff --git a/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingCooperationTest.java b/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingCooperationTest.java
index a8f8fd4..22d9988 100644
--- a/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingCooperationTest.java
+++ b/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingCooperationTest.java
@@ -1,10 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
+ * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
@@ -16,9 +13,9 @@
* specific language governing permissions and limitations under the
* License. When distributing the software, include this License Header
* Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
* particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
+ * by Sun in the GPL Version 2 section of the License file that
* accompanied this code. If applicable, add the following below the
* License Header, with the fields enclosed by brackets [] replaced by
* your own identifying information:
diff --git a/openide.util.enumerations/manifest.mf b/openide.util.enumerations/manifest.mf
index 4df2d19..1d2185d 100644
--- a/openide.util.enumerations/manifest.mf
+++ b/openide.util.enumerations/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.util.enumerations
-OpenIDE-Module-Specification-Version: 6.33.1
+OpenIDE-Module-Specification-Version: 6.32.1
OpenIDE-Module-Localizing-Bundle: org/openide/util/enum/Bundle.properties
OpenIDE-Module-Deprecated: true
AutoUpdate-Essential-Module: true
diff --git a/openide.util.enumerations/src/org/openide/util/enum/package.html b/openide.util.enumerations/src/org/openide/util/enum/package.html
index 1eec2f5..7a2f2a0 100644
--- a/openide.util.enumerations/src/org/openide/util/enum/package.html
+++ b/openide.util.enumerations/src/org/openide/util/enum/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/openide.util.lookup/apichanges.xml b/openide.util.lookup/apichanges.xml
index 2dd2032..8658b92 100644
--- a/openide.util.lookup/apichanges.xml
+++ b/openide.util.lookup/apichanges.xml
@@ -60,7 +60,7 @@ made subject to such option by the copyright holder.
binary="compatible" deletion="no" deprecation="no"
modification="no" semantic="incompatible" source="compatible"
>
- The clients of <a href="@TOP@/org/openide/util/Lookup.html#getDefault--">
+ The clients of <a href="@TOP@/org/openide/util/Lookup.html#getDefault()">
Lookup.getDefault()</a> are mostly unaffected by this change,
just they need to be ready for the fact that the return
value of the method may no longer be fixed one, but can mutate
@@ -68,10 +68,10 @@ made subject to such option by the copyright holder.
</compatibility>
<description>
<p>
- One can use <a href="@TOP@/org/openide/util/lookup/Lookups.html#executeWith-org.openide.util.Lookup-java.lang.Runnable-">
+ One can use <a href="@TOP@/org/openide/util/lookup/Lookups.html#executeWith(org.openide.util.Lookup, java.lang.Runnable)">
Lookups.execute(yourLookup, yourRunnable)
</a> to temporarily influence return value from
- <a href="@TOP@/org/openide/util/Lookup.html#getDefault--">
+ <a href="@TOP@/org/openide/util/Lookup.html#getDefault()">
Lookup.getDefault()</a>.
</p>
</description>
@@ -95,7 +95,7 @@ made subject to such option by the copyright holder.
<a href="@TOP at org/openide/util/lookup/NamedServiceDefinition.html">NamedServiceDefinition</a>
for those who define their own annotations that register
something into
- <a href="@TOP at org/openide/util/lookup/Lookups.html#forPath-java.lang.String-">
+ <a href="@TOP at org/openide/util/lookup/Lookups.html#forPath(java.lang.String)">
Lookups.forPath</a> registration area.
</p>
</description>
@@ -135,7 +135,7 @@ made subject to such option by the copyright holder.
waiting for or creating all of them:
</p>
<pre>
-for (<a href="@JDK@/java/net/URLStreamHandlerFactory.html">URLStreamHandlerFactory</a> first : <a href="@TOP@/org/openide/util/Lookup.html#getDefault--">Lookup.getDefault()</a>.lookupAll(<a href="@JDK@/java/net/URLStreamHandlerFactory.html">URLStreamHandlerFactory</a>.class)) {
+for (<a href="@JDK@/java/net/URLStreamHandlerFactory.html">URLStreamHandlerFactory</a> first : <a href="@TOP@/org/openide/util/Lookup.html#getDefault()">Lookup.getDefault()</a>.lookupAll(<a href="@JDK@/java/net/URLStreamHandlerFactory.html">URLStreamHandlerFactory</a>.class)) {
return first;
}
</pre>
@@ -261,7 +261,7 @@ for (<a href="@JDK@/java/net/URLStreamHandlerFactory.html">URLStreamHandlerFacto
<compatibility addition="yes"/>
<description>
<p>
- New method <a href="@TOP@/org/openide/util/lookup/Lookups.html#forPath-java.lang.String-">Lookups.forPath(String)</a>
+ New method <a href="@TOP@/org/openide/util/lookup/Lookups.html#forPath(java.lang.String)">Lookups.forPath(String)</a>
has been added to replace now deprecated <a href="@org-openide-loaders@/org/openide/loaders/FolderLookup.html">FolderLookup</a>
and allow modules who wants to read settings from layers
to do so with a simpler code, without dependency on DataSystems API.
diff --git a/openide.util.lookup/arch.xml b/openide.util.lookup/arch.xml
index edfb19d..09bf657 100644
--- a/openide.util.lookup/arch.xml
+++ b/openide.util.lookup/arch.xml
@@ -130,7 +130,7 @@ In general there are three ways to achieve this.
as described at
<a href="@org-openide-util@/org/openide/util/doc-files/api.html#ido-methodvalue">services
</a> documentation and in your factory method either return the instance
- your want or <code>null</code> depending on result of <a href="@org-openide-util@/org/openide/util/BaseUtilities.html#isWindows--">
+ your want or <code>null</code> depending on result of <a href="@org-openide-util@/org/openide/util/BaseUtilities.html#isWindows()">
Utilities.isWindows()</a> call.</p>
</li>
<li>
@@ -185,7 +185,7 @@ In general there are three ways to achieve this.
<span class="java-keywords">import</span> <span class="java-identifier">org</span><span class="java-operators">.</span><span class="java-identifier">openide</span><span class="java-operators">.</span><span class="java-identifier">util</span><span class="java-operators">.</span><span class="java-identifier">Lookup</span><span class="java-operators">;</span>
<a href="@TOP at org/openide/util/Lookup.Result.html"><span class="java-identifier">Lookup</span><span class="java-operators">.</span><span class="java-identifier">Result</span></a> <span class="java-identifier">result</span> <span class="java-operators">=</span> <a href="@TOP at org/openide/util/Lookup.html"><span class="java-identifier">Lookup</span></a><span class="java-operators">.</span><span class="java-layer-method">getDefault</span> <span class="java-operators">(</span><span class="jav [...]
-<span class="java-identifier">Collection</span> <span class="java-identifier">c</span> <span class="java-operators">=</span> <span class="java-identifier">result</span><span class="java-operators">.</span><a href="@TOP at org/openide/util/Lookup.Result.html#allInstances--"><span class="java-layer-method">allInstances</span></a> <span class="java-operators">(</span><span class="java-operators">)</span><span class="java-operators">;</span>
+<span class="java-identifier">Collection</span> <span class="java-identifier">c</span> <span class="java-operators">=</span> <span class="java-identifier">result</span><span class="java-operators">.</span><a href="@TOP at org/openide/util/Lookup.Result.html#allInstances()"><span class="java-layer-method">allInstances</span></a> <span class="java-operators">(</span><span class="java-operators">)</span><span class="java-operators">;</span>
<span class="java-identifier">Collections</span><span class="java-operators">.</span><span class="java-layer-method">shuffle</span> <span class="java-operators">(</span><span class="java-identifier">c</span><span class="java-operators">)</span><span class="java-operators">;</span>
<span class="java-identifier">TipsOfTheDayProvider</span> <span class="java-identifier">selected</span> <span class="java-operators">=</span> <span class="java-operators">(</span><span class="java-identifier">TipsOfTheDayProvider</span><span class="java-operators">)</span><span class="java-identifier">c</span><span class="java-operators">.</span><span class="java-layer-method">iterator</span> <span class="java-operators">(</span><span class="java-operators">)</span><span class="java-oper [...]
</pre><p>
@@ -343,19 +343,19 @@ org.my.netbeans.extramodule.ExtraTip
<li>
<api type="export" group="systemproperty" name="org.openide.util.Lookup" category="devel">
checked by the initialization of the
- <a href="@TOP@/org/openide/util/Lookup.html#getDefault--">Lookup.getDefault()</a>
+ <a href="@TOP@/org/openide/util/Lookup.html#getDefault()">Lookup.getDefault()</a>
and can
contain name of a class that extends <code>org.openide.util.Lookup</code> and
has public constructor, that should be instantiated and returned from
- <a href="@TOP@/org/openide/util/Lookup.html#getDefault--">Lookup.getDefault()</a>
+ <a href="@TOP@/org/openide/util/Lookup.html#getDefault()">Lookup.getDefault()</a>
the class will be loaded by
- <a href="@JDK@/java/lang/Thread.html#getContextClassLoader--">
+ <a href="@JDK@/java/lang/Thread.html#getContextClassLoader()">
Thread.currentThread().getContextClassLoader()</a>
classloader the first time <code>Lookup.getDefault</code> is invoked.
<p/>
The property can also contain value <code>"-"</code> which means to completely
disable the lookup instantiation and return <a href="@TOP@/org/openide/util/Lookup.html#EMPTY">Lookup.EMPTY</a>
- from <a href="@TOP@/org/openide/util/Lookup.html#getDefault--">Lookup.getDefault()</a>.
+ from <a href="@TOP@/org/openide/util/Lookup.html#getDefault()">Lookup.getDefault()</a>.
<p/>
If the property is unspecified, the default <code>MetaInfServicesLookup</code>
is constructed for <code>Thread.currentThread().getContextclassLoader()</code>
@@ -364,7 +364,7 @@ org.my.netbeans.extramodule.ExtraTip
<a href="@TOP@/org/openide/util/Lookup.Provider.html">Lookup.Provider</a>
is found
in there, its lookup is returned as result. Otherwise the <code>MetaInfServicesLookup</code>
- is the result of <a href="@TOP@/org/openide/util/Lookup.html#getDefault--">Lookup.getDefault()</a>.
+ is the result of <a href="@TOP@/org/openide/util/Lookup.html#getDefault()">Lookup.getDefault()</a>.
</api>
</li>
@@ -374,11 +374,11 @@ org.my.netbeans.extramodule.ExtraTip
some system file system folder. This can be done with
<code>org.openide.util.Lookup.paths=Folder1:Folder2:Folder3</code>.
If this property is set prior to first call to
- <a href="@TOP@/org/openide/util/Lookup.html#getDefault--">Lookup.getDefault()</a>,
+ <a href="@TOP@/org/openide/util/Lookup.html#getDefault()">Lookup.getDefault()</a>,
it is split into pieces (separator is <code>':'</code>) and individual
parts are then used to construct <code>Lookups.forPath("Folder1")</code>,
etc. All these lookups then become part of the
- <a href="@TOP@/org/openide/util/Lookup.html#getDefault--">Lookup.getDefault()</a>
+ <a href="@TOP@/org/openide/util/Lookup.html#getDefault()">Lookup.getDefault()</a>
one. This property works since version 7.24
</api>
</li>
@@ -390,7 +390,7 @@ org.my.netbeans.extramodule.ExtraTip
<answer id="exec-reflection">
<p>
- <api category="devel" group="java" name="Lookups.metaInfServices" type="export" url="@TOP@/org/openide/util/lookup/Lookups.html#metaInfServices-java.lang.ClassLoader-">
+ <api category="devel" group="java" name="Lookups.metaInfServices" type="export" url="@TOP@/org/openide/util/lookup/Lookups.html#metaInfServices(java.lang.ClassLoader)">
calls constructor of registered classes using reflection
</api>.
<api category="friend" group="java" name="Lookup.resetDefaultLookup" type="export">
@@ -406,7 +406,7 @@ org.my.netbeans.extramodule.ExtraTip
<p>
Everything is synchronous, except pluggable use of <code>java.util.concurrent.Executor</code>
that allows to make calls asynchronous. The default implementation only delivers
- changes from <a href="@TOP@/org/openide/util/lookup/Lookups.html#metaInfServices-java.lang.ClassLoader-">metaInfServices</a>
+ changes from <a href="@TOP@/org/openide/util/lookup/Lookups.html#metaInfServices(java.lang.ClassLoader)">metaInfServices</a>
lookup in asynchronous thread.
</p>
</answer>
@@ -439,7 +439,7 @@ org.my.netbeans.extramodule.ExtraTip
<ul>
<li><api name="LookupInitializationLookup" category="devel" group="lookup" type="export" url="#systemproperty-org.openide.util.Lookup">
during
- initialization of the <a href="@TOP@/org/openide/util/Lookup.html#getDefault--">Lookup.getDefault()</a>
+ initialization of the <a href="@TOP@/org/openide/util/Lookup.html#getDefault()">Lookup.getDefault()</a>
the <a href="@TOP@/org/openide/util/Lookup.Provider.html">Lookup.Provider</a>
is being searched</api>.
</li>
@@ -452,7 +452,7 @@ org.my.netbeans.extramodule.ExtraTip
<li><api name="LookupClassLoader" category="devel" group="lookup" type="export">
Nearly all resource looking functions and reflective code
uses <a href="@JDK@/java/lang/ClassLoader.html">ClassLoader</a>
- obtained from <a href="@TOP@/org/openide/util/Lookup.html#getDefault--">Lookup.getDefault()</a>
+ obtained from <a href="@TOP@/org/openide/util/Lookup.html#getDefault()">Lookup.getDefault()</a>
for loading system wide resources.
</api>.</li>
diff --git a/openide.util.lookup/build.xml b/openide.util.lookup/build.xml
index db76aee..81db96e 100644
--- a/openide.util.lookup/build.xml
+++ b/openide.util.lookup/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="openide.util.lookup">
<description>Builds, tests, and runs the project org.openide.util.lookup</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/openide.util.lookup/manifest.mf b/openide.util.lookup/manifest.mf
index cdcb654..e70caea 100644
--- a/openide.util.lookup/manifest.mf
+++ b/openide.util.lookup/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.util.lookup
OpenIDE-Module-Localizing-Bundle: org/openide/util/lookup/Bundle.properties
-OpenIDE-Module-Specification-Version: 8.33.1
+OpenIDE-Module-Specification-Version: 8.32.1
diff --git a/openide.util.lookup/nbproject/org-openide-util-lookup.sig b/openide.util.lookup/nbproject/org-openide-util-lookup.sig
index d994276..a19ec7f 100644
--- a/openide.util.lookup/nbproject/org-openide-util-lookup.sig
+++ b/openide.util.lookup/nbproject/org-openide-util-lookup.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 8.32.1
+#Version 8.25
CLSS public abstract interface java.io.Serializable
@@ -90,7 +90,7 @@ meth public abstract <%0 extends java.lang.Object> org.openide.util.Lookup$Resul
meth public abstract <%0 extends java.lang.Object> {%%0} lookup(java.lang.Class<{%%0}>)
meth public static org.openide.util.Lookup getDefault()
supr java.lang.Object
-hfds LOG,defaultLookup,defaultLookupProvider
+hfds LOG,defaultLookup
hcls DefLookup,Empty
CLSS public abstract static org.openide.util.Lookup$Item<%0 extends java.lang.Object>
@@ -211,7 +211,6 @@ meth public static org.openide.util.Lookup metaInfServices(java.lang.ClassLoader
meth public static org.openide.util.Lookup metaInfServices(java.lang.ClassLoader,java.lang.String)
meth public static org.openide.util.Lookup proxy(org.openide.util.Lookup$Provider)
meth public static org.openide.util.Lookup singleton(java.lang.Object)
-meth public static void executeWith(org.openide.util.Lookup,java.lang.Runnable)
supr java.lang.Object
hcls LookupItem
diff --git a/openide.util.lookup/nbproject/project.properties b/openide.util.lookup/nbproject/project.properties
index 2511aa0..f04bc5b 100644
--- a/openide.util.lookup/nbproject/project.properties
+++ b/openide.util.lookup/nbproject/project.properties
@@ -41,7 +41,7 @@
# made subject to such option by the copyright holder.
module.jar.dir=lib
-javac.source=1.7
+javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
diff --git a/openide.util.lookup/nbproject/project.xml b/openide.util.lookup/nbproject/project.xml
index bf90fe0..195199d 100644
--- a/openide.util.lookup/nbproject/project.xml
+++ b/openide.util.lookup/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/openide.util.lookup/src/META-INF/upgrade/org.openide.util.Lookup.hint b/openide.util.lookup/src/META-INF/upgrade/org.openide.util.Lookup.hint
index 142d61e..2253246 100644
--- a/openide.util.lookup/src/META-INF/upgrade/org.openide.util.Lookup.hint
+++ b/openide.util.lookup/src/META-INF/upgrade/org.openide.util.Lookup.hint
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2011, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
'Lookup.lookupAll can be used instead':
$this.lookup(new org.openide.util.Lookup.Template($class)).allInstances() :: $this instanceof org.openide.util.Lookup && $class instanceof java.lang.Class
=> $this.lookupAll($class)
diff --git a/openide.util.lookup/src/org/openide/util/lookup/Bundle.properties b/openide.util.lookup/src/org/openide/util/lookup/Bundle.properties
index de7b016..95f4365 100644
--- a/openide.util.lookup/src/org/openide/util/lookup/Bundle.properties
+++ b/openide.util.lookup/src/org/openide/util/lookup/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Long-Description=\
Many APIs in NetBeans use Lookup as an observable collection of services. \
The default lookup is the global service registry; selections, project capabilities, and more are also modeled as Lookup instances.
diff --git a/openide.util.lookup/src/org/openide/util/lookup/MetaInfServicesLookup.java b/openide.util.lookup/src/org/openide/util/lookup/MetaInfServicesLookup.java
index 747ce9a..691c0b8 100644
--- a/openide.util.lookup/src/org/openide/util/lookup/MetaInfServicesLookup.java
+++ b/openide.util.lookup/src/org/openide/util/lookup/MetaInfServicesLookup.java
@@ -278,7 +278,7 @@ final class MetaInfServicesLookup extends AbstractLookup {
// is it position attribute?
if (line.startsWith("#position=")) {
if (currentItem == null) {
- LOGGER.log(Level.INFO, "Found line ''{0}'' in {1} but there is no item to associate it with", new Object[] {line, url});
+ LOGGER.log(Level.INFO, "Found line '{0}' in {1} but there is no item to associate it with", new Object[] {line, url});
continue;
}
diff --git a/openide.util.lookup/src/org/openide/util/lookup/doc-files/index.html b/openide.util.lookup/src/org/openide/util/lookup/doc-files/index.html
index 96e3818..39c301c 100644
--- a/openide.util.lookup/src/org/openide/util/lookup/doc-files/index.html
+++ b/openide.util.lookup/src/org/openide/util/lookup/doc-files/index.html
@@ -1,42 +1,43 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<HTML>
<HEAD>
@@ -47,15 +48,15 @@ Contributor(s):
<P>
-This is the home page of the <em>lookup library</em> implementation, which
+This is the home page of the <em>lookup library</em> implementation, which
is intended to solve a general problem that every <cite>component-based system</CITE>
-has had to face: how different components <b>register</b> to the system
-and how other parts of the system can <b>look</b> them <b>up</B>.
+has had to face: how different components <b>register</b> to the system
+and how other parts of the system can <b>look</b> them <b>up</B>.
<P>
-There already are libraries trying to solve this problem, usually by querying for
-an interface and finding its appropriate implementaion. The most famous is
+There already are libraries trying to solve this problem, usually by querying for
+an interface and finding its appropriate implementaion. The most famous is
<A href="http://www.jini.org/">Jini</A>, the platform for development of
-distributed network services. Our library does something similar, but tries
+distributed network services. Our library does something similar, but tries
to stay small and easy
to use. The NetBeans <em>Lookup
Library</EM>'s main focus is a modular application consisting of independent modules
@@ -123,7 +124,7 @@ the search algorithm with an easy interface. Just write:
<pre>
<font class="keyword">import</font> <font class="type">java.awt.Toolkit</font>;
<font class="keyword">import</font> <font class="type">org.openide.util.Lookup;</font>;
- <font class="type">Toolkit</font> <font class="variable-name">t</font> = (<font class="type">Toolkit</font>)Lookup.getDefault().<a href="@TOP at org/openide/util/Lookup.html#lookup-java.lang.Class-">lookup</a>(Toolkit.<font class="keyword">class</font>);
+ <font class="type">Toolkit</font> <font class="variable-name">t</font> = (<font class="type">Toolkit</font>)Lookup.getDefault().<a href="@TOP at org/openide/util/Lookup.html#lookup(java.lang.Class)">lookup</a>(Toolkit.<font class="keyword">class</font>);
</PRE>
and if the JAR with <code>MyToolkit</CODE> is in the class path, the simple call
above will do the rest.
@@ -169,7 +170,7 @@ whether the object supports a given interface like this:
<font class="type">MorphingObject</FONT> <font class="variable-name">morph</FONT> = ...
<font class="type">AnInterface</font> <font class="variable-name">impl</font> = (<font
class="type">AnInterface</font>)morph.getLookup().<a
-href="@TOP at org/openide/util/Lookup.html#lookup-java.lang.Class-">lookup</a>(AnInterface.<font class="keyword">class</font>);
+href="@TOP at org/openide/util/Lookup.html#lookup(java.lang.Class)">lookup</a>(AnInterface.<font class="keyword">class</font>);
<font class="keyword">if</font> (impl == <font class="constant">null</font>) {
<font class="keyword">return;</font><font class="comment">/* AnInterface not supported now! */</font>
}
diff --git a/openide.util.lookup/src/org/openide/util/lookup/doc-files/lookup-api.html b/openide.util.lookup/src/org/openide/util/lookup/doc-files/lookup-api.html
index 2ecf769..f1192da 100644
--- a/openide.util.lookup/src/org/openide/util/lookup/doc-files/lookup-api.html
+++ b/openide.util.lookup/src/org/openide/util/lookup/doc-files/lookup-api.html
@@ -1,42 +1,43 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<HTML>
<HEAD>
@@ -63,7 +64,7 @@ As you can see in the
Javadoc there is a static method
-<pre><a href="@TOP at org/openide/util/Lookup.html#getDefault--">public static Lookup getDefault()</a></pre>
+<pre><a href="@TOP at org/openide/util/Lookup.html#getDefault()">public static Lookup getDefault()</a></pre>
The object returned from this method is
a global lookup that can serve as a central place for registering services.
diff --git a/openide.util.lookup/src/org/openide/util/lookup/doc-files/lookup-spi.html b/openide.util.lookup/src/org/openide/util/lookup/doc-files/lookup-spi.html
index f1214b2..fcd7aaf 100644
--- a/openide.util.lookup/src/org/openide/util/lookup/doc-files/lookup-spi.html
+++ b/openide.util.lookup/src/org/openide/util/lookup/doc-files/lookup-spi.html
@@ -1,42 +1,43 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<HTML>
<HEAD>
@@ -61,10 +62,10 @@ return a functional lookup from this call. You can use static methods in class
<a href="@TOP at org/openide/util/lookup/Lookups.html">
<code>Lookups</code></A> to create a lookup for you. If you want only one
object to be returned, just call
-<a href="@TOP at org/openide/util/lookup/Lookups.html#singleton-java.lang.Object-">
+<a href="@TOP at org/openide/util/lookup/Lookups.html#singleton(java.lang.Object)">
<code>Lookups.singleton(x)</code></A> where x is the object to be
returned by the lookup. Or if you want to supply more objects, use a call to the method
-<a href="@TOP at org/openide/util/lookup/Lookups.html#fixed-java.lang.Object...-">
+<a href="@TOP at org/openide/util/lookup/Lookups.html#fixed(java.lang.Object...)">
<code>fixed(Object []x)</CODE></A>.
<EM> Note: </EM> The lookups returned from methods <code>singleton(...)</code> and
<code>fixed(...)</code> do <EM>
@@ -115,7 +116,7 @@ deregistered. Often
is used as the content implementation. To add something to the lookup,
simply use
-<a href="@TOP at org/openide/util/lookup/InstanceContent.html#add-java.lang.Object-"><code>add(Object)</code></a>
+<a href="@TOP at org/openide/util/lookup/InstanceContent.html#add(java.lang.Object)"><code>add(Object)</code></a>
(and <code>remove(Object)</code> for the reverse). These may be called
at any time and will update the set of registered instances (firing
diff --git a/openide.util.lookup/src/org/openide/util/lookup/implspi/AbstractServiceProviderProcessor.java b/openide.util.lookup/src/org/openide/util/lookup/implspi/AbstractServiceProviderProcessor.java
index bb7fabb..a3c0eb5 100644
--- a/openide.util.lookup/src/org/openide/util/lookup/implspi/AbstractServiceProviderProcessor.java
+++ b/openide.util.lookup/src/org/openide/util/lookup/implspi/AbstractServiceProviderProcessor.java
@@ -50,7 +50,6 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.lang.annotation.Annotation;
-import java.nio.file.NoSuchFileException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -223,7 +222,7 @@ public abstract class AbstractServiceProviderProcessor extends AbstractProcessor
// at com.sun.tools.javac.processing.JavacFiler.getResource(JavacFiler.java:434)
// at org.netbeans.modules.openide.util.AbstractServiceProviderProcessor.register(AbstractServiceProviderProcessor.java:163)
// at org.netbeans.modules.openide.util.ServiceProviderProcessor.register(ServiceProviderProcessor.java:99)
- } catch (FileNotFoundException | NoSuchFileException x) {
+ } catch (FileNotFoundException x) {
// Good.
}
try {
@@ -234,7 +233,7 @@ public abstract class AbstractServiceProviderProcessor extends AbstractProcessor
} finally {
is.close();
}
- } catch (FileNotFoundException | NoSuchFileException x) {
+ } catch (FileNotFoundException x) {
// OK, created for the first time
}
} catch (IOException x) {
diff --git a/openide.util.lookup/src/org/openide/util/lookup/implspi/ActiveQueue.java b/openide.util.lookup/src/org/openide/util/lookup/implspi/ActiveQueue.java
index 8348186..c87cf52 100644
--- a/openide.util.lookup/src/org/openide/util/lookup/implspi/ActiveQueue.java
+++ b/openide.util.lookup/src/org/openide/util/lookup/implspi/ActiveQueue.java
@@ -44,6 +44,9 @@ package org.openide.util.lookup.implspi;
import java.lang.ref.Reference;
import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -55,23 +58,49 @@ public final class ActiveQueue {
private ActiveQueue() {}
private static final Logger LOGGER = Logger.getLogger(ActiveQueue.class.getName());
- private static Impl activeReferenceQueue;
+ private static final ReferenceQueue<Impl> ACTIVE = new ReferenceQueue<Impl>();
+ private static Reference<Impl> activeReferenceQueue = new WeakReference<Impl>(null);
/**
* Gets the active reference queue.
* @return the singleton queue
*/
public static synchronized ReferenceQueue<Object> queue() {
- if (activeReferenceQueue == null) {
- activeReferenceQueue = new Impl();
+ Impl impl = activeReferenceQueue.get();
+ if (impl == null) {
+ impl = new Impl();
+ activeReferenceQueue = new WeakReference<Impl>(impl, ACTIVE);
Daemon.ping();
}
- return activeReferenceQueue;
+ return impl;
}
private static final class Impl extends ReferenceQueue<Object> {
+ private static final Field LOCK;
+ static {
+ Field f = null;
+ try {
+ f = ReferenceQueue.class.getDeclaredField("lock"); // NOI18N
+ f.setAccessible(true);
+ } catch (Throwable ex) {
+ reportError(ex);
+ }
+ LOCK = f;
+ }
+ private final Object myLock;
Impl() {
+ Object l = this;
+ try {
+ if (LOCK != null) {
+ LOCK.set(this, l = LOCK.get(ACTIVE));
+ }
+ } catch (IllegalArgumentException ex) {
+ reportError(ex);
+ } catch (IllegalAccessException ex) {
+ reportError(ex);
+ }
+ myLock = l;
}
@Override
@@ -89,8 +118,12 @@ public final class ActiveQueue {
throw new InterruptedException();
}
- final Reference<? extends Object> removeSuper() throws InterruptedException {
- return super.remove(0);
+ final Object lock() {
+ return myLock;
+ }
+
+ final Reference<? extends Object> pollSuper() throws IllegalArgumentException, InterruptedException {
+ return super.poll();
}
}
@@ -116,8 +149,18 @@ public final class ActiveQueue {
return running != null;
}
+ static synchronized void wakeUp() {
+ if (running != null) {
+ running.interrupt();
+ }
+ }
+
static synchronized Impl obtainQueue() {
- return activeReferenceQueue;
+ Impl impl= activeReferenceQueue.get();
+ if (impl == null) {
+ running = null;
+ }
+ return impl;
}
@Override
@@ -128,8 +171,18 @@ public final class ActiveQueue {
if (impl == null) {
return;
}
- Reference<?> ref = impl.removeSuper();
- LOGGER.log(Level.FINE, "Got dequeued reference {0}", new Object[] { ref });
+ Reference<?> ref;
+ Object lck = impl.lock();
+ synchronized (lck) {
+ ref = impl.pollSuper();
+ impl = null;
+ if (ref == null) {
+ Reference<?> res = removeBetter(ACTIVE, lck);
+ LOGGER.log(Level.FINE, "Got {0} with {1}", new Object[]{res, res == null ? null : res.get()});
+ continue;
+ }
+ }
+ LOGGER.finer("dequeued reference");
if (!(ref instanceof Runnable)) {
LOGGER.log(Level.WARNING, "A reference not implementing runnable has been added to the Utilities.activeReferenceQueue(): {0}", ref.getClass());
continue;
@@ -154,4 +207,30 @@ public final class ActiveQueue {
}
}
}
+ private static <T extends Throwable> T reportError(T ex) throws IllegalStateException {
+ LOGGER.log(Level.WARNING, "Cannot hack ReferenceQueue to fix bug #206621!", ex);
+ return ex;
+ }
+
+ private static Reference<?> removeBetter(ReferenceQueue<?> q, Object lock) {
+ try {
+ Method m = q.getClass().getDeclaredMethod("reallyPoll"); // NOI18N
+ m.setAccessible(true);
+
+ Reference<?> r = (Reference<?>) m.invoke(q);
+ if (r != null) {
+ return r;
+ }
+ for (;;) {
+ lock.wait();
+ r = (Reference<?>) m.invoke(q);
+ if (r != null) {
+ return r;
+ }
+ return null;
+ }
+ } catch (Exception ex) {
+ return null;
+ }
+ }
}
diff --git a/openide.util.lookup/src/org/openide/util/lookup/package.html b/openide.util.lookup/src/org/openide/util/lookup/package.html
index 5eb3bcf..49918f8 100644
--- a/openide.util.lookup/src/org/openide/util/lookup/package.html
+++ b/openide.util.lookup/src/org/openide/util/lookup/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
diff --git a/openide.util.lookup/src/org/openide/util/package.html b/openide.util.lookup/src/org/openide/util/package.html
index 42d698e..a32fcb1 100644
--- a/openide.util.lookup/src/org/openide/util/package.html
+++ b/openide.util.lookup/src/org/openide/util/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/openide.util.lookup/test/unit/src/org/netbeans/modules/openide/util/ActiveQueueTest.java b/openide.util.lookup/test/unit/src/org/netbeans/modules/openide/util/ActiveQueueTest.java
index 4e83358..d1ae156 100644
--- a/openide.util.lookup/test/unit/src/org/netbeans/modules/openide/util/ActiveQueueTest.java
+++ b/openide.util.lookup/test/unit/src/org/netbeans/modules/openide/util/ActiveQueueTest.java
@@ -100,13 +100,11 @@ public class ActiveQueueTest extends NbTestCase{
ref.wait();
assertTrue("Run method has been executed", ref.executed);
}
- /* We can not expect to have the ActiveQueue GC'ed after fix of issue #256943.
Reference<?> r = new WeakReference<Object>(u2);
q = null;
u2 = null;
l = null;
assertGC("#86625: Utilities.class can also be collected now", r);
- */
}
diff --git a/openide.util.lookup/test/unit/src/org/openide/util/lookup/LookupPermGenLeakTest.java b/openide.util.lookup/test/unit/src/org/openide/util/lookup/LookupPermGenLeakTest.java
index 4bda61f..0bf743f 100644
--- a/openide.util.lookup/test/unit/src/org/openide/util/lookup/LookupPermGenLeakTest.java
+++ b/openide.util.lookup/test/unit/src/org/openide/util/lookup/LookupPermGenLeakTest.java
@@ -132,7 +132,7 @@ public class LookupPermGenLeakTest extends NbTestCase implements InvocationHandl
public void testClassLoaderCanGC() throws Exception {
Reference<?> ref = new WeakReference<Object>(createClass());
- // assertGC("Can be GCed", ref); TODO: Uncomment after #257013 is implemented.
+ assertGC("Can be GCed", ref);
}
private synchronized int waitForOne() throws InterruptedException {
diff --git a/openide.util.lookup/test/unit/src/org/openide/util/test/AnnotationProcessorTestUtils.java b/openide.util.lookup/test/unit/src/org/openide/util/test/AnnotationProcessorTestUtils.java
index 0723772..d9fd157 100644
--- a/openide.util.lookup/test/unit/src/org/openide/util/test/AnnotationProcessorTestUtils.java
+++ b/openide.util.lookup/test/unit/src/org/openide/util/test/AnnotationProcessorTestUtils.java
@@ -50,7 +50,6 @@ import java.io.PrintWriter;
import java.io.Writer;
import java.net.URL;
import java.net.URLClassLoader;
-import java.security.CodeSource;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
@@ -134,12 +133,7 @@ public class AnnotationProcessorTestUtils {
destG.mkdirs();
scan(args, src, srcIncludes);
JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
- Assert.assertNotNull(String.format(
- "No JSR 199 compiler impl found; perhaps tools.jar missing from CP? BootClassPath: %s. ClassPath: %s",
- System.getProperty("sun.boot.class.path"), //NOI18N
- System.getProperty("java.class.path") //NOI18N
- ),
- compiler);
+ Assert.assertNotNull("no JSR 199 compiler impl found; perhaps tools.jar missing from CP?", compiler);
//System.err.println("running javac with args: " + args);
return compiler.run(null, null, stderr, args.toArray(new String[args.size()])) == 0;
}
@@ -162,16 +156,8 @@ public class AnnotationProcessorTestUtils {
// Cannot just check for e.g. SourceVersion.RELEASE_7 because we might be running JDK 6 javac w/ JDK 7 boot CP, and that is in JRE.
// (Anyway libs.javacapi/external/nb-javac-api.jar, in the test's normal boot CP, has this!)
// Filter.class added in 7ae4016c5938, not long after f3323b1c65ee which we rely on for this to work.
- // Also cannot just check Class.forName(...) since tools.jar not in CP but ToolProvider loads it specially - not true anymore since JDK 9 ToolProvider does not look for tools.jar.
- final String res = "com/sun/tools/javac/util/Filter.class"; //NOI18N
- final CodeSource codeSource = ToolProvider.getSystemJavaCompiler().getClass().getProtectionDomain().getCodeSource();
- if (codeSource != null) {
- //Compiler from URLClassLoader - JDK7, JDK8 javac
- return new URLClassLoader(new URL[] {codeSource.getLocation()}).findResource(res) == null;
- } else {
- //Compiler from Boot, Ext, System ClassLoader - JDK9 javac
- return ClassLoader.getSystemClassLoader().getResource(res) == null;
- }
+ // Also cannot just check Class.forName(...) since tools.jar not in CP but ToolProvider loads it specially.
+ return new URLClassLoader(new URL[] {ToolProvider.getSystemJavaCompiler().getClass().getProtectionDomain().getCodeSource().getLocation()}).findResource("com/sun/tools/javac/util/Filter.class") == null;
}
}
diff --git a/openide.util.ui/apichanges.xml b/openide.util.ui/apichanges.xml
index 466009d..0c56814 100644
--- a/openide.util.ui/apichanges.xml
+++ b/openide.util.ui/apichanges.xml
@@ -329,7 +329,7 @@ made subject to such option by the copyright holder.
<p>
Some plugins needs a way to suppress <a href="@JDK@/java/net/Authenticator.html"><code>java.net.Authenticator</code></a> without asking
user a question about the credentials.
- Invoke <a href="@TOP@/org/openide/util/NetworkSettings.html#suppressAuthenticationDialog-java.util.concurrent.Callable-">
+ Invoke <a href="@TOP@/org/openide/util/NetworkSettings.html#suppressAuthenticationDialog(java.util.concurrent.Callable)">
suppressAuthenticationDialog</a> with a block of code where authentication dialog will be suppressed.
See <a href="http://wiki.netbeans.org/Authenticator">http://wiki.netbeans.org/Authenticator</a>
</p>
@@ -361,7 +361,7 @@ made subject to such option by the copyright holder.
<compatibility addition="yes"/>
<description>
<p>
- Images loaded by <a href="@TOP@/org/openide/util/ImageUtilities.html#loadImage-java.lang.String-boolean-">
+ Images loaded by <a href="@TOP@/org/openide/util/ImageUtilities.html#loadImage(java.lang.String,%20boolean)">
ImageUtilities.loadImage</a> now
respond to <code>getProperty("url", null)</code> calls.
</p>
@@ -1027,7 +1027,7 @@ made subject to such option by the copyright holder.
<description>
When one calls <a href="@org-openide-util@/org/openide/util/RequestProcessor.Task.html">RequestProcessor.Task</a>.cancel(),
the running thread gets interrupted if the
- <a href="@org-openide-util@/org/openide/util/RequestProcessor.html#RequestProcessor-java.lang.String-int-boolean-">
+ <a href="@org-openide-util@/org/openide/util/RequestProcessor.html#RequestProcessor(java.lang.String,%20int,%20boolean)">
RequestProcessor(string, int, boolean)
</a>
constructor is used.
diff --git a/openide.util.ui/arch.xml b/openide.util.ui/arch.xml
index 3bc92dc..90fd1da 100644
--- a/openide.util.ui/arch.xml
+++ b/openide.util.ui/arch.xml
@@ -144,7 +144,7 @@ made subject to such option by the copyright holder.
indirectly communicates with <a href="@org-openide-awt@/overview-summary.html">UI Utilities</a>
module using <api name="AWTBridge" category="private" group="java" type="export"
url="http://www.netbeans.org/source/browse/openide/util/src/org/netbeans/modules/openide/util/AWTBridge.java">
- a class that is looked up in <a href="@org-openide-util-lookup@/org/openide/util/Lookup.html#getDefault--">Lookup.getDefault()</a>
+ a class that is looked up in <a href="@org-openide-util-lookup@/org/openide/util/Lookup.html#getDefault()">Lookup.getDefault()</a>
and if registered can provide better UI elements for <a href="@JDK@/javax/swing/Action.html">Action</a>s.
</api>
@@ -432,9 +432,9 @@ made subject to such option by the copyright holder.
</api>.</li>
<li><api name="LookupContextGlobalProvider" category="stable" group="lookup" type="export">
- <a href="@TOP@/org/openide/util/Utilities.html#actionsGlobalContext--">actionsGlobalContext</a>
+ <a href="@TOP@/org/openide/util/Utilities.html#actionsGlobalContext()">actionsGlobalContext</a>
searches for <a href="@TOP@/org/openide/util/ContextGlobalProvider.html">ContextGlobalProvider</a> in
- <a href="@org-openide-util-lookup@/org/openide/util/Lookup.html#getDefault--">Lookup.getDefault()</a>.
+ <a href="@org-openide-util-lookup@/org/openide/util/Lookup.html#getDefault()">Lookup.getDefault()</a>.
The provider is usually provided by <a href="@org-openide-windows@/overview-summary.html">window
system implementation</a>.
</api>.</li>
@@ -591,7 +591,7 @@ made subject to such option by the copyright holder.
-->
<answer id="perf-progress">
<p>
- Actions declared as <a href="@TOP@/org/openide/util/actions/CallableSystemAction.html#asynchronous--">CallableSystemAction.asynchronous()</a>
+ Actions declared as <a href="@TOP@/org/openide/util/actions/CallableSystemAction.html#asynchronous()">CallableSystemAction.asynchronous()</a>
are executed outside of AWT thread on a dedicated request processor one.
</p>
</answer>
diff --git a/openide.util.ui/manifest.mf b/openide.util.ui/manifest.mf
index 27096c2..4aa9b6d 100644
--- a/openide.util.ui/manifest.mf
+++ b/openide.util.ui/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.util.ui
OpenIDE-Module-Localizing-Bundle: org/openide/util/Bundle.properties
-OpenIDE-Module-Specification-Version: 9.6.1
+OpenIDE-Module-Specification-Version: 9.4.1
diff --git a/openide.util.ui/nbproject/org-openide-util-ui.sig b/openide.util.ui/nbproject/org-openide-util-ui.sig
deleted file mode 100644
index 4943cdc..0000000
--- a/openide.util.ui/nbproject/org-openide-util-ui.sig
+++ /dev/null
@@ -1,1703 +0,0 @@
-#Signature file v4.1
-#Version 9.4.1
-
-CLSS public java.awt.datatransfer.Clipboard
-cons public init(java.lang.String)
-fld protected java.awt.datatransfer.ClipboardOwner owner
-fld protected java.awt.datatransfer.Transferable contents
-meth public boolean isDataFlavorAvailable(java.awt.datatransfer.DataFlavor)
-meth public java.awt.datatransfer.DataFlavor[] getAvailableDataFlavors()
-meth public java.awt.datatransfer.FlavorListener[] getFlavorListeners()
-meth public java.awt.datatransfer.Transferable getContents(java.lang.Object)
-meth public java.lang.Object getData(java.awt.datatransfer.DataFlavor) throws java.awt.datatransfer.UnsupportedFlavorException,java.io.IOException
-meth public java.lang.String getName()
-meth public void addFlavorListener(java.awt.datatransfer.FlavorListener)
-meth public void removeFlavorListener(java.awt.datatransfer.FlavorListener)
-meth public void setContents(java.awt.datatransfer.Transferable,java.awt.datatransfer.ClipboardOwner)
-supr java.lang.Object
-hfds currentDataFlavors,flavorListeners,name
-
-CLSS public abstract interface java.awt.datatransfer.Transferable
-meth public abstract boolean isDataFlavorSupported(java.awt.datatransfer.DataFlavor)
-meth public abstract java.awt.datatransfer.DataFlavor[] getTransferDataFlavors()
-meth public abstract java.lang.Object getTransferData(java.awt.datatransfer.DataFlavor) throws java.awt.datatransfer.UnsupportedFlavorException,java.io.IOException
-
-CLSS public abstract interface java.awt.event.ActionListener
-intf java.util.EventListener
-meth public abstract void actionPerformed(java.awt.event.ActionEvent)
-
-CLSS public abstract interface java.io.Closeable
-intf java.lang.AutoCloseable
-meth public abstract void close() throws java.io.IOException
-
-CLSS public abstract interface java.io.DataInput
-meth public abstract boolean readBoolean() throws java.io.IOException
-meth public abstract byte readByte() throws java.io.IOException
-meth public abstract char readChar() throws java.io.IOException
-meth public abstract double readDouble() throws java.io.IOException
-meth public abstract float readFloat() throws java.io.IOException
-meth public abstract int readInt() throws java.io.IOException
-meth public abstract int readUnsignedByte() throws java.io.IOException
-meth public abstract int readUnsignedShort() throws java.io.IOException
-meth public abstract int skipBytes(int) throws java.io.IOException
-meth public abstract java.lang.String readLine() throws java.io.IOException
-meth public abstract java.lang.String readUTF() throws java.io.IOException
-meth public abstract long readLong() throws java.io.IOException
-meth public abstract short readShort() throws java.io.IOException
-meth public abstract void readFully(byte[]) throws java.io.IOException
-meth public abstract void readFully(byte[],int,int) throws java.io.IOException
-
-CLSS public abstract interface java.io.DataOutput
-meth public abstract void write(byte[]) throws java.io.IOException
-meth public abstract void write(byte[],int,int) throws java.io.IOException
-meth public abstract void write(int) throws java.io.IOException
-meth public abstract void writeBoolean(boolean) throws java.io.IOException
-meth public abstract void writeByte(int) throws java.io.IOException
-meth public abstract void writeBytes(java.lang.String) throws java.io.IOException
-meth public abstract void writeChar(int) throws java.io.IOException
-meth public abstract void writeChars(java.lang.String) throws java.io.IOException
-meth public abstract void writeDouble(double) throws java.io.IOException
-meth public abstract void writeFloat(float) throws java.io.IOException
-meth public abstract void writeInt(int) throws java.io.IOException
-meth public abstract void writeLong(long) throws java.io.IOException
-meth public abstract void writeShort(int) throws java.io.IOException
-meth public abstract void writeUTF(java.lang.String) throws java.io.IOException
-
-CLSS public abstract interface java.io.Externalizable
-intf java.io.Serializable
-meth public abstract void readExternal(java.io.ObjectInput) throws java.io.IOException,java.lang.ClassNotFoundException
-meth public abstract void writeExternal(java.io.ObjectOutput) throws java.io.IOException
-
-CLSS public abstract interface java.io.Flushable
-meth public abstract void flush() throws java.io.IOException
-
-CLSS public java.io.IOException
-cons public init()
-cons public init(java.lang.String)
-cons public init(java.lang.String,java.lang.Throwable)
-cons public init(java.lang.Throwable)
-supr java.lang.Exception
-hfds serialVersionUID
-
-CLSS public abstract java.io.InputStream
-cons public init()
-intf java.io.Closeable
-meth public abstract int read() throws java.io.IOException
-meth public boolean markSupported()
-meth public int available() throws java.io.IOException
-meth public int read(byte[]) throws java.io.IOException
-meth public int read(byte[],int,int) throws java.io.IOException
-meth public long skip(long) throws java.io.IOException
-meth public void close() throws java.io.IOException
-meth public void mark(int)
-meth public void reset() throws java.io.IOException
-supr java.lang.Object
-hfds MAX_SKIP_BUFFER_SIZE
-
-CLSS public abstract interface java.io.ObjectInput
-intf java.io.DataInput
-intf java.lang.AutoCloseable
-meth public abstract int available() throws java.io.IOException
-meth public abstract int read() throws java.io.IOException
-meth public abstract int read(byte[]) throws java.io.IOException
-meth public abstract int read(byte[],int,int) throws java.io.IOException
-meth public abstract java.lang.Object readObject() throws java.io.IOException,java.lang.ClassNotFoundException
-meth public abstract long skip(long) throws java.io.IOException
-meth public abstract void close() throws java.io.IOException
-
-CLSS public java.io.ObjectInputStream
-cons protected init() throws java.io.IOException
-cons public init(java.io.InputStream) throws java.io.IOException
-innr public abstract static GetField
-intf java.io.ObjectInput
-intf java.io.ObjectStreamConstants
-meth protected boolean enableResolveObject(boolean)
-meth protected java.io.ObjectStreamClass readClassDescriptor() throws java.io.IOException,java.lang.ClassNotFoundException
-meth protected java.lang.Class<?> resolveClass(java.io.ObjectStreamClass) throws java.io.IOException,java.lang.ClassNotFoundException
-meth protected java.lang.Class<?> resolveProxyClass(java.lang.String[]) throws java.io.IOException,java.lang.ClassNotFoundException
-meth protected java.lang.Object readObjectOverride() throws java.io.IOException,java.lang.ClassNotFoundException
-meth protected java.lang.Object resolveObject(java.lang.Object) throws java.io.IOException
-meth protected void readStreamHeader() throws java.io.IOException
-meth public boolean readBoolean() throws java.io.IOException
-meth public byte readByte() throws java.io.IOException
-meth public char readChar() throws java.io.IOException
-meth public double readDouble() throws java.io.IOException
-meth public final java.lang.Object readObject() throws java.io.IOException,java.lang.ClassNotFoundException
-meth public float readFloat() throws java.io.IOException
-meth public int available() throws java.io.IOException
-meth public int read() throws java.io.IOException
-meth public int read(byte[],int,int) throws java.io.IOException
-meth public int readInt() throws java.io.IOException
-meth public int readUnsignedByte() throws java.io.IOException
-meth public int readUnsignedShort() throws java.io.IOException
-meth public int skipBytes(int) throws java.io.IOException
-meth public java.io.ObjectInputStream$GetField readFields() throws java.io.IOException,java.lang.ClassNotFoundException
-meth public java.lang.Object readUnshared() throws java.io.IOException,java.lang.ClassNotFoundException
-meth public java.lang.String readLine() throws java.io.IOException
- anno 0 java.lang.Deprecated()
-meth public java.lang.String readUTF() throws java.io.IOException
-meth public long readLong() throws java.io.IOException
-meth public short readShort() throws java.io.IOException
-meth public void close() throws java.io.IOException
-meth public void defaultReadObject() throws java.io.IOException,java.lang.ClassNotFoundException
-meth public void readFully(byte[]) throws java.io.IOException
-meth public void readFully(byte[],int,int) throws java.io.IOException
-meth public void registerValidation(java.io.ObjectInputValidation,int) throws java.io.InvalidObjectException,java.io.NotActiveException
-supr java.io.InputStream
-hfds NULL_HANDLE,bin,closed,curContext,defaultDataEnd,depth,enableOverride,enableResolve,handles,passHandle,primClasses,primVals,unsharedMarker,vlist
-hcls BlockDataInputStream,Caches,GetFieldImpl,HandleTable,PeekInputStream,ValidationList
-
-CLSS public abstract interface java.io.ObjectOutput
-intf java.io.DataOutput
-intf java.lang.AutoCloseable
-meth public abstract void close() throws java.io.IOException
-meth public abstract void flush() throws java.io.IOException
-meth public abstract void write(byte[]) throws java.io.IOException
-meth public abstract void write(byte[],int,int) throws java.io.IOException
-meth public abstract void write(int) throws java.io.IOException
-meth public abstract void writeObject(java.lang.Object) throws java.io.IOException
-
-CLSS public java.io.ObjectOutputStream
-cons protected init() throws java.io.IOException
-cons public init(java.io.OutputStream) throws java.io.IOException
-innr public abstract static PutField
-intf java.io.ObjectOutput
-intf java.io.ObjectStreamConstants
-meth protected boolean enableReplaceObject(boolean)
-meth protected java.lang.Object replaceObject(java.lang.Object) throws java.io.IOException
-meth protected void annotateClass(java.lang.Class<?>) throws java.io.IOException
-meth protected void annotateProxyClass(java.lang.Class<?>) throws java.io.IOException
-meth protected void drain() throws java.io.IOException
-meth protected void writeClassDescriptor(java.io.ObjectStreamClass) throws java.io.IOException
-meth protected void writeObjectOverride(java.lang.Object) throws java.io.IOException
-meth protected void writeStreamHeader() throws java.io.IOException
-meth public final void writeObject(java.lang.Object) throws java.io.IOException
-meth public java.io.ObjectOutputStream$PutField putFields() throws java.io.IOException
-meth public void close() throws java.io.IOException
-meth public void defaultWriteObject() throws java.io.IOException
-meth public void flush() throws java.io.IOException
-meth public void reset() throws java.io.IOException
-meth public void useProtocolVersion(int) throws java.io.IOException
-meth public void write(byte[]) throws java.io.IOException
-meth public void write(byte[],int,int) throws java.io.IOException
-meth public void write(int) throws java.io.IOException
-meth public void writeBoolean(boolean) throws java.io.IOException
-meth public void writeByte(int) throws java.io.IOException
-meth public void writeBytes(java.lang.String) throws java.io.IOException
-meth public void writeChar(int) throws java.io.IOException
-meth public void writeChars(java.lang.String) throws java.io.IOException
-meth public void writeDouble(double) throws java.io.IOException
-meth public void writeFields() throws java.io.IOException
-meth public void writeFloat(float) throws java.io.IOException
-meth public void writeInt(int) throws java.io.IOException
-meth public void writeLong(long) throws java.io.IOException
-meth public void writeShort(int) throws java.io.IOException
-meth public void writeUTF(java.lang.String) throws java.io.IOException
-meth public void writeUnshared(java.lang.Object) throws java.io.IOException
-supr java.io.OutputStream
-hfds bout,curContext,curPut,debugInfoStack,depth,enableOverride,enableReplace,extendedDebugInfo,handles,primVals,protocol,subs
-hcls BlockDataOutputStream,Caches,DebugTraceInfoStack,HandleTable,PutFieldImpl,ReplaceTable
-
-CLSS public abstract interface java.io.ObjectStreamConstants
-fld public final static byte SC_BLOCK_DATA = 8
-fld public final static byte SC_ENUM = 16
-fld public final static byte SC_EXTERNALIZABLE = 4
-fld public final static byte SC_SERIALIZABLE = 2
-fld public final static byte SC_WRITE_METHOD = 1
-fld public final static byte TC_ARRAY = 117
-fld public final static byte TC_BASE = 112
-fld public final static byte TC_BLOCKDATA = 119
-fld public final static byte TC_BLOCKDATALONG = 122
-fld public final static byte TC_CLASS = 118
-fld public final static byte TC_CLASSDESC = 114
-fld public final static byte TC_ENDBLOCKDATA = 120
-fld public final static byte TC_ENUM = 126
-fld public final static byte TC_EXCEPTION = 123
-fld public final static byte TC_LONGSTRING = 124
-fld public final static byte TC_MAX = 126
-fld public final static byte TC_NULL = 112
-fld public final static byte TC_OBJECT = 115
-fld public final static byte TC_PROXYCLASSDESC = 125
-fld public final static byte TC_REFERENCE = 113
-fld public final static byte TC_RESET = 121
-fld public final static byte TC_STRING = 116
-fld public final static int PROTOCOL_VERSION_1 = 1
-fld public final static int PROTOCOL_VERSION_2 = 2
-fld public final static int baseWireHandle = 8257536
-fld public final static java.io.SerializablePermission SUBCLASS_IMPLEMENTATION_PERMISSION
-fld public final static java.io.SerializablePermission SUBSTITUTION_PERMISSION
-fld public final static short STREAM_MAGIC = -21267
-fld public final static short STREAM_VERSION = 5
-
-CLSS public abstract java.io.OutputStream
-cons public init()
-intf java.io.Closeable
-intf java.io.Flushable
-meth public abstract void write(int) throws java.io.IOException
-meth public void close() throws java.io.IOException
-meth public void flush() throws java.io.IOException
-meth public void write(byte[]) throws java.io.IOException
-meth public void write(byte[],int,int) throws java.io.IOException
-supr java.lang.Object
-
-CLSS public abstract interface java.io.Serializable
-
-CLSS public abstract interface java.lang.AutoCloseable
-meth public abstract void close() throws java.lang.Exception
-
-CLSS public abstract interface java.lang.Cloneable
-
-CLSS public abstract interface !annotation java.lang.Deprecated
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE])
-intf java.lang.annotation.Annotation
-
-CLSS public java.lang.Exception
-cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean)
-cons public init()
-cons public init(java.lang.String)
-cons public init(java.lang.String,java.lang.Throwable)
-cons public init(java.lang.Throwable)
-supr java.lang.Throwable
-hfds serialVersionUID
-
-CLSS public abstract interface java.lang.Iterable<%0 extends java.lang.Object>
-meth public abstract java.util.Iterator<{java.lang.Iterable%0}> iterator()
-
-CLSS public java.lang.Object
-cons public init()
-meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
-meth protected void finalize() throws java.lang.Throwable
-meth public boolean equals(java.lang.Object)
-meth public final java.lang.Class<?> getClass()
-meth public final void notify()
-meth public final void notifyAll()
-meth public final void wait() throws java.lang.InterruptedException
-meth public final void wait(long) throws java.lang.InterruptedException
-meth public final void wait(long,int) throws java.lang.InterruptedException
-meth public int hashCode()
-meth public java.lang.String toString()
-
-CLSS public abstract interface java.lang.Runnable
-meth public abstract void run()
-
-CLSS public java.lang.RuntimeException
-cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean)
-cons public init()
-cons public init(java.lang.String)
-cons public init(java.lang.String,java.lang.Throwable)
-cons public init(java.lang.Throwable)
-supr java.lang.Exception
-hfds serialVersionUID
-
-CLSS public java.lang.Throwable
-cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean)
-cons public init()
-cons public init(java.lang.String)
-cons public init(java.lang.String,java.lang.Throwable)
-cons public init(java.lang.Throwable)
-intf java.io.Serializable
-meth public final java.lang.Throwable[] getSuppressed()
-meth public final void addSuppressed(java.lang.Throwable)
-meth public java.lang.StackTraceElement[] getStackTrace()
-meth public java.lang.String getLocalizedMessage()
-meth public java.lang.String getMessage()
-meth public java.lang.String toString()
-meth public java.lang.Throwable fillInStackTrace()
-meth public java.lang.Throwable getCause()
-meth public java.lang.Throwable initCause(java.lang.Throwable)
-meth public void printStackTrace()
-meth public void printStackTrace(java.io.PrintStream)
-meth public void printStackTrace(java.io.PrintWriter)
-meth public void setStackTrace(java.lang.StackTraceElement[])
-supr java.lang.Object
-hfds CAUSE_CAPTION,EMPTY_THROWABLE_ARRAY,NULL_CAUSE_MESSAGE,SELF_SUPPRESSION_MESSAGE,SUPPRESSED_CAPTION,SUPPRESSED_SENTINEL,UNASSIGNED_STACK,backtrace,cause,detailMessage,serialVersionUID,stackTrace,suppressedExceptions
-hcls PrintStreamOrWriter,SentinelHolder,WrappedPrintStream,WrappedPrintWriter
-
-CLSS public abstract interface java.lang.annotation.Annotation
-meth public abstract boolean equals(java.lang.Object)
-meth public abstract int hashCode()
-meth public abstract java.lang.Class<? extends java.lang.annotation.Annotation> annotationType()
-meth public abstract java.lang.String toString()
-
-CLSS public abstract interface !annotation java.lang.annotation.Documented
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-
-CLSS public abstract interface !annotation java.lang.annotation.Retention
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract java.lang.annotation.RetentionPolicy value()
-
-CLSS public abstract interface !annotation java.lang.annotation.Target
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract java.lang.annotation.ElementType[] value()
-
-CLSS public abstract java.text.Format
-cons protected init()
-innr public static Field
-intf java.io.Serializable
-intf java.lang.Cloneable
-meth public abstract java.lang.Object parseObject(java.lang.String,java.text.ParsePosition)
-meth public abstract java.lang.StringBuffer format(java.lang.Object,java.lang.StringBuffer,java.text.FieldPosition)
-meth public final java.lang.String format(java.lang.Object)
-meth public java.lang.Object clone()
-meth public java.lang.Object parseObject(java.lang.String) throws java.text.ParseException
-meth public java.text.AttributedCharacterIterator formatToCharacterIterator(java.lang.Object)
-supr java.lang.Object
-hfds serialVersionUID
-hcls FieldDelegate
-
-CLSS public abstract java.util.AbstractCollection<%0 extends java.lang.Object>
-cons protected init()
-intf java.util.Collection<{java.util.AbstractCollection%0}>
-meth public <%0 extends java.lang.Object> {%%0}[] toArray({%%0}[])
-meth public abstract int size()
-meth public abstract java.util.Iterator<{java.util.AbstractCollection%0}> iterator()
-meth public boolean add({java.util.AbstractCollection%0})
-meth public boolean addAll(java.util.Collection<? extends {java.util.AbstractCollection%0}>)
-meth public boolean contains(java.lang.Object)
-meth public boolean containsAll(java.util.Collection<?>)
-meth public boolean isEmpty()
-meth public boolean remove(java.lang.Object)
-meth public boolean removeAll(java.util.Collection<?>)
-meth public boolean retainAll(java.util.Collection<?>)
-meth public java.lang.Object[] toArray()
-meth public java.lang.String toString()
-meth public void clear()
-supr java.lang.Object
-hfds MAX_ARRAY_SIZE
-
-CLSS public abstract java.util.AbstractMap<%0 extends java.lang.Object, %1 extends java.lang.Object>
-cons protected init()
-innr public static SimpleEntry
-innr public static SimpleImmutableEntry
-intf java.util.Map<{java.util.AbstractMap%0},{java.util.AbstractMap%1}>
-meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
-meth public abstract java.util.Set<java.util.Map$Entry<{java.util.AbstractMap%0},{java.util.AbstractMap%1}>> entrySet()
-meth public boolean containsKey(java.lang.Object)
-meth public boolean containsValue(java.lang.Object)
-meth public boolean equals(java.lang.Object)
-meth public boolean isEmpty()
-meth public int hashCode()
-meth public int size()
-meth public java.lang.String toString()
-meth public java.util.Collection<{java.util.AbstractMap%1}> values()
-meth public java.util.Set<{java.util.AbstractMap%0}> keySet()
-meth public void clear()
-meth public void putAll(java.util.Map<? extends {java.util.AbstractMap%0},? extends {java.util.AbstractMap%1}>)
-meth public {java.util.AbstractMap%1} get(java.lang.Object)
-meth public {java.util.AbstractMap%1} put({java.util.AbstractMap%0},{java.util.AbstractMap%1})
-meth public {java.util.AbstractMap%1} remove(java.lang.Object)
-supr java.lang.Object
-hfds keySet,values
-
-CLSS public abstract java.util.AbstractSet<%0 extends java.lang.Object>
-cons protected init()
-intf java.util.Set<{java.util.AbstractSet%0}>
-meth public boolean equals(java.lang.Object)
-meth public boolean removeAll(java.util.Collection<?>)
-meth public int hashCode()
-supr java.util.AbstractCollection<{java.util.AbstractSet%0}>
-
-CLSS public abstract interface java.util.Collection<%0 extends java.lang.Object>
-intf java.lang.Iterable<{java.util.Collection%0}>
-meth public abstract <%0 extends java.lang.Object> {%%0}[] toArray({%%0}[])
-meth public abstract boolean add({java.util.Collection%0})
-meth public abstract boolean addAll(java.util.Collection<? extends {java.util.Collection%0}>)
-meth public abstract boolean contains(java.lang.Object)
-meth public abstract boolean containsAll(java.util.Collection<?>)
-meth public abstract boolean equals(java.lang.Object)
-meth public abstract boolean isEmpty()
-meth public abstract boolean remove(java.lang.Object)
-meth public abstract boolean removeAll(java.util.Collection<?>)
-meth public abstract boolean retainAll(java.util.Collection<?>)
-meth public abstract int hashCode()
-meth public abstract int size()
-meth public abstract java.lang.Object[] toArray()
-meth public abstract java.util.Iterator<{java.util.Collection%0}> iterator()
-meth public abstract void clear()
-
-CLSS public abstract interface java.util.EventListener
-
-CLSS public java.util.EventObject
-cons public init(java.lang.Object)
-fld protected java.lang.Object source
-intf java.io.Serializable
-meth public java.lang.Object getSource()
-meth public java.lang.String toString()
-supr java.lang.Object
-hfds serialVersionUID
-
-CLSS public abstract interface java.util.Map<%0 extends java.lang.Object, %1 extends java.lang.Object>
-innr public abstract interface static Entry
-meth public abstract boolean containsKey(java.lang.Object)
-meth public abstract boolean containsValue(java.lang.Object)
-meth public abstract boolean equals(java.lang.Object)
-meth public abstract boolean isEmpty()
-meth public abstract int hashCode()
-meth public abstract int size()
-meth public abstract java.util.Collection<{java.util.Map%1}> values()
-meth public abstract java.util.Set<java.util.Map$Entry<{java.util.Map%0},{java.util.Map%1}>> entrySet()
-meth public abstract java.util.Set<{java.util.Map%0}> keySet()
-meth public abstract void clear()
-meth public abstract void putAll(java.util.Map<? extends {java.util.Map%0},? extends {java.util.Map%1}>)
-meth public abstract {java.util.Map%1} get(java.lang.Object)
-meth public abstract {java.util.Map%1} put({java.util.Map%0},{java.util.Map%1})
-meth public abstract {java.util.Map%1} remove(java.lang.Object)
-
-CLSS public abstract interface java.util.Set<%0 extends java.lang.Object>
-intf java.util.Collection<{java.util.Set%0}>
-meth public abstract <%0 extends java.lang.Object> {%%0}[] toArray({%%0}[])
-meth public abstract boolean add({java.util.Set%0})
-meth public abstract boolean addAll(java.util.Collection<? extends {java.util.Set%0}>)
-meth public abstract boolean contains(java.lang.Object)
-meth public abstract boolean containsAll(java.util.Collection<?>)
-meth public abstract boolean equals(java.lang.Object)
-meth public abstract boolean isEmpty()
-meth public abstract boolean remove(java.lang.Object)
-meth public abstract boolean removeAll(java.util.Collection<?>)
-meth public abstract boolean retainAll(java.util.Collection<?>)
-meth public abstract int hashCode()
-meth public abstract int size()
-meth public abstract java.lang.Object[] toArray()
-meth public abstract java.util.Iterator<{java.util.Set%0}> iterator()
-meth public abstract void clear()
-
-CLSS public abstract interface java.util.concurrent.Executor
-meth public abstract void execute(java.lang.Runnable)
-
-CLSS public abstract interface java.util.concurrent.ExecutorService
-intf java.util.concurrent.Executor
-meth public abstract <%0 extends java.lang.Object> java.util.List<java.util.concurrent.Future<{%%0}>> invokeAll(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>) throws java.lang.InterruptedException
-meth public abstract <%0 extends java.lang.Object> java.util.List<java.util.concurrent.Future<{%%0}>> invokeAll(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>,long,java.util.concurrent.TimeUnit) throws java.lang.InterruptedException
-meth public abstract <%0 extends java.lang.Object> java.util.concurrent.Future<{%%0}> submit(java.lang.Runnable,{%%0})
-meth public abstract <%0 extends java.lang.Object> java.util.concurrent.Future<{%%0}> submit(java.util.concurrent.Callable<{%%0}>)
-meth public abstract <%0 extends java.lang.Object> {%%0} invokeAny(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>) throws java.lang.InterruptedException,java.util.concurrent.ExecutionException
-meth public abstract <%0 extends java.lang.Object> {%%0} invokeAny(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>,long,java.util.concurrent.TimeUnit) throws java.lang.InterruptedException,java.util.concurrent.ExecutionException,java.util.concurrent.TimeoutException
-meth public abstract boolean awaitTermination(long,java.util.concurrent.TimeUnit) throws java.lang.InterruptedException
-meth public abstract boolean isShutdown()
-meth public abstract boolean isTerminated()
-meth public abstract java.util.List<java.lang.Runnable> shutdownNow()
-meth public abstract java.util.concurrent.Future<?> submit(java.lang.Runnable)
-meth public abstract void shutdown()
-
-CLSS public abstract interface java.util.concurrent.ScheduledExecutorService
-intf java.util.concurrent.ExecutorService
-meth public abstract <%0 extends java.lang.Object> java.util.concurrent.ScheduledFuture<{%%0}> schedule(java.util.concurrent.Callable<{%%0}>,long,java.util.concurrent.TimeUnit)
-meth public abstract java.util.concurrent.ScheduledFuture<?> schedule(java.lang.Runnable,long,java.util.concurrent.TimeUnit)
-meth public abstract java.util.concurrent.ScheduledFuture<?> scheduleAtFixedRate(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)
-meth public abstract java.util.concurrent.ScheduledFuture<?> scheduleWithFixedDelay(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)
-
-CLSS public abstract interface javax.swing.Action
-fld public final static java.lang.String ACCELERATOR_KEY = "AcceleratorKey"
-fld public final static java.lang.String ACTION_COMMAND_KEY = "ActionCommandKey"
-fld public final static java.lang.String DEFAULT = "Default"
-fld public final static java.lang.String DISPLAYED_MNEMONIC_INDEX_KEY = "SwingDisplayedMnemonicIndexKey"
-fld public final static java.lang.String LARGE_ICON_KEY = "SwingLargeIconKey"
-fld public final static java.lang.String LONG_DESCRIPTION = "LongDescription"
-fld public final static java.lang.String MNEMONIC_KEY = "MnemonicKey"
-fld public final static java.lang.String NAME = "Name"
-fld public final static java.lang.String SELECTED_KEY = "SwingSelectedKey"
-fld public final static java.lang.String SHORT_DESCRIPTION = "ShortDescription"
-fld public final static java.lang.String SMALL_ICON = "SmallIcon"
-intf java.awt.event.ActionListener
-meth public abstract boolean isEnabled()
-meth public abstract java.lang.Object getValue(java.lang.String)
-meth public abstract void addPropertyChangeListener(java.beans.PropertyChangeListener)
-meth public abstract void putValue(java.lang.String,java.lang.Object)
-meth public abstract void removePropertyChangeListener(java.beans.PropertyChangeListener)
-meth public abstract void setEnabled(boolean)
-
-CLSS public abstract org.openide.ErrorManager
-cons public init()
-fld public final static int ERROR = 65536
-fld public final static int EXCEPTION = 4096
-fld public final static int INFORMATIONAL = 1
-fld public final static int UNKNOWN = 0
-fld public final static int USER = 256
-fld public final static int WARNING = 16
-innr public abstract interface static Annotation
-meth public abstract java.lang.Throwable annotate(java.lang.Throwable,int,java.lang.String,java.lang.String,java.lang.Throwable,java.util.Date)
-meth public abstract java.lang.Throwable attachAnnotations(java.lang.Throwable,org.openide.ErrorManager$Annotation[])
-meth public abstract org.openide.ErrorManager getInstance(java.lang.String)
-meth public abstract org.openide.ErrorManager$Annotation[] findAnnotations(java.lang.Throwable)
-meth public abstract void log(int,java.lang.String)
-meth public abstract void notify(int,java.lang.Throwable)
-meth public boolean isLoggable(int)
-meth public boolean isNotifiable(int)
-meth public final java.lang.Throwable annotate(java.lang.Throwable,java.lang.String)
-meth public final java.lang.Throwable annotate(java.lang.Throwable,java.lang.Throwable)
-meth public final java.lang.Throwable copyAnnotation(java.lang.Throwable,java.lang.Throwable)
- anno 0 java.lang.Deprecated()
-meth public final void log(java.lang.String)
-meth public final void notify(java.lang.Throwable)
-meth public static org.openide.ErrorManager getDefault()
-supr java.lang.Object
-hfds current
-hcls AnnException,DelegatingErrorManager,OwnLevel
-
-CLSS public abstract interface static org.openide.ErrorManager$Annotation
- outer org.openide.ErrorManager
-meth public abstract int getSeverity()
-meth public abstract java.lang.String getLocalizedMessage()
-meth public abstract java.lang.String getMessage()
-meth public abstract java.lang.Throwable getStackTrace()
-meth public abstract java.util.Date getDate()
-
-CLSS public abstract org.openide.LifecycleManager
-cons protected init()
-meth public abstract void exit()
-meth public abstract void saveAll()
-meth public static org.openide.LifecycleManager getDefault()
-meth public void exit(int)
-meth public void markForRestart()
-supr java.lang.Object
-hcls Trivial
-
-CLSS public abstract org.openide.ServiceType
- anno 0 java.lang.Deprecated()
-cons public init()
-fld public final static java.lang.String PROP_NAME = "name"
-innr public abstract static Registry
-innr public final static Handle
-intf java.io.Serializable
-intf org.openide.util.HelpCtx$Provider
-meth protected final void firePropertyChange(java.lang.String,java.lang.Object,java.lang.Object)
-meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
- anno 0 java.lang.Deprecated()
-meth protected java.lang.String displayName()
-meth public abstract org.openide.util.HelpCtx getHelpCtx()
-meth public final org.openide.ServiceType createClone()
- anno 0 java.lang.Deprecated()
-meth public final void addPropertyChangeListener(java.beans.PropertyChangeListener)
-meth public final void removePropertyChangeListener(java.beans.PropertyChangeListener)
-meth public java.lang.String getName()
-meth public void setName(java.lang.String)
-supr java.lang.Object
-hfds err,name,serialVersionUID,supp
-
-CLSS public final static org.openide.ServiceType$Handle
- outer org.openide.ServiceType
- anno 0 java.lang.Deprecated()
-cons public init(org.openide.ServiceType)
-intf java.io.Serializable
-meth public java.lang.String toString()
-meth public org.openide.ServiceType getServiceType()
-supr java.lang.Object
-hfds className,name,serialVersionUID,serviceType
-
-CLSS public abstract static org.openide.ServiceType$Registry
- outer org.openide.ServiceType
- anno 0 java.lang.Deprecated()
-cons public init()
-intf java.io.Serializable
-meth public <%0 extends org.openide.ServiceType> java.util.Enumeration<{%%0}> services(java.lang.Class<{%%0}>)
-meth public abstract java.util.Enumeration<org.openide.ServiceType> services()
-meth public abstract java.util.List getServiceTypes()
-meth public abstract void setServiceTypes(java.util.List)
- anno 0 java.lang.Deprecated()
-meth public org.openide.ServiceType find(java.lang.Class)
- anno 0 java.lang.Deprecated()
-meth public org.openide.ServiceType find(java.lang.String)
-supr java.lang.Object
-hfds serialVersionUID
-
-CLSS public abstract interface org.openide.util.AsyncGUIJob
-meth public abstract void construct()
-meth public abstract void finished()
-
-CLSS public abstract org.openide.util.BaseUtilities
-fld public final static int OS_AIX = 64
-fld public final static int OS_DEC = 1024
- anno 0 java.lang.Deprecated()
-fld public final static int OS_FREEBSD = 131072
-fld public final static int OS_HP = 32
-fld public final static int OS_IRIX = 128
-fld public final static int OS_LINUX = 16
-fld public final static int OS_MAC = 4096
-fld public final static int OS_OPENBSD = 1048576
-fld public final static int OS_OS2 = 2048
-fld public final static int OS_OTHER = 65536
-fld public final static int OS_SOLARIS = 8
-fld public final static int OS_SUNOS = 256
-fld public final static int OS_TRU64 = 512
-fld public final static int OS_UNIX_MASK = 1709048
- anno 0 java.lang.Deprecated()
-fld public final static int OS_UNIX_OTHER = 524288
-fld public final static int OS_VMS = 16384
-fld public final static int OS_WIN2000 = 8192
-fld public final static int OS_WIN95 = 2
-fld public final static int OS_WIN98 = 4
-fld public final static int OS_WINDOWS_MASK = 303111
- anno 0 java.lang.Deprecated()
-fld public final static int OS_WINNT = 1
-fld public final static int OS_WINVISTA = 262144
-fld public final static int OS_WIN_OTHER = 32768
-meth public static <%0 extends java.lang.Object> java.util.List<{%%0}> topologicalSort(java.util.Collection<? extends {%%0}>,java.util.Map<? super {%%0},? extends java.util.Collection<? extends {%%0}>>) throws org.openide.util.TopologicalSortException
-meth public static boolean compareObjects(java.lang.Object,java.lang.Object)
-meth public static boolean compareObjectsImpl(java.lang.Object,java.lang.Object,int)
-meth public static boolean isJavaIdentifier(java.lang.String)
-meth public static boolean isMac()
-meth public static boolean isUnix()
-meth public static boolean isWindows()
-meth public static int getOperatingSystem()
-meth public static java.io.File toFile(java.net.URI)
-meth public static java.lang.Class<?> getObjectType(java.lang.Class<?>)
-meth public static java.lang.Class<?> getPrimitiveType(java.lang.Class<?>)
-meth public static java.lang.Object toPrimitiveArray(java.lang.Object[])
-meth public static java.lang.Object[] toObjectArray(java.lang.Object)
-meth public static java.lang.String escapeParameters(java.lang.String[])
-meth public static java.lang.String getClassName(java.lang.Class<?>)
-meth public static java.lang.String getShortClassName(java.lang.Class<?>)
-meth public static java.lang.String pureClassName(java.lang.String)
-meth public static java.lang.String translate(java.lang.String)
-meth public static java.lang.String wrapString(java.lang.String,int,java.text.BreakIterator,boolean)
-meth public static java.lang.String[] parseParameters(java.lang.String)
-meth public static java.lang.String[] wrapStringToArray(java.lang.String,int,java.text.BreakIterator,boolean)
-meth public static java.lang.ref.ReferenceQueue<java.lang.Object> activeReferenceQueue()
-meth public static java.net.URI toURI(java.io.File)
-supr java.lang.Object
-hfds LOG,TRANS_LOCK,operatingSystem,pathURIConsistent,transExp,transLoader
-hcls RE
-
-CLSS public abstract interface org.openide.util.Cancellable
-meth public abstract boolean cancel()
-
-CLSS public final org.openide.util.ChangeSupport
-cons public init(java.lang.Object)
-meth public boolean hasListeners()
-meth public void addChangeListener(javax.swing.event.ChangeListener)
-meth public void fireChange()
-meth public void removeChangeListener(javax.swing.event.ChangeListener)
-supr java.lang.Object
-hfds LOG,listeners,source
-
-CLSS public final org.openide.util.CharSequences
-meth public static boolean isCompact(java.lang.CharSequence)
-meth public static int indexOf(java.lang.CharSequence,java.lang.CharSequence)
-meth public static int indexOf(java.lang.CharSequence,java.lang.CharSequence,int)
-meth public static java.lang.CharSequence create(char[],int,int)
-meth public static java.lang.CharSequence create(java.lang.CharSequence)
-meth public static java.lang.CharSequence empty()
-meth public static java.util.Comparator<java.lang.CharSequence> comparator()
-supr java.lang.Object
-hfds Comparator,EMPTY,decodeTable,encodeTable
-hcls ByteBasedSequence,CharBasedSequence,CharSequenceComparator,CompactCharSequence,Fixed6Bit_11_20,Fixed6Bit_1_10,Fixed6Bit_21_30,Fixed_0_7,Fixed_16_23,Fixed_8_15
-
-CLSS public abstract interface org.openide.util.ContextAwareAction
-intf javax.swing.Action
-meth public abstract javax.swing.Action createContextAwareInstance(org.openide.util.Lookup)
-
-CLSS public abstract interface org.openide.util.ContextGlobalProvider
-meth public abstract org.openide.util.Lookup createGlobalContext()
-
-CLSS public final org.openide.util.EditableProperties
-cons public init(boolean)
-intf java.lang.Cloneable
-meth public java.lang.Object clone()
-meth public java.lang.String get(java.lang.Object)
-meth public java.lang.String getProperty(java.lang.String)
-meth public java.lang.String put(java.lang.String,java.lang.String)
-meth public java.lang.String setProperty(java.lang.String,java.lang.String)
-meth public java.lang.String setProperty(java.lang.String,java.lang.String[])
-meth public java.lang.String[] getComment(java.lang.String)
-meth public java.util.Set<java.util.Map$Entry<java.lang.String,java.lang.String>> entrySet()
-meth public org.openide.util.EditableProperties cloneProperties()
-meth public void load(java.io.InputStream) throws java.io.IOException
-meth public void setComment(java.lang.String,java.lang.String[],boolean)
-meth public void store(java.io.OutputStream) throws java.io.IOException
-supr java.util.AbstractMap<java.lang.String,java.lang.String>
-hfds INDENT,READING_KEY_VALUE,WAITING_FOR_KEY_VALUE,alphabetize,state
-hcls Item,IteratorImpl,MapEntryImpl,SetImpl,State
-
-CLSS public final org.openide.util.Enumerations
-innr public abstract interface static Processor
-meth public !varargs static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> array({%%0}[])
-meth public final static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> empty()
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Enumeration<{%%1}> convert(java.util.Enumeration<? extends {%%0}>,org.openide.util.Enumerations$Processor<{%%0},{%%1}>)
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Enumeration<{%%1}> filter(java.util.Enumeration<? extends {%%0}>,org.openide.util.Enumerations$Processor<{%%0},{%%1}>)
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Enumeration<{%%1}> queue(java.util.Enumeration<? extends {%%0}>,org.openide.util.Enumerations$Processor<{%%0},{%%1}>)
-meth public static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> concat(java.util.Enumeration<? extends java.util.Enumeration<? extends {%%0}>>)
-meth public static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> concat(java.util.Enumeration<? extends {%%0}>,java.util.Enumeration<? extends {%%0}>)
-meth public static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> removeDuplicates(java.util.Enumeration<{%%0}>)
-meth public static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> removeNulls(java.util.Enumeration<{%%0}>)
-meth public static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> singleton({%%0})
-supr java.lang.Object
-hcls AltEn,FilEn,QEn,RNulls,SeqEn
-
-CLSS public abstract interface static org.openide.util.Enumerations$Processor<%0 extends java.lang.Object, %1 extends java.lang.Object>
- outer org.openide.util.Enumerations
-meth public abstract {org.openide.util.Enumerations$Processor%1} process({org.openide.util.Enumerations$Processor%0},java.util.Collection<{org.openide.util.Enumerations$Processor%0}>)
-
-CLSS public final org.openide.util.Exceptions
-meth public static <%0 extends java.lang.Throwable> {%%0} attachLocalizedMessage({%%0},java.lang.String)
-meth public static <%0 extends java.lang.Throwable> {%%0} attachMessage({%%0},java.lang.String)
-meth public static <%0 extends java.lang.Throwable> {%%0} attachSeverity({%%0},java.util.logging.Level)
-meth public static java.lang.String findLocalizedMessage(java.lang.Throwable)
-meth public static void printStackTrace(java.lang.Throwable)
-supr java.lang.Object
-hfds LOC_MSG_PLACEHOLDER,LOG
-hcls AnnException,OwnLevel
-
-CLSS public final org.openide.util.HelpCtx
-cons public init(java.lang.Class<?>)
- anno 0 java.lang.Deprecated()
-cons public init(java.lang.String)
-cons public init(java.net.URL)
- anno 0 java.lang.Deprecated()
-fld public final static org.openide.util.HelpCtx DEFAULT_HELP
-innr public abstract interface static Displayer
-innr public abstract interface static Provider
-meth public boolean display()
-meth public boolean equals(java.lang.Object)
-meth public int hashCode()
-meth public java.lang.String getHelpID()
-meth public java.lang.String toString()
-meth public java.net.URL getHelp()
-meth public static org.openide.util.HelpCtx findHelp(java.awt.Component)
-meth public static org.openide.util.HelpCtx findHelp(java.lang.Object)
-meth public static void setHelpIDString(javax.swing.JComponent,java.lang.String)
-supr java.lang.Object
-hfds err,helpCtx,helpID
-
-CLSS public abstract interface static org.openide.util.HelpCtx$Displayer
- outer org.openide.util.HelpCtx
-meth public abstract boolean display(org.openide.util.HelpCtx)
-
-CLSS public abstract interface static org.openide.util.HelpCtx$Provider
- outer org.openide.util.HelpCtx
-meth public abstract org.openide.util.HelpCtx getHelpCtx()
-
-CLSS public final org.openide.util.ImageUtilities
-meth public final static java.awt.Image addToolTipToImage(java.awt.Image,java.lang.String)
-meth public final static java.awt.Image assignToolTipToImage(java.awt.Image,java.lang.String)
-meth public final static java.awt.Image icon2Image(javax.swing.Icon)
-meth public final static java.awt.Image loadImage(java.lang.String)
-meth public final static java.awt.Image loadImage(java.lang.String,boolean)
-meth public final static java.awt.Image mergeImages(java.awt.Image,java.awt.Image,int,int)
-meth public final static java.lang.String getImageToolTip(java.awt.Image)
-meth public final static javax.swing.Icon image2Icon(java.awt.Image)
-meth public final static javax.swing.ImageIcon loadImageIcon(java.lang.String,boolean)
-meth public static java.awt.Image createDisabledImage(java.awt.Image)
-meth public static javax.swing.Icon createDisabledIcon(javax.swing.Icon)
-supr java.lang.Object
-hfds DARK_LAF_SUFFIX,ERR,NO_ICON,PNG_READER,TOOLTIP_SEPAR,cache,component,compositeCache,currentLoader,extraInitialSlashes,imageIconFilter,imageToolTipCache,loaderQuery,localizedCache,mediaTrackerID,noLoaderWarned,tracker
-hcls ActiveRef,CompositeImageKey,DisabledButtonFilter,LazyDisabledIcon,ToolTipImage,ToolTipImageKey
-
-CLSS public abstract org.openide.util.Lookup
-cons public init()
-fld public final static org.openide.util.Lookup EMPTY
-innr public abstract interface static Provider
-innr public abstract static Item
-innr public abstract static Result
-innr public final static Template
-meth public <%0 extends java.lang.Object> java.util.Collection<? extends {%%0}> lookupAll(java.lang.Class<{%%0}>)
-meth public <%0 extends java.lang.Object> org.openide.util.Lookup$Item<{%%0}> lookupItem(org.openide.util.Lookup$Template<{%%0}>)
-meth public <%0 extends java.lang.Object> org.openide.util.Lookup$Result<{%%0}> lookupResult(java.lang.Class<{%%0}>)
-meth public abstract <%0 extends java.lang.Object> org.openide.util.Lookup$Result<{%%0}> lookup(org.openide.util.Lookup$Template<{%%0}>)
-meth public abstract <%0 extends java.lang.Object> {%%0} lookup(java.lang.Class<{%%0}>)
-meth public static org.openide.util.Lookup getDefault()
-supr java.lang.Object
-hfds LOG,defaultLookup,defaultLookupProvider
-hcls DefLookup,Empty
-
-CLSS public abstract static org.openide.util.Lookup$Item<%0 extends java.lang.Object>
- outer org.openide.util.Lookup
-cons public init()
-meth public abstract java.lang.Class<? extends {org.openide.util.Lookup$Item%0}> getType()
-meth public abstract java.lang.String getDisplayName()
-meth public abstract java.lang.String getId()
-meth public abstract {org.openide.util.Lookup$Item%0} getInstance()
-meth public java.lang.String toString()
-supr java.lang.Object
-
-CLSS public abstract interface static org.openide.util.Lookup$Provider
- outer org.openide.util.Lookup
-meth public abstract org.openide.util.Lookup getLookup()
-
-CLSS public abstract static org.openide.util.Lookup$Result<%0 extends java.lang.Object>
- outer org.openide.util.Lookup
-cons public init()
-meth public abstract java.util.Collection<? extends {org.openide.util.Lookup$Result%0}> allInstances()
-meth public abstract void addLookupListener(org.openide.util.LookupListener)
-meth public abstract void removeLookupListener(org.openide.util.LookupListener)
-meth public java.util.Collection<? extends org.openide.util.Lookup$Item<{org.openide.util.Lookup$Result%0}>> allItems()
-meth public java.util.Set<java.lang.Class<? extends {org.openide.util.Lookup$Result%0}>> allClasses()
-supr java.lang.Object
-
-CLSS public final static org.openide.util.Lookup$Template<%0 extends java.lang.Object>
- outer org.openide.util.Lookup
-cons public init()
- anno 0 java.lang.Deprecated()
-cons public init(java.lang.Class<{org.openide.util.Lookup$Template%0}>)
-cons public init(java.lang.Class<{org.openide.util.Lookup$Template%0}>,java.lang.String,{org.openide.util.Lookup$Template%0})
-meth public boolean equals(java.lang.Object)
-meth public int hashCode()
-meth public java.lang.Class<{org.openide.util.Lookup$Template%0}> getType()
-meth public java.lang.String getId()
-meth public java.lang.String toString()
-meth public {org.openide.util.Lookup$Template%0} getInstance()
-supr java.lang.Object
-hfds hashCode,id,instance,type
-
-CLSS public final org.openide.util.LookupEvent
-cons public init(org.openide.util.Lookup$Result)
-supr java.util.EventObject
-
-CLSS public abstract interface org.openide.util.LookupListener
-intf java.util.EventListener
-meth public abstract void resultChanged(org.openide.util.LookupEvent)
-
-CLSS public org.openide.util.MapFormat
-cons public init(java.util.Map)
-meth protected java.lang.Object processKey(java.lang.String)
-meth public boolean isExactMatch()
-meth public boolean willThrowExceptionIfKeyWasNotFound()
-meth public java.lang.Object parseObject(java.lang.String,java.text.ParsePosition)
-meth public java.lang.String getLeftBrace()
-meth public java.lang.String getRightBrace()
-meth public java.lang.String parse(java.lang.String)
-meth public java.lang.String processPattern(java.lang.String)
-meth public java.lang.StringBuffer format(java.lang.Object,java.lang.StringBuffer,java.text.FieldPosition)
-meth public java.util.Map getMap()
-meth public static java.lang.String format(java.lang.String,java.util.Map)
-meth public void setExactMatch(boolean)
-meth public void setLeftBrace(java.lang.String)
-meth public void setMap(java.util.Map)
-meth public void setRightBrace(java.lang.String)
-meth public void setThrowExceptionIfKeyWasNotFound(boolean)
-supr java.text.Format
-hfds BUFSIZE,argmap,arguments,exactmatch,ldel,locale,maxOffset,offsets,rdel,serialVersionUID,throwex
-
-CLSS public final org.openide.util.Mutex
-cons public init()
-cons public init(java.lang.Object)
-cons public init(org.openide.util.Mutex$Privileged)
-cons public init(org.openide.util.Mutex$Privileged,java.util.concurrent.Executor)
-cons public init(org.openide.util.spi.MutexImplementation)
-fld public final static org.openide.util.Mutex EVENT
-innr public abstract interface static Action
-innr public abstract interface static ExceptionAction
-innr public final static Privileged
-meth public <%0 extends java.lang.Object> {%%0} readAccess(org.openide.util.Mutex$Action<{%%0}>)
-meth public <%0 extends java.lang.Object> {%%0} readAccess(org.openide.util.Mutex$ExceptionAction<{%%0}>) throws org.openide.util.MutexException
-meth public <%0 extends java.lang.Object> {%%0} writeAccess(org.openide.util.Mutex$Action<{%%0}>)
-meth public <%0 extends java.lang.Object> {%%0} writeAccess(org.openide.util.Mutex$ExceptionAction<{%%0}>) throws org.openide.util.MutexException
-meth public boolean isReadAccess()
-meth public boolean isWriteAccess()
-meth public java.lang.String toString()
-meth public void postReadRequest(java.lang.Runnable)
-meth public void postWriteRequest(java.lang.Runnable)
-meth public void readAccess(java.lang.Runnable)
-meth public void writeAccess(java.lang.Runnable)
-supr java.lang.Object
-hfds LOG,impl
-
-CLSS public abstract interface static org.openide.util.Mutex$Action<%0 extends java.lang.Object>
- outer org.openide.util.Mutex
-intf org.openide.util.Mutex$ExceptionAction<{org.openide.util.Mutex$Action%0}>
-meth public abstract {org.openide.util.Mutex$Action%0} run()
-
-CLSS public abstract interface static org.openide.util.Mutex$ExceptionAction<%0 extends java.lang.Object>
- outer org.openide.util.Mutex
-meth public abstract {org.openide.util.Mutex$ExceptionAction%0} run() throws java.lang.Exception
-
-CLSS public final static org.openide.util.Mutex$Privileged
- outer org.openide.util.Mutex
-cons public init()
-meth public boolean tryReadAccess(long)
-meth public boolean tryWriteAccess(long)
-meth public void enterReadAccess()
-meth public void enterWriteAccess()
-meth public void exitReadAccess()
-meth public void exitWriteAccess()
-supr java.lang.Object
-hfds delegate
-
-CLSS public org.openide.util.MutexException
-cons public init(java.lang.Exception)
-meth public java.lang.Exception getException()
-meth public java.lang.Throwable getCause()
-supr java.lang.Exception
-hfds ex,serialVersionUID
-
-CLSS public org.openide.util.NbBundle
-cons public init()
- anno 0 java.lang.Deprecated()
-innr public abstract interface static !annotation Messages
-innr public abstract interface static ClassLoaderFinder
-meth public !varargs static java.lang.String getMessage(java.lang.Class<?>,java.lang.String,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object[])
-meth public static <%0 extends java.lang.Object> {%%0} getLocalizedValue(java.util.Map<java.lang.String,{%%0}>,java.lang.String)
-meth public static <%0 extends java.lang.Object> {%%0} getLocalizedValue(java.util.Map<java.lang.String,{%%0}>,java.lang.String,java.util.Locale)
-meth public static java.lang.String getBranding()
-meth public static java.lang.String getLocalizedValue(java.util.jar.Attributes,java.util.jar.Attributes$Name)
-meth public static java.lang.String getLocalizedValue(java.util.jar.Attributes,java.util.jar.Attributes$Name,java.util.Locale)
-meth public static java.lang.String getMessage(java.lang.Class<?>,java.lang.String)
-meth public static java.lang.String getMessage(java.lang.Class<?>,java.lang.String,java.lang.Object)
-meth public static java.lang.String getMessage(java.lang.Class<?>,java.lang.String,java.lang.Object,java.lang.Object)
-meth public static java.lang.String getMessage(java.lang.Class<?>,java.lang.String,java.lang.Object,java.lang.Object,java.lang.Object)
-meth public static java.lang.String getMessage(java.lang.Class<?>,java.lang.String,java.lang.Object[])
-meth public static java.net.URL getLocalizedFile(java.lang.String,java.lang.String)
- anno 0 java.lang.Deprecated()
-meth public static java.net.URL getLocalizedFile(java.lang.String,java.lang.String,java.util.Locale)
- anno 0 java.lang.Deprecated()
-meth public static java.net.URL getLocalizedFile(java.lang.String,java.lang.String,java.util.Locale,java.lang.ClassLoader)
- anno 0 java.lang.Deprecated()
-meth public static java.util.Iterator<java.lang.String> getLocalizingSuffixes()
-meth public static java.util.ResourceBundle getBundle(java.lang.Class<?>)
-meth public static java.util.ResourceBundle getBundle(java.lang.String)
-meth public static java.util.ResourceBundle getBundle(java.lang.String,java.util.Locale)
-meth public static java.util.ResourceBundle getBundle(java.lang.String,java.util.Locale,java.lang.ClassLoader)
-meth public static void setBranding(java.lang.String)
-meth public static void setClassLoaderFinder(org.openide.util.NbBundle$ClassLoaderFinder)
- anno 0 java.lang.Deprecated()
-supr java.lang.Object
-hfds LOG,USE_DEBUG_LOADER,brandingToken,bundleCache,localizedFileCache
-hcls AttributesMap,DebugLoader,LocaleIterator,MergedBundle,PBundle
-
-CLSS public abstract interface static org.openide.util.NbBundle$ClassLoaderFinder
- outer org.openide.util.NbBundle
- anno 0 java.lang.Deprecated()
-meth public abstract java.lang.ClassLoader find()
- anno 0 java.lang.Deprecated()
-
-CLSS public abstract interface static !annotation org.openide.util.NbBundle$Messages
- outer org.openide.util.NbBundle
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[PACKAGE, TYPE, METHOD, CONSTRUCTOR, FIELD])
-intf java.lang.annotation.Annotation
-meth public abstract java.lang.String[] value()
-
-CLSS public org.openide.util.NbCollections
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> checkedMapByCopy(java.util.Map,java.lang.Class<{%%0}>,java.lang.Class<{%%1}>,boolean)
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> checkedMapByFilter(java.util.Map,java.lang.Class<{%%0}>,java.lang.Class<{%%1}>,boolean)
-meth public static <%0 extends java.lang.Object> java.lang.Iterable<{%%0}> iterable(java.util.Enumeration<{%%0}>)
-meth public static <%0 extends java.lang.Object> java.lang.Iterable<{%%0}> iterable(java.util.Iterator<{%%0}>)
-meth public static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> checkedEnumerationByFilter(java.util.Enumeration,java.lang.Class<{%%0}>,boolean)
-meth public static <%0 extends java.lang.Object> java.util.Iterator<{%%0}> checkedIteratorByFilter(java.util.Iterator,java.lang.Class<{%%0}>,boolean)
-meth public static <%0 extends java.lang.Object> java.util.List<{%%0}> checkedListByCopy(java.util.List,java.lang.Class<{%%0}>,boolean)
-meth public static <%0 extends java.lang.Object> java.util.Set<{%%0}> checkedSetByCopy(java.util.Set,java.lang.Class<{%%0}>,boolean)
-meth public static <%0 extends java.lang.Object> java.util.Set<{%%0}> checkedSetByFilter(java.util.Set,java.lang.Class<{%%0}>,boolean)
-supr java.lang.Object
-hfds LOG
-hcls CheckedIterator,CheckedMap,CheckedSet
-
-CLSS public final org.openide.util.NbPreferences
-innr public abstract interface static Provider
-meth public static java.util.prefs.Preferences forModule(java.lang.Class)
-meth public static java.util.prefs.Preferences root()
-supr java.lang.Object
-hfds PREFS_IMPL
-
-CLSS public abstract interface static org.openide.util.NbPreferences$Provider
- outer org.openide.util.NbPreferences
-meth public abstract java.util.prefs.Preferences preferencesForModule(java.lang.Class)
-meth public abstract java.util.prefs.Preferences preferencesRoot()
-
-CLSS public final org.openide.util.NetworkSettings
-cons public init()
-innr public abstract static ProxyCredentialsProvider
-meth public static <%0 extends java.lang.Object> {%%0} suppressAuthenticationDialog(java.util.concurrent.Callable<{%%0}>) throws java.lang.Exception
-meth public static boolean isAuthenticationDialogSuppressed()
-meth public static java.lang.String getAuthenticationUsername(java.net.URI)
-meth public static java.lang.String getKeyForAuthenticationPassword(java.net.URI)
-meth public static java.lang.String getProxyHost(java.net.URI)
-meth public static java.lang.String getProxyPort(java.net.URI)
-supr java.lang.Object
-hfds LOGGER,PROXY_AUTHENTICATION_PASSWORD,authenticationDialogSuppressed
-
-CLSS public abstract static org.openide.util.NetworkSettings$ProxyCredentialsProvider
- outer org.openide.util.NetworkSettings
-cons public init()
-meth protected abstract boolean isProxyAuthentication(java.net.URI)
-meth protected abstract char[] getProxyPassword(java.net.URI)
-meth protected abstract java.lang.String getProxyHost(java.net.URI)
-meth protected abstract java.lang.String getProxyPort(java.net.URI)
-meth protected abstract java.lang.String getProxyUserName(java.net.URI)
-supr java.lang.Object
-
-CLSS public org.openide.util.NotImplementedException
-cons public init()
-cons public init(java.lang.String)
-supr java.lang.RuntimeException
-hfds serialVersionUID
-
-CLSS public final org.openide.util.Pair<%0 extends java.lang.Object, %1 extends java.lang.Object>
-meth public boolean equals(java.lang.Object)
-meth public int hashCode()
-meth public java.lang.String toString()
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> org.openide.util.Pair<{%%0},{%%1}> of({%%0},{%%1})
-meth public {org.openide.util.Pair%0} first()
-meth public {org.openide.util.Pair%1} second()
-supr java.lang.Object
-hfds first,second
-
-CLSS public org.openide.util.Parameters
-meth public static void javaIdentifier(java.lang.CharSequence,java.lang.CharSequence)
-meth public static void javaIdentifierOrNull(java.lang.CharSequence,java.lang.CharSequence)
-meth public static void notEmpty(java.lang.CharSequence,java.lang.CharSequence)
-meth public static void notNull(java.lang.CharSequence,java.lang.Object)
-meth public static void notWhitespace(java.lang.CharSequence,java.lang.CharSequence)
-supr java.lang.Object
-
-CLSS public org.openide.util.Queue<%0 extends java.lang.Object>
- anno 0 java.lang.Deprecated()
-cons public init()
-meth public void put({org.openide.util.Queue%0})
-meth public {org.openide.util.Queue%0} get()
-supr java.lang.Object
-hfds queue
-
-CLSS public final org.openide.util.RequestProcessor
-cons public init()
-cons public init(java.lang.Class<?>)
-cons public init(java.lang.String)
-cons public init(java.lang.String,int)
-cons public init(java.lang.String,int,boolean)
-cons public init(java.lang.String,int,boolean,boolean)
-innr public final Task
-intf java.util.concurrent.ScheduledExecutorService
-meth public <%0 extends java.lang.Object> java.util.List<java.util.concurrent.Future<{%%0}>> invokeAll(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>) throws java.lang.InterruptedException
-meth public <%0 extends java.lang.Object> java.util.List<java.util.concurrent.Future<{%%0}>> invokeAll(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>,long,java.util.concurrent.TimeUnit) throws java.lang.InterruptedException
-meth public <%0 extends java.lang.Object> java.util.concurrent.Future<{%%0}> submit(java.lang.Runnable,{%%0})
-meth public <%0 extends java.lang.Object> java.util.concurrent.Future<{%%0}> submit(java.util.concurrent.Callable<{%%0}>)
-meth public <%0 extends java.lang.Object> java.util.concurrent.ScheduledFuture<{%%0}> schedule(java.util.concurrent.Callable<{%%0}>,long,java.util.concurrent.TimeUnit)
-meth public <%0 extends java.lang.Object> {%%0} invokeAny(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>) throws java.lang.InterruptedException,java.util.concurrent.ExecutionException
-meth public <%0 extends java.lang.Object> {%%0} invokeAny(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>,long,java.util.concurrent.TimeUnit) throws java.lang.InterruptedException,java.util.concurrent.ExecutionException,java.util.concurrent.TimeoutException
-meth public boolean awaitTermination(long,java.util.concurrent.TimeUnit) throws java.lang.InterruptedException
-meth public boolean isRequestProcessorThread()
-meth public boolean isShutdown()
-meth public boolean isTerminated()
-meth public java.util.List<java.lang.Runnable> shutdownNow()
-meth public java.util.concurrent.Future<?> submit(java.lang.Runnable)
-meth public java.util.concurrent.ScheduledFuture<?> schedule(java.lang.Runnable,long,java.util.concurrent.TimeUnit)
-meth public java.util.concurrent.ScheduledFuture<?> scheduleAtFixedRate(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)
-meth public java.util.concurrent.ScheduledFuture<?> scheduleWithFixedDelay(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)
-meth public org.openide.util.RequestProcessor$Task create(java.lang.Runnable)
-meth public org.openide.util.RequestProcessor$Task create(java.lang.Runnable,boolean)
-meth public org.openide.util.RequestProcessor$Task post(java.lang.Runnable)
-meth public org.openide.util.RequestProcessor$Task post(java.lang.Runnable,int)
-meth public org.openide.util.RequestProcessor$Task post(java.lang.Runnable,int,int)
-meth public static org.openide.util.RequestProcessor getDefault()
-meth public static org.openide.util.RequestProcessor$Task createRequest(java.lang.Runnable)
- anno 0 java.lang.Deprecated()
-meth public static org.openide.util.RequestProcessor$Task postRequest(java.lang.Runnable)
- anno 0 java.lang.Deprecated()
-meth public static org.openide.util.RequestProcessor$Task postRequest(java.lang.Runnable,int)
- anno 0 java.lang.Deprecated()
-meth public static org.openide.util.RequestProcessor$Task postRequest(java.lang.Runnable,int,int)
- anno 0 java.lang.Deprecated()
-meth public void execute(java.lang.Runnable)
-meth public void shutdown()
-meth public void stop()
-supr java.lang.Object
-hfds DEFAULT,SLOW,TOP_GROUP,UNLIMITED,counter,enableStackTraces,finishAwaitingTasks,inParallel,interruptThread,logger,name,processorLock,processors,queue,stopped,throughput,warnParallel
-hcls CreatedItem,FastItem,FixedDelayTask,FixedRateTask,Item,Processor,RPFutureTask,RunnableWrapper,ScheduledRPFutureTask,SlowItem,TaskFutureWrapper,TickTac,TopLevelThreadGroup,WaitableCallable
-
-CLSS public final org.openide.util.RequestProcessor$Task
- outer org.openide.util.RequestProcessor
-intf org.openide.util.Cancellable
-meth public boolean cancel()
-meth public boolean waitFinished(long) throws java.lang.InterruptedException
-meth public int getDelay()
-meth public int getPriority()
-meth public java.lang.String toString()
-meth public void run()
-meth public void schedule(int)
-meth public void setPriority(int)
-meth public void waitFinished()
-supr org.openide.util.Task
-hfds cancelled,item,lastThread,priority,time
-
-CLSS public abstract org.openide.util.SharedClassObject
-cons protected init()
-intf java.io.Externalizable
-meth protected boolean clearSharedData()
-meth protected final java.lang.Object getLock()
-meth protected final java.lang.Object getProperty(java.lang.Object)
-meth protected final java.lang.Object putProperty(java.lang.Object,java.lang.Object)
-meth protected final java.lang.Object putProperty(java.lang.String,java.lang.Object,boolean)
-meth protected final void finalize() throws java.lang.Throwable
-meth protected java.lang.Object writeReplace()
-meth protected void addNotify()
-meth protected void firePropertyChange(java.lang.String,java.lang.Object,java.lang.Object)
-meth protected void initialize()
-meth protected void removeNotify()
-meth protected void reset()
-meth public final boolean equals(java.lang.Object)
-meth public final int hashCode()
-meth public final void addPropertyChangeListener(java.beans.PropertyChangeListener)
-meth public final void removePropertyChangeListener(java.beans.PropertyChangeListener)
-meth public static <%0 extends org.openide.util.SharedClassObject> {%%0} findObject(java.lang.Class<{%%0}>)
-meth public static <%0 extends org.openide.util.SharedClassObject> {%%0} findObject(java.lang.Class<{%%0}>,boolean)
-meth public void readExternal(java.io.ObjectInput) throws java.io.IOException,java.lang.ClassNotFoundException
-meth public void writeExternal(java.io.ObjectOutput) throws java.io.IOException
-supr java.lang.Object
-hfds PROP_SUPPORT,addNotifySuper,alreadyWarnedAboutDupes,dataEntry,err,first,firstTrace,inReadExternal,initializeSuper,instancesBeingCreated,lock,prematureSystemOptionMutation,removeNotifySuper,serialVersionUID,systemOption,values,waitingOnSystemOption
-hcls DataEntry,SetAccessibleAction,WriteReplace
-
-CLSS public org.openide.util.Task
-cons protected init()
-cons public init(java.lang.Runnable)
-fld public final static org.openide.util.Task EMPTY
-intf java.lang.Runnable
-meth protected final void notifyFinished()
-meth protected final void notifyRunning()
-meth public boolean waitFinished(long) throws java.lang.InterruptedException
-meth public final boolean isFinished()
-meth public java.lang.String toString()
-meth public void addTaskListener(org.openide.util.TaskListener)
-meth public void removeTaskListener(org.openide.util.TaskListener)
-meth public void run()
-meth public void waitFinished()
-supr java.lang.Object
-hfds LOG,RP,finished,list,overrides,run
-
-CLSS public abstract interface org.openide.util.TaskListener
-intf java.util.EventListener
-meth public abstract void taskFinished(org.openide.util.Task)
-
-CLSS public final org.openide.util.TopologicalSortException
-meth public final java.util.List partialSort()
-meth public final java.util.Set[] topologicalSets()
-meth public final java.util.Set[] unsortableSets()
-meth public final void printStackTrace(java.io.PrintStream)
-meth public final void printStackTrace(java.io.PrintWriter)
-meth public java.lang.String getMessage()
-meth public java.lang.String toString()
-supr java.lang.Exception
-hfds counter,dualGraph,edges,result,vertexes
-hcls Vertex
-
-CLSS public abstract interface !annotation org.openide.util.URLStreamHandlerRegistration
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault int position()
-meth public abstract java.lang.String[] protocol()
-
-CLSS public abstract org.openide.util.Union2<%0 extends java.lang.Object, %1 extends java.lang.Object>
-intf java.io.Serializable
-intf java.lang.Cloneable
-meth public abstract boolean hasFirst()
-meth public abstract boolean hasSecond()
-meth public abstract org.openide.util.Union2<{org.openide.util.Union2%0},{org.openide.util.Union2%1}> clone()
-meth public abstract {org.openide.util.Union2%0} first()
-meth public abstract {org.openide.util.Union2%1} second()
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> org.openide.util.Union2<{%%0},{%%1}> createFirst({%%0})
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> org.openide.util.Union2<{%%0},{%%1}> createSecond({%%1})
-supr java.lang.Object
-hfds serialVersionUID
-hcls Union2First,Union2Second
-
-CLSS public org.openide.util.UserCancelException
-cons public init()
-cons public init(java.lang.String)
-supr java.io.IOException
-hfds serialVersionUID
-
-CLSS public abstract org.openide.util.UserQuestionException
-cons public init()
-cons public init(java.lang.String)
-meth public abstract void confirmed() throws java.io.IOException
-supr java.io.IOException
-hfds serialVersionUID
-
-CLSS public final org.openide.util.Utilities
-fld public final static int OS_AIX = 64
-fld public final static int OS_DEC = 1024
- anno 0 java.lang.Deprecated()
-fld public final static int OS_FREEBSD = 131072
-fld public final static int OS_HP = 32
-fld public final static int OS_IRIX = 128
-fld public final static int OS_LINUX = 16
-fld public final static int OS_MAC = 4096
-fld public final static int OS_OPENBSD = 1048576
-fld public final static int OS_OS2 = 2048
-fld public final static int OS_OTHER = 65536
-fld public final static int OS_SOLARIS = 8
-fld public final static int OS_SUNOS = 256
-fld public final static int OS_TRU64 = 512
-fld public final static int OS_UNIX_MASK = 1709048
- anno 0 java.lang.Deprecated()
-fld public final static int OS_UNIX_OTHER = 524288
-fld public final static int OS_VMS = 16384
-fld public final static int OS_WIN2000 = 8192
-fld public final static int OS_WIN95 = 2
-fld public final static int OS_WIN98 = 4
-fld public final static int OS_WINDOWS_MASK = 303111
- anno 0 java.lang.Deprecated()
-fld public final static int OS_WINNT = 1
-fld public final static int OS_WINVISTA = 262144
-fld public final static int OS_WIN_OTHER = 32768
-fld public final static int TYPICAL_WINDOWS_TASKBAR_HEIGHT = 27
-innr public static UnorderableException
-meth public static <%0 extends java.lang.Object> java.util.List<{%%0}> topologicalSort(java.util.Collection<? extends {%%0}>,java.util.Map<? super {%%0},? extends java.util.Collection<? extends {%%0}>>) throws org.openide.util.TopologicalSortException
-meth public static boolean compareObjects(java.lang.Object,java.lang.Object)
-meth public static boolean compareObjectsImpl(java.lang.Object,java.lang.Object,int)
-meth public static boolean isJavaIdentifier(java.lang.String)
-meth public static boolean isLargeFrameIcons()
- anno 0 java.lang.Deprecated()
-meth public static boolean isMac()
-meth public static boolean isUnix()
-meth public static boolean isWindows()
-meth public static int arrayHashCode(java.lang.Object[])
- anno 0 java.lang.Deprecated()
-meth public static int getOperatingSystem()
-meth public static int showJFileChooser(javax.swing.JFileChooser,java.awt.Component,java.lang.String)
- anno 0 java.lang.Deprecated()
-meth public static java.awt.Component getFocusTraversableComponent(java.awt.Component)
-meth public static java.awt.Cursor createCustomCursor(java.awt.Component,java.awt.Image,java.lang.String)
-meth public static java.awt.Cursor createProgressCursor(java.awt.Component)
-meth public static java.awt.Dimension getScreenSize()
- anno 0 java.lang.Deprecated()
-meth public static java.awt.Image icon2Image(javax.swing.Icon)
- anno 0 java.lang.Deprecated()
-meth public static java.awt.Image loadImage(java.lang.String)
- anno 0 java.lang.Deprecated()
-meth public static java.awt.Image loadImage(java.lang.String,boolean)
- anno 0 java.lang.Deprecated()
-meth public static java.awt.Image mergeImages(java.awt.Image,java.awt.Image,int,int)
- anno 0 java.lang.Deprecated()
-meth public static java.awt.Rectangle findCenterBounds(java.awt.Dimension)
-meth public static java.awt.Rectangle getUsableScreenBounds()
-meth public static java.awt.Rectangle getUsableScreenBounds(java.awt.GraphicsConfiguration)
-meth public static java.beans.BeanInfo getBeanInfo(java.lang.Class<?>) throws java.beans.IntrospectionException
-meth public static java.beans.BeanInfo getBeanInfo(java.lang.Class<?>,java.lang.Class<?>) throws java.beans.IntrospectionException
-meth public static java.io.File toFile(java.net.URI)
-meth public static java.io.File toFile(java.net.URL)
- anno 0 java.lang.Deprecated()
-meth public static java.lang.Class<?> getObjectType(java.lang.Class<?>)
-meth public static java.lang.Class<?> getPrimitiveType(java.lang.Class<?>)
-meth public static java.lang.Object toPrimitiveArray(java.lang.Object[])
-meth public static java.lang.Object[] toObjectArray(java.lang.Object)
-meth public static java.lang.String escapeParameters(java.lang.String[])
-meth public static java.lang.String getClassName(java.lang.Class<?>)
-meth public static java.lang.String getShortClassName(java.lang.Class<?>)
-meth public static java.lang.String keyToString(javax.swing.KeyStroke)
-meth public static java.lang.String keyToString(javax.swing.KeyStroke,boolean)
-meth public static java.lang.String pureClassName(java.lang.String)
-meth public static java.lang.String replaceString(java.lang.String,java.lang.String,java.lang.String)
- anno 0 java.lang.Deprecated()
-meth public static java.lang.String translate(java.lang.String)
-meth public static java.lang.String wrapString(java.lang.String,int,boolean,boolean)
- anno 0 java.lang.Deprecated()
-meth public static java.lang.String wrapString(java.lang.String,int,java.text.BreakIterator,boolean)
-meth public static java.lang.String[] parseParameters(java.lang.String)
-meth public static java.lang.String[] wrapStringToArray(java.lang.String,int,boolean,boolean)
- anno 0 java.lang.Deprecated()
-meth public static java.lang.String[] wrapStringToArray(java.lang.String,int,java.text.BreakIterator,boolean)
-meth public static java.lang.ref.ReferenceQueue<java.lang.Object> activeReferenceQueue()
-meth public static java.net.URI toURI(java.io.File)
-meth public static java.net.URL toURL(java.io.File) throws java.net.MalformedURLException
- anno 0 java.lang.Deprecated()
-meth public static java.util.List partialSort(java.util.List,java.util.Comparator,boolean)
- anno 0 java.lang.Deprecated()
-meth public static java.util.List<? extends javax.swing.Action> actionsForPath(java.lang.String)
-meth public static javax.swing.JPopupMenu actionsToPopup(javax.swing.Action[],java.awt.Component)
-meth public static javax.swing.JPopupMenu actionsToPopup(javax.swing.Action[],org.openide.util.Lookup)
-meth public static javax.swing.KeyStroke stringToKey(java.lang.String)
-meth public static javax.swing.KeyStroke[] stringToKeys(java.lang.String)
-meth public static org.openide.util.Lookup actionsGlobalContext()
-meth public static void attachInitJob(java.awt.Component,org.openide.util.AsyncGUIJob)
-meth public static void disabledActionBeep()
-supr java.lang.Object
-hfds ALT_WILDCARD_MASK,CTRL_WILDCARD_MASK,LOG,TYPICAL_MACOSX_MENU_HEIGHT,clearIntrospector,doClear,global,namesAndValues,screenBoundsCache
-hcls NamesAndValues
-
-CLSS public static org.openide.util.Utilities$UnorderableException
- outer org.openide.util.Utilities
- anno 0 java.lang.Deprecated()
-cons public init(java.lang.String,java.util.Collection,java.util.Map)
-cons public init(java.util.Collection,java.util.Map)
-meth public java.util.Collection getUnorderable()
-meth public java.util.Map getDeps()
-supr java.lang.RuntimeException
-hfds deps,serialVersionUID,unorderable
-
-CLSS public final org.openide.util.WeakListeners
-meth public static <%0 extends java.util.EventListener> {%%0} create(java.lang.Class<{%%0}>,java.lang.Class<? super {%%0}>,{%%0},java.lang.Object)
-meth public static <%0 extends java.util.EventListener> {%%0} create(java.lang.Class<{%%0}>,{%%0},java.lang.Object)
-meth public static java.beans.PropertyChangeListener propertyChange(java.beans.PropertyChangeListener,java.lang.Object)
-meth public static java.beans.PropertyChangeListener propertyChange(java.beans.PropertyChangeListener,java.lang.String,java.lang.Object)
-meth public static java.beans.VetoableChangeListener vetoableChange(java.beans.VetoableChangeListener,java.lang.Object)
-meth public static java.beans.VetoableChangeListener vetoableChange(java.beans.VetoableChangeListener,java.lang.String,java.lang.Object)
-meth public static javax.swing.event.ChangeListener change(javax.swing.event.ChangeListener,java.lang.Object)
-meth public static javax.swing.event.DocumentListener document(javax.swing.event.DocumentListener,java.lang.Object)
-supr java.lang.Object
-
-CLSS public org.openide.util.WeakSet<%0 extends java.lang.Object>
-cons public init()
-cons public init(int)
-cons public init(int,float)
-cons public init(java.util.Collection<? extends {org.openide.util.WeakSet%0}>)
-intf java.io.Serializable
-intf java.lang.Cloneable
-meth public <%0 extends java.lang.Object> {%%0}[] toArray({%%0}[])
-meth public boolean add({org.openide.util.WeakSet%0})
-meth public boolean contains(java.lang.Object)
-meth public boolean containsAll(java.util.Collection<?>)
-meth public boolean equals(java.lang.Object)
-meth public boolean isEmpty()
-meth public boolean remove(java.lang.Object)
-meth public boolean removeAll(java.util.Collection<?>)
-meth public boolean retainAll(java.util.Collection<?>)
-meth public int hashCode()
-meth public int size()
-meth public java.lang.Object clone()
-meth public java.lang.Object[] toArray()
-meth public java.lang.String toString()
-meth public java.util.Iterator<{org.openide.util.WeakSet%0}> iterator()
-meth public void clear()
-meth public void resize(int)
-meth public {org.openide.util.WeakSet%0} putIfAbsent({org.openide.util.WeakSet%0})
-supr java.util.AbstractSet<{org.openide.util.WeakSet%0}>
-hfds PRESENT,loadFactor,m,s,serialVersionUID
-hcls SharedKeyWeakHashMap
-
-CLSS public abstract org.openide.util.actions.ActionInvoker
-cons protected init()
-meth protected abstract void invokeAction(javax.swing.Action,java.awt.event.ActionEvent)
-meth public static void invokeAction(javax.swing.Action,java.awt.event.ActionEvent,boolean,java.lang.Runnable)
-supr java.lang.Object
-hfds RP
-hcls ActionRunnable
-
-CLSS public abstract interface org.openide.util.actions.ActionPerformer
- anno 0 java.lang.Deprecated()
-meth public abstract void performAction(org.openide.util.actions.SystemAction)
-
-CLSS public abstract org.openide.util.actions.ActionPresenterProvider
-cons protected init()
-meth public abstract java.awt.Component createToolbarPresenter(javax.swing.Action)
-meth public abstract java.awt.Component[] convertComponents(java.awt.Component)
-meth public abstract javax.swing.JMenuItem createMenuPresenter(javax.swing.Action)
-meth public abstract javax.swing.JMenuItem createPopupPresenter(javax.swing.Action)
-meth public abstract javax.swing.JPopupMenu createEmptyPopup()
-meth public static org.openide.util.actions.ActionPresenterProvider getDefault()
-supr java.lang.Object
-hcls Default
-
-CLSS public abstract org.openide.util.actions.BooleanStateAction
-cons public init()
-fld public final static java.lang.String PROP_BOOLEAN_STATE = "booleanState"
-intf org.openide.util.actions.Presenter$Menu
-intf org.openide.util.actions.Presenter$Popup
-intf org.openide.util.actions.Presenter$Toolbar
-meth protected void initialize()
-meth public boolean getBooleanState()
-meth public java.awt.Component getToolbarPresenter()
-meth public javax.swing.JMenuItem getMenuPresenter()
-meth public javax.swing.JMenuItem getPopupPresenter()
-meth public void actionPerformed(java.awt.event.ActionEvent)
-meth public void setBooleanState(boolean)
-supr org.openide.util.actions.SystemAction
-hfds serialVersionUID
-
-CLSS public abstract org.openide.util.actions.CallableSystemAction
-cons public init()
-intf org.openide.util.actions.Presenter$Menu
-intf org.openide.util.actions.Presenter$Popup
-intf org.openide.util.actions.Presenter$Toolbar
-meth protected boolean asynchronous()
-meth public abstract void performAction()
-meth public java.awt.Component getToolbarPresenter()
-meth public javax.swing.JMenuItem getMenuPresenter()
-meth public javax.swing.JMenuItem getPopupPresenter()
-meth public void actionPerformed(java.awt.event.ActionEvent)
-supr org.openide.util.actions.SystemAction
-hfds DEFAULT_ASYNCH,serialVersionUID,warnedAsynchronousActions
-
-CLSS public abstract org.openide.util.actions.CallbackSystemAction
-cons public init()
-intf org.openide.util.ContextAwareAction
-meth protected void initialize()
-meth public boolean getSurviveFocusChange()
-meth public java.lang.Object getActionMapKey()
-meth public javax.swing.Action createContextAwareInstance(org.openide.util.Lookup)
-meth public org.openide.util.actions.ActionPerformer getActionPerformer()
- anno 0 java.lang.Deprecated()
-meth public void actionPerformed(java.awt.event.ActionEvent)
-meth public void performAction()
- anno 0 java.lang.Deprecated()
-meth public void setActionPerformer(org.openide.util.actions.ActionPerformer)
- anno 0 java.lang.Deprecated()
-meth public void setSurviveFocusChange(boolean)
-supr org.openide.util.actions.CallableSystemAction
-hfds LISTENER,PROP_ACTION_PERFORMER,err,notSurviving,serialVersionUID,surviving
-hcls ActionDelegateListener,DelegateAction,GlobalManager,WeakAction
-
-CLSS public abstract interface org.openide.util.actions.Presenter
-innr public abstract interface static Menu
-innr public abstract interface static Popup
-innr public abstract interface static Toolbar
-
-CLSS public abstract interface static org.openide.util.actions.Presenter$Menu
- outer org.openide.util.actions.Presenter
-intf org.openide.util.actions.Presenter
-meth public abstract javax.swing.JMenuItem getMenuPresenter()
-
-CLSS public abstract interface static org.openide.util.actions.Presenter$Popup
- outer org.openide.util.actions.Presenter
-intf org.openide.util.actions.Presenter
-meth public abstract javax.swing.JMenuItem getPopupPresenter()
-
-CLSS public abstract interface static org.openide.util.actions.Presenter$Toolbar
- outer org.openide.util.actions.Presenter
-intf org.openide.util.actions.Presenter
-meth public abstract java.awt.Component getToolbarPresenter()
-
-CLSS public abstract org.openide.util.actions.SystemAction
-cons public init()
-fld public final static java.lang.String PROP_ENABLED = "enabled"
-fld public final static java.lang.String PROP_ICON = "icon"
-intf javax.swing.Action
-intf org.openide.util.HelpCtx$Provider
-meth protected boolean clearSharedData()
-meth protected java.lang.String iconResource()
-meth protected void initialize()
-meth public abstract java.lang.String getName()
-meth public abstract org.openide.util.HelpCtx getHelpCtx()
-meth public abstract void actionPerformed(java.awt.event.ActionEvent)
-meth public boolean isEnabled()
-meth public final java.lang.Object getValue(java.lang.String)
-meth public final javax.swing.Icon getIcon()
-meth public final javax.swing.Icon getIcon(boolean)
-meth public final void putValue(java.lang.String,java.lang.Object)
-meth public final void setIcon(javax.swing.Icon)
-meth public static <%0 extends org.openide.util.actions.SystemAction> {%%0} get(java.lang.Class<{%%0}>)
-meth public static javax.swing.JPopupMenu createPopupMenu(org.openide.util.actions.SystemAction[])
- anno 0 java.lang.Deprecated()
-meth public static javax.swing.JToolBar createToolbarPresenter(org.openide.util.actions.SystemAction[])
-meth public static org.openide.util.actions.SystemAction[] linkActions(org.openide.util.actions.SystemAction[],org.openide.util.actions.SystemAction[])
-meth public void setEnabled(boolean)
-supr org.openide.util.SharedClassObject
-hfds LOG,PROP_ICON_TEXTUAL,relativeIconResourceClasses,serialVersionUID
-hcls ComponentIcon
-
-CLSS public final org.openide.util.datatransfer.ClipboardEvent
-meth public boolean isConsumed()
-meth public org.openide.util.datatransfer.ExClipboard getClipboard()
-meth public void consume()
-supr java.util.EventObject
-hfds consumed,serialVersionUID
-
-CLSS public abstract interface org.openide.util.datatransfer.ClipboardListener
-intf java.util.EventListener
-meth public abstract void clipboardChanged(org.openide.util.datatransfer.ClipboardEvent)
-
-CLSS public abstract org.openide.util.datatransfer.ExClipboard
-cons public init(java.lang.String)
-innr public abstract interface static Convertor
-meth protected abstract org.openide.util.datatransfer.ExClipboard$Convertor[] getConvertors()
-meth protected final void fireClipboardChange()
-meth public final void addClipboardListener(org.openide.util.datatransfer.ClipboardListener)
-meth public final void removeClipboardListener(org.openide.util.datatransfer.ClipboardListener)
-meth public java.awt.datatransfer.Transferable convert(java.awt.datatransfer.Transferable)
-meth public static void transferableAccepted(java.awt.datatransfer.Transferable,int)
-meth public static void transferableOwnershipLost(java.awt.datatransfer.Transferable)
-meth public static void transferableRejected(java.awt.datatransfer.Transferable)
-meth public void setContents(java.awt.datatransfer.Transferable,java.awt.datatransfer.ClipboardOwner)
-supr java.awt.datatransfer.Clipboard
-hfds listeners
-
-CLSS public abstract interface static org.openide.util.datatransfer.ExClipboard$Convertor
- outer org.openide.util.datatransfer.ExClipboard
-meth public abstract java.awt.datatransfer.Transferable convert(java.awt.datatransfer.Transferable)
-
-CLSS public org.openide.util.datatransfer.ExTransferable
-fld public final static java.awt.datatransfer.DataFlavor multiFlavor
-fld public final static java.awt.datatransfer.Transferable EMPTY
-innr public abstract static Single
-innr public static Multi
-intf java.awt.datatransfer.Transferable
-meth public boolean isDataFlavorSupported(java.awt.datatransfer.DataFlavor)
-meth public final void addTransferListener(org.openide.util.datatransfer.TransferListener)
-meth public final void removeTransferListener(org.openide.util.datatransfer.TransferListener)
-meth public java.awt.datatransfer.DataFlavor[] getTransferDataFlavors()
-meth public java.lang.Object getTransferData(java.awt.datatransfer.DataFlavor) throws java.awt.datatransfer.UnsupportedFlavorException,java.io.IOException
-meth public static org.openide.util.datatransfer.ExTransferable create(java.awt.datatransfer.Transferable)
-meth public void put(org.openide.util.datatransfer.ExTransferable$Single)
-meth public void remove(java.awt.datatransfer.DataFlavor)
-supr java.lang.Object
-hfds listeners,map
-hcls Empty
-
-CLSS public static org.openide.util.datatransfer.ExTransferable$Multi
- outer org.openide.util.datatransfer.ExTransferable
-cons public init(java.awt.datatransfer.Transferable[])
-intf java.awt.datatransfer.Transferable
-meth public boolean isDataFlavorSupported(java.awt.datatransfer.DataFlavor)
-meth public java.awt.datatransfer.DataFlavor[] getTransferDataFlavors()
-meth public java.lang.Object getTransferData(java.awt.datatransfer.DataFlavor) throws java.awt.datatransfer.UnsupportedFlavorException,java.io.IOException
-supr java.lang.Object
-hfds flavorList,transferObject
-hcls TransferObjectImpl
-
-CLSS public abstract static org.openide.util.datatransfer.ExTransferable$Single
- outer org.openide.util.datatransfer.ExTransferable
-cons public init(java.awt.datatransfer.DataFlavor)
-intf java.awt.datatransfer.Transferable
-meth protected abstract java.lang.Object getData() throws java.awt.datatransfer.UnsupportedFlavorException,java.io.IOException
-meth public boolean isDataFlavorSupported(java.awt.datatransfer.DataFlavor)
-meth public java.awt.datatransfer.DataFlavor[] getTransferDataFlavors()
-meth public java.lang.Object getTransferData(java.awt.datatransfer.DataFlavor) throws java.awt.datatransfer.UnsupportedFlavorException,java.io.IOException
-supr java.lang.Object
-hfds flavor
-
-CLSS public abstract interface org.openide.util.datatransfer.MultiTransferObject
-meth public abstract boolean areDataFlavorsSupported(java.awt.datatransfer.DataFlavor[])
-meth public abstract boolean isDataFlavorSupported(int,java.awt.datatransfer.DataFlavor)
-meth public abstract int getCount()
-meth public abstract java.awt.datatransfer.DataFlavor[] getTransferDataFlavors(int)
-meth public abstract java.awt.datatransfer.Transferable getTransferableAt(int)
-meth public abstract java.lang.Object getTransferData(int,java.awt.datatransfer.DataFlavor) throws java.awt.datatransfer.UnsupportedFlavorException,java.io.IOException
-
-CLSS public abstract org.openide.util.datatransfer.NewType
-cons public init()
-intf org.openide.util.HelpCtx$Provider
-meth public abstract void create() throws java.io.IOException
-meth public java.lang.String getName()
-meth public org.openide.util.HelpCtx getHelpCtx()
-supr java.lang.Object
-
-CLSS public abstract org.openide.util.datatransfer.PasteType
-cons public init()
-intf org.openide.util.HelpCtx$Provider
-meth public abstract java.awt.datatransfer.Transferable paste() throws java.io.IOException
-meth public java.lang.String getName()
-meth public org.openide.util.HelpCtx getHelpCtx()
-supr java.lang.Object
-
-CLSS public abstract interface org.openide.util.datatransfer.TransferListener
-intf java.util.EventListener
-meth public abstract void accepted(int)
-meth public abstract void ownershipLost()
-meth public abstract void rejected()
-
-CLSS public org.openide.util.io.FoldingIOException
-cons public init(java.lang.Throwable)
- anno 0 java.lang.Deprecated()
-meth public java.lang.String getLocalizedMessage()
-meth public java.lang.String toString()
-meth public void printStackTrace()
-meth public void printStackTrace(java.io.PrintStream)
-meth public void printStackTrace(java.io.PrintWriter)
-supr java.io.IOException
-hfds serialVersionUID,t
-
-CLSS public final org.openide.util.io.NbMarshalledObject
-cons public init(java.lang.Object) throws java.io.IOException
-intf java.io.Serializable
-meth public boolean equals(java.lang.Object)
-meth public int hashCode()
-meth public java.lang.Object get() throws java.io.IOException,java.lang.ClassNotFoundException
-supr java.lang.Object
-hfds HEX,hash,objBytes,serialVersionUID
-
-CLSS public org.openide.util.io.NbObjectInputStream
-cons public init(java.io.InputStream) throws java.io.IOException
-meth protected java.io.ObjectStreamClass readClassDescriptor() throws java.io.IOException,java.lang.ClassNotFoundException
-meth protected java.lang.Class resolveClass(java.io.ObjectStreamClass) throws java.io.IOException,java.lang.ClassNotFoundException
-meth public static java.lang.Object readSafely(java.io.ObjectInput) throws java.io.IOException
-meth public static void skipSafely(java.io.ObjectInput) throws java.io.IOException
-supr java.io.ObjectInputStream
-
-CLSS public org.openide.util.io.NbObjectOutputStream
-cons public init(java.io.OutputStream) throws java.io.IOException
-meth protected void annotateClass(java.lang.Class) throws java.io.IOException
-meth public java.lang.Object replaceObject(java.lang.Object) throws java.io.IOException
-meth public static void writeSafely(java.io.ObjectOutput,java.lang.Object) throws java.io.IOException
-supr java.io.ObjectOutputStream
-hfds SVUID,alreadyReported,examinedClasses,serializing
-
-CLSS public org.openide.util.io.NullInputStream
-cons public init()
-fld public boolean throwException
-meth public int read() throws java.io.IOException
-supr java.io.InputStream
-
-CLSS public org.openide.util.io.NullOutputStream
-cons public init()
-fld public boolean throwException
-meth public void write(int) throws java.io.IOException
-supr java.io.OutputStream
-
-CLSS public org.openide.util.io.OperationException
-cons public init(java.lang.Exception)
-meth public java.lang.Exception getException()
-meth public java.lang.String getMessage()
-meth public java.lang.Throwable getCause()
-supr java.io.IOException
-hfds ex,serialVersionUID
-
-CLSS public org.openide.util.io.ReaderInputStream
-cons public init(java.io.Reader) throws java.io.IOException
-cons public init(java.io.Reader,java.lang.String) throws java.io.IOException
-meth public int available() throws java.io.IOException
-meth public int read() throws java.io.IOException
-meth public int read(byte[],int,int) throws java.io.IOException
-meth public void close() throws java.io.IOException
-supr java.io.InputStream
-hfds osw,pis,pos,reader
-
-CLSS public org.openide.util.io.SafeException
-cons public init(java.lang.Exception)
-meth public java.lang.Exception getException()
-meth public java.lang.Throwable getCause()
-supr org.openide.util.io.FoldingIOException
-hfds ex,serialVersionUID
-
-CLSS public abstract interface !annotation org.openide.util.lookup.NamedServiceDefinition
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault java.lang.String position()
-meth public abstract java.lang.Class<?>[] serviceType()
-meth public abstract java.lang.String path()
-
-CLSS public abstract org.openide.xml.EntityCatalog
-cons protected init()
-fld public final static java.lang.String PUBLIC_ID = "-//NetBeans//Entity Mapping Registration 1.0//EN"
- anno 0 java.lang.Deprecated()
-intf org.xml.sax.EntityResolver
-meth public static org.openide.xml.EntityCatalog getDefault()
-supr java.lang.Object
-hfds instance
-hcls Forwarder
-
-CLSS public final org.openide.xml.XMLUtil
-meth public static byte[] fromHex(char[],int,int) throws java.io.IOException
-meth public static java.lang.String findText(org.w3c.dom.Node)
-meth public static java.lang.String toAttributeValue(java.lang.String) throws java.io.CharConversionException
-meth public static java.lang.String toElementContent(java.lang.String) throws java.io.CharConversionException
-meth public static java.lang.String toHex(byte[],int,int)
-meth public static java.util.List<org.w3c.dom.Element> findSubElements(org.w3c.dom.Element)
-meth public static org.w3c.dom.Document createDocument(java.lang.String,java.lang.String,java.lang.String,java.lang.String)
-meth public static org.w3c.dom.Document parse(org.xml.sax.InputSource,boolean,boolean,org.xml.sax.ErrorHandler,org.xml.sax.EntityResolver) throws java.io.IOException,org.xml.sax.SAXException
-meth public static org.w3c.dom.Element findElement(org.w3c.dom.Element,java.lang.String,java.lang.String)
-meth public static org.w3c.dom.Element translateXML(org.w3c.dom.Element,java.lang.String)
-meth public static org.xml.sax.ErrorHandler defaultErrorHandler()
-meth public static org.xml.sax.XMLReader createXMLReader() throws org.xml.sax.SAXException
-meth public static org.xml.sax.XMLReader createXMLReader(boolean) throws org.xml.sax.SAXException
-meth public static org.xml.sax.XMLReader createXMLReader(boolean,boolean) throws org.xml.sax.SAXException
-meth public static void appendChildElement(org.w3c.dom.Element,org.w3c.dom.Element,java.lang.String[])
-meth public static void copyDocument(org.w3c.dom.Element,org.w3c.dom.Element,java.lang.String)
-meth public static void validate(org.w3c.dom.Element,javax.xml.validation.Schema) throws org.xml.sax.SAXException
-meth public static void write(org.w3c.dom.Document,java.io.OutputStream,java.lang.String) throws java.io.IOException
-supr java.lang.Object
-hfds DEC2HEX,IDENTITY_XSLT_WITH_INDENT,ORACLE_IS_STANDALONE,doms,saxes
-hcls ErrHandler
-
-CLSS public abstract interface org.xml.sax.EntityResolver
-meth public abstract org.xml.sax.InputSource resolveEntity(java.lang.String,java.lang.String) throws java.io.IOException,org.xml.sax.SAXException
-
diff --git a/openide.util.ui/src/META-INF/upgrade/ImageUtilities.hint b/openide.util.ui/src/META-INF/upgrade/ImageUtilities.hint
index e68260b..3e66ffe 100644
--- a/openide.util.ui/src/META-INF/upgrade/ImageUtilities.hint
+++ b/openide.util.ui/src/META-INF/upgrade/ImageUtilities.hint
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
"Use ImageUtilities instead of Utilities for image manipulation":
org.openide.util.Utilities.loadImage($r)
=>
diff --git a/openide.util.ui/src/META-INF/upgrade/NbBundle.hint b/openide.util.ui/src/META-INF/upgrade/NbBundle.hint
index 0f0ea81..a073d67 100644
--- a/openide.util.ui/src/META-INF/upgrade/NbBundle.hint
+++ b/openide.util.ui/src/META-INF/upgrade/NbBundle.hint
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
"Use getMessage in place of getString":
org.openide.util.NbBundle.getBundle($c).getString($k) :: $c instanceof java.lang.Class
=>
diff --git a/openide.util.ui/src/META-INF/upgrade/Utilities.hint b/openide.util.ui/src/META-INF/upgrade/Utilities.hint
index 5699b40..5dd77b6 100644
--- a/openide.util.ui/src/META-INF/upgrade/Utilities.hint
+++ b/openide.util.ui/src/META-INF/upgrade/Utilities.hint
@@ -1,42 +1,3 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
"Use Utilities API for URI/File conversion":
$f.toURI() :: $f instanceof java.io.File
=>
diff --git a/openide.util.ui/src/org/netbeans/modules/openide/util/NbBundleProcessor.java b/openide.util.ui/src/org/netbeans/modules/openide/util/NbBundleProcessor.java
index cf8bafb..068d299 100644
--- a/openide.util.ui/src/org/netbeans/modules/openide/util/NbBundleProcessor.java
+++ b/openide.util.ui/src/org/netbeans/modules/openide/util/NbBundleProcessor.java
@@ -299,7 +299,7 @@ public class NbBundleProcessor extends AbstractProcessor {
for (String method : methods.values()) {
pw.print(method);
}
- pw.println(" private Bundle() {}");
+ pw.println(" private void Bundle() {}");
pw.println("}");
pw.flush();
pw.close();
diff --git a/openide.util.ui/src/org/openide/package.html b/openide.util.ui/src/org/openide/package.html
index ccbe49a..1022e94 100644
--- a/openide.util.ui/src/org/openide/package.html
+++ b/openide.util.ui/src/org/openide/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/openide.util.ui/src/org/openide/util/ImageUtilities.java b/openide.util.ui/src/org/openide/util/ImageUtilities.java
index 5c7f4f0..a01a303 100644
--- a/openide.util.ui/src/org/openide/util/ImageUtilities.java
+++ b/openide.util.ui/src/org/openide/util/ImageUtilities.java
@@ -163,18 +163,9 @@ public final class ImageUtilities {
Image image = null;
if( isDarkLaF() ) {
image = getIcon(addDarkSuffix(resource), localized);
- // found an image with _dark-suffix, so there no need to apply an
- // image filter to make it look nice using dark themes
- }
- if (null == image) {
- image = getIcon(resource, localized);
- // only non _dark images need filtering
- RGBImageFilter imageFilter = getImageIconFilter();
- if (null != image && null != imageFilter) {
- image = Toolkit.getDefaultToolkit()
- .createImage(new FilteredImageSource(image.getSource(), imageFilter));
- }
}
+ if( null == image )
+ image = getIcon( resource, localized );
return image;
}
@@ -193,10 +184,21 @@ public final class ImageUtilities {
* @since 7.22
*/
public static final ImageIcon loadImageIcon( String resource, boolean localized ) {
- Image image = loadImage(resource, localized);
+ Image image = null;
+ if( isDarkLaF() ) {
+ image = getIcon(addDarkSuffix(resource), localized);
+ if( null != image ) {
+ return ( ImageIcon ) image2Icon( image );
+ }
+ }
+ image = getIcon( resource, localized );
if( image == null ) {
return null;
}
+ RGBImageFilter imageFilter = getImageIconFilter();
+ if( null != imageFilter ) {
+ image = Toolkit.getDefaultToolkit().createImage( new FilteredImageSource( image.getSource(), imageFilter ) );
+ }
return ( ImageIcon ) image2Icon( image );
}
@@ -647,8 +649,7 @@ public final class ImageUtilities {
System.out.println("INTERRUPTED while loading Image");
}
- // #262804 assertation disabled because of error, when using ImageFilter
- // assert (tracker.statusID(id, false) == MediaTracker.COMPLETE) : "Image loaded";
+ assert (tracker.statusID(id, false) == MediaTracker.COMPLETE) : "Image loaded";
tracker.removeImage(image, id);
}
}
diff --git a/openide.util.ui/src/org/openide/util/actions/CallableSystemAction.java b/openide.util.ui/src/org/openide/util/actions/CallableSystemAction.java
index d878fa5..896eaac 100644
--- a/openide.util.ui/src/org/openide/util/actions/CallableSystemAction.java
+++ b/openide.util.ui/src/org/openide/util/actions/CallableSystemAction.java
@@ -51,7 +51,7 @@ import java.util.logging.Logger;
import org.openide.util.Utilities;
import org.openide.util.WeakSet;
-/** Not preferred anymore, use <a href="@org-openide-awt@/org/openide/awt/Actions.html#alwaysEnabled-java.awt.event.ActionListener-java.lang.String-java.lang.String-boolean-">Actions.alwaysEnabled</a>
+/** Not preferred anymore, use <a href="@org-openide-awt@/org/openide/awt/Actions.html#alwaysEnabled(java.awt.event.ActionListener,%20java.lang.String,%20java.lang.String,%20boolean)">Actions.alwaysEnabled</a>
* instead. To migrate your
* <a href="@org-openide-modules@/org/openide/modules/doc-files/api.html#how-layer">
* layer definition</a> use:
diff --git a/openide.util.ui/src/org/openide/util/actions/CallbackSystemAction.java b/openide.util.ui/src/org/openide/util/actions/CallbackSystemAction.java
index 94ae552..a631882 100644
--- a/openide.util.ui/src/org/openide/util/actions/CallbackSystemAction.java
+++ b/openide.util.ui/src/org/openide/util/actions/CallbackSystemAction.java
@@ -70,7 +70,7 @@ import org.openide.util.WeakListeners;
import org.openide.util.WeakSet;
/** Not preferred anymore, the replacement is
-* <a href="@org-openide-awt@/org/openide/awt/Actions.html#callback-java.lang.String-javax.swing.Action-boolean-java.lang.String-java.lang.String-boolean-">Actions.callback</a> factory method.
+* <a href="@org-openide-awt@/org/openide/awt/Actions.html#callback(java.lang.String,%20javax.swing.Action,%20boolean,%20java.lang.String,%20java.lang.String,%20boolean)">Actions.callback</a> factory method.
* To migrate to the new API just remove the definition of your action in
* <a href="@org-openide-modules@/org/openide/modules/doc-files/api.html#how-layer">
* layer file</a> and replace it with:
diff --git a/openide.util.ui/src/org/openide/util/actions/package.html b/openide.util.ui/src/org/openide/util/actions/package.html
index d9e26a7..4f70138 100644
--- a/openide.util.ui/src/org/openide/util/actions/package.html
+++ b/openide.util.ui/src/org/openide/util/actions/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/openide.util.ui/src/org/openide/util/datatransfer/package.html b/openide.util.ui/src/org/openide/util/datatransfer/package.html
index 36ee4e3..13df659 100644
--- a/openide.util.ui/src/org/openide/util/datatransfer/package.html
+++ b/openide.util.ui/src/org/openide/util/datatransfer/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/openide.util.ui/src/org/openide/util/doc-files/api.html b/openide.util.ui/src/org/openide/util/doc-files/api.html
index 3c313f2..06280e5 100644
--- a/openide.util.ui/src/org/openide/util/doc-files/api.html
+++ b/openide.util.ui/src/org/openide/util/doc-files/api.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
@@ -61,9 +63,9 @@ our sources.
is the <em>adaptable</em> interface that objects can provide if
they wish to offer dynamic capabilities.
</li>
-
+
<li><a href="@org-openide-util@/org/openide/util/NbBundle.html">NbBundle</a> as our specialized support
- for localization and replacement to
+ for localization and replacement to
<a href="@JDK@/java/util/ResourceBundle.html">ResourceBundle</a>.
</li>
@@ -81,12 +83,12 @@ our sources.
<li>
<a href="../Utilities.html"><code>Utilities</code></a> which contain
a lot of methods of possible interest. For example
- <a href="../Utilities.html#actionsGlobalContext--"><code>actionsGlobalContext</code></a>,
- <a href="../Utilities.html#loadImage-java.lang.String-"><code>loadImage</code></a>,
- <a href="../Utilities.html#mergeImages-java.awt.Image-java.awt.Image-int-int-"><code>mergeImage</code></a>,
- <a href="../Utilities.html#topologicalSort-java.util.Collection-java.util.Map-"><code>topologicalSort</code></a>,
- <a href="../Utilities.html#activeReferenceQueue--"><code>activeReferenceQueue</code></a>,
- <a href="../Utilities.html#translate-java.lang.String-"><code>translate</code></a>.
+ <a href="../Utilities.html#actionsGlobalContext()"><code>actionsGlobalContext</code></a>,
+ <a href="../Utilities.html#loadImage(java.lang.String)"><code>loadImage</code></a>,
+ <a href="../Utilities.html#mergeImages(java.awt.Image,%20java.awt.Image,%20int,%20int)"><code>mergeImage</code></a>,
+ <a href="../Utilities.html#topologicalSort(java.util.Collection,%20java.util.Map)"><code>topologicalSort</code></a>,
+ <a href="../Utilities.html#activeReferenceQueue()"><code>activeReferenceQueue</code></a>,
+ <a href="../Utilities.html#translate(java.lang.String)"><code>translate</code></a>.
</li>
<li>
@@ -454,7 +456,7 @@ wish to find the implementation of it, you
may simply use:
<pre>
-<span class="type">MyService</span> <span class="variable-name">impl</span> = (<span class="type">MyService</span>)Lookup.getDefault().<a href="@org-openide-util-lookup@/org/openide/util/Lookup.html#lookup-java.lang.Class-">lookup</a>(MyService.<span class="keyword">class</span>);
+<span class="type">MyService</span> <span class="variable-name">impl</span> = (<span class="type">MyService</span>)Lookup.getDefault().<a href="@org-openide-util-lookup@/org/openide/util/Lookup.html#lookup(java.lang.Class)">lookup</a>(MyService.<span class="keyword">class</span>);
<span class="keyword">if</span> (impl == <span class="constant">null</span>) <span class="comment">/* nothing registered */</span> ...
impl.useIt();
</pre>
@@ -542,7 +544,7 @@ system options).
However for this purpose it is simpler to use the static finder method
-<a href="../SharedClassObject.html#findObject-java.lang.Class-boolean-"><code>SharedClassObject.findObject(Class, true)</code></a>
+<a href="../SharedClassObject.html#findObject(java.lang.Class,%20boolean)"><code>SharedClassObject.findObject(Class, true)</code></a>
which is guaranteed to find the singleton whether it was registered in
lookup or not (if necessary it will first
@@ -621,7 +623,7 @@ full state of the instance itself, which must be stored.
}
<span class="comment">// later...
</span><span class="type">String</span> <span class="variable-name">storedID</span> = someSettings.getChosenService();
-<span class="type">Lookup.Template</span> <span class="variable-name">templ</span> = <span class="keyword">new</span> <span class="type"><a href="@org-openide-util-lookup@/org/openide/util/Lookup.Template.html#Template-java.lang.Class-java.lang.String-java.lang.Object-">Lookup.Template</a></span>(MyService.<span class="keyword">class</span>, storedID, <span class="constant">null</span>);
+<span class="type">Lookup.Template</span> <span class="variable-name">templ</span> = <span class="keyword">new</span> <span class="type"><a href="@org-openide-util-lookup@/org/openide/util/Lookup.Template.html#Lookup.Template(java.lang.Class,java.lang.String,java.lang.Object)">Lookup.Template</a></span>(MyService.<span class="keyword">class</span>, storedID, <span class="constant">null</span>);
<span class="type">Iterator</span> <span class="variable-name">it</span> = Lookup.getDefault().lookup(templ).allInstances().iterator();
<span class="keyword">if</span> (! it.hasNext()) <span class="comment">/* failed to find it... */</span>
<span class="type">MyService</span> <span class="variable-name">instance</span> = (<span class="type">MyService</span>)it.next();
@@ -671,7 +673,7 @@ merging together the results of the delegate lookups.
If you want to use the common mechanism of finding instances in
folders (or subfolders) and serving these as the results,
-<a href="@org-openide-util-lookup@/org/openide/util/lookup/Lookups.html#forPath-java.lang.String-">Lookups.forPath(String)</a>
+<a href="@org-openide-util-lookup@/org/openide/util/lookup/Lookups.html#forPath(java.lang.String)">Lookups.forPath(String)</a>
makes this possible: you need only provide a name of a folder to look in, and
use
@@ -740,7 +742,7 @@ deregistered. Often
is used as the content implementation. To add something to the lookup,
simply use
-<a href="@org-openide-util-lookup@/org/openide/util/lookup/InstanceContent.html#add-java.lang.Object-"><code>add(Object)</code></a>
+<a href="@org-openide-util-lookup@/org/openide/util/lookup/InstanceContent.html#add(java.lang.Object)"><code>add(Object)</code></a>
(and <code>remove(Object)</code> for the reverse). These may be called
at any time and will update the set of registered instances (firing
@@ -911,7 +913,7 @@ instead).</p>
<li>In the common case of <code>SystemOption</code>, you may simply
call
-<a href="../SharedClassObject.html#findObject-java.lang.Class-boolean-"><code>SharedClassObject.findObject(Class, true)</code></a>
+<a href="../SharedClassObject.html#findObject(java.lang.Class,%20boolean)"><code>SharedClassObject.findObject(Class, true)</code></a>
which will either provide a previously initialized singleton, or find
the setting in lookup if possible and read any customized state before
diff --git a/openide.util.ui/src/org/openide/util/doc-files/logging.html b/openide.util.ui/src/org/openide/util/doc-files/logging.html
index 14c5dfb..9557e8a 100644
--- a/openide.util.ui/src/org/openide/util/doc-files/logging.html
+++ b/openide.util.ui/src/org/openide/util/doc-files/logging.html
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -57,10 +18,10 @@ Contributor(s):
writing good NetBeans ready logging code. The
info given here is valid for default configuration of the logger as
it is used in NetBeans. However it is possible to fully replace
- the system by providing own logging properties as
- in any
- <a href="@JDK@/java/util/logging/LogManager.html">other JDK application</a>.
- Then of course the behaviour may get completely
+ the system by providing own logging properties as
+ in any
+ <a href="@JDK@/java/util/logging/LogManager.html">other JDK application</a>.
+ Then of course the behaviour may get completely
different.
</p>
@@ -75,12 +36,12 @@ Contributor(s):
<p>Another important thing is to chain stack traces to
exceptions using
- <a href="@JDK@/java/lang/Throwable.html#initCause-java.lang.Throwable-">
+ <a href="@JDK@/java/lang/Throwable.html#initCause(java.lang.Throwable)">
Throwable.initCause(Throwable)</a>, permitting you to throw an exception
of a type permitted by your
API signature while safely encapsulating the root cause of the problem (in terms
of other nested exceptions). Code should use
- <a href="@JDK@/java/util/logging/Logger.html#log-java.util.logging.Level-java.lang.String-java.lang.Throwable-">
+ <a href="@JDK@/java/util/logging/Logger.html#log(java.util.logging.Level,%20java.lang.String,%20java.lang.Throwable)">
Logger.log(Level.SEVERE, msg, exception)</a>
rather than directly printing caught exceptions,
to make sure nested annotations are not lost and to allow pluged in
@@ -105,7 +66,7 @@ Contributor(s):
global logger
</a>
but it is preferred to create
- <a href="@JDK@/java/util/logging/Logger.html#getLogger-java.lang.String-">
+ <a href="@JDK@/java/util/logging/Logger.html#getLogger(java.lang.String)">
named and shared instances
</a> of loggers.
The later has the advantage of finer control of what is going
@@ -165,11 +126,11 @@ show blinking
icon to the user in bottom right corner of main window):
</p>
<pre>
-private static final <a href="@JDK@/java/util/logging/Logger.html">Logger</a> logger = <a href="@JDK@/java/util/logging/Logger.html#getLogger-java.lang.String-">Logger.getLogger</a>(ThisClass.class.getName());
+private static final <a href="@JDK@/java/util/logging/Logger.html">Logger</a> logger = <a href="@JDK@/java/util/logging/Logger.html#getLogger(java.lang.String)">Logger.getLogger</a>(ThisClass.class.getName());
try {
foo.doSomething();
} catch (IOException ioe) {
- <a href="@JDK@/java/util/logging/Logger.html#log-java.util.logging.Level-java.lang.String-java.lang.Throwable-">logger.log</a>(Level.SEVERE, null, ioe);
+ <a href="@JDK@/java/util/logging/Logger.html#log(java.util.logging.Level,%20java.lang.String,%20java.lang.Throwable)">logger.log</a>(Level.SEVERE, null, ioe);
}
</pre>
@@ -206,10 +167,10 @@ try {
This code will present a dialog box with warning message extracted from
the exception <code>ex</code> sometime in the <q>future</q> - e.g. when the
AWT event queue is empty and can show the dialog. Use of
-<a href="@org-openide-dialogs@/org/openide/DialogDisplayer.html#notifyLater-org.openide.NotifyDescriptor-">
+<a href="@org-openide-dialogs@/org/openide/DialogDisplayer.html#notifyLater(org.openide.NotifyDescriptor)">
notifyLater</a>
to plain
-<a href="@org-openide-dialogs@/org/openide/DialogDisplayer.html#notify-org.openide.NotifyDescriptor-">
+<a href="@org-openide-dialogs@/org/openide/DialogDisplayer.html#notify(org.openide.NotifyDescriptor)">
notify</a>
is recommended in order to prevent deadlocks and
@@ -220,7 +181,7 @@ starvations
<p>
To rethrow an exception use standard JDK's
- <a href="@JDK@/java/lang/Throwable.html#initCause-java.lang.Throwable-">
+ <a href="@JDK@/java/lang/Throwable.html#initCause(java.lang.Throwable)">
Throwable.initCause(Throwable)</a> method. It is going to
be properly annotated and printed when sent to logger:
<pre>
@@ -287,15 +248,15 @@ class Something {
<p>
There is an easy way how to annotate exceptions with localized and non-localized
messages in NetBeans. One can use
-<a href="@org-openide-util@/org/openide/util/Exceptions.html#attachMessage-E-java.lang.String-">
+<a href="@org-openide-util@/org/openide/util/Exceptions.html#attachMessage(E,%20java.lang.String)">
Exceptions.attachMessage
</a> or
-<a href="@org-openide-util@/org/openide/util/Exceptions.html#attachLocalizedMessage-E-java.lang.String-">
+<a href="@org-openide-util@/org/openide/util/Exceptions.html#attachLocalizedMessage(E,%20java.lang.String)">
Exceptions.attachLocalizedMessage
</a>. The non-localized messages are guaranteed to be printed when one does
<code>ex.printStackTrace()</code>, to extract associated localized message
one can use
-<a href="@org-openide-util@/org/openide/util/Exceptions.html#findLocalizedMessage-java.lang.Throwable-">
+<a href="@org-openide-util@/org/openide/util/Exceptions.html#findLocalizedMessage(java.lang.Throwable)">
Exceptions.findLocalizedMessage
</a>.
</p>
diff --git a/openide.util.ui/src/org/openide/util/doc-files/preferences.html b/openide.util.ui/src/org/openide/util/doc-files/preferences.html
index be4e202..be51adb 100644
--- a/openide.util.ui/src/org/openide/util/doc-files/preferences.html
+++ b/openide.util.ui/src/org/openide/util/doc-files/preferences.html
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
@@ -47,7 +8,7 @@ Contributor(s):
<h1 align="left">Preferences API in NetBeans</h1>
NetBeans adopts <a href="http://java.sun.com/j2se/1.5.0/docs/guide/preferences/">Java Preferences API</a>
standard to be used in NetBeans to
- store preference and configuration data to be able to adapt to the needs
+ store preference and configuration data to be able to adapt to the needs
of different users. NetBeans keeps this standard and enhances it slightly
by providing its own preference tree in addition to default system and user
roots. The purpose for this enhancement is to
diff --git a/openide.util.ui/src/org/openide/util/package.html b/openide.util.ui/src/org/openide/util/package.html
index 1aee92f..5a7b628 100644
--- a/openide.util.ui/src/org/openide/util/package.html
+++ b/openide.util.ui/src/org/openide/util/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/openide.util/arch.xml b/openide.util/arch.xml
index d5076cd..1cf1458 100644
--- a/openide.util/arch.xml
+++ b/openide.util/arch.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE api-answers PUBLIC "-//NetBeans//DTD Arch Answers//EN" "../nbbuild/antsrc/org/netbeans/nbbuild/Arch.dtd" [
<!ENTITY api-questions SYSTEM "../nbbuild/antsrc/org/netbeans/nbbuild/Arch-api-questions.xml">
]>
@@ -52,11 +13,11 @@ Contributor(s):
<!--
<question id="arch-overall" when="init">
- Describe the overall architecture.
+ Describe the overall architecture.
<hint>
- What will be API for
+ What will be API for
<a href="http://wiki.netbeans.org/API_Design#Separate_API_for_clients_from_support_API">
- clients and what support API</a>?
+ clients and what support API</a>?
What parts will be pluggable?
How will plug-ins be registered? Please use <code><api type="export"/></code>
to describe your general APIs and specify their
@@ -256,8 +217,8 @@ Contributor(s):
<p>
The <a href="http://java.sun.com/j2se/1.3/docs/guide/jar/jar.html#Provider%20Configuration%20File">META-INF/services/...</a> files.
<api name="TranslateNames" category="official" type="export" group="java.io.File"
- url="@TOP@/org/openide/util/BaseUtilities.html#translate-java.lang.String-">
- <a href="@TOP@/org/openide/util/BaseUtilities.html#translate-java.lang.String-">Utilities.translate</a>
+ url="@TOP@/org/openide/util/BaseUtilities.html#translate(java.lang.String)">
+ <a href="@TOP@/org/openide/util/BaseUtilities.html#translate(java.lang.String)">Utilities.translate</a>
reads <code>META-INF/netbeans/translate.names</code> files from JARs</api>.
</p>
</answer>
diff --git a/openide.util/build.xml b/openide.util/build.xml
index 1bdfa12..2a36891 100644
--- a/openide.util/build.xml
+++ b/openide.util/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2003, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="openide.util">
<description>Builds, tests, and runs the project org.openide.util</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/openide.util/manifest.mf b/openide.util/manifest.mf
index 264380f..65cffce 100644
--- a/openide.util/manifest.mf
+++ b/openide.util/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.util
OpenIDE-Module-Localizing-Bundle: org/openide/util/base/Bundle.properties
-OpenIDE-Module-Specification-Version: 9.7.1
+OpenIDE-Module-Specification-Version: 9.5.1
diff --git a/openide.util/nbproject/org-openide-util.sig b/openide.util/nbproject/org-openide-util.sig
deleted file mode 100644
index 2452f0b..0000000
--- a/openide.util/nbproject/org-openide-util.sig
+++ /dev/null
@@ -1,1114 +0,0 @@
-#Signature file v4.1
-#Version 9.5.1
-
-CLSS public abstract interface java.io.Closeable
-intf java.lang.AutoCloseable
-meth public abstract void close() throws java.io.IOException
-
-CLSS public abstract interface java.io.DataInput
-meth public abstract boolean readBoolean() throws java.io.IOException
-meth public abstract byte readByte() throws java.io.IOException
-meth public abstract char readChar() throws java.io.IOException
-meth public abstract double readDouble() throws java.io.IOException
-meth public abstract float readFloat() throws java.io.IOException
-meth public abstract int readInt() throws java.io.IOException
-meth public abstract int readUnsignedByte() throws java.io.IOException
-meth public abstract int readUnsignedShort() throws java.io.IOException
-meth public abstract int skipBytes(int) throws java.io.IOException
-meth public abstract java.lang.String readLine() throws java.io.IOException
-meth public abstract java.lang.String readUTF() throws java.io.IOException
-meth public abstract long readLong() throws java.io.IOException
-meth public abstract short readShort() throws java.io.IOException
-meth public abstract void readFully(byte[]) throws java.io.IOException
-meth public abstract void readFully(byte[],int,int) throws java.io.IOException
-
-CLSS public abstract interface java.io.DataOutput
-meth public abstract void write(byte[]) throws java.io.IOException
-meth public abstract void write(byte[],int,int) throws java.io.IOException
-meth public abstract void write(int) throws java.io.IOException
-meth public abstract void writeBoolean(boolean) throws java.io.IOException
-meth public abstract void writeByte(int) throws java.io.IOException
-meth public abstract void writeBytes(java.lang.String) throws java.io.IOException
-meth public abstract void writeChar(int) throws java.io.IOException
-meth public abstract void writeChars(java.lang.String) throws java.io.IOException
-meth public abstract void writeDouble(double) throws java.io.IOException
-meth public abstract void writeFloat(float) throws java.io.IOException
-meth public abstract void writeInt(int) throws java.io.IOException
-meth public abstract void writeLong(long) throws java.io.IOException
-meth public abstract void writeShort(int) throws java.io.IOException
-meth public abstract void writeUTF(java.lang.String) throws java.io.IOException
-
-CLSS public abstract interface java.io.Flushable
-meth public abstract void flush() throws java.io.IOException
-
-CLSS public java.io.IOException
-cons public init()
-cons public init(java.lang.String)
-cons public init(java.lang.String,java.lang.Throwable)
-cons public init(java.lang.Throwable)
-supr java.lang.Exception
-hfds serialVersionUID
-
-CLSS public abstract java.io.InputStream
-cons public init()
-intf java.io.Closeable
-meth public abstract int read() throws java.io.IOException
-meth public boolean markSupported()
-meth public int available() throws java.io.IOException
-meth public int read(byte[]) throws java.io.IOException
-meth public int read(byte[],int,int) throws java.io.IOException
-meth public long skip(long) throws java.io.IOException
-meth public void close() throws java.io.IOException
-meth public void mark(int)
-meth public void reset() throws java.io.IOException
-supr java.lang.Object
-hfds MAX_SKIP_BUFFER_SIZE
-
-CLSS public abstract interface java.io.ObjectInput
-intf java.io.DataInput
-intf java.lang.AutoCloseable
-meth public abstract int available() throws java.io.IOException
-meth public abstract int read() throws java.io.IOException
-meth public abstract int read(byte[]) throws java.io.IOException
-meth public abstract int read(byte[],int,int) throws java.io.IOException
-meth public abstract java.lang.Object readObject() throws java.io.IOException,java.lang.ClassNotFoundException
-meth public abstract long skip(long) throws java.io.IOException
-meth public abstract void close() throws java.io.IOException
-
-CLSS public java.io.ObjectInputStream
-cons protected init() throws java.io.IOException
-cons public init(java.io.InputStream) throws java.io.IOException
-innr public abstract static GetField
-intf java.io.ObjectInput
-intf java.io.ObjectStreamConstants
-meth protected boolean enableResolveObject(boolean)
-meth protected java.io.ObjectStreamClass readClassDescriptor() throws java.io.IOException,java.lang.ClassNotFoundException
-meth protected java.lang.Class<?> resolveClass(java.io.ObjectStreamClass) throws java.io.IOException,java.lang.ClassNotFoundException
-meth protected java.lang.Class<?> resolveProxyClass(java.lang.String[]) throws java.io.IOException,java.lang.ClassNotFoundException
-meth protected java.lang.Object readObjectOverride() throws java.io.IOException,java.lang.ClassNotFoundException
-meth protected java.lang.Object resolveObject(java.lang.Object) throws java.io.IOException
-meth protected void readStreamHeader() throws java.io.IOException
-meth public boolean readBoolean() throws java.io.IOException
-meth public byte readByte() throws java.io.IOException
-meth public char readChar() throws java.io.IOException
-meth public double readDouble() throws java.io.IOException
-meth public final java.lang.Object readObject() throws java.io.IOException,java.lang.ClassNotFoundException
-meth public float readFloat() throws java.io.IOException
-meth public int available() throws java.io.IOException
-meth public int read() throws java.io.IOException
-meth public int read(byte[],int,int) throws java.io.IOException
-meth public int readInt() throws java.io.IOException
-meth public int readUnsignedByte() throws java.io.IOException
-meth public int readUnsignedShort() throws java.io.IOException
-meth public int skipBytes(int) throws java.io.IOException
-meth public java.io.ObjectInputStream$GetField readFields() throws java.io.IOException,java.lang.ClassNotFoundException
-meth public java.lang.Object readUnshared() throws java.io.IOException,java.lang.ClassNotFoundException
-meth public java.lang.String readLine() throws java.io.IOException
- anno 0 java.lang.Deprecated()
-meth public java.lang.String readUTF() throws java.io.IOException
-meth public long readLong() throws java.io.IOException
-meth public short readShort() throws java.io.IOException
-meth public void close() throws java.io.IOException
-meth public void defaultReadObject() throws java.io.IOException,java.lang.ClassNotFoundException
-meth public void readFully(byte[]) throws java.io.IOException
-meth public void readFully(byte[],int,int) throws java.io.IOException
-meth public void registerValidation(java.io.ObjectInputValidation,int) throws java.io.InvalidObjectException,java.io.NotActiveException
-supr java.io.InputStream
-hfds NULL_HANDLE,bin,closed,curContext,defaultDataEnd,depth,enableOverride,enableResolve,handles,passHandle,primClasses,primVals,unsharedMarker,vlist
-hcls BlockDataInputStream,Caches,GetFieldImpl,HandleTable,PeekInputStream,ValidationList
-
-CLSS public abstract interface java.io.ObjectOutput
-intf java.io.DataOutput
-intf java.lang.AutoCloseable
-meth public abstract void close() throws java.io.IOException
-meth public abstract void flush() throws java.io.IOException
-meth public abstract void write(byte[]) throws java.io.IOException
-meth public abstract void write(byte[],int,int) throws java.io.IOException
-meth public abstract void write(int) throws java.io.IOException
-meth public abstract void writeObject(java.lang.Object) throws java.io.IOException
-
-CLSS public java.io.ObjectOutputStream
-cons protected init() throws java.io.IOException
-cons public init(java.io.OutputStream) throws java.io.IOException
-innr public abstract static PutField
-intf java.io.ObjectOutput
-intf java.io.ObjectStreamConstants
-meth protected boolean enableReplaceObject(boolean)
-meth protected java.lang.Object replaceObject(java.lang.Object) throws java.io.IOException
-meth protected void annotateClass(java.lang.Class<?>) throws java.io.IOException
-meth protected void annotateProxyClass(java.lang.Class<?>) throws java.io.IOException
-meth protected void drain() throws java.io.IOException
-meth protected void writeClassDescriptor(java.io.ObjectStreamClass) throws java.io.IOException
-meth protected void writeObjectOverride(java.lang.Object) throws java.io.IOException
-meth protected void writeStreamHeader() throws java.io.IOException
-meth public final void writeObject(java.lang.Object) throws java.io.IOException
-meth public java.io.ObjectOutputStream$PutField putFields() throws java.io.IOException
-meth public void close() throws java.io.IOException
-meth public void defaultWriteObject() throws java.io.IOException
-meth public void flush() throws java.io.IOException
-meth public void reset() throws java.io.IOException
-meth public void useProtocolVersion(int) throws java.io.IOException
-meth public void write(byte[]) throws java.io.IOException
-meth public void write(byte[],int,int) throws java.io.IOException
-meth public void write(int) throws java.io.IOException
-meth public void writeBoolean(boolean) throws java.io.IOException
-meth public void writeByte(int) throws java.io.IOException
-meth public void writeBytes(java.lang.String) throws java.io.IOException
-meth public void writeChar(int) throws java.io.IOException
-meth public void writeChars(java.lang.String) throws java.io.IOException
-meth public void writeDouble(double) throws java.io.IOException
-meth public void writeFields() throws java.io.IOException
-meth public void writeFloat(float) throws java.io.IOException
-meth public void writeInt(int) throws java.io.IOException
-meth public void writeLong(long) throws java.io.IOException
-meth public void writeShort(int) throws java.io.IOException
-meth public void writeUTF(java.lang.String) throws java.io.IOException
-meth public void writeUnshared(java.lang.Object) throws java.io.IOException
-supr java.io.OutputStream
-hfds bout,curContext,curPut,debugInfoStack,depth,enableOverride,enableReplace,extendedDebugInfo,handles,primVals,protocol,subs
-hcls BlockDataOutputStream,Caches,DebugTraceInfoStack,HandleTable,PutFieldImpl,ReplaceTable
-
-CLSS public abstract interface java.io.ObjectStreamConstants
-fld public final static byte SC_BLOCK_DATA = 8
-fld public final static byte SC_ENUM = 16
-fld public final static byte SC_EXTERNALIZABLE = 4
-fld public final static byte SC_SERIALIZABLE = 2
-fld public final static byte SC_WRITE_METHOD = 1
-fld public final static byte TC_ARRAY = 117
-fld public final static byte TC_BASE = 112
-fld public final static byte TC_BLOCKDATA = 119
-fld public final static byte TC_BLOCKDATALONG = 122
-fld public final static byte TC_CLASS = 118
-fld public final static byte TC_CLASSDESC = 114
-fld public final static byte TC_ENDBLOCKDATA = 120
-fld public final static byte TC_ENUM = 126
-fld public final static byte TC_EXCEPTION = 123
-fld public final static byte TC_LONGSTRING = 124
-fld public final static byte TC_MAX = 126
-fld public final static byte TC_NULL = 112
-fld public final static byte TC_OBJECT = 115
-fld public final static byte TC_PROXYCLASSDESC = 125
-fld public final static byte TC_REFERENCE = 113
-fld public final static byte TC_RESET = 121
-fld public final static byte TC_STRING = 116
-fld public final static int PROTOCOL_VERSION_1 = 1
-fld public final static int PROTOCOL_VERSION_2 = 2
-fld public final static int baseWireHandle = 8257536
-fld public final static java.io.SerializablePermission SUBCLASS_IMPLEMENTATION_PERMISSION
-fld public final static java.io.SerializablePermission SUBSTITUTION_PERMISSION
-fld public final static short STREAM_MAGIC = -21267
-fld public final static short STREAM_VERSION = 5
-
-CLSS public abstract java.io.OutputStream
-cons public init()
-intf java.io.Closeable
-intf java.io.Flushable
-meth public abstract void write(int) throws java.io.IOException
-meth public void close() throws java.io.IOException
-meth public void flush() throws java.io.IOException
-meth public void write(byte[]) throws java.io.IOException
-meth public void write(byte[],int,int) throws java.io.IOException
-supr java.lang.Object
-
-CLSS public abstract interface java.io.Serializable
-
-CLSS public abstract interface java.lang.AutoCloseable
-meth public abstract void close() throws java.lang.Exception
-
-CLSS public abstract interface java.lang.Cloneable
-
-CLSS public abstract interface !annotation java.lang.Deprecated
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE])
-intf java.lang.annotation.Annotation
-
-CLSS public java.lang.Exception
-cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean)
-cons public init()
-cons public init(java.lang.String)
-cons public init(java.lang.String,java.lang.Throwable)
-cons public init(java.lang.Throwable)
-supr java.lang.Throwable
-hfds serialVersionUID
-
-CLSS public abstract interface java.lang.Iterable<%0 extends java.lang.Object>
-meth public abstract java.util.Iterator<{java.lang.Iterable%0}> iterator()
-
-CLSS public java.lang.Object
-cons public init()
-meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
-meth protected void finalize() throws java.lang.Throwable
-meth public boolean equals(java.lang.Object)
-meth public final java.lang.Class<?> getClass()
-meth public final void notify()
-meth public final void notifyAll()
-meth public final void wait() throws java.lang.InterruptedException
-meth public final void wait(long) throws java.lang.InterruptedException
-meth public final void wait(long,int) throws java.lang.InterruptedException
-meth public int hashCode()
-meth public java.lang.String toString()
-
-CLSS public abstract interface java.lang.Runnable
-meth public abstract void run()
-
-CLSS public java.lang.RuntimeException
-cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean)
-cons public init()
-cons public init(java.lang.String)
-cons public init(java.lang.String,java.lang.Throwable)
-cons public init(java.lang.Throwable)
-supr java.lang.Exception
-hfds serialVersionUID
-
-CLSS public java.lang.Throwable
-cons protected init(java.lang.String,java.lang.Throwable,boolean,boolean)
-cons public init()
-cons public init(java.lang.String)
-cons public init(java.lang.String,java.lang.Throwable)
-cons public init(java.lang.Throwable)
-intf java.io.Serializable
-meth public final java.lang.Throwable[] getSuppressed()
-meth public final void addSuppressed(java.lang.Throwable)
-meth public java.lang.StackTraceElement[] getStackTrace()
-meth public java.lang.String getLocalizedMessage()
-meth public java.lang.String getMessage()
-meth public java.lang.String toString()
-meth public java.lang.Throwable fillInStackTrace()
-meth public java.lang.Throwable getCause()
-meth public java.lang.Throwable initCause(java.lang.Throwable)
-meth public void printStackTrace()
-meth public void printStackTrace(java.io.PrintStream)
-meth public void printStackTrace(java.io.PrintWriter)
-meth public void setStackTrace(java.lang.StackTraceElement[])
-supr java.lang.Object
-hfds CAUSE_CAPTION,EMPTY_THROWABLE_ARRAY,NULL_CAUSE_MESSAGE,SELF_SUPPRESSION_MESSAGE,SUPPRESSED_CAPTION,SUPPRESSED_SENTINEL,UNASSIGNED_STACK,backtrace,cause,detailMessage,serialVersionUID,stackTrace,suppressedExceptions
-hcls PrintStreamOrWriter,SentinelHolder,WrappedPrintStream,WrappedPrintWriter
-
-CLSS public abstract interface java.lang.annotation.Annotation
-meth public abstract boolean equals(java.lang.Object)
-meth public abstract int hashCode()
-meth public abstract java.lang.Class<? extends java.lang.annotation.Annotation> annotationType()
-meth public abstract java.lang.String toString()
-
-CLSS public abstract interface !annotation java.lang.annotation.Documented
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-
-CLSS public abstract interface !annotation java.lang.annotation.Retention
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract java.lang.annotation.RetentionPolicy value()
-
-CLSS public abstract interface !annotation java.lang.annotation.Target
- anno 0 java.lang.annotation.Documented()
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract java.lang.annotation.ElementType[] value()
-
-CLSS public abstract java.text.Format
-cons protected init()
-innr public static Field
-intf java.io.Serializable
-intf java.lang.Cloneable
-meth public abstract java.lang.Object parseObject(java.lang.String,java.text.ParsePosition)
-meth public abstract java.lang.StringBuffer format(java.lang.Object,java.lang.StringBuffer,java.text.FieldPosition)
-meth public final java.lang.String format(java.lang.Object)
-meth public java.lang.Object clone()
-meth public java.lang.Object parseObject(java.lang.String) throws java.text.ParseException
-meth public java.text.AttributedCharacterIterator formatToCharacterIterator(java.lang.Object)
-supr java.lang.Object
-hfds serialVersionUID
-hcls FieldDelegate
-
-CLSS public abstract java.util.AbstractCollection<%0 extends java.lang.Object>
-cons protected init()
-intf java.util.Collection<{java.util.AbstractCollection%0}>
-meth public <%0 extends java.lang.Object> {%%0}[] toArray({%%0}[])
-meth public abstract int size()
-meth public abstract java.util.Iterator<{java.util.AbstractCollection%0}> iterator()
-meth public boolean add({java.util.AbstractCollection%0})
-meth public boolean addAll(java.util.Collection<? extends {java.util.AbstractCollection%0}>)
-meth public boolean contains(java.lang.Object)
-meth public boolean containsAll(java.util.Collection<?>)
-meth public boolean isEmpty()
-meth public boolean remove(java.lang.Object)
-meth public boolean removeAll(java.util.Collection<?>)
-meth public boolean retainAll(java.util.Collection<?>)
-meth public java.lang.Object[] toArray()
-meth public java.lang.String toString()
-meth public void clear()
-supr java.lang.Object
-hfds MAX_ARRAY_SIZE
-
-CLSS public abstract java.util.AbstractMap<%0 extends java.lang.Object, %1 extends java.lang.Object>
-cons protected init()
-innr public static SimpleEntry
-innr public static SimpleImmutableEntry
-intf java.util.Map<{java.util.AbstractMap%0},{java.util.AbstractMap%1}>
-meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException
-meth public abstract java.util.Set<java.util.Map$Entry<{java.util.AbstractMap%0},{java.util.AbstractMap%1}>> entrySet()
-meth public boolean containsKey(java.lang.Object)
-meth public boolean containsValue(java.lang.Object)
-meth public boolean equals(java.lang.Object)
-meth public boolean isEmpty()
-meth public int hashCode()
-meth public int size()
-meth public java.lang.String toString()
-meth public java.util.Collection<{java.util.AbstractMap%1}> values()
-meth public java.util.Set<{java.util.AbstractMap%0}> keySet()
-meth public void clear()
-meth public void putAll(java.util.Map<? extends {java.util.AbstractMap%0},? extends {java.util.AbstractMap%1}>)
-meth public {java.util.AbstractMap%1} get(java.lang.Object)
-meth public {java.util.AbstractMap%1} put({java.util.AbstractMap%0},{java.util.AbstractMap%1})
-meth public {java.util.AbstractMap%1} remove(java.lang.Object)
-supr java.lang.Object
-hfds keySet,values
-
-CLSS public abstract java.util.AbstractSet<%0 extends java.lang.Object>
-cons protected init()
-intf java.util.Set<{java.util.AbstractSet%0}>
-meth public boolean equals(java.lang.Object)
-meth public boolean removeAll(java.util.Collection<?>)
-meth public int hashCode()
-supr java.util.AbstractCollection<{java.util.AbstractSet%0}>
-
-CLSS public abstract interface java.util.Collection<%0 extends java.lang.Object>
-intf java.lang.Iterable<{java.util.Collection%0}>
-meth public abstract <%0 extends java.lang.Object> {%%0}[] toArray({%%0}[])
-meth public abstract boolean add({java.util.Collection%0})
-meth public abstract boolean addAll(java.util.Collection<? extends {java.util.Collection%0}>)
-meth public abstract boolean contains(java.lang.Object)
-meth public abstract boolean containsAll(java.util.Collection<?>)
-meth public abstract boolean equals(java.lang.Object)
-meth public abstract boolean isEmpty()
-meth public abstract boolean remove(java.lang.Object)
-meth public abstract boolean removeAll(java.util.Collection<?>)
-meth public abstract boolean retainAll(java.util.Collection<?>)
-meth public abstract int hashCode()
-meth public abstract int size()
-meth public abstract java.lang.Object[] toArray()
-meth public abstract java.util.Iterator<{java.util.Collection%0}> iterator()
-meth public abstract void clear()
-
-CLSS public abstract interface java.util.EventListener
-
-CLSS public java.util.EventObject
-cons public init(java.lang.Object)
-fld protected java.lang.Object source
-intf java.io.Serializable
-meth public java.lang.Object getSource()
-meth public java.lang.String toString()
-supr java.lang.Object
-hfds serialVersionUID
-
-CLSS public abstract interface java.util.Map<%0 extends java.lang.Object, %1 extends java.lang.Object>
-innr public abstract interface static Entry
-meth public abstract boolean containsKey(java.lang.Object)
-meth public abstract boolean containsValue(java.lang.Object)
-meth public abstract boolean equals(java.lang.Object)
-meth public abstract boolean isEmpty()
-meth public abstract int hashCode()
-meth public abstract int size()
-meth public abstract java.util.Collection<{java.util.Map%1}> values()
-meth public abstract java.util.Set<java.util.Map$Entry<{java.util.Map%0},{java.util.Map%1}>> entrySet()
-meth public abstract java.util.Set<{java.util.Map%0}> keySet()
-meth public abstract void clear()
-meth public abstract void putAll(java.util.Map<? extends {java.util.Map%0},? extends {java.util.Map%1}>)
-meth public abstract {java.util.Map%1} get(java.lang.Object)
-meth public abstract {java.util.Map%1} put({java.util.Map%0},{java.util.Map%1})
-meth public abstract {java.util.Map%1} remove(java.lang.Object)
-
-CLSS public abstract interface java.util.Set<%0 extends java.lang.Object>
-intf java.util.Collection<{java.util.Set%0}>
-meth public abstract <%0 extends java.lang.Object> {%%0}[] toArray({%%0}[])
-meth public abstract boolean add({java.util.Set%0})
-meth public abstract boolean addAll(java.util.Collection<? extends {java.util.Set%0}>)
-meth public abstract boolean contains(java.lang.Object)
-meth public abstract boolean containsAll(java.util.Collection<?>)
-meth public abstract boolean equals(java.lang.Object)
-meth public abstract boolean isEmpty()
-meth public abstract boolean remove(java.lang.Object)
-meth public abstract boolean removeAll(java.util.Collection<?>)
-meth public abstract boolean retainAll(java.util.Collection<?>)
-meth public abstract int hashCode()
-meth public abstract int size()
-meth public abstract java.lang.Object[] toArray()
-meth public abstract java.util.Iterator<{java.util.Set%0}> iterator()
-meth public abstract void clear()
-
-CLSS public abstract interface java.util.concurrent.Executor
-meth public abstract void execute(java.lang.Runnable)
-
-CLSS public abstract interface java.util.concurrent.ExecutorService
-intf java.util.concurrent.Executor
-meth public abstract <%0 extends java.lang.Object> java.util.List<java.util.concurrent.Future<{%%0}>> invokeAll(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>) throws java.lang.InterruptedException
-meth public abstract <%0 extends java.lang.Object> java.util.List<java.util.concurrent.Future<{%%0}>> invokeAll(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>,long,java.util.concurrent.TimeUnit) throws java.lang.InterruptedException
-meth public abstract <%0 extends java.lang.Object> java.util.concurrent.Future<{%%0}> submit(java.lang.Runnable,{%%0})
-meth public abstract <%0 extends java.lang.Object> java.util.concurrent.Future<{%%0}> submit(java.util.concurrent.Callable<{%%0}>)
-meth public abstract <%0 extends java.lang.Object> {%%0} invokeAny(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>) throws java.lang.InterruptedException,java.util.concurrent.ExecutionException
-meth public abstract <%0 extends java.lang.Object> {%%0} invokeAny(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>,long,java.util.concurrent.TimeUnit) throws java.lang.InterruptedException,java.util.concurrent.ExecutionException,java.util.concurrent.TimeoutException
-meth public abstract boolean awaitTermination(long,java.util.concurrent.TimeUnit) throws java.lang.InterruptedException
-meth public abstract boolean isShutdown()
-meth public abstract boolean isTerminated()
-meth public abstract java.util.List<java.lang.Runnable> shutdownNow()
-meth public abstract java.util.concurrent.Future<?> submit(java.lang.Runnable)
-meth public abstract void shutdown()
-
-CLSS public abstract interface java.util.concurrent.ScheduledExecutorService
-intf java.util.concurrent.ExecutorService
-meth public abstract <%0 extends java.lang.Object> java.util.concurrent.ScheduledFuture<{%%0}> schedule(java.util.concurrent.Callable<{%%0}>,long,java.util.concurrent.TimeUnit)
-meth public abstract java.util.concurrent.ScheduledFuture<?> schedule(java.lang.Runnable,long,java.util.concurrent.TimeUnit)
-meth public abstract java.util.concurrent.ScheduledFuture<?> scheduleAtFixedRate(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)
-meth public abstract java.util.concurrent.ScheduledFuture<?> scheduleWithFixedDelay(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)
-
-CLSS public abstract org.openide.util.BaseUtilities
-fld public final static int OS_AIX = 64
-fld public final static int OS_DEC = 1024
- anno 0 java.lang.Deprecated()
-fld public final static int OS_FREEBSD = 131072
-fld public final static int OS_HP = 32
-fld public final static int OS_IRIX = 128
-fld public final static int OS_LINUX = 16
-fld public final static int OS_MAC = 4096
-fld public final static int OS_OPENBSD = 1048576
-fld public final static int OS_OS2 = 2048
-fld public final static int OS_OTHER = 65536
-fld public final static int OS_SOLARIS = 8
-fld public final static int OS_SUNOS = 256
-fld public final static int OS_TRU64 = 512
-fld public final static int OS_UNIX_MASK = 1709048
- anno 0 java.lang.Deprecated()
-fld public final static int OS_UNIX_OTHER = 524288
-fld public final static int OS_VMS = 16384
-fld public final static int OS_WIN2000 = 8192
-fld public final static int OS_WIN95 = 2
-fld public final static int OS_WIN98 = 4
-fld public final static int OS_WINDOWS_MASK = 303111
- anno 0 java.lang.Deprecated()
-fld public final static int OS_WINNT = 1
-fld public final static int OS_WINVISTA = 262144
-fld public final static int OS_WIN_OTHER = 32768
-meth public static <%0 extends java.lang.Object> java.util.List<{%%0}> topologicalSort(java.util.Collection<? extends {%%0}>,java.util.Map<? super {%%0},? extends java.util.Collection<? extends {%%0}>>) throws org.openide.util.TopologicalSortException
-meth public static boolean compareObjects(java.lang.Object,java.lang.Object)
-meth public static boolean compareObjectsImpl(java.lang.Object,java.lang.Object,int)
-meth public static boolean isJavaIdentifier(java.lang.String)
-meth public static boolean isMac()
-meth public static boolean isUnix()
-meth public static boolean isWindows()
-meth public static int getOperatingSystem()
-meth public static java.io.File toFile(java.net.URI)
-meth public static java.lang.Class<?> getObjectType(java.lang.Class<?>)
-meth public static java.lang.Class<?> getPrimitiveType(java.lang.Class<?>)
-meth public static java.lang.Object toPrimitiveArray(java.lang.Object[])
-meth public static java.lang.Object[] toObjectArray(java.lang.Object)
-meth public static java.lang.String escapeParameters(java.lang.String[])
-meth public static java.lang.String getClassName(java.lang.Class<?>)
-meth public static java.lang.String getShortClassName(java.lang.Class<?>)
-meth public static java.lang.String pureClassName(java.lang.String)
-meth public static java.lang.String translate(java.lang.String)
-meth public static java.lang.String wrapString(java.lang.String,int,java.text.BreakIterator,boolean)
-meth public static java.lang.String[] parseParameters(java.lang.String)
-meth public static java.lang.String[] wrapStringToArray(java.lang.String,int,java.text.BreakIterator,boolean)
-meth public static java.lang.ref.ReferenceQueue<java.lang.Object> activeReferenceQueue()
-meth public static java.net.URI toURI(java.io.File)
-supr java.lang.Object
-hfds LOG,TRANS_LOCK,operatingSystem,pathURIConsistent,transExp,transLoader
-hcls RE
-
-CLSS public abstract interface org.openide.util.Cancellable
-meth public abstract boolean cancel()
-
-CLSS public final org.openide.util.ChangeSupport
-cons public init(java.lang.Object)
-meth public boolean hasListeners()
-meth public void addChangeListener(javax.swing.event.ChangeListener)
-meth public void fireChange()
-meth public void removeChangeListener(javax.swing.event.ChangeListener)
-supr java.lang.Object
-hfds LOG,listeners,source
-
-CLSS public final org.openide.util.CharSequences
-meth public static boolean isCompact(java.lang.CharSequence)
-meth public static int indexOf(java.lang.CharSequence,java.lang.CharSequence)
-meth public static int indexOf(java.lang.CharSequence,java.lang.CharSequence,int)
-meth public static java.lang.CharSequence create(char[],int,int)
-meth public static java.lang.CharSequence create(java.lang.CharSequence)
-meth public static java.lang.CharSequence empty()
-meth public static java.util.Comparator<java.lang.CharSequence> comparator()
-supr java.lang.Object
-hfds Comparator,EMPTY,decodeTable,encodeTable
-hcls ByteBasedSequence,CharBasedSequence,CharSequenceComparator,CompactCharSequence,Fixed6Bit_11_20,Fixed6Bit_1_10,Fixed6Bit_21_30,Fixed_0_7,Fixed_16_23,Fixed_8_15
-
-CLSS public final org.openide.util.EditableProperties
-cons public init(boolean)
-intf java.lang.Cloneable
-meth public java.lang.Object clone()
-meth public java.lang.String get(java.lang.Object)
-meth public java.lang.String getProperty(java.lang.String)
-meth public java.lang.String put(java.lang.String,java.lang.String)
-meth public java.lang.String setProperty(java.lang.String,java.lang.String)
-meth public java.lang.String setProperty(java.lang.String,java.lang.String[])
-meth public java.lang.String[] getComment(java.lang.String)
-meth public java.util.Set<java.util.Map$Entry<java.lang.String,java.lang.String>> entrySet()
-meth public org.openide.util.EditableProperties cloneProperties()
-meth public void load(java.io.InputStream) throws java.io.IOException
-meth public void setComment(java.lang.String,java.lang.String[],boolean)
-meth public void store(java.io.OutputStream) throws java.io.IOException
-supr java.util.AbstractMap<java.lang.String,java.lang.String>
-hfds INDENT,READING_KEY_VALUE,WAITING_FOR_KEY_VALUE,alphabetize,state
-hcls Item,IteratorImpl,MapEntryImpl,SetImpl,State
-
-CLSS public final org.openide.util.Enumerations
-innr public abstract interface static Processor
-meth public !varargs static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> array({%%0}[])
-meth public final static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> empty()
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Enumeration<{%%1}> convert(java.util.Enumeration<? extends {%%0}>,org.openide.util.Enumerations$Processor<{%%0},{%%1}>)
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Enumeration<{%%1}> filter(java.util.Enumeration<? extends {%%0}>,org.openide.util.Enumerations$Processor<{%%0},{%%1}>)
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Enumeration<{%%1}> queue(java.util.Enumeration<? extends {%%0}>,org.openide.util.Enumerations$Processor<{%%0},{%%1}>)
-meth public static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> concat(java.util.Enumeration<? extends java.util.Enumeration<? extends {%%0}>>)
-meth public static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> concat(java.util.Enumeration<? extends {%%0}>,java.util.Enumeration<? extends {%%0}>)
-meth public static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> removeDuplicates(java.util.Enumeration<{%%0}>)
-meth public static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> removeNulls(java.util.Enumeration<{%%0}>)
-meth public static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> singleton({%%0})
-supr java.lang.Object
-hcls AltEn,FilEn,QEn,RNulls,SeqEn
-
-CLSS public abstract interface static org.openide.util.Enumerations$Processor<%0 extends java.lang.Object, %1 extends java.lang.Object>
- outer org.openide.util.Enumerations
-meth public abstract {org.openide.util.Enumerations$Processor%1} process({org.openide.util.Enumerations$Processor%0},java.util.Collection<{org.openide.util.Enumerations$Processor%0}>)
-
-CLSS public final org.openide.util.Exceptions
-meth public static <%0 extends java.lang.Throwable> {%%0} attachLocalizedMessage({%%0},java.lang.String)
-meth public static <%0 extends java.lang.Throwable> {%%0} attachMessage({%%0},java.lang.String)
-meth public static <%0 extends java.lang.Throwable> {%%0} attachSeverity({%%0},java.util.logging.Level)
-meth public static java.lang.String findLocalizedMessage(java.lang.Throwable)
-meth public static void printStackTrace(java.lang.Throwable)
-supr java.lang.Object
-hfds LOC_MSG_PLACEHOLDER,LOG
-hcls AnnException,OwnLevel
-
-CLSS public abstract org.openide.util.Lookup
-cons public init()
-fld public final static org.openide.util.Lookup EMPTY
-innr public abstract interface static Provider
-innr public abstract static Item
-innr public abstract static Result
-innr public final static Template
-meth public <%0 extends java.lang.Object> java.util.Collection<? extends {%%0}> lookupAll(java.lang.Class<{%%0}>)
-meth public <%0 extends java.lang.Object> org.openide.util.Lookup$Item<{%%0}> lookupItem(org.openide.util.Lookup$Template<{%%0}>)
-meth public <%0 extends java.lang.Object> org.openide.util.Lookup$Result<{%%0}> lookupResult(java.lang.Class<{%%0}>)
-meth public abstract <%0 extends java.lang.Object> org.openide.util.Lookup$Result<{%%0}> lookup(org.openide.util.Lookup$Template<{%%0}>)
-meth public abstract <%0 extends java.lang.Object> {%%0} lookup(java.lang.Class<{%%0}>)
-meth public static org.openide.util.Lookup getDefault()
-supr java.lang.Object
-hfds LOG,defaultLookup,defaultLookupProvider
-hcls DefLookup,Empty
-
-CLSS public abstract static org.openide.util.Lookup$Item<%0 extends java.lang.Object>
- outer org.openide.util.Lookup
-cons public init()
-meth public abstract java.lang.Class<? extends {org.openide.util.Lookup$Item%0}> getType()
-meth public abstract java.lang.String getDisplayName()
-meth public abstract java.lang.String getId()
-meth public abstract {org.openide.util.Lookup$Item%0} getInstance()
-meth public java.lang.String toString()
-supr java.lang.Object
-
-CLSS public abstract interface static org.openide.util.Lookup$Provider
- outer org.openide.util.Lookup
-meth public abstract org.openide.util.Lookup getLookup()
-
-CLSS public abstract static org.openide.util.Lookup$Result<%0 extends java.lang.Object>
- outer org.openide.util.Lookup
-cons public init()
-meth public abstract java.util.Collection<? extends {org.openide.util.Lookup$Result%0}> allInstances()
-meth public abstract void addLookupListener(org.openide.util.LookupListener)
-meth public abstract void removeLookupListener(org.openide.util.LookupListener)
-meth public java.util.Collection<? extends org.openide.util.Lookup$Item<{org.openide.util.Lookup$Result%0}>> allItems()
-meth public java.util.Set<java.lang.Class<? extends {org.openide.util.Lookup$Result%0}>> allClasses()
-supr java.lang.Object
-
-CLSS public final static org.openide.util.Lookup$Template<%0 extends java.lang.Object>
- outer org.openide.util.Lookup
-cons public init()
- anno 0 java.lang.Deprecated()
-cons public init(java.lang.Class<{org.openide.util.Lookup$Template%0}>)
-cons public init(java.lang.Class<{org.openide.util.Lookup$Template%0}>,java.lang.String,{org.openide.util.Lookup$Template%0})
-meth public boolean equals(java.lang.Object)
-meth public int hashCode()
-meth public java.lang.Class<{org.openide.util.Lookup$Template%0}> getType()
-meth public java.lang.String getId()
-meth public java.lang.String toString()
-meth public {org.openide.util.Lookup$Template%0} getInstance()
-supr java.lang.Object
-hfds hashCode,id,instance,type
-
-CLSS public final org.openide.util.LookupEvent
-cons public init(org.openide.util.Lookup$Result)
-supr java.util.EventObject
-
-CLSS public abstract interface org.openide.util.LookupListener
-intf java.util.EventListener
-meth public abstract void resultChanged(org.openide.util.LookupEvent)
-
-CLSS public org.openide.util.MapFormat
-cons public init(java.util.Map)
-meth protected java.lang.Object processKey(java.lang.String)
-meth public boolean isExactMatch()
-meth public boolean willThrowExceptionIfKeyWasNotFound()
-meth public java.lang.Object parseObject(java.lang.String,java.text.ParsePosition)
-meth public java.lang.String getLeftBrace()
-meth public java.lang.String getRightBrace()
-meth public java.lang.String parse(java.lang.String)
-meth public java.lang.String processPattern(java.lang.String)
-meth public java.lang.StringBuffer format(java.lang.Object,java.lang.StringBuffer,java.text.FieldPosition)
-meth public java.util.Map getMap()
-meth public static java.lang.String format(java.lang.String,java.util.Map)
-meth public void setExactMatch(boolean)
-meth public void setLeftBrace(java.lang.String)
-meth public void setMap(java.util.Map)
-meth public void setRightBrace(java.lang.String)
-meth public void setThrowExceptionIfKeyWasNotFound(boolean)
-supr java.text.Format
-hfds BUFSIZE,argmap,arguments,exactmatch,ldel,locale,maxOffset,offsets,rdel,serialVersionUID,throwex
-
-CLSS public final org.openide.util.Mutex
-cons public init()
-cons public init(java.lang.Object)
-cons public init(org.openide.util.Mutex$Privileged)
-cons public init(org.openide.util.Mutex$Privileged,java.util.concurrent.Executor)
-cons public init(org.openide.util.spi.MutexImplementation)
-fld public final static org.openide.util.Mutex EVENT
-innr public abstract interface static Action
-innr public abstract interface static ExceptionAction
-innr public final static Privileged
-meth public <%0 extends java.lang.Object> {%%0} readAccess(org.openide.util.Mutex$Action<{%%0}>)
-meth public <%0 extends java.lang.Object> {%%0} readAccess(org.openide.util.Mutex$ExceptionAction<{%%0}>) throws org.openide.util.MutexException
-meth public <%0 extends java.lang.Object> {%%0} writeAccess(org.openide.util.Mutex$Action<{%%0}>)
-meth public <%0 extends java.lang.Object> {%%0} writeAccess(org.openide.util.Mutex$ExceptionAction<{%%0}>) throws org.openide.util.MutexException
-meth public boolean isReadAccess()
-meth public boolean isWriteAccess()
-meth public java.lang.String toString()
-meth public void postReadRequest(java.lang.Runnable)
-meth public void postWriteRequest(java.lang.Runnable)
-meth public void readAccess(java.lang.Runnable)
-meth public void writeAccess(java.lang.Runnable)
-supr java.lang.Object
-hfds LOG,impl
-
-CLSS public abstract interface static org.openide.util.Mutex$Action<%0 extends java.lang.Object>
- outer org.openide.util.Mutex
-intf org.openide.util.Mutex$ExceptionAction<{org.openide.util.Mutex$Action%0}>
-meth public abstract {org.openide.util.Mutex$Action%0} run()
-
-CLSS public abstract interface static org.openide.util.Mutex$ExceptionAction<%0 extends java.lang.Object>
- outer org.openide.util.Mutex
-meth public abstract {org.openide.util.Mutex$ExceptionAction%0} run() throws java.lang.Exception
-
-CLSS public final static org.openide.util.Mutex$Privileged
- outer org.openide.util.Mutex
-cons public init()
-meth public boolean tryReadAccess(long)
-meth public boolean tryWriteAccess(long)
-meth public void enterReadAccess()
-meth public void enterWriteAccess()
-meth public void exitReadAccess()
-meth public void exitWriteAccess()
-supr java.lang.Object
-hfds delegate
-
-CLSS public org.openide.util.MutexException
-cons public init(java.lang.Exception)
-meth public java.lang.Exception getException()
-meth public java.lang.Throwable getCause()
-supr java.lang.Exception
-hfds ex,serialVersionUID
-
-CLSS public org.openide.util.NbBundle
-cons public init()
- anno 0 java.lang.Deprecated()
-innr public abstract interface static !annotation Messages
-innr public abstract interface static ClassLoaderFinder
-meth public !varargs static java.lang.String getMessage(java.lang.Class<?>,java.lang.String,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object,java.lang.Object[])
-meth public static <%0 extends java.lang.Object> {%%0} getLocalizedValue(java.util.Map<java.lang.String,{%%0}>,java.lang.String)
-meth public static <%0 extends java.lang.Object> {%%0} getLocalizedValue(java.util.Map<java.lang.String,{%%0}>,java.lang.String,java.util.Locale)
-meth public static java.lang.String getBranding()
-meth public static java.lang.String getLocalizedValue(java.util.jar.Attributes,java.util.jar.Attributes$Name)
-meth public static java.lang.String getLocalizedValue(java.util.jar.Attributes,java.util.jar.Attributes$Name,java.util.Locale)
-meth public static java.lang.String getMessage(java.lang.Class<?>,java.lang.String)
-meth public static java.lang.String getMessage(java.lang.Class<?>,java.lang.String,java.lang.Object)
-meth public static java.lang.String getMessage(java.lang.Class<?>,java.lang.String,java.lang.Object,java.lang.Object)
-meth public static java.lang.String getMessage(java.lang.Class<?>,java.lang.String,java.lang.Object,java.lang.Object,java.lang.Object)
-meth public static java.lang.String getMessage(java.lang.Class<?>,java.lang.String,java.lang.Object[])
-meth public static java.net.URL getLocalizedFile(java.lang.String,java.lang.String)
- anno 0 java.lang.Deprecated()
-meth public static java.net.URL getLocalizedFile(java.lang.String,java.lang.String,java.util.Locale)
- anno 0 java.lang.Deprecated()
-meth public static java.net.URL getLocalizedFile(java.lang.String,java.lang.String,java.util.Locale,java.lang.ClassLoader)
- anno 0 java.lang.Deprecated()
-meth public static java.util.Iterator<java.lang.String> getLocalizingSuffixes()
-meth public static java.util.ResourceBundle getBundle(java.lang.Class<?>)
-meth public static java.util.ResourceBundle getBundle(java.lang.String)
-meth public static java.util.ResourceBundle getBundle(java.lang.String,java.util.Locale)
-meth public static java.util.ResourceBundle getBundle(java.lang.String,java.util.Locale,java.lang.ClassLoader)
-meth public static void setBranding(java.lang.String)
-meth public static void setClassLoaderFinder(org.openide.util.NbBundle$ClassLoaderFinder)
- anno 0 java.lang.Deprecated()
-supr java.lang.Object
-hfds LOG,USE_DEBUG_LOADER,brandingToken,bundleCache,localizedFileCache
-hcls AttributesMap,DebugLoader,LocaleIterator,MergedBundle,PBundle
-
-CLSS public abstract interface static org.openide.util.NbBundle$ClassLoaderFinder
- outer org.openide.util.NbBundle
- anno 0 java.lang.Deprecated()
-meth public abstract java.lang.ClassLoader find()
- anno 0 java.lang.Deprecated()
-
-CLSS public abstract interface static !annotation org.openide.util.NbBundle$Messages
- outer org.openide.util.NbBundle
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[PACKAGE, TYPE, METHOD, CONSTRUCTOR, FIELD])
-intf java.lang.annotation.Annotation
-meth public abstract java.lang.String[] value()
-
-CLSS public org.openide.util.NbCollections
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> checkedMapByCopy(java.util.Map,java.lang.Class<{%%0}>,java.lang.Class<{%%1}>,boolean)
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> java.util.Map<{%%0},{%%1}> checkedMapByFilter(java.util.Map,java.lang.Class<{%%0}>,java.lang.Class<{%%1}>,boolean)
-meth public static <%0 extends java.lang.Object> java.lang.Iterable<{%%0}> iterable(java.util.Enumeration<{%%0}>)
-meth public static <%0 extends java.lang.Object> java.lang.Iterable<{%%0}> iterable(java.util.Iterator<{%%0}>)
-meth public static <%0 extends java.lang.Object> java.util.Enumeration<{%%0}> checkedEnumerationByFilter(java.util.Enumeration,java.lang.Class<{%%0}>,boolean)
-meth public static <%0 extends java.lang.Object> java.util.Iterator<{%%0}> checkedIteratorByFilter(java.util.Iterator,java.lang.Class<{%%0}>,boolean)
-meth public static <%0 extends java.lang.Object> java.util.List<{%%0}> checkedListByCopy(java.util.List,java.lang.Class<{%%0}>,boolean)
-meth public static <%0 extends java.lang.Object> java.util.Set<{%%0}> checkedSetByCopy(java.util.Set,java.lang.Class<{%%0}>,boolean)
-meth public static <%0 extends java.lang.Object> java.util.Set<{%%0}> checkedSetByFilter(java.util.Set,java.lang.Class<{%%0}>,boolean)
-supr java.lang.Object
-hfds LOG
-hcls CheckedIterator,CheckedMap,CheckedSet
-
-CLSS public final org.openide.util.NbPreferences
-innr public abstract interface static Provider
-meth public static java.util.prefs.Preferences forModule(java.lang.Class)
-meth public static java.util.prefs.Preferences root()
-supr java.lang.Object
-hfds PREFS_IMPL
-
-CLSS public abstract interface static org.openide.util.NbPreferences$Provider
- outer org.openide.util.NbPreferences
-meth public abstract java.util.prefs.Preferences preferencesForModule(java.lang.Class)
-meth public abstract java.util.prefs.Preferences preferencesRoot()
-
-CLSS public org.openide.util.NotImplementedException
-cons public init()
-cons public init(java.lang.String)
-supr java.lang.RuntimeException
-hfds serialVersionUID
-
-CLSS public final org.openide.util.Pair<%0 extends java.lang.Object, %1 extends java.lang.Object>
-meth public boolean equals(java.lang.Object)
-meth public int hashCode()
-meth public java.lang.String toString()
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> org.openide.util.Pair<{%%0},{%%1}> of({%%0},{%%1})
-meth public {org.openide.util.Pair%0} first()
-meth public {org.openide.util.Pair%1} second()
-supr java.lang.Object
-hfds first,second
-
-CLSS public org.openide.util.Parameters
-meth public static void javaIdentifier(java.lang.CharSequence,java.lang.CharSequence)
-meth public static void javaIdentifierOrNull(java.lang.CharSequence,java.lang.CharSequence)
-meth public static void notEmpty(java.lang.CharSequence,java.lang.CharSequence)
-meth public static void notNull(java.lang.CharSequence,java.lang.Object)
-meth public static void notWhitespace(java.lang.CharSequence,java.lang.CharSequence)
-supr java.lang.Object
-
-CLSS public final org.openide.util.RequestProcessor
-cons public init()
-cons public init(java.lang.Class<?>)
-cons public init(java.lang.String)
-cons public init(java.lang.String,int)
-cons public init(java.lang.String,int,boolean)
-cons public init(java.lang.String,int,boolean,boolean)
-innr public final Task
-intf java.util.concurrent.ScheduledExecutorService
-meth public <%0 extends java.lang.Object> java.util.List<java.util.concurrent.Future<{%%0}>> invokeAll(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>) throws java.lang.InterruptedException
-meth public <%0 extends java.lang.Object> java.util.List<java.util.concurrent.Future<{%%0}>> invokeAll(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>,long,java.util.concurrent.TimeUnit) throws java.lang.InterruptedException
-meth public <%0 extends java.lang.Object> java.util.concurrent.Future<{%%0}> submit(java.lang.Runnable,{%%0})
-meth public <%0 extends java.lang.Object> java.util.concurrent.Future<{%%0}> submit(java.util.concurrent.Callable<{%%0}>)
-meth public <%0 extends java.lang.Object> java.util.concurrent.ScheduledFuture<{%%0}> schedule(java.util.concurrent.Callable<{%%0}>,long,java.util.concurrent.TimeUnit)
-meth public <%0 extends java.lang.Object> {%%0} invokeAny(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>) throws java.lang.InterruptedException,java.util.concurrent.ExecutionException
-meth public <%0 extends java.lang.Object> {%%0} invokeAny(java.util.Collection<? extends java.util.concurrent.Callable<{%%0}>>,long,java.util.concurrent.TimeUnit) throws java.lang.InterruptedException,java.util.concurrent.ExecutionException,java.util.concurrent.TimeoutException
-meth public boolean awaitTermination(long,java.util.concurrent.TimeUnit) throws java.lang.InterruptedException
-meth public boolean isRequestProcessorThread()
-meth public boolean isShutdown()
-meth public boolean isTerminated()
-meth public java.util.List<java.lang.Runnable> shutdownNow()
-meth public java.util.concurrent.Future<?> submit(java.lang.Runnable)
-meth public java.util.concurrent.ScheduledFuture<?> schedule(java.lang.Runnable,long,java.util.concurrent.TimeUnit)
-meth public java.util.concurrent.ScheduledFuture<?> scheduleAtFixedRate(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)
-meth public java.util.concurrent.ScheduledFuture<?> scheduleWithFixedDelay(java.lang.Runnable,long,long,java.util.concurrent.TimeUnit)
-meth public org.openide.util.RequestProcessor$Task create(java.lang.Runnable)
-meth public org.openide.util.RequestProcessor$Task create(java.lang.Runnable,boolean)
-meth public org.openide.util.RequestProcessor$Task post(java.lang.Runnable)
-meth public org.openide.util.RequestProcessor$Task post(java.lang.Runnable,int)
-meth public org.openide.util.RequestProcessor$Task post(java.lang.Runnable,int,int)
-meth public static org.openide.util.RequestProcessor getDefault()
-meth public static org.openide.util.RequestProcessor$Task createRequest(java.lang.Runnable)
- anno 0 java.lang.Deprecated()
-meth public static org.openide.util.RequestProcessor$Task postRequest(java.lang.Runnable)
- anno 0 java.lang.Deprecated()
-meth public static org.openide.util.RequestProcessor$Task postRequest(java.lang.Runnable,int)
- anno 0 java.lang.Deprecated()
-meth public static org.openide.util.RequestProcessor$Task postRequest(java.lang.Runnable,int,int)
- anno 0 java.lang.Deprecated()
-meth public void execute(java.lang.Runnable)
-meth public void shutdown()
-meth public void stop()
-supr java.lang.Object
-hfds DEFAULT,SLOW,TOP_GROUP,UNLIMITED,counter,enableStackTraces,finishAwaitingTasks,inParallel,interruptThread,logger,name,processorLock,processors,queue,stopped,throughput,warnParallel
-hcls CreatedItem,FastItem,FixedDelayTask,FixedRateTask,Item,Processor,RPFutureTask,RunnableWrapper,ScheduledRPFutureTask,SlowItem,TaskFutureWrapper,TickTac,TopLevelThreadGroup,WaitableCallable
-
-CLSS public final org.openide.util.RequestProcessor$Task
- outer org.openide.util.RequestProcessor
-intf org.openide.util.Cancellable
-meth public boolean cancel()
-meth public boolean waitFinished(long) throws java.lang.InterruptedException
-meth public int getDelay()
-meth public int getPriority()
-meth public java.lang.String toString()
-meth public void run()
-meth public void schedule(int)
-meth public void setPriority(int)
-meth public void waitFinished()
-supr org.openide.util.Task
-hfds cancelled,item,lastThread,priority,time
-
-CLSS public org.openide.util.Task
-cons protected init()
-cons public init(java.lang.Runnable)
-fld public final static org.openide.util.Task EMPTY
-intf java.lang.Runnable
-meth protected final void notifyFinished()
-meth protected final void notifyRunning()
-meth public boolean waitFinished(long) throws java.lang.InterruptedException
-meth public final boolean isFinished()
-meth public java.lang.String toString()
-meth public void addTaskListener(org.openide.util.TaskListener)
-meth public void removeTaskListener(org.openide.util.TaskListener)
-meth public void run()
-meth public void waitFinished()
-supr java.lang.Object
-hfds LOG,RP,finished,list,overrides,run
-
-CLSS public abstract interface org.openide.util.TaskListener
-intf java.util.EventListener
-meth public abstract void taskFinished(org.openide.util.Task)
-
-CLSS public final org.openide.util.TopologicalSortException
-meth public final java.util.List partialSort()
-meth public final java.util.Set[] topologicalSets()
-meth public final java.util.Set[] unsortableSets()
-meth public final void printStackTrace(java.io.PrintStream)
-meth public final void printStackTrace(java.io.PrintWriter)
-meth public java.lang.String getMessage()
-meth public java.lang.String toString()
-supr java.lang.Exception
-hfds counter,dualGraph,edges,result,vertexes
-hcls Vertex
-
-CLSS public abstract interface !annotation org.openide.util.URLStreamHandlerRegistration
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault int position()
-meth public abstract java.lang.String[] protocol()
-
-CLSS public abstract org.openide.util.Union2<%0 extends java.lang.Object, %1 extends java.lang.Object>
-intf java.io.Serializable
-intf java.lang.Cloneable
-meth public abstract boolean hasFirst()
-meth public abstract boolean hasSecond()
-meth public abstract org.openide.util.Union2<{org.openide.util.Union2%0},{org.openide.util.Union2%1}> clone()
-meth public abstract {org.openide.util.Union2%0} first()
-meth public abstract {org.openide.util.Union2%1} second()
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> org.openide.util.Union2<{%%0},{%%1}> createFirst({%%0})
-meth public static <%0 extends java.lang.Object, %1 extends java.lang.Object> org.openide.util.Union2<{%%0},{%%1}> createSecond({%%1})
-supr java.lang.Object
-hfds serialVersionUID
-hcls Union2First,Union2Second
-
-CLSS public final org.openide.util.WeakListeners
-meth public static <%0 extends java.util.EventListener> {%%0} create(java.lang.Class<{%%0}>,java.lang.Class<? super {%%0}>,{%%0},java.lang.Object)
-meth public static <%0 extends java.util.EventListener> {%%0} create(java.lang.Class<{%%0}>,{%%0},java.lang.Object)
-meth public static java.beans.PropertyChangeListener propertyChange(java.beans.PropertyChangeListener,java.lang.Object)
-meth public static java.beans.PropertyChangeListener propertyChange(java.beans.PropertyChangeListener,java.lang.String,java.lang.Object)
-meth public static java.beans.VetoableChangeListener vetoableChange(java.beans.VetoableChangeListener,java.lang.Object)
-meth public static java.beans.VetoableChangeListener vetoableChange(java.beans.VetoableChangeListener,java.lang.String,java.lang.Object)
-meth public static javax.swing.event.ChangeListener change(javax.swing.event.ChangeListener,java.lang.Object)
-meth public static javax.swing.event.DocumentListener document(javax.swing.event.DocumentListener,java.lang.Object)
-supr java.lang.Object
-
-CLSS public org.openide.util.WeakSet<%0 extends java.lang.Object>
-cons public init()
-cons public init(int)
-cons public init(int,float)
-cons public init(java.util.Collection<? extends {org.openide.util.WeakSet%0}>)
-intf java.io.Serializable
-intf java.lang.Cloneable
-meth public <%0 extends java.lang.Object> {%%0}[] toArray({%%0}[])
-meth public boolean add({org.openide.util.WeakSet%0})
-meth public boolean contains(java.lang.Object)
-meth public boolean containsAll(java.util.Collection<?>)
-meth public boolean equals(java.lang.Object)
-meth public boolean isEmpty()
-meth public boolean remove(java.lang.Object)
-meth public boolean removeAll(java.util.Collection<?>)
-meth public boolean retainAll(java.util.Collection<?>)
-meth public int hashCode()
-meth public int size()
-meth public java.lang.Object clone()
-meth public java.lang.Object[] toArray()
-meth public java.lang.String toString()
-meth public java.util.Iterator<{org.openide.util.WeakSet%0}> iterator()
-meth public void clear()
-meth public void resize(int)
-meth public {org.openide.util.WeakSet%0} putIfAbsent({org.openide.util.WeakSet%0})
-supr java.util.AbstractSet<{org.openide.util.WeakSet%0}>
-hfds PRESENT,loadFactor,m,s,serialVersionUID
-hcls SharedKeyWeakHashMap
-
-CLSS public org.openide.util.io.FoldingIOException
-cons public init(java.lang.Throwable)
- anno 0 java.lang.Deprecated()
-meth public java.lang.String getLocalizedMessage()
-meth public java.lang.String toString()
-meth public void printStackTrace()
-meth public void printStackTrace(java.io.PrintStream)
-meth public void printStackTrace(java.io.PrintWriter)
-supr java.io.IOException
-hfds serialVersionUID,t
-
-CLSS public final org.openide.util.io.NbMarshalledObject
-cons public init(java.lang.Object) throws java.io.IOException
-intf java.io.Serializable
-meth public boolean equals(java.lang.Object)
-meth public int hashCode()
-meth public java.lang.Object get() throws java.io.IOException,java.lang.ClassNotFoundException
-supr java.lang.Object
-hfds HEX,hash,objBytes,serialVersionUID
-
-CLSS public org.openide.util.io.NbObjectInputStream
-cons public init(java.io.InputStream) throws java.io.IOException
-meth protected java.io.ObjectStreamClass readClassDescriptor() throws java.io.IOException,java.lang.ClassNotFoundException
-meth protected java.lang.Class resolveClass(java.io.ObjectStreamClass) throws java.io.IOException,java.lang.ClassNotFoundException
-meth public static java.lang.Object readSafely(java.io.ObjectInput) throws java.io.IOException
-meth public static void skipSafely(java.io.ObjectInput) throws java.io.IOException
-supr java.io.ObjectInputStream
-
-CLSS public org.openide.util.io.NbObjectOutputStream
-cons public init(java.io.OutputStream) throws java.io.IOException
-meth protected void annotateClass(java.lang.Class) throws java.io.IOException
-meth public java.lang.Object replaceObject(java.lang.Object) throws java.io.IOException
-meth public static void writeSafely(java.io.ObjectOutput,java.lang.Object) throws java.io.IOException
-supr java.io.ObjectOutputStream
-hfds SVUID,alreadyReported,examinedClasses,serializing
-
-CLSS public org.openide.util.io.NullInputStream
-cons public init()
-fld public boolean throwException
-meth public int read() throws java.io.IOException
-supr java.io.InputStream
-
-CLSS public org.openide.util.io.NullOutputStream
-cons public init()
-fld public boolean throwException
-meth public void write(int) throws java.io.IOException
-supr java.io.OutputStream
-
-CLSS public org.openide.util.io.OperationException
-cons public init(java.lang.Exception)
-meth public java.lang.Exception getException()
-meth public java.lang.String getMessage()
-meth public java.lang.Throwable getCause()
-supr java.io.IOException
-hfds ex,serialVersionUID
-
-CLSS public org.openide.util.io.ReaderInputStream
-cons public init(java.io.Reader) throws java.io.IOException
-cons public init(java.io.Reader,java.lang.String) throws java.io.IOException
-meth public int available() throws java.io.IOException
-meth public int read() throws java.io.IOException
-meth public int read(byte[],int,int) throws java.io.IOException
-meth public void close() throws java.io.IOException
-supr java.io.InputStream
-hfds osw,pis,pos,reader
-
-CLSS public org.openide.util.io.SafeException
-cons public init(java.lang.Exception)
-meth public java.lang.Exception getException()
-meth public java.lang.Throwable getCause()
-supr org.openide.util.io.FoldingIOException
-hfds ex,serialVersionUID
-
-CLSS public abstract interface !annotation org.openide.util.lookup.NamedServiceDefinition
- anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
- anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
-intf java.lang.annotation.Annotation
-meth public abstract !hasdefault java.lang.String position()
-meth public abstract java.lang.Class<?>[] serviceType()
-meth public abstract java.lang.String path()
-
-CLSS public abstract interface org.openide.util.spi.MutexEventProvider
-meth public abstract org.openide.util.spi.MutexImplementation createMutex()
-
-CLSS public abstract interface org.openide.util.spi.MutexImplementation
-meth public abstract <%0 extends java.lang.Object> {%%0} readAccess(org.openide.util.Mutex$ExceptionAction<{%%0}>) throws org.openide.util.MutexException
-meth public abstract <%0 extends java.lang.Object> {%%0} writeAccess(org.openide.util.Mutex$ExceptionAction<{%%0}>) throws org.openide.util.MutexException
-meth public abstract boolean isReadAccess()
-meth public abstract boolean isWriteAccess()
-meth public abstract void postReadRequest(java.lang.Runnable)
-meth public abstract void postWriteRequest(java.lang.Runnable)
-meth public abstract void readAccess(java.lang.Runnable)
-meth public abstract void writeAccess(java.lang.Runnable)
-
-CLSS public abstract org.openide.xml.EntityCatalog
-cons protected init()
-fld public final static java.lang.String PUBLIC_ID = "-//NetBeans//Entity Mapping Registration 1.0//EN"
- anno 0 java.lang.Deprecated()
-intf org.xml.sax.EntityResolver
-meth public static org.openide.xml.EntityCatalog getDefault()
-supr java.lang.Object
-hfds instance
-hcls Forwarder
-
-CLSS public final org.openide.xml.XMLUtil
-meth public static byte[] fromHex(char[],int,int) throws java.io.IOException
-meth public static java.lang.String findText(org.w3c.dom.Node)
-meth public static java.lang.String toAttributeValue(java.lang.String) throws java.io.CharConversionException
-meth public static java.lang.String toElementContent(java.lang.String) throws java.io.CharConversionException
-meth public static java.lang.String toHex(byte[],int,int)
-meth public static java.util.List<org.w3c.dom.Element> findSubElements(org.w3c.dom.Element)
-meth public static org.w3c.dom.Document createDocument(java.lang.String,java.lang.String,java.lang.String,java.lang.String)
-meth public static org.w3c.dom.Document parse(org.xml.sax.InputSource,boolean,boolean,org.xml.sax.ErrorHandler,org.xml.sax.EntityResolver) throws java.io.IOException,org.xml.sax.SAXException
-meth public static org.w3c.dom.Element findElement(org.w3c.dom.Element,java.lang.String,java.lang.String)
-meth public static org.w3c.dom.Element translateXML(org.w3c.dom.Element,java.lang.String)
-meth public static org.xml.sax.ErrorHandler defaultErrorHandler()
-meth public static org.xml.sax.XMLReader createXMLReader() throws org.xml.sax.SAXException
-meth public static org.xml.sax.XMLReader createXMLReader(boolean) throws org.xml.sax.SAXException
-meth public static org.xml.sax.XMLReader createXMLReader(boolean,boolean) throws org.xml.sax.SAXException
-meth public static void appendChildElement(org.w3c.dom.Element,org.w3c.dom.Element,java.lang.String[])
-meth public static void copyDocument(org.w3c.dom.Element,org.w3c.dom.Element,java.lang.String)
-meth public static void validate(org.w3c.dom.Element,javax.xml.validation.Schema) throws org.xml.sax.SAXException
-meth public static void write(org.w3c.dom.Document,java.io.OutputStream,java.lang.String) throws java.io.IOException
-supr java.lang.Object
-hfds DEC2HEX,IDENTITY_XSLT_WITH_INDENT,ORACLE_IS_STANDALONE,doms,saxes
-hcls ErrHandler
-
-CLSS public abstract interface org.xml.sax.EntityResolver
-meth public abstract org.xml.sax.InputSource resolveEntity(java.lang.String,java.lang.String) throws java.io.IOException,org.xml.sax.SAXException
-
diff --git a/openide.util/nbproject/project.properties b/openide.util/nbproject/project.properties
index 88e2bd8..5cc4ccb 100644
--- a/openide.util/nbproject/project.properties
+++ b/openide.util/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
diff --git a/openide.util/nbproject/project.xml b/openide.util/nbproject/project.xml
index d2d7ec3..edbba73 100644
--- a/openide.util/nbproject/project.xml
+++ b/openide.util/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/openide.util/src/org/netbeans/modules/openide/util/DefaultMutexImplementation.java b/openide.util/src/org/netbeans/modules/openide/util/DefaultMutexImplementation.java
index 4807cd6..f3f7d07 100644
--- a/openide.util/src/org/netbeans/modules/openide/util/DefaultMutexImplementation.java
+++ b/openide.util/src/org/netbeans/modules/openide/util/DefaultMutexImplementation.java
@@ -36,7 +36,50 @@
* made subject to such option by the copyright holder.
*
* Contributor(s):
+ *
+ * Portions Copyrighted 2014 Sun Microsystems, Inc.
+ *//*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2014 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2014 Sun Microsystems, Inc.
*/
+
package org.netbeans.modules.openide.util;
import java.util.ArrayList;
diff --git a/openide.util/src/org/netbeans/modules/openide/util/NbBundleProcessor.java b/openide.util/src/org/netbeans/modules/openide/util/NbBundleProcessor.java
index d93486d..efd9fff 100644
--- a/openide.util/src/org/netbeans/modules/openide/util/NbBundleProcessor.java
+++ b/openide.util/src/org/netbeans/modules/openide/util/NbBundleProcessor.java
@@ -299,7 +299,7 @@ public class NbBundleProcessor extends AbstractProcessor {
for (String method : methods.values()) {
pw.print(method);
}
- pw.println(" private Bundle() {}");
+ pw.println(" private void Bundle() {}");
pw.println("}");
pw.flush();
pw.close();
diff --git a/openide.util/src/org/openide/util/base/Bundle.properties b/openide.util/src/org/openide/util/base/Bundle.properties
index 4919d15..4e3d9e9 100644
--- a/openide.util/src/org/openide/util/base/Bundle.properties
+++ b/openide.util/src/org/openide/util/base/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=Base Utilities API
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Short-Description=Base Utilities API.
diff --git a/openide.util/src/org/openide/util/base/doc-files/api.html b/openide.util/src/org/openide/util/base/doc-files/api.html
index 5b6ed06..5256826 100644
--- a/openide.util/src/org/openide/util/base/doc-files/api.html
+++ b/openide.util/src/org/openide/util/base/doc-files/api.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
@@ -57,11 +59,11 @@ our sources.
<ol>
<li><a href="../../NbBundle.html">NbBundle</a> as our specialized support
- for localization and replacement to
+ for localization and replacement to
<a href="@JDK@/java/util/ResourceBundle.html">ResourceBundle</a>.
</li>
-
- <li><a href="../../Task.html"><code>Task</code></a> and especially
+
+ <li><a href="../../Task.html"><code>Task</code></a> and especially
<a href="../../RequestProcessor.html"><code>RequestProcessor</code></a> which
is our way to manage pools of thread workers and execute asynchronous
computations.
diff --git a/openide.util/src/org/openide/util/base/doc-files/logging.html b/openide.util/src/org/openide/util/base/doc-files/logging.html
index e0c177c..afc1dca 100644
--- a/openide.util/src/org/openide/util/base/doc-files/logging.html
+++ b/openide.util/src/org/openide/util/base/doc-files/logging.html
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -57,10 +18,10 @@ Contributor(s):
writing good NetBeans ready logging code. The
info given here is valid for default configuration of the logger as
it is used in NetBeans. However it is possible to fully replace
- the system by providing own logging properties as
- in any
- <a href="@JDK@/java/util/logging/LogManager.html">other JDK application</a>.
- Then of course the behaviour may get completely
+ the system by providing own logging properties as
+ in any
+ <a href="@JDK@/java/util/logging/LogManager.html">other JDK application</a>.
+ Then of course the behaviour may get completely
different.
</p>
diff --git a/openide.util/src/org/openide/util/doc-files/api.html b/openide.util/src/org/openide/util/doc-files/api.html
index 6d43321..3775126 100644
--- a/openide.util/src/org/openide/util/doc-files/api.html
+++ b/openide.util/src/org/openide/util/doc-files/api.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
@@ -57,11 +59,11 @@ our sources.
<ol>
<li><a href="../NbBundle.html">NbBundle</a> as our specialized support
- for localization and replacement to
+ for localization and replacement to
<a href="@JDK@/java/util/ResourceBundle.html">ResourceBundle</a>.
</li>
-
- <li><a href="../Task.html"><code>Task</code></a> and especially
+
+ <li><a href="../Task.html"><code>Task</code></a> and especially
<a href="../RequestProcessor.html"><code>RequestProcessor</code></a> which
is our way to manage pools of thread workers and execute asynchronous
computations.
@@ -70,9 +72,9 @@ our sources.
<li>
<a href="../BaseUtilities.html"><code>BaseUtilities</code></a> which contain
a lot of methods of possible interest. For example
- <a href="../BaseUtilities.html#topologicalSort-java.util.Collection-java.util.Map-"><code>topologicalSort</code></a>,
- <a href="../BaseUtilities.html#activeReferenceQueue--"><code>activeReferenceQueue</code></a>,
- <a href="../BaseUtilities.html#translate-java.lang.String-"><code>translate</code></a>.
+ <a href="../BaseUtilities.html#topologicalSort(java.util.Collection,%20java.util.Map)"><code>topologicalSort</code></a>,
+ <a href="../BaseUtilities.html#activeReferenceQueue()"><code>activeReferenceQueue</code></a>,
+ <a href="../BaseUtilities.html#translate(java.lang.String)"><code>translate</code></a>.
</li>
<li>
@@ -430,7 +432,7 @@ wish to find the implementation of it, you
may simply use:
<pre>
-<span class="type">MyService</span> <span class="variable-name">impl</span> = (<span class="type">MyService</span>)Lookup.getDefault().<a href="@org-openide-util-lookup@/org/openide/util/Lookup.html#lookup-java.lang.Class-">lookup</a>(MyService.<span class="keyword">class</span>);
+<span class="type">MyService</span> <span class="variable-name">impl</span> = (<span class="type">MyService</span>)Lookup.getDefault().<a href="@org-openide-util-lookup@/org/openide/util/Lookup.html#lookup(java.lang.Class)">lookup</a>(MyService.<span class="keyword">class</span>);
<span class="keyword">if</span> (impl == <span class="constant">null</span>) <span class="comment">/* nothing registered */</span> ...
impl.useIt();
</pre>
@@ -518,7 +520,7 @@ system options).
However for this purpose it is simpler to use the static finder method
-<a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#findObject-java.lang.Class-boolean-"><code>SharedClassObject.findObject(Class, true)</code></a>
+<a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#findObject(java.lang.Class,%20boolean)"><code>SharedClassObject.findObject(Class, true)</code></a>
which is guaranteed to find the singleton whether it was registered in
lookup or not (if necessary it will first
@@ -597,7 +599,7 @@ full state of the instance itself, which must be stored.
}
<span class="comment">// later...
</span><span class="type">String</span> <span class="variable-name">storedID</span> = someSettings.getChosenService();
-<span class="type">Lookup.Template</span> <span class="variable-name">templ</span> = <span class="keyword">new</span> <span class="type"><a href="@org-openide-util-lookup@/org/openide/util/Lookup.Template.html#Template-java.lang.Class-java.lang.String-java.lang.Object-">Lookup.Template</a></span>(MyService.<span class="keyword">class</span>, storedID, <span class="constant">null</span>);
+<span class="type">Lookup.Template</span> <span class="variable-name">templ</span> = <span class="keyword">new</span> <span class="type"><a href="@org-openide-util-lookup@/org/openide/util/Lookup.Template.html#Lookup.Template(java.lang.Class,java.lang.String,java.lang.Object)">Lookup.Template</a></span>(MyService.<span class="keyword">class</span>, storedID, <span class="constant">null</span>);
<span class="type">Iterator</span> <span class="variable-name">it</span> = Lookup.getDefault().lookup(templ).allInstances().iterator();
<span class="keyword">if</span> (! it.hasNext()) <span class="comment">/* failed to find it... */</span>
<span class="type">MyService</span> <span class="variable-name">instance</span> = (<span class="type">MyService</span>)it.next();
@@ -647,7 +649,7 @@ merging together the results of the delegate lookups.
If you want to use the common mechanism of finding instances in
folders (or subfolders) and serving these as the results,
-<a href="@org-openide-util-lookup@/org/openide/util/lookup/Lookups.html#forPath-java.lang.String-">Lookups.forPath(String)</a>
+<a href="@org-openide-util-lookup@/org/openide/util/lookup/Lookups.html#forPath(java.lang.String)">Lookups.forPath(String)</a>
makes this possible: you need only provide a name of a folder to look in, and
use
@@ -716,7 +718,7 @@ deregistered. Often
is used as the content implementation. To add something to the lookup,
simply use
-<a href="@org-openide-util-lookup@/org/openide/util/lookup/InstanceContent.html#add-java.lang.Object-"><code>add(Object)</code></a>
+<a href="@org-openide-util-lookup@/org/openide/util/lookup/InstanceContent.html#add(java.lang.Object)"><code>add(Object)</code></a>
(and <code>remove(Object)</code> for the reverse). These may be called
at any time and will update the set of registered instances (firing
@@ -887,7 +889,7 @@ instead).</p>
<li>In the common case of <code>SystemOption</code>, you may simply
call
-<a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#findObject-java.lang.Class-boolean-"><code>SharedClassObject.findObject(Class, true)</code></a>
+<a href="@org-openide-util-ui@/org/openide/util/SharedClassObject.html#findObject(java.lang.Class,%20boolean)"><code>SharedClassObject.findObject(Class, true)</code></a>
which will either provide a previously initialized singleton, or find
the setting in lookup if possible and read any customized state before
diff --git a/openide.util/src/org/openide/util/doc-files/logging.html b/openide.util/src/org/openide/util/doc-files/logging.html
index 42641f2..afc1dca 100644
--- a/openide.util/src/org/openide/util/doc-files/logging.html
+++ b/openide.util/src/org/openide/util/doc-files/logging.html
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -57,10 +18,10 @@ Contributor(s):
writing good NetBeans ready logging code. The
info given here is valid for default configuration of the logger as
it is used in NetBeans. However it is possible to fully replace
- the system by providing own logging properties as
- in any
- <a href="@JDK@/java/util/logging/LogManager.html">other JDK application</a>.
- Then of course the behaviour may get completely
+ the system by providing own logging properties as
+ in any
+ <a href="@JDK@/java/util/logging/LogManager.html">other JDK application</a>.
+ Then of course the behaviour may get completely
different.
</p>
@@ -75,12 +36,12 @@ Contributor(s):
<p>Another important thing is to chain stack traces to
exceptions using
- <a href="@JDK@/java/lang/Throwable.html#initCause-java.lang.Throwable-">
+ <a href="@JDK@/java/lang/Throwable.html#initCause(java.lang.Throwable)">
Throwable.initCause(Throwable)</a>, permitting you to throw an exception
of a type permitted by your
API signature while safely encapsulating the root cause of the problem (in terms
of other nested exceptions). Code should use
- <a href="@JDK@/java/util/logging/Logger.html#log-java.util.logging.Level-java.lang.String-java.lang.Throwable-">
+ <a href="@JDK@/java/util/logging/Logger.html#log(java.util.logging.Level,%20java.lang.String,%20java.lang.Throwable)">
Logger.log(Level.SEVERE, msg, exception)</a>
rather than directly printing caught exceptions,
to make sure nested annotations are not lost and to allow pluged in
@@ -105,7 +66,7 @@ Contributor(s):
global logger
</a>
but it is preferred to create
- <a href="@JDK@/java/util/logging/Logger.html#getLogger-java.lang.String-">
+ <a href="@JDK@/java/util/logging/Logger.html#getLogger(java.lang.String)">
named and shared instances
</a> of loggers.
The later has the advantage of finer control of what is going
@@ -165,11 +126,11 @@ show blinking
icon to the user in bottom right corner of main window):
</p>
<pre>
-private static final <a href="@JDK@/java/util/logging/Logger.html">Logger</a> logger = <a href="@JDK@/java/util/logging/Logger.html#getLogger-java.lang.String-">Logger.getLogger</a>(ThisClass.class.getName());
+private static final <a href="@JDK@/java/util/logging/Logger.html">Logger</a> logger = <a href="@JDK@/java/util/logging/Logger.html#getLogger(java.lang.String)">Logger.getLogger</a>(ThisClass.class.getName());
try {
foo.doSomething();
} catch (IOException ioe) {
- <a href="@JDK@/java/util/logging/Logger.html#log-java.util.logging.Level-java.lang.String-java.lang.Throwable-">logger.log</a>(Level.SEVERE, null, ioe);
+ <a href="@JDK@/java/util/logging/Logger.html#log(java.util.logging.Level,%20java.lang.String,%20java.lang.Throwable)">logger.log</a>(Level.SEVERE, null, ioe);
}
</pre>
@@ -206,10 +167,10 @@ try {
This code will present a dialog box with warning message extracted from
the exception <code>ex</code> sometime in the <q>future</q> - e.g. when the
AWT event queue is empty and can show the dialog. Use of
-<a href="@org-openide-dialogs@/org/openide/DialogDisplayer.html#notifyLater-org.openide.NotifyDescriptor-">
+<a href="@org-openide-dialogs@/org/openide/DialogDisplayer.html#notifyLater(org.openide.NotifyDescriptor)">
notifyLater</a>
to plain
-<a href="@org-openide-dialogs@/org/openide/DialogDisplayer.html#notify-org.openide.NotifyDescriptor-">
+<a href="@org-openide-dialogs@/org/openide/DialogDisplayer.html#notify(org.openide.NotifyDescriptor)">
notify</a>
is recommended in order to prevent deadlocks and
@@ -220,7 +181,7 @@ starvations
<p>
To rethrow an exception use standard JDK's
- <a href="@JDK@/java/lang/Throwable.html#initCause-java.lang.Throwable-">
+ <a href="@JDK@/java/lang/Throwable.html#initCause(java.lang.Throwable)">
Throwable.initCause(Throwable)</a> method. It is going to
be properly annotated and printed when sent to logger:
<pre>
@@ -287,15 +248,15 @@ class Something {
<p>
There is an easy way how to annotate exceptions with localized and non-localized
messages in NetBeans. One can use
-<a href="@TOP@/org/openide/util/Exceptions.html#attachMessage-E-java.lang.String-">
+<a href="@TOP@/org/openide/util/Exceptions.html#attachMessage(E,%20java.lang.String)">
Exceptions.attachMessage
</a> or
-<a href="@TOP@/org/openide/util/Exceptions.html#attachLocalizedMessage-E-java.lang.String-">
+<a href="@TOP@/org/openide/util/Exceptions.html#attachLocalizedMessage(E,%20java.lang.String)">
Exceptions.attachLocalizedMessage
</a>. The non-localized messages are guaranteed to be printed when one does
<code>ex.printStackTrace()</code>, to extract associated localized message
one can use
-<a href="@TOP@/org/openide/util/Exceptions.html#findLocalizedMessage-java.lang.Throwable-">
+<a href="@TOP@/org/openide/util/Exceptions.html#findLocalizedMessage(java.lang.Throwable)">
Exceptions.findLocalizedMessage
</a>.
</p>
diff --git a/openide.util/src/org/openide/util/doc-files/preferences.html b/openide.util/src/org/openide/util/doc-files/preferences.html
index 0beaf81..be51adb 100644
--- a/openide.util/src/org/openide/util/doc-files/preferences.html
+++ b/openide.util/src/org/openide/util/doc-files/preferences.html
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
@@ -47,7 +8,7 @@ Contributor(s):
<h1 align="left">Preferences API in NetBeans</h1>
NetBeans adopts <a href="http://java.sun.com/j2se/1.5.0/docs/guide/preferences/">Java Preferences API</a>
standard to be used in NetBeans to
- store preference and configuration data to be able to adapt to the needs
+ store preference and configuration data to be able to adapt to the needs
of different users. NetBeans keeps this standard and enhances it slightly
by providing its own preference tree in addition to default system and user
roots. The purpose for this enhancement is to
diff --git a/openide.util/src/org/openide/util/io/package.html b/openide.util/src/org/openide/util/io/package.html
index 8d827f0..96cb151 100644
--- a/openide.util/src/org/openide/util/io/package.html
+++ b/openide.util/src/org/openide/util/io/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/openide.util/src/org/openide/util/package.html b/openide.util/src/org/openide/util/package.html
index bb4b58a..5a7b628 100644
--- a/openide.util/src/org/openide/util/package.html
+++ b/openide.util/src/org/openide/util/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/openide.util/src/org/openide/xml/package.html b/openide.util/src/org/openide/xml/package.html
index f285327..c38e13a 100644
--- a/openide.util/src/org/openide/xml/package.html
+++ b/openide.util/src/org/openide/xml/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/openide.util/test/unit/src/org/openide/util/ReadWriteAccessTest.java b/openide.util/test/unit/src/org/openide/util/ReadWriteAccessTest.java
index 572781a..285162d 100644
--- a/openide.util/test/unit/src/org/openide/util/ReadWriteAccessTest.java
+++ b/openide.util/test/unit/src/org/openide/util/ReadWriteAccessTest.java
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
*
* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
* Other names may be trademarks of their respective owners.
@@ -24,6 +24,96 @@
* your own identifying information:
* "Portions Copyrighted [year] [name of copyright owner]"
*
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *//*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *//*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
* If you wish your version of this file to be governed by only the CDDL
* or only the GPL Version 2, indicate your decision by adding
* "[Contributor] elects to include this software in this distribution
@@ -34,8 +124,48 @@
* However, if you add GPL Version 2 code and therefore, elected the GPL
* Version 2 license, then the option applies only if the new code is
* made subject to such option by the copyright holder.
+ *//*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
*
* Contributor(s):
+ *
+ * The Original Software is NetBeans. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ * Microsystems, Inc. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
*/
package org.openide.util;
diff --git a/openide.util/test/unit/src/org/openide/util/UtilitiesActiveQueueTest.java b/openide.util/test/unit/src/org/openide/util/UtilitiesActiveQueueTest.java
index 887c1c3..a7886a6 100644
--- a/openide.util/test/unit/src/org/openide/util/UtilitiesActiveQueueTest.java
+++ b/openide.util/test/unit/src/org/openide/util/UtilitiesActiveQueueTest.java
@@ -96,27 +96,6 @@ public class UtilitiesActiveQueueTest extends NbTestCase {
}
}
- public void testManyReferencesProcessed() throws InterruptedException {
- int n = 10;
- Object[] objects = new Object[n];
- ExpensiveRef[] refs = new ExpensiveRef[n];
- for (int i = 0; i < n; i++) {
- objects[i] = new Object();
- refs[i] = new ExpensiveRef(objects[i], Integer.toString(i));
- }
- objects = null;
- for (int i = 0; i < n; i++) {
- assertGC("is GC'ed", refs[i]);
- }
- for (int i = 0; i < n; i++) {
- synchronized (refs[i]) {
- while (!refs[i].executed) {
- refs[i].wait();
- }
- }
- }
- }
-
public void testCallingPublicMethodsThrowsExceptions () {
try {
BaseUtilities.activeReferenceQueue().poll();
@@ -164,27 +143,4 @@ public class UtilitiesActiveQueueTest extends NbTestCase {
notifyAll ();
}
}
-
- private static class ExpensiveRef extends WeakReference<Object>
- implements Runnable {
- public boolean executed;
- private final String name;
-
- public ExpensiveRef (Object o, String name) {
- super(o, BaseUtilities.activeReferenceQueue());
- this.name = name;
- }
-
- @Override
- public synchronized void run () {
- executed = true;
- try {
- Thread.sleep(10);
- System.gc();
- Thread.sleep(10);
- } catch (InterruptedException iex) {}
- notifyAll ();
- System.err.println(name+" executed.");
- }
- }
}
diff --git a/openide.windows/apichanges.xml b/openide.windows/apichanges.xml
index 00540d1..153aac6 100644
--- a/openide.windows/apichanges.xml
+++ b/openide.windows/apichanges.xml
@@ -529,7 +529,7 @@ made subject to such option by the copyright holder.
<author login="saubrecht"/>
<compatibility addition="yes" binary="incompatible" source="incompatible" semantic="compatible" deprecation="no" deletion="no" modification="no"/>
<description>
- Added method <a href="@TOP at org/openide/windows/WindowManager.html#isOpenedEditorTopComponent-org.openide.windows.TopComponent-">WindowManager.isOpenedEditorTopComponent(TopComponent)</a>
+ Added method <a href="@TOP at org/openide/windows/WindowManager.html#isOpenedEditorTopComponent(org.openide.windows.TopComponent)">WindowManager.isOpenedEditorTopComponent(TopComponent)</a>
for checking of the TopComponent type - editor or view. The method returns true if the given TopComponent is opened and is docked into an editor-type Mode.
It is safe to call this method outside the event dispatch thread.
</description>
@@ -545,9 +545,9 @@ made subject to such option by the copyright holder.
<author login="dsimonek"/>
<compatibility addition="yes" binary="incompatible" source="incompatible" semantic="compatible" deprecation="no" deletion="no" modification="no"/>
<description>
- Added method <a href="@TOP at org/openide/windows/TopComponent.html#openAtTabPosition-int-">TopComponent.openAtTabPosition(int)</a>
+ Added method <a href="@TOP at org/openide/windows/TopComponent.html#openAtTabPosition(int)">TopComponent.openAtTabPosition(int)</a>
for opening and inserting top component at specified position. For retrieving current position,
- method <a href="@TOP at org/openide/windows/TopComponent.html#getTabPosition--">TopComponent.getTabPosition()</a>
+ method <a href="@TOP at org/openide/windows/TopComponent.html#getTabPosition()">TopComponent.getTabPosition()</a>
was added.
</description>
<class package="org.openide.windows" name="TopComponent"/>
@@ -656,7 +656,7 @@ made subject to such option by the copyright holder.
<author login="dsimonek"/>
<compatibility addition="yes" binary="compatible" source="compatible" semantic="compatible" deprecation="no" deletion="no" modification="no"/>
<description>
- New method <a href="@TOP at org/openide/windows/WindowManager.html#invokeWhenUIReady-java.lang.Runnable-">WindowManager.invokeWhenUIReady</a>
+ New method <a href="@TOP at org/openide/windows/WindowManager.html#invokeWhenUIReady(java.lang.Runnable)">WindowManager.invokeWhenUIReady</a>
has been added that can be used to execute a code
that is supposed to run after main window is shown.
</description>
diff --git a/openide.windows/arch.xml b/openide.windows/arch.xml
index 75229d3..f4640fd 100644
--- a/openide.windows/arch.xml
+++ b/openide.windows/arch.xml
@@ -1177,11 +1177,11 @@ Module configuration is stored in XML files.
<answer id="lookup-lookup">
Window Manager implementation (from core) registers itself and lookup is used
from API part to get the instance and return as
-<a href="@TOP@/org/openide/windows/WindowManager.html#getDefault--">WindowManager.getDefault ()</a>
-and also <a href="@TOP@/org/openide/windows/WindowManager.html#componentRegistry--">WindowManager.componentRegistry()</a>.
+<a href="@TOP@/org/openide/windows/WindowManager.html#getDefault()">WindowManager.getDefault ()</a>
+and also <a href="@TOP@/org/openide/windows/WindowManager.html#componentRegistry()">WindowManager.componentRegistry()</a>.
gets the registered instance of <code>TopComponent.Registry</code>.
-Also there are provided implementations of <a href="@org-openide-dialogs@/org/openide/DialogDisplayer.html#getDefault--">DialogDisplayer.getDefault()</a>
-and <a href="@org-openide-nodes@/org/openide/nodes/NodeOperation.html#getDefault--">NodeOperation.getDefault()</a> services.
+Also there are provided implementations of <a href="@org-openide-dialogs@/org/openide/DialogDisplayer.html#getDefault()">DialogDisplayer.getDefault()</a>
+and <a href="@org-openide-nodes@/org/openide/nodes/NodeOperation.html#getDefault()">NodeOperation.getDefault()</a> services.
<p/>
There is also provided service which implements <api category="friend" group="java" name="NbTopManager.WindowSystem" type="import">org.netbeans.core.NbTopManager$WindowSystem interface</api>,
which is used in core module. It is used for starting window system (loading and show) in startup sequence and finishiing of window system (hiding and saving)
@@ -1219,7 +1219,7 @@ instance by singleton accessor.
</question>
-->
<answer id="lookup-remove">
-Yes. It removes implementation of <a href="@org-openide-nodes@/org/openide/nodes/NodeOperation.html#getDefault--">NodeOperation.getDefault()</a>
+Yes. It removes implementation of <a href="@org-openide-nodes@/org/openide/nodes/NodeOperation.html#getDefault()">NodeOperation.getDefault()</a>
service provided by openide-explorer module.
</answer>
diff --git a/openide.windows/manifest.mf b/openide.windows/manifest.mf
index 49ab1e6..65b0087 100644
--- a/openide.windows/manifest.mf
+++ b/openide.windows/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.windows
-OpenIDE-Module-Specification-Version: 6.75.1
+OpenIDE-Module-Specification-Version: 6.74.1
OpenIDE-Module-Localizing-Bundle: org/openide/windows/Bundle.properties
AutoUpdate-Essential-Module: true
diff --git a/openide.windows/nbproject/org-openide-windows.sig b/openide.windows/nbproject/org-openide-windows.sig
index 214803a..ed14b1c 100644
--- a/openide.windows/nbproject/org-openide-windows.sig
+++ b/openide.windows/nbproject/org-openide-windows.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 6.74.1
+#Version 6.71
CLSS public abstract java.awt.Component
cons protected init()
@@ -559,8 +559,6 @@ meth public void firePropertyChange(java.lang.String,boolean,boolean)
meth public void firePropertyChange(java.lang.String,char,char)
meth public void firePropertyChange(java.lang.String,int,int)
meth public void grabFocus()
-meth public void hide()
- anno 0 java.lang.Deprecated()
meth public void paint(java.awt.Graphics)
meth public void paintImmediately(int,int,int,int)
meth public void paintImmediately(java.awt.Rectangle)
@@ -667,7 +665,7 @@ meth public abstract <%0 extends java.lang.Object> org.openide.util.Lookup$Resul
meth public abstract <%0 extends java.lang.Object> {%%0} lookup(java.lang.Class<{%%0}>)
meth public static org.openide.util.Lookup getDefault()
supr java.lang.Object
-hfds LOG,defaultLookup,defaultLookupProvider
+hfds LOG,defaultLookup
hcls DefLookup,Empty
CLSS public abstract interface static org.openide.util.Lookup$Provider
diff --git a/openide.windows/src/org/openide/windows/doc-files/api.html b/openide.windows/src/org/openide/windows/doc-files/api.html
index 18b16ff..3639f22 100644
--- a/openide.windows/src/org/openide/windows/doc-files/api.html
+++ b/openide.windows/src/org/openide/windows/doc-files/api.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<head>
@@ -200,11 +202,11 @@ which means that it is possible to draw on it using a variety of
mechanisms; typically, it is treated as a container, and its layout
may be
-<a href="@JDK@/java/awt/Container.html#setLayout-java.awt.LayoutManager-">set</a>
+<a href="@JDK@/java/awt/Container.html#setLayout(java.awt.LayoutManager)">set</a>
and components
-<a href="@JDK@/java/awt/Container.html#add-java.awt.Component-java.lang.Object-">added</a>
+<a href="@JDK@/java/awt/Container.html#add(java.awt.Component,java.lang.Object)">added</a>
to it.
@@ -215,29 +217,29 @@ component besides painting subcomponents on it:
<li>You may set a
-<a href="../TopComponent.html#setName-java.lang.String-">display name</a>
+<a href="../TopComponent.html#setName(java.lang.String)">display name</a>
and
-<a href="../TopComponent.html#setIcon-java.awt.Image-">icon</a>
+<a href="../TopComponent.html#setIcon(java.awt.Image)">icon</a>
for the component, affecting its appearance in window title bars
and tabs. These ought generally be set in the constructor.
-<li><a href="../TopComponent.html#getHelpCtx--"><code>TopComponent.getHelpCtx()</code></a>
+<li><a href="../TopComponent.html#getHelpCtx()"><code>TopComponent.getHelpCtx()</code></a>
should be overridden to provide a help link for the component as a
whole, if you have any context help. Or, subcomponents may have their
own more specific help. By default, context help is taken from the activated
node selection, if there is any to be found.
-<li><a href="../TopComponent.html#getUndoRedo--"><code>TopComponent.getUndoRedo()</code></a>
+<li><a href="../TopComponent.html#getUndoRedo()"><code>TopComponent.getUndoRedo()</code></a>
allows you to associate undo/redo actions with the component, so
that these actions will work properly when your component is
focussed.
-<li><a href="../TopComponent.html#getActions--"><code>TopComponent.getActions()</code></a>
+<li><a href="../TopComponent.html#getActions()"><code>TopComponent.getActions()</code></a>
permits you to provide a list of actions which will appear in a
popup menu, e.g. on a tab for the component. The system should
@@ -257,7 +259,7 @@ Finding <a href="#overview-top">modes</a> is straightforward.
<p>You cannot create mode directly, however you can specify
new mode in XML layer. Then you can find such a mode by call
-<a href="../WindowManager.html#findMode-java.lang.String-"><code>WindowManager.findMode(String)</code></a>
+<a href="../WindowManager.html#findMode(java.lang.String)"><code>WindowManager.findMode(String)</code></a>
. Do not keep references to modes, Rather use the above method to access them.
Modes could be removed from window system inbetween, thus manipulating with such
@@ -265,7 +267,7 @@ a mode wouldn't achieve desired goal.
<p>To add top components to a mode, just call
-<a href="../Mode.html#dockInto-org.openide.windows.TopComponent-"><code>Mode.dockInto(TopComponent)</code></a>.
+<a href="../Mode.html#dockInto(org.openide.windows.TopComponent)"><code>Mode.dockInto(TopComponent)</code></a>.
For example:
@@ -309,12 +311,12 @@ Just by subclassing
you can create a component which is capable of <em>cloning</em>
itself, like the Editor does with the popup action "Clone View". If
-<a href="@JDK@/java/lang/Object.html#clone--"><code>Object.clone()</code></a>
+<a href="@JDK@/java/lang/Object.html#clone()"><code>Object.clone()</code></a>
takes care of all of your instance state satisfactorily, then you
need do little more; otherwise, you can override
-<a href="../CloneableTopComponent.html#createClonedObject--"><code>CloneableTopComponent.createClonedObject()</code></a>
+<a href="../CloneableTopComponent.html#createClonedObject()"><code>CloneableTopComponent.createClonedObject()</code></a>
to specify exactly what fields should be shared with the original
top component. Typically all clones of a component should share any
@@ -324,7 +326,7 @@ different display parameters or other noncritical settings.
<p>You may specify how these cloned windows act when they are
closed, by overriding
-<a href="../CloneableTopComponent.html#closeLast--"><code>CloneableTopComponent.closeLast()</code></a>.
+<a href="../CloneableTopComponent.html#closeLast()"><code>CloneableTopComponent.closeLast()</code></a>.
(There are more general methods for all top components pertaining
to closing them; this method is specific to cloneable top
@@ -354,15 +356,15 @@ window has the activated component on its selected tab.
<p>You can explicitly request that a top component be activated by calling
-<a href="../TopComponent.html#requestActive--"><code>TopComponent.requestActive()</code></a>.
+<a href="../TopComponent.html#requestActive()"><code>TopComponent.requestActive()</code></a>.
(It should be opened first.)
-<a href="../TopComponent.html#getRegistry--"><code>TopComponent.getRegistry()</code></a>
+<a href="../TopComponent.html#getRegistry()"><code>TopComponent.getRegistry()</code></a>
and then
-<a href="../TopComponent.Registry.html#getActivated--"><code>TopComponent.Registry.getActivated()</code></a>
+<a href="../TopComponent.Registry.html#getActivated()"><code>TopComponent.Registry.getActivated()</code></a>
correspondingly finds the last-activated component.
@@ -386,7 +388,7 @@ pay attention to it.
<p>The selection may be set using
-<a href="../TopComponent.html#setActivatedNodes-org.openide.nodes.Node:A-"><code>TopComponent.setActivatedNodes(...)</code></a>.
+<a href="../TopComponent.html#setActivatedNodes(org.openide.nodes.Node[])"><code>TopComponent.setActivatedNodes(...)</code></a>.
<p>Explorer views embedded in as described at
@@ -576,41 +578,41 @@ A few method calls may be used to find modes, groups and top components:
<li><code>WindowManager</code> instance is obtained by
-<a href="../WindowManager.html#getDefault--"><code>WindowManager.getDefault()</code></a>.
+<a href="../WindowManager.html#getDefault()"><code>WindowManager.getDefault()</code></a>.
<li>The modes in a window systeme may be gotten
with
-<a href="../WindowManager.html#getModes--"><code>WindowManager.getModes()</code></a>
+<a href="../WindowManager.html#getModes()"><code>WindowManager.getModes()</code></a>
or
-<a href="../WindowManager.html#findMode-java.lang.String-"><code>WindowManager.findMode(String)</code></a>
+<a href="../WindowManager.html#findMode(java.lang.String)"><code>WindowManager.findMode(String)</code></a>
(or also
-<a href="../WindowManager.html#findMode-org.openide.windows.TopComponent-"><code>WindowManager.findMode(TopComponent)</code></a>).
+<a href="../WindowManager.html#findMode(org.openide.windows.TopComponent)"><code>WindowManager.findMode(TopComponent)</code></a>).
<li>Each mode has some top components in it, obtainable with
-<a href="../Mode.html#getTopComponents--"><code>Mode.getTopComponents()</code></a>.
+<a href="../Mode.html#getTopComponents()"><code>Mode.getTopComponents()</code></a>.
<li>Groups can be retrieved via
-<a href="../WindowManager.html#findTopComponentGroup-java.lang.String-"><code>WindowManager.findTopComponentGroup(String)</code></a>
+<a href="../WindowManager.html#findTopComponentGroup(java.lang.String)"><code>WindowManager.findTopComponentGroup(String)</code></a>
<li>To get the currently selected top component, use
-<a href="../TopComponent.html#getRegistry--"><code>TopComponent.getRegistry()</code></a>
+<a href="../TopComponent.html#getRegistry()"><code>TopComponent.getRegistry()</code></a>
followed by
-<a href="../TopComponent.Registry.html#getActivated--"><code>TopComponent.Registry.getActivated()</code></a>.
+<a href="../TopComponent.Registry.html#getActivated()"><code>TopComponent.Registry.getActivated()</code></a>.
You can also get all opened components with
-<a href="../TopComponent.Registry.html#getOpened--"><code>TopComponent.Registry.getOpened()</code></a>.
+<a href="../TopComponent.Registry.html#getOpened()"><code>TopComponent.Registry.getOpened()</code></a>.
</ul>
@@ -618,11 +620,11 @@ You can also get all opened components with
Any top component may be activated just by calling
-<a href="../TopComponent.html#requestActive--"><code>TopComponent.requestActive()</code></a>.
+<a href="../TopComponent.html#requestActive()"><code>TopComponent.requestActive()</code></a>.
<p>To close a top component programmatically, call
-<a href="../TopComponent.html#close--"><code>TopComponent.close()</code></a>.
+<a href="../TopComponent.html#close()"><code>TopComponent.close()</code></a>.
<h3><a name="listen">Listening to window system events</a></h3>
@@ -635,12 +637,12 @@ possible too.
<li>All properties of the window manager (i.e. contained modes) may be listened to with
-<a href="../WindowManager.html#addPropertyChangeListener-java.beans.PropertyChangeListener-"><code>WindowManager.addPropertyChangeListener(PropertyChangeListener)</code></a>.
+<a href="../WindowManager.html#addPropertyChangeListener(java.beans.PropertyChangeListener)"><code>WindowManager.addPropertyChangeListener(PropertyChangeListener)</code></a>.
<li>All properties of the top component registry (i.e. available
and selected components, and the node selection) may be listened to with
-<a href="../TopComponent.Registry.html#addPropertyChangeListener-java.beans.PropertyChangeListener-"><code>TopComponent.Registry.addPropertyChangeListener(PropertyChangeListener)</code></a>.
+<a href="../TopComponent.Registry.html#addPropertyChangeListener(java.beans.PropertyChangeListener)"><code>TopComponent.Registry.addPropertyChangeListener(PropertyChangeListener)</code></a>.
<!-- No longer exists...why?
diff --git a/openide.windows/src/org/openide/windows/package.html b/openide.windows/src/org/openide/windows/package.html
index 78ab6d9..dad9e2a 100644
--- a/openide.windows/src/org/openide/windows/package.html
+++ b/openide.windows/src/org/openide/windows/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2005, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/options.api/manifest.mf b/options.api/manifest.mf
index b58d23e..6853b2c 100644
--- a/options.api/manifest.mf
+++ b/options.api/manifest.mf
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.options.api/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/options/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.45.1
+OpenIDE-Module-Specification-Version: 1.44.1
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
diff --git a/options.api/nbproject/org-netbeans-modules-options-api.sig b/options.api/nbproject/org-netbeans-modules-options-api.sig
index e8c33c2..3be5b13 100644
--- a/options.api/nbproject/org-netbeans-modules-options-api.sig
+++ b/options.api/nbproject/org-netbeans-modules-options-api.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.44.1
+#Version 1.40
CLSS public java.lang.Object
cons public init()
diff --git a/options.api/src/org/netbeans/modules/options/CategoryModel.java b/options.api/src/org/netbeans/modules/options/CategoryModel.java
index b0d15a8..510d25d 100644
--- a/options.api/src/org/netbeans/modules/options/CategoryModel.java
+++ b/options.api/src/org/netbeans/modules/options/CategoryModel.java
@@ -50,7 +50,6 @@ import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
@@ -327,7 +326,6 @@ public final class CategoryModel implements LookupListener {
final class Category {
private OptionsCategory category;
private OptionsPanelController controller;
- private final Set<PropertyChangeListener> controllerListeners = new HashSet<PropertyChangeListener>(1);
private boolean isUpdated;
private JComponent component;
private Lookup lookup;
@@ -392,9 +390,8 @@ public final class CategoryModel implements LookupListener {
isUpdated = true;
getComponent();
create().update();
- if (l != null && !controllerListeners.contains(l)) {
+ if (l != null) {
create().addPropertyChangeListener(l);
- controllerListeners.add(l);
}
}
}
diff --git a/options.api/src/org/netbeans/modules/options/OptionsPanel.java b/options.api/src/org/netbeans/modules/options/OptionsPanel.java
index 72a1584..d5c25a5 100644
--- a/options.api/src/org/netbeans/modules/options/OptionsPanel.java
+++ b/options.api/src/org/netbeans/modules/options/OptionsPanel.java
@@ -136,26 +136,27 @@ public class OptionsPanel extends JPanel {
private boolean clearSearch = false;
private CardLayout cLayout;
- private final HashMap<String, JTabbedPane> categoryid2tabbedpane = new HashMap<String, JTabbedPane>();
- private final HashMap<String, ArrayList<String>> categoryid2words = new HashMap<String, ArrayList<String>>();
+ private int selectedTabIndex = -1;
+ private HashMap<String, JTabbedPane> categoryid2tabbedpane = new HashMap<String, JTabbedPane>();
+ private HashMap<String, ArrayList<String>> categoryid2words = new HashMap<String, ArrayList<String>>();
private HashMap<String, HashMap<Integer, TabInfo>> categoryid2tabs = new HashMap<String, HashMap<Integer, TabInfo>>();
- private final ArrayList<String> disabledCategories = new ArrayList<String>();
+ private ArrayList<String> disabledCategories = new ArrayList<String>();
- //private final ArrayList<FileObject> advancedFOs = new ArrayList<FileObject>();
- //private final HashMap<String, Integer> dublicateKeywordsFOs = new HashMap<String, Integer>();
- //private final HashMap<FileObject, Integer> fo2index = new HashMap<FileObject, Integer>();
+ private ArrayList<FileObject> advancedFOs = new ArrayList<FileObject>();
+ private HashMap<String, Integer> dublicateKeywordsFOs = new HashMap<String, Integer>();
+ private HashMap<FileObject, Integer> fo2index = new HashMap<FileObject, Integer>();
private Map<String, CategoryButton> buttons = new LinkedHashMap<String, CategoryButton>();
private final boolean isMac = UIManager.getLookAndFeel ().getID ().equals ("Aqua");
private static final boolean isNimbus = UIManager.getLookAndFeel ().getID ().equals ("Nimbus");
private static final boolean isMetal = UIManager.getLookAndFeel() instanceof MetalLookAndFeel;
private final boolean isGTK = UIManager.getLookAndFeel ().getID ().equals ("GTK");
- private final Color selected = isMac ? new Color(221, 221, 221) : getSelectionBackground();
- private final Color selectedB = isMac ? new Color(183, 183, 183) : new Color (149, 106, 197);
- private final Color highlighted = isMac ? new Color(221, 221, 221) : getHighlightBackground();
- private final Color highlightedB = new Color (152, 180, 226);
- //private final Color iconViewBorder = new Color (127, 157, 185);
- private final ControllerListener controllerListener = new ControllerListener ();
+ private Color selected = isMac ? new Color(221, 221, 221) : getSelectionBackground();
+ private Color selectedB = isMac ? new Color(183, 183, 183) : new Color (149, 106, 197);
+ private Color highlighted = isMac ? new Color(221, 221, 221) : getHighlightBackground();
+ private Color highlightedB = new Color (152, 180, 226);
+ private Color iconViewBorder = new Color (127, 157, 185);
+ private ControllerListener controllerListener = new ControllerListener ();
private final Color borderMac = new Color(141, 141, 141);
private final Font labelFontMac = new Font("Lucida Grande", 0, 10);
diff --git a/options.keymap/manifest.mf b/options.keymap/manifest.mf
index 150fa7f..619faa9 100644
--- a/options.keymap/manifest.mf
+++ b/options.keymap/manifest.mf
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.options.keymap
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/keymap/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/options/keymap/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.37.1
+OpenIDE-Module-Specification-Version: 1.36.1
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
diff --git a/options.keymap/nbproject/project.properties b/options.keymap/nbproject/project.properties
index e1c2183..e1e400b 100644
--- a/options.keymap/nbproject/project.properties
+++ b/options.keymap/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
javac.compilerargs=-Xlint:unchecked
javac.source=1.7
javadoc.arch=${basedir}/arch.xml
diff --git a/print/manifest.mf b/print/manifest.mf
index 95bb98c..e698208 100644
--- a/print/manifest.mf
+++ b/print/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 7.26.1
+OpenIDE-Module-Specification-Version: 7.25.1
OpenIDE-Module: org.netbeans.modules.print
OpenIDE-Module-Layer: org/netbeans/modules/print/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/print/resources/Bundle.properties
diff --git a/print/nbproject/org-netbeans-modules-print.sig b/print/nbproject/org-netbeans-modules-print.sig
index 32db7f3..a1df75b 100644
--- a/print/nbproject/org-netbeans-modules-print.sig
+++ b/print/nbproject/org-netbeans-modules-print.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 7.25.1
+#Version 7.22
CLSS public java.lang.Object
cons public init()
diff --git a/progress.ui/build.xml b/progress.ui/build.xml
index c4b85b4..417bc3d 100644
--- a/progress.ui/build.xml
+++ b/progress.ui/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="progress.ui">
<description>Builds, tests, and runs the project org.netbeans.modules.progress.ui</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/progress.ui/manifest.mf b/progress.ui/manifest.mf
index bb3ab10..9417f6e 100644
--- a/progress.ui/manifest.mf
+++ b/progress.ui/manifest.mf
@@ -3,5 +3,5 @@ OpenIDE-Module: org.netbeans.modules.progress.ui
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/progress/ui/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.progress.spi.ProgressUIWorkerProvider, org.netbeans.modules.progress.spi.RunOffEDTProvider
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.33.1
+OpenIDE-Module-Specification-Version: 1.32.1
diff --git a/progress.ui/nbproject/project.properties b/progress.ui/nbproject/project.properties
index 6ca28cb..30a7da5 100644
--- a/progress.ui/nbproject/project.properties
+++ b/progress.ui/nbproject/project.properties
@@ -1,41 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
-
# Sample ResourceBundle properties file
is.autoload=true
javac.compilerargs=-Xlint:unchecked
diff --git a/progress.ui/nbproject/project.xml b/progress.ui/nbproject/project.xml
index c072ff2..bf4e334 100644
--- a/progress.ui/nbproject/project.xml
+++ b/progress.ui/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/queries/manifest.mf b/queries/manifest.mf
index 9523d19..6a1466e 100644
--- a/queries/manifest.mf
+++ b/queries/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.queries/1
-OpenIDE-Module-Specification-Version: 1.43.1
+OpenIDE-Module-Specification-Version: 1.42.1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/queries/Bundle.properties
diff --git a/queries/nbproject/org-netbeans-modules-queries.sig b/queries/nbproject/org-netbeans-modules-queries.sig
index f71aa62..c40c3fc 100644
--- a/queries/nbproject/org-netbeans-modules-queries.sig
+++ b/queries/nbproject/org-netbeans-modules-queries.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.42.1
+#Version 1.39
CLSS public abstract interface java.io.Serializable
diff --git a/queries/src/org/netbeans/api/queries/package.html b/queries/src/org/netbeans/api/queries/package.html
index 1422d7b..b6f629b 100644
--- a/queries/src/org/netbeans/api/queries/package.html
+++ b/queries/src/org/netbeans/api/queries/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
@@ -58,6 +60,6 @@ them would have any sense. {@link org.netbeans.api.queries.FileBuiltQuery} can
be used to see if a file that can be "built", currently needs to be.
{@link org.netbeans.api.queries.SharabilityQuery} checks whether a file is
intended to be important data kept in a version-control system.</p>
-
+
</body>
</html>
diff --git a/queries/src/org/netbeans/spi/queries/package.html b/queries/src/org/netbeans/spi/queries/package.html
index 65ed7b6..cca28ff 100644
--- a/queries/src/org/netbeans/spi/queries/package.html
+++ b/queries/src/org/netbeans/spi/queries/package.html
@@ -1,10 +1,8 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-Copyright (c) 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common
@@ -16,14 +14,20 @@ or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
specific language governing permissions and limitations under the
License. When distributing the software, include this License Header
Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
+by Sun in the GPL Version 2 section of the License file that
accompanied this code. If applicable, add the following below the
License Header, with the fields enclosed by brackets [] replaced by
your own identifying information:
"Portions Copyrighted [year] [name of copyright owner]"
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
If you wish your version of this file to be governed by only the CDDL
or only the GPL Version 2, indicate your decision by adding
"[Contributor] elects to include this software in this distribution
@@ -34,8 +38,6 @@ to extend the choice of license to its licensees as provided above.
However, if you add GPL Version 2 code and therefore, elected the GPL
Version 2 license, then the option applies only if the new code is
made subject to such option by the copyright holder.
-
-Contributor(s):
-->
<html>
<body>
diff --git a/sampler/build.xml b/sampler/build.xml
index 9a13201..14911b2 100644
--- a/sampler/build.xml
+++ b/sampler/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="sampler">
<description>Builds, tests, and runs the project org.netbeans.modules.sampler</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/sampler/manifest.mf b/sampler/manifest.mf
index fc8a8d9..cf932fa 100644
--- a/sampler/manifest.mf
+++ b/sampler/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.sampler
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/sampler/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.14.1
+OpenIDE-Module-Specification-Version: 1.13.1
Main-Class: org.netbeans.modules.sampler.CLISampler
diff --git a/sampler/nbproject/org-netbeans-modules-sampler.sig b/sampler/nbproject/org-netbeans-modules-sampler.sig
index 055470f..ab75d43 100644
--- a/sampler/nbproject/org-netbeans-modules-sampler.sig
+++ b/sampler/nbproject/org-netbeans-modules-sampler.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.13.1
+#Version 1.10
CLSS public java.lang.Object
cons public init()
diff --git a/sampler/nbproject/project.properties b/sampler/nbproject/project.properties
index 2fec344..f0066e2 100644
--- a/sampler/nbproject/project.properties
+++ b/sampler/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/sampler/nbproject/project.xml b/sampler/nbproject/project.xml
index cf1a46a..d12f1c0 100644
--- a/sampler/nbproject/project.xml
+++ b/sampler/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/sampler/src/org/netbeans/modules/sampler/Bundle.properties b/sampler/src/org/netbeans/modules/sampler/Bundle.properties
index 5297abc..659e5e6 100644
--- a/sampler/src/org/netbeans/modules/sampler/Bundle.properties
+++ b/sampler/src/org/netbeans/modules/sampler/Bundle.properties
@@ -1,38 +1 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2012, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=Sampler
diff --git a/sendopts/apichanges.xml b/sendopts/apichanges.xml
index e7c10ec..6a65644 100644
--- a/sendopts/apichanges.xml
+++ b/sendopts/apichanges.xml
@@ -60,7 +60,7 @@ made subject to such option by the copyright holder.
<author login="jtulach"/>
<compatibility addition="yes" binary="compatible" source="compatible" semantic="compatible"/>
<description>
- <a href="@TOP@/org/netbeans/spi/sendopts/Env.html#usage--">Env.usage</a>
+ <a href="@TOP@/org/netbeans/spi/sendopts/Env.html#usage()">Env.usage</a>
can be called when one wants to process own <code>--help</code> option.
</description>
<class package="org.netbeans.spi.sendopts" name="Env"/>
@@ -75,7 +75,7 @@ made subject to such option by the copyright holder.
<description>
<a href="@TOP@/org/netbeans/spi/sendopts/Arg.html">@Arg</a> annotation
and associated classes allow to register options declaratively. There
- is a new <a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html#create-java.lang.Class...-">
+ is a new <a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html#create(java.lang.Class...)">
factory method
</a> to create multiple instances of differently configured
<a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html">command lines</a>.
@@ -94,7 +94,7 @@ made subject to such option by the copyright holder.
<description>
Those processors that wish to be informed about every command line
processing, can register themselves as providers of
- <a href="@TOP@/org/netbeans/spi/sendopts/Option.html#always--">always</a>
+ <a href="@TOP@/org/netbeans/spi/sendopts/Option.html#always()">always</a>
option. This one is automatically present in each successfully parsed
command line.
</description>
@@ -149,7 +149,7 @@ made subject to such option by the copyright holder.
<author login="jtulach"/>
<compatibility addition="yes" modification="no" binary="compatible" source="compatible" semantic="compatible" deprecation="no" deletion="no"/>
<description>
- There is new method <a href="@TOP at org/netbeans/api/sendopts/CommandLine.html#usage-java.io.PrintWriter-">usage</a>
+ There is new method <a href="@TOP at org/netbeans/api/sendopts/CommandLine.html#usage(java.io.PrintWriter)">usage</a>
that
allows to print description of all available options in the command
line.
diff --git a/sendopts/arch.xml b/sendopts/arch.xml
index 697c166..864f400 100644
--- a/sendopts/arch.xml
+++ b/sendopts/arch.xml
@@ -164,12 +164,12 @@ made subject to such option by the copyright holder.
Since version 2.20 one can define own classes with fields and annotate
them with <a href="@TOP@/org/netbeans/spi/sendopts/Arg.html">@Arg</a>
annotation. Those classes can then be passed into a
- <a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html#create-java.lang.Class...-">
+ <a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html#create(java.lang.Class...)">
factory method
</a>
- that creates new <a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html#create-java.lang.Class...-">command line</a>.
+ that creates new <a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html#create(java.lang.Class...)">command line</a>.
One can then process the arguments as many times as needed via the
- <a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html#process-java.lang.String...-">process</a>
+ <a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html#process(java.lang.String...)">process</a>
method. Example:
<pre>
public final class MyOption implements <a href="@JDK@/java/lang/Runnable.html">Runnable</a> {
@@ -181,8 +181,8 @@ public final class MyOption implements <a href="@JDK@/java/lang/Runnable.html">R
}
public static void main(String... args) {
- <a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html">CommandLine</a> line = <a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html#create-java.lang.Class...-">CommandLine.create</a>(MyOption.class);
- line.<a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html#process-java.lang.String...-">process</a>(args);
+ <a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html">CommandLine</a> line = <a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html#create(java.lang.Class...)">CommandLine.create</a>(MyOption.class);
+ line.<a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html#process(java.lang.String...)">process</a>(args);
}
}
</pre>
@@ -207,7 +207,7 @@ public final class MyOption implements <a href="@JDK@/java/lang/Runnable.html">R
One can create an <a href="@TOP at org/netbeans/spi/sendopts/Option.html">Option</a>
by calling any of its factory methods
(like
- <a href="@TOP at org/netbeans/spi/sendopts/Option.html#withoutArgument-char-java.lang.String-">withoutArgument</a>)
+ <a href="@TOP at org/netbeans/spi/sendopts/Option.html#withoutArgument(char,%20java.lang.String)">withoutArgument</a>)
and provider <code>char</code> for the one letter option and/or string for
the long getopts option.
</usecase>
@@ -377,7 +377,7 @@ public final class MyOption implements <a href="@JDK@/java/lang/Runnable.html">R
That is why
every option can be associated with a short description providing info
about what it is useful for using
- <a href="@TOP@/org/netbeans/spi/sendopts/Option.html#shortDescription-org.netbeans.spi.sendopts.Option-java.lang.String-java.lang.String-">
+ <a href="@TOP@/org/netbeans/spi/sendopts/Option.html#shortDescription(org.netbeans.spi.sendopts.Option,%20java.lang.String,%20java.lang.String)">
Option.shortDescription
</a> method. When using the
<a href="@TOP@/org/netbeans/spi/sendopts/Arg.html">@Arg</a> style, there
@@ -386,7 +386,7 @@ public final class MyOption implements <a href="@JDK@/java/lang/Runnable.html">R
and short description with the option.
To get such descriptions for all available options one
can use
- <a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html#usage-java.io.PrintWriter-">
+ <a href="@TOP@/org/netbeans/api/sendopts/CommandLine.html#usage(java.io.PrintWriter)">
CommandLine.getDefault().usage(java.io.PrintWriter)</a>.
</usecase>
<usecase id="cli-errorrecovery" name="Finding and Reporting when Options Are Not Correct" >
@@ -409,7 +409,7 @@ public final class MyOption implements <a href="@JDK@/java/lang/Runnable.html">R
parse them. It is an error if more than one or no handler expresses
an interest in extra arguments and those are given. One can register
such option by using the <code>
- <a href="@TOP at org/netbeans/spi/sendopts/Option.html#additionalArguments-char-java.lang.String-">
+ <a href="@TOP at org/netbeans/spi/sendopts/Option.html#additionalArguments(char,%20java.lang.String)">
Option.additionalArgument
</a>
</code> factory method.
@@ -444,11 +444,11 @@ public final class MyOption implements <a href="@JDK@/java/lang/Runnable.html">R
It is an error if such non-options are provided and no or more than one
handler is around to handle them. One can create such option by
using <code>
- <a href="@TOP at org/netbeans/spi/sendopts/Option.html#defaultArguments--">Option.defaultArguments</a>
+ <a href="@TOP at org/netbeans/spi/sendopts/Option.html#defaultArguments()">Option.defaultArguments</a>
</code> factory method. With the
<a href="@TOP@/org/netbeans/spi/sendopts/Arg.html">declarative annotation style</a>
one can annotate a field of type <code>String[]</code> and specify that
- it is supposed to be <a href="@TOP@/org/netbeans/spi/sendopts/Arg.html#implicit--">implicit</a>.
+ it is supposed to be <a href="@TOP@/org/netbeans/spi/sendopts/Arg.html#implicit()">implicit</a>.
</usecase>
<usecase id="cli-lazy-handler-initiliazation" name="Only those processor need to process the options are created" >
For purposes of usage in NetBeans, it is needed to not-initialize those
@@ -466,9 +466,9 @@ public final class MyOption implements <a href="@JDK@/java/lang/Runnable.html">R
and then also tell what to do with the output. It is unconvenient
to process that as one option with argument(s), that is why one can
use the
-<a href="@TOP at org/netbeans/spi/sendopts/OptionGroups.html#allOf-org.netbeans.spi.sendopts.Option...-">
+<a href="@TOP at org/netbeans/spi/sendopts/OptionGroups.html#allOf(org.netbeans.spi.sendopts.Option...)">
OptionGroups.allOf</a>,
-<a href="@TOP at org/netbeans/spi/sendopts/OptionGroups.html#someOf-org.netbeans.spi.sendopts.Option...-">
+<a href="@TOP at org/netbeans/spi/sendopts/OptionGroups.html#someOf(org.netbeans.spi.sendopts.Option...)">
OptionGroups.someOf</a>, for example like: <pre>
class PP extends OptionProcessor {
private static Option tune = Option.requiredArgument(Option.NO_SHORT_NAME, "tune");
@@ -476,7 +476,7 @@ class PP extends OptionProcessor {
public Set<Option> getOptions() {
return Collections.singleton(
- <a href="@TOP at org/netbeans/spi/sendopts/OptionGroups.html#allOf-org.netbeans.spi.sendopts.Option...-">OptionGroups.allOf</a>(tune, stream)
+ <a href="@TOP at org/netbeans/spi/sendopts/OptionGroups.html#allOf(org.netbeans.spi.sendopts.Option...)">OptionGroups.allOf</a>(tune, stream)
);
}
@@ -505,7 +505,7 @@ registration.
For example is there is a way to tune the radio with direct frequency
or with name of the station. Just one can be provided and one is needed.
This can be specified by using
-<a href="@TOP at org/netbeans/spi/sendopts/OptionGroups.html#oneOf-org.netbeans.spi.sendopts.Option...-">
+<a href="@TOP at org/netbeans/spi/sendopts/OptionGroups.html#oneOf(org.netbeans.spi.sendopts.Option...)">
OptionGroups.oneOf</a> factory methods:
<pre>
Option freq = Option.requiredArgument(Option.NO_SHORT_NAME, "tune");
diff --git a/sendopts/manifest.mf b/sendopts/manifest.mf
index d7f49c3..c9a1ece 100644
--- a/sendopts/manifest.mf
+++ b/sendopts/manifest.mf
@@ -1,5 +1,5 @@
OpenIDE-Module: org.netbeans.modules.sendopts/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/sendopts/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.35.1
+OpenIDE-Module-Specification-Version: 2.34.1
AutoUpdate-Essential-Module: true
diff --git a/sendopts/nbproject/org-netbeans-modules-sendopts.sig b/sendopts/nbproject/org-netbeans-modules-sendopts.sig
index 7f7d402..d4c8042 100644
--- a/sendopts/nbproject/org-netbeans-modules-sendopts.sig
+++ b/sendopts/nbproject/org-netbeans-modules-sendopts.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 2.34.1
+#Version 2.31
CLSS public abstract interface java.io.Serializable
diff --git a/sendopts/src/org/netbeans/api/sendopts/package.html b/sendopts/src/org/netbeans/api/sendopts/package.html
index 1074ee3..cfaa4af 100644
--- a/sendopts/src/org/netbeans/api/sendopts/package.html
+++ b/sendopts/src/org/netbeans/api/sendopts/package.html
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
diff --git a/sendopts/src/org/netbeans/spi/sendopts/package.html b/sendopts/src/org/netbeans/spi/sendopts/package.html
index 99f2ca7..8af5e9e 100644
--- a/sendopts/src/org/netbeans/spi/sendopts/package.html
+++ b/sendopts/src/org/netbeans/spi/sendopts/package.html
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
@@ -44,9 +5,9 @@ Contributor(s):
<title></title>
</head>
<body>
- Package for those that want to write a
+ Package for those that want to write a
<a href="Arg.html">command line handler</a>
that can participate on handling parts of a
- command line send to the application.
+ command line send to the application.
</body>
</html>
diff --git a/settings/apichanges.xml b/settings/apichanges.xml
index ae31fad..2446d4f 100644
--- a/settings/apichanges.xml
+++ b/settings/apichanges.xml
@@ -19,7 +19,7 @@
- Notice in each file and include the License file at
- nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- particular file as subject to the "Classpath" exception as provided
- - by Oracle in the GPL Version 2 section of the License file that
+ - by Sun in the GPL Version 2 section of the License file that
- accompanied this code. If applicable, add the following below the
- License Header, with the fields enclosed by brackets [] replaced by
- your own identifying information:
@@ -215,7 +215,7 @@ is the proper place.
<author login="jtulach"/>
<compatibility addition="yes"/>
<description>
- Provides support for <a href="@org-openide-util-lookup@/org/openide/util/lookup/Lookups.html#forPath-java.lang.String-">Lookups.forPath(String)</a>
+ Provides support for <a href="@org-openide-util-lookup@/org/openide/util/lookup/Lookups.html#forPath(java.lang.String)">Lookups.forPath(String)</a>
method in order to replace now deprecated <a href="@org-openide-loaders@/org/openide/loaders/FolderLookup.html">FolderLookup</a>.
</description>
<issue number="98426"/>
diff --git a/settings/examples/src/org/netbeans/modules/settings/examples/Bundle.properties b/settings/examples/src/org/netbeans/modules/settings/examples/Bundle.properties
index f1512c9..30dc5ea 100644
--- a/settings/examples/src/org/netbeans/modules/settings/examples/Bundle.properties
+++ b/settings/examples/src/org/netbeans/modules/settings/examples/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
Services/org-netbeans-modules-settings-examples-ProxySettings.settings=Proxy Settings
Services/SettingExamples/org-netbeans-modules-settings-examples-JavaCompilerSetting.settings=External Compiler
Services/SettingExamples=Setting Examples
diff --git a/settings/examples/src/org/netbeans/modules/settings/examples/resources/JavaCompilerSetting.xml b/settings/examples/src/org/netbeans/modules/settings/examples/resources/JavaCompilerSetting.xml
index 868c3fa..c0dee13 100644
--- a/settings/examples/src/org/netbeans/modules/settings/examples/resources/JavaCompilerSetting.xml
+++ b/settings/examples/src/org/netbeans/modules/settings/examples/resources/JavaCompilerSetting.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE properties PUBLIC
"-//NetBeans org.netbeans.modules.settings.examples//DTD XML JavaCompilerSetting 1.0//EN"
diff --git a/settings/examples/src/org/netbeans/modules/settings/examples/resources/ProxySettings.xml b/settings/examples/src/org/netbeans/modules/settings/examples/resources/ProxySettings.xml
index 87f03fc..65b0f6b 100644
--- a/settings/examples/src/org/netbeans/modules/settings/examples/resources/ProxySettings.xml
+++ b/settings/examples/src/org/netbeans/modules/settings/examples/resources/ProxySettings.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE properties PUBLIC
"-//NetBeans org.netbeans.modules.settings.examples//DTD XML ProxySettings 1.0//EN"
diff --git a/settings/manifest.mf b/settings/manifest.mf
index cc705da..93ea064 100644
--- a/settings/manifest.mf
+++ b/settings/manifest.mf
@@ -3,5 +3,5 @@ OpenIDE-Module: org.netbeans.modules.settings/1
OpenIDE-Module-Layer: org/netbeans/modules/settings/resources/mf-layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/settings/resources/Bundle.properties
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.49.1
+OpenIDE-Module-Specification-Version: 1.48.1
diff --git a/settings/nbproject/org-netbeans-modules-settings.sig b/settings/nbproject/org-netbeans-modules-settings.sig
index 0e7ed4f..e7fcd6c 100644
--- a/settings/nbproject/org-netbeans-modules-settings.sig
+++ b/settings/nbproject/org-netbeans-modules-settings.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.48.1
+#Version 1.45
CLSS public java.lang.Object
cons public init()
diff --git a/settings/src/org/netbeans/spi/settings/package.html b/settings/src/org/netbeans/spi/settings/package.html
index 09c36e0..3658e13 100644
--- a/settings/src/org/netbeans/spi/settings/package.html
+++ b/settings/src/org/netbeans/spi/settings/package.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 2002 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html><head>
@@ -177,7 +178,7 @@ associated with a proper entity registration.
</pre>
To create a persistent instance use method
-<a href="@org-openide-loaders@/org/openide/loaders/InstanceDataObject.html#create-org.openide.loaders.DataFolder-java.lang.String-java.lang.Object-org.openide.modules.ModuleInfo-">
+<a href="@org-openide-loaders@/org/openide/loaders/InstanceDataObject.html#create(org.openide.loaders.DataFolder,%20java.lang.String,%20java.lang.Object,%20org.openide.modules.ModuleInfo)">
org.openide.loaders.InstanceDataObject.create</a>. The framework will
look up the provider registration for the exact class of the object passed
into the method.
diff --git a/spi.actions/build.xml b/spi.actions/build.xml
index 722ff8e..6ab606b 100644
--- a/spi.actions/build.xml
+++ b/spi.actions/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="spi.actions">
<description>Builds, tests, and runs the project org.netbeans.spi.actions</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/spi.actions/manifest.mf b/spi.actions/manifest.mf
index 220b6c5..3b23cfa 100644
--- a/spi.actions/manifest.mf
+++ b/spi.actions/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.spi.actions/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/spi/actions/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.28.1
+OpenIDE-Module-Specification-Version: 1.27.1
diff --git a/spi.actions/nbproject/project.properties b/spi.actions/nbproject/project.properties
index 57c65ab..7d0adf2 100644
--- a/spi.actions/nbproject/project.properties
+++ b/spi.actions/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=8
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=80
auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=default
diff --git a/spi.actions/nbproject/project.xml b/spi.actions/nbproject/project.xml
index 4eb44d9..5df01fb 100644
--- a/spi.actions/nbproject/project.xml
+++ b/spi.actions/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/spi.actions/src/org/netbeans/spi/actions/Bundle.properties b/spi.actions/src/org/netbeans/spi/actions/Bundle.properties
index 19d3041..406720e 100644
--- a/spi.actions/src/org/netbeans/spi/actions/Bundle.properties
+++ b/spi.actions/src/org/netbeans/spi/actions/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Long-Description=\
A module that provides a new API to replace NodeAction, CookieAction, etc.
diff --git a/spi.quicksearch/build.xml b/spi.quicksearch/build.xml
index b0d1f93..3285da8 100644
--- a/spi.quicksearch/build.xml
+++ b/spi.quicksearch/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="spi.quicksearch">
<description>Builds, tests, and runs the project org.netbeans.spi.quicksearch</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/spi.quicksearch/manifest.mf b/spi.quicksearch/manifest.mf
index bd74277..4345a5f 100644
--- a/spi.quicksearch/manifest.mf
+++ b/spi.quicksearch/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.spi.quicksearch
OpenIDE-Module-Layer: org/netbeans/modules/quicksearch/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/spi/quicksearch/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.27.1
+OpenIDE-Module-Specification-Version: 1.26.1
diff --git a/spi.quicksearch/nbproject/org-netbeans-spi-quicksearch.sig b/spi.quicksearch/nbproject/org-netbeans-spi-quicksearch.sig
index 88cd2fe..d5723c6 100644
--- a/spi.quicksearch/nbproject/org-netbeans-spi-quicksearch.sig
+++ b/spi.quicksearch/nbproject/org-netbeans-spi-quicksearch.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 1.26.1
+#Version 1.23
CLSS public java.lang.Object
cons public init()
diff --git a/spi.quicksearch/nbproject/project.properties b/spi.quicksearch/nbproject/project.properties
index 2e0dd58..f1fd2e7 100644
--- a/spi.quicksearch/nbproject/project.properties
+++ b/spi.quicksearch/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/spi.quicksearch/nbproject/project.xml b/spi.quicksearch/nbproject/project.xml
index cd5cdcf..6fbc8c8 100644
--- a/spi.quicksearch/nbproject/project.xml
+++ b/spi.quicksearch/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/spi.quicksearch/src/org/netbeans/spi/quicksearch/Bundle.properties b/spi.quicksearch/src/org/netbeans/spi/quicksearch/Bundle.properties
index 0c9d607..9601cd7 100644
--- a/spi.quicksearch/src/org/netbeans/spi/quicksearch/Bundle.properties
+++ b/spi.quicksearch/src/org/netbeans/spi/quicksearch/Bundle.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2008, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Display-Category=Infrastructure
OpenIDE-Module-Name=Quick Search API
OpenIDE-Module-Short-Description=Infrastructure for quick search in menu items, actions, files etc.
diff --git a/templates/manifest.mf b/templates/manifest.mf
index fd701e0..7d30c8d 100644
--- a/templates/manifest.mf
+++ b/templates/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.templates/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/templates/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.7.1
+OpenIDE-Module-Specification-Version: 1.6.1
OpenIDE-Module-Layer: org/netbeans/modules/templates/resources/layer.xml
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
diff --git a/templates/src/org/netbeans/modules/templates/actions/TemplatesAction.java b/templates/src/org/netbeans/modules/templates/actions/TemplatesAction.java
index 3c84b35..be7662b 100644
--- a/templates/src/org/netbeans/modules/templates/actions/TemplatesAction.java
+++ b/templates/src/org/netbeans/modules/templates/actions/TemplatesAction.java
@@ -78,7 +78,7 @@ import org.openide.nodes.Node;
* @author Jiri Rechtacek
*/
@ActionID(id = "org.netbeans.modules.templates.actions.TemplatesAction", category = "System")
- at ActionRegistration(displayName = "#LBL_TemplatesAction_Name", iconInMenu=false, asynchronous=false)
+ at ActionRegistration(displayName = "#LBL_TemplatesAction_Name", iconInMenu=false, asynchronous=true)
@ActionReference(position = 1000, path = "Menu/Tools")
public class TemplatesAction extends AbstractAction { // XXX could be ActionListener if not using SHORT_DESCRIPTION, or maybe alwaysEnabled should support that as an option?
diff --git a/templates/src/org/netbeans/modules/templates/resources/templatesFile.html b/templates/src/org/netbeans/modules/templates/resources/templatesFile.html
index 187f396..b427de5 100644
--- a/templates/src/org/netbeans/modules/templates/resources/templatesFile.html
+++ b/templates/src/org/netbeans/modules/templates/resources/templatesFile.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/templates/src/org/netbeans/modules/templates/resources/templatesFolder.html b/templates/src/org/netbeans/modules/templates/resources/templatesFolder.html
index 4b42daf..833311d 100644
--- a/templates/src/org/netbeans/modules/templates/resources/templatesFolder.html
+++ b/templates/src/org/netbeans/modules/templates/resources/templatesFolder.html
@@ -1,41 +1,42 @@
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+ - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ -
+ - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ -
+ - The contents of this file are subject to the terms of either the GNU
+ - General Public License Version 2 only ("GPL") or the Common
+ - Development and Distribution License("CDDL") (collectively, the
+ - "License"). You may not use this file except in compliance with the
+ - License. You can obtain a copy of the License at
+ - http://www.netbeans.org/cddl-gplv2.html
+ - or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ - specific language governing permissions and limitations under the
+ - License. When distributing the software, include this License Header
+ - Notice in each file and include the License file at
+ - nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
+ - particular file as subject to the "Classpath" exception as provided
+ - by Sun in the GPL Version 2 section of the License file that
+ - accompanied this code. If applicable, add the following below the
+ - License Header, with the fields enclosed by brackets [] replaced by
+ - your own identifying information:
+ - "Portions Copyrighted [year] [name of copyright owner]"
+ -
+ - Contributor(s):
+ -
+ - The Original Software is NetBeans. The Initial Developer of the Original
+ - Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+ - Microsystems, Inc. All Rights Reserved.
+ -
+ - If you wish your version of this file to be governed by only the CDDL
+ - or only the GPL Version 2, indicate your decision by adding
+ - "[Contributor] elects to include this software in this distribution
+ - under the [CDDL or GPL Version 2] license." If you do not indicate a
+ - single choice of license, a recipient has the option to distribute
+ - your version of this file under either the CDDL, the GPL Version 2 or
+ - to extend the choice of license to its licensees as provided above.
+ - However, if you add GPL Version 2 code and therefore, elected the GPL
+ - Version 2 license, then the option applies only if the new code is
+ - made subject to such option by the copyright holder.
-->
<html>
diff --git a/templatesui/build.xml b/templatesui/build.xml
index d562f6d..37c51ef 100644
--- a/templatesui/build.xml
+++ b/templatesui/build.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project basedir="." default="netbeans" name="templatesui">
<description>Builds, tests, and runs the project org.netbeans.modules.templatesui</description>
<import file="../nbbuild/templates/projectized.xml"/>
diff --git a/templatesui/manifest.mf b/templatesui/manifest.mf
index 7e890f9..2715677 100644
--- a/templatesui/manifest.mf
+++ b/templatesui/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.templatesui
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/templatesui/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.api.templates.wizard
-OpenIDE-Module-Specification-Version: 1.3.1
+OpenIDE-Module-Specification-Version: 1.2.1
diff --git a/templatesui/nbproject/project.properties b/templatesui/nbproject/project.properties
index 60bcb58..c933df7 100644
--- a/templatesui/nbproject/project.properties
+++ b/templatesui/nbproject/project.properties
@@ -1,40 +1,3 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
is.autoload=true
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/templatesui/nbproject/project.xml b/templatesui/nbproject/project.xml
index 6a8eac4..e804752 100644
--- a/templatesui/nbproject/project.xml
+++ b/templatesui/nbproject/project.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.apisupport.project</type>
<configuration>
diff --git a/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java b/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java
index e6b77d7..b8a5e96 100644
--- a/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java
+++ b/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java
@@ -44,8 +44,6 @@ package org.netbeans.modules.templatesui;
import java.awt.Dimension;
import java.io.IOException;
import java.io.InterruptedIOException;
-import java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
import java.net.URL;
import java.util.ArrayList;
@@ -93,8 +91,8 @@ implements WizardDescriptor.InstantiatingIterator<WizardDescriptor> {
private List<String> steps = Collections.emptyList();
private List<String> stepNames = Collections.emptyList();
private String current;
+ private List<WizardDescriptor.Panel<WizardDescriptor>> panels;
private Object data;
- private Object ref;
private JFXPanel p;
private /* final */ WebView v;
private ChangeListener listener;
@@ -147,7 +145,7 @@ implements WizardDescriptor.InstantiatingIterator<WizardDescriptor> {
private List<? extends WizardDescriptor.Panel<WizardDescriptor>> getPanels() {
- List<WizardDescriptor.Panel<WizardDescriptor>> panels = new ArrayList<>();
+ panels = new ArrayList<>();
fillPanels((TemplateWizard)wizard, this, panels, steps);
return Collections.unmodifiableList(panels);
}
@@ -298,7 +296,6 @@ implements WizardDescriptor.InstantiatingIterator<WizardDescriptor> {
} else {
if (ret != null && Models.isModel(ret.getClass())) {
data = Models.toRaw(ret);
- ref = ret;
} else {
throw new IllegalStateException("Returned value should be string or class generated by @Model annotation: " + ret);
}
@@ -387,10 +384,6 @@ implements WizardDescriptor.InstantiatingIterator<WizardDescriptor> {
final Object data() {
return data;
}
-
- final Reference<?> ref() {
- return new WeakReference<Object>(ref);
- }
final String[] steps(boolean localized) {
return (localized ? stepNames : steps).toArray(new String[0]);
diff --git a/templatesui/src/org/netbeans/modules/templatesui/Bundle.properties b/templatesui/src/org/netbeans/modules/templatesui/Bundle.properties
index b39df6d..4107988 100644
--- a/templatesui/src/org/netbeans/modules/templatesui/Bundle.properties
+++ b/templatesui/src/org/netbeans/modules/templatesui/Bundle.properties
@@ -1,38 +1 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-#
-# Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
-#
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License. When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
OpenIDE-Module-Name=File Templates HTML UI
diff --git a/templatesui/test/unit/src/org/netbeans/modules/templatesui/HTMLJavaTemplateTest.java b/templatesui/test/unit/src/org/netbeans/modules/templatesui/HTMLJavaTemplateTest.java
index 0e5e5a3..02ef89a 100644
--- a/templatesui/test/unit/src/org/netbeans/modules/templatesui/HTMLJavaTemplateTest.java
+++ b/templatesui/test/unit/src/org/netbeans/modules/templatesui/HTMLJavaTemplateTest.java
@@ -55,7 +55,6 @@ import net.java.html.json.Property;
import org.junit.Test;
import static org.junit.Assert.*;
import org.netbeans.api.templates.TemplateRegistration;
-import org.netbeans.junit.NbTestCase;
import org.openide.WizardDescriptor;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
@@ -128,14 +127,6 @@ public class HTMLJavaTemplateTest {
awaitFX();
}
assertTrue("error code set to 0", p1.isValid());
-
- try {
- System.setProperty("assertgc.paths", "0");
- NbTestCase.assertGC("Shouldn't GC", it.ref());
- throw new IllegalStateException("Ref for " + it.data() + " should exist: " + it.ref().get());
- } catch (AssertionError ex) {
- // OK
- }
assertSelectedIndex("Zero th panel is selected", cmp1, 0);
diff --git a/templatesui/test/unit/src/org/netbeans/modules/templatesui/HTMLTemplateTest.java b/templatesui/test/unit/src/org/netbeans/modules/templatesui/HTMLTemplateTest.java
index f6a755b..c49da41 100644
--- a/templatesui/test/unit/src/org/netbeans/modules/templatesui/HTMLTemplateTest.java
+++ b/templatesui/test/unit/src/org/netbeans/modules/templatesui/HTMLTemplateTest.java
@@ -103,7 +103,7 @@ public class HTMLTemplateTest {
WizardDescriptor.Panel<?> p1 = master.current();
assertNotNull("Panel found", p1);
assertTrue("It is HTML wizard: " + p1, p1 instanceof HTMLPanel);
- final HTMLPanel h1 = (HTMLPanel) p1;
+ HTMLPanel h1 = (HTMLPanel) p1;
HTMLWizard it = (HTMLWizard) h1.getWizard();
final CountDownLatch cdl = it.initializationDone;
@@ -129,34 +129,19 @@ public class HTMLTemplateTest {
h1.getWizard().setProp("errorCode", 0);
assertTrue("Now we are valid", h1.getWizard().isValid());
- EventQueue.invokeAndWait(new Runnable() {
- @Override
- public void run() {
- try {
- h1.getWizard().nextPanel();
- assertCurrentStep(h1, "Two");
-
- h1.getWizard().nextPanel();
- assertCurrentStep(h1, "Three");
- } catch (Exception ex) {
- throw new RuntimeException(ex);
- }
- }
- });
- final Set res = h1.getWizard().instantiate();
+ h1.getWizard().nextPanel();
+ assertCurrentStep(h1, "Two");
+
+ h1.getWizard().nextPanel();
+ assertCurrentStep(h1, "Three");
+
+ Set res = h1.getWizard().instantiate();
assertEquals("One file created: " + res, res.size(), 1);
- final DataObject[] dobjPtr = new DataObject[] { null };
- EventQueue.invokeAndWait(new Runnable() {
- @Override
- public void run() {
- Object dObj = res.iterator().next();
- assertTrue("It is data object: " + dObj, dObj instanceof DataObject);
- dobjPtr[0] = (DataObject) dObj;
- }
- });
+ Object dObj = res.iterator().next();
+ assertTrue("It is data object: " + dObj, dObj instanceof DataObject);
- FileObject created = dobjPtr[0].getPrimaryFile();
+ FileObject created = ((DataObject)dObj).getPrimaryFile();
assertTrue("Error: " + created.asText(), created.asText().contains("Hello from Finished"));
}
diff --git a/templatesui/test/unit/src/org/netbeans/modules/templatesui/RunTCK.java b/templatesui/test/unit/src/org/netbeans/modules/templatesui/RunTCK.java
index 759594d..65cb5bf 100644
--- a/templatesui/test/unit/src/org/netbeans/modules/templatesui/RunTCK.java
+++ b/templatesui/test/unit/src/org/netbeans/modules/templatesui/RunTCK.java
@@ -129,7 +129,6 @@ final class RunTCK extends AbstractWizard {
public final class TCK {
final RequestProcessor rp = new RequestProcessor("Validating");
- private volatile RequestProcessor.Task lastTask;
TCK() {
}
@@ -153,12 +152,9 @@ final class RunTCK extends AbstractWizard {
RunTCK.this.nextPanel();
} catch (WizardValidationException ex) {
Exceptions.printStackTrace(ex);
- } finally {
- lastTask = null;
}
}
});
- lastTask = task;
} else {
if (RunTCK.this.isValid()) {
RunTCK.this.nextPanel();
@@ -181,11 +177,6 @@ final class RunTCK extends AbstractWizard {
public void invokeNow() {
RunTCK.this.invokeFn(later.toArray());
- RequestProcessor.Task taskToWaitFor;
- taskToWaitFor = lastTask;
- if (taskToWaitFor != null) {
- taskToWaitFor.waitFinished();
- }
}
}
}
diff --git a/templatesui/test/unit/src/org/netbeans/modules/templatesui/x.js b/templatesui/test/unit/src/org/netbeans/modules/templatesui/x.js
index e3f5a7a..8acfd66 100644
--- a/templatesui/test/unit/src/org/netbeans/modules/templatesui/x.js
+++ b/templatesui/test/unit/src/org/netbeans/modules/templatesui/x.js
@@ -1,43 +1,3 @@
-/**
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 2014, 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License. When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
-
print('Hello from ' + wizard.get('message'));
if (wizard.get('current')) {
throw 'current should not be defined: ' + wizard.get('current');
diff --git a/uihandler/arch.xml b/uihandler/arch.xml
index 58c815b..21a7b53 100644
--- a/uihandler/arch.xml
+++ b/uihandler/arch.xml
@@ -229,7 +229,7 @@ made subject to such option by the copyright holder.
<a href="@JDK@/java/util/logging/LogRecord.html">LogRecord</a>
(where the MSG_KEY is the string returned by <code>record.getMessage()</code>)
and the value is then going to be used for the
- <a href="@org-openide-nodes@/org/openide/nodes/AbstractNode.html#setIconBaseWithExtension-java.lang.String-">
+ <a href="@org-openide-nodes@/org/openide/nodes/AbstractNode.html#setIconBaseWithExtension(java.lang.String)">
Node
</a> representing the UI gesture.
</api>
diff --git a/uihandler/manifest.mf b/uihandler/manifest.mf
index 67a2933..38668c6 100644
--- a/uihandler/manifest.mf
+++ b/uihandler/manifest.mf
@@ -3,5 +3,5 @@ OpenIDE-Module: org.netbeans.modules.uihandler
OpenIDE-Module-Install: org/netbeans/modules/uihandler/Installer.class
OpenIDE-Module-Layer: org/netbeans/modules/uihandler/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/uihandler/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.35.1
+OpenIDE-Module-Specification-Version: 2.34.1
diff --git a/uihandler/nbproject/org-netbeans-modules-uihandler.sig b/uihandler/nbproject/org-netbeans-modules-uihandler.sig
index 8e4013b..91fc895 100644
--- a/uihandler/nbproject/org-netbeans-modules-uihandler.sig
+++ b/uihandler/nbproject/org-netbeans-modules-uihandler.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 2.34.1
+#Version 2.31
CLSS public java.lang.Object
cons public init()
diff --git a/uihandler/src/org/netbeans/modules/uihandler/Connecting.html b/uihandler/src/org/netbeans/modules/uihandler/Connecting.html
index 7f69ae2..c551adc 100644
--- a/uihandler/src/org/netbeans/modules/uihandler/Connecting.html
+++ b/uihandler/src/org/netbeans/modules/uihandler/Connecting.html
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
diff --git a/uihandler/src/org/netbeans/modules/uihandler/Installer.java b/uihandler/src/org/netbeans/modules/uihandler/Installer.java
index 2901de8..17b9de3 100644
--- a/uihandler/src/org/netbeans/modules/uihandler/Installer.java
+++ b/uihandler/src/org/netbeans/modules/uihandler/Installer.java
@@ -2674,10 +2674,8 @@ public class Installer extends ModuleInstall implements Runnable {
@Override
public void run() {
- if (d != null) {
- d.setModal(false);
- d.setVisible(true);
- }
+ d.setModal(false);
+ d.setVisible(true);
}
});
} catch (InterruptedException | InvocationTargetException ex) {
diff --git a/uihandler/src/org/netbeans/modules/uihandler/ReporterResultTopComponentSettings.xml b/uihandler/src/org/netbeans/modules/uihandler/ReporterResultTopComponentSettings.xml
index 3a8389b..695ff9f 100644
--- a/uihandler/src/org/netbeans/modules/uihandler/ReporterResultTopComponentSettings.xml
+++ b/uihandler/src/org/netbeans/modules/uihandler/ReporterResultTopComponentSettings.xml
@@ -1,42 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+To change this template, choose Tools | Templates
+and open the template in the editor.
-->
<!DOCTYPE settings PUBLIC "-//NetBeans//DTD Session settings 1.0//EN" "http://www.netbeans.org/dtds/sessionsettings-1_0.dtd">
<settings version="1.0">
diff --git a/uihandler/src/org/netbeans/modules/uihandler/ReporterResultTopComponentWstcref.xml b/uihandler/src/org/netbeans/modules/uihandler/ReporterResultTopComponentWstcref.xml
index fb9439b..028f17f 100644
--- a/uihandler/src/org/netbeans/modules/uihandler/ReporterResultTopComponentWstcref.xml
+++ b/uihandler/src/org/netbeans/modules/uihandler/ReporterResultTopComponentWstcref.xml
@@ -1,42 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
+To change this template, choose Tools | Templates
+and open the template in the editor.
-->
<!DOCTYPE tc-ref PUBLIC "-//NetBeans//DTD Top Component in Mode Properties 2.0//EN" "http://www.netbeans.org/dtds/tc-ref2_0.dtd">
<tc-ref version="2.0" >
diff --git a/uihandler/src/org/netbeans/modules/uihandler/SAXException.html b/uihandler/src/org/netbeans/modules/uihandler/SAXException.html
index 16d8a3c..75cd83c 100644
--- a/uihandler/src/org/netbeans/modules/uihandler/SAXException.html
+++ b/uihandler/src/org/netbeans/modules/uihandler/SAXException.html
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
diff --git a/uihandler/src/org/netbeans/modules/uihandler/UnknownHostException.html b/uihandler/src/org/netbeans/modules/uihandler/UnknownHostException.html
index 1f1c2d0..e5092ad 100644
--- a/uihandler/src/org/netbeans/modules/uihandler/UnknownHostException.html
+++ b/uihandler/src/org/netbeans/modules/uihandler/UnknownHostException.html
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -56,14 +17,14 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
</p>
<p>
- The basic idea is that you tell the server what you do, and the server,
+ The basic idea is that you tell the server what you do, and the server,
based on received data, can generate metrics, statistics, or provide
advice directly to you on how to use the NetBeans IDE more effectively.
</p>
<p>
You can now submit data about the UI actions you have done in the IDE.
- If you do so, the server records them and gives you some
+ If you do so, the server records them and gives you some
statistics. Right now the whole system is in development mode, so
we are still mostly collecting data. However, some basic information comparing
your usage to average usage of all participants in the program shall
diff --git a/uihandler/src/org/netbeans/modules/uihandler/api/doc-files/ui.html b/uihandler/src/org/netbeans/modules/uihandler/api/doc-files/ui.html
index 9389a63..a46aae6 100644
--- a/uihandler/src/org/netbeans/modules/uihandler/api/doc-files/ui.html
+++ b/uihandler/src/org/netbeans/modules/uihandler/api/doc-files/ui.html
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><!-- -*- xhtml -*- -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -54,7 +15,7 @@ Contributor(s):
<dt><em>Abstract:</em></dt>
<dd>
<p>
- Proposal of scenarios and UI to satisfy
+ Proposal of scenarios and UI to satisfy
<a href="@TOP@/architecture-summary.html#answer-arch-usecases">usecases</a>
for UI Gestures Collector.
</p>
@@ -68,7 +29,7 @@ Contributor(s):
<p>
Important user actions are recorded and remember in the system
when the UI Gestures Collector is installed. In order for the gesture
- collector to be useful, it is necessary to convince the user to
+ collector to be useful, it is necessary to convince the user to
upload these information to our collecting server for processing.
As we need a wide range of submittions, it is important that the
same user continous to submit these logs repeatedly.
diff --git a/uihandler/src/org/netbeans/modules/uihandler/layer.xml b/uihandler/src/org/netbeans/modules/uihandler/layer.xml
index 8b8d981..62f6cc2 100644
--- a/uihandler/src/org/netbeans/modules/uihandler/layer.xml
+++ b/uihandler/src/org/netbeans/modules/uihandler/layer.xml
@@ -1,43 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
<filesystem>
<folder name="Actions">
diff --git a/uihandler/test/unit/src/org/netbeans/modules/uihandler/error.html b/uihandler/test/unit/src/org/netbeans/modules/uihandler/error.html
index f4f8765..2057567 100644
--- a/uihandler/test/unit/src/org/netbeans/modules/uihandler/error.html
+++ b/uihandler/test/unit/src/org/netbeans/modules/uihandler/error.html
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<HTML>
<HEAD>
<title>UI Gestures Collector</title>
@@ -45,7 +6,7 @@ Contributor(s):
<BODY>
<H1>A bug seems to happen in your application!</H1>
<P>
- You can help the project by submitting the data to the
+ You can help the project by submitting the data to the
collecting server.
</P>
diff --git a/uihandler/test/unit/src/org/netbeans/modules/uihandler/error_ja.html b/uihandler/test/unit/src/org/netbeans/modules/uihandler/error_ja.html
index 9680f6c..b0bf1ad 100644
--- a/uihandler/test/unit/src/org/netbeans/modules/uihandler/error_ja.html
+++ b/uihandler/test/unit/src/org/netbeans/modules/uihandler/error_ja.html
@@ -1,45 +1,6 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<HTML>
<HEAD>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html;charset=euc-jp"> </META>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html;charset=euc-jp"> </META>
<title>���ޥ��Report Problem</title>
<!--
<link rel="stylesheet" type="text/css" href="http://www.netbeans.org/netbeans.css"/>
@@ -52,9 +13,9 @@ Contributor(s):
<H3>You have found a bug in the application!</H3>
<P>���ޥ��
Actual system of direct bug uploading to the collecting server is now out of order.
- You can help the NetBeans.org project by reporting this problem to
+ You can help the NetBeans.org project by reporting this problem to
our existing bug tracking system using the <q>Report to Issuezilla ���ޥ��</q> button bellow.
-</P>
+</P>
<P>���ޥ��
Thank you for helping us make NetBeans better!
</P>
diff --git a/uihandler/test/unit/src/org/netbeans/modules/uihandler/index_ja.html b/uihandler/test/unit/src/org/netbeans/modules/uihandler/index_ja.html
index 6bba6c5..60d8671 100644
--- a/uihandler/test/unit/src/org/netbeans/modules/uihandler/index_ja.html
+++ b/uihandler/test/unit/src/org/netbeans/modules/uihandler/index_ja.html
@@ -1,45 +1,6 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2007, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<HTML>
<HEAD>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html;charset=x-euc-jp"> </META>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html;charset=x-euc-jp"> </META>
<title>���ޥ��Welcome to UI Gestures Collector</title>
<link rel="stylesheet" type="text/css" href="http://www.netbeans.org/nonav/uigestures/index.css"></link>
<meta http-equiv="Content-Type" content="text/html; charset=x-euc-jp"></meta>
@@ -47,7 +8,7 @@ Contributor(s):
<BODY> ���ޥ��
<p>���ޥ��
- You can now submit data about the UI actions you did in the IDE and
+ You can now submit data about the UI actions you did in the IDE and
help us make NetBeans better. <a href="http://devtools.sfbay/teams/DeveloperTools_I18N/gestures/info_ja.html">
Read more...</a>
</p>
diff --git a/uihandler/test/unit/src/org/netbeans/modules/uihandler/parsing_with_suffix.html b/uihandler/test/unit/src/org/netbeans/modules/uihandler/parsing_with_suffix.html
index c197dc4..fba5136 100644
--- a/uihandler/test/unit/src/org/netbeans/modules/uihandler/parsing_with_suffix.html
+++ b/uihandler/test/unit/src/org/netbeans/modules/uihandler/parsing_with_suffix.html
@@ -1,42 +1,3 @@
-<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright (c) 2009, 2016 Oracle and/or its affiliates. All rights reserved.
-
-Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-Other names may be trademarks of their respective owners.
-
-The contents of this file are subject to the terms of either the GNU
-General Public License Version 2 only ("GPL") or the Common
-Development and Distribution License("CDDL") (collectively, the
-"License"). You may not use this file except in compliance with the
-License. You can obtain a copy of the License at
-http://www.netbeans.org/cddl-gplv2.html
-or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-specific language governing permissions and limitations under the
-License. When distributing the software, include this License Header
-Notice in each file and include the License file at
-nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the GPL Version 2 section of the License file that
-accompanied this code. If applicable, add the following below the
-License Header, with the fields enclosed by brackets [] replaced by
-your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-If you wish your version of this file to be governed by only the CDDL
-or only the GPL Version 2, indicate your decision by adding
-"[Contributor] elects to include this software in this distribution
-under the [CDDL or GPL Version 2] license." If you do not indicate a
-single choice of license, a recipient has the option to distribute
-your version of this file under either the CDDL, the GPL Version 2 or
-to extend the choice of license to its licensees as provided above.
-However, if you add GPL Version 2 code and therefore, elected the GPL
-Version 2 license, then the option applies only if the new code is
-made subject to such option by the copyright holder.
-
-Contributor(s):
--->
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnb-platform-java.git
More information about the pkg-java-commits
mailing list