You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jl...@apache.org on 2017/12/15 21:53:29 UTC
[incubator-netbeans] 01/01: Merging recent master changes into the
jdk-javac branch
This is an automated email from the ASF dual-hosted git repository.
jlahoda pushed a commit to branch jdk-javac
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 3f6610357bc144917f2a9345ca3bbc1b2ba3b561
Merge: 00d491b 36cc052
Author: Jan Lahoda <jl...@netbeans.org>
AuthorDate: Fri Dec 15 22:52:23 2017 +0100
Merging recent master changes into the jdk-javac branch
.gitignore | 2 -
api.htmlui/apichanges.xml | 23 +
api.htmlui/arch.xml | 20 +-
api.htmlui/manifest.mf | 2 +-
.../src/org/netbeans/api/htmlui/HTMLDialog.java | 10 +-
.../modules/htmlui/HTMLDialogProcessor.java | 2 +-
.../org/netbeans/modules/htmlui/NbBrowsers.java | 59 +-
.../org/netbeans/modules/htmlui/css}/cb-mac-s.png | Bin
.../org/netbeans/modules/htmlui/css}/cb-mac-u.png | Bin
.../org/netbeans/modules/htmlui/css}/cb-metal.png | Bin
.../org/netbeans/modules/htmlui/css}/cb-nimbus.png | Bin
.../netbeans/modules/htmlui/css}/cb-win-s-a.png | Bin
.../org/netbeans/modules/htmlui/css}/cb-win-s.png | Bin
.../netbeans/modules/htmlui/css}/radio-mac-s.png | Bin
.../netbeans/modules/htmlui/css}/radio-mac-u.png | Bin
.../netbeans/modules/htmlui/css/wizard-darcula.css | 42 +-
.../org/netbeans/modules/htmlui/css/wizard-gtk.css | 18 +
.../netbeans/modules/htmlui/css}/wizard-mac.css | 9 +-
.../netbeans/modules/htmlui/css}/wizard-metal.css | 13 +-
.../netbeans/modules/htmlui/css}/wizard-nimbus.css | 15 +-
.../netbeans/modules/htmlui/css}/wizard-win.css | 11 +-
.../netbeans/modules/htmlui/AnnotationsTest.java | 58 +
api.visual/apichanges.xml | 20 +-
api.visual/manifest.mf | 2 +-
api.visual/nbproject/project.properties | 2 +-
.../org/netbeans/api/visual/model/ObjectScene.java | 105 +-
.../src/org/netbeans/api/visual/widget/Scene.java | 22 +
.../src/org/netbeans/api/visual/widget/Widget.java | 4 +
.../modules/visual/basic/ObjectSceneLazyTest.java | 355 ++++++
apisupport.ant/nbproject/project.xml | 9 -
.../libsrc/org/netbeans/updater/UpdaterFrame.java | 2 +-
.../netbeans/updater/resources/updatersplash.gif | Bin 51613 -> 50358 bytes
.../netbeans/api/autoupdate/RefreshItemsTest.java | 12 +-
.../UpdateProviderFactoryCreateTest.java | 8 +-
.../api/autoupdate/UpdateProviderFactoryTest.java | 5 +-
.../org/netbeans/api/autoupdate/data/catalog.xml | 29 +-
.../data/com-example-testmodule-cluster.nbm | Bin 0 -> 3188 bytes
.../api/autoupdate/data/dummy-signed-twice.jar | Bin 0 -> 4368 bytes
.../netbeans/api/autoupdate/data/dummy-signed.jar | Bin 0 -> 2796 bytes
.../src/org/netbeans/api/autoupdate/data/empty.jar | Bin 0 -> 343 bytes
.../data/org-yourorghere-brokendepending.nbm | Bin 0 -> 3208 bytes
.../autoupdate/data/org-yourorghere-depending.nbm | Bin 0 -> 3186 bytes
...org-yourorghere-depending_on_new_one_engine.nbm | Bin 0 -> 3271 bytes
.../autoupdate/data/org-yourorghere-engine-1-1.nbm | Bin 0 -> 3142 bytes
.../autoupdate/data/org-yourorghere-engine-1-2.nbm | Bin 0 -> 3127 bytes
.../api/autoupdate/data/org-yourorghere-engine.nbm | Bin 0 -> 3136 bytes
.../org-yourorghere-executable-permissions.nbm | Bin 0 -> 3661 bytes
.../data/org-yourorghere-independent-1-1.nbm | Bin 0 -> 3132 bytes
.../data/org-yourorghere-independent.nbm | Bin 0 -> 3128 bytes
.../org-yourorghere-refresh_providers_test.nbm | Bin 0 -> 3198 bytes
.../netbeans/api/autoupdate/data/test-keystore.jks | Bin 0 -> 4481 bytes
.../api/autoupdate/data/updates-subset.xml | 49 +-
.../org/netbeans/api/autoupdate/data/updates.xml | 60 +-
...isabled.java => ExecutablePermissionsTest.java} | 15 +-
.../services/InstallDisabledModuleTest.java | 12 +-
.../services/InstallEagerModuleTest.java | 42 +-
.../services/InstallHiddenModuleTest.java | 2 +-
.../services/InstallIntoNewClusterTest.java | 2 +-
.../services/NbmsInDownloadedTabTest.java | 2 +-
...estDisabled.java => NewClustersRebootTest.java} | 16 +-
...Disabled.java => UpdateDisabledModuleTest.java} | 66 +-
.../autoupdate/services/UpdateFromNbmTest.java | 143 +++
.../autoupdate/services/UpdateUnitFactoryTest.java | 188 ++++
...fyFileTestDisabled.java => VerifyFileTest.java} | 12 +-
.../AutoupdateCatalogProviderTest.java | 2 +-
...Disabled.java => AutoupdateInfoParserTest.java} | 18 +-
.../updateprovider/{ => data}/malformed.xml | 0
.../issuetable/IssuetableTestFactory.java | 6 +-
.../bugtracking/settings/BugtrackingOptions.java | 5 +-
.../settings/BugtrackingOptionsPanel.java | 6 +-
.../bugtracking/tasks/dashboard/QueryNode.java | 3 +-
.../ui/selectors/RepositorySelector.java | 6 +-
.../external/JavaEWAH-0.7.9-license.txt | 5 +-
c.jcraft.jsch/external/jsch-0.1.54-license.txt | 8 +-
c.jcraft.jzlib/external/jzlib-1.0.7-license.txt | 10 +-
classfile/jar-excludes.txt | 5 -
.../org/netbeans/core/startup/Bundle.properties | 4 +-
.../src/org/netbeans/core/startup/splash.gif | Bin 91716 -> 49417 bytes
.../src/org/netbeans/core/startup/splash_dark.gif | Bin 91716 -> 49417 bytes
.../core/windows/view/ui/Bundle.properties | 4 +-
csl.api/changes.txt | 3 +
.../modules/csl/core/GsfIndentTaskFactory.java | 4 +-
...21-spec-license.txt => css2.1-spec-license.txt} | 7 +-
css.editor/external/css3-spec-license.txt | 8 +-
.../css/editor/indent/CssIndentTaskFactory.java | 3 +-
.../editor/module/main/properties/description.txt | 3 +
.../css/resources/icons/chrome20-disabled.png | Bin 3842 -> 5058 bytes
.../modules/css/resources/icons/chrome20.png | Bin 3842 -> 5143 bytes
.../css/resources/icons/firefox20-disabled.png | Bin 3842 -> 1256 bytes
.../modules/css/resources/icons/firefox20.png | Bin 3842 -> 1380 bytes
.../modules/css/resources/icons/ie20-disabled.png | Bin 3842 -> 1270 bytes
.../netbeans/modules/css/resources/icons/ie20.png | Bin 3842 -> 1372 bytes
.../css/resources/icons/opera20-disabled.png | Bin 3842 -> 1087 bytes
.../modules/css/resources/icons/opera20.png | Bin 3842 -> 1133 bytes
.../css/resources/icons/safari20-disabled.png | Bin 3842 -> 1172 bytes
.../modules/css/resources/icons/safari20.png | Bin 3842 -> 1251 bytes
css.editor/todo | 3 +
.../netbeans/modules/css/visual/spi/Location.java | 11 +-
db.dataview/external/h2-1.4.196-license.txt | 173 +--
db.dataview/external/h2-1.4.196-notice.txt | 6 -
db.drivers/external/binaries-list | 1 -
.../mysql-connector-java-5.1.23-license.txt | 349 ------
db.drivers/nbproject/project.properties | 2 -
.../netbeans/modules/db/drivers/MySQLDriver.xml | 45 -
.../src/org/netbeans/modules/db/drivers/layer.xml | 3 -
.../src/org/netbeans/modules/db/drivers/mysql.xml | 3 -
.../db/metadata/model/jdbc/mssql/MSSQLCatalog.java | 2 +-
.../db/metadata/model/jdbc/mysql/MySQLCatalog.java | 2 +-
.../metadata/model/jdbc/oracle/OracleCatalog.java | 2 +-
.../db/sql/editor/ui/actions/RunSQLAction.java | 2 +-
.../external/javacc-3.2-license.txt | 3 +-
.../api/db/explorer/JDBCDriverManager2Test.java | 7 +-
derby/build.xml | 27 +
derby/external/binaries-list | 3 +-
.../external/derby-10.14.1.0-license.txt | 13 +-
derby/nbproject/project.properties | 2 +-
.../modules/derby/api/DerbyDatabasesTest.java | 3 +-
.../external/exechlp-1.0-license.txt | 615 +++++++----
.../nativeexecution/api/util/FileInfoProvider.java | 6 +-
.../spi/ExecutionEnvironmentFactoryService.java | 11 +-
.../lib2/RectangularSelectionTransferHandler.java | 3 +-
.../editor/search/actions/FindSelectionAction.java | 5 +-
.../search/completion/SearchCompletionItem.java | 3 +-
.../storage/fontscolors/FontColorSettingsImpl.java | 2 +-
.../keybindings/KeyBindingSettingsImpl.java | 2 +-
.../external/libpam4j-1.1-license.txt | 3 +-
.../external/processtreekiller-1.0.7-license.txt | 3 +-
.../external/winp-1.14-patched-license.txt | 4 +-
.../binding/resources/BindingSystemClasses.txt | 16 +
form.kit/nbproject/project.xml | 7 -
.../modules/form/project/ClassPathUtils.java | 2 +-
.../modules/form/resources/SystemClasses.txt | 16 +
.../src/org/netbeans/modules/html/custom/spec.txt | 3 +
.../src/org/netbeans/modules/html/custom/todo.txt | 3 +
html.editor/external/html-4.01-license.txt | 8 +-
.../editor/hints/css/CreateRuleInStylesheet.java | 3 +-
html.parser/external/howtoupgrade.txt | 3 +
html.parser/external/html5doc-license.txt | 1 -
html.parser/external/htmlparser-1.2.1-license.txt | 76 +-
html.parser/external/icu4j-4_4_2-license.txt | 6 +-
.../src/org/netbeans/modules/html/parser/todo | 3 +
.../test/unit/data/testfiles/netbeans_org.html | 21 +-
html.parser/test/unit/data/testfiles/test2.html | 23 +-
.../modules/html/parser/Html5ParserTest.java | 86 +-
html.validation/external/binaries-list | 12 +-
.../external/html5-datatypes-license.txt | 31 -
html.validation/external/io-xml-util-license.txt | 184 ----
.../{iri-license.txt => iri-0.5-license.txt} | 9 +-
...x-license.txt => isorelax-20041111-license.txt} | 7 +-
...{jing-license.txt => jing-0unknown-license.txt} | 9 +-
html.validation/external/log4j-1.2.15-license.txt | 9 +-
html.validation/external/org.whattf.datatype.patch | 19 +
.../external/saxon9B-9.1.0.2-license.txt | 367 +++++++
html.validation/external/saxon9B-license.txt | 17 -
....txt => validator-20150629-patched-license.txt} | 30 +-
html.validation/nbproject/project.properties | 20 +-
html.validation/nbproject/project.xml | 10 +-
.../test/unit/data/testfiles/test1.xhtml | 20 +
.../test/unit/data/testfiles/test2.xhtml | 20 +
.../test/unit/data/testfiles/wicket.xhtml | 20 +
.../netbeans/modules/html/validation/TestBase.java | 5 +-
.../html/validation/ValidationTransactionTest.java | 7 +-
.../modules/html/validation/ValidatorImplTest.java | 7 +-
.../netbeans/modules/html/HtmlEditorSupport.java | 3 +-
.../org/netbeans/test/gui/httpserver/Module.java | 2 +-
.../src/org/netbeans/test/gui/httpserver/test.txt | 3 +
.../testfs/org/netbeans/test/httpserver/Page.html | 20 +
.../dir with spaces/file with spaces.txt | 19 +
.../unit/testfs/org/netbeans/test/httpserver/empty | 0
.../org/netbeans/core/startup/Bundle_nb.properties | 4 +-
.../org/netbeans/core/startup/about_dark_nb.png | Bin 95223 -> 137593 bytes
.../src/org/netbeans/core/startup/about_nb.png | Bin 95223 -> 137593 bytes
.../org/netbeans/core/startup/splash_dark_nb.gif | Bin 91052 -> 49006 bytes
.../src/org/netbeans/core/startup/splash_nb.gif | Bin 91052 -> 49006 bytes
.../core/windows/view/ui/Bundle_nb.properties | 4 +-
ide.branding/release-toplevel/LICENSE.txt | 1125 ++++----------------
j2ee.eclipselink/build.xml | 23 +
j2ee.eclipselink/external/binaries-list | 11 +-
...2-licence.txt => eclipselink-2.5.2-license.txt} | 7 +-
j2ee.eclipselink/nbproject/project.properties | 20 +-
j2ee.eclipselink/nbproject/project.xml | 15 +-
.../modules/j2ee/eclipselink/eclipselink_lib.xml | 16 +-
.../modules/j2ee/eclipselink/jpa20-persistence.xml | 2 +-
j2ee.eclipselinkmodelgen/external/binaries-list | 2 +-
...2-licence.txt => eclipselink-2.5.2-license.txt} | 7 +-
.../nbproject/project.properties | 4 +-
.../eclipselinkmodelgen_lib.xml | 2 +-
j2ee.jpa.refactoring/nbproject/project.properties | 10 +-
.../nbproject/project.properties | 8 +-
j2ee.metadata.model.support/nbproject/project.xml | 10 +-
.../editor/completion/JPACompletionItem.java | 2 +-
.../persistence/resources/hibernate-mapping.png | Bin 0 -> 779 bytes
j2ee.persistenceapi/nbproject/project.properties | 8 +-
java.examples/build.xml | 23 +-
java.examples/nbproject/project.xml | 9 -
.../modules/java/examples/Bundle.properties | 1 -
.../resources/descriptions/ClientEditor.html | 30 -
.../modules/java/examples/resources/mf-layer.xml | 10 -
java.hints/build.xml | 10 +-
.../netbeans/modules/java/hints/bugs/NPECheck.java | 172 +--
.../modules/java/hints/introduce/Flow.java | 31 +-
.../modules/java/hints/perf/SizeEqualsZero.java | 9 +-
.../java/hints/suggestions/CreateSubclass.java | 38 +-
java.hints/test-excludes.txt | 1 -
.../modules/java/hints/bugs/NPECheckTest.java | 32 +-
.../hints/bugs/UnusedAssignmentOrBranchTest.java | 32 +
.../modules/java/hints/errors/Class.template | 18 +
.../infrastructure/ErrorHintsProviderTest.java | 6 -
.../java/hints/perf/SizeEqualsZeroTest.java | 110 +-
.../java/hints/suggestions/CreateSubclassTest.java | 70 +-
java.navigation/test/log.txt | 1 -
.../source/transform/ImmutableTreeTranslator.java | 3 +-
java.source/build.xml | 8 -
java.source/test-excludes.txt | 18 -
.../jshell/resources/ShellClass.java.template | 20 +
.../modules/jshell/support/ContentParserTest.java | 9 +
.../netbeans/modules/jshell/support/reploutput.txt | 16 +
.../modules/jshell/support/reploutput_golden.txt | 16 +
lib.jshell.agent/nbproject/project.properties | 2 +-
.../lib/nbjavac/services/NBJavadocMemberEnter.java | 5 +-
lib.profiler/build.xml | 2 +-
lib.profiler/external/binaries-list | 2 +-
.../profiler-external-binaries-8.2-license.txt | 406 +++++++
.../profiler-external-binaries-license.txt | 40 -
lib.profiler/test/qa-functional/coverage.txt | 3 +
.../external/antlr-runtime-3.4-license.txt | 10 +-
.../external/antlr4-runtime-4.5.3-license.txt | 10 +-
libs.bytelist/external/binaries-list | 2 +-
libs.bytelist/external/bytelist-0.1-license.txt | 519 ---------
.../external/bytelist-1.0.15-license.txt | 13 +-
libs.bytelist/nbproject/project.properties | 4 +-
libs.bytelist/nbproject/project.xml | 4 +-
.../libs/git/jgit/commands/CherryPickTest.java | 6 +-
libs.javacapi/external/binaries-list | 2 +-
libs.javacimpl/external/binaries-list | 2 +-
libs.jaxb/external/binaries-list | 8 +-
libs.jaxb/external/jaxb-2.2.5-2-license.txt | 355 ++++++
libs.jaxb/external/jaxb-2.2.5-license.txt | 722 -------------
.../external/jaxb-api-2.2.5-javadoc-license.txt | 354 ++++++
libs.jaxb/nbproject/project.properties | 18 +-
libs.jaxb/nbproject/project.xml | 6 +-
libs.jaxb/src/org/netbeans/libs/jaxb/jaxb.xml | 9 +-
...cense.txt => jsch.agentproxy-0.0.7-license.txt} | 14 +-
.../jsch.agentproxy.core-0.0.7-license.txt | 32 -
.../jsch.agentproxy.pageant-0.0.7-license.txt | 32 -
.../jsch.agentproxy.sshagent-0.0.7-notice.txt | 26 -
.../jsch.agentproxy.usocket-jna-0.0.7-license.txt | 32 -
.../jsch.agentproxy.usocket-jna-0.0.7-notice.txt | 26 -
libs.jshell.compile/external/binaries-list | 2 +-
...{nb-jshell-license.txt => jshell-9-license.txt} | 7 +-
libs.jshell.compile/nbproject/project.xml | 2 +-
.../external/json-simple-1.1.1-license.txt | 5 +
libs.jvyamlb/external/jvyamlb-0.2.6-license.txt | 27 +-
libs.jvyamlb/external/jvyamlb-0.2.7-license.txt | 26 -
libs.lucene/external/lucene-core-3.5.0-license.txt | 51 +-
libs.lucene/external/lucene-core-3.5.0-notice.txt | 3 -
.../{smack-license.txt => smack-3.1.0-license.txt} | 8 +-
.../spring-framework-3.2.7.RELEASE-license.txt | 49 +-
.../spring-framework-4.0.1.RELEASE-license.txt | 7 +-
.../svnClientAdapter-javahl-1.10.12-license.txt | 8 +-
.../external/svnjavahl-1.9.3-license.txt | 9 +-
.../javahl/JavaHlClientAdapterFactoryTest.java | 6 +-
.../svnkit/SvnKitClientAdapterFactoryTest.java | 6 +-
.../svnClientAdapter-main-1.10.12-license.txt | 7 +-
libs.xerces/external/xerces-2.8.0-notice.txt | 15 -
....0-license.txt => xercesImpl-2.8.0-license.txt} | 4 +-
libs.xerces/external/xercesImpl-2.8.0-notice.txt | 9 +
.../watcher/FsEventFromAtomicActionTest.java | 6 +-
.../masterfs/watcher/MoveUnlocksWatcherTest.java | 6 +-
.../external/apache-maven-3.3.9-bin-license.txt | 10 +-
maven.embedder/external/jdom-1.0-license.txt | 1 -
maven.embedder/external/jdom-1.0-notice.txt | 51 +-
.../external/maven-dependency-tree-2.0-license.txt | 4 +-
maven.htmlui/nbproject/project.xml | 4 +-
.../modules/maven/htmlui/DukeScriptWizard.java | 28 -
.../org/netbeans/modules/maven/htmlui/UIDefaults | 137 ---
.../modules/maven/htmlui/dukeScriptWizard.html | 1 -
.../netbeans/modules/maven/htmlui/wizard-gtk.css | 0
... indexer-core-6.0-SNAPSHOT-patched-license.txt} | 7 +-
.../external/javax.annotation-api-1.2-license.txt | 355 ++++++
...-5.5.3-license.txt => lucene-5.5.3-license.txt} | 8 +-
maven.indexer/external/lucene-5.5.3-notice.txt | 188 ++++
.../external/lucene-highlighter-5.5.3-license.txt | 210 ----
.../external/lucene-queryparser-5.5.3-license.txt | 210 ----
.../maven/indexer/NexusRepositoryIndexerImpl.java | 2 +-
.../spi/impl/RepositoryIndexerImplementation.java | 5 +-
.../maven/osgi/templates/Activator.java.template | 21 +-
maven/apichanges.xml | 50 +-
maven/arch.xml | 29 +
maven/build.xml | 2 +-
.../external/aether-api-1.13.1-license.txt | 34 +-
maven/external/binaries-list | 4 +-
.../external/jarjar-1.5-license.txt | 11 +-
maven/manifest.mf | 2 +-
maven/nbproject/project.xml | 9 -
.../org/netbeans/modules/maven/api/Constants.java | 9 +
.../maven/debug/DebugCheckerOutputFactory.java | 95 ++
.../modules/maven/debug/DebuggerChecker.java | 55 +-
.../modules/mercurial/ui/log/HgLogMessage.java | 2 +-
.../mercurial/ui/status/VersioningPanel.java | 2 +-
.../org/netbeans/test/mercurial/hgStableTest.java | 2 +-
nashorn.execution/nbproject/project.xml | 9 -
.../execution/options/JavaScriptNashornPanel.form | 18 +-
.../execution/options/JavaScriptNashornPanel.java | 19 +-
nbbuild/antsrc/org/netbeans/nbbuild/Arch.java | 61 +-
.../nbbuild/extlibs/VerifyLibsAndLicenses.java | 3 +-
.../org/netbeans/nbbuild/extlibs/ignored-overlaps | 8 +
nbbuild/antsrc/org/netbeans/nbbuild/xhtml-lat1.ent | 196 ++++
.../antsrc/org/netbeans/nbbuild/xhtml-special.ent | 80 ++
.../antsrc/org/netbeans/nbbuild/xhtml-symbol.ent | 237 +++++
.../antsrc/org/netbeans/nbbuild/xhtml1-strict.dtd | 1025 ++++++++++++++++++
nbbuild/build.xml | 49 +-
nbbuild/cluster.properties | 5 -
nbbuild/external/binaries-list | 1 -
.../nbbuild-xhtml1-dtds-resources-license.txt | 280 -----
nbbuild/javadoctools/template.xml | 6 +-
.../licenses/Apache-2.0-lucene | 10 -
.../licenses/Apache-2.0-spring3.2.7 | 8 +-
.../licenses/Apache-2.0-spring4.0.1 | 6 -
.../licenses/BSD-antlr-runtime3 | 9 -
.../licenses/BSD-antlr-runtime4 | 9 -
.../iri-license.txt => nbbuild/licenses/BSD-iri | 8 -
nbbuild/licenses/BSD-ispell-enwl | 44 +
.../licenses/BSD-javacc-3.2 | 7 -
.../jing-license.txt => nbbuild/licenses/BSD-jing | 9 -
nbbuild/licenses/{BSD-jsch-variant => BSD-jsch} | 2 +-
.../licenses/BSD-jsch-agentproxy | 6 +-
.../licenses/BSD-jzlib | 7 +-
nbbuild/licenses/BSD-postgresql | 26 +
nbbuild/licenses/CDDL-1.1 | 399 +++++++
.../licenses/EPL-v10-eclipselink | 9 +-
.../licenses/EPL-v10-h2 | 23 +-
.../licenses/EPL-v10-with-commons | 7 -
.../licenses/EPL-v10-with-osgi | 7 -
.../licenses/HTML5DOC | 7 -
.../licenses/MIT-html5-parser | 9 -
.../licenses/MIT-icu4j | 8 -
.../licenses/MIT-isorelax | 8 -
.../licenses/MIT-jvyamlb | 12 +-
.../licenses/MIT-validator | 12 +-
nbbuild/licenses/MPL-1.0 | 360 +++++++
nbbuild/licenses/freemarker | 54 +-
nbbuild/licenses/names.properties | 21 +
nbbuild/templates/projectized.xml | 11 +-
.../IncrementSpecificationVersionsTest.java | 2 +-
...3-license.txt => commons-codec-1.3-license.txt} | 4 +-
.../external/commons.codec-1.3-notice.txt | 2 -
.../external/commons-httpclient-3.1-license.txt | 2 +-
.../external/commons-io-1.4-license.txt | 6 +-
.../external/common-lang-2.6-notice.txt | 5 -
....6-license.txt => commons-lang-2.6-license.txt} | 6 +-
.../external/commons-logging-1.1.1-license.txt | 4 +-
.../external/commons-logging-1.1.1-notice.txt | 5 -
.../external/ant-1.10.1-license.txt | 4 +-
.../external/ant-1.10.1-notice.txt | 6 +
.../external/ws-commons-util-1.0.1-license.txt | 6 +-
.../README-xml-resolver-1.2-netbeans.patch | 3 +
o.apache.xml.resolver/external/readme.txt | 48 -
.../external/resolver-1.2-license.txt | 7 +-
.../external/resolver-1.2-notice.txt | 3 -
o.apache.xml.resolver/external/resolver.patch | 129 ---
.../external/xmlrpc-client-3.0-license.txt | 6 +-
...0-license.txt => xmlrpc-common-3.0-license.txt} | 6 +-
.../external/xmlrpc-server-3.0-license.txt | 6 +-
o.eclipse.core.contenttype/external/binaries-list | 1 -
...rg.eclipse.core.contenttype-3.4.100-license.txt | 72 --
....contenttype-3.4.100.v20110423-0524-license.txt | 34 +-
o.eclipse.core.jobs/external/binaries-list | 1 -
.../org.eclipse.core.jobs-3.5.100-license.txt | 34 +-
.../org.eclipse.core.jobs-3.5.101-license.txt | 72 --
.../org.eclipse.core.net-1.2.100-license.txt | 72 --
..._1.2.100.I20110511-0800_nosignature-license.txt | 34 +-
....runtime.compatibility.auth-3.2.200-license.txt | 72 --
....auth_3.2.200.v20110110_nosignature-license.txt | 34 +-
.../org.eclipse.core.runtime-3.7.0-license.txt | 6 +-
.../org.eclipse.equinox.app-1.3.100-license.txt | 8 +-
...ipse.equinox.common-3.6.0.v20110523-license.txt | 34 +-
...ipse.equinox.common_3.6.0.v20110523-license.txt | 72 --
...inox.preferences-3.4.2_nosignature-license.txt} | 6 +-
...3.5.200.v20120522-1841_nosignature-license.txt} | 9 +-
.../org.eclipse.equinox.security-1.1.1-license.txt | 72 --
....equinox.security-1.1.1_nosignature-license.txt | 34 +-
...pse.jgit.java7-3.6.2.201501210735-r-license.txt | 28 +-
...g.eclipse.jgit-3.6.2.201501210735-r-license.txt | 26 +-
...bugzilla.core-3.17.0.v20150828-2026-license.txt | 72 --
...bugzilla.core_3.17.0.v20150828-2026-license.txt | 34 +-
....commons.core-3.17.0.v20150625-2042-license.txt | 72 --
....commons.core_3.17.0.v20150625-2042-license.txt | 34 +-
...n.commons.net-3.17.0.v20150706-2057-license.txt | 72 --
...n.commons.net_3.17.0.v20150706-2057-license.txt | 34 +-
...ositories.core-1.9.0.v20150625-2042-license.txt | 72 --
...ositories.core_1.9.0.v20150625-2042-license.txt | 34 +-
...ommons.xmlrpc-3.17.0.v20150625-2042-license.txt | 72 --
...ommons.xmlrpc_3.17.0.v20150625-2042-license.txt | 34 +-
...yn.tasks.core-3.17.0.v20150828-2026-license.txt | 72 --
...yn.tasks.core_3.17.0.v20150828-2026-license.txt | 34 +-
...onfluence.core_2.6.0.v20150901-2143-license.txt | 12 +-
....v20150901-2143-patched-nosignature-license.txt | 10 +-
...markdown.core_2.6.0.v20150901-2143-license.txt} | 7 +-
...t.textile.core_2.6.0.v20150901-2143-license.txt | 10 +-
.../test/unit/src/org/fakepkg/resource1.txt | 3 +
.../test/unit/src/org/fakepkg/resource2.txt | 3 +
.../src/org/netbeans/core/ui/Bundle.properties | 11 +-
.../swing/tabcontrol/plaf/ChicletDemo.java | 2 +-
.../filesystems/FileSystem$Environment.java | 6 +-
.../org/openide/loaders/NewObjectWizardPanel.java | 2 +-
.../src/org/openide/loaders/TemplateWizard2.java | 2 +-
.../org/openide/loaders/TemplateWizardPanel1.java | 2 +-
.../org/openide/loaders/TemplateWizardPanel2.java | 2 +-
openide.util.lookup/build.xml | 3 -
.../src/jbiasa/.ignore | 0
performance/external/javacc-3.2-license.txt | 2 +-
.../profiler/heapwalk/ui/HintsControllerUI.java | 2 +-
project.libraries/devel/design/uispec.txt | 6 +-
.../project/ui/resources/explorer-override.wsmode | 20 +
.../modules/schema2beansdev/metadd/gen.ksh | 1 -
.../quicksearch/AquaQuickSearchComboBar.java | 3 +-
subversion/nbproject/project.xml | 5 -
.../subversion/client/SvnClientFactory.java | 4 +
.../subversion/options/SvnOptionsController.java | 8 +-
...4cc001a41ab9138496b11e2ae256a159ffd-license.txt | 406 +++++++
.../external/ValidationAPI-license.txt | 834 ---------------
swing.validation/external/binaries-list | 2 +-
swing.validation/nbproject/project.properties | 2 +-
swing.validation/nbproject/project.xml | 2 +-
.../modules/templatesui/AbstractWizard.java | 157 ++-
.../org/netbeans/modules/templatesui/RunTCK.java | 12 +-
.../updatecenters/install/ValidateInstallTest.java | 5 +-
.../netbeans/modules/usersguide/f1_css_editor.htm | 2 +-
.../modules/usersguide/f1_css_editor001.htm | 2 +-
.../modules/usersguide/f1_css_editor002.htm | 2 +-
.../modules/usersguide/f1_css_editor003.htm | 2 +-
.../modules/usersguide/f1_css_editor004.htm | 2 +-
.../modules/usersguide/f1_css_editor005.htm | 2 +-
.../modules/usersguide/f1_css_editor006.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs001.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs002.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs003.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs004.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs005.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs006.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs007.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs008.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs009.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs010.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs011.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs012.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs013.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs014.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs015.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs016.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs017.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs018.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs019.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_cvs020.htm | 2 +-
.../netbeans/modules/usersguide/f1_database.htm | 2 +-
.../netbeans/modules/usersguide/f1_database001.htm | 2 +-
.../netbeans/modules/usersguide/f1_database002.htm | 2 +-
.../netbeans/modules/usersguide/f1_database003.htm | 2 +-
.../netbeans/modules/usersguide/f1_database004.htm | 2 +-
.../netbeans/modules/usersguide/f1_database005.htm | 2 +-
.../netbeans/modules/usersguide/f1_database006.htm | 2 +-
.../netbeans/modules/usersguide/f1_database007.htm | 2 +-
.../netbeans/modules/usersguide/f1_database008.htm | 2 +-
.../netbeans/modules/usersguide/f1_database009.htm | 2 +-
.../netbeans/modules/usersguide/f1_database010.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git001.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git002.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git003.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git004.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git005.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git006.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git007.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git008.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git009.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git010.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git011.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git012.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git013.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git014.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git015.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git016.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git017.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git018.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git019.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git020.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git021.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git022.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git023.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git024.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git025.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git026.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git027.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git028.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git029.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git030.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git031.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git032.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_git033.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html001.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html002.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html003.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html004.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html005.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html006.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html007.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html008.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html009.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html010.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html011.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html012.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html013.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html014.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html015.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html016.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html017.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html018.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html019.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html020.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html021.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html022.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html023.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html024.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html025.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html026.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html027.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html028.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html029.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html030.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_html031.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_debug.htm | 2 +-
.../modules/usersguide/f1_java_debug001.htm | 2 +-
.../modules/usersguide/f1_java_debug002.htm | 2 +-
.../modules/usersguide/f1_java_debug003.htm | 2 +-
.../modules/usersguide/f1_java_debug004.htm | 2 +-
.../modules/usersguide/f1_java_debug005.htm | 2 +-
.../modules/usersguide/f1_java_debug006.htm | 2 +-
.../modules/usersguide/f1_java_debug007.htm | 2 +-
.../modules/usersguide/f1_java_debug008.htm | 2 +-
.../modules/usersguide/f1_java_debug009.htm | 2 +-
.../modules/usersguide/f1_java_debug010.htm | 2 +-
.../modules/usersguide/f1_java_debug011.htm | 2 +-
.../modules/usersguide/f1_java_debug012.htm | 2 +-
.../modules/usersguide/f1_java_debug013.htm | 2 +-
.../modules/usersguide/f1_java_debug014.htm | 2 +-
.../modules/usersguide/f1_java_debug015.htm | 2 +-
.../modules/usersguide/f1_java_debug016.htm | 2 +-
.../modules/usersguide/f1_java_debug017.htm | 2 +-
.../modules/usersguide/f1_java_debug018.htm | 2 +-
.../modules/usersguide/f1_java_debug019.htm | 2 +-
.../modules/usersguide/f1_java_debug020.htm | 2 +-
.../modules/usersguide/f1_java_debug021.htm | 2 +-
.../modules/usersguide/f1_java_debug022.htm | 2 +-
.../modules/usersguide/f1_java_debug023.htm | 2 +-
.../modules/usersguide/f1_java_debug024.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_edit.htm | 2 +-
.../modules/usersguide/f1_java_edit001.htm | 2 +-
.../modules/usersguide/f1_java_edit002.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_java_ee.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee001.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee002.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee003.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee004.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee005.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee006.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee007.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee008.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee009.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee010.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee011.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee012.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee013.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee014.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee015.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee016.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee017.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee018.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee019.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee020.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee021.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee022.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee023.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee024.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee025.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee026.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee027.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee028.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee029.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee030.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee031.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee032.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee033.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee034.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee035.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee036.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee037.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee038.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee039.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee040.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee041.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee042.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee043.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee044.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee045.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee046.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee047.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee048.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee049.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee050.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee051.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee052.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee053.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee054.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee055.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee056.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee057.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee058.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee059.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee060.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee061.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee062.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee063.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee064.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee065.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee066.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee067.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee068.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee069.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee070.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee071.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee072.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee073.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee074.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee075.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee076.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee077.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee078.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee079.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee080.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee081.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee082.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee083.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee084.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee085.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee086.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee087.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee088.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee089.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee090.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee091.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee092.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee093.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee094.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee095.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee096.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee097.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee098.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee099.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee100.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee101.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee102.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee103.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee104.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee105.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee106.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee107.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee108.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee109.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee110.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee111.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee112.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee113.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_ee114.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui001.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui002.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui003.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui004.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui005.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui006.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui007.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui008.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui009.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui010.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui011.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui012.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui013.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui014.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui015.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui016.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui017.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui018.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui019.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui020.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui021.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_gui022.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_java_me.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me001.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me002.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me003.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me004.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me005.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me006.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me007.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me008.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me009.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me010.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me011.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me012.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me013.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me014.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me015.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me016.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me017.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me018.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me019.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me020.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me021.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me022.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me023.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me024.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me025.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me026.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me027.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me028.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me029.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me030.htm | 2 +-
.../netbeans/modules/usersguide/f1_java_me031.htm | 2 +-
.../modules/usersguide/f1_java_project.htm | 2 +-
.../modules/usersguide/f1_java_project001.htm | 2 +-
.../modules/usersguide/f1_java_project002.htm | 2 +-
.../modules/usersguide/f1_java_project003.htm | 2 +-
.../modules/usersguide/f1_java_project004.htm | 2 +-
.../modules/usersguide/f1_java_project005.htm | 2 +-
.../modules/usersguide/f1_java_project006.htm | 2 +-
.../modules/usersguide/f1_java_project007.htm | 2 +-
.../modules/usersguide/f1_java_project008.htm | 2 +-
.../modules/usersguide/f1_java_project009.htm | 2 +-
.../modules/usersguide/f1_java_project010.htm | 2 +-
.../modules/usersguide/f1_java_project011.htm | 2 +-
.../modules/usersguide/f1_java_project012.htm | 2 +-
.../modules/usersguide/f1_java_project013.htm | 2 +-
.../modules/usersguide/f1_java_project014.htm | 2 +-
.../modules/usersguide/f1_java_project015.htm | 2 +-
.../modules/usersguide/f1_java_project016.htm | 2 +-
.../modules/usersguide/f1_java_project017.htm | 2 +-
.../modules/usersguide/f1_java_project018.htm | 2 +-
.../modules/usersguide/f1_java_project019.htm | 2 +-
.../modules/usersguide/f1_java_project020.htm | 2 +-
.../modules/usersguide/f1_java_project021.htm | 2 +-
.../modules/usersguide/f1_java_project022.htm | 2 +-
.../modules/usersguide/f1_java_project023.htm | 2 +-
.../modules/usersguide/f1_java_project024.htm | 2 +-
.../modules/usersguide/f1_java_project025.htm | 2 +-
.../modules/usersguide/f1_java_project026.htm | 2 +-
.../modules/usersguide/f1_java_project027.htm | 2 +-
.../modules/usersguide/f1_java_project028.htm | 2 +-
.../modules/usersguide/f1_java_project029.htm | 2 +-
.../modules/usersguide/f1_java_project030.htm | 2 +-
.../modules/usersguide/f1_java_project031.htm | 2 +-
.../modules/usersguide/f1_java_project032.htm | 2 +-
.../modules/usersguide/f1_java_project033.htm | 2 +-
.../modules/usersguide/f1_java_project034.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_jpa.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_jpa001.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_jpa002.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_jpa003.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_jpa004.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_jpa005.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_jpa006.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_jpa007.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_jpa008.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_jpa009.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_jpa010.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_jpa011.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_jpa012.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_jpa013.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_jpa014.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_maven.htm | 2 +-
.../netbeans/modules/usersguide/f1_maven001.htm | 2 +-
.../netbeans/modules/usersguide/f1_maven002.htm | 2 +-
.../netbeans/modules/usersguide/f1_maven003.htm | 2 +-
.../netbeans/modules/usersguide/f1_maven004.htm | 2 +-
.../netbeans/modules/usersguide/f1_maven005.htm | 2 +-
.../netbeans/modules/usersguide/f1_maven006.htm | 2 +-
.../netbeans/modules/usersguide/f1_mercurial.htm | 2 +-
.../modules/usersguide/f1_mercurial001.htm | 2 +-
.../modules/usersguide/f1_mercurial002.htm | 2 +-
.../modules/usersguide/f1_mercurial003.htm | 2 +-
.../modules/usersguide/f1_mercurial004.htm | 2 +-
.../modules/usersguide/f1_mercurial005.htm | 2 +-
.../modules/usersguide/f1_mercurial006.htm | 2 +-
.../modules/usersguide/f1_mercurial007.htm | 2 +-
.../modules/usersguide/f1_mercurial008.htm | 2 +-
.../modules/usersguide/f1_mercurial009.htm | 2 +-
.../modules/usersguide/f1_mercurial010.htm | 2 +-
.../modules/usersguide/f1_mercurial011.htm | 2 +-
.../modules/usersguide/f1_mercurial012.htm | 2 +-
.../modules/usersguide/f1_mercurial013.htm | 2 +-
.../modules/usersguide/f1_mercurial014.htm | 2 +-
.../modules/usersguide/f1_mercurial015.htm | 2 +-
.../modules/usersguide/f1_mercurial016.htm | 2 +-
.../modules/usersguide/f1_mercurial017.htm | 2 +-
.../modules/usersguide/f1_mercurial018.htm | 2 +-
.../modules/usersguide/f1_mercurial019.htm | 2 +-
.../modules/usersguide/f1_mercurial020.htm | 2 +-
.../modules/usersguide/f1_mercurial021.htm | 2 +-
.../modules/usersguide/f1_mercurial022.htm | 2 +-
.../modules/usersguide/f1_mercurial023.htm | 2 +-
.../modules/usersguide/f1_mercurial024.htm | 2 +-
.../modules/usersguide/f1_mercurial025.htm | 2 +-
.../modules/usersguide/f1_mercurial026.htm | 2 +-
.../modules/usersguide/f1_mercurial027.htm | 2 +-
.../modules/usersguide/f1_mercurial028.htm | 2 +-
.../modules/usersguide/f1_mercurial029.htm | 2 +-
.../modules/usersguide/f1_mercurial030.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_modules.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules001.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules002.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules003.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules004.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules005.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules006.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules007.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules008.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules009.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules010.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules011.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules012.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules013.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules014.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules015.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules016.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules017.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules018.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules019.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules020.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules021.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules022.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules023.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules024.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules025.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules026.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules027.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules028.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules029.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules030.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules031.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules032.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules033.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules034.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules035.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules036.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules037.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules038.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules039.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules040.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules041.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules042.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules043.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules044.htm | 2 +-
.../netbeans/modules/usersguide/f1_modules045.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php001.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php002.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php003.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php004.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php005.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php006.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php007.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php008.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php009.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php010.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php011.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php012.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php013.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php014.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php015.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php016.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php017.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php018.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php019.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php020.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php021.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php022.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php023.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php024.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php025.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php026.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php027.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php028.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php029.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php030.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php031.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php032.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php033.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php034.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php035.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php036.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php037.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php038.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php039.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php040.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php041.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php042.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_php043.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler001.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler002.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler003.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler004.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler005.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler006.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler007.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler008.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler009.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler010.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler011.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler012.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler013.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler014.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler015.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler016.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler017.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler018.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler019.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler020.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler021.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler022.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler023.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler024.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler025.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler026.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler027.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler028.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler029.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler030.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler031.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler032.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler033.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler034.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler035.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler036.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler037.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler038.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler039.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler040.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler041.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler042.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler043.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler044.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler045.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler046.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler047.htm | 2 +-
.../netbeans/modules/usersguide/f1_profiler048.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor001.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor002.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor003.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor004.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor005.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor006.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor007.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor008.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor009.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor010.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor011.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor012.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor013.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor014.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor015.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor016.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor017.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor018.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor019.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor020.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor021.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor022.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor023.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor024.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor025.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor026.htm | 2 +-
.../netbeans/modules/usersguide/f1_refactor027.htm | 2 +-
.../netbeans/modules/usersguide/f1_subversion.htm | 2 +-
.../modules/usersguide/f1_subversion001.htm | 2 +-
.../modules/usersguide/f1_subversion002.htm | 2 +-
.../modules/usersguide/f1_subversion003.htm | 2 +-
.../modules/usersguide/f1_subversion004.htm | 2 +-
.../modules/usersguide/f1_subversion005.htm | 2 +-
.../modules/usersguide/f1_subversion006.htm | 2 +-
.../modules/usersguide/f1_subversion007.htm | 2 +-
.../modules/usersguide/f1_subversion008.htm | 2 +-
.../modules/usersguide/f1_subversion009.htm | 2 +-
.../modules/usersguide/f1_subversion010.htm | 2 +-
.../modules/usersguide/f1_subversion011.htm | 2 +-
.../modules/usersguide/f1_subversion012.htm | 2 +-
.../modules/usersguide/f1_subversion013.htm | 2 +-
.../modules/usersguide/f1_subversion014.htm | 2 +-
.../modules/usersguide/f1_subversion015.htm | 2 +-
.../modules/usersguide/f1_subversion016.htm | 2 +-
.../modules/usersguide/f1_subversion017.htm | 2 +-
.../modules/usersguide/f1_subversion018.htm | 2 +-
.../modules/usersguide/f1_subversion019.htm | 2 +-
.../modules/usersguide/f1_subversion020.htm | 2 +-
.../modules/usersguide/f1_subversion021.htm | 2 +-
.../modules/usersguide/f1_subversion022.htm | 2 +-
.../modules/usersguide/f1_subversion023.htm | 2 +-
.../modules/usersguide/f1_subversion024.htm | 2 +-
.../modules/usersguide/f1_subversion025.htm | 2 +-
.../modules/usersguide/f1_subversion026.htm | 2 +-
.../modules/usersguide/f1_subversion027.htm | 2 +-
.../modules/usersguide/f1_subversion028.htm | 2 +-
.../modules/usersguide/f1_subversion029.htm | 2 +-
.../modules/usersguide/f1_subversion030.htm | 2 +-
.../modules/usersguide/f1_subversion031.htm | 2 +-
.../modules/usersguide/f1_subversion032.htm | 2 +-
.../modules/usersguide/f1_subversion033.htm | 2 +-
.../modules/usersguide/f1_subversion034.htm | 2 +-
.../modules/usersguide/f1_subversion035.htm | 2 +-
.../modules/usersguide/f1_subversion036.htm | 2 +-
.../modules/usersguide/f1_subversion037.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_team.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_team001.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_team002.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_team003.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_unit.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_unit001.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_unit002.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_unit003.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_unit004.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_unit005.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_unit006.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_unit007.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps001.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps002.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps003.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps004.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps005.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps006.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps007.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps008.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps009.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps010.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps011.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps012.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps013.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps014.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps015.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps016.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps017.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps018.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps019.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps020.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps021.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps022.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps023.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps024.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps025.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps026.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps027.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps028.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps029.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps030.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps031.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps032.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps033.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps034.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps035.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps036.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps037.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps038.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps039.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps040.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps041.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps042.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps043.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps044.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_apps045.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk001.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk002.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk003.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk004.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk005.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk006.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk007.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk008.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk009.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk010.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk011.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk012.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk013.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk014.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk015.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk016.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk017.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk018.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk019.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk020.htm | 2 +-
.../netbeans/modules/usersguide/f1_web_fmwk021.htm | 2 +-
.../modules/usersguide/f1_working_netbeans.htm | 2 +-
.../modules/usersguide/f1_working_netbeans001.htm | 2 +-
.../modules/usersguide/f1_working_netbeans002.htm | 2 +-
.../modules/usersguide/f1_working_netbeans003.htm | 2 +-
.../modules/usersguide/f1_working_netbeans004.htm | 2 +-
.../modules/usersguide/f1_working_netbeans005.htm | 2 +-
.../modules/usersguide/f1_working_netbeans006.htm | 2 +-
.../modules/usersguide/f1_working_netbeans007.htm | 2 +-
.../modules/usersguide/f1_working_netbeans008.htm | 2 +-
.../modules/usersguide/f1_working_netbeans009.htm | 2 +-
.../modules/usersguide/f1_working_netbeans010.htm | 2 +-
.../modules/usersguide/f1_working_netbeans011.htm | 2 +-
.../modules/usersguide/f1_working_netbeans012.htm | 2 +-
.../modules/usersguide/f1_working_netbeans013.htm | 2 +-
.../modules/usersguide/f1_working_netbeans014.htm | 2 +-
.../modules/usersguide/f1_working_netbeans015.htm | 2 +-
.../modules/usersguide/f1_working_netbeans016.htm | 2 +-
.../modules/usersguide/f1_working_netbeans017.htm | 2 +-
.../modules/usersguide/f1_working_netbeans018.htm | 2 +-
.../modules/usersguide/f1_working_netbeans019.htm | 2 +-
.../modules/usersguide/f1_working_netbeans020.htm | 2 +-
.../modules/usersguide/f1_working_netbeans021.htm | 2 +-
.../modules/usersguide/f1_working_netbeans022.htm | 2 +-
.../modules/usersguide/f1_working_netbeans023.htm | 2 +-
.../modules/usersguide/f1_working_netbeans024.htm | 2 +-
.../modules/usersguide/f1_working_netbeans025.htm | 2 +-
.../modules/usersguide/f1_working_netbeans026.htm | 2 +-
.../modules/usersguide/f1_working_netbeans027.htm | 2 +-
.../modules/usersguide/f1_working_netbeans028.htm | 2 +-
.../modules/usersguide/f1_working_netbeans029.htm | 2 +-
.../modules/usersguide/f1_working_netbeans030.htm | 2 +-
.../modules/usersguide/f1_working_netbeans031.htm | 2 +-
.../modules/usersguide/f1_working_netbeans032.htm | 2 +-
.../modules/usersguide/f1_working_netbeans033.htm | 2 +-
.../modules/usersguide/f1_working_netbeans034.htm | 2 +-
.../modules/usersguide/f1_working_netbeans035.htm | 2 +-
.../modules/usersguide/f1_working_netbeans036.htm | 2 +-
.../modules/usersguide/f1_working_netbeans037.htm | 2 +-
.../modules/usersguide/f1_working_netbeans038.htm | 2 +-
.../modules/usersguide/f1_working_netbeans039.htm | 2 +-
.../modules/usersguide/f1_working_netbeans040.htm | 2 +-
.../modules/usersguide/f1_working_netbeans041.htm | 2 +-
.../modules/usersguide/f1_working_netbeans042.htm | 2 +-
.../modules/usersguide/f1_working_netbeans043.htm | 2 +-
.../modules/usersguide/f1_working_netbeans044.htm | 2 +-
.../modules/usersguide/f1_working_netbeans045.htm | 2 +-
.../modules/usersguide/f1_working_netbeans046.htm | 2 +-
.../modules/usersguide/f1_working_netbeans047.htm | 2 +-
.../modules/usersguide/f1_working_netbeans048.htm | 2 +-
.../modules/usersguide/f1_working_netbeans049.htm | 2 +-
.../modules/usersguide/f1_working_netbeans050.htm | 2 +-
.../modules/usersguide/f1_working_netbeans051.htm | 2 +-
.../modules/usersguide/f1_working_netbeans052.htm | 2 +-
.../modules/usersguide/f1_working_netbeans053.htm | 2 +-
.../modules/usersguide/f1_working_netbeans054.htm | 2 +-
.../modules/usersguide/f1_working_netbeans055.htm | 2 +-
.../modules/usersguide/f1_working_netbeans056.htm | 2 +-
.../modules/usersguide/f1_working_netbeans057.htm | 2 +-
.../modules/usersguide/f1_working_netbeans058.htm | 2 +-
.../modules/usersguide/f1_working_netbeans059.htm | 2 +-
.../modules/usersguide/f1_working_netbeans060.htm | 2 +-
.../modules/usersguide/f1_working_netbeans061.htm | 2 +-
.../modules/usersguide/f1_working_netbeans062.htm | 2 +-
.../modules/usersguide/f1_working_netbeans063.htm | 2 +-
.../modules/usersguide/f1_working_netbeans064.htm | 2 +-
.../modules/usersguide/f1_working_netbeans065.htm | 2 +-
.../modules/usersguide/f1_working_netbeans066.htm | 2 +-
.../modules/usersguide/f1_working_netbeans067.htm | 2 +-
.../modules/usersguide/f1_working_netbeans068.htm | 2 +-
.../modules/usersguide/f1_working_netbeans069.htm | 2 +-
.../modules/usersguide/f1_working_netbeans070.htm | 2 +-
.../modules/usersguide/f1_working_netbeans071.htm | 2 +-
.../modules/usersguide/f1_working_netbeans072.htm | 38 +-
.../modules/usersguide/f1_working_netbeans073.htm | 2 +-
.../modules/usersguide/f1_working_netbeans074.htm | 2 +-
.../modules/usersguide/f1_working_netbeans075.htm | 2 +-
.../modules/usersguide/f1_working_netbeans076.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_xml.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_xml001.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_xml002.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_xml003.htm | 2 +-
.../org/netbeans/modules/usersguide/f1_xml004.htm | 2 +-
.../netbeans/modules/usersguide/prefacehelp.htm | 2 +-
.../org/netbeans/modules/usersguide/titlehelp.htm | 32 +-
.../versioning/VCSFilesystemTestFactory.java | 7 +-
.../modules/versioning/util/TemplateSelector.java | 3 +-
.../browser/ui/resources/browser_chrome_16x.png | Bin 847 -> 906 bytes
.../browser/ui/resources/browser_chrome_24x.png | Bin 4119 -> 1493 bytes
.../browser/ui/resources/browser_chromium_16x.png | Bin 847 -> 919 bytes
.../browser/ui/resources/browser_chromium_24x.png | Bin 4119 -> 1537 bytes
.../web/browser/ui/resources/browser_edge_16x.png | Bin 847 -> 1830 bytes
.../web/browser/ui/resources/browser_edge_24x.png | Bin 4119 -> 1099 bytes
.../browser/ui/resources/browser_firefox_16x.png | Bin 847 -> 985 bytes
.../browser/ui/resources/browser_firefox_24x.png | Bin 4119 -> 1889 bytes
.../web/browser/ui/resources/browser_ie_16x.png | Bin 847 -> 982 bytes
.../web/browser/ui/resources/browser_ie_24x.png | Bin 4119 -> 1824 bytes
.../web/browser/ui/resources/browser_opera_16x.png | Bin 847 -> 794 bytes
.../web/browser/ui/resources/browser_opera_24x.png | Bin 4119 -> 1381 bytes
.../browser/ui/resources/browser_safari_16x.png | Bin 847 -> 866 bytes
.../browser/ui/resources/browser_safari_24x.png | Bin 4119 -> 1770 bytes
.../netbeans/modules/web/common/api/WebServer.java | 6 +-
.../org/netbeans/modules/web/common/api/mime.types | 17 +
.../modules/web/common/api/WebServerTest.java | 9 +
web.common/web.common.webloc | 8 -
.../modules/web/webkit/debugging/api/css/CSS.java | 20 +-
.../css/{Longhands.txt => Longhands.properties} | 16 +
.../web/webkit/debugging/api/css/CSSTest.java | 95 ++
websvc.jaxws21/external/binaries-list | 2 +-
websvc.jaxws21/external/jaxws-2.2.6-license.txt | 1052 ++++++------------
websvc.jaxws21/nbproject/project.properties | 2 +-
.../external/jaxws-2.2.6-api-license.txt | 1037 ++++++------------
websvc.saas.api/build.xml | 4 -
websvc.saas.api/external/binaries-list | 17 -
.../modules/websvc/saas/model/wadl20061109.xsd | 289 +++++
.../modules/websvc/saas/model/wadl200902.xsd | 312 ++++++
.../saas/codegen/java/resources/apikey.properties | 20 +
.../codegen/java/resources/httpbasic.properties | 20 +
.../codegen/java/resources/sessionkey.properties | 20 +
.../codegen/java/resources/signedurl.properties | 20 +
xml.jaxb.api/external/activation-1.1.1-license.txt | 354 ++++++
xml.jaxb.api/external/jaxb-2.2.6-license.txt | 722 -------------
xml.jaxb.api/external/jaxb-api-2.2.6-license.txt | 354 ++++++
.../xml/schema/model/SchemaModelReference.java | 3 +-
.../wsdl/validator/spi/ValidatorSchemaFactory.java | 3 +-
.../modules/xml/wsdl/model/TestCatalogModel.java | 5 +-
1229 files changed, 11655 insertions(+), 11080 deletions(-)
diff --cc lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBJavadocMemberEnter.java
index 1c4f9d3,eddc66d..c15d91c
--- a/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBJavadocMemberEnter.java
+++ b/lib.nbjavac/src/org/netbeans/lib/nbjavac/services/NBJavadocMemberEnter.java
@@@ -68,15 -66,12 +68,18 @@@ public class NBJavadocMemberEnter exten
@Override
public void visitMethodDef(JCMethodDecl tree) {
cancelService.abortIfCanceled();
- super.visitMethodDef(tree);
+ JCBlock body = tree.body;
+ try {
+ super.visitMethodDef(tree);
+ } finally {
+ //reinstall body:
+ tree.body = body;
+ }
if (trees instanceof NBJavacTrees && !env.enclClass.defs.contains(tree)) {
- ((NBJavacTrees)trees).addPathForElement(tree.sym, new TreePath(trees.getPath(env.toplevel, env.enclClass), tree));
+ TreePath path = trees.getPath(env.toplevel, env.enclClass);
+ if (path != null) {
+ ((NBJavacTrees)trees).addPathForElement(tree.sym, new TreePath(path, tree));
+ }
}
}
diff --cc nbbuild/external/binaries-list
index 7335f3b,b6035a5..3a0989f
--- a/nbbuild/external/binaries-list
+++ b/nbbuild/external/binaries-list
@@@ -15,6 -15,4 +15,5 @@@
# specific language governing permissions and limitations
# under the License.
A7674A6D78B7FEA58AF76B357DAE6EA5E3FDFBE9 apitest.jar
- 88CADDFC6785B6B7B7E65C9DC80C03958EBAEE73 nbbuild-xhtml1-dtds-resources.zip
+071355012BD9E174619F838E72F1869277E24B69 nb-javac-impl.jar
16398550402B27F81CD0D508CEF54B3E47A4A6DA org.apache.rat:apache-rat:0.12
diff --cc nbbuild/licenses/names.properties
index 90a89e9,2b83358..ccd1fe8
--- a/nbbuild/licenses/names.properties
+++ b/nbbuild/licenses/names.properties
@@@ -25,4 -39,10 +39,11 @@@ EPL-v10-h2=Eclipse Public License v1, h
LGPL-2.1=LGPLv2.1 (https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html)
INRIA=BSD license with INRIA headers
CDDL-GPL-2-CP=Dual license consisting of the CDDL v1.1 and GPL v2 with Classpath exception
+Apache-2.0+BSD-INRIA=Apache Version 2.0 and BSD license with INRIA copyright
+ MIT-jvyamlb=MIT license jvyamlb variant
+ HTML5DOC=HTML5DOC license
+ MIT-html5-parser=MIT license html5 parser variant
+ MIT-icu4j=MIT license icu4j variant
+ MIT-isorelax=MIT license isorelax variant
+ MIT-validator=MIT license validator variant
+ MPL-1.0=MPL 1.0 license
--
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.