Code cleanup: remove "(non-Javadoc)" and old "@see" (override) comments

Bug: 470699
Change-Id: I17f5c678f19a491d56afb9954db119a9d107e6cd
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>

14 files changed, 91 insertions, 273 deletions

diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/AbstractScope.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/AbstractScope.java
index 640de8a96..3c7e3bf4a 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/AbstractScope.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/AbstractScope.java
@@ -22,9 +22,7 @@ import org.eclipse.core.runtime.preferences.IScopeContext;
  */
 public abstract class AbstractScope implements IScopeContext {
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IScopeContext#getName()
-	 */
+
 	@Override
 	public abstract String getName();
 
@@ -40,15 +38,11 @@ public abstract class AbstractScope implements IScopeContext {
 		return (IEclipsePreferences) PreferencesService.getDefault().getRootNode().node(getName()).node(qualifier);
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IScopeContext#getLocation()
-	 */
+
 	@Override
 	public abstract IPath getLocation();
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
+
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)
@@ -62,9 +56,7 @@ public abstract class AbstractScope implements IScopeContext {
 		return location == null ? other.getLocation() == null : location.equals(other.getLocation());
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
+
 	@Override
 	public int hashCode() {
 		return getName().hashCode();
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java
index a0019a344..fcf4021b5 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java
@@ -56,9 +56,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 	 */
 	private ServiceRegistration osgiPreferencesService = null;
 
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
-	 */
+
 	@Override
 	public void start(BundleContext context) throws Exception {
 		bundleContext = context;
@@ -76,9 +74,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 		registryServiceTracker.open();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
+
 	@Override
 	public void stop(BundleContext context) throws Exception {
 		PreferencesOSGiUtils.getDefault().closeServices();
@@ -101,9 +97,7 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 		return bundleContext;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.osgi.util.tracker.ServiceTrackerCustomizer#addingService(org.osgi.framework.ServiceReference)
-	 */
+
 	@Override
 	public synchronized Object addingService(ServiceReference reference) {
 		Object service = bundleContext.getService(reference);
@@ -129,17 +123,13 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 		return service;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.osgi.util.tracker.ServiceTrackerCustomizer#modifiedService(org.osgi.framework.ServiceReference, java.lang.Object)
-	 */
+
 	@Override
 	public void modifiedService(ServiceReference reference, Object service) {
 		// nothing to do
 	}
 
-	/* (non-Javadoc)
-	 * @see org.osgi.util.tracker.ServiceTrackerCustomizer#removedService(org.osgi.framework.ServiceReference, java.lang.Object)
-	 */
+
 	@Override
 	public synchronized void removedService(ServiceReference reference, Object service) {
 		PreferencesService.getDefault().setRegistryHelper(null);
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/BundleDefaultPreferences.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/BundleDefaultPreferences.java
index a5a21217e..9ec242765 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/BundleDefaultPreferences.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/BundleDefaultPreferences.java
@@ -57,9 +57,7 @@ public class BundleDefaultPreferences extends EclipsePreferences {
 			return;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.internal.preferences.EclipsePreferences#getLoadLevel()
-	 */
+
 	@Override
 	protected IEclipsePreferences getLoadLevel() {
 		if (loadLevel == null) {
@@ -76,25 +74,19 @@ public class BundleDefaultPreferences extends EclipsePreferences {
 		return loadLevel;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.internal.preferences.EclipsePreferences#isAlreadyLoaded(org.eclipse.core.runtime.preferences.IEclipsePreferences)
-	 */
+
 	@Override
 	protected boolean isAlreadyLoaded(IEclipsePreferences node) {
 		return loadedNodes.contains(node.name());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.internal.preferences.EclipsePreferences#loaded()
-	 */
+
 	@Override
 	protected void loaded() {
 		loadedNodes.add(name());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.internal.preferences.EclipsePreferences#load()
-	 */
+
 	@Override
 	protected void load() {
 		// ensure that the same node in the "default" scope is loaded so this one is
@@ -106,9 +98,7 @@ public class BundleDefaultPreferences extends EclipsePreferences {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.internal.preferences.EclipsePreferences#internalCreate(org.eclipse.core.internal.preferences.EclipsePreferences, java.lang.String, java.lang.Object)
-	 */
+
 	@Override
 	protected EclipsePreferences internalCreate(EclipsePreferences nodeParent, String nodeName, Object context) {
 		return new BundleDefaultPreferences(nodeParent, nodeName);
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/DefaultPreferences.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/DefaultPreferences.java
index 8795fc62e..c566a6f80 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/DefaultPreferences.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/DefaultPreferences.java
@@ -236,9 +236,7 @@ public class DefaultPreferences extends EclipsePreferences {
 			applyDefaults(null, productCustomization, productTranslation);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.osgi.service.prefs.Preferences#flush()
-	 */
+
 	@Override
 	public void flush() {
 		// default values are not persisted
@@ -270,9 +268,7 @@ public class DefaultPreferences extends EclipsePreferences {
 		return loadedNodes.contains(node.name());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.internal.preferences.EclipsePreferences#load()
-	 */
+
 	@Override
 	protected void load() {
 		setInitializingBundleDefaults();
@@ -287,9 +283,7 @@ public class DefaultPreferences extends EclipsePreferences {
 		applyCommandLineDefaults();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.internal.preferences.EclipsePreferences#internalPut(java.lang.String, java.lang.String)
-	 */
+
 	@Override
 	protected String internalPut(String key, String newValue) {
 		// set the value in this node
@@ -414,9 +408,7 @@ public class DefaultPreferences extends EclipsePreferences {
 		loadedNodes.add(name());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.osgi.service.prefs.Preferences#sync()
-	 */
+
 	@Override
 	public void sync() {
 		// default values are not persisted
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/EclipsePreferences.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/EclipsePreferences.java
index 96fd2c211..948232953 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/EclipsePreferences.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/EclipsePreferences.java
@@ -84,9 +84,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 			super();
 		}
 
-		/* (non-Javadoc)
-		 * @see java.util.Hashtable#keys()
-		 */
+
 		@Override
 		public synchronized Enumeration keys() {
 			TreeSet set = new TreeSet();
@@ -95,9 +93,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 			return Collections.enumeration(set);
 		}
 
-		/* (non-Javadoc)
-		 * @see java.util.Hashtable#entrySet()
-		 */
+
 		@Override
 		public Set entrySet() {
 			TreeSet set = new TreeSet(new Comparator() {
@@ -125,9 +121,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		this.cachedPath = null; // make sure the cached path is cleared after setting the parent
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#absolutePath()
-	 */
+
 	@Override
 	public String absolutePath() {
 		if (cachedPath == null) {
@@ -165,9 +159,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.IEclipsePreferences#addNodeChangeListener(org.eclipse.core.runtime.IEclipsePreferences.INodeChangeListener)
-	 */
+
 	@Override
 	public void addNodeChangeListener(INodeChangeListener listener) {
 		checkRemoved();
@@ -178,9 +170,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 			PrefsMessages.message("Added preference node change listener: " + listener + " to: " + absolutePath()); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.IEclipsePreferences#addPreferenceChangeListener(org.eclipse.core.runtime.IEclipsePreferences.IPreferenceChangeListener)
-	 */
+
 	@Override
 	public void addPreferenceChangeListener(IPreferenceChangeListener listener) {
 		checkRemoved();
@@ -207,9 +197,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 			throw new IllegalStateException(NLS.bind(PrefsMessages.preferences_removedNode, name));
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#childrenNames()
-	 */
+
 	@Override
 	public String[] childrenNames() throws BackingStoreException {
 		// illegal state if this node has been removed
@@ -233,9 +221,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		}
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#clear()
-	 */
+
 	@Override
 	public void clear() {
 		// illegal state if this node has been removed
@@ -381,9 +367,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		return result;
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IScope#create(org.eclipse.core.runtime.preferences.IEclipsePreferences)
-	 */
+
 	@Override
 	public IEclipsePreferences create(IEclipsePreferences nodeParent, String nodeName) {
 		return create((EclipsePreferences) nodeParent, nodeName, null);
@@ -430,9 +414,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		return result;
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#flush()
-	 */
+
 	@Override
 	public void flush() throws BackingStoreException {
 		IEclipsePreferences toFlush = null;
@@ -488,27 +470,21 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		return null;
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#get(java.lang.String, java.lang.String)
-	 */
+
 	@Override
 	public String get(String key, String defaultValue) {
 		String value = internalGet(key);
 		return value == null ? defaultValue : value;
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#getBoolean(java.lang.String, boolean)
-	 */
+
 	@Override
 	public boolean getBoolean(String key, boolean defaultValue) {
 		String value = internalGet(key);
 		return value == null ? defaultValue : TRUE.equalsIgnoreCase(value);
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#getByteArray(java.lang.String, byte[])
-	 */
+
 	@Override
 	public byte[] getByteArray(String key, byte[] defaultValue) {
 		String value = internalGet(key);
@@ -562,9 +538,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		return (IEclipsePreferences[]) result.toArray(EMPTY_NODE_ARRAY);
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#getDouble(java.lang.String, double)
-	 */
+
 	@Override
 	public double getDouble(String key, double defaultValue) {
 		String value = internalGet(key);
@@ -578,9 +552,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		return result;
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#getFloat(java.lang.String, float)
-	 */
+
 	@Override
 	public float getFloat(String key, float defaultValue) {
 		String value = internalGet(key);
@@ -594,9 +566,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		return result;
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#getInt(java.lang.String, int)
-	 */
+
 	@Override
 	public int getInt(String key, int defaultValue) {
 		String value = internalGet(key);
@@ -621,9 +591,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		return null;
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#getLong(java.lang.String, long)
-	 */
+
 	@Override
 	public long getLong(String key, long defaultValue) {
 		String value = internalGet(key);
@@ -720,9 +688,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		return descriptor == null ? true : descriptor.isAlreadyLoaded(node.absolutePath());
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#keys()
-	 */
+
 	@Override
 	public String[] keys() {
 		// illegal state if this node has been removed
@@ -817,17 +783,13 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		return dirty;
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#name()
-	 */
+
 	@Override
 	public String name() {
 		return name;
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#node(java.lang.String)
-	 */
+
 	@Override
 	public Preferences node(String pathName) {
 		return internalNode(pathName, true, null);
@@ -857,9 +819,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		}
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#nodeExists(java.lang.String)
-	 */
+
 	@Override
 	public boolean nodeExists(String path) throws BackingStoreException {
 		// short circuit for checking this node
@@ -892,9 +852,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		return child.nodeExists(path.substring(index + 1));
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#parent()
-	 */
+
 	@Override
 	public Preferences parent() {
 		// illegal state if this node has been removed
@@ -927,9 +885,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		}
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#put(java.lang.String, java.lang.String)
-	 */
+
 	@Override
 	public void put(String key, String newValue) {
 		if (key == null || newValue == null)
@@ -941,9 +897,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		}
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#putBoolean(java.lang.String, boolean)
-	 */
+
 	@Override
 	public void putBoolean(String key, boolean value) {
 		if (key == null)
@@ -956,9 +910,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		}
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#putByteArray(java.lang.String, byte[])
-	 */
+
 	@Override
 	public void putByteArray(String key, byte[] value) {
 		if (key == null || value == null)
@@ -971,9 +923,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		}
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#putDouble(java.lang.String, double)
-	 */
+
 	@Override
 	public void putDouble(String key, double value) {
 		if (key == null)
@@ -986,9 +936,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		}
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#putFloat(java.lang.String, float)
-	 */
+
 	@Override
 	public void putFloat(String key, float value) {
 		if (key == null)
@@ -1001,9 +949,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		}
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#putInt(java.lang.String, int)
-	 */
+
 	@Override
 	public void putInt(String key, int value) {
 		if (key == null)
@@ -1016,9 +962,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		}
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#putLong(java.lang.String, long)
-	 */
+
 	@Override
 	public void putLong(String key, long value) {
 		if (key == null)
@@ -1031,9 +975,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		}
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#remove(java.lang.String)
-	 */
+
 	@Override
 	public void remove(String key) {
 		String oldValue;
@@ -1049,9 +991,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		firePreferenceEvent(key, oldValue, null);
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#removeNode()
-	 */
+
 	@Override
 	public void removeNode() throws BackingStoreException {
 		// illegal state if this node has been removed
@@ -1107,9 +1047,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.IEclipsePreferences#removeNodeChangeListener(org.eclipse.core.runtime.IEclipsePreferences.removeNodeChangeListener)
-	 */
+
 	@Override
 	public void removeNodeChangeListener(INodeChangeListener listener) {
 		checkRemoved();
@@ -1122,9 +1060,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 			PrefsMessages.message("Removed preference node change listener: " + listener + " from: " + absolutePath()); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.IEclipsePreferences#removePreferenceChangeListener(org.eclipse.core.runtime.IEclipsePreferences.IPreferenceChangeListener)
-	 */
+
 	@Override
 	public void removePreferenceChangeListener(IPreferenceChangeListener listener) {
 		checkRemoved();
@@ -1294,9 +1230,7 @@ public class EclipsePreferences implements IEclipsePreferences, IScope {
 		return new String[] {path, key};
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#sync()
-	 */
+
 
 	@Override
 	public void sync() throws BackingStoreException {
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ExportedPreferences.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ExportedPreferences.java
index 4cf1db753..dc9cf3035 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ExportedPreferences.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ExportedPreferences.java
@@ -28,9 +28,7 @@ public class ExportedPreferences extends EclipsePreferences implements IExported
 		super(parent, name);
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IExportedPreferences#isExportRoot()
-	 */
+
 	@Override
 	public boolean isExportRoot() {
 		return isExportRoot;
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ImmutableMap.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ImmutableMap.java
index 963ac900a..f75491822 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ImmutableMap.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/ImmutableMap.java
@@ -146,9 +146,7 @@ public abstract class ImmutableMap implements Cloneable {
 			return this;
 		}
 
-		/* (non-Javadoc
-		 * Method declared on IStringPoolParticipant
-		 */
+
 		@Override
 		public void shareStrings(StringPool set) {
 			//copy elements for thread safety
@@ -265,9 +263,7 @@ public abstract class ImmutableMap implements Cloneable {
 	 */
 	public abstract ImmutableMap removeKey(String key);
 
-	/* (non-Javadoc
-	 * Method declared on IStringPoolParticipant
-	 */
+
 	public void shareStrings(StringPool set) {
 		// nothing to do
 	}
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferenceServiceRegistryHelper.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferenceServiceRegistryHelper.java
index 65a835760..d1399ca83 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferenceServiceRegistryHelper.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferenceServiceRegistryHelper.java
@@ -252,9 +252,7 @@ public class PreferenceServiceRegistryHelper implements IRegistryChangeListener
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IRegistryChangeListener#registryChanged(org.eclipse.core.runtime.IRegistryChangeEvent)
-	 */
+
 	@Override
 	public void registryChanged(IRegistryChangeEvent event) {
 		IExtensionDelta[] deltasOld = event.getExtensionDeltas(IPreferencesConstants.RUNTIME_NAME, IPreferencesConstants.PT_PREFERENCES);
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesService.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesService.java
index 6f712f966..c63638a2e 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesService.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesService.java
@@ -82,9 +82,7 @@ public class PreferencesService implements IPreferencesService {
 		initializeDefaultScopes();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#applyPreferences(org.eclipse.core.runtime.preferences.IEclipsePreferences, org.eclipse.core.runtime.preferences.IPreferenceFilter[])
-	 */
+
 	@Override
 	public void applyPreferences(IEclipsePreferences tree, IPreferenceFilter[] filters) throws CoreException {
 		if (filters == null || filters.length == 0)
@@ -106,9 +104,7 @@ public class PreferencesService implements IPreferencesService {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#applyPreferences(org.eclipse.core.runtime.preferences.IExportedPreferences)
-	 */
+
 	@Override
 	public IStatus applyPreferences(IExportedPreferences preferences) throws CoreException {
 		// TODO investigate refactoring to merge with new #apply(IEclipsePreferences, IPreferenceFilter[]) APIs
@@ -394,9 +390,7 @@ public class PreferencesService implements IPreferencesService {
 		return scope.create(root, key);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#exportPreferences(IEclipsePreferences, IPreferenceFilter[], OutputStream)
-	 */
+
 	@Override
 	public void exportPreferences(IEclipsePreferences node, IPreferenceFilter[] filters, OutputStream stream) throws CoreException {
 		if (filters == null || filters.length == 0)
@@ -408,9 +402,7 @@ public class PreferencesService implements IPreferencesService {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#exportPreferences(org.eclipse.core.runtime.preferences.IEclipsePreferences, java.io.OutputStream, java.lang.String[])
-	 */
+
 	@Override
 	public IStatus exportPreferences(IEclipsePreferences node, OutputStream output, String[] excludesList) throws CoreException {
 		// TODO investigate refactoring to merge with new #export(IEclipsePreferences, IPreferenceFilter[]) APIs
@@ -462,9 +454,7 @@ public class PreferencesService implements IPreferencesService {
 		return result[0];
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#get(java.lang.String, java.lang.String, org.osgi.service.prefs.Preferences[])
-	 */
+
 	@Override
 	public String get(String key, String defaultValue, Preferences[] nodes) {
 		if (nodes == null)
@@ -480,9 +470,7 @@ public class PreferencesService implements IPreferencesService {
 		return defaultValue;
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#getBoolean(java.lang.String, java.lang.String, boolean, org.eclipse.core.runtime.preferences.IScope[])
-	 */
+
 	@Override
 	public boolean getBoolean(String qualifier, String key, boolean defaultValue, IScopeContext[] scopes) {
 		String result = get(EclipsePreferences.decodePath(key)[1], null, getNodes(qualifier, key, scopes));
@@ -519,27 +507,21 @@ public class PreferencesService implements IPreferencesService {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#getByteArray(java.lang.String, java.lang.String, byte[], org.eclipse.core.runtime.preferences.IScope[])
-	 */
+
 	@Override
 	public byte[] getByteArray(String qualifier, String key, byte[] defaultValue, IScopeContext[] scopes) {
 		String result = get(EclipsePreferences.decodePath(key)[1], null, getNodes(qualifier, key, scopes));
 		return result == null ? defaultValue : Base64.decode(result.getBytes());
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#getDefaultLookupOrder(java.lang.String, java.lang.String)
-	 */
+
 	@Override
 	public String[] getDefaultLookupOrder(String qualifier, String key) {
 		LookupOrder order = (LookupOrder) defaultsRegistry.get(getRegistryKey(qualifier, key));
 		return order == null ? null : order.getOrder();
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#getDouble(java.lang.String, java.lang.String, double, org.eclipse.core.runtime.preferences.IScope[])
-	 */
+
 	@Override
 	public double getDouble(String qualifier, String key, double defaultValue, IScopeContext[] scopes) {
 		String value = get(EclipsePreferences.decodePath(key)[1], null, getNodes(qualifier, key, scopes));
@@ -552,9 +534,7 @@ public class PreferencesService implements IPreferencesService {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#getFloat(java.lang.String, java.lang.String, float, org.eclipse.core.runtime.preferences.IScope[])
-	 */
+
 	@Override
 	public float getFloat(String qualifier, String key, float defaultValue, IScopeContext[] scopes) {
 		String value = get(EclipsePreferences.decodePath(key)[1], null, getNodes(qualifier, key, scopes));
@@ -567,9 +547,7 @@ public class PreferencesService implements IPreferencesService {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#getInt(java.lang.String, java.lang.String, int, org.eclipse.core.runtime.preferences.IScope[])
-	 */
+
 	@Override
 	public int getInt(String qualifier, String key, int defaultValue, IScopeContext[] scopes) {
 		String value = get(EclipsePreferences.decodePath(key)[1], null, getNodes(qualifier, key, scopes));
@@ -582,13 +560,9 @@ public class PreferencesService implements IPreferencesService {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#getRootNode()
-	 */
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#getLong(java.lang.String, java.lang.String, long, org.eclipse.core.runtime.preferences.IScope[])
-	 */
+
+
 	@Override
 	public long getLong(String qualifier, String key, long defaultValue, IScopeContext[] scopes) {
 		String value = get(EclipsePreferences.decodePath(key)[1], null, getNodes(qualifier, key, scopes));
@@ -601,9 +575,7 @@ public class PreferencesService implements IPreferencesService {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#getLookupOrder(java.lang.String, java.lang.String)
-	 */
+
 	@Override
 	public String[] getLookupOrder(String qualifier, String key) {
 		String[] order = getDefaultLookupOrder(qualifier, key);
@@ -690,17 +662,13 @@ public class PreferencesService implements IPreferencesService {
 		return path.substring(startIndex + 1, endIndex);
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#getString(java.lang.String, java.lang.String, java.lang.String, org.eclipse.core.runtime.preferences.IScope[])
-	 */
+
 	@Override
 	public String getString(String qualifier, String key, String defaultValue, IScopeContext[] scopes) {
 		return get(EclipsePreferences.decodePath(key)[1], defaultValue, getNodes(qualifier, key, scopes));
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#importPreferences(java.io.InputStream)
-	 */
+
 	@Override
 	public IStatus importPreferences(InputStream input) throws CoreException {
 		if (EclipsePreferences.DEBUG_PREFERENCE_GENERAL)
@@ -855,9 +823,7 @@ public class PreferencesService implements IPreferencesService {
 		return properties.getProperty(VERSION_KEY) == null;
 	}
 
-	/* (non-Javadoc)
-	 * @see IPreferencesService#matches(IEclipsePreferences, IPreferenceFilter[])
-	 */
+
 	@Override
 	public IPreferenceFilter[] matches(IEclipsePreferences tree, IPreferenceFilter[] filters) throws CoreException {
 		if (filters == null || filters.length == 0)
@@ -888,9 +854,7 @@ public class PreferencesService implements IPreferencesService {
 		return result;
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#readPreferences(java.io.InputStream)
-	 */
+
 	@Override
 	public IExportedPreferences readPreferences(InputStream input) throws CoreException {
 		if (input == null)
@@ -946,9 +910,7 @@ public class PreferencesService implements IPreferencesService {
 		return scope.equals(sub);
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IPreferencesService#setDefaultLookupOrder(java.lang.String, java.lang.String, java.lang.String[])
-	 */
+
 	@Override
 	public void setDefaultLookupOrder(String qualifier, String key, String[] order) {
 		String registryKey = getRegistryKey(qualifier, key);
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/RootPreferences.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/RootPreferences.java
index 5d80775b7..a6436d026 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/RootPreferences.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/RootPreferences.java
@@ -27,9 +27,7 @@ public class RootPreferences extends EclipsePreferences {
 		super(null, ""); //$NON-NLS-1$
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#flush()
-	 */
+
 	@Override
 	public void flush() throws BackingStoreException {
 		// flush all children
@@ -49,9 +47,7 @@ public class RootPreferences extends EclipsePreferences {
 			throw exception;
 	}
 
-	/*
-	 * @see EclipsePreferences#getChild(String, Plugin)
-	 */
+
 	protected synchronized IEclipsePreferences getChild(String key, Object context) {
 		if (children == null)
 			return null;
@@ -66,9 +62,7 @@ public class RootPreferences extends EclipsePreferences {
 		return child;
 	}
 
-	/*
-	 * @see EclipsePreferences#getChildren()
-	 */
+
 	protected synchronized IEclipsePreferences[] getChildren() {
 		//must perform lazy initialization of child nodes
 		String[] childNames = new String[0];
@@ -84,9 +78,7 @@ public class RootPreferences extends EclipsePreferences {
 		return childNodes;
 	}
 
-	/*
-	 * @see Preferences#node(String)
-	 */
+
 	@Override
 	public Preferences node(String path) {
 		return getNode(path, true); // create if not found
@@ -113,9 +105,7 @@ public class RootPreferences extends EclipsePreferences {
 		return child.node(endIndex == -1 ? "" : path.substring(endIndex + 1)); //$NON-NLS-1$
 	}
 
-	/*
-	 * @see org.osgi.service.prefs.Preferences#sync()
-	 */
+
 	@Override
 	public void sync() throws BackingStoreException {
 		// sync all children
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/BundleDefaultsScope.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/BundleDefaultsScope.java
index a2a2fccc4..3c2a94027 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/BundleDefaultsScope.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/BundleDefaultsScope.java
@@ -58,25 +58,19 @@ public final class BundleDefaultsScope extends AbstractScope {
 		super();
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IScopeContext#getName()
-	 */
+
 	@Override
 	public String getName() {
 		return SCOPE;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.preferences.IScopeContext#getNode(java.lang.String)
-	 */
+
 	@Override
 	public IEclipsePreferences getNode(String qualifier) {
 		return super.getNode(qualifier);
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IScopeContext#getLocation()
-	 */
+
 	@Override
 	public IPath getLocation() {
 		// We don't persist defaults so return null.
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/ConfigurationScope.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/ConfigurationScope.java
index b170caa47..6a0ab3ce4 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/ConfigurationScope.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/ConfigurationScope.java
@@ -63,25 +63,19 @@ public final class ConfigurationScope extends AbstractScope {
 		super();
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IScopeContext#getName()
-	 */
+
 	@Override
 	public String getName() {
 		return SCOPE;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.preferences.IScopeContext#getNode(java.lang.String)
-	 */
+
 	@Override
 	public IEclipsePreferences getNode(String qualifier) {
 		return super.getNode(qualifier);
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IScopeContext#getLocation()
-	 */
+
 	@Override
 	public IPath getLocation() {
 		IPath result = null;
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/DefaultScope.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/DefaultScope.java
index cc82bedf1..2c1cc8b95 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/DefaultScope.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/DefaultScope.java
@@ -62,25 +62,19 @@ public final class DefaultScope extends AbstractScope {
 		super();
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IScopeContext#getName()
-	 */
+
 	@Override
 	public String getName() {
 		return SCOPE;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.preferences.IScopeContext#getNode(java.lang.String)
-	 */
+
 	@Override
 	public IEclipsePreferences getNode(String qualifier) {
 		return super.getNode(qualifier);
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IScopeContext#getLocation()
-	 */
+
 	@Override
 	public IPath getLocation() {
 		// We don't persist defaults so return null.
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/InstanceScope.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/InstanceScope.java
index f085b72dd..b98052f8c 100644
--- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/InstanceScope.java
+++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/runtime/preferences/InstanceScope.java
@@ -57,9 +57,7 @@ public final class InstanceScope extends AbstractScope {
 		super();
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IScopeContext#getLocation()
-	 */
+
 	@Override
 	public IPath getLocation() {
 		// Return null. The instance location usually corresponds to the state
@@ -67,17 +65,13 @@ public final class InstanceScope extends AbstractScope {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.core.runtime.preferences.IScopeContext#getName()
-	 */
+
 	@Override
 	public String getName() {
 		return SCOPE;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.preferences.IScopeContext#getNode(java.lang.String)
-	 */
+
 	@Override
 	public IEclipsePreferences getNode(String qualifier) {
 		return super.getNode(qualifier);