Bug 413418 - Adds missing @Override and @Deprecated annotations to
o.e.core.runtime

Change-Id: I53987c1cb85d070a9de8fc4fd99f7c4622ff5ba2
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/InitLegacyPreferences.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/InitLegacyPreferences.java
index be3afd8..af9ef63 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/InitLegacyPreferences.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/InitLegacyPreferences.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2005, 2008 IBM Corporation and others.
+ *  Copyright (c) 2005, 2014 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@
 	 * @deprecated Marked deprecated to suppress warnings. This class is added to support
 	 * backward compatibility only and should not be used in any new code.
 	 */
+	@Deprecated
 	public Object init(Object object, String name) {
 		Plugin plugin = null;
 		if (object instanceof Plugin)
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/PreferenceForwarder.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/PreferenceForwarder.java
index 9d8ac2e..b15408d 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/PreferenceForwarder.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/preferences/legacy/PreferenceForwarder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2004, 2013 IBM Corporation and others.
+ *  Copyright (c) 2004, 2014 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -29,6 +29,7 @@
  * @since 3.0
  * @deprecated to avoid warnings for interacting with deprecated Preferences class.
  */
+@Deprecated
 public class PreferenceForwarder extends Preferences implements IEclipsePreferences.IPreferenceChangeListener, IEclipsePreferences.INodeChangeListener {
 
 	private static final byte[] BYTE_ARRAY_DEFAULT_DEFAULT = new byte[0];
@@ -82,6 +83,7 @@
 	 *
 	 * @param listener a property change listener
 	 */
+	@Override
 	public synchronized void addPropertyChangeListener(IPropertyChangeListener listener) {
 		if (listeners.size() == 0) {
 			EclipsePreferences prefs = getPluginPreferences(false);
@@ -135,6 +137,7 @@
 	 *
 	 * @param listener a property change listener
 	 */
+	@Override
 	public synchronized void removePropertyChangeListener(IPropertyChangeListener listener) {
 		listeners.remove(listener);
 		if (listeners.size() == 0) {
@@ -182,6 +185,7 @@
 	 * @return <code>true</code> if either a current value or a default
 	 *  value is known for the named property, and <code>false</code>otherwise
 	 */
+	@Override
 	public boolean contains(String name) {
 		if (name == null)
 			return false;
@@ -201,6 +205,7 @@
 	 * @param name the name of the property
 	 * @return the boolean-valued property
 	 */
+	@Override
 	public boolean getBoolean(String name) {
 		return getPluginPreferences(true).getBoolean(name, getDefaultPreferences().getBoolean(name, BOOLEAN_DEFAULT_DEFAULT));
 	}
@@ -224,6 +229,7 @@
 	 * @param name the name of the property
 	 * @param value the new current value of the property
 	 */
+	@Override
 	public void setValue(String name, boolean value) {
 		Boolean oldValue = getBoolean(name) ? Boolean.TRUE : Boolean.FALSE;
 		Boolean newValue = value ? Boolean.TRUE : Boolean.FALSE;
@@ -251,6 +257,7 @@
 	 * @param name the name of the property
 	 * @return the default value of the named property
 	 */
+	@Override
 	public boolean getDefaultBoolean(String name) {
 		return getDefaultPreferences().getBoolean(name, BOOLEAN_DEFAULT_DEFAULT);
 	}
@@ -270,6 +277,7 @@
 	 * @param name the name of the property
 	 * @param value the new default value for the property
 	 */
+	@Override
 	public void setDefault(String name, boolean value) {
 		getDefaultPreferences().putBoolean(name, value);
 	}
@@ -284,6 +292,7 @@
 	 * @param name the name of the property
 	 * @return the double-valued property
 	 */
+	@Override
 	public double getDouble(String name) {
 		return getPluginPreferences(true).getDouble(name, getDefaultPreferences().getDouble(name, DOUBLE_DEFAULT_DEFAULT));
 	}
@@ -308,6 +317,7 @@
 	 * @param value the new current value of the property; must be 
 	 *   a number (not a NaN)
 	 */
+	@Override
 	public void setValue(String name, double value) {
 		if (Double.isNaN(value))
 			throw new IllegalArgumentException();
@@ -338,6 +348,7 @@
 	 * @param name the name of the property
 	 * @return the default value of the named property
 	 */
+	@Override
 	public double getDefaultDouble(String name) {
 		return getDefaultPreferences().getDouble(name, DOUBLE_DEFAULT_DEFAULT);
 	}
@@ -358,6 +369,7 @@
 	 * @param value the new default value for the property; must be 
 	 *   a number (not a NaN)
 	 */
+	@Override
 	public void setDefault(String name, double value) {
 		if (Double.isNaN(value))
 			throw new IllegalArgumentException();
@@ -374,6 +386,7 @@
 	 * @param name the name of the property
 	 * @return the float-valued property
 	 */
+	@Override
 	public float getFloat(String name) {
 		return getPluginPreferences(true).getFloat(name, getDefaultPreferences().getFloat(name, FLOAT_DEFAULT_DEFAULT));
 	}
@@ -398,6 +411,7 @@
 	 * @param value the new current value of the property; must be 
 	 *   a number (not a NaN)
 	 */
+	@Override
 	public void setValue(String name, float value) {
 		if (Float.isNaN(value))
 			throw new IllegalArgumentException();
@@ -428,6 +442,7 @@
 	 * @param name the name of the property
 	 * @return the default value of the named property
 	 */
+	@Override
 	public float getDefaultFloat(String name) {
 		return getDefaultPreferences().getFloat(name, FLOAT_DEFAULT_DEFAULT);
 	}
@@ -448,6 +463,7 @@
 	 * @param value the new default value for the property; must be 
 	 *   a number (not a NaN)
 	 */
+	@Override
 	public void setDefault(String name, float value) {
 		if (Float.isNaN(value))
 			throw new IllegalArgumentException();
@@ -464,6 +480,7 @@
 	 * @param name the name of the property
 	 * @return the int-valued property
 	 */
+	@Override
 	public int getInt(String name) {
 		return getPluginPreferences(true).getInt(name, getDefaultPreferences().getInt(name, INT_DEFAULT_DEFAULT));
 	}
@@ -487,6 +504,7 @@
 	 * @param name the name of the property
 	 * @param value the new current value of the property
 	 */
+	@Override
 	public void setValue(String name, int value) {
 		final int intValue = getInt(name);
 		if (value == intValue)
@@ -515,6 +533,7 @@
 	 * @param name the name of the property
 	 * @return the default value of the named property
 	 */
+	@Override
 	public int getDefaultInt(String name) {
 		return getDefaultPreferences().getInt(name, INT_DEFAULT_DEFAULT);
 	}
@@ -534,6 +553,7 @@
 	 * @param name the name of the property
 	 * @param value the new default value for the property
 	 */
+	@Override
 	public void setDefault(String name, int value) {
 		getDefaultPreferences().putInt(name, value);
 	}
@@ -548,6 +568,7 @@
 	 * @param name the name of the property
 	 * @return the long-valued property
 	 */
+	@Override
 	public long getLong(String name) {
 		return getPluginPreferences(true).getLong(name, getDefaultPreferences().getLong(name, LONG_DEFAULT_DEFAULT));
 	}
@@ -571,6 +592,7 @@
 	 * @param name the name of the property
 	 * @param value the new current value of the property
 	 */
+	@Override
 	public void setValue(String name, long value) {
 		final long longValue = getLong(name);
 		if (value == longValue)
@@ -599,6 +621,7 @@
 	 * @param name the name of the property
 	 * @return the default value of the named property
 	 */
+	@Override
 	public long getDefaultLong(String name) {
 		return getDefaultPreferences().getLong(name, LONG_DEFAULT_DEFAULT);
 	}
@@ -618,6 +641,7 @@
 	 * @param name the name of the property
 	 * @param value the new default value for the property
 	 */
+	@Override
 	public void setDefault(String name, long value) {
 		getDefaultPreferences().putLong(name, value);
 	}
@@ -631,6 +655,7 @@
 	 * @param name the name of the property
 	 * @return the string-valued property
 	 */
+	@Override
 	public String getString(String name) {
 		return getPluginPreferences(true).get(name, getDefaultPreferences().get(name, STRING_DEFAULT_DEFAULT));
 	}
@@ -654,6 +679,7 @@
 	 * @param name the name of the property
 	 * @param value the new current value of the property
 	 */
+	@Override
 	public void setValue(String name, String value) {
 		if (value == null)
 			throw new IllegalArgumentException();
@@ -682,6 +708,7 @@
 	 * @param name the name of the property
 	 * @return the default value of the named property
 	 */
+	@Override
 	public String getDefaultString(String name) {
 		return getDefaultPreferences().get(name, STRING_DEFAULT_DEFAULT);
 	}
@@ -701,6 +728,7 @@
 	 * @param name the name of the property
 	 * @param value the new default value for the property
 	 */
+	@Override
 	public void setDefault(String name, String value) {
 		if (value == null)
 			throw new IllegalArgumentException();
@@ -716,6 +744,7 @@
 	 * and <code>false</code> otherwise (including the case where the property
 	 * is unknown to this object)
 	 */
+	@Override
 	public boolean isDefault(String name) {
 		if (name == null)
 			return false;
@@ -741,6 +770,7 @@
 	 *
 	 * @param name the name of the property
 	 */
+	@Override
 	public void setToDefault(String name) {
 		IEclipsePreferences preferences = getPluginPreferences(true);
 		Object oldValue = preferences.get(name, null);
@@ -754,6 +784,7 @@
 	 *
 	 * @return an array of property names 
 	 */
+	@Override
 	public String[] propertyNames() {
 		return getPluginPreferences(true).keys();
 	}
@@ -764,6 +795,7 @@
 	 *
 	 * @return an array of property names 
 	 */
+	@Override
 	public String[] defaultPropertyNames() {
 		try {
 			return getDefaultPreferences().keys();
@@ -781,6 +813,7 @@
 	 *  known to this preference object has a current value different from its
 	 *  default value, and <code>false</code> otherwise
 	 */
+	@Override
 	public boolean needsSaving() {
 		return getPluginPreferences(true).isDirty();
 	}
@@ -807,6 +840,7 @@
 	/*
 	 * @see org.eclipse.core.runtime.Preferences#load(java.io.InputStream)
 	 */
+	@Override
 	public void load(InputStream in) throws IOException {
 		Properties result = new Properties();
 		result.load(in);
@@ -824,6 +858,7 @@
 	/*
 	 * @see org.eclipse.core.runtime.Preferences#store(java.io.OutputStream, java.lang.String)
 	 */
+	@Override
 	public void store(OutputStream out, String header) throws IOException {
 		Properties result = convertToProperties();
 		result.store(out, header);
@@ -847,6 +882,7 @@
 		}
 	}
 
+	@Override
 	public String toString() {
 		return "PreferenceForwarder(" + pluginID + ")"; //$NON-NLS-1$ //$NON-NLS-2$
 	}
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/CompatibilityHelper.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/CompatibilityHelper.java
index 2ab9e22..dc6b0e1 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/CompatibilityHelper.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/CompatibilityHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2013 IBM Corporation and others.
+ * Copyright (c) 2003, 2014 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,6 +21,7 @@
  * 
  * @deprecated Marked as deprecated to suppress deprecation warnings.
  */
+@Deprecated
 public class CompatibilityHelper {
 	private static final String OPTION_DEBUG_COMPATIBILITY = Platform.PI_RUNTIME + "/compatibility/debug"; //$NON-NLS-1$
 	public static final boolean DEBUG = Boolean.TRUE.toString().equalsIgnoreCase(InternalPlatform.getDefault().getOption(OPTION_DEBUG_COMPATIBILITY));
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/PerformanceStatsProcessor.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/PerformanceStatsProcessor.java
index 6b72add..40ca066 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/PerformanceStatsProcessor.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/PerformanceStatsProcessor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2013 IBM Corporation and others.
+ * Copyright (c) 2005, 2014 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -186,6 +186,7 @@
 	/*
 	 * @see Job#run(IProgressMonitor)
 	 */
+	@Override
 	protected IStatus run(IProgressMonitor monitor) {
 		PerformanceStats[] events;
 		PerformanceStats[] failedEvents;
@@ -214,6 +215,7 @@
 	/*
 	 * @see Job#shouldRun()
 	 */
+	@Override
 	public boolean shouldRun() {
 		return !changes.isEmpty() || !failures.isEmpty();
 	}
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/PlatformActivator.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/PlatformActivator.java
index 2c1e2da..20077dd 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/PlatformActivator.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/internal/runtime/PlatformActivator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2013 IBM Corporation and others.
+ * Copyright (c) 2003, 2014 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@
 		return context;
 	}
 
+	@Override
 	public void start(BundleContext runtimeContext) throws Exception {
 		PlatformActivator.context = runtimeContext;
 		InternalPlatform.getDefault().start(runtimeContext);
@@ -34,6 +35,7 @@
 		super.start(runtimeContext);
 	}
 
+	@Override
 	public void stop(BundleContext runtimeContext) {
 		// Stop the platform orderly.		
 		InternalPlatform.getDefault().stop(runtimeContext);
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/ILibrary.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/ILibrary.java
index a986440..8f46632 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/ILibrary.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/ILibrary.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -55,12 +55,14 @@
  * 
  * @noimplement This interface is not intended to be implemented by clients.
  */
+@Deprecated
 public interface ILibrary {
 	/**
 	 * Constant string (value "code") indicating the code library type.
 	 * @deprecated As of Eclipse 3.0 library types are obsolete.
 	 * There is no replacement.
 	 */
+	@Deprecated
 	public static final String CODE = "code"; //$NON-NLS-1$
 
 	/**
@@ -68,6 +70,7 @@
 	 * @deprecated As of Eclipse 3.0 library types are obsolete.
 	 * There is no replacement.
 	 */
+	@Deprecated
 	public static final String RESOURCE = "resource"; //$NON-NLS-1$
 
 	/**
@@ -83,6 +86,7 @@
 	 * @deprecated As of Eclipse 3.0 content filters are obsolete.  
 	 * There is no replacement.
 	 */
+	@Deprecated
 	public String[] getContentFilters();
 
 	/**
@@ -99,6 +103,7 @@
 	 *     element.getValue();   // the jar/dir containing the code
 	 * </pre>
 	 */
+	@Deprecated
 	public IPath getPath();
 
 	/**
@@ -110,6 +115,7 @@
 	 * @deprecated As of Eclipse 3.0 library types are obsolete.
 	 * There is no replacement.
 	 */
+	@Deprecated
 	public String getType();
 
 	/**
@@ -124,6 +130,7 @@
 	 * @deprecated As of Eclipse 3.0 exporting an individual library is obsolete.
 	 * There is no replacement.
 	 */
+	@Deprecated
 	public boolean isExported();
 
 	/**
@@ -135,6 +142,7 @@
 	 * @deprecated As of Eclipse 3.0 exporting an individual library is obsolete.
 	 * There is no replacement.
 	 */
+	@Deprecated
 	public boolean isFullyExported();
 
 	/**
@@ -146,5 +154,6 @@
 	 * @deprecated As of Eclipse 3.0 package prefix filtering is obsolete.
 	 * There is no replacement.
 	 */
+	@Deprecated
 	public String[] getPackagePrefixes();
 }
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPlatformRunnable.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPlatformRunnable.java
index f1a0b25..063ba27 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPlatformRunnable.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPlatformRunnable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2003, 2007 IBM Corporation and others.
+ *  Copyright (c) 2003, 2014 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -25,6 +25,7 @@
  * @since 3.0
  * @deprecated use {@link IApplication}
  */
+@Deprecated
 public interface IPlatformRunnable {
 
 	/**
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginDescriptor.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginDescriptor.java
index 3411909..7d38495 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginDescriptor.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginDescriptor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -67,6 +67,7 @@
  * @see #getPlugin()
  * @noimplement This interface is not intended to be implemented by clients.
  */
+@Deprecated
 public interface IPluginDescriptor {
 	/**
 	 * Returns the extension with the given simple identifier declared in
@@ -83,6 +84,7 @@
 	 * </pre>
 	 * where <code>id</code> is the plug-in id.
 	 */
+	@Deprecated
 	public IExtension getExtension(String extensionName);
 
 	/**
@@ -98,6 +100,7 @@
 	 * </pre>
 	 * where <code>id</code> is the plug-in id.
 	 */
+	@Deprecated
 	public IExtensionPoint getExtensionPoint(String extensionPointId);
 
 	/**
@@ -112,6 +115,7 @@
 	 * </pre>
 	 * where <code>id</code> is the plug-in id.
 	 */
+	@Deprecated
 	public IExtensionPoint[] getExtensionPoints();
 
 	/**
@@ -126,6 +130,7 @@
 	 * </pre>
 	 * where <code>id</code> is the plug-in id.
 	 */
+	@Deprecated
 	public IExtension[] getExtensions();
 
 	/**
@@ -148,6 +153,7 @@
 	 * the relevant plug-in or simply use the <code>getEntry</code> API
 	 * to construct the desired URL.
 	 */
+	@Deprecated
 	public URL getInstallURL();
 
 	/**
@@ -169,6 +175,7 @@
 	 * where <code>bundle</code> is the bundle associated with 
 	 * the relevant plug-in.
 	 */
+	@Deprecated
 	public String getLabel();
 
 	/**
@@ -197,6 +204,7 @@
 	 * where <code>bundle</code> is the bundle associated with 
 	 * the relevant plug-in.
 	 */
+	@Deprecated
 	public Plugin getPlugin() throws CoreException;
 
 	/**
@@ -244,6 +252,7 @@
 	 * where <code>bundle</code> is the bundle associated with 
 	 * the relevant plug-in.
 	 */
+	@Deprecated
 	public ClassLoader getPluginClassLoader();
 
 	/**
@@ -265,6 +274,7 @@
 	 * the relevant plug-in.  The resultant elements array contains one
 	 * entry for each required plug-in.
 	 */
+	@Deprecated
 	public IPluginPrerequisite[] getPluginPrerequisites();
 
 	/**
@@ -284,6 +294,7 @@
 	 * where <code>bundle</code> is the bundle associated with 
 	 * the relevant plug-in.
 	 */
+	@Deprecated
 	public String getProviderName();
 
 	/**
@@ -305,6 +316,7 @@
 	 * where <code>bundle</code> is the bundle associated with 
 	 * the relevant plug-in.
 	 */
+	@Deprecated
 	public ResourceBundle getResourceBundle() throws MissingResourceException;
 
 	/**
@@ -335,6 +347,7 @@
 	 * where <code>bundle</code> is the bundle associated with 
 	 * the relevant plug-in.
 	 */
+	@Deprecated
 	public String getResourceString(String value);
 
 	/**
@@ -376,6 +389,7 @@
 	 * where <code>bundle</code> is the bundle associated with 
 	 * the relevant plug-in.
 	 */
+	@Deprecated
 	public String getResourceString(String value, ResourceBundle resourceBundle);
 
 	/**
@@ -396,6 +410,7 @@
 	 * the relevant plug-in.  The resultant elements array contains one
 	 * entry for each entry on the bundle's classpath..
 	 */
+	@Deprecated
 	public ILibrary[] getRuntimeLibraries();
 
 	/**
@@ -412,6 +427,7 @@
 	 * where <code>bundle</code> is the bundle associated with 
 	 * the relevant plug-in.
 	 */
+	@Deprecated
 	public String getUniqueIdentifier();
 
 	/**
@@ -427,6 +443,7 @@
 	 * where <code>bundle</code> is the bundle associated with 
 	 * the relevant plug-in.
 	 */
+	@Deprecated
 	public PluginVersionIdentifier getVersionIdentifier();
 
 	/**
@@ -445,6 +462,7 @@
 	 * where <code>bundle</code> is the bundle associated with 
 	 * the relevant plug-in.
 	 */
+	@Deprecated
 	public boolean isPluginActivated();
 
 	/**
@@ -464,6 +482,7 @@
 	 * where <code>bundle</code> is the bundle associated with 
 	 * the relevant plug-in.
 	 */
+	@Deprecated
 	public URL find(IPath path);
 
 	/**
@@ -519,5 +538,6 @@
 	 * where <code>bundle</code> is the bundle associated with 
 	 * the relevant plug-in.
 	 */
+	@Deprecated
 	public URL find(IPath path, Map<String,String> override);
 }
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginPrerequisite.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginPrerequisite.java
index 9ff8305..26b93ff 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginPrerequisite.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginPrerequisite.java
@@ -47,6 +47,7 @@
  * 
  * @noimplement This interface is not intended to be implemented by clients.
  */
+@Deprecated
 public interface IPluginPrerequisite {
 	/**
 	 * Returns the actual version identifier that is used
@@ -63,6 +64,7 @@
 	 *     BundleDescription prereq = spec.getSupplier();
 	 * </pre>
 	 */
+	@Deprecated
 	public PluginVersionIdentifier getResolvedVersionIdentifier();
 
 	/**
@@ -75,6 +77,7 @@
 	 *     element.getValue();
 	 * </pre>
 	 */
+	@Deprecated
 	public String getUniqueIdentifier();
 
 	/**
@@ -92,6 +95,7 @@
 	 *     Version reqMinVersion = spec.getVersionRange().getMinimum();
 	 * </pre>
 	 */
+	@Deprecated
 	public PluginVersionIdentifier getVersionIdentifier();
 
 	/**
@@ -111,6 +115,7 @@
 	 *     element.getAttribute(Constants.REPROVIDE_ATTRIBUTE);
 	 * </pre>
 	 */
+	@Deprecated
 	public boolean isExported();
 
 	/**
@@ -137,6 +142,7 @@
 	 *     return false;
 	 * </pre>
 	 */
+	@Deprecated
 	public boolean isMatchedAsGreaterOrEqual();
 
 	/**
@@ -163,6 +169,7 @@
 	 *     return false;	
 	 * </pre>
 	 */
+	@Deprecated
 	public boolean isMatchedAsCompatible();
 
 	/**
@@ -195,6 +202,7 @@
 	 *     return false;
 	 * </pre>
 	 */
+	@Deprecated
 	public boolean isMatchedAsEquivalent();
 
 	/**
@@ -222,6 +230,7 @@
 	 *     return false;
 	 * </pre>
 	 */
+	@Deprecated
 	public boolean isMatchedAsPerfect();
 
 	/**
@@ -254,6 +263,7 @@
 	 *     return false;
 	 * </pre>
 	 */
+	@Deprecated
 	public boolean isMatchedAsExact();
 
 	/**
@@ -267,5 +277,6 @@
 	 *     "true".equals(element.getAttribute(Constants.OPTIONAL_ATTRIBUTE);
 	 * </pre>
 	 */
+	@Deprecated
 	public boolean isOptional();
 }
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginRegistry.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginRegistry.java
index 3212a1d..514588a 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginRegistry.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/IPluginRegistry.java
@@ -33,6 +33,7 @@
  * 
  * @noimplement This interface is not intended to be implemented by clients.
  */
+@Deprecated
 public interface IPluginRegistry {
 	/**
 	 * Returns all configuration elements from all extensions configured
@@ -45,6 +46,7 @@
 	 * @return the configuration elements
 	 * @deprecated Replaced by {@link IExtensionRegistry#getConfigurationElementsFor(String)}.
 	 */
+	@Deprecated
 	public IConfigurationElement[] getConfigurationElementsFor(String extensionPointId);
 
 	/**
@@ -60,6 +62,7 @@
 	 * @return the configuration elements
 	 * @deprecated Replaced by {@link IExtensionRegistry#getConfigurationElementsFor(String, String)}.
 	 */
+	@Deprecated
 	public IConfigurationElement[] getConfigurationElementsFor(String pluginId, String extensionPointName);
 
 	/**
@@ -76,6 +79,7 @@
 	 * @return the configuration elements
 	 * @deprecated Replaced by {@link IExtensionRegistry#getConfigurationElementsFor(String, String, String)}.
 	 */
+	@Deprecated
 	public IConfigurationElement[] getConfigurationElementsFor(String pluginId, String extensionPointName, String extensionId);
 
 	/**
@@ -91,6 +95,7 @@
 	 * @return the extension, or <code>null</code>
 	 * @deprecated Replaced by {@link IExtensionRegistry#getExtension(String, String)}.
 	 */
+	@Deprecated
 	public IExtension getExtension(String extensionPointId, String extensionId);
 
 	/**
@@ -108,6 +113,7 @@
 	 * @return the extension, or <code>null</code>
 	 * @deprecated Replaced by {@link IExtensionRegistry#getExtension(String, String, String)}.
 	 */
+	@Deprecated
 	public IExtension getExtension(String pluginId, String extensionPointName, String extensionId);
 
 	/**
@@ -120,6 +126,7 @@
 	 * @return the extension point, or <code>null</code>
 	 * @deprecated Replaced by {@link IExtensionRegistry#getExtensionPoint(String)}.
 	 */
+	@Deprecated
 	public IExtensionPoint getExtensionPoint(String extensionPointId);
 
 	/**
@@ -134,6 +141,7 @@
 	 * @return the extension point, or <code>null</code>
 	 * @deprecated Replaced by {@link IExtensionRegistry#getExtensionPoint(String, String)}.
 	 */
+	@Deprecated
 	public IExtensionPoint getExtensionPoint(String pluginId, String extensionPointName);
 
 	/**
@@ -143,6 +151,7 @@
 	 * @return the extension points known to this plug-in registry
 	 * @deprecated Replaced by {@link IExtensionRegistry#getExtensionPoints()}.
 	 */
+	@Deprecated
 	public IExtensionPoint[] getExtensionPoints();
 
 	/**
@@ -160,6 +169,7 @@
 	 * which explicitly require the org.eclipse.core.runtime.compatibility plug-in.
 	 * See the comments on {@link IPluginDescriptor} and its methods for details.
 	 */
+	@Deprecated
 	public IPluginDescriptor getPluginDescriptor(String pluginId);
 
 	/**
@@ -179,6 +189,7 @@
 	 * which explicitly require the org.eclipse.core.runtime.compatibility plug-in.
 	 * See the comments on {@link IPluginDescriptor} and its methods for details.
 	 */
+	@Deprecated
 	public IPluginDescriptor getPluginDescriptor(String pluginId, PluginVersionIdentifier version);
 
 	/**
@@ -192,6 +203,7 @@
 	 * which explicitly require the org.eclipse.core.runtime.compatibility plug-in.
 	 * See the comments on {@link IPluginDescriptor} and its methods for details.
 	 */
+	@Deprecated
 	public IPluginDescriptor[] getPluginDescriptors();
 
 	/**
@@ -209,5 +221,6 @@
 	 * which explicitly require the org.eclipse.core.runtime.compatibility plug-in.
 	 * See the comments on {@link IPluginDescriptor} and its methods for details.
 	 */
+	@Deprecated
 	public IPluginDescriptor[] getPluginDescriptors(String pluginId);
 }
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/PerformanceStats.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/PerformanceStats.java
index 195a3f9..ae1eae6 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/PerformanceStats.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/PerformanceStats.java
@@ -377,6 +377,7 @@
 	/* (non-Javadoc)
 	 * @see java.lang.Object#equals()
 	 */
+	@Override
 	public boolean equals(Object obj) {
 		//count and time are not considered part of equality
 		if (!(obj instanceof PerformanceStats))
@@ -467,6 +468,7 @@
 		return value.longValue();
 	}
 
+	@Override
 	public int hashCode() {
 		//count and time are not considered part of equality
 		int hash = event.hashCode() * 37 + getBlameString().hashCode();
@@ -521,6 +523,7 @@
 	/**
 	 * For debugging purposes only.
 	 */
+	@Override
 	public String toString() {
 		StringBuffer result = new StringBuffer("PerformanceStats("); //$NON-NLS-1$
 		result.append(event);
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
index 794ef80..725244a 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -331,6 +331,7 @@
 	 * @deprecated use <code>ARCH_X86_64</code> instead. Note the values
 	 * has been changed to be the value of the <code>ARCH_X86_64</code> constant.
 	 */
+	@Deprecated
 	public static final String ARCH_AMD64 = ARCH_X86_64;
 
 	/**
@@ -475,6 +476,7 @@
 	 * Consider using <code>ISecurePreferences#put(String, String, boolean)</code> as a replacement of this method.
 	 * This API will be deleted in a future release. See bug 370248 for details.
 	 */
+	@Deprecated
 	public static void addAuthorizationInfo(URL serverUrl, String realm, String authScheme, Map<String,String> info) throws CoreException {
 		AuthorizationHandler.addAuthorizationInfo(serverUrl, realm, authScheme, info);
 	}
@@ -517,6 +519,7 @@
 	 * for data access and modifications.  
 	 * This API will be deleted in a future release. See bug 370248 for details.
 	 */
+	@Deprecated
 	public static void addProtectionSpace(URL resourceUrl, String realm) throws CoreException {
 		AuthorizationHandler.addProtectionSpace(resourceUrl, realm);
 	}
@@ -542,6 +545,7 @@
 	 * @see Bundle#getEntry(String)
 	 * @deprecated use {@link FileLocator#toFileURL(URL)} instead
 	 */
+	@Deprecated
 	public static URL asLocalURL(URL url) throws IOException {
 		return FileLocator.toFileURL(url);
 	}
@@ -550,6 +554,7 @@
 	 * Takes down the splash screen if one was put up.
 	 * @deprecated use {@link IApplicationContext#applicationRunning()} instead
 	 */
+	@Deprecated
 	public static void endSplash() {
 		InternalPlatform.getDefault().endSplash();
 	}
@@ -580,6 +585,7 @@
 	 * Consider using <code>ISecurePreferences#clear()</code> as a replacement of this method.
 	 * This API will be deleted in a future release. See bug 370248 for details.
 	 */
+	@Deprecated
 	public static void flushAuthorizationInfo(URL serverUrl, String realm, String authScheme) throws CoreException {
 		AuthorizationHandler.flushAuthorizationInfo(serverUrl, realm, authScheme);
 	}
@@ -618,6 +624,7 @@
 	 * Consider using <code>ISecurePreferences#get(String, String)</code> as a replacement of this method.
 	 * This API will be deleted in a future release. See bug 370248 for details.
 	 */
+	@Deprecated
 	public static Map<String,String> getAuthorizationInfo(URL serverUrl, String realm, String authScheme) {
 		return AuthorizationHandler.getAuthorizationInfo(serverUrl, realm, authScheme);
 	}
@@ -724,6 +731,7 @@
 	 * This method only works if the compatibility layer is installed and must not be used otherwise.
 	 * See the comments on {@link IPluginDescriptor#getPlugin()} for details.
 	 */
+	@Deprecated
 	public static Plugin getPlugin(String id) {
 		try {
 			IPluginRegistry registry = getPluginRegistry();
@@ -748,6 +756,7 @@
 	 * This method only works if the compatibility layer is installed and must not be used otherwise.
 	 * See the comments on {@link IPluginRegistry} and its methods for details.
 	 */
+	@Deprecated
 	public static IPluginRegistry getPluginRegistry() {
 		Bundle compatibility = InternalPlatform.getDefault().getBundle(CompatibilityHelper.PI_RUNTIME_COMPATIBILITY);
 		if (compatibility == null)
@@ -781,6 +790,7 @@
 	 * @return a local file system path
 	 * @deprecated clients should call {@link #getStateLocation(Bundle)} instead
 	 */
+	@Deprecated
 	public static IPath getPluginStateLocation(Plugin plugin) {
 		return plugin.getStateLocation();
 	}
@@ -799,6 +809,7 @@
 	 * for data access and modifications.  
 	 * This API will be deleted in a future release. See bug 370248 for details.
 	 */
+	@Deprecated
 	public static String getProtectionSpace(URL resourceUrl) {
 		return AuthorizationHandler.getProtectionSpace(resourceUrl);
 	}
@@ -838,6 +849,7 @@
 	 * @see Bundle#getEntry(String)
 	 * @deprecated use {@link FileLocator#resolve(URL)} instead
 	 */
+	@Deprecated
 	public static URL resolve(URL url) throws IOException {
 		return FileLocator.resolve(url);
 	}
@@ -850,6 +862,7 @@
 	 * @param runnable the runnable to run
 	 * @deprecated clients should use <code>SafeRunner#run</code> instead
 	 */
+	@Deprecated
 	public static void run(ISafeRunnable runnable) {
 		SafeRunner.run(runnable);
 	}
@@ -861,6 +874,7 @@
 	 * @since 3.0
 	 * @deprecated The method {@link Job#getJobManager()} should be used instead.
 	 */
+	@Deprecated
 	public static IJobManager getJobManager() {
 		return Job.getJobManager();
 	}
@@ -893,6 +907,7 @@
 	 * @since 3.0
 	 * @deprecated use {@link FileLocator#find(Bundle, IPath, Map)}
 	 */
+	@Deprecated
 	public static URL find(Bundle bundle, IPath path) {
 		return FileLocator.find(bundle, path, null);
 	}
@@ -949,6 +964,7 @@
 	 * @since 3.0
 	 * @deprecated use {@link FileLocator#find(Bundle, IPath, Map)} instead
 	 */
+	@Deprecated
 	public static URL find(Bundle bundle, IPath path, Map<String,String> override) {
 		return FileLocator.find(bundle, path, override);
 	}
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Plugin.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Plugin.java
index 9da7cc8..f65a76c 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Plugin.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Plugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -140,6 +140,7 @@
 	/** The plug-in descriptor.
 	 * @deprecated Marked as deprecated to suppress deprecation warnings.
 	 */
+	@Deprecated
 	private IPluginDescriptor descriptor;
 
 	/**
@@ -171,6 +172,7 @@
 	 * @since 2.0
 	 * @deprecated
 	 */
+	@Deprecated
 	private Preferences preferences = null;
 
 	/**
@@ -218,6 +220,7 @@
 	 * The <code>MyPlugin(IPluginDescriptor descriptor)</code> constructor is called only for plug-ins 
 	 * which explicitly require the org.eclipse.core.runtime.compatibility plug-in.
 	 */
+	@Deprecated
 	public Plugin(IPluginDescriptor descriptor) {
 		Assert.isNotNull(descriptor);
 		Assert.isTrue(!CompatibilityHelper.hasPluginObject(descriptor), NLS.bind(Messages.plugin_deactivatedLoad, this.getClass().getName(), descriptor.getUniqueIdentifier() + " is not activated")); //$NON-NLS-1$
@@ -242,6 +245,7 @@
 	 * @return a URL for the given path or <code>null</code>
 	 * @deprecated use {@link FileLocator#find(Bundle, IPath, Map)}
 	 */
+	@Deprecated
 	public final URL find(IPath path) {
 		return FileLocator.find(getBundle(), path, null);
 	}
@@ -260,6 +264,7 @@
 	 * @return a URL for the given path or <code>null</code>
 	 * @deprecated use {@link FileLocator#find(Bundle, IPath, Map)}
 	 */
+	@Deprecated
 	public final URL find(IPath path, Map<String,String> override) {
 		return FileLocator.find(getBundle(), path, override);
 	}
@@ -274,6 +279,7 @@
 	 * which explicitly require the org.eclipse.core.runtime.compatibility plug-in.
 	 * See the comments on {@link IPluginDescriptor} and its methods for details.
 	 */
+	@Deprecated
 	public final IPluginDescriptor getDescriptor() {
 		if (descriptor != null)
 			return descriptor;
@@ -350,6 +356,7 @@
 	 * Similar methods exist on {@link IPreferencesService} for obtaining other kinds
 	 * of preference values (strings, booleans, etc).
 	 */
+	@Deprecated
 	public final Preferences getPluginPreferences() {
 		final Bundle bundleCopy = getBundle();
 		if (preferences != null) {
@@ -387,6 +394,7 @@
 	 * @since 2.0
 	 * @deprecated Replaced by InstanceScope.getNode(&lt;bundleId&gt;).flush()
 	 */
+	@Deprecated
 	public final void savePluginPreferences() {
 		
 		Location instance = InternalPlatform.getDefault().getInstanceLocation();
@@ -457,6 +465,7 @@
 	 *		}
 	 * </pre>
 	 */
+	@Deprecated
 	protected void initializeDefaultPluginPreferences() {
 		// default implementation of this method - spec'd to do nothing
 	}
@@ -469,6 +478,7 @@
 	 * @since 3.0
 	 * @deprecated
 	 */
+	@Deprecated
 	public final void internalInitializeDefaultPluginPreferences() {
 		initializeDefaultPluginPreferences();
 	}
@@ -510,6 +520,7 @@
 	 * @see #openStream(IPath,boolean)
 	 * @deprecated use {@link FileLocator#openStream(Bundle, IPath, boolean)}
 	 */
+	@Deprecated
 	public final InputStream openStream(IPath file) throws IOException {
 		return FileLocator.openStream(getBundle(), file, false);
 	}
@@ -532,6 +543,7 @@
 	 * @exception IOException if the given path cannot be found in this plug-in
 	 * @deprecated use {@link FileLocator#openStream(Bundle, IPath, boolean)}
 	 */
+	@Deprecated
 	public final InputStream openStream(IPath file, boolean substituteArgs) throws IOException {
 		return FileLocator.openStream(getBundle(), file, substituteArgs);
 	}
@@ -621,6 +633,7 @@
 	 * The <code>shutdown()</code> method is called only for plug-ins which explicitly require the 
 	 * org.eclipse.core.runtime.compatibility plug-in.
 	 */
+	@Deprecated
 	public void shutdown() throws CoreException {
 		if (CompatibilityHelper.initializeCompatibility() == null)
 			return;
@@ -691,6 +704,7 @@
 	 * The <code>startup()</code> method is called only for plug-ins which explicitly require the 
 	 * org.eclipse.core.runtime.compatibility plug-in.
 	 */
+	@Deprecated
 	public void startup() throws CoreException {
 		//default implementation does nothing
 	}
@@ -699,6 +713,7 @@
 	 * Returns a string representation of the plug-in, suitable 
 	 * for debugging purposes only.
 	 */
+	@Override
 	public String toString() {
 		Bundle myBundle = getBundle();
 		if (myBundle == null)
@@ -756,6 +771,7 @@
 	/**
 	 * @deprecated Marked as deprecated to suppress deprecation warnings.
 	 */
+	@Deprecated
 	private IPluginDescriptor initializeDescriptor(String symbolicName) {
 		if (CompatibilityHelper.initializeCompatibility() == null)
 			return null;
diff --git a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Preferences.java b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Preferences.java
index f4cef3c..e7560c7 100644
--- a/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Preferences.java
+++ b/bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Preferences.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -89,6 +89,7 @@
  * an explicit non-default value is accomplished by setting a value in the {@link InstanceScope}.
  * To obtain a preference value, use the preference accessor methods on {@link IPreferencesService}.
  */
+@Deprecated
 public class Preferences {
 
 	/**