Merge pull request #4397 from ebarboni/fixapi100doc
attemp to fix javadoc for release100
diff --git a/java/maven/arch.xml b/java/maven/arch.xml
index b4169e7..5846bc5 100644
--- a/java/maven/arch.xml
+++ b/java/maven/arch.xml
@@ -265,7 +265,7 @@
One can define following code in nbactions.xml file to start
a process during goal execution and attach a debugger to it
once the execution is over. Here is an example using
- <a onclick="target='_blank'" href="https://github.com/simpligility/android-maven-plugin/pull/584">enhancement</a>
+ <a href="https://github.com/simpligility/android-maven-plugin/pull/584">enhancement</a>
in the Maven Android plugin:
</p>
<pre>
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/CheckLinks.java b/nbbuild/antsrc/org/netbeans/nbbuild/CheckLinks.java
index d0bbc40..4f55bbf 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/CheckLinks.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/CheckLinks.java
@@ -132,7 +132,7 @@
JUnitReportWriter.writeReport(this, null, report, Collections.singletonMap("testBrokenLinks", testMessage));
}
- private static Pattern hrefOrAnchor = Pattern.compile("<(a|img|link)(\\s+shape=\"rect\")?(?:\\s+rel=\"stylesheet\")?\\s+(href|name|src)=\"([^\"#]*)(#[^\"]+)?\"(\\s+shape=\"rect\")?(?:\\s+type=\"text/css\")?\\s*/?>", Pattern.CASE_INSENSITIVE);
+ private static Pattern hrefOrAnchor = Pattern.compile("<(a|img|link|h3)(\\s+shape=\"rect\")?(?:\\s+rel=\"stylesheet\")?\\s+(href|name|id|src)=\"([^\"#]*)(#[^\"]+)?\"(\\s+shape=\"rect\")?(?:\\s+type=\"text/css\")?\\s*/?>", Pattern.CASE_INSENSITIVE);
private static Pattern lineBreak = Pattern.compile("^", Pattern.MULTILINE);
/**
@@ -459,7 +459,7 @@
while (m.find()) {
// Get the stuff involved:
String type = m.group(3);
- if (type.equalsIgnoreCase("name")) {
+ if (type.equalsIgnoreCase("name") || (type.equalsIgnoreCase("id") && !unescape(m.group(4)).startsWith("#"))) {
// We have an anchor, therefore refs to it are valid.
String name = unescape(m.group(4));
if (names.add(name)) {
diff --git a/nbbuild/build.properties b/nbbuild/build.properties
index 2761bd9..b517027 100644
--- a/nbbuild/build.properties
+++ b/nbbuild/build.properties
@@ -152,7 +152,14 @@
print,\
extexecution,\
lib.uihandler,\
- uihandler
+ uihandler,\
+ openide.options,\
+ editor,\
+ editor.lib,\
+ editor.indent,\
+ editor.indent.support,\
+ editor.bracesmatching,\
+ editor.util
#FIXME: changes for retouche merge:
# editor/codetemplates,\
diff --git a/platform/api.htmlui/apichanges.xml b/platform/api.htmlui/apichanges.xml
index 268aabb..6f9f0f1 100644
--- a/platform/api.htmlui/apichanges.xml
+++ b/platform/api.htmlui/apichanges.xml
@@ -57,7 +57,7 @@
<compatibility addition="yes" binary="compatible" source="compatible"/>
<description>
<p>
- The <a onclick="target='_blank'" href="http://bits.netbeans.org/html+java/">
+ The <a href="https://bits.netbeans.org/html+java/dev">
HTML UI API for Java
</a>
revision 1.1 supports technolgy identifiers. Now they can
@@ -78,7 +78,7 @@
<compatibility addition="yes" binary="compatible" source="compatible"/>
<description>
<p>
- The <a onclick="target='_blank'" href="http://bits.netbeans.org/html+java/">
+ The <a href="https://bits.netbeans.org/html+java/dev">
HTML UI API for Java
</a>
and NetBeans has been included
diff --git a/platform/api.htmlui/arch.xml b/platform/api.htmlui/arch.xml
index 344e06a..06bd506 100644
--- a/platform/api.htmlui/arch.xml
+++ b/platform/api.htmlui/arch.xml
@@ -35,7 +35,7 @@
<p>
<api name="HTMLUI" category="official" group="java" type="export">
NetBeans Platform specific bindings over
- standard <a href="http://bits.netbeans.org/html+java/" onclick="target='_blank'">HTML for Java</a> API.
+ standard <a href="https://bits.netbeans.org/html+java/dev/" >HTML for Java</a> API.
</api>
</p>
</answer>
@@ -58,7 +58,7 @@
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
- <a onclick="target='_blank'" href="http://bits.netbeans.org/html+java/">HTML for Java</a> API.
+ <a href="https://bits.netbeans.org/html+java/dev/">HTML for Java</a> API.
</p>
<usecase id="window" name="Portable HTML based Window">
<a name="use-window"></a>
@@ -110,7 +110,7 @@
<answer id="arch-what">
<p>
NetBeans Platform specific bindings over
- standard <a onclick="target='_blank'" href="http://bits.netbeans.org/html+java/">HTML for Java</a> API.
+ standard <a href="https://bits.netbeans.org/html+java/dev/">HTML for Java</a> API.
</p>
</answer>
@@ -337,11 +337,11 @@
<p>
The HTML for Java & NetBeans API is a classical NetBeans module. However
it depends on other modules provided by the
- <a onclick="target='_blank'" href="http://bits.netbeans.org/html+java/">HTML for Java</a>
+ <a href="https://bits.netbeans.org/html+java/dev/">HTML for Java</a>
project and those are OSGi bundles. As such, when one decides to use this
module, one needs to turn on an OSGi container inside of the NetBeans Platform.
- It can be either <a onclick="target='_blank'" href="http://felix.apache.org">Felix</a> or
- NetBeans version of <a onclick="target='_blank'" href="http://wiki.apidesign.org/wiki/Netbinox">Equinox</a>.
+ It can be either <a href="http://felix.apache.org">Felix</a> or
+ NetBeans version of <a href="http://wiki.apidesign.org/wiki/Netbinox">Equinox</a>.
</p>
</answer>
diff --git a/platform/api.templates/apichanges.xml b/platform/api.templates/apichanges.xml
index 448b78e..47393f6 100644
--- a/platform/api.templates/apichanges.xml
+++ b/platform/api.templates/apichanges.xml
@@ -87,7 +87,7 @@
<compatibility addition="yes" binary="compatible" source="compatible"/>
<description>
<p>
- The <a onclick="target='_blank'" href="http://bits.netbeans.org/html+java/">
+ The <a href="https://bits.netbeans.org/html+java/dev">
HTML UI API for Java
</a>
revision 1.1 supports technolgy identifiers. Now they can
diff --git a/platform/api.templates/arch.xml b/platform/api.templates/arch.xml
index 25d0e3a..c5d93a0 100644
--- a/platform/api.templates/arch.xml
+++ b/platform/api.templates/arch.xml
@@ -339,8 +339,8 @@
way to rewrite the <a href="#html-and-js">HTML and JavaScript sample</a>
to <b>Java</b>
(and possibly run it in a plugin-less browser via
- <a onclick="target='_blank'" href="http://bck2brwsr.apidesign.org">bck2brwsr VM</a>). Keep the
- same HTML, <a onclick="target='_blank'" href="http://freemarker.org/">Freemarker</a>, etc.
+ <a href="http://bck2brwsr.apidesign.org">bck2brwsr VM</a>). Keep the
+ same HTML, <a href="http://freemarker.org/">Freemarker</a>, etc.
files - just instead of encoding the logic in JavaScript use Java:
</p>
<pre>
@@ -374,9 +374,9 @@
</pre>
<p>
The return value of the annotated method is now an
- <a onclick="target='_blank'" href="http://bits.netbeans.org/html+java/">HTML/Java</a>
+ <a href="https://bits.netbeans.org/html+java/dev">HTML/Java</a>
model class which can naturally represent the essential
- <a onclick="target='_blank'" href="http://knockoutjs.com">Knockout.js</a> objects
+ <a href="http://knockoutjs.com">Knockout.js</a> objects
in Java.
</p>
</usecase>
diff --git a/platform/openide.awt/arch.xml b/platform/openide.awt/arch.xml
index 393f547..4ed3cde 100644
--- a/platform/openide.awt/arch.xml
+++ b/platform/openide.awt/arch.xml
@@ -111,14 +111,14 @@
-->
<answer id="arch-usecases">
<p>
- <a onclick="target='_blank'" href="https://leanpub.com/nbp4beginners">
+ <a href="https://leanpub.com/nbp4beginners">
<img src="http://wiki.apidesign.org/images/0/03/NetBeansPlatformForBeginners.jpg"
style="float: right"
width="60" height="70" alt="Cover of NetBeans Platform for Beginners book"/>
</a>
For general overview of the concepts of NetBeans action system and related UI elements,
together with code samples, see chapter 5,
- of <a onclick="target='_blank'" href="https://leanpub.com/nbp4beginners">NetBeans Platform for Beginners</a>
+ of <a href="https://leanpub.com/nbp4beginners">NetBeans Platform for Beginners</a>
by Jason Wexbridge and Walter Nyland.
</p>
</answer>
diff --git a/platform/openide.awt/src/org/openide/awt/awt/ActionState.java b/platform/openide.awt/src/org/openide/awt/ActionState.java
similarity index 100%
rename from platform/openide.awt/src/org/openide/awt/awt/ActionState.java
rename to platform/openide.awt/src/org/openide/awt/ActionState.java
diff --git a/platform/openide.awt/src/org/openide/awt/awt/PropertyMonitor.java b/platform/openide.awt/src/org/openide/awt/PropertyMonitor.java
similarity index 100%
rename from platform/openide.awt/src/org/openide/awt/awt/PropertyMonitor.java
rename to platform/openide.awt/src/org/openide/awt/PropertyMonitor.java
diff --git a/platform/openide.awt/src/org/openide/awt/awt/StatefulAction.java b/platform/openide.awt/src/org/openide/awt/StatefulAction.java
similarity index 100%
rename from platform/openide.awt/src/org/openide/awt/awt/StatefulAction.java
rename to platform/openide.awt/src/org/openide/awt/StatefulAction.java
diff --git a/platform/openide.explorer/arch.xml b/platform/openide.explorer/arch.xml
index c3baad4..6fae6fe 100644
--- a/platform/openide.explorer/arch.xml
+++ b/platform/openide.explorer/arch.xml
@@ -67,14 +67,14 @@
<answer id="arch-usecases">
<p>
- <a onclick="target='_blank'" href="https://leanpub.com/nbp4beginners">
+ <a href="https://leanpub.com/nbp4beginners">
<img src="http://wiki.apidesign.org/images/0/03/NetBeansPlatformForBeginners.jpg"
style="float: right"
width="60" height="70" alt="Cover of NetBeans Platform for Beginners book"/>
</a>
For general overview of the concepts related to <a href="@org-openide-nodes@/overview-summary.html">nodes</a> and explorers,
together with code samples, see chapter 7,
- of <a onclick="target='_blank'" href="https://leanpub.com/nbp4beginners">NetBeans Platform for Beginners</a>
+ of <a href="https://leanpub.com/nbp4beginners">NetBeans Platform for Beginners</a>
by Jason Wexbridge and Walter Nyland.
</p>
</answer>
diff --git a/platform/openide.filesystems/arch.xml b/platform/openide.filesystems/arch.xml
index 2907d75..ca07ec8 100644
--- a/platform/openide.filesystems/arch.xml
+++ b/platform/openide.filesystems/arch.xml
@@ -857,14 +857,14 @@
-->
<answer id="arch-usecases">
<p>
- <a onclick="target='_blank'" href="https://leanpub.com/nbp4beginners">
+ <a href="https://leanpub.com/nbp4beginners">
<img src="http://wiki.apidesign.org/images/0/03/NetBeansPlatformForBeginners.jpg"
style="float: right"
width="60" height="70" alt="Cover of NetBeans Platform for Beginners book"/>
</a>
For general overview of the filesystem concepts, related topics,
together with code samples, see chapter 3,
- of <a onclick="target='_blank'" href="https://leanpub.com/nbp4beginners">NetBeans Platform for Beginners</a>
+ of <a href="https://leanpub.com/nbp4beginners">NetBeans Platform for Beginners</a>
by Jason Wexbridge and Walter Nyland.
Many of the usecases are described at the
<a href="@TOP@/org/openide/filesystems/doc-files/api.html">overall documentation</a>,
diff --git a/platform/openide.modules/arch.xml b/platform/openide.modules/arch.xml
index e7d7991..2a7cf9f 100644
--- a/platform/openide.modules/arch.xml
+++ b/platform/openide.modules/arch.xml
@@ -48,14 +48,14 @@
</answer>
<answer id="arch-usecases">
- <a onclick="target='_blank'" href="https://leanpub.com/nbp4beginners">
+ <a href="https://leanpub.com/nbp4beginners">
<img src="http://wiki.apidesign.org/images/0/03/NetBeansPlatformForBeginners.jpg"
style="float: right"
width="60" height="70" alt="Cover of NetBeans Platform for Beginners book"/>
</a>
For general overview of the concepts,
together with code samples, see chapter 2,
- of <a onclick="target='_blank'" href="https://leanpub.com/nbp4beginners">NetBeans Platform for Beginners</a>
+ of <a href="https://leanpub.com/nbp4beginners">NetBeans Platform for Beginners</a>
by Jason Wexbridge and Walter Nyland.
Gory technical details are explained on <a href="@TOP@/org/openide/modules/doc-files/api.html">
diff --git a/platform/openide.modules/src/org/openide/modules/ConstructorDelegate.java b/platform/openide.modules/src/org/openide/modules/ConstructorDelegate.java
index 2dca461..a058949 100644
--- a/platform/openide.modules/src/org/openide/modules/ConstructorDelegate.java
+++ b/platform/openide.modules/src/org/openide/modules/ConstructorDelegate.java
@@ -99,7 +99,7 @@
* order specified by the invoked constructor signature.
* Each item is a zero-based parameter position in the static creation method signature.
* Order and type of the referenced parameters must match the target constructor signature.
- * @return
+ * @return array of positions
*/
public int[] delegateParams() default -1;
}
diff --git a/platform/openide.modules/src/org/openide/modules/Places.java b/platform/openide.modules/src/org/openide/modules/Places.java
index 6b58d3b..1ecf8bf 100644
--- a/platform/openide.modules/src/org/openide/modules/Places.java
+++ b/platform/openide.modules/src/org/openide/modules/Places.java
@@ -45,7 +45,7 @@
* This may be used to persist valuable files for which the system filesystem
* ({@code FileUtil.getConfigFile}) is inappropriate due its being virtual.
* Each module is responsible for using sufficiently unique filenames within this directory.
- * The system property {@link #USER_DIR_PROP} is used for compatibility.
+ * The system property #USER_DIR_PROP is used for compatibility.
* @return a directory location (need not yet exist), or null if unconfigured
*/
public static synchronized /*@CheckForNull*/ File getUserDirectory() {
@@ -116,7 +116,8 @@
/** Constructor for those who believe to know
* where {@link #getCacheDirectory} or
* {@link #getUserDirectory()} is. Register your subclass via
- * {@link ServiceProvider} annotation.
+ * <a href="@org-openide-util-lookup@/org/openide/util/ServiceProvider.html">
+ * {@code @ServiceProvider}</a>@ServiceProvider annotation.
*/
protected Places() {
}
diff --git a/platform/openide.nodes/arch.xml b/platform/openide.nodes/arch.xml
index 74201c5..a68e5b7 100644
--- a/platform/openide.nodes/arch.xml
+++ b/platform/openide.nodes/arch.xml
@@ -55,14 +55,14 @@
<answer id="arch-usecases">
<p>
- <a onclick="target='_blank'" href="https://leanpub.com/nbp4beginners">
+ <a href="https://leanpub.com/nbp4beginners">
<img src="http://wiki.apidesign.org/images/0/03/NetBeansPlatformForBeginners.jpg"
style="float: right"
width="60" height="70" alt="Cover of NetBeans Platform for Beginners book"/>
</a>
For general overview of the concepts related to nodes and <a href="@org-openide-explorer@/overview-summary.html">explorers</a>,
together with code samples, see chapter 7,
- of <a onclick="target='_blank'" href="https://leanpub.com/nbp4beginners">NetBeans Platform for Beginners</a>
+ of <a href="https://leanpub.com/nbp4beginners">NetBeans Platform for Beginners</a>
by Jason Wexbridge and Walter Nyland.
</p>
</answer>
diff --git a/platform/openide.util.lookup/arch.xml b/platform/openide.util.lookup/arch.xml
index 6e50e72..f9b0a9c 100644
--- a/platform/openide.util.lookup/arch.xml
+++ b/platform/openide.util.lookup/arch.xml
@@ -64,7 +64,7 @@
<answer id="arch-usecases">
- <a onclick="target='_blank'" href="https://leanpub.com/nbp4beginners">
+ <a href="https://leanpub.com/nbp4beginners">
<img src="http://wiki.apidesign.org/images/0/03/NetBeansPlatformForBeginners.jpg"
style="float: right"
width="60" height="70" alt="Cover of NetBeans Platform for Beginners book"/>
@@ -74,7 +74,7 @@
<a href="@TOP@/org/openide/util/Lookup.html">javadoc</a>.
For details on this topic,
together with code samples, see chapter 4,
- of <a onclick="target='_blank'" href="https://leanpub.com/nbp4beginners">NetBeans Platform for Beginners</a>
+ of <a href="https://leanpub.com/nbp4beginners">NetBeans Platform for Beginners</a>
by Jason Wexbridge and Walter Nyland.
In addition to that here is
a list of frequently asked or interesting questions slowly expanding as
diff --git a/platform/openide.windows/arch.xml b/platform/openide.windows/arch.xml
index a9e3045..2fb8647 100644
--- a/platform/openide.windows/arch.xml
+++ b/platform/openide.windows/arch.xml
@@ -96,14 +96,14 @@
<answer id="arch-usecases">
<p>
- <a onclick="target='_blank'" href="https://leanpub.com/nbp4beginners">
+ <a href="https://leanpub.com/nbp4beginners">
<img src="http://wiki.apidesign.org/images/0/03/NetBeansPlatformForBeginners.jpg"
style="float: right"
width="60" height="70" alt="Cover of NetBeans Platform for Beginners book"/>
</a>
For general overview of the concepts,
together with code samples, see chapter 6,
- of <a onclick="target='_blank'" href="https://leanpub.com/nbp4beginners">NetBeans Platform for Beginners</a>
+ of <a href="https://leanpub.com/nbp4beginners">NetBeans Platform for Beginners</a>
by Jason Wexbridge and Walter Nyland.
</p>
