diff options
author | Alexander Kurtakov | 2019-02-14 17:08:06 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2019-02-14 19:48:01 +0000 |
commit | fe3657653eca42e6987aa004bbc3f755182e5fa3 (patch) | |
tree | add7cba3c1ac9dd416df8502c72b36670c329ab8 | |
parent | 62fc3654f006efe853d94423fe71e7b37a0d8829 (diff) | |
download | rt.equinox.bundles-fe3657653eca42e6987aa004bbc3f755182e5fa3.tar.gz rt.equinox.bundles-fe3657653eca42e6987aa004bbc3f755182e5fa3.tar.xz rt.equinox.bundles-fe3657653eca42e6987aa004bbc3f755182e5fa3.zip |
Bug 543933 - Build javadocs with Java 11I20190215-0630I20190215-0055I20190214-1800
Fix warnings as catched by Java 11 tool. Round 2.
Change-Id: Ib7b1b4eca04384245a06f90bcb72c531faef3513
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
23 files changed, 32 insertions, 39 deletions
diff --git a/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF index 77bb02b5f..2215eee1c 100644 --- a/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.app/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.app; singleton:=true -Bundle-Version: 1.4.0.qualifier +Bundle-Version: 1.4.100.qualifier Bundle-Vendor: %providerName Bundle-Activator: org.eclipse.equinox.internal.app.Activator Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.app/pom.xml b/bundles/org.eclipse.equinox.app/pom.xml index 333b97ce2..10b4a6cb4 100644 --- a/bundles/org.eclipse.equinox.app/pom.xml +++ b/bundles/org.eclipse.equinox.app/pom.xml @@ -19,7 +19,7 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.app</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.100-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> <plugins> diff --git a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/app/package.html b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/app/package.html index 992e013f3..2430de981 100644 --- a/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/app/package.html +++ b/bundles/org.eclipse.equinox.app/src/org/eclipse/equinox/app/package.html @@ -10,8 +10,7 @@ Provides core support for Eclipse application model. Package Specification</h2> <p> This package specifies API for defining Eclipse applications. -<p> +</p> @since 1.0 -<p> </body> </html> diff --git a/bundles/org.eclipse.equinox.bidi/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.bidi/META-INF/MANIFEST.MF index 6001950e5..5effeb633 100644 --- a/bundles/org.eclipse.equinox.bidi/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.bidi/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.equinox.bidi;singleton:=true -Bundle-Version: 1.1.200.qualifier +Bundle-Version: 1.1.300.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-ActivationPolicy: lazy diff --git a/bundles/org.eclipse.equinox.bidi/pom.xml b/bundles/org.eclipse.equinox.bidi/pom.xml index f57abca4e..86d3bda7a 100644 --- a/bundles/org.eclipse.equinox.bidi/pom.xml +++ b/bundles/org.eclipse.equinox.bidi/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.bidi</artifactId> - <version>1.1.200-SNAPSHOT</version> + <version>1.1.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/StructuredTextProcessor.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/StructuredTextProcessor.java index 1bb3a82a6..718fb11d1 100644 --- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/StructuredTextProcessor.java +++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/StructuredTextProcessor.java @@ -23,7 +23,7 @@ import org.eclipse.equinox.bidi.custom.StructuredTextTypeHandler; * ensure correct presentation, or to remove those characters to * restore the original text * (for more explanations, please see the - * {@link org.eclipse.equinox.bidi package documentation</a>}. + * {@link org.eclipse.equinox.bidi package documentation}. * <p> * This class can be used without OSGi running (but only the structured text types declared * in {@link StructuredTextTypeHandlerFactory} are available in that mode). diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/IStructuredTextExpert.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/IStructuredTextExpert.java index 4a94e7d0f..f5d628042 100644 --- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/IStructuredTextExpert.java +++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/advanced/IStructuredTextExpert.java @@ -19,11 +19,11 @@ import org.eclipse.equinox.bidi.custom.StructuredTextTypeHandler; * Provides advanced methods for processing bidirectional text with * a specific structure to ensure proper presentation. * For a general introduction to structured text, see the - * {@link <a href="../package-summary.html">org.eclipse.equinox.bidi - * package documentation</a>}. + * {@link org.eclipse.equinox.bidi + * package documentation}. * For details about when the advanced methods are needed, see - * {@link <a href="package-summary.html">this - * package documentation</a>}. + * {@link org.eclipse.equinox.bidi.advanced this + * package documentation}. * <p> * Identifiers for several common handlers are included in * {@link org.eclipse.equinox.bidi.StructuredTextTypeHandlerFactory}. For handlers @@ -63,17 +63,17 @@ import org.eclipse.equinox.bidi.custom.StructuredTextTypeHandler; * </p><p> * The following code shows how to transform a certain type of structured text * (directory and file paths) in order to obtain the <i>full</i> - * text corresponding to the given <i>lean</i> text. + * text corresponding to the given <i>lean</i> text.</p> * <pre> * IStructuredTextExpert expert = StructuredTextExpertFactory.getExpert(StructuredTextTypeHandlerFactory.FILE); * String leanText = "D:\\\u05d0\u05d1\\\u05d2\\\u05d3.ext"; * String fullText = expert.leanToFullText(leanText); * System.out.println("full text = " + fullText); * </pre> - * </p><p> + * <p> * The following code shows how to transform successive lines of Java * code in order to obtain the <i>full</i> - * text corresponding to the <i>lean</i> text of each line. + * text corresponding to the <i>lean</i> text of each line.</p> * <pre> * IStructuredTextExpert expert = StructuredTextExpertFactory.getStatefulExpert(StructuredTextTypeHandlerFactory.JAVA); * String leanText = "int i = 3; // first Java statement"; @@ -83,7 +83,7 @@ import org.eclipse.equinox.bidi.custom.StructuredTextTypeHandler; * fullText = expert.leanToFullText(leanText,); * System.out.println("full text = " + fullText); * </pre> - * </p> + * */ public interface IStructuredTextExpert { diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubProgressMonitor.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubProgressMonitor.java index 14bb2741c..748c5370f 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubProgressMonitor.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubProgressMonitor.java @@ -135,7 +135,7 @@ public class SubProgressMonitor extends ProgressMonitorWrapper { * progress monitor, the given name will NOT be used to update * the progress bar's main task label. That means the given * string will be ignored. If style <code>PREPEND_MAIN_LABEL_TO_SUBTASK - * <code> is specified, then the given string will be prepended to + * </code> is specified, then the given string will be prepended to * every string passed to <code>subTask(String)</code>. */ @Override diff --git a/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/package.html b/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/package.html index e3ea751dc..a3c72056b 100644 --- a/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/package.html +++ b/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/package.html @@ -10,8 +10,7 @@ Provides core support for the Jetty-based Http Service. Package Specification</h2> <p> This package specifies API for configuring an instance of the Jetty-based Http Service. -<p> +</p> @since 1.0 -<p> </body> </html> diff --git a/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF index 462e3d427..072b75b13 100644 --- a/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.http.registry/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.equinox.http.registry;singleton:=true -Bundle-Version: 1.1.600.qualifier +Bundle-Version: 1.1.700.qualifier Bundle-Activator: org.eclipse.equinox.http.registry.internal.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.equinox.common, diff --git a/bundles/org.eclipse.equinox.http.registry/pom.xml b/bundles/org.eclipse.equinox.http.registry/pom.xml index 0cbfbc695..4e72ca1ca 100644 --- a/bundles/org.eclipse.equinox.http.registry/pom.xml +++ b/bundles/org.eclipse.equinox.http.registry/pom.xml @@ -19,7 +19,7 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.http.registry</artifactId> - <version>1.1.600-SNAPSHOT</version> + <version>1.1.700-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build> diff --git a/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/package.html b/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/package.html index cc6009969..435084394 100644 --- a/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/package.html +++ b/bundles/org.eclipse.equinox.http.registry/src/org/eclipse/equinox/http/registry/package.html @@ -10,8 +10,7 @@ Provides core support for the Http Registry. Package Specification</h2> <p> This package specifies API for working with the extension points provided by the Http Registry. -<p> +</p> @since 1.0 -<p> </body> </html> diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/package.html b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/package.html index f377dac4d..757b3d2e9 100644 --- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/package.html +++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/package.html @@ -10,8 +10,7 @@ Provides core support for the Jsp Jasper Registry. Package Specification</h2> <p> This package specifies API for working with and creating a Jsp Servlet tyhat canbe used in conjunction with the "servlets" extension point in org.eclipse.equinox.http.registry. -<p> +</p> @since 1.0 -<p> </body> </html> diff --git a/bundles/org.eclipse.equinox.jsp.jasper.registry/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.jsp.jasper.registry/META-INF/MANIFEST.MF index e20ecd282..95552c956 100644 --- a/bundles/org.eclipse.equinox.jsp.jasper.registry/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.jsp.jasper.registry/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %bundleName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.equinox.jsp.jasper.registry -Bundle-Version: 1.1.100.qualifier +Bundle-Version: 1.1.200.qualifier Bundle-Activator: org.eclipse.equinox.internal.jsp.jasper.registry.Activator Import-Package: org.eclipse.equinox.jsp.jasper, org.osgi.framework;version="1.3.0", diff --git a/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml b/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml index eb50fd66f..b24fb9e68 100644 --- a/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml +++ b/bundles/org.eclipse.equinox.jsp.jasper.registry/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.jsp.jasper.registry</artifactId> - <version>1.1.100-SNAPSHOT</version> + <version>1.1.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.jsp.jasper.registry/src/org/eclipse/equinox/jsp/jasper/registry/package.html b/bundles/org.eclipse.equinox.jsp.jasper.registry/src/org/eclipse/equinox/jsp/jasper/registry/package.html index 355531824..22220e926 100644 --- a/bundles/org.eclipse.equinox.jsp.jasper.registry/src/org/eclipse/equinox/jsp/jasper/registry/package.html +++ b/bundles/org.eclipse.equinox.jsp.jasper.registry/src/org/eclipse/equinox/jsp/jasper/registry/package.html @@ -10,8 +10,7 @@ Provides core support for the HttpService Servlet. Package Specification</h2> <p> This package specifies API for working with the HttpService Servlet. -<p> +</p> @since 1.0 -<p> </body> </html> diff --git a/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF index 329f4915e..632ef22bc 100644 --- a/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.jsp.jasper/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %bundleName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.equinox.jsp.jasper -Bundle-Version: 1.1.100.qualifier +Bundle-Version: 1.1.200.qualifier Bundle-Activator: org.eclipse.equinox.internal.jsp.jasper.Activator Import-Package: javax.servlet;version="[2.4, 5.0)", javax.servlet.annotation;version="[2.6, 5.0)";resolution:=optional, diff --git a/bundles/org.eclipse.equinox.jsp.jasper/pom.xml b/bundles/org.eclipse.equinox.jsp.jasper/pom.xml index 781d271da..152a34eb6 100644 --- a/bundles/org.eclipse.equinox.jsp.jasper/pom.xml +++ b/bundles/org.eclipse.equinox.jsp.jasper/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.jsp.jasper</artifactId> - <version>1.1.100-SNAPSHOT</version> + <version>1.1.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java b/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java index 7da2df82f..3f85dd9a9 100644 --- a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java +++ b/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/JspServlet.java @@ -57,12 +57,12 @@ import org.osgi.framework.Bundle; * </p> * <p> * TLD discovery is slightly different, to clarify it occurs in one of three ways: + * </p> * <ol> * <li> declarations found in /WEB-INF/web.xml (found either on the bundleResourcePath in the bundle or in the ServletContext)</li> * <li> tld files found under /WEB-INF (found either on the bundleResourcePath in the bundle or in the ServletContext)</li> * <li> tld files found in jars on the Bundle-Classpath (see org.eclipse.equinox.internal.jsp.jasper.JSPClassLoader)</li> * </ol> - * </p> * <p> * Other than the setting and resetting of the thread context classloader and additional resource lookups in the bundle the JSPServlet * is behaviourally consistent with the JSP 2.0 specification and regular Jasper operation. diff --git a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/package.html b/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/package.html index 355531824..22220e926 100644 --- a/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/package.html +++ b/bundles/org.eclipse.equinox.jsp.jasper/src/org/eclipse/equinox/jsp/jasper/package.html @@ -10,8 +10,7 @@ Provides core support for the HttpService Servlet. Package Specification</h2> <p> This package specifies API for working with the HttpService Servlet. -<p> +</p> @since 1.0 -<p> </body> </html> diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/package.html b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/package.html index 7c88d888b..eadb3218a 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/package.html +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/package.html @@ -10,8 +10,7 @@ Provides core support for Eclipse preferences. Package Specification</h2> <p> This package specifies API for defining and accessing preferences in the runtime. -<p> +</p> @since 3.0 -<p> </body> </html> diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryStrategy.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryStrategy.java index 699b74307..aa43b3413 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryStrategy.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryStrategy.java @@ -234,9 +234,9 @@ public class RegistryStrategy { /** * Override this method to customize scheduling of an extension registry event. Note that this method * <strong>must</strong> make the following call to actually process the event: - * <p><pre><code> + * <pre><code> * RegistryStrategy.processChangeEvent(listeners, deltas, registry); - * </code></pre></p><p> + * </code></pre><p> * In the default implementation, the method registry events are executed in a queue * on a separate thread (i.e. asynchronously, sequentially). * </p> diff --git a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/security/storage/ISecurePreferences.java b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/security/storage/ISecurePreferences.java index 8c369e540..97f1a2d3f 100644 --- a/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/security/storage/ISecurePreferences.java +++ b/bundles/org.eclipse.equinox.security/src/org/eclipse/equinox/security/storage/ISecurePreferences.java @@ -38,7 +38,7 @@ import java.io.IOException; * node.put("password", myPassword, true); * </pre> * <p> - * This interface has the following differences from the {@link org.osgi.service.prefs.Preferences}: + * This interface has the following differences from the {@link org.osgi.service.prefs.Preferences}:</p> * <ul> * <li>get...() and put...() methods throw StorageException</li> * <li>put...() methods have an extra argument bEncrypt</li> @@ -47,7 +47,7 @@ import java.io.IOException; * <li>flush() throws IOException</li> * <li>sync() method is removed</li> * </ul> - * </p><p> + * <p> * On the keyring side, when adding a key to the node, you can ask framework to encrypt it. Framework * will lazily acquire password from password provider and use it to encrypt all new entries added * to the secure preferences tree in this session. |