Bug 493023: Fix Javadoc validation settings for org.eclipse.equinox.commonY20160513-1000I20160512-1000I20160511-2000I20160511-0400I20160510-2000I20160509-2000

Change-Id: Ib10a98815933980f6bf186bd472b180b656c8e4f

4 files changed, 1 insertions, 38 deletions

diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/boot/PlatformURLConnection.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/boot/PlatformURLConnection.java
index b039e8651..5435906bc 100644
--- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/boot/PlatformURLConnection.java
+++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/boot/PlatformURLConnection.java
@@ -222,13 +222,6 @@ public abstract class PlatformURLConnection extends URLConnection {
 		System.out.println("URL " + s); //$NON-NLS-1$
 	}
 
-	/**
-	 * @throws IOException
-	 */
-	public URL[] getAuxillaryURLs() throws IOException {
-		return null;
-	}
-
 	@Override
 	public synchronized InputStream getInputStream() throws IOException {
 		if (!connected)
diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/AdapterManager.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/AdapterManager.java
index fff35fb9f..07909a1b0 100644
--- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/AdapterManager.java
+++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/AdapterManager.java
@@ -194,7 +194,6 @@ public final class AdapterManager implements IAdapterManager {
 	 * Computes the adapters that the provided class can adapt to, along
 	 * with the factory object that can perform that transformation. Returns 
 	 * a table of adapter class name to factory object.
-	 * @param adaptable
 	 */
 	private Map<String, IAdapterFactory> getFactories(Class<? extends Object> adaptable) {
 		//cache reference to lookup to protect against concurrent flush
diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/PlatformURLPluginConnection.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/PlatformURLPluginConnection.java
index fd3c4489f..1386ae653 100644
--- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/PlatformURLPluginConnection.java
+++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/PlatformURLPluginConnection.java
@@ -23,7 +23,6 @@ import org.osgi.framework.Bundle;
  */
 public class PlatformURLPluginConnection extends PlatformURLConnection {
 
-	private Bundle target = null;
 	private static boolean isRegistered = false;
 	public static final String PLUGIN = "plugin"; //$NON-NLS-1$
 
@@ -89,32 +88,4 @@ public class PlatformURLPluginConnection extends PlatformURLConnection {
 		PlatformURLHandler.register(PLUGIN, PlatformURLPluginConnection.class);
 		isRegistered = true;
 	}
-
-	@Override
-	public URL[] getAuxillaryURLs() throws IOException {
-		if (target == null) {
-			String spec = url.getFile().trim();
-			if (spec.startsWith("/")) //$NON-NLS-1$
-				spec = spec.substring(1);
-			if (!spec.startsWith(PLUGIN))
-				throw new IOException(NLS.bind(CommonMessages.url_badVariant, url));
-			int ix = spec.indexOf("/", PLUGIN.length() + 1); //$NON-NLS-1$
-			String ref = ix == -1 ? spec.substring(PLUGIN.length() + 1) : spec.substring(PLUGIN.length() + 1, ix);
-			String id = getId(ref);
-			Activator activator = Activator.getDefault();
-			if (activator == null)
-				throw new IOException(CommonMessages.activator_not_available);
-			target = activator.getBundle(id);
-			if (target == null)
-				throw new IOException(NLS.bind(CommonMessages.url_resolvePlugin, url));
-		}
-		Bundle[] fragments = Activator.getDefault().getFragments(target);
-		int fragmentLength = (fragments == null) ? 0 : fragments.length;
-		if (fragmentLength == 0)
-			return null;
-		URL[] result = new URL[fragmentLength];
-		for (int i = 0; i < fragmentLength; i++)
-			result[i] = fragments[i].getEntry("/"); //$NON-NLS-1$
-		return result;
-	}
 }
diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/URIUtil.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/URIUtil.java
index a568942b8..a6dd3a1cc 100644
--- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/URIUtil.java
+++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/URIUtil.java
@@ -299,7 +299,7 @@ public final class URIUtil {
 	/**
 	 * Returns a URI as a URL.
 	 * 
-	 * @throws MalformedURLException 
+	 * <p>Better use {@link URI#toURL()} instead.</p>
 	 */
 	public static URL toURL(URI uri) throws MalformedURLException {
 		return new URL(uri.toString());