diff options
author | Alexander Kurtakov | 2019-02-13 19:55:30 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2019-02-13 20:14:57 +0000 |
commit | 62fc3654f006efe853d94423fe71e7b37a0d8829 (patch) | |
tree | 5c620e7c9e0572efaad55be4ed0cf797a977ad90 | |
parent | eaf4caf2f686c2010003993cc55734efc1a6cb18 (diff) | |
download | rt.equinox.bundles-62fc3654f006efe853d94423fe71e7b37a0d8829.tar.gz rt.equinox.bundles-62fc3654f006efe853d94423fe71e7b37a0d8829.tar.xz rt.equinox.bundles-62fc3654f006efe853d94423fe71e7b37a0d8829.zip |
Bug 543933 - Build javadocs with Java 11Y20190213-2200I20190213-1800
Fix warnings as catched by Java 11 tool.
Change-Id: I90777a1e3aca97ce9854a0fc2dfc809ea427ed94
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
16 files changed, 26 insertions, 23 deletions
diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/Adapters.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/Adapters.java index bae235134..24637ce46 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/Adapters.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/Adapters.java @@ -37,6 +37,7 @@ public class Adapters { * * Otherwise returns null. * + * @param <T> class type to adapt to * @param sourceObject * object to adapt, can be null * @param adapter @@ -99,6 +100,7 @@ public class Adapters { * <p> * See {@link #adapt(Object, Class, boolean)}. * + * @param <T> class type to adapt to * @param sourceObject * object to adapt, can be null * @param adapter diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IAdaptable.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IAdaptable.java index 094999760..43e8333e4 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IAdaptable.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IAdaptable.java @@ -50,6 +50,7 @@ public interface IAdaptable { * rather than invoking it directly. * * @param adapter the adapter class to look up + * @param <T> the class type * @return a object of the given class, * or <code>null</code> if this object does not * have an adapter for the given class diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IAdapterManager.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IAdapterManager.java index 90d9c25b2..39f39e84d 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IAdapterManager.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IAdapterManager.java @@ -32,7 +32,7 @@ package org.eclipse.core.runtime; * <p> * The following code snippet shows how one might register an adapter of type * <code>com.example.acme.Sticky</code> on resources in the workspace. - * <p> + * </p> * * <pre> * IAdapterFactory pr = new IAdapterFactory() { @@ -60,7 +60,7 @@ package org.eclipse.core.runtime; * Platform.getAdapterManager().registerAdapters(pr, IResource.class); * </pre> * - * </p><p> + * <p> * This interface can be used without OSGi running. * </p><p> * This interface is not intended to be implemented by clients. diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IStatus.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IStatus.java index f4653ce31..f7124e134 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IStatus.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/IStatus.java @@ -20,6 +20,7 @@ package org.eclipse.core.runtime; * to provide details of failures (e.g., validation methods). * <p> * A status carries the following information: + * </p> * <ul> * <li> plug-in identifier (required)</li> * <li> severity (required)</li> @@ -28,6 +29,7 @@ package org.eclipse.core.runtime; * <li> exception (optional) - for problems stemming from a failure at * a lower level</li> * </ul> + * <p> * Some status objects, known as multi-statuses, have other status objects * as children. * </p> diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/ListenerList.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/ListenerList.java index f17053f70..83aa5e26b 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/ListenerList.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/ListenerList.java @@ -26,7 +26,7 @@ import java.util.stream.StreamSupport; * to the underlying array data structure for reading, with the trust that they will * not modify the underlying array. * <p> - * <a name="same"></a>A listener list handles the <i>same</i> listener being added + * A listener list handles the <i>same</i> listener being added * multiple times, and tolerates removal of listeners that are the same as other * listeners in the list. For this purpose, listeners can be compared with each other * using either equality or identity, as specified in the list constructor. @@ -37,7 +37,7 @@ import java.util.stream.StreamSupport; * <code>FooListener#eventHappened(Event)</code>, is: * </p> * <pre> -ListenerList<FooListener> fooListeners = new ListenerList<>(); +ListenerList<FooListener> fooListeners = new ListenerList<>(); //... for (FooListener listener : fooListeners) { listener.eventHappened(event); diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/PlatformObject.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/PlatformObject.java index ba7fa3e6b..b53c27402 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/PlatformObject.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/PlatformObject.java @@ -26,13 +26,14 @@ import org.eclipse.core.internal.runtime.AdapterManager; * the {@link IAdaptable} interface and explicitly forwarding * the <code>getAdapter</code> request to an implementation * of the {@link IAdapterManager} service. The method would look like: + * </p> * <pre> * public <T> T getAdapter(Class<T> adapter) { * IAdapterManager manager = ...;//lookup the IAdapterManager service * return manager.getAdapter(this, adapter); * } * </pre> - * </p><p> + * <p> * This class can be used without OSGi running. * </p><p> * Clients may subclass. diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/PluginVersionIdentifier.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/PluginVersionIdentifier.java index 3a6f1fddb..be8daf44e 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/PluginVersionIdentifier.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/PluginVersionIdentifier.java @@ -29,6 +29,7 @@ import org.osgi.framework.Version; * is an uninterpreted string (no whitespace characters allowed). * For example, the following are valid version identifiers * (as strings): + * </p> * <ul> * <li><code>0.0.0</code></li> * <li><code>1.0.127564</code></li> @@ -36,7 +37,6 @@ import org.osgi.framework.Version; * <li><code>1.9</code> (interpreted as <code>1.9.0</code>)</li> * <li><code>3</code> (interpreted as <code>3.0.0</code>)</li> * </ul> - * </p> * <p> * The version identifier can be decomposed into a major, minor, * service level component and qualifier components. A difference diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java index f949859b2..e01ab91e1 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java @@ -38,7 +38,6 @@ import org.eclipse.core.internal.runtime.TracingOptions; * if a called method fails to call done() on the given monitor or fails to consume all the ticks on * the given monitor, the parent will correct the problem after the method returns.</li> * </ul> - * <p></p> * <p><b>USAGE:</b></p> * * <p>When implementing a method that accepts an IProgressMonitor:</p> @@ -49,7 +48,6 @@ import org.eclipse.core.internal.runtime.TracingOptions; * accepts an IProgressMonitor.</li> * </ul> * - * <p></p> * <p><b>Example: Recommended usage</b></p> * * <p>This example demonstrates how the recommended usage of <code>SubMonitor</code> makes it unnecessary to call @@ -79,7 +77,6 @@ import org.eclipse.core.internal.runtime.TracingOptions; * } * </pre> * - * <p></p> * <p><b>Example: Branches</b></p> * * <p>This example demonstrates how to smoothly report progress in situations where some of the work is optional.</p> @@ -118,7 +115,6 @@ import org.eclipse.core.internal.runtime.TracingOptions; * </pre> * * - * <p></p> * <p><b>Example: Loops</b></p> * * <p>This example demonstrates how to report progress in a loop.</p> @@ -143,7 +139,6 @@ import org.eclipse.core.internal.runtime.TracingOptions; * </pre> * * - * <p></p> * <p><b>Example: Infinite progress</b></p> * * <p>This example demonstrates how to report logarithmic progress in situations where the number of ticks diff --git a/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF index 09a3b2884..96d840a56 100644 --- a/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.preferences/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.preferences; singleton:=true -Bundle-Version: 3.7.200.qualifier +Bundle-Version: 3.7.300.qualifier Bundle-Activator: org.eclipse.core.internal.preferences.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.equinox.preferences/pom.xml b/bundles/org.eclipse.equinox.preferences/pom.xml index 0a79c90c6..2ba466a15 100644 --- a/bundles/org.eclipse.equinox.preferences/pom.xml +++ b/bundles/org.eclipse.equinox.preferences/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.preferences</artifactId> - <version>3.7.200-SNAPSHOT</version> + <version>3.7.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IPreferenceNodeVisitor.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IPreferenceNodeVisitor.java index 96456c4fd..0326eb760 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IPreferenceNodeVisitor.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/IPreferenceNodeVisitor.java @@ -19,6 +19,7 @@ import org.osgi.service.prefs.BackingStoreException; * This interface is implemented by objects that visit preference nodes. * <p> * Usage: + * </p> * <pre> * class Visitor implements IPreferenceNodeVisitor { * public boolean visit(IEclipsePreferences node) { @@ -29,7 +30,7 @@ import org.osgi.service.prefs.BackingStoreException; * IEclipsePreferences root = ...; * root.accept(new Visitor()); * </pre> - * </p><p> + * <p> * Clients may implement this interface. * </p> * diff --git a/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF index aa63a0504..676f9dbe2 100644 --- a/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.registry/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.registry;singleton:=true -Bundle-Version: 3.8.200.qualifier +Bundle-Version: 3.8.300.qualifier Bundle-Localization: plugin Export-Package: org.eclipse.core.internal.adapter;x-internal:=true, org.eclipse.core.internal.registry;x-friends:="org.eclipse.core.runtime", diff --git a/bundles/org.eclipse.equinox.registry/pom.xml b/bundles/org.eclipse.equinox.registry/pom.xml index dc556ce6b..b40e664d3 100644 --- a/bundles/org.eclipse.equinox.registry/pom.xml +++ b/bundles/org.eclipse.equinox.registry/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.registry</artifactId> - <version>3.8.200-SNAPSHOT</version> + <version>3.8.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtensionFactory.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtensionFactory.java index 5d8741642..00a6b9d8c 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtensionFactory.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/IExecutableExtensionFactory.java @@ -17,13 +17,14 @@ package org.eclipse.core.runtime; * This interface allows extension providers to control how the instances provided to extension-points are being created * by referring to the factory instead of referring to a class. For example, the following extension to the preference page * extension-point uses a factory called <code>PreferencePageFactory</code>. - * <code><pre> + * <pre><code> * <extension point="org.eclipse.ui.preferencePages"> * <page name="..." class="org.eclipse.update.ui.PreferencePageFactory:org.eclipse.update.ui.preferences.MainPreferencePage"> * </page> * </extension> - * </pre> * </code> + * </pre> + * * * <p> * Effectively, factories give full control over the create executable extension process. diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/RegistryFactory.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/RegistryFactory.java index 0bcb2ce62..6000c4244 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/RegistryFactory.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/RegistryFactory.java @@ -24,11 +24,11 @@ import org.eclipse.core.runtime.spi.RegistryStrategy; * Use this class to create or obtain an extension registry. * <p> * The following methods can be used without OSGi running: - * </p><p><ul> + * </p><ul> * <li>{@link #createRegistry(RegistryStrategy, Object, Object)}</li> * <li>{@link #getRegistry()}</li> * <li>{@link #setDefaultRegistryProvider(IRegistryProvider)}</li> - * </ul></p><p> + * </ul><p> * This class is not intended to be subclassed or instantiated. * </p> * @since org.eclipse.equinox.registry 3.2 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 54c103ec9..699b74307 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 @@ -26,12 +26,12 @@ import org.eclipse.osgi.util.NLS; * and debugging. * <p> * In this strategy: - * </p><p><ul> + * </p><ul> * <li>Logging is done onto <code>System.out</code>;</li> - * <li>The translation routine assumes that keys are prefixed with <code>'%'/<code>;</li> + * <li>The translation routine assumes that keys are prefixed with <code>'%'/</code>;</li> * <li>Caching is enabled and doesn't use state or time stamp validation;</li> * <li>Standard Java class loading is used to create executable extensions.</li> - * </ul></p><p> + * </ul><p> * This class can be used without OSGi running. * </p><p> * This class can be overridden and/or instantiated by clients. |