Remove useless non-javadoc see comments.

Handled by Override annotation.

Change-Id: Icd0334c0b57bb3021693117877a9af5fcda571d7
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

52 files changed, 74 insertions, 528 deletions

diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
index 72c625b65..53d6db5c2 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/DebugPlugin.java
@@ -646,9 +646,6 @@ public class DebugPlugin extends Plugin {
 		fEventListeners.remove(listener);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
 	@Override
 	public void stop(BundleContext context) throws Exception {
 		try {
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java
index 72e23c24a..fad75de0f 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/Launch.java
@@ -575,9 +575,6 @@ public class Launch extends PlatformObject implements ILaunch, IDisconnect, ILau
         return hasChildren();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchListener#launchRemoved(org.eclipse.debug.core.ILaunch)
-	 */
 	@Override
 	public void launchRemoved(ILaunch launch) {
 		if (this.equals(launch)) {
@@ -596,26 +593,17 @@ public class Launch extends PlatformObject implements ILaunch, IDisconnect, ILau
 		return DebugPlugin.getDefault().getLaunchManager();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchListener#launchAdded(org.eclipse.debug.core.ILaunch)
-	 */
 	@Override
 	public void launchAdded(ILaunch launch) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchListener#launchChanged(org.eclipse.debug.core.ILaunch)
-	 */
 	@Override
 	public void launchChanged(ILaunch launch) {
 	}
 
-	/* (non-Javadoc)
-	 *
-	 * If the launch configuration this launch is associated with is
-	 * moved, update the underlying handle to the new location.
-	 *
-	 * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationAdded(org.eclipse.debug.core.ILaunchConfiguration)
+	/*
+	 * If the launch configuration this launch is associated with is moved,
+	 * update the underlying handle to the new location.
 	 */
 	@Override
 	public void launchConfigurationAdded(ILaunchConfiguration configuration) {
@@ -626,18 +614,12 @@ public class Launch extends PlatformObject implements ILaunch, IDisconnect, ILau
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationChanged(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
 	@Override
 	public void launchConfigurationChanged(ILaunchConfiguration configuration) {}
 
-	/* (non-Javadoc)
-	 *
+	/*
 	 * Update the launch configuration associated with this launch if the
 	 * underlying configuration is deleted.
-	 *
-	 * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationRemoved(org.eclipse.debug.core.ILaunchConfiguration)
 	 */
 	@Override
 	public void launchConfigurationRemoved(ILaunchConfiguration configuration) {
@@ -649,9 +631,6 @@ public class Launch extends PlatformObject implements ILaunch, IDisconnect, ILau
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[])
-	 */
 	@Override
 	public void handleDebugEvents(DebugEvent[] events) {
 		for (int i = 0; i < events.length; i++) {
@@ -673,9 +652,6 @@ public class Launch extends PlatformObject implements ILaunch, IDisconnect, ILau
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
-	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T getAdapter(Class<T> adapter) {
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/DebugElement.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/DebugElement.java
index 4fd98de84..38bcb82dd 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/DebugElement.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/DebugElement.java
@@ -16,7 +16,6 @@ package org.eclipse.debug.core.model;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.PlatformObject;
 import org.eclipse.core.runtime.Status;
-
 import org.eclipse.debug.core.DebugEvent;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.DebugPlugin;
@@ -44,28 +43,16 @@ public abstract class DebugElement extends PlatformObject implements IDebugEleme
         fTarget = target;
     }
 
-    /* (non-Javadoc)
-     *
-     * Debug target implementation should override this method.
-     *
-     * @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
-     */
     @Override
 	public IDebugTarget getDebugTarget() {
         return fTarget;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
-     */
     @Override
 	public ILaunch getLaunch() {
         return getDebugTarget().getLaunch();
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-     */
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T getAdapter(Class<T> adapter) {
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java
index 44de44597..898a04197 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/LaunchConfigurationDelegate.java
@@ -192,16 +192,15 @@ public abstract class LaunchConfigurationDelegate implements ILaunchConfiguratio
 		}
 	}
 
-	/* (non-Javadoc)
-	 *
-	 * If launching in run mode, and the configuration supports debug mode, check
-	 * if there are any breakpoints in the workspace, and ask the user if they'd
-	 * rather launch in debug mode.
-	 * <p>
-	 * Since 3.2, this check also performs saving of resources before launching.
-	 * </p>
-	 *
-	 * @see org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#preLaunchCheck(org.eclipse.debug.core.ILaunchConfiguration, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
+	/*
+	 * If launching in run mode, and the configuration supports debug mode,
+	 * check if there are any breakpoints in the workspace, and ask the user if
+	 * they'd rather launch in debug mode. <p> Since 3.2, this check also
+	 * performs saving of resources before launching. </p>
+	 * @see
+	 * org.eclipse.debug.core.model.ILaunchConfigurationDelegate2#preLaunchCheck
+	 * (org.eclipse.debug.core.ILaunchConfiguration, java.lang.String,
+	 * org.eclipse.core.runtime.IProgressMonitor)
 	 */
 	@Override
 	public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java
index bc3ef65ea..76af4f599 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/AbstractSourceLookupDirector.java
@@ -322,12 +322,11 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec
 		}
 	}
 
-	/* (non-Javadoc)
-	 *
+	/*
 	 * Updates source containers in response to changes in underlying launch
 	 * configuration. Only responds to changes in non-working copies.
-	 *
-	 * @see org.eclipse.debug.core.ILaunchConfigurationListener#launchConfigurationChanged(org.eclipse.debug.core.ILaunchConfiguration)
+	 * @see org.eclipse.debug.core.ILaunchConfigurationListener#
+	 * launchConfigurationChanged(org.eclipse.debug.core.ILaunchConfiguration)
 	 */
 	@Override
 	public void launchConfigurationChanged(ILaunchConfiguration configuration) {
@@ -457,9 +456,9 @@ public abstract class AbstractSourceLookupDirector implements ISourceLookupDirec
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ISourceLocator#getSourceElement(org.eclipse.debug.core.model.IStackFrame)
-	 * Would be better to accept Object so this can be used for breakpoints and other objects.
+	/*
+	 * Would be better to accept Object so this can be used for breakpoints and
+	 * other objects.
 	 */
 	@Override
 	public Object getSourceElement(IStackFrame stackFrame) {
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/AbstractSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/AbstractSourceContainer.java
index 18b91867d..1f8941ea7 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/AbstractSourceContainer.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/AbstractSourceContainer.java
@@ -63,10 +63,8 @@ public abstract class AbstractSourceContainer extends PlatformObject implements
 		throw new CoreException(status);
 	}
 
-	/* (non-Javadoc)
-	 *
+	/*
 	 * By default, do nothing. Subclasses should override as required.
-	 *
 	 * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#dispose()
 	 */
 	@Override
@@ -74,25 +72,16 @@ public abstract class AbstractSourceContainer extends PlatformObject implements
 		fDirector = null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getSourceContainers()
-	 */
 	@Override
 	public ISourceContainer[] getSourceContainers() throws CoreException {
 		return new ISourceContainer[0];
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#isComposite()
-	 */
 	@Override
 	public boolean isComposite() {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#init(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector)
-	 */
 	@Override
 	public void init(ISourceLookupDirector director) {
 		fDirector = director;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ArchiveSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ArchiveSourceContainer.java
index 4a2bf3999..7777b1ec5 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ArchiveSourceContainer.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ArchiveSourceContainer.java
@@ -63,9 +63,6 @@ public class ArchiveSourceContainer extends AbstractSourceContainer {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName()
-	 */
 	@Override
 	public String getName() {
 		return fFile.getName();
@@ -80,34 +77,22 @@ public class ArchiveSourceContainer extends AbstractSourceContainer {
 		return fFile;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType()
-	 */
 	@Override
 	public ISourceContainerType getType() {
 		return getSourceContainerType(TYPE_ID);
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object obj) {
 		return obj instanceof ArchiveSourceContainer &&
 			((ArchiveSourceContainer)obj).getName().equals(getName());
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return getName().hashCode();
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#findSourceElements(java.lang.String)
-     */
     @Override
 	public Object[] findSourceElements(String name) throws CoreException {
         ExternalArchiveSourceContainer container = getDelegateContainer();
@@ -126,9 +111,6 @@ public class ArchiveSourceContainer extends AbstractSourceContainer {
     private ExternalArchiveSourceContainer getDelegateContainer() {
         return fDelegateContainer;
     }
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#init(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector)
-     */
     @Override
 	public void init(ISourceLookupDirector director) {
         super.init(director);
@@ -136,9 +118,6 @@ public class ArchiveSourceContainer extends AbstractSourceContainer {
             fDelegateContainer.init(director);
         }
     }
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#dispose()
-     */
     @Override
 	public void dispose() {
         super.dispose();
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.java
index ae9fb675e..c70809684 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/DefaultSourceContainer.java
@@ -46,17 +46,11 @@ public class DefaultSourceContainer extends CompositeSourceContainer {
 	public DefaultSourceContainer() {
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object obj) {
 		return obj instanceof DefaultSourceContainer;
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return getClass().hashCode();
@@ -77,9 +71,6 @@ public class DefaultSourceContainer extends CompositeSourceContainer {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType()
-	 */
 	@Override
 	public ISourceContainerType getType() {
 		return getSourceContainerType(TYPE_ID);
@@ -100,17 +91,11 @@ public class DefaultSourceContainer extends CompositeSourceContainer {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName()
-	 */
 	@Override
 	public String getName() {
 		return SourceLookupMessages.DefaultSourceContainer_0;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.containers.CompositeSourceContainer#createSourceContainers()
-	 */
 	@Override
 	protected ISourceContainer[] createSourceContainers() throws CoreException {
 		ISourcePathComputer sourcePathComputer = getSourcePathComputer();
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/FolderSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/FolderSourceContainer.java
index 9552d63cd..1ba6dc309 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/FolderSourceContainer.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/FolderSourceContainer.java
@@ -44,9 +44,6 @@ public class FolderSourceContainer extends ContainerSourceContainer {
 		super(folder, subfolders);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType()
-	 */
 	@Override
 	public ISourceContainerType getType() {
 		return getSourceContainerType(TYPE_ID);
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.java
index e7f9fd1a1..2c99f0d55 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/LocalFileStorage.java
@@ -54,9 +54,6 @@ public class LocalFileStorage extends PlatformObject implements IStorage {
 		setFile(file);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IStorage#getContents()
-	 */
 	@Override
 	public InputStream getContents() throws CoreException {
 		try {
@@ -66,9 +63,6 @@ public class LocalFileStorage extends PlatformObject implements IStorage {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IStorage#getFullPath()
-	 */
 	@Override
 	public IPath getFullPath() {
 		try {
@@ -79,17 +73,11 @@ public class LocalFileStorage extends PlatformObject implements IStorage {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IStorage#getName()
-	 */
 	@Override
 	public String getName() {
 		return getFile().getName();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IStorage#isReadOnly()
-	 */
 	@Override
 	public boolean isReadOnly() {
 		return true;
@@ -113,18 +101,12 @@ public class LocalFileStorage extends PlatformObject implements IStorage {
 		return fFile;
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object object) {
 		return object instanceof LocalFileStorage &&
 			 getFile().equals(((LocalFileStorage)object).getFile());
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return getFile().hashCode();
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.java
index 7067652ef..bc8daef13 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/WorkspaceSourceContainer.java
@@ -40,41 +40,26 @@ public class WorkspaceSourceContainer extends CompositeSourceContainer {
 	public WorkspaceSourceContainer() {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName()
-	 */
 	@Override
 	public String getName() {
 		return SourceLookupMessages.WorkspaceSourceContainer_0;
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object obj) {
 		return obj instanceof WorkspaceSourceContainer;
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return ResourcesPlugin.getWorkspace().hashCode();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getType()
-	 */
 	@Override
 	public ISourceContainerType getType() {
 		return getSourceContainerType(TYPE_ID);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.containers.CompositeSourceContainer#createSourceContainers()
-	 */
 	@Override
 	protected ISourceContainer[] createSourceContainers() throws CoreException {
 		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ZipEntryStorage.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ZipEntryStorage.java
index f6daf3653..2bf9eeef3 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ZipEntryStorage.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/sourcelookup/containers/ZipEntryStorage.java
@@ -62,9 +62,6 @@ public class ZipEntryStorage extends PlatformObject implements IStorage {
 		setZipEntry(entry);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IStorage#getContents()
-	 */
 	@Override
 	public InputStream getContents() throws CoreException {
 		try {
@@ -74,17 +71,11 @@ public class ZipEntryStorage extends PlatformObject implements IStorage {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IStorage#getFullPath()
-	 */
 	@Override
 	public IPath getFullPath() {
 		return new Path(getArchive().getName()).append(getZipEntry().getName());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IStorage#getName()
-	 */
 	@Override
 	public String getName() {
 		int index = getZipEntry().getName().lastIndexOf('\\');
@@ -97,9 +88,6 @@ public class ZipEntryStorage extends PlatformObject implements IStorage {
 		return getZipEntry().getName().substring(index + 1);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IStorage#isReadOnly()
-	 */
 	@Override
 	public boolean isReadOnly() {
 		return true;
@@ -141,9 +129,6 @@ public class ZipEntryStorage extends PlatformObject implements IStorage {
 		return fZipEntry;
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object object) {
 		return object instanceof ZipEntryStorage &&
@@ -151,9 +136,6 @@ public class ZipEntryStorage extends PlatformObject implements IStorage {
 			 getZipEntry().getName().equals(((ZipEntryStorage)object).getZipEntry().getName());
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return getZipEntry().getName().hashCode();
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java
index 6b3ed75bb..cc991ebcb 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/BreakpointManager.java
@@ -176,9 +176,6 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 
 		private PostChangeVisitor fVisitor = new PostChangeVisitor();
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-		 */
 		@Override
 		public void resourceChanged(IResourceChangeEvent event) {
 			IResourceDelta delta= event.getDelta();
@@ -229,9 +226,6 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 
 	class PostChangeVisitor implements IResourceDeltaVisitor {
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
-		 */
 		@Override
 		public boolean visit(IResourceDelta delta) throws CoreException {
 			if (delta == null) {
@@ -419,9 +413,6 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 		return fMarkersToBreakpoints.get(marker);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointManager#getBreakpoints()
-	 */
 	@Override
 	public IBreakpoint[] getBreakpoints() {
 		IBreakpoint[] temp = new IBreakpoint[0];
@@ -460,9 +451,6 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 		return fBreakpoints;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointManager#getBreakpoints(java.lang.String)
-	 */
 	@Override
 	public IBreakpoint[] getBreakpoints(String modelIdentifier) {
 		Vector<IBreakpoint> allBreakpoints = getBreakpoints0();
@@ -1112,18 +1100,12 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 		private IMarkerDelta[] fDeltas;
 		private IBreakpoint[] fNotifierBreakpoints;
 
-		/**
-		 * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
-		 */
 		@Override
 		public void handleException(Throwable exception) {
 			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, "An exception occurred during breakpoint change notification.", exception);  //$NON-NLS-1$
 			DebugPlugin.log(status);
 		}
 
-		/**
-		 * @see org.eclipse.core.runtime.ISafeRunnable#run()
-		 */
 		@Override
 		public void run() throws Exception {
 			switch (fType) {
@@ -1162,17 +1144,11 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointManager#isEnabled()
-	 */
 	@Override
 	public boolean isEnabled() {
 		return Platform.getPreferencesService().getBoolean(DebugPlugin.getUniqueIdentifier(), IInternalDebugCoreConstants.PREF_BREAKPOINT_MANAGER_ENABLED_STATE, true, null);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointManager#setEnabled(boolean)
-	 */
 	@Override
 	public void setEnabled(final boolean enabled) {
         if (isEnabled() != enabled) {
@@ -1182,17 +1158,11 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
         }
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointManager#addBreakpointManagerListener(org.eclipse.debug.core.IBreakpointManagerListener)
-	 */
 	@Override
 	public void addBreakpointManagerListener(IBreakpointManagerListener listener) {
 		fBreakpointManagerListeners.add(listener);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointManager#removeBreakpointManagerListener(org.eclipse.debug.core.IBreakpointManagerListener)
-	 */
 	@Override
 	public void removeBreakpointManagerListener(IBreakpointManagerListener listener) {
 		fBreakpointManagerListeners.remove(listener);
@@ -1207,18 +1177,12 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 		private IBreakpointManagerListener fListener;
 		private boolean fManagerEnabled;
 
-		/**
-		 * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
-		 */
 		@Override
 		public void handleException(Throwable exception) {
 			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, "An exception occurred during breakpoint change notification.", exception);  //$NON-NLS-1$
 			DebugPlugin.log(status);
 		}
 
-		/**
-		 * @see org.eclipse.core.runtime.ISafeRunnable#run()
-		 */
 		@Override
 		public void run() throws Exception {
 			fListener.breakpointManagerEnablementChanged(fManagerEnabled);
@@ -1248,18 +1212,12 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 		private IBreakpointManagerListener fListener;
 		private IBreakpoint fManagerTriggerPoint;
 
-		/**
-		 * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
-		 */
 		@Override
 		public void handleException(Throwable exception) {
 			IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.INTERNAL_ERROR, "An exception occurred during breakpoint change notification.", exception); //$NON-NLS-1$
 			DebugPlugin.log(status);
 		}
 
-		/**
-		 * @see org.eclipse.core.runtime.ISafeRunnable#run()
-		 */
 		@Override
 		public void run() throws Exception {
 			fListener.breakpointManagerTriggerPointChanged(fManagerTriggerPoint);
@@ -1290,9 +1248,6 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 			setSystem(true);
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
-		 */
 		@Override
 		protected IStatus run(IProgressMonitor monitor) {
 			try {
@@ -1304,9 +1259,6 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
 		}
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.core.IBreakpointManager#getTypeName(org.eclipse.debug.core.model.IBreakpoint)
-     */
     @Override
 	public String getTypeName(IBreakpoint breakpoint) {
         String typeName= null;
@@ -1323,9 +1275,6 @@ public class BreakpointManager implements IBreakpointManager, IResourceChangeLis
         return typeName;
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointManager#getImportParticipants(java.lang.String)
-	 */
 	@Override
 	public IBreakpointImportParticipant[] getImportParticipants(String markertype) throws CoreException {
 		initializeImportParticipants();
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugPreferenceInitializer.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugPreferenceInitializer.java
index d0258a09b..aacfafd3e 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugPreferenceInitializer.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/DebugPreferenceInitializer.java
@@ -23,9 +23,6 @@ import org.eclipse.debug.core.DebugPlugin;
  */
 public class DebugPreferenceInitializer extends AbstractPreferenceInitializer {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
 	@Override
 	public void initializeDefaultPreferences() {
 		// Step filter preferences
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/EnvironmentVariableResolver.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/EnvironmentVariableResolver.java
index 199e426e1..0a9cba4e0 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/EnvironmentVariableResolver.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/EnvironmentVariableResolver.java
@@ -31,9 +31,6 @@ import org.eclipse.osgi.service.environment.Constants;
  */
 public class EnvironmentVariableResolver implements IDynamicVariableResolver {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.variables.IDynamicVariableResolver#resolveValue(org.eclipse.core.variables.IDynamicVariable, java.lang.String)
-	 */
 	@Override
 	public String resolveValue(IDynamicVariable variable, String argument) throws CoreException {
 		if (argument == null) {
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchMode.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchMode.java
index 5aa593943..147def062 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchMode.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchMode.java
@@ -74,24 +74,15 @@ public class LaunchMode implements ILaunchMode {
 		throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.ERROR, MessageFormat.format(DebugCoreMessages.LaunchMode_1, new Object[] { attrName }), null));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchMode#getIdentifier()
-	 */
 	@Override
 	public String getIdentifier() {
 		return fConfigurationElement.getAttribute(IConfigurationElementConstants.MODE);
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchMode#getLabel()
-	 */
 	@Override
 	public String getLabel() {
 		return fConfigurationElement.getAttribute(IConfigurationElementConstants.LABEL);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchMode#getLaunchAsLabel()
-	 */
 	@Override
 	public String getLaunchAsLabel() {
 		String label = fConfigurationElement.getAttribute(IConfigurationElementConstants.LAUNCH_AS_LABEL);
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureType.java
index 46579f0f6..0d801a2b0 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LogicalStructureType.java
@@ -85,33 +85,21 @@ public class LogicalStructureType implements ILogicalStructureType {
 		throw new CoreException(new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.ERROR, MessageFormat.format(DebugCoreMessages.LogicalStructureType_1, new Object[] { attrName }), null));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.ILogicalStructureType#getDescription()
-	 */
 	@Override
 	public String getDescription() {
 		return fConfigurationElement.getAttribute(IConfigurationElementConstants.DESCRIPTION);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.ILogicalStructureType#getId()
-	 */
 	@Override
 	public String getId() {
 		return fConfigurationElement.getAttribute(IConfigurationElementConstants.ID);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.ILogicalStructureType#getLogicalStructure(org.eclipse.debug.core.model.IValue)
-	 */
 	@Override
 	public IValue getLogicalStructure(IValue value) throws CoreException {
 		return getDelegate().getLogicalStructure(value);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.ILogicalStructureType#providesLogicalStructure(org.eclipse.debug.core.model.IValue)
-	 */
 	@Override
 	public boolean providesLogicalStructure(IValue value) {
 		if (value.getModelIdentifier().equals(fModelId)) {
@@ -135,9 +123,6 @@ public class LogicalStructureType implements ILogicalStructureType {
 		return fDelegate;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.ILogicalStructureTypeDelegate2#getDescription(org.eclipse.debug.core.model.IValue)
-	 */
 	@Override
 	public String getDescription(IValue value) {
 		ILogicalStructureTypeDelegate delegate = getDelegate();
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java
index b79d31ab3..5abe88d65 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/NullStreamsProxy.java
@@ -29,32 +29,20 @@ public class NullStreamsProxy implements IStreamsProxy2 {
         errorStreamMonitor = new NullStreamMonitor(process.getErrorStream());
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.core.model.IStreamsProxy2#closeInputStream()
-     */
     @Override
 	public void closeInputStream() throws IOException {
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.core.model.IStreamsProxy#getErrorStreamMonitor()
-     */
     @Override
 	public IStreamMonitor getErrorStreamMonitor() {
         return errorStreamMonitor;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.core.model.IStreamsProxy#getOutputStreamMonitor()
-     */
     @Override
 	public IStreamMonitor getOutputStreamMonitor() {
         return outputStreamMonitor;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.core.model.IStreamsProxy#write(java.lang.String)
-     */
     @Override
 	public void write(String input) throws IOException {
     }
@@ -82,24 +70,15 @@ public class NullStreamsProxy implements IStreamsProxy2 {
 
         }
 
-        /* (non-Javadoc)
-         * @see org.eclipse.debug.core.model.IStreamMonitor#addListener(org.eclipse.debug.core.IStreamListener)
-         */
         @Override
 		public void addListener(IStreamListener listener) {
         }
 
-        /* (non-Javadoc)
-         * @see org.eclipse.debug.core.model.IStreamMonitor#getContents()
-         */
         @Override
 		public String getContents() {
             return ""; //$NON-NLS-1$
         }
 
-        /* (non-Javadoc)
-         * @see org.eclipse.debug.core.model.IStreamMonitor#removeListener(org.eclipse.debug.core.IStreamListener)
-         */
         @Override
 		public void removeListener(IStreamListener listener) {
         }
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java
index 5113d148e..af02abdd4 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/OutputStreamMonitor.java
@@ -91,9 +91,6 @@ public class OutputStreamMonitor implements IFlushableStreamMonitor {
 		fDone = new AtomicBoolean(false);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStreamMonitor#addListener(org.eclipse.debug.core.IStreamListener)
-	 */
 	@Override
 	public synchronized void addListener(IStreamListener listener) {
 		fListeners.add(listener);
@@ -125,9 +122,6 @@ public class OutputStreamMonitor implements IFlushableStreamMonitor {
 		getNotifier().notifyAppend(text);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStreamMonitor#getContents()
-	 */
 	@Override
 	public synchronized String getContents() {
 		return fContents.toString();
@@ -207,9 +201,6 @@ public class OutputStreamMonitor implements IFlushableStreamMonitor {
 		fKilled= true;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IStreamMonitor#removeListener(org.eclipse.debug.core.IStreamListener)
-	 */
 	@Override
 	public synchronized void removeListener(IStreamListener listener) {
 		fListeners.remove(listener);
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/StreamsProxy.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/StreamsProxy.java
index 1c7ab5bf9..c3fab169f 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/StreamsProxy.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/StreamsProxy.java
@@ -108,25 +108,16 @@ public class StreamsProxy implements IStreamsProxy, IStreamsProxy2 {
 		fInputMonitor.close();
 	}
 
-	/**
-	 * @see IStreamsProxy#getErrorStreamMonitor()
-	 */
 	@Override
 	public IStreamMonitor getErrorStreamMonitor() {
 		return fErrorMonitor;
 	}
 
-	/**
-	 * @see IStreamsProxy#getOutputStreamMonitor()
-	 */
 	@Override
 	public IStreamMonitor getOutputStreamMonitor() {
 		return fOutputMonitor;
 	}
 
-	/**
-	 * @see IStreamsProxy#write(String)
-	 */
 	@Override
 	public void write(String input) throws IOException {
 		if (!isClosed(false)) {
@@ -136,9 +127,6 @@ public class StreamsProxy implements IStreamsProxy, IStreamsProxy2 {
 		}
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.core.model.IStreamsProxy2#closeInputStream()
-     */
     @Override
 	public void closeInputStream() throws IOException {
         if (!isClosed(false)) {
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/SystemPropertyResolver.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/SystemPropertyResolver.java
index 5ad4808a7..965644a1a 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/SystemPropertyResolver.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/SystemPropertyResolver.java
@@ -26,9 +26,6 @@ import org.eclipse.debug.core.DebugPlugin;
  */
 public class SystemPropertyResolver implements IDynamicVariableResolver {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.variables.IDynamicVariableResolver#resolveValue(org.eclipse.core.variables.IDynamicVariable, java.lang.String)
-	 */
 	@Override
 	public String resolveValue(IDynamicVariable variable, String argument) throws CoreException {
 		if (argument == null) {
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/SystemVariableResolver.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/SystemVariableResolver.java
index 7906c1684..ed80baf16 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/SystemVariableResolver.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/SystemVariableResolver.java
@@ -35,9 +35,6 @@ import org.eclipse.core.variables.IDynamicVariableResolver;
  * @since 3.0
  */
 public class SystemVariableResolver implements IDynamicVariableResolver {
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.variables.IDynamicVariableResolver#resolveValue(org.eclipse.core.variables.IDynamicVariable, java.lang.String)
-	 */
 	@Override
 	public String resolveValue(IDynamicVariable variable, String argument) throws CoreException {
 		if ("ARCH".equals(argument)) { //$NON-NLS-1$
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java
index 8890d679a..3e66c8483 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/WatchExpression.java
@@ -14,7 +14,6 @@
 package org.eclipse.debug.internal.core;
 
 import org.eclipse.core.runtime.Platform;
-
 import org.eclipse.debug.core.DebugEvent;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.DebugPlugin;
@@ -72,15 +71,7 @@ public class WatchExpression implements IWatchExpression {
 			return;
 		}
 
-		IWatchExpressionListener listener= new IWatchExpressionListener() {
-			/* (non-Javadoc)
-			 * @see org.eclipse.debug.core.model.IWatchExpressionListener#watchEvaluationFinished(org.eclipse.debug.core.model.IWatchExpressionResult)
-			 */
-			@Override
-			public void watchEvaluationFinished(IWatchExpressionResult result) {
-				setResult(result);
-			}
-		};
+		IWatchExpressionListener listener = result -> setResult(result);
 		setPending(true);
 		IWatchExpressionDelegate delegate= DebugPlugin.getDefault().getExpressionManager().newWatchExpressionDelegate(context.getModelIdentifier());
 		if (delegate != null) {
@@ -112,9 +103,6 @@ public class WatchExpression implements IWatchExpression {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IWatchExpression#setExpressionContext(org.eclipse.debug.core.model.IDebugElement)
-	 */
 	@Override
 	public void setExpressionContext(IDebugElement context) {
 		synchronized (this) {
@@ -300,17 +288,11 @@ public class WatchExpression implements IWatchExpression {
 		fireEvent(new DebugEvent(this, DebugEvent.CHANGE, DebugEvent.STATE));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IErrorReportingExpression#hasErrors()
-	 */
 	@Override
 	public boolean hasErrors() {
 		return fResult != null && fResult.hasErrors();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IErrorReportingExpression#getErrorMessages()
-	 */
 	@Override
 	public String[] getErrorMessages() {
 		if (fResult == null) {
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/XMLMemento.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/XMLMemento.java
index d149c0f4b..c2c59ad0e 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/XMLMemento.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/XMLMemento.java
@@ -154,18 +154,18 @@ public final class XMLMemento {
         this.element = element;
     }
 
-    /* (non-Javadoc)
-     * Method declared in XMLMemento.
-     */
+	/*
+	 * Method declared in XMLMemento.
+	 */
     public XMLMemento createChild(String type) {
         Element child = factory.createElement(type);
         element.appendChild(child);
         return new XMLMemento(factory, child);
     }
 
-    /* (non-Javadoc)
-     * Method declared in XMLMemento.
-     */
+	/*
+	 * Method declared in XMLMemento.
+	 */
     public XMLMemento createChild(String type, String id) {
         Element child = factory.createElement(type);
         child.setAttribute(IMementoConstants.TAG_ID, id == null ? "" : id); //$NON-NLS-1$
@@ -173,9 +173,9 @@ public final class XMLMemento {
         return new XMLMemento(factory, child);
     }
 
-    /* (non-Javadoc)
-     * Method declared in XMLMemento.
-     */
+	/*
+	 * Method declared in XMLMemento.
+	 */
     public XMLMemento copyChild(XMLMemento child) {
         Element childElement = child.element;
         Element newElement = (Element) factory.importNode(childElement, true);
@@ -183,9 +183,9 @@ public final class XMLMemento {
         return new XMLMemento(factory, newElement);
     }
 
-    /* (non-Javadoc)
-     * Method declared in XMLMemento.
-     */
+	/*
+	 * Method declared in XMLMemento.
+	 */
     public XMLMemento getChild(String type) {
 
         // Get the nodes.
@@ -210,9 +210,9 @@ public final class XMLMemento {
         return null;
     }
 
-    /* (non-Javadoc)
-     * Method declared in XMLMemento.
-     */
+	/*
+	 * Method declared in XMLMemento.
+	 */
     public XMLMemento[] getChildren(String type) {
 
         // Get the nodes.
@@ -243,9 +243,9 @@ public final class XMLMemento {
         return results;
     }
 
-    /* (non-Javadoc)
-     * Method declared in XMLMemento.
-     */
+	/*
+	 * Method declared in XMLMemento.
+	 */
     public Float getFloat(String key) {
         Attr attr = element.getAttributeNode(key);
         if (attr == null) {
@@ -265,16 +265,16 @@ public final class XMLMemento {
 		return element.getNodeName();
 	}
 
-    /* (non-Javadoc)
-     * Method declared in XMLMemento.
-     */
+	/*
+	 * Method declared in XMLMemento.
+	 */
     public String getID() {
         return element.getAttribute(IMementoConstants.TAG_ID);
     }
 
-    /* (non-Javadoc)
-     * Method declared in XMLMemento.
-     */
+	/*
+	 * Method declared in XMLMemento.
+	 */
     public Integer getInteger(String key) {
         Attr attr = element.getAttributeNode(key);
         if (attr == null) {
@@ -291,9 +291,9 @@ public final class XMLMemento {
         }
     }
 
-    /* (non-Javadoc)
-     * Method declared in XMLMemento.
-     */
+	/*
+	 * Method declared in XMLMemento.
+	 */
     public String getString(String key) {
         Attr attr = element.getAttributeNode(key);
         if (attr == null) {
@@ -310,9 +310,9 @@ public final class XMLMemento {
         return Boolean.valueOf(attr.getValue());
 	}
 
-    /* (non-Javadoc)
-     * Method declared in XMLMemento.
-     */
+	/*
+	 * Method declared in XMLMemento.
+	 */
     public String getTextData() {
         Text textNode = getTextNode();
         if (textNode != null) {
@@ -386,32 +386,32 @@ public final class XMLMemento {
         }
     }
 
-    /* (non-Javadoc)
-     * Method declared in XMLMemento.
-     */
+	/*
+	 * Method declared in XMLMemento.
+	 */
     public void putFloat(String key, float f) {
         element.setAttribute(key, String.valueOf(f));
     }
 
-    /* (non-Javadoc)
-     * Method declared in XMLMemento.
-     */
+	/*
+	 * Method declared in XMLMemento.
+	 */
     public void putInteger(String key, int n) {
         element.setAttribute(key, String.valueOf(n));
     }
 
-    /* (non-Javadoc)
-     * Method declared in XMLMemento.
-     */
+	/*
+	 * Method declared in XMLMemento.
+	 */
     public void putMemento(XMLMemento memento) {
     	// Do not copy the element's top level text node (this would overwrite the existing text).
     	// Text nodes of children are copied.
         putElement(memento.element, false);
     }
 
-    /* (non-Javadoc)
-     * Method declared in XMLMemento.
-     */
+	/*
+	 * Method declared in XMLMemento.
+	 */
     public void putString(String key, String value) {
         if (value == null) {
 			return;
@@ -428,9 +428,9 @@ public final class XMLMemento {
 		element.setAttribute(key, value ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
-    /* (non-Javadoc)
-     * Method declared in XMLMemento.
-     */
+	/*
+	 * Method declared in XMLMemento.
+	 */
     public void putTextData(String data) {
         Text textNode = getTextNode();
         if (textNode == null) {
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/CommandAdapterFactory.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/CommandAdapterFactory.java
index 7457fa278..e6fc3d3fc 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/CommandAdapterFactory.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/CommandAdapterFactory.java
@@ -14,7 +14,6 @@
 package org.eclipse.debug.internal.core.commands;
 
 import org.eclipse.core.runtime.IAdapterFactory;
-
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.commands.IDisconnectHandler;
 import org.eclipse.debug.core.commands.IDropToFrameHandler;
@@ -52,9 +51,6 @@ public class CommandAdapterFactory implements IAdapterFactory {
 	private static IResumeHandler fgResumeCommand = new ResumeCommand();
 	private static IStepFiltersHandler fgStepFiltersCommand = new StepFiltersCommand();
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
@@ -109,9 +105,6 @@ public class CommandAdapterFactory implements IAdapterFactory {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
 	@Override
 	public Class<?>[] getAdapterList() {
 		return new Class[]{
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/DebugCommandRequest.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/DebugCommandRequest.java
index 288933c4e..eac8a170a 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/DebugCommandRequest.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/DebugCommandRequest.java
@@ -26,9 +26,6 @@ public class DebugCommandRequest extends Request implements IDebugCommandRequest
 		fElements = elements;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.commands.IDebugCommandRequest#getElements()
-	 */
 	@Override
 	public Object[] getElements() {
 		return fElements;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/DisconnectCommand.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/DisconnectCommand.java
index 0b6c49641..500b1c365 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/DisconnectCommand.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/DisconnectCommand.java
@@ -30,25 +30,16 @@ public class DisconnectCommand extends ForEachCommand implements IDisconnectHand
 		return getAdapter(element, IDisconnect.class);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.commands.ForEachCommand#execute(java.lang.Object)
-	 */
 	@Override
 	protected void execute(Object target) throws CoreException {
 		((IDisconnect)target).disconnect();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.commands.ForEachCommand#isExecutable(java.lang.Object)
-	 */
 	@Override
 	protected boolean isExecutable(Object target) {
 		return ((IDisconnect)target).canDisconnect();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.commands.AbstractDebugCommand#getEnabledStateJobFamily(org.eclipse.debug.core.commands.IDebugCommandRequest)
-	 */
 	@Override
 	protected Object getEnabledStateJobFamily(IDebugCommandRequest request) {
 		return IDisconnectHandler.class;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/DropToFrameCommand.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/DropToFrameCommand.java
index 13fcc7c7d..fc2665b8b 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/DropToFrameCommand.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/DropToFrameCommand.java
@@ -30,25 +30,16 @@ public class DropToFrameCommand extends StepCommand implements IDropToFrameHandl
 		return getAdapter(element, IDropToFrame.class);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.commands.StepCommand#isSteppable(java.lang.Object)
-	 */
 	@Override
 	protected boolean isSteppable(Object target) throws CoreException {
 		return ((IDropToFrame)target).canDropToFrame();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.commands.StepCommand#step(java.lang.Object)
-	 */
 	@Override
 	protected void step(Object target) throws CoreException {
 		((IDropToFrame)target).dropToFrame();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.commands.AbstractDebugCommand#getEnabledStateJobFamily(org.eclipse.debug.core.commands.IDebugCommandRequest)
-	 */
 	@Override
 	protected Object getEnabledStateJobFamily(IDebugCommandRequest request) {
 		return IDropToFrameHandler.class;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/ForEachCommand.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/ForEachCommand.java
index d11b5e436..a890c4c95 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/ForEachCommand.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/ForEachCommand.java
@@ -26,9 +26,6 @@ import org.eclipse.debug.core.commands.IEnabledStateRequest;
  */
 public abstract class ForEachCommand extends AbstractDebugCommand {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.commands.DebugCommand#doExecute(java.lang.Object[], org.eclipse.core.runtime.IProgressMonitor, org.eclipse.debug.core.IRequest)
-	 */
 	@Override
 	protected void doExecute(Object[] targets, IProgressMonitor monitor, IRequest request) throws CoreException {
 		for (int i = 0; i < targets.length; i++) {
@@ -39,9 +36,6 @@ public abstract class ForEachCommand extends AbstractDebugCommand {
 
 	protected abstract void execute(Object target) throws CoreException;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.commands.DebugCommand#isExecutable(java.lang.Object[], org.eclipse.core.runtime.IProgressMonitor, org.eclipse.debug.core.commands.IEnabledStateRequest)
-	 */
 	@Override
 	protected boolean isExecutable(Object[] targets, IProgressMonitor monitor, IEnabledStateRequest request) throws CoreException {
 		for (int i = 0; i < targets.length; i++) {
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/Request.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/Request.java
index 0112cc007..628104de0 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/Request.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/Request.java
@@ -25,40 +25,25 @@ public class Request implements IRequest {
 	private IStatus fStatus;
 	private boolean fCanceled = false;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IRequest#done()
-	 */
 	@Override
 	public void done() {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IRequest#getStatus()
-	 */
 	@Override
 	public IStatus getStatus() {
 		return fStatus;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IRequest#setStatus(org.eclipse.core.runtime.IStatus)
-	 */
 	@Override
 	public void setStatus(IStatus status) {
 		fStatus = status;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IRequest#cancel()
-	 */
 	@Override
 	public synchronized void cancel() {
 		fCanceled = true;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IRequest#isCanceled()
-	 */
 	@Override
 	public synchronized boolean isCanceled() {
 		return fCanceled;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/ResumeCommand.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/ResumeCommand.java
index 62e85d82a..217891369 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/ResumeCommand.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/ResumeCommand.java
@@ -35,9 +35,6 @@ public class ResumeCommand extends SuspendCommand implements IResumeHandler {
 		return ((ISuspendResume)target).canResume();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.commands.SuspendCommand#getEnabledStateJobFamily(org.eclipse.debug.core.commands.IDebugCommandRequest)
-	 */
 	@Override
 	protected Object getEnabledStateJobFamily(IDebugCommandRequest request) {
 		return IResumeHandler.class;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepFiltersCommand.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepFiltersCommand.java
index 42262220c..1db82aa0a 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepFiltersCommand.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepFiltersCommand.java
@@ -66,9 +66,6 @@ public class StepFiltersCommand extends ForEachCommand implements IStepFiltersHa
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.commands.ForEachCommand#execute(java.lang.Object)
-	 */
 	@Override
 	protected void execute(Object target) throws CoreException {
 		if (target == null) {
@@ -81,9 +78,6 @@ public class StepFiltersCommand extends ForEachCommand implements IStepFiltersHa
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.commands.ForEachCommand#isExecutable(java.lang.Object)
-	 */
 	@Override
 	protected boolean isExecutable(Object target) {
 		IStepFilters[] filters = (IStepFilters[]) target;
@@ -96,9 +90,6 @@ public class StepFiltersCommand extends ForEachCommand implements IStepFiltersHa
 		return true;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.commands.AbstractDebugCommand#getEnabledStateJobFamily(org.eclipse.debug.core.commands.IDebugCommandRequest)
-	 */
 	@Override
 	protected Object getEnabledStateJobFamily(IDebugCommandRequest request) {
 		return IStepFiltersHandler.class;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepIntoCommand.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepIntoCommand.java
index 4fa9b2080..58127d055 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepIntoCommand.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepIntoCommand.java
@@ -35,9 +35,6 @@ public class StepIntoCommand extends StepCommand implements IStepIntoHandler {
 		((IStep)target).stepInto();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.commands.AbstractDebugCommand#getEnabledStateJobFamily(org.eclipse.debug.core.commands.IDebugCommandRequest)
-	 */
 	@Override
 	protected Object getEnabledStateJobFamily(IDebugCommandRequest request) {
 		return IStepIntoHandler.class;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepOverCommand.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepOverCommand.java
index 5c3802845..4ff028bc1 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepOverCommand.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepOverCommand.java
@@ -31,17 +31,11 @@ public class StepOverCommand extends StepCommand implements IStepOverHandler {
 		((IStep)target).stepOver();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.commands.StepCommand#isSteppable(java.lang.Object)
-	 */
 	@Override
 	protected boolean isSteppable(Object target) {
 		return ((IStep)target).canStepOver();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.commands.AbstractDebugCommand#getEnabledStateJobFamily(org.eclipse.debug.core.commands.IDebugCommandRequest)
-	 */
 	@Override
 	protected Object getEnabledStateJobFamily(IDebugCommandRequest request) {
 		return IStepOverHandler.class;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepReturnCommand.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepReturnCommand.java
index 3cf5b3d85..80efd0dc9 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepReturnCommand.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/StepReturnCommand.java
@@ -35,10 +35,6 @@ public class StepReturnCommand extends StepCommand implements IStepReturnHandler
 		((IStep)target).stepReturn();
 	}
 
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.commands.AbstractDebugCommand#getEnabledStateJobFamily(org.eclipse.debug.core.commands.IDebugCommandRequest)
-	 */
 	@Override
 	protected Object getEnabledStateJobFamily(IDebugCommandRequest request) {
 		return IStepReturnHandler.class;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/SuspendCommand.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/SuspendCommand.java
index 6778031ad..f53072767 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/SuspendCommand.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/SuspendCommand.java
@@ -40,9 +40,6 @@ public class SuspendCommand extends ForEachCommand implements ISuspendHandler {
 		return ((ISuspendResume)target).canSuspend();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.commands.AbstractDebugCommand#getEnabledStateJobFamily(org.eclipse.debug.core.commands.IDebugCommandRequest)
-	 */
 	@Override
 	protected Object getEnabledStateJobFamily(IDebugCommandRequest request) {
 		return ISuspendHandler.class;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/TerminateCommand.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/TerminateCommand.java
index 271c9245f..2e5d323a8 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/TerminateCommand.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/commands/TerminateCommand.java
@@ -40,9 +40,6 @@ public class TerminateCommand extends ForEachCommand implements ITerminateHandle
 		return ((ITerminate)target).canTerminate();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.commands.AbstractDebugCommand#getEnabledStateJobFamily(org.eclipse.debug.core.commands.IDebugCommandRequest)
-	 */
 	@Override
 	protected Object getEnabledStateJobFamily(IDebugCommandRequest request) {
 		return ITerminateHandler.class;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java
index d9f92120a..66b92886b 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/groups/GroupLaunchConfigurationDelegate.java
@@ -257,25 +257,11 @@ public class GroupLaunchConfigurationDelegate extends LaunchConfigurationDelegat
 		return true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.core.model.LaunchConfigurationDelegate#buildProjects(
-	 * org.eclipse.core.resources.IProject[],
-	 * org.eclipse.core.runtime.IProgressMonitor)
-	 */
 	@Override
 	protected void buildProjects(IProject[] projects, IProgressMonitor monitor) throws CoreException {
 		// do nothing, project can be rebuild for each launch individually
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.core.model.LaunchConfigurationDelegate#buildForLaunch(
-	 * org.eclipse.debug.core.ILaunchConfiguration, java.lang.String,
-	 * org.eclipse.core.runtime.IProgressMonitor)
-	 */
 	@Override
 	public boolean buildForLaunch(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
 		// not build for this one
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceContainerType.java
index cd45375bd..85f441028 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourceContainerType.java
@@ -47,16 +47,11 @@ public class SourceContainerType implements ISourceContainerType {
 		fElement = element;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#createSourceContainer(java.lang.String)
-	 */
 	@Override
 	public ISourceContainer createSourceContainer(String memento) throws CoreException {
 		return getDelegate().createSourceContainer(memento);
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
-	 */
+
 	@Override
 	public String getMemento(ISourceContainer container) throws CoreException {
 		if (this.equals(container.getType())) {
@@ -65,16 +60,12 @@ public class SourceContainerType implements ISourceContainerType {
 		IStatus status = new Status(IStatus.ERROR, DebugPlugin.getUniqueIdentifier(), DebugPlugin.ERROR, SourceLookupMessages.SourceContainerType_0, null);
 		throw new CoreException(status);
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getName()
-	 */
+
 	@Override
 	public String getName() {
 		return fElement.getAttribute(IConfigurationElementConstants.NAME);
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getId()
-	 */
+
 	@Override
 	public String getId() {
 		return fElement.getAttribute(IConfigurationElementConstants.ID);
@@ -91,9 +82,7 @@ public class SourceContainerType implements ISourceContainerType {
 		}
 		return fDelegate;
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getDescription()
-	 */
+
 	@Override
 	public String getDescription() {
 		return fElement.getAttribute(IConfigurationElementConstants.DESCRIPTION);
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourcePathComputer.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourcePathComputer.java
index d112d40cb..e3393febc 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourcePathComputer.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/SourcePathComputer.java
@@ -45,9 +45,6 @@ public class SourcePathComputer implements ISourcePathComputer {
 		fElement = element;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourcePathComputer#getId()
-	 */
 	@Override
 	public String getId() {
 		return fElement.getAttribute(IConfigurationElementConstants.ID);
@@ -65,9 +62,6 @@ public class SourcePathComputer implements ISourcePathComputer {
 		return fDelegate;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate#computeSourceContainers(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.core.runtime.IProgressMonitor)
-	 */
 	@Override
 	public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor) {
 		try {
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ArchiveSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ArchiveSourceContainerType.java
index 381dbf719..eaeafd6ee 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ArchiveSourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ArchiveSourceContainerType.java
@@ -32,9 +32,6 @@ import org.w3c.dom.Node;
  */
 public class ArchiveSourceContainerType extends AbstractSourceContainerTypeDelegate {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#createSourceContainer(java.lang.String)
-	 */
 	@Override
 	public ISourceContainer createSourceContainer(String memento) throws CoreException {
 		Node node = parseDocument(memento);
@@ -55,9 +52,7 @@ public class ArchiveSourceContainerType extends AbstractSourceContainerTypeDeleg
 		abort(SourceLookupMessages.ExternalArchiveSourceContainerType_12, null);
 		return null;
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
-	 */
+
 	@Override
 	public String getMemento(ISourceContainer container) throws CoreException {
 		ArchiveSourceContainer archive = (ArchiveSourceContainer) container;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DefaultSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DefaultSourceContainerType.java
index 1dba2f384..4e169a2c4 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DefaultSourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DefaultSourceContainerType.java
@@ -30,9 +30,6 @@ import org.w3c.dom.Node;
  */
 public class DefaultSourceContainerType extends AbstractSourceContainerTypeDelegate {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
-	 */
 	@Override
 	public String getMemento(ISourceContainer container) throws CoreException {
 		Document document = newDocument();
@@ -41,9 +38,6 @@ public class DefaultSourceContainerType extends AbstractSourceContainerTypeDeleg
 		return serializeDocument(document);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#createSourceContainer(java.lang.String)
-	 */
 	@Override
 	public ISourceContainer createSourceContainer(String memento)throws CoreException {
 		Node node = parseDocument(memento);
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DirectorySourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DirectorySourceContainerType.java
index fb71a8710..3fb4858d3 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DirectorySourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/DirectorySourceContainerType.java
@@ -30,9 +30,6 @@ import org.w3c.dom.Node;
  */
 public class DirectorySourceContainerType extends AbstractSourceContainerTypeDelegate {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#createSourceContainer(java.lang.String)
-	 */
 	@Override
 	public ISourceContainer createSourceContainer(String memento) throws CoreException {
 		Node node = parseDocument(memento);
@@ -53,9 +50,6 @@ public class DirectorySourceContainerType extends AbstractSourceContainerTypeDel
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
-	 */
 	@Override
 	public String getMemento(ISourceContainer container) throws CoreException {
 		DirectorySourceContainer folder = (DirectorySourceContainer) container;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ExternalArchiveSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ExternalArchiveSourceContainerType.java
index 7863d9d20..4b449c8dd 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ExternalArchiveSourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ExternalArchiveSourceContainerType.java
@@ -29,9 +29,6 @@ import org.w3c.dom.Node;
  */
 public class ExternalArchiveSourceContainerType extends AbstractSourceContainerTypeDelegate {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#createSourceContainer(java.lang.String)
-	 */
 	@Override
 	public ISourceContainer createSourceContainer(String memento) throws CoreException {
 		Node node = parseDocument(memento);
@@ -51,9 +48,7 @@ public class ExternalArchiveSourceContainerType extends AbstractSourceContainerT
 		abort(SourceLookupMessages.ExternalArchiveSourceContainerType_12, null);
 		return null;
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
-	 */
+
 	@Override
 	public String getMemento(ISourceContainer container) throws CoreException {
 		ExternalArchiveSourceContainer archive = (ExternalArchiveSourceContainer) container;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/FolderSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/FolderSourceContainerType.java
index 406d26ac1..80a63ca4d 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/FolderSourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/FolderSourceContainerType.java
@@ -33,9 +33,6 @@ import org.w3c.dom.Node;
  */
 public class FolderSourceContainerType extends AbstractSourceContainerTypeDelegate {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
-	 */
 	@Override
 	public String getMemento(ISourceContainer container) throws CoreException {
 		FolderSourceContainer folderSourceContainer = (FolderSourceContainer)container;
@@ -51,9 +48,6 @@ public class FolderSourceContainerType extends AbstractSourceContainerTypeDelega
 		return serializeDocument(document);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#createSourceContainer(java.lang.String)
-	 */
 	@Override
 	public ISourceContainer createSourceContainer(String memento) throws CoreException {
 		Node node = parseDocument(memento);
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ProjectSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ProjectSourceContainerType.java
index a546419f5..0b3e344f0 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ProjectSourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/ProjectSourceContainerType.java
@@ -32,9 +32,6 @@ import org.w3c.dom.Node;
  */
 public class ProjectSourceContainerType extends AbstractSourceContainerTypeDelegate {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
-	 */
 	@Override
 	public String getMemento(ISourceContainer container) throws CoreException {
 		ProjectSourceContainer project = (ProjectSourceContainer) container;
@@ -50,9 +47,6 @@ public class ProjectSourceContainerType extends AbstractSourceContainerTypeDeleg
 		return serializeDocument(document);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerType#createSourceContainer(java.lang.String)
-	 */
 	@Override
 	public ISourceContainer createSourceContainer(String memento) throws CoreException {
 		Node node = parseDocument(memento);
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/WorkspaceSourceContainerType.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/WorkspaceSourceContainerType.java
index d9f0ff072..17c08032b 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/WorkspaceSourceContainerType.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/sourcelookup/containers/WorkspaceSourceContainerType.java
@@ -29,9 +29,6 @@ import org.w3c.dom.Node;
  */
 public class WorkspaceSourceContainerType extends AbstractSourceContainerTypeDelegate {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#createSourceContainer(java.lang.String)
-	 */
 	@Override
 	public ISourceContainer createSourceContainer(String memento) throws CoreException {
 		Node node = parseDocument(memento);
@@ -45,9 +42,7 @@ public class WorkspaceSourceContainerType extends AbstractSourceContainerTypeDel
 		abort(SourceLookupMessages.WorkspaceSourceContainerType_4, null);
 		return null;
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.sourcelookup.ISourceContainerTypeDelegate#getMemento(org.eclipse.debug.internal.core.sourcelookup.ISourceContainer)
-	 */
+
 	@Override
 	public String getMemento(ISourceContainer container) throws CoreException {
 		Document document = newDocument();
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/ContainerResolver.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/ContainerResolver.java
index dcecd3367..141da14ff 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/ContainerResolver.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/ContainerResolver.java
@@ -25,9 +25,6 @@ import org.eclipse.core.resources.IResource;
  */
 public class ContainerResolver extends ResourceResolver {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.stringsubstitution.ResourceResolver#translateSelectedResource(org.eclipse.core.resources.IResource)
-	 */
 	@Override
 	protected IResource translateSelectedResource(IResource resource) {
 		return resource.getParent();
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/DateTimeResolver.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/DateTimeResolver.java
index dd032a276..478c384ad 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/DateTimeResolver.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/DateTimeResolver.java
@@ -32,9 +32,6 @@ import org.eclipse.osgi.util.NLS;
  */
 public class DateTimeResolver implements IDynamicVariableResolver {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.variables.IDynamicVariableResolver#resolveValue(org.eclipse.core.variables.IDynamicVariable, java.lang.String)
-	 */
 	@Override
 	public String resolveValue(IDynamicVariable variable, String argument) throws CoreException {
 		SimpleDateFormat format = null;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/ProjectResolver.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/ProjectResolver.java
index cdeb04fa9..4c4ba15e3 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/ProjectResolver.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/ProjectResolver.java
@@ -24,9 +24,7 @@ import org.eclipse.core.resources.IResource;
  * @since 3.5
  */
 public class ProjectResolver extends ResourceResolver {
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.stringsubstitution.ResourceResolver#translateSelectedResource(org.eclipse.core.resources.IResource)
-	 */
+
 	@Override
 	protected IResource translateSelectedResource(IResource resource) {
 		return resource.getProject();
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/ResourceResolver.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/ResourceResolver.java
index 103035b14..9d13dfe6d 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/ResourceResolver.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/ResourceResolver.java
@@ -41,9 +41,6 @@ import com.ibm.icu.text.MessageFormat;
  */
 public class ResourceResolver implements IDynamicVariableResolver {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.stringsubstitution.IContextVariableResolver#resolveValue(org.eclipse.debug.internal.core.stringsubstitution.IContextVariable, java.lang.String)
-	 */
 	@Override
 	public String resolveValue(IDynamicVariable variable, String argument) throws CoreException {
 		IResource resource = null;
diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/WorkspaceResolver.java b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/WorkspaceResolver.java
index 0726dc993..c27267d62 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/WorkspaceResolver.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/variables/WorkspaceResolver.java
@@ -37,9 +37,6 @@ import org.eclipse.osgi.util.NLS;
  */
 public final class WorkspaceResolver implements IDynamicVariableResolver {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.variables.IDynamicVariableResolver#resolveValue(org.eclipse.core.variables.IDynamicVariable, java.lang.String)
-	 */
 	@Override
 	public String resolveValue(IDynamicVariable variable, String argument) throws CoreException {
 		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();