diff options
author | Alexander Kurtakov | 2019-02-14 22:51:24 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2019-02-14 22:55:39 +0000 |
commit | 578a68df741d6b2ff9b99053b05ae34aa54b7fbd (patch) | |
tree | 7c74d8bdaa3fb7615ac7a4a8cf4d87e1f0369f22 | |
parent | 7470a9c748a4393d8f0da786eba9a2cab0373a91 (diff) | |
download | rt.equinox.framework-578a68df741d6b2ff9b99053b05ae34aa54b7fbd.tar.gz rt.equinox.framework-578a68df741d6b2ff9b99053b05ae34aa54b7fbd.tar.xz rt.equinox.framework-578a68df741d6b2ff9b99053b05ae34aa54b7fbd.zip |
Bug 543933 - Build javadocs with Java 11I20190215-0055
Fix warnings as catched by Java 11 tool.
Change-Id: I7f0625d4674b85f3fa5a9f5e915cdae9310f48bd
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
5 files changed, 48 insertions, 38 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java index 2e9632b79..f58efa436 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/resolver/State.java @@ -13,7 +13,10 @@ *******************************************************************************/ package org.eclipse.osgi.service.resolver; -import java.util.*; +import java.util.Collection; +import java.util.Dictionary; +import java.util.List; +import java.util.Map; import org.osgi.framework.BundleException; import org.osgi.framework.Version; import org.osgi.framework.hooks.resolver.ResolverHookFactory; @@ -117,7 +120,7 @@ public interface State { * version. A null value is returned if no such bundle is found in this state. * A resolved bundle is always preferably returned over an unresolved bundle. * If multiple bundles with the same resolution state are available, the bundle - * with the highest version number is returned if the <code>version<code> is + * with the highest version number is returned if the <code>version</code> is * null. * * @param symbolicName symbolic name of the bundle to query diff --git a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF index 7694dc51d..8c80f7e9a 100644 --- a/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi/supplement/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.supplement -Bundle-Version: 1.8.100.qualifier +Bundle-Version: 1.8.200.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.equinox.log;version="1.0", diff --git a/bundles/org.eclipse.osgi/supplement/pom.xml b/bundles/org.eclipse.osgi/supplement/pom.xml index 0967c78c9..dc58a80a5 100644 --- a/bundles/org.eclipse.osgi/supplement/pom.xml +++ b/bundles/org.eclipse.osgi/supplement/pom.xml @@ -21,7 +21,7 @@ <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.supplement</artifactId> - <version>1.8.100-SNAPSHOT</version> + <version>1.8.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java index becb9fb7e..8a2b22ece 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java @@ -13,9 +13,22 @@ *******************************************************************************/ package org.eclipse.osgi.storagemanager; -import java.io.*; -import java.util.*; -import org.eclipse.osgi.framework.internal.reliablefile.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.SyncFailedException; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import org.eclipse.osgi.framework.internal.reliablefile.ReliableFile; +import org.eclipse.osgi.framework.internal.reliablefile.ReliableFileInputStream; +import org.eclipse.osgi.framework.internal.reliablefile.ReliableFileOutputStream; import org.eclipse.osgi.internal.location.LocationHelper; import org.eclipse.osgi.internal.location.Locker; import org.eclipse.osgi.internal.messages.Msg; @@ -33,7 +46,7 @@ import org.eclipse.osgi.internal.messages.Msg; * Clients can not extend this class * </p> * <p> - * Example + * Example:</p> * <pre> * //Open the storage manager * org.eclipse.osgi.storagemanager.StorageManager cacheStorageManager = new StorageManager("d:/sharedFolder/bar/", false); //$NON-NLS-1$ @@ -65,7 +78,6 @@ import org.eclipse.osgi.internal.messages.Msg; * //Close the file manager at the end * cacheStorageManager.close(); * </pre> - * </p> * <p> * Implementation details <br> * The following implementation details are provided to help with understanding the diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java index 315e892cb..0e1e2e97c 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/ManifestElement.java @@ -14,8 +14,17 @@ package org.eclipse.osgi.util; -import java.io.*; -import java.util.*; +import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; import org.eclipse.osgi.internal.messages.Msg; import org.eclipse.osgi.internal.util.SupplementDebug; import org.eclipse.osgi.internal.util.Tokenizer; @@ -26,7 +35,6 @@ import org.osgi.framework.BundleException; * {@link String} value. The {@link String} value may be split up into component values each * separated by a semi-colon (';'). A manifest element may optionally have a set of * attribute and directive values associated with it. The general syntax of a manifest element is as follows: - * <p> * <pre> * ManifestElement ::= component (';' component)* (';' parameter)* * component ::= ([^;,:="\#x0D#x0A#x00])+ | quoted-string @@ -38,32 +46,27 @@ import org.osgi.framework.BundleException; * token ::= ( alphanum | '_' | '-' )+ * extended ::= ( alphanum | '_' | '-' | '.' )+ * </pre> - * </p> * <p> - * For example, the following is an example of a manifest element to the <tt>Export-Package</tt> header: + * For example, the following is an example of a manifest element to the <code>Export-Package</code> header: * </p> - * <p> * <pre> * org.osgi.framework; specification-version="1.2"; another-attr="examplevalue" * </pre> - * </p> * <p> - * This manifest element has a value of <tt>org.osgi.framework</tt> and it has two attributes, - * <tt>specification-version</tt> and <tt>another-attr</tt>. + * This manifest element has a value of <code>org.osgi.framework</code> and it has two attributes, + * <code>specification-version</code> and <code>another-attr</code>. * </p> * <p> * The following manifest element is an example of a manifest element that has multiple * components to its value: * </p> - * <p> * <pre> * code1.jar;code2.jar;code3.jar;attr1=value1;attr2=value2;attr3=value3 * </pre> - * </p> * <p> - * This manifest element has a value of <tt>code1.jar;code2.jar;code3.jar</tt>. + * This manifest element has a value of <code>code1.jar;code2.jar;code3.jar</code>. * This is an example of a multiple component value. This value has three - * components: <tt>code1.jar</tt>, <tt>code2.jar</tt>, and <tt>code3.jar</tt>. + * components: <code>code1.jar</code>, <code>code2.jar</code>, and <code>code3.jar</code>. * </p> * <p> * If components contain delimiter characters (e.g ';', ',' ':' "=") then it must be @@ -74,8 +77,8 @@ import org.osgi.framework.BundleException; * "component ; 1"; "component , 2"; "component : 3"; attr1=value1; attr2=value2; attr3=value3 * </pre> * <p> - * This manifest element has a value of <tt>"component ; 1"; "component , 2"; "component : 3"</tt>. - * This value has three components: <tt>"component ; 1"</tt>, <tt>"component , 2"</tt>, <tt>"component : 3"</tt>. + * This manifest element has a value of <code>"component ; 1"; "component , 2"; "component : 3"</code>. + * This value has three components: <code>"component ; 1"</code>, <code>"component , 2"</code>, <code>"component : 3"</code>. * </p> * <p> * This class is not intended to be subclassed by clients. @@ -118,11 +121,9 @@ public class ManifestElement { * Returns the value of the manifest element. The value returned is the * complete value up to the first attribute or directive. For example, the * following manifest element: - * <p> * <pre> * test1.jar;test2.jar;test3.jar;selection-filter="(os.name=Windows XP)" * </pre> - * </p> * <p> * This manifest element has a value of <tt>test1.jar;test2.jar;test3.jar</tt> * </p> @@ -138,15 +139,13 @@ public class ManifestElement { * components returned are the complete list of value components up to * the first attribute or directive. * For example, the following manifest element: - * <p> * <pre> * test1.jar;test2.jar;test3.jar;selection-filter="(os.name=Windows XP)" * </pre> - * </p> * <p> * This manifest element has the value components array - * <tt>{ "test1.jar", "test2.jar", "test3.jar" }</tt> - * Each value component is delemited by a semi-colon (<tt>';'</tt>). + * <code>{ "test1.jar", "test2.jar", "test3.jar" }</code> + * Each value component is delemited by a semi-colon (<code>';'</code>). * </p> * * @return the String[] of value components @@ -159,15 +158,13 @@ public class ManifestElement { * Returns the value for the specified attribute or <code>null</code> if it does * not exist. If the attribute has multiple values specified then the last value * specified is returned. For example the following manifest element: - * <p> * <pre> * elementvalue; myattr="value1"; myattr="value2" * </pre> - * </p> * <p> - * specifies two values for the attribute key <tt>myattr</tt>. In this case <tt>value2</tt> + * specifies two values for the attribute key <code>myattr</code>. In this case <code>value2</code> * will be returned because it is the last value specified for the attribute - * <tt>myattr</tt>. + * <code>myattr</code>. * </p> * * @param key the attribute key to return the value for @@ -213,14 +210,12 @@ public class ManifestElement { * Returns the value for the specified directive or <code>null</code> if it * does not exist. If the directive has multiple values specified then the * last value specified is returned. For example the following manifest element: - * <p> * <pre> * elementvalue; mydir:="value1"; mydir:="value2" * </pre> - * </p> * <p> - * specifies two values for the directive key <tt>mydir</tt>. In this case <tt>value2</tt> - * will be returned because it is the last value specified for the directive <tt>mydir</tt>. + * specifies two values for the directive key <code>mydir</code>. In this case <code>value2</code> + * will be returned because it is the last value specified for the directive <code>mydir</code>. * </p> * * @param key the directive key to return the value for |