Remove useless non-javadoc see comments. (take 2)

Handled by Override annotation.

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

154 files changed, 381 insertions, 2704 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugCheckboxSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugCheckboxSelectionDialog.java
index 1e50c30ee..e306b33e3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugCheckboxSelectionDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugCheckboxSelectionDialog.java
@@ -61,9 +61,6 @@ public abstract class AbstractDebugCheckboxSelectionDialog extends AbstractDebug
 		return (CheckboxTableViewer) fViewer;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#initializeControls()
-	 */
 	@Override
 	protected void initializeControls() {
 		List<?> selectedElements = getInitialElementSelections();
@@ -74,9 +71,6 @@ public abstract class AbstractDebugCheckboxSelectionDialog extends AbstractDebug
 		super.initializeControls();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#createViewer(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	protected StructuredViewer createViewer(Composite parent){
 		//by default return a checkbox table viewer
@@ -88,9 +82,6 @@ public abstract class AbstractDebugCheckboxSelectionDialog extends AbstractDebug
 		return new CheckboxTableViewer(table);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#addViewerListeners(org.eclipse.jface.viewers.StructuredViewer)
-	 */
 	@Override
 	protected void addViewerListeners(StructuredViewer viewer) {
 		getCheckBoxTableViewer().addCheckStateListener(new DefaultCheckboxListener());
@@ -108,17 +99,11 @@ public abstract class AbstractDebugCheckboxSelectionDialog extends AbstractDebug
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.AbstractDebugSelectionDialog#isValid()
-	 */
 	@Override
 	protected boolean isValid() {
 		return getCheckBoxTableViewer().getCheckedElements().length > 0;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
 	@Override
 	protected void okPressed() {
 		Object[] elements =  getCheckBoxTableViewer().getCheckedElements();
@@ -126,9 +111,6 @@ public abstract class AbstractDebugCheckboxSelectionDialog extends AbstractDebug
 		super.okPressed();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#addCustomFooterControls(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	protected void addCustomFooterControls(Composite parent) {
 		if (fShowSelectButtons){
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java
index e34e6a376..fd2fdc4e4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugListSelectionDialog.java
@@ -45,9 +45,6 @@ public abstract class AbstractDebugListSelectionDialog extends AbstractDebugSele
 		setShellStyle(getShellStyle() | SWT.RESIZE);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.AbstractDebugSelectionDialog#createViewer(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	protected StructuredViewer createViewer(Composite parent){
 		//by default return a table viewer
@@ -58,9 +55,6 @@ public abstract class AbstractDebugListSelectionDialog extends AbstractDebugSele
 		return fListViewer;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.launchConfigurations.AbstractDebugSelectionDialog#addViewerListeners(org.eclipse.jface.viewers.StructuredViewer)
-	 */
 	@Override
 	protected void addViewerListeners(StructuredViewer viewer) {
 		viewer.addSelectionChangedListener(new ISelectionChangedListener(){
@@ -79,9 +73,6 @@ public abstract class AbstractDebugListSelectionDialog extends AbstractDebugSele
 		});
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.AbstractDebugSelectionDialog#isValid()
-	 */
 	@Override
 	protected boolean isValid() {
 		if(fListViewer != null) {
@@ -93,9 +84,6 @@ public abstract class AbstractDebugListSelectionDialog extends AbstractDebugSele
 		return false;
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-     */
     @Override
 	protected void okPressed() {
 		ISelection selection = fViewer.getSelection();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java
index 760c8b47a..9cc311402 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/AbstractDebugSelectionDialog.java
@@ -155,9 +155,6 @@ public abstract class AbstractDebugSelectionDialog extends SelectionDialog {
     	return fViewer;
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createContents(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	protected Control createContents(Composite parent) {
 		Composite comp = (Composite) super.createContents(parent);
@@ -165,9 +162,6 @@ public abstract class AbstractDebugSelectionDialog extends SelectionDialog {
 		return comp;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		initializeDialogUnits(parent);
@@ -206,9 +200,6 @@ public abstract class AbstractDebugSelectionDialog extends SelectionDialog {
 	 */
 	abstract protected String getViewerLabel();
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.SelectionDialog#getDialogBoundsSettings()
-	 */
 	@Override
 	protected IDialogSettings getDialogBoundsSettings() {
 		IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/BreakpointImageProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/BreakpointImageProvider.java
index ca48840ad..7b3468319 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/BreakpointImageProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/BreakpointImageProvider.java
@@ -27,11 +27,6 @@ import org.eclipse.ui.texteditor.MarkerAnnotation;
  * @since 3.0
  */
 public class BreakpointImageProvider implements IAnnotationImageProvider {
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getManagedImage(org.eclipse.jface.text.source.Annotation)
-	 */
 	@Override
 	public Image getManagedImage(Annotation annotation) {
 		if (annotation instanceof MarkerAnnotation) {
@@ -45,16 +40,10 @@ public class BreakpointImageProvider implements IAnnotationImageProvider {
 		}
 		return null;
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptorId(org.eclipse.jface.text.source.Annotation)
-	 */
 	@Override
 	public String getImageDescriptorId(Annotation annotation) {
 		return null;
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptor(java.lang.String)
-	 */
 	@Override
 	public ImageDescriptor getImageDescriptor(String imageDescritporId) {
 		return null;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java
index 68cb4f82e..f7281fee6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugModelPropertyTester.java
@@ -38,9 +38,6 @@ public class DebugModelPropertyTester extends PropertyTester {
 	public static final String MODEL_TYPE_PROPERTY = "getModelIdentifier"; //$NON-NLS-1$
 	public static final String IS_TERMINATED_OR_DISCONNECTED_PROPERTY = "isTerminatedOrDisconnected"; //$NON-NLS-1$
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.expressions.PropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
-	 */
 	@Override
 	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
 		if (MODEL_TYPE_PROPERTY.equals(property)){
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
index 959d1f884..175436224 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DebugUIPlugin.java
@@ -421,9 +421,6 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
 		return DebugPluginImages.initializeImageRegistry();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
-	 */
 	@Override
 	public void stop(BundleContext context) throws Exception {
 		try {
@@ -500,9 +497,6 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
 		return fSaveParticipants.remove(participant);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
 	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
@@ -588,9 +582,6 @@ public class DebugUIPlugin extends AbstractUIPlugin implements ILaunchListener,
 				});
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.osgi.service.debug.DebugOptionsListener#optionsChanged(org.eclipse.osgi.service.debug.DebugOptions)
-	 */
 	@Override
 	public void optionsChanged(DebugOptions options) {
 		fgDebugTrace = options.newDebugTrace(getUniqueIdentifier());
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java
index d86b25aef..94bf2b550 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DelegatingModelPresentation.java
@@ -68,9 +68,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
 	 */
 	private HashMap<String, IDebugModelPresentation> fLabelProviders = new HashMap<>(5);
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDebugEditorPresentation#removeAnnotations(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IThread)
-	 */
 	@Override
 	public void removeAnnotations(IEditorPart editorPart, IThread thread) {
 		IDebugModelPresentation presentation = getConfiguredPresentation(thread);
@@ -79,9 +76,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDebugEditorPresentation#addAnnotations(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame)
-	 */
 	@Override
 	public boolean addAnnotations(IEditorPart editorPart, IStackFrame frame) {
 		IDebugModelPresentation presentation = getConfiguredPresentation(frame);
@@ -138,9 +132,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
 		}
 	}
 
-	/**
-	 * @see IDebugModelPresentation#getImage(Object)
-	 */
 	@Override
 	public Image getImage(Object item) {
 		// Attempt to delegate
@@ -155,9 +146,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
 		return getDefaultImage(item);
 	}
 
-	/**
-     * @see IDebugModelPresentation#getText(Object)
-     */
     @Override
 	public String getText(Object item) {
     	IDebugModelPresentation lp= getConfiguredPresentation(item);
@@ -167,9 +155,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
     	return getDefaultText(item);
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ISourcePresentation#getEditorInput(java.lang.Object)
-	 */
 	@Override
 	public IEditorInput getEditorInput(Object item) {
 		IDebugModelPresentation lp= getConfiguredPresentation(item);
@@ -179,9 +164,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ISourcePresentation#getEditorId(org.eclipse.ui.IEditorInput, java.lang.Object)
-	 */
 	@Override
 	public String getEditorId(IEditorInput input, Object objectInput) {
 		IDebugModelPresentation lp= getConfiguredPresentation(objectInput);
@@ -206,9 +188,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
 		return DebugUIPlugin.getDefaultLabelProvider().getImage(element);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDebugModelPresentation#computeDetail(org.eclipse.debug.core.model.IValue, org.eclipse.debug.ui.IValueDetailListener)
-	 */
 	@Override
 	public void computeDetail(IValue value, IValueDetailListener listener) {
 		IDebugModelPresentation lp= getConfiguredPresentation(value);
@@ -281,9 +260,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
 		return getLabelProviders().get(id);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDebugModelPresentation#setAttribute(java.lang.String, java.lang.Object)
-	 */
 	@Override
 	public void setAttribute(String id, Object value) {
 		if (value == null) {
@@ -343,9 +319,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
 		return fLabelProviders;
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
-     */
     @Override
 	public Color getForeground(Object element) {
         IDebugModelPresentation presentation = getConfiguredPresentation(element);
@@ -356,9 +329,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
-     */
     @Override
 	public Color getBackground(Object element) {
         IDebugModelPresentation presentation = getConfiguredPresentation(element);
@@ -369,9 +339,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
-     */
     @Override
 	public Font getFont(Object element) {
         IDebugModelPresentation presentation = getConfiguredPresentation(element);
@@ -382,9 +349,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
         return null;
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getInstructionPointerAnnotation(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame)
-	 */
 	@Override
 	public Annotation getInstructionPointerAnnotation(IEditorPart editorPart, IStackFrame frame) {
 		IDebugModelPresentation presentation = getConfiguredPresentation(frame);
@@ -448,9 +412,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
 		return annotation;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getMarkerAnnotationSpecificationId(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame)
-	 */
 	@Override
 	public String getInstructionPointerAnnotationType(IEditorPart editorPart, IStackFrame frame) {
 		IDebugModelPresentation presentation = getConfiguredPresentation(frame);
@@ -460,9 +421,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getInstructionPointerImage(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame)
-	 */
 	@Override
 	public Image getInstructionPointerImage(IEditorPart editorPart, IStackFrame frame) {
 		IDebugModelPresentation presentation = getConfiguredPresentation(frame);
@@ -472,9 +430,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getInstructionPointerText(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame)
-	 */
 	@Override
 	public String getInstructionPointerText(IEditorPart editorPart, IStackFrame frame) {
 		IDebugModelPresentation presentation = getConfiguredPresentation(frame);
@@ -484,9 +439,6 @@ public class DelegatingModelPresentation implements IDebugModelPresentation, IDe
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDebugModelPresentationExtension#requiresUIThread(java.lang.Object)
-	 */
 	@Override
 	public boolean requiresUIThread(Object element) {
 		IDebugModelPresentation presentation = getConfiguredPresentation(element);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DynamicInstructionPointerAnnotation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DynamicInstructionPointerAnnotation.java
index 9148b9503..b40a196cf 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DynamicInstructionPointerAnnotation.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/DynamicInstructionPointerAnnotation.java
@@ -39,9 +39,6 @@ public class DynamicInstructionPointerAnnotation extends Annotation {
 		fStackFrame = frame;
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object other) {
 		if (other instanceof DynamicInstructionPointerAnnotation) {
@@ -50,9 +47,6 @@ public class DynamicInstructionPointerAnnotation extends Annotation {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return getStackFrame().hashCode();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerContext.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerContext.java
index 09c2085a5..3da6085fe 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerContext.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerContext.java
@@ -52,9 +52,6 @@ public class InstructionPointerContext {
 		fAnnotation = annotation;
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object other) {
 		if (other instanceof InstructionPointerContext) {
@@ -66,9 +63,6 @@ public class InstructionPointerContext {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return getAnnotation().hashCode() + getEditor().hashCode();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerImageProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerImageProvider.java
index 9a309ba25..3d4c02eda 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerImageProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerImageProvider.java
@@ -22,9 +22,6 @@ import org.eclipse.ui.texteditor.IAnnotationImageProvider;
 
 public class InstructionPointerImageProvider implements IAnnotationImageProvider {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getManagedImage(org.eclipse.jface.text.source.Annotation)
-	 */
 	@Override
 	public Image getManagedImage(Annotation annotation) {
 		if (annotation instanceof InstructionPointerAnnotation) {
@@ -35,17 +32,11 @@ public class InstructionPointerImageProvider implements IAnnotationImageProvider
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptorId(org.eclipse.jface.text.source.Annotation)
-	 */
 	@Override
 	public String getImageDescriptorId(Annotation annotation) {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptor(java.lang.String)
-	 */
 	@Override
 	public ImageDescriptor getImageDescriptor(String imageDescritporId) {
 		return null;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerManager.java
index 6d63a3a92..c9132420d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/InstructionPointerManager.java
@@ -304,9 +304,6 @@ public class InstructionPointerManager{
 		@Override
 		public void partBroughtToTop(IWorkbenchPartReference partRef) {}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference)
-		 */
 		@Override
 		public void partClosed(IWorkbenchPartReference partRef) {
 			IWorkbenchPart part = partRef.getPart(false);
@@ -316,9 +313,6 @@ public class InstructionPointerManager{
 
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference)
-		 */
 		@Override
 		public void partInputChanged(IWorkbenchPartReference partRef) {
 			IWorkbenchPart part = partRef.getPart(false);
@@ -338,9 +332,6 @@ public class InstructionPointerManager{
 		@Override
 		public void pageOpened(IWorkbenchPage page) {}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.IPageListener#pageClosed(org.eclipse.ui.IWorkbenchPage)
-		 */
 		@Override
 		public void pageClosed(IWorkbenchPage page) {
 			page.removePartListener(getPartListener());
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java
index 18bb43b88..e32129daf 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/LazyModelPresentation.java
@@ -84,9 +84,6 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
 	private DelegatingModelPresentation fOwner = null;
 
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDebugEditorPresentation#removeAnntations(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IThread)
-	 */
 	@Override
 	public void removeAnnotations(IEditorPart editorPart, IThread thread) {
 		IDebugModelPresentation presentation = getPresentation();
@@ -95,9 +92,6 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDebugEditorPresentation#addAnnotations(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame)
-	 */
 	@Override
 	public boolean addAnnotations(IEditorPart editorPart, IStackFrame frame) {
 		IDebugModelPresentation presentation = getPresentation();
@@ -400,9 +394,6 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
 		return fAttributes;
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
-     */
     @Override
 	public Color getForeground(Object element) {
         IDebugModelPresentation presentation = getPresentation();
@@ -413,9 +404,6 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
-     */
     @Override
 	public Color getBackground(Object element) {
         IDebugModelPresentation presentation = getPresentation();
@@ -426,9 +414,6 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
-     */
     @Override
 	public Font getFont(Object element) {
         IDebugModelPresentation presentation = getPresentation();
@@ -439,9 +424,6 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
         return null;
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getInstructionPointerAnnotation(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame)
-	 */
 	@Override
 	public Annotation getInstructionPointerAnnotation(IEditorPart editorPart, IStackFrame frame) {
 		IDebugModelPresentation presentation = getPresentation();
@@ -452,9 +434,6 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getMarkerAnnotationSpecificationId(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame)
-	 */
 	@Override
 	public String getInstructionPointerAnnotationType(IEditorPart editorPart, IStackFrame frame) {
 		IDebugModelPresentation presentation = getPresentation();
@@ -465,9 +444,6 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getInstructionPointerImage(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame)
-	 */
 	@Override
 	public Image getInstructionPointerImage(IEditorPart editorPart, IStackFrame frame) {
 		IDebugModelPresentation presentation = getPresentation();
@@ -478,9 +454,6 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IInstructionPointerPresentation#getInstructionPointerText(org.eclipse.ui.IEditorPart, org.eclipse.debug.core.model.IStackFrame)
-	 */
 	@Override
 	public String getInstructionPointerText(IEditorPart editorPart, IStackFrame frame) {
 		IDebugModelPresentation presentation = getPresentation();
@@ -491,9 +464,6 @@ public class LazyModelPresentation implements IDebugModelPresentation, IDebugEdi
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDebugModelPresentationExtension#requiresUIThread(java.lang.Object)
-	 */
 	@Override
 	public boolean requiresUIThread(Object element) {
 		if (!DebugPluginImages.isInitialized()) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java
index 1af185ad3..4e7d834eb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/MultipleInputDialog.java
@@ -65,9 +65,6 @@ public class MultipleInputDialog extends Dialog {
 		setShellStyle(getShellStyle() | SWT.RESIZE);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
 	@Override
 	protected void configureShell(Shell shell) {
 		super.configureShell(shell);
@@ -77,9 +74,6 @@ public class MultipleInputDialog extends Dialog {
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createButtonBar(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	protected Control createButtonBar(Composite parent) {
 		Control bar = super.createButtonBar(parent);
@@ -87,9 +81,6 @@ public class MultipleInputDialog extends Dialog {
 		return bar;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite container = (Composite)super.createDialogArea(parent);
@@ -368,9 +359,6 @@ public class MultipleInputDialog extends Dialog {
 		controlList.add(text);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
 	@Override
 	protected void okPressed() {
 		for (Text control : controlList) {
@@ -380,10 +368,6 @@ public class MultipleInputDialog extends Dialog {
 		super.okPressed();
 	}
 
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#open()
-	 */
 	@Override
 	public int open() {
 		applyDialogFont(panel);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java
index 43304246a..53c76a253 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/ResourceExtender.java
@@ -46,9 +46,6 @@ public class ResourceExtender extends PropertyTester {
 
     private static final String PROPERTY_MATCHES_CONTENT_TYPE = "matchesContentType"; //$NON-NLS-1$
 
-    /* (non-Javadoc)
-     * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
-     */
     @Override
 	public boolean test(Object receiver, String method, Object[] args, Object expectedValue) {
         IResource resource = ((IAdaptable) receiver).getAdapter(IResource.class);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextManager.java
index 1ead0e2aa..c8669a24c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextManager.java
@@ -60,23 +60,14 @@ public class ViewContextManager implements IWindowListener {
 		workbench.addWindowListener(this);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow)
-	 */
 	@Override
 	public void windowActivated(IWorkbenchWindow window) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow)
-	 */
 	@Override
 	public void windowDeactivated(IWorkbenchWindow window) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow)
-	 */
 	@Override
 	public void windowClosed(IWorkbenchWindow window) {
 		ViewContextService service = fWindowToService.get(window);
@@ -86,9 +77,6 @@ public class ViewContextManager implements IWindowListener {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow)
-	 */
 	@Override
 	public void windowOpened(IWorkbenchWindow window) {
 		ViewContextService service = fWindowToService.get(window);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java
index b88fc1ebe..62def7381 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/ViewContextService.java
@@ -907,23 +907,14 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPerspectiveListener3#perspectiveOpened(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor)
-	 */
 	@Override
 	public void perspectiveOpened(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPerspectiveListener3#perspectiveClosed(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor)
-	 */
 	@Override
 	public void perspectiveClosed(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPerspectiveListener3#perspectiveDeactivated(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor)
-	 */
 	@Override
 	public void perspectiveDeactivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
 	}
@@ -943,16 +934,10 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPerspectiveListener3#perspectiveSavedAs(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, org.eclipse.ui.IPerspectiveDescriptor)
-	 */
 	@Override
 	public void perspectiveSavedAs(IWorkbenchPage page, IPerspectiveDescriptor oldPerspective, IPerspectiveDescriptor newPerspective) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPerspectiveListener2#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, org.eclipse.ui.IWorkbenchPartReference, java.lang.String)
-	 */
 	@Override
 	public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, IWorkbenchPartReference partRef, String changeId) {
 		if (!fIgnoreChanges && page.getWorkbenchWindow().equals(fWindow)) {
@@ -973,9 +958,6 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
         }
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPerspectiveListener#perspectiveActivated(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor)
-	 */
 	@Override
 	public void perspectiveActivated(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
 		if (page.getWorkbenchWindow().equals(fWindow)) {
@@ -987,9 +969,6 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPerspectiveListener#perspectiveChanged(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor, java.lang.String)
-	 */
 	@Override
 	public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) {
 	}
@@ -1064,9 +1043,6 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.contexts.IContextManagerListener#contextManagerChanged(org.eclipse.core.commands.contexts.ContextManagerEvent)
-	 */
 	@Override
 	public void contextManagerChanged(ContextManagerEvent event) {
 		if (event.isActiveContextsChanged() && getActivePerspective() != null) {
@@ -1187,9 +1163,6 @@ public class ViewContextService implements IDebugContextListener, IPerspectiveLi
 		}
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPerspectiveListener4#perspectivePreDeactivate(org.eclipse.ui.IWorkbenchPage, org.eclipse.ui.IPerspectiveDescriptor)
-	 */
 	@Override
 	public void perspectivePreDeactivate(IWorkbenchPage page, IPerspectiveDescriptor perspective) {
 		if (page.getWorkbenchWindow().equals(fWindow)) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java
index 8fda2bc91..aaee66875 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointContainerWorkbenchAdapter.java
@@ -28,18 +28,12 @@ import org.eclipse.ui.model.IWorkbenchAdapter2;
  */
 public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, IWorkbenchAdapter2{
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object)
-     */
     @Override
 	public Object[] getChildren(Object o) {
         // not used
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
-     */
     @Override
 	public ImageDescriptor getImageDescriptor(Object object) {
         if (object instanceof IBreakpointContainer) {
@@ -56,9 +50,6 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object)
-     */
     @Override
 	public String getLabel(Object object) {
         if (object instanceof IBreakpointContainer) {
@@ -75,17 +66,11 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I
         return IInternalDebugCoreConstants.EMPTY_STRING;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
-     */
     @Override
 	public Object getParent(Object o) {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.model.IWorkbenchAdapter2#getForeground(java.lang.Object)
-     */
     @Override
 	public RGB getForeground(Object object) {
         if (object instanceof IBreakpointContainer) {
@@ -99,9 +84,6 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.model.IWorkbenchAdapter2#getBackground(java.lang.Object)
-     */
     @Override
 	public RGB getBackground(Object object) {
         if (object instanceof IBreakpointContainer) {
@@ -115,9 +97,6 @@ public class BreakpointContainerWorkbenchAdapter implements IWorkbenchAdapter, I
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.model.IWorkbenchAdapter2#getFont(java.lang.Object)
-     */
     @Override
 	public FontData getFont(Object object) {
         if (object instanceof IBreakpointContainer) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointFactory.java
index de3ec4922..7f2e199a6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointFactory.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointFactory.java
@@ -27,9 +27,6 @@ import org.eclipse.ui.PlatformUI;
  */
 public class BreakpointFactory implements IElementFactory {
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IElementFactory#createElement(org.eclipse.ui.IMemento)
-     */
     @Override
 	public IAdaptable createElement(IMemento memento) {
         String longString = memento.getString(BreakpointPersistableElementAdapter.TAG_MARKER_ID);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java
index f58965a20..be2005ce3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointOrganizerExtension.java
@@ -97,65 +97,41 @@ public class BreakpointOrganizerExtension implements IBreakpointOrganizer, IBrea
 		return fDelegate;
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories(org.eclipse.debug.core.model.IBreakpoint)
-     */
     @Override
 	public IAdaptable[] getCategories(IBreakpoint breakpoint) {
         return getOrganizer().getCategories(breakpoint);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
-     */
     @Override
 	public void addPropertyChangeListener(IPropertyChangeListener listener) {
         getOrganizer().addPropertyChangeListener(listener);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
-     */
     @Override
 	public void removePropertyChangeListener(IPropertyChangeListener listener) {
         getOrganizer().removePropertyChangeListener(listener);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#addBreakpoint(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.runtime.IAdaptable)
-     */
     @Override
 	public void addBreakpoint(IBreakpoint breakpoint, IAdaptable category) {
         getOrganizer().addBreakpoint(breakpoint, category);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#removeBreakpoint(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.runtime.IAdaptable)
-     */
     @Override
 	public void removeBreakpoint(IBreakpoint breakpoint, IAdaptable category) {
         getOrganizer().removeBreakpoint(breakpoint, category);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#canAdd(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.runtime.IAdaptable)
-     */
     @Override
 	public boolean canAdd(IBreakpoint breakpoint, IAdaptable category) {
         return getOrganizer().canAdd(breakpoint, category);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#canRemove(org.eclipse.debug.core.model.IBreakpoint, org.eclipse.core.runtime.IAdaptable)
-     */
     @Override
 	public boolean canRemove(IBreakpoint breakpoint, IAdaptable category) {
         return getOrganizer().canRemove(breakpoint, category);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#dispose()
-     */
     @Override
 	public void dispose() {
     	// don't instantiate the delegate if it has not been used
@@ -164,9 +140,6 @@ public class BreakpointOrganizerExtension implements IBreakpointOrganizer, IBrea
     	}
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.internal.ui.views.breakpoints.IBreakpointOrganizer#getOthersLabel()
-     */
     @Override
 	public String getOthersLabel() {
         String attribute = fElement.getAttribute(ATTR_OTHERS_LABEL);
@@ -176,17 +149,11 @@ public class BreakpointOrganizerExtension implements IBreakpointOrganizer, IBrea
         return attribute;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories()
-     */
     @Override
 	public IAdaptable[] getCategories() {
         return getOrganizer().getCategories();
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegateExtension#addBreakpoints(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.runtime.IAdaptable)
-	 */
 	@Override
 	public void addBreakpoints(IBreakpoint[] breakpoints, IAdaptable category) {
 		IBreakpointOrganizerDelegate organizer = getOrganizer();
@@ -199,9 +166,6 @@ public class BreakpointOrganizerExtension implements IBreakpointOrganizer, IBrea
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegateExtension#removeBreakpoints(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.runtime.IAdaptable)
-	 */
 	@Override
 	public void removeBreakpoints(IBreakpoint[] breakpoints, IAdaptable category) {
 		IBreakpointOrganizerDelegate organizer = getOrganizer();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointPersistableElementAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointPersistableElementAdapter.java
index 9305dcb14..f961845e5 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointPersistableElementAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointPersistableElementAdapter.java
@@ -38,17 +38,11 @@ public class BreakpointPersistableElementAdapter implements IPersistableElement
         fBreakpoint = breakpoint;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IPersistableElement#getFactoryId()
-     */
     @Override
 	public String getFactoryId() {
         return "org.eclipse.debug.ui.elementFactory.breakpoints"; //$NON-NLS-1$
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IPersistableElement#saveState(org.eclipse.ui.IMemento)
-     */
     @Override
 	public void saveState(IMemento memento) {
         IMarker marker = fBreakpoint.getMarker();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java
index eb3e516d4..7973227aa 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointSetOrganizer.java
@@ -77,11 +77,6 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 		fDefaultWorkingSet = getDefaultWorkingSet();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories(org.eclipse.debug.core.model.IBreakpoint)
-	 */
 	@Override
 	public IAdaptable[] getCategories(IBreakpoint breakpoint) {
 		List<IAdaptable> result = new ArrayList<>();
@@ -102,11 +97,6 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 		return result.toArray(new IAdaptable[result.size()]);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#dispose()
-	 */
 	@Override
 	public void dispose() {
 		fWorkingSetManager.removePropertyChangeListener(this);
@@ -116,11 +106,6 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 		super.dispose();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
 	@Override
 	public void propertyChange(PropertyChangeEvent event) {
 		String property = event.getProperty();
@@ -170,11 +155,6 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsAdded(org.eclipse.debug.core.model.IBreakpoint[])
-	 */
 	@Override
 	public void breakpointsAdded(IBreakpoint[] breakpoints) {
 		Map<IWorkingSet, List<IBreakpoint>> setToBreakpoints = new HashMap<>();
@@ -239,12 +219,6 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsRemoved(org.eclipse.debug.core.model.IBreakpoint[],
-	 *      org.eclipse.core.resources.IMarkerDelta[])
-	 */
 	@Override
 	public void breakpointsRemoved(IBreakpoint[] breakpoints,
 			IMarkerDelta[] deltas) {
@@ -290,12 +264,6 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.debug.core.IBreakpointsListener#breakpointsChanged(org.eclipse.debug.core.model.IBreakpoint[],
-	 *      org.eclipse.core.resources.IMarkerDelta[])
-	 */
 	@Override
 	public void breakpointsChanged(IBreakpoint[] breakpoints, IMarkerDelta[] deltas) {
 	}
@@ -342,12 +310,6 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#canRemove(org.eclipse.debug.core.model.IBreakpoint,
-	 *      org.eclipse.core.runtime.IAdaptable)
-	 */
 	@Override
 	public boolean canRemove(IBreakpoint breakpoint, IAdaptable category) {
 		if (category instanceof WorkingSetCategory) {
@@ -357,12 +319,6 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 		return super.canRemove(breakpoint, category);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#canAdd(org.eclipse.debug.core.model.IBreakpoint,
-	 *      org.eclipse.core.runtime.IAdaptable)
-	 */
 	@Override
 	public boolean canAdd(IBreakpoint breakpoint, IAdaptable category) {
 		if (category instanceof WorkingSetCategory) {
@@ -372,12 +328,6 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 		return super.canAdd(breakpoint, category);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#addBreakpoint(org.eclipse.debug.core.model.IBreakpoint,
-	 *      org.eclipse.core.runtime.IAdaptable)
-	 */
 	@Override
 	public void addBreakpoint(IBreakpoint breakpoint, IAdaptable category) {
 		addBreakpoints(new IBreakpoint[]{breakpoint}, category);
@@ -403,12 +353,6 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 		return new String[] {};
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#removeBreakpoint(org.eclipse.debug.core.model.IBreakpoint,
-	 *      org.eclipse.core.runtime.IAdaptable)
-	 */
 	@Override
 	public void removeBreakpoint(IBreakpoint breakpoint, IAdaptable category) {
 		if (category instanceof WorkingSetCategory) {
@@ -427,11 +371,6 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories()
-	 */
 	@Override
 	public IAdaptable[] getCategories() {
 		IWorkingSet[] workingSets = fWorkingSetManager.getWorkingSets();
@@ -446,9 +385,6 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 		return all.toArray(new IAdaptable[all.size()]);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegateExtension#addBreakpoints(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.runtime.IAdaptable)
-	 */
 	@Override
 	public void addBreakpoints(IBreakpoint[] breakpoints, IAdaptable category) {
 		if (category instanceof WorkingSetCategory) {
@@ -457,9 +393,6 @@ public class BreakpointSetOrganizer extends AbstractBreakpointOrganizerDelegate
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegateExtension#removeBreakpoints(org.eclipse.debug.core.model.IBreakpoint[], org.eclipse.core.runtime.IAdaptable)
-	 */
 	@Override
 	public void removeBreakpoints(IBreakpoint[] breakpoints, IAdaptable category) {
 		if (category instanceof WorkingSetCategory) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointTypeOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointTypeOrganizer.java
index 61cc2e213..c810780fe 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointTypeOrganizer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointTypeOrganizer.java
@@ -32,9 +32,6 @@ public class BreakpointTypeOrganizer extends AbstractBreakpointOrganizerDelegate
 
 	private Map<String, IAdaptable[]> fTypes = new HashMap<>();
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories(org.eclipse.debug.core.model.IBreakpoint)
-     */
     @Override
 	public IAdaptable[] getCategories(IBreakpoint breakpoint) {
         IBreakpointTypeCategory category = breakpoint.getAdapter(IBreakpointTypeCategory.class);
@@ -53,9 +50,6 @@ public class BreakpointTypeOrganizer extends AbstractBreakpointOrganizerDelegate
     	return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#dispose()
-     */
     @Override
 	public void dispose() {
     	fTypes.clear();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetElementAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetElementAdapter.java
index 1e356733b..6134a9a71 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetElementAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointWorkingSetElementAdapter.java
@@ -31,9 +31,6 @@ import org.eclipse.ui.IWorkingSetElementAdapter;
  */
 public class BreakpointWorkingSetElementAdapter implements IWorkingSetElementAdapter {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkingSetElementAdapter#adaptElements(org.eclipse.ui.IWorkingSet, org.eclipse.core.runtime.IAdaptable[])
-	 */
 	@Override
 	public IAdaptable[] adaptElements(IWorkingSet ws, IAdaptable[] elements) {
 		for (int i = 0; i < elements.length; i++) {
@@ -56,9 +53,6 @@ public class BreakpointWorkingSetElementAdapter implements IWorkingSetElementAda
 		return breakpoints.toArray(new IAdaptable[breakpoints.size()]);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkingSetElementAdapter#dispose()
-	 */
 	@Override
 	public void dispose() {
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java
index cfe71868a..37a66b30c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsComparator.java
@@ -34,9 +34,6 @@ import org.eclipse.jface.viewers.ViewerComparator;
  * @since 3.3
  */
 public class BreakpointsComparator extends ViewerComparator {
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ViewerComparator#isSorterProperty(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public boolean isSorterProperty(Object element,String propertyId) {
 		return propertyId.equals(IBasicPropertyConstants.P_TEXT);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsContentProvider.java
index 3a220e529..e7c438e79 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsContentProvider.java
@@ -40,9 +40,6 @@ public class BreakpointsContentProvider implements ITreeContentProvider, IProper
     private Object[] fElements;
     private boolean fDisposed = false;
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-     */
     @Override
 	public Object[] getChildren(Object parentElement) {
         if (parentElement.equals(DebugPlugin.getDefault().getBreakpointManager())) {
@@ -53,33 +50,21 @@ public class BreakpointsContentProvider implements ITreeContentProvider, IProper
         return new Object[0];
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-     */
     @Override
 	public Object getParent(Object element) {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-     */
     @Override
 	public boolean hasChildren(Object element) {
     	return getChildren(element).length > 0;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-     */
     @Override
 	public Object[] getElements(Object inputElement) {
         return getChildren(inputElement);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-     */
     @Override
 	public void dispose() {
         fDisposed = true;
@@ -87,9 +72,6 @@ public class BreakpointsContentProvider implements ITreeContentProvider, IProper
         setOrganizers(null);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-     */
     @Override
 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
     	fViewer = (BreakpointsViewer)viewer;
@@ -230,9 +212,6 @@ public class BreakpointsContentProvider implements ITreeContentProvider, IProper
         fViewer.getControl().setRedraw(true);
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
 	@Override
 	public void propertyChange(PropertyChangeEvent event) {
 		if (event.getProperty().equals(IBreakpointOrganizerDelegate.P_CATEGORY_CHANGED)) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsDragAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsDragAdapter.java
index 31879f665..485d369ac 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsDragAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsDragAdapter.java
@@ -55,17 +55,11 @@ public class BreakpointsDragAdapter extends DragSourceAdapter implements Transfe
         fView = view;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.util.TransferDragSourceListener#getTransfer()
-     */
     @Override
 	public Transfer getTransfer() {
         return LocalSelectionTransfer.getTransfer();
     }
 
-    /* non Java-doc
-     * @see org.eclipse.swt.dnd.DragSourceListener#dragStart
-     */
     @Override
 	public void dragStart(DragSourceEvent event) {
         ISelection selection = fViewer.getSelection();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsLabelProvider.java
index 1f1c1431d..3b096d177 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsLabelProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsLabelProvider.java
@@ -41,9 +41,6 @@ public class BreakpointsLabelProvider extends LabelProvider implements IFontProv
         fPresentation = DebugUITools.newDebugModelPresentation();
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-     */
     @Override
 	public void dispose() {
         fWorkbenchLabelProvider.dispose();
@@ -51,9 +48,6 @@ public class BreakpointsLabelProvider extends LabelProvider implements IFontProv
         super.dispose();
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-     */
     @Override
 	public Image getImage(Object element) {
         if (element instanceof IBreakpoint) {
@@ -82,9 +76,6 @@ public class BreakpointsLabelProvider extends LabelProvider implements IFontProv
         return 0;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-     */
     @Override
 	public String getText(Object element) {
         if (element instanceof IBreakpoint) {
@@ -93,9 +84,6 @@ public class BreakpointsLabelProvider extends LabelProvider implements IFontProv
         return fWorkbenchLabelProvider.getText(element);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
-     */
     @Override
 	public Font getFont(Object element) {
         if (element instanceof IBreakpoint) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java
index a392b1af7..faa5492f6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsView.java
@@ -123,37 +123,21 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager
 		super.dispose();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getDetailPanePreferenceKey()
-	 */
 	@Override
 	protected String getDetailPanePreferenceKey() {
 		return IDebugPreferenceConstants.BREAKPOINTS_DETAIL_PANE_ORIENTATION;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getHelpContextId()
-	 */
 	@Override
 	protected String getHelpContextId() {
 		return IDebugHelpContextIds.BREAKPOINT_VIEW;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getViewerStyle()
-	 */
 	@Override
 	protected int getViewerStyle() {
 		return SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.VIRTUAL | SWT.FULL_SELECTION | SWT.CHECK;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#createViewer(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	public Viewer createViewer(Composite parent) {
 		TreeModelViewer viewer = (TreeModelViewer) super.createViewer(parent);
@@ -167,10 +151,6 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager
         return viewer;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getModelPresentation()
-	 */
 	@Override
 	protected IDebugModelPresentation getModelPresentation() {
 		if (fModelPresentation == null) {
@@ -199,10 +179,6 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager
 		return (TreeModelViewer) getViewer();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#configureToolBar(org.eclipse.jface.action.IToolBarManager)
-	 */
 	@Override
 	protected void configureToolBar(IToolBarManager tbm) {
 		tbm.add(new Separator(IDebugUIConstants.BREAKPOINT_GROUP));
@@ -212,10 +188,6 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager
 		tbm.add(new Separator(IDebugUIConstants.RENDER_GROUP));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
 	@Override
 	protected void fillContextMenu(IMenuManager menu) {
 		updateObjects();
@@ -239,10 +211,6 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager
 		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#createActions()
-	 */
 	@Override
 	protected void createActions() {
 		IAction action = new OpenBreakpointMarkerAction(getViewer());
@@ -280,31 +248,16 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager
 		setGlobalAction(FIND_ACTION, new VirtualFindAction(getVariablesViewer()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @seeorg.eclipse.debug.internal.ui.views.variables.VariablesView#getToggleActionLabel()
-	 */
 	@Override
 	protected String getToggleActionLabel() {
 		return DebugUIViewsMessages.BreakpointsView_12;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getPresentationContextId()
-	 */
 	@Override
 	protected String getPresentationContextId() {
 		return IDebugUIConstants.ID_BREAKPOINT_VIEW;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#contextActivated(org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	protected void contextActivated(ISelection selection) {
 		if (!isAvailable() || !isVisible()) {
@@ -324,11 +277,6 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#setViewerInput(java.lang.Object)
-	 */
 	@Override
 	protected void setViewerInput(Object context) {
 		Object current = getViewer().getInput();
@@ -350,10 +298,6 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#viewerInputUpdateComplete(org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputUpdate)
-	 */
 	@Override
 	protected void viewerInputUpdateComplete(IViewerInputUpdate update) {
 		// handles non-standard debug model
@@ -439,10 +383,6 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager
         viewer.addDragSupport(ops, new Transfer[] {LocalSelectionTransfer.getTransfer()}, new BreakpointsDragAdapter(viewer, this));
     }
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#saveViewerState(org.eclipse.ui.IMemento)
-	 */
 	@Override
 	public void saveViewerState(IMemento memento) {
 		StringBuffer buffer = new StringBuffer();
@@ -528,9 +468,6 @@ public class BreakpointsView extends VariablesView implements IBreakpointManager
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.IBreakpointManagerListener#breakpointManagerEnablementChanged(boolean)
-	 */
 	@Override
 	public void breakpointManagerEnablementChanged(boolean enabled) {
 		DebugUIPlugin.getStandardDisplay().asyncExec(() -> {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsViewer.java
index 2d2d6146f..c72c2333c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/BreakpointsViewer.java
@@ -338,9 +338,6 @@ public class BreakpointsViewer extends CheckboxTreeViewer {
     	return true;
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.Viewer#refresh()
-	 */
 	@Override
 	public void refresh() {
 		super.refresh();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ElementComparator.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ElementComparator.java
index a27589664..d7a0fb9ec 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ElementComparator.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ElementComparator.java
@@ -46,10 +46,6 @@ public class ElementComparator implements Comparator<Object> {
 		}
 	}
 
-
-	/* (non-Javadoc)
-	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public int compare(Object arg0, Object arg1) {
         IBreakpoint bp0 = (IBreakpoint)DebugPlugin.getAdapter(arg0, IBreakpoint.class);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/FileBreakpointOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/FileBreakpointOrganizer.java
index 109b9baaf..a712c77ed 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/FileBreakpointOrganizer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/FileBreakpointOrganizer.java
@@ -27,9 +27,6 @@ import org.eclipse.debug.ui.AbstractBreakpointOrganizerDelegate;
  */
 public class FileBreakpointOrganizer extends AbstractBreakpointOrganizerDelegate {
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories(org.eclipse.debug.core.model.IBreakpoint)
-     */
     @Override
 	public IAdaptable[] getCategories(IBreakpoint breakpoint) {
         IMarker marker = breakpoint.getMarker();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ProjectBreakpointOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ProjectBreakpointOrganizer.java
index ed4901e0e..406ae6506 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ProjectBreakpointOrganizer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/ProjectBreakpointOrganizer.java
@@ -26,9 +26,6 @@ import org.eclipse.debug.ui.AbstractBreakpointOrganizerDelegate;
  */
 public class ProjectBreakpointOrganizer extends AbstractBreakpointOrganizerDelegate {
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories(org.eclipse.debug.core.model.IBreakpoint)
-     */
     @Override
 	public IAdaptable[] getCategories(IBreakpoint breakpoint) {
         IMarker marker = breakpoint.getMarker();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetBreakpointOrganizer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetBreakpointOrganizer.java
index 90f80d5c8..3f443c9e8 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetBreakpointOrganizer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetBreakpointOrganizer.java
@@ -44,9 +44,6 @@ public class WorkingSetBreakpointOrganizer extends AbstractBreakpointOrganizerDe
         fWorkingSetManager.addPropertyChangeListener(this);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#getCategories(org.eclipse.debug.core.model.IBreakpoint)
-     */
     @Override
 	public IAdaptable[] getCategories(IBreakpoint breakpoint) {
 		List<IAdaptable> result = new ArrayList<>();
@@ -77,9 +74,6 @@ public class WorkingSetBreakpointOrganizer extends AbstractBreakpointOrganizerDe
         return result.toArray(new IAdaptable[result.size()]);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.IBreakpointOrganizerDelegate#dispose()
-     */
     @Override
 	public void dispose() {
         fWorkingSetManager.removePropertyChangeListener(this);
@@ -87,9 +81,6 @@ public class WorkingSetBreakpointOrganizer extends AbstractBreakpointOrganizerDe
         super.dispose();
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-     */
     @Override
 	public void propertyChange(PropertyChangeEvent event) {
         IWorkingSet set = null;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetCategory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetCategory.java
index 3e5ee7695..0b1d871ce 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetCategory.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/breakpoints/WorkingSetCategory.java
@@ -40,25 +40,16 @@ public class WorkingSetCategory extends PlatformObject implements IWorkbenchAdap
         fWorkingSet = workingSet;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object)
-     */
     @Override
 	public Object[] getChildren(Object o) {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
-     */
     @Override
 	public ImageDescriptor getImageDescriptor(Object object) {
         return fWorkingSet.getImageDescriptor();
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object)
-     */
     @Override
 	public String getLabel(Object o) {
         StringBuffer name = new StringBuffer(fWorkingSet.getName());
@@ -68,9 +59,6 @@ public class WorkingSetCategory extends PlatformObject implements IWorkbenchAdap
         return name.toString();
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
-     */
     @Override
 	public Object getParent(Object o) {
         return null;
@@ -85,9 +73,6 @@ public class WorkingSetCategory extends PlatformObject implements IWorkbenchAdap
         return fWorkingSet;
     }
 
-    /* (non-Javadoc)
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
     @Override
 	public boolean equals(Object obj) {
         if (obj instanceof WorkingSetCategory) {
@@ -97,33 +82,21 @@ public class WorkingSetCategory extends PlatformObject implements IWorkbenchAdap
         return false;
     }
 
-    /* (non-Javadoc)
-     * @see java.lang.Object#hashCode()
-     */
     @Override
 	public int hashCode() {
         return fWorkingSet.hashCode();
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.model.IWorkbenchAdapter2#getForeground(java.lang.Object)
-     */
     @Override
 	public RGB getForeground(Object element) {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.model.IWorkbenchAdapter2#getBackground(java.lang.Object)
-     */
     @Override
 	public RGB getBackground(Object element) {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.model.IWorkbenchAdapter2#getFont(java.lang.Object)
-     */
     @Override
 	public FontData getFont(Object element) {
         if (isDefault()) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleLineNotifier.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleLineNotifier.java
index 3fe2758da..9b22fb2fa 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleLineNotifier.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleLineNotifier.java
@@ -46,9 +46,6 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan
 	 */
 	private ProcessConsole fConsole = null;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.console.IPatternMatchListenerDelegate#connect(org.eclipse.ui.console.TextConsole)
-	 */
 	@Override
 	public void connect(TextConsole console) {
 	    if (console instanceof ProcessConsole) {
@@ -64,9 +61,6 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan
 	    }
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.console.IPatternMatchListener#disconnect()
-	 */
 	@Override
 	public synchronized void disconnect() {
         try {
@@ -111,9 +105,6 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan
 		}
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.console.IPatternMatchListener#matchFound(org.eclipse.ui.console.PatternMatchEvent)
-     */
     @Override
 	public void matchFound(PatternMatchEvent event) {
         try  {
@@ -134,9 +125,6 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-     */
     @Override
 	public void propertyChange(PropertyChangeEvent event) {
         if(event.getProperty().equals(IConsoleConstants.P_CONSOLE_OUTPUT_COMPLETE)) {
@@ -145,25 +133,16 @@ public class ConsoleLineNotifier implements IPatternMatchListener, IPropertyChan
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.console.IPatternMatchListener#getPattern()
-     */
     @Override
 	public String getPattern() {
         return ".*\\r(\\n?)|.*\\n"; //$NON-NLS-1$
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.console.IPatternMatchListener#getCompilerFlags()
-     */
     @Override
 	public int getCompilerFlags() {
         return 0;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.console.IPatternMatchListener#getLineQualifier()
-     */
     @Override
 	public String getLineQualifier() {
         return "\\n|\\r"; //$NON-NLS-1$
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java
index 9116f728c..9a6a16a25 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveAllTerminatedAction.java
@@ -34,9 +34,6 @@ public class ConsoleRemoveAllTerminatedAction extends Action implements IUpdate,
 		DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IUpdate#update()
-	 */
 	@Override
 	public void update() {
 		ILaunch[] launches = DebugPlugin.getDefault().getLaunchManager().getLaunches();
@@ -51,9 +48,6 @@ public class ConsoleRemoveAllTerminatedAction extends Action implements IUpdate,
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 		ILaunch[] launches = DebugPlugin.getDefault().getLaunchManager().getLaunches();
@@ -71,9 +65,6 @@ public class ConsoleRemoveAllTerminatedAction extends Action implements IUpdate,
 		update();
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[])
-     */
     @Override
 	public void launchesRemoved(ILaunch[] launches) {
        if (isEnabled()) {
@@ -81,23 +72,14 @@ public class ConsoleRemoveAllTerminatedAction extends Action implements IUpdate,
        }
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[])
-     */
     @Override
 	public void launchesAdded(ILaunch[] launches) {
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[])
-     */
     @Override
 	public void launchesChanged(ILaunch[] launches) {
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchesListener2#launchesTerminated(org.eclipse.debug.core.ILaunch[])
-	 */
 	@Override
 	public void launchesTerminated(ILaunch[] launches) {
 		update();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java
index 5a4fa06b0..0e6ccb2ad 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleRemoveLaunchAction.java
@@ -108,31 +108,19 @@ public class ConsoleRemoveLaunchAction extends Action implements IViewActionDele
         update();
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchesListener2#launchesTerminated(org.eclipse.debug.core.ILaunch[])
-	 */
 	@Override
 	public void launchesTerminated(ILaunch[] launches) {
 		update();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchesListener#launchesRemoved(org.eclipse.debug.core.ILaunch[])
-	 */
 	@Override
 	public void launchesRemoved(ILaunch[] launches) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchesListener#launchesAdded(org.eclipse.debug.core.ILaunch[])
-	 */
 	@Override
 	public void launchesAdded(ILaunch[] launches) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.ILaunchesListener#launchesChanged(org.eclipse.debug.core.ILaunch[])
-	 */
 	@Override
 	public void launchesChanged(ILaunch[] launches) {
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleShowPreferencesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleShowPreferencesAction.java
index 6fc14d379..50ded99a1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleShowPreferencesAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleShowPreferencesAction.java
@@ -27,30 +27,14 @@ import org.eclipse.ui.IViewPart;
  */
 public class ConsoleShowPreferencesAction extends Action implements IViewActionDelegate {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-     */
     @Override
 	public void init(IViewPart view) {}
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-     */
     @Override
 	public void run(IAction action) {
     	SWTFactory.showPreferencePage("org.eclipse.debug.ui.ConsolePreferencePage"); //$NON-NLS-1$
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
-     *      org.eclipse.jface.viewers.ISelection)
-     */
     @Override
 	public void selectionChanged(IAction action, ISelection selection) {
         // do nothing
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java
index a6b855069..3cce1e96c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ConsoleTerminateAction.java
@@ -58,18 +58,12 @@ public class ConsoleTerminateAction extends Action implements IUpdate {
 		update();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IUpdate#update()
-	 */
 	@Override
 	public void update() {
 		IProcess process = fConsole.getProcess();
 		setEnabled(process.canTerminate());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 		IProcess process = fConsole.getProcess();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
index 879e806ea..0af92d15a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsole.java
@@ -621,12 +621,6 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe
             streamAppended(null, monitor);
         }
 
-        /*
-         * (non-Javadoc)
-         *
-         * @see org.eclipse.debug.core.IStreamListener#streamAppended(java.lang.String,
-         *      org.eclipse.debug.core.model.IStreamMonitor)
-         */
         @Override
 		public void streamAppended(String text, IStreamMonitor monitor) {
             String encoding = getEncoding();
@@ -752,11 +746,6 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.ui.console.IConsole#getImageDescriptor()
-     */
     @Override
 	public ImageDescriptor getImageDescriptor() {
         if (super.getImageDescriptor() == null) {
@@ -901,9 +890,6 @@ public class ProcessConsole extends IOConsole implements IConsole, IDebugEventSe
         }
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.console.AbstractConsole#getHelpContextId()
-	 */
 	@Override
 	public String getHelpContextId() {
 		return IDebugHelpContextIds.PROCESS_CONSOLE;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java
index 7a8d0d571..431b52743 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessConsolePageParticipant.java
@@ -93,9 +93,6 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I
 
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.console.IConsolePageParticipant#init(IPageBookViewPage, IConsole)
-     */
     @Override
 	public void init(IPageBookViewPage page, IConsole console) {
         fPage = page;
@@ -120,9 +117,6 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I
         fEOFHandler = new EOFHandler();
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.console.IConsolePageParticipant#dispose()
-     */
     @Override
 	public void dispose() {
         DebugUITools.getDebugContextManager().getContextService(fPage.getSite().getWorkbenchWindow()).removeDebugContextListener(this);
@@ -161,9 +155,6 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I
 		mgr.appendToGroup(IConsoleConstants.OUTPUT_GROUP, fStdErr);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-     */
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T getAdapter(Class<T> required) {
@@ -184,9 +175,6 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.part.IShowInSource#getShowInContext()
-     */
     @Override
 	public ShowInContext getShowInContext() {
         IProcess process = getProcess();
@@ -209,17 +197,11 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I
         return new ShowInContext(null, selection);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.part.IShowInTargetList#getShowInTargetIds()
-     */
     @Override
 	public String[] getShowInTargetIds() {
         return new String[] {IDebugUIConstants.ID_DEBUG_VIEW};
     }
 
-    /* (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++) {
@@ -240,9 +222,6 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I
         return fConsole != null ? fConsole.getProcess() : null;
     }
 
-	/* (non-Javadoc)
-     * @see org.eclipse.ui.console.IConsolePageParticipant#activated()
-     */
     @Override
 	public void activated() {
         // add EOF submissions
@@ -255,9 +234,6 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.console.IConsolePageParticipant#deactivated()
-     */
     @Override
 	public void deactivated() {
         // remove EOF submissions
@@ -270,9 +246,6 @@ public class ProcessConsolePageParticipant implements IConsolePageParticipant, I
 		fActivatedHandler = null;
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener#contextEvent(org.eclipse.debug.internal.ui.contexts.provisional.DebugContextEvent)
-	 */
 	@Override
 	public void debugContextChanged(DebugContextEvent event) {
 		if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessTypePropertyTester.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessTypePropertyTester.java
index 88d8316d1..0ff7735c2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessTypePropertyTester.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ProcessTypePropertyTester.java
@@ -25,9 +25,6 @@ import org.eclipse.ui.console.TextConsole;
  */
 public class ProcessTypePropertyTester extends PropertyTester {
 
-    /* (non-Javadoc)
-     * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
-     */
     @Override
 	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
         if (receiver instanceof TextConsole) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowWhenContentChangesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowWhenContentChangesAction.java
index 7190cd2b5..786539db4 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowWhenContentChangesAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/console/ShowWhenContentChangesAction.java
@@ -38,9 +38,6 @@ public abstract class ShowWhenContentChangesAction extends Action implements IPr
 		update();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
 	@Override
 	public void propertyChange(PropertyChangeEvent event) {
 	    String property = event.getProperty();
@@ -62,16 +59,10 @@ public abstract class ShowWhenContentChangesAction extends Action implements IPr
          }
 	}
 
-	/**
-	 * @return
-	 */
 	private IPreferenceStore getPreferenceStore() {
 		return DebugUIPlugin.getDefault().getPreferenceStore();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
 	@Override
 	public void run() {
 		IPreferenceStore store = getPreferenceStore();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java
index fca99ae61..ac62f4d55 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionDropAdapter.java
@@ -80,9 +80,6 @@ public class ExpressionDropAdapter extends ViewerDropAdapter {
         setScrollExpandEnabled(false);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.ViewerDropAdapter#dragEnter(org.eclipse.swt.dnd.DropTargetEvent)
-     */
     @Override
 	public void dragEnter(DropTargetEvent event) {
     	fDropType = DROP_TYPE_DEFAULT;
@@ -165,9 +162,6 @@ public class ExpressionDropAdapter extends ViewerDropAdapter {
         return true;
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ViewerDropAdapter#dragOver(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
 	@Override
 	public void dragOver(DropTargetEvent event) {
     	super.dragOver(event);
@@ -175,9 +169,6 @@ public class ExpressionDropAdapter extends ViewerDropAdapter {
     	event.feedback |= DND.FEEDBACK_SCROLL;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.ViewerDropAdapter#validateDrop(java.lang.Object, int, org.eclipse.swt.dnd.TransferData)
-     */
     @Override
 	public boolean validateDrop(Object target, int operation, TransferData transferType) {
         if (LocalSelectionTransfer.getTransfer().isSupportedType(transferType)) {
@@ -320,9 +311,6 @@ public class ExpressionDropAdapter extends ViewerDropAdapter {
         return false;
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ViewerDropAdapter#drop(org.eclipse.swt.dnd.DropTargetEvent)
-	 */
 	@Override
 	public void drop(DropTargetEvent event) {
 	    fCurrentTransferType = event.currentDataType;
@@ -331,9 +319,6 @@ public class ExpressionDropAdapter extends ViewerDropAdapter {
 	    super.drop(event);
 	}
 
-	/* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.ViewerDropAdapter#performDrop(java.lang.Object)
-     */
     @Override
 	public boolean performDrop(Object data) {
         if (LocalSelectionTransfer.getTransfer().isSupportedType(fCurrentTransferType)) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java
index 270901f25..72e48b518 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/expression/ExpressionView.java
@@ -64,17 +64,11 @@ public class ExpressionView extends VariablesView {
     private PasteWatchExpressionsAction fPasteAction;
     private EditWatchExpressinInPlaceAction fEditInPlaceAction;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getHelpContextId()
-	 */
 	@Override
 	protected String getHelpContextId() {
 		return IDebugHelpContextIds.EXPRESSION_VIEW;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#configureToolBar(org.eclipse.jface.action.IToolBarManager)
-	 */
 	@Override
 	protected void configureToolBar(IToolBarManager tbm) {
 		super.configureToolBar(tbm);
@@ -82,9 +76,6 @@ public class ExpressionView extends VariablesView {
 		tbm.add(new Separator(IDebugUIConstants.EXPRESSION_GROUP));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-	 */
 	@Override
 	protected void fillContextMenu(IMenuManager menu) {
 		menu.add(new Separator(IDebugUIConstants.EMPTY_EXPRESSION_GROUP));
@@ -107,9 +98,6 @@ public class ExpressionView extends VariablesView {
 		menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#contextActivated(org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	protected void contextActivated(ISelection selection) {
 		if (!isAvailable() || !isVisible()) {
@@ -125,9 +113,6 @@ public class ExpressionView extends VariablesView {
         }
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#viewerInputUpdateComplete(IViewerInputUpdate)
-     */
 	@Override
 	protected void viewerInputUpdateComplete(IViewerInputUpdate update) {
         IStatus status = update.getStatus();
@@ -139,42 +124,27 @@ public class ExpressionView extends VariablesView {
         updateAction(FIND_ACTION);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getDetailPanePreferenceKey()
-	 */
 	@Override
 	protected String getDetailPanePreferenceKey() {
 		return IDebugPreferenceConstants.EXPRESSIONS_DETAIL_PANE_ORIENTATION;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getToggleActionLabel()
-	 */
 	@Override
 	protected String getToggleActionLabel() {
 		return VariablesViewMessages.ExpressionView_4;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getPresentationContextId()
-	 */
 	@Override
 	protected String getPresentationContextId() {
 		return IDebugUIConstants.ID_EXPRESSION_VIEW;
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#initDragAndDrop(org.eclipse.debug.internal.ui.viewers.model.provisional.TreeModelViewer)
-     */
     @Override
 	protected void initDragAndDrop(TreeModelViewer viewer) {
         viewer.addDragSupport(DND.DROP_MOVE, new Transfer[] {LocalSelectionTransfer.getTransfer()}, new SelectionDragAdapter(viewer));
         viewer.addDropSupport(DND.DROP_MOVE|DND.DROP_COPY, new Transfer[] {LocalSelectionTransfer.getTransfer(), TextTransfer.getInstance()}, new ExpressionDropAdapter(getSite(), viewer));
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#createActions()
-     */
     @Override
 	protected void createActions() {
     	super.createActions();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbDropDownAutoExpandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbDropDownAutoExpandAction.java
index 7c6a7e4c4..8a9e3cbeb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbDropDownAutoExpandAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbDropDownAutoExpandAction.java
@@ -46,9 +46,6 @@ class BreadcrumbDropDownAutoExpandAction extends Action {
 		setChecked(fLaunchView.getBreadcrumbDropDownAutoExpand());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 		fLaunchView.setBreadcrumbDropDownAutoExpand(isChecked());
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java
index ed7942a56..51c5cdd0b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/BreadcrumbWorkbenchPart.java
@@ -16,7 +16,6 @@ package org.eclipse.debug.internal.ui.views.launch;
 
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
-
 import org.eclipse.ui.IPropertyListener;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchPartSite;
@@ -30,17 +29,11 @@ class BreadcrumbWorkbenchPart implements IWorkbenchPart {
 
     private IWorkbenchPartSite fSite = null;
 
-    /* (non-Javadoc)
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
     @Override
 	public boolean equals(Object obj) {
         return (obj instanceof BreadcrumbWorkbenchPart);
     }
 
-    /* (non-Javadoc)
-     * @see java.lang.Object#hashCode()
-     */
     @Override
 	public int hashCode() {
         return getClass().hashCode();
@@ -55,76 +48,46 @@ class BreadcrumbWorkbenchPart implements IWorkbenchPart {
         fSite = site;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IWorkbenchPart#addPropertyListener(org.eclipse.ui.IPropertyListener)
-     */
     @Override
 	public void addPropertyListener(IPropertyListener listener) {
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-     */
     @Override
 	public void createPartControl(Composite parent) {
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IWorkbenchPart#dispose()
-     */
     @Override
 	public void dispose() {
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IWorkbenchPart#getSite()
-     */
     @Override
 	public IWorkbenchPartSite getSite() {
         return fSite;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IWorkbenchPart#getTitle()
-     */
     @Override
 	public String getTitle() {
         return ""; //$NON-NLS-1$
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IWorkbenchPart#getTitleImage()
-     */
     @Override
 	public Image getTitleImage() {
         return null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IWorkbenchPart#getTitleToolTip()
-     */
     @Override
 	public String getTitleToolTip() {
         return ""; //$NON-NLS-1$
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IWorkbenchPart#removePropertyListener(org.eclipse.ui.IPropertyListener)
-     */
     @Override
 	public void removePropertyListener(IPropertyListener listener) {
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-     */
     @Override
 	public void setFocus() {
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-     */
     @Override
 	public <T> T getAdapter(Class<T> adapter) {
         return null;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java
index 0167f6cb1..de46ada99 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugElementAdapterFactory.java
@@ -146,9 +146,6 @@ public class DebugElementAdapterFactory implements IAdapterFactory {
     private static IViewerInputProvider fgDefaultViewerInputProvider = new DefaultViewerInputProvider();
     private static IViewerInputProvider fgStackFrameViewerInputProvider = new StackFrameViewerInputProvider();
 
-    /* (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) {
@@ -325,9 +322,6 @@ public class DebugElementAdapterFactory 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.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java
index be86cfabd..9dcb0f44c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugToolBarAction.java
@@ -46,9 +46,6 @@ class DebugToolBarAction extends Action {
 	    setChecked(showingToolbar);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 		fLaunchView.setDebugToolbarInView(isChecked());
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugViewModeAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugViewModeAction.java
index 8985cfbd2..90a129906 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugViewModeAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/DebugViewModeAction.java
@@ -73,9 +73,6 @@ class DebugViewModeAction extends Action {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 		fLaunchView.setViewMode(fMode, fParent);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/ImageImageDescriptor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/ImageImageDescriptor.java
index 9bb0d9f00..7ab2f805c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/ImageImageDescriptor.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/ImageImageDescriptor.java
@@ -31,25 +31,16 @@ public class ImageImageDescriptor extends ImageDescriptor {
 		fImage= image;
 	}
 
-	/* (non-Javadoc)
-	 * @see ImageDescriptor#getImageData()
-	 */
 	@Override
 	public ImageData getImageData() {
 		return fImage.getImageData();
 	}
 
-	/* (non-Javadoc)
-	 * @see Object#equals(Object)
-	 */
 	@Override
 	public boolean equals(Object obj) {
 		return (obj != null) && getClass().equals(obj.getClass()) && fImage.equals(((ImageImageDescriptor)obj).fImage);
 	}
 
-	/* (non-Javadoc)
-	 * @see Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return fImage.hashCode();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/StandardDecoration.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/StandardDecoration.java
index bcf4fe0b0..f0e7e5a30 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/StandardDecoration.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/StandardDecoration.java
@@ -32,17 +32,11 @@ public class StandardDecoration extends Decoration {
 		fPresentation = presentation;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.launch.Decoration#remove()
-	 */
 	@Override
 	public void remove() {
 		fPresentation.removeAnnotations(fEditor, fThread);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.launch.Decoration#getThread()
-	 */
 	@Override
 	public IThread getThread() {
 		return fThread;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewPane.java
index 828633c5c..37a6b44db 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AbstractMemoryViewPane.java
@@ -366,11 +366,6 @@ public abstract class AbstractMemoryViewPane implements IMemoryBlockListener, IS
 		return fPaneId;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#getControl()
-	 */
 	@Override
 	public Control getControl() {
 		return fCanvas;
@@ -389,28 +384,12 @@ public abstract class AbstractMemoryViewPane implements IMemoryBlockListener, IS
 		return fIsDisposed;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.core.memory.IMemoryBlockListener#MemoryBlockAdded
-	 * (org.eclipse.debug.core.model.IMemoryBlock)
-	 */
 	@Override
 	abstract public void memoryBlocksAdded(IMemoryBlock[] memoryBlocks);
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.memory.IMemoryBlockListener#
-	 * MemoryBlockRemoved(org.eclipse.debug.core.model.IMemoryBlock)
-	 */
 	@Override
 	abstract public void memoryBlocksRemoved(final IMemoryBlock[] memoryBlocks);
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.
-	 * IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	abstract public void selectionChanged(IWorkbenchPart part, ISelection selection);
 
@@ -420,8 +399,8 @@ public abstract class AbstractMemoryViewPane implements IMemoryBlockListener, IS
 	abstract public Object getCurrentSelection();
 
 	/**
-	 * retore the view pane based on current selection from the debug view and
-	 * the memory blocks and renderings currently exist
+	 * restore the view pane based on current selection from the debug view and the
+	 * memory blocks and renderings currently exist
 	 */
 	@Override
 	abstract public void restoreViewPane();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java
index 2ab50c385..8b34b0fab 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryBlockAction.java
@@ -115,10 +115,6 @@ public class AddMemoryBlockAction extends Action implements IDebugContextListene
 		DebugPlugin.getDefault().addDebugEventListener(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 		boolean exit = false;
@@ -278,12 +274,6 @@ public class AddMemoryBlockAction extends Action implements IDebugContextListene
 		return exit;
 	}
 
-	/*
-	 * (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++) {
@@ -403,13 +393,6 @@ public class AddMemoryBlockAction extends Action implements IDebugContextListene
 		job.schedule();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener
-	 * #contextEvent
-	 * (org.eclipse.debug.internal.ui.contexts.provisional.DebugContextEvent)
-	 */
 	@Override
 	public void debugContextChanged(DebugContextEvent event) {
 		if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingAction.java
index 1cab5c04d..d0b3ba98a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingAction.java
@@ -35,13 +35,10 @@ public class AddMemoryRenderingAction extends AddMemoryBlockAction {
 		fContainer = container;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
-		if (fContainer instanceof RenderingViewPane)
+		if (fContainer instanceof RenderingViewPane) {
 			((RenderingViewPane) fContainer).showCreateRenderingTab();
+		}
 	}
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingContextAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingContextAction.java
index c37e17722..e347d88b7 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingContextAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingContextAction.java
@@ -24,10 +24,6 @@ public class AddMemoryRenderingContextAction implements IViewActionDelegate {
 
 	private IMemoryRenderingSite fMemoryView;
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
 	@Override
 	public void init(IViewPart view) {
 
@@ -36,15 +32,12 @@ public class AddMemoryRenderingContextAction implements IViewActionDelegate {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void run(IAction action) {
 
-		if (fMemoryView == null)
+		if (fMemoryView == null) {
 			return;
+		}
 
 		IMemoryRenderingContainer container = getRenderingContainer(action);
 		if (container != null) {
@@ -73,20 +66,15 @@ public class AddMemoryRenderingContextAction implements IViewActionDelegate {
 		return selectedPane;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action
-	 * .IAction, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		IMemoryRenderingContainer container = getRenderingContainer(action);
 		if (container instanceof RenderingViewPane) {
-			if (!((RenderingViewPane) container).canAddRendering())
+			if (!((RenderingViewPane) container).canAddRendering()) {
 				action.setEnabled(false);
-			else
+			} else {
 				action.setEnabled(true);
+			}
 		}
 	}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java
index 20b3a8459..05b06559c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/AddMemoryRenderingDialog.java
@@ -121,21 +121,11 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 
 	class MemoryRenderingLabelProvider implements ILabelProvider {
 
-		/*
-		 * (non-Javadoc)
-		 * @see
-		 * org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-		 */
 		@Override
 		public Image getImage(Object element) {
 			return null;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see
-		 * org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-		 */
 		@Override
 		public String getText(Object element) {
 			if (element instanceof IMemoryRenderingType) {
@@ -145,41 +135,19 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 			return element.toString();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see
-		 * org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse
-		 * .jface.viewers.ILabelProviderListener)
-		 */
 		@Override
 		public void addListener(ILabelProviderListener listener) {
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-		 */
 		@Override
 		public void dispose() {
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see
-		 * org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java
-		 * .lang.Object, java.lang.String)
-		 */
 		@Override
 		public boolean isLabelProperty(Object element, String property) {
 			return false;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see
-		 * org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse
-		 * .jface.viewers.ILabelProviderListener)
-		 */
 		@Override
 		public void removeListener(ILabelProviderListener listener) {
 		}
@@ -188,42 +156,22 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 
 	class MemoryRenderingContentProvider implements IStructuredContentProvider {
 
-		/*
-		 * (non-Javadoc)
-		 * @see
-		 * org.eclipse.jface.viewers.IStructuredContentProvider#getElements(
-		 * java.lang.Object)
-		 */
 		@Override
 		public Object[] getElements(Object inputElement) {
 			IMemoryRenderingType[] renderings = DebugUITools.getMemoryRenderingManager().getRenderingTypes((IMemoryBlock) inputElement);
 			return renderings;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-		 */
 		@Override
 		public void dispose() {
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see
-		 * org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse
-		 * .jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
 		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 		}
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#close()
-	 */
 	@Override
 	public boolean close() {
 
@@ -236,22 +184,12 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 		return super.close();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse
-	 * .swt.widgets.Composite)
-	 */
 	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
 		super.createButtonsForButtonBar(parent);
 		getButton(IDialogConstants.OK_ID).setEnabled(false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.dialogs.SelectionDialog#getResult()
-	 */
 	@Override
 	public Object[] getResult() {
 
@@ -264,10 +202,6 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 		return new Object[0];
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#cancelPressed()
-	 */
 	@Override
 	protected void cancelPressed() {
 
@@ -276,10 +210,6 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 		super.cancelPressed();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
 	@Override
 	protected void okPressed() {
 
@@ -289,12 +219,6 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 		super.okPressed();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets
-	 * .Composite)
-	 */
 	@Override
 	protected Control createDialogArea(Composite parent) {
 
@@ -361,8 +285,9 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 				int idx = memoryBlock.getSelectionIndex();
 
 				// avoid null pointer exception
-				if (fMemoryBlocks == null)
+				if (fMemoryBlocks == null) {
 					return;
+				}
 
 				fSelectedMemoryBlock = fMemoryBlocks[idx];
 
@@ -455,18 +380,19 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 	private IMemoryBlock getMemoryBlockToSelect(IMemoryBlock lastAdded) {
 		IMemoryBlock currentBlock = null;
 
-		if (lastAdded != null)
+		if (lastAdded != null) {
 			currentBlock = lastAdded;
-		else {
+		} else {
 			// take Memory View's selection if possible
 			ISelectionProvider selectionProvider = fSite.getSite().getSelectionProvider();
 			ISelection selection = null;
 
-			if (selectionProvider != null)
+			if (selectionProvider != null) {
 				selection = selectionProvider.getSelection();
-			else
+			} else {
 				// otherwise, take selection from selection service
 				selection = DebugUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection(IDebugUIConstants.ID_MEMORY_VIEW);
+			}
 
 			IMemoryBlock element = getMemoryBlock(selection);
 
@@ -476,16 +402,19 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 				if (context != null) {
 					IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(context);
 
-					if (retrieval == null)
+					if (retrieval == null) {
 						return currentBlock;
+					}
 
 					IMemoryBlock[] blocks = new IMemoryBlock[0];
 
-					if (retrieval != null)
+					if (retrieval != null) {
 						blocks = MemoryViewUtil.getMemoryBlockManager().getMemoryBlocks(retrieval);
+					}
 
-					if (blocks.length > 0)
+					if (blocks.length > 0) {
 						currentBlock = blocks[0];
+					}
 				}
 			} else {
 				currentBlock = element;
@@ -502,8 +431,9 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 				try {
 					text = ((IMemoryBlockExtension) memoryBlocks[i]).getExpression();
 
-					if (text == null)
+					if (text == null) {
 						text = DebugUIMessages.AddMemoryRenderingDialog_Unknown;
+					}
 
 					if (((IMemoryBlockExtension) memoryBlocks[i]).getBigBaseAddress() != null) {
 						text += " : 0x"; //$NON-NLS-1$
@@ -520,8 +450,9 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 
 			// ask decorator to decorate to ensure consistent label
 			ILabelDecorator decorator = fMemoryBlocks[i].getAdapter(ILabelDecorator.class);
-			if (decorator != null)
+			if (decorator != null) {
 				text = decorator.decorateText(text, fMemoryBlocks[i]);
+			}
 
 			labels[i] = text;
 		}
@@ -529,8 +460,9 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 	}
 
 	private IMemoryBlock getMemoryBlock(ISelection selection) {
-		if (!(selection instanceof IStructuredSelection))
+		if (!(selection instanceof IStructuredSelection)) {
 			return null;
+		}
 
 		// only single selection of debug element is allowed for this action
 		if (selection.isEmpty() || ((IStructuredSelection) selection).size() > 1) {
@@ -539,12 +471,13 @@ public class AddMemoryRenderingDialog extends SelectionDialog {
 
 		Object elem = ((IStructuredSelection) selection).getFirstElement();
 
-		if (elem instanceof IMemoryBlock)
+		if (elem instanceof IMemoryBlock) {
 			return (IMemoryBlock) elem;
-		else if (elem instanceof IMemoryRendering)
+		} else if (elem instanceof IMemoryRendering) {
 			return ((IMemoryRendering) elem).getMemoryBlock();
-		else
+		} else {
 			return null;
+		}
 	}
 
 	public IMemoryBlock getMemoryBlock() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/LinkRenderingPanesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/LinkRenderingPanesAction.java
index 1cf3b0ee7..4d7934c05 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/LinkRenderingPanesAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/LinkRenderingPanesAction.java
@@ -28,10 +28,6 @@ public class LinkRenderingPanesAction implements IViewActionDelegate {
 	IMemoryRenderingSite fRenderingSite;
 	private MemoryViewSynchronizationService fMemSyncService;
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
 	@Override
 	public void init(IViewPart view) {
 
@@ -40,20 +36,18 @@ public class LinkRenderingPanesAction implements IViewActionDelegate {
 
 			IMemoryRenderingSynchronizationService syncService = fRenderingSite.getSynchronizationService();
 
-			if (syncService instanceof MemoryViewSynchronizationService)
+			if (syncService instanceof MemoryViewSynchronizationService) {
 				fMemSyncService = (MemoryViewSynchronizationService) syncService;
+			}
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void run(IAction action) {
 
-		if (fMemSyncService == null)
+		if (fMemSyncService == null) {
 			return;
+		}
 
 		fMemSyncService.setEnabled(!fMemSyncService.isEnabled());
 		updateActionState(action);
@@ -64,21 +58,17 @@ public class LinkRenderingPanesAction implements IViewActionDelegate {
 	 */
 	private void updateActionState(IAction action) {
 
-		if (fMemSyncService == null)
+		if (fMemSyncService == null) {
 			return;
+		}
 
-		if (fMemSyncService.isEnabled())
+		if (fMemSyncService.isEnabled()) {
 			action.setChecked(true);
-		else
+		} else {
 			action.setChecked(false);
+		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action
-	 * .IAction, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		updateActionState(action);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java
index 05013b0cc..e5478da29 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryBlocksTreeViewPane.java
@@ -103,10 +103,6 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC
 			setEnabled(true);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.jface.action.IAction#run()
-		 */
 		@Override
 		public void run() {
 			ISelection selected = fTreeViewer.getSelection();
@@ -137,10 +133,6 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC
 			PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".RemoveAllMemoryBlocksAction_context"); //$NON-NLS-1$
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.jface.action.IAction#run()
-		 */
 		@Override
 		public void run() {
 
@@ -165,7 +157,6 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC
 		}
 
 		/*
-		 * (non-Javadoc)
 		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
 		 */
 		public void dispose() {
@@ -174,11 +165,6 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC
 			DebugPlugin.getDefault().removeDebugEventListener(this);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.debug.internal.core.memory.IMemoryBlockListener#
-		 * MemoryBlockAdded(org.eclipse.debug.core.model.IMemoryBlock)
-		 */
 		@Override
 		public void memoryBlocksAdded(final IMemoryBlock[] memory) {
 			// if the content provider is disposed, do not handle event
@@ -188,11 +174,6 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC
 			updateActionsEnablement();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.debug.internal.core.memory.IMemoryBlockListener#
-		 * MemoryBlockRemoved(org.eclipse.debug.core.model.IMemoryBlock)
-		 */
 		@Override
 		public void memoryBlocksRemoved(final IMemoryBlock[] memory) {
 			if (fDisposed) {
@@ -202,7 +183,6 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC
 		}
 
 		/*
-		 * (non-Javadoc)
 		 * @see
 		 * org.eclipse.debug.internal.ui.views.memory.BasicDebugViewContentProvider
 		 * #doHandleDebugEvent(org.eclipse.debug.core.DebugEvent)
@@ -277,13 +257,6 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC
 			}
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see
-		 * org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener
-		 * #contextEvent(org.eclipse.debug.internal.ui.contexts.provisional.
-		 * DebugContextEvent)
-		 */
 		@Override
 		public void debugContextChanged(DebugContextEvent event) {
 			if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) {
@@ -387,11 +360,6 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC
 		fPresentationContext.dispose();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.
-	 * IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
 
@@ -427,11 +395,6 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC
 		return fPaneId;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#getActions()
-	 */
 	@Override
 	public IAction[] getActions() {
 
@@ -454,11 +417,6 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC
 				fRemoveAllMemoryBlocksAction };
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#
-	 * addSelectionListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
 	@Override
 	public void addSelectionListener(ISelectionChangedListener listener) {
 		if (fSelectionProvider == null) {
@@ -468,12 +426,6 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC
 		fSelectionProvider.addSelectionChangedListener(listener);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#
-	 * removeSelctionListener
-	 * (org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
 	@Override
 	public void removeSelctionListener(ISelectionChangedListener listener) {
 		if (fSelectionProvider == null) {
@@ -483,44 +435,22 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC
 		fSelectionProvider.removeSelectionChangedListener(listener);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#
-	 * getSelectionProvider()
-	 */
 	@Override
 	public ISelectionProvider getSelectionProvider() {
 		return fSelectionProvider;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#restoreViewPane
-	 * ()
-	 */
 	@Override
 	public void restoreViewPane() {
 		updateRetrieval();
 		updateActionsEnablement();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#getControl()
-	 */
 	@Override
 	public Control getControl() {
 		return fTreeViewer.getControl();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#setVisible
-	 * (boolean)
-	 */
 	@Override
 	public void setVisible(boolean visible) {
 		if (fVisible != visible) {
@@ -533,11 +463,6 @@ public class MemoryBlocksTreeViewPane implements ISelectionListener, ISelectionC
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.views.memory.IMemoryViewPane#isVisible()
-	 */
 	@Override
 	public boolean isVisible() {
 		return fVisible;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java
index 2d1548aad..25c128610 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryView.java
@@ -129,60 +129,42 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 
 		IStructuredSelection fSelections = new StructuredSelection();
 
-		/*
-		 * (non-Javadoc)
-		 * @see
-		 * org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener
-		 * (org.eclipse.jface.viewers.ISelectionChangedListener)
-		 */
 		@Override
 		public void addSelectionChangedListener(ISelectionChangedListener listener) {
-			if (!fListeners.contains(listener))
+			if (!fListeners.contains(listener)) {
 				fListeners.add(listener);
+			}
 
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
-		 */
 		@Override
 		public ISelection getSelection() {
 			return fSelections;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ISelectionProvider#
-		 * removeSelectionChangedListener
-		 * (org.eclipse.jface.viewers.ISelectionChangedListener)
-		 */
 		@Override
 		public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-			if (fListeners.contains(listener))
+			if (fListeners.contains(listener)) {
 				fListeners.remove(listener);
+			}
 
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see
-		 * org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse
-		 * .jface.viewers.ISelection)
-		 */
 		@Override
 		public void setSelection(ISelection selection) {
 			if (selection instanceof IStructuredSelection) {
 				boolean fireChanged = false;
 
 				// only fire change event if the selection has really changed
-				if (fSelections.getFirstElement() != ((IStructuredSelection) selection).getFirstElement())
+				if (fSelections.getFirstElement() != ((IStructuredSelection) selection).getFirstElement()) {
 					fireChanged = true;
+				}
 
 				fSelections = (IStructuredSelection) selection;
 
-				if (fireChanged)
+				if (fireChanged) {
 					fireChanged();
+				}
 			}
 		}
 
@@ -193,12 +175,6 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 			}
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see
-		 * org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged
-		 * (org.eclipse.jface.viewers.SelectionChangedEvent)
-		 */
 		@Override
 		public void selectionChanged(SelectionChangedEvent event) {
 			ISelection viewPaneSelection = event.getSelection();
@@ -223,47 +199,22 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 			fView = view;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partActivated(org.eclipse.ui.
-		 * IWorkbenchPartReference)
-		 */
 		@Override
 		public void partActivated(IWorkbenchPartReference ref) {
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partBroughtToTop(org.eclipse.ui.
-		 * IWorkbenchPartReference)
-		 */
 		@Override
 		public void partBroughtToTop(IWorkbenchPartReference ref) {
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.
-		 * IWorkbenchPartReference)
-		 */
 		@Override
 		public void partClosed(IWorkbenchPartReference ref) {
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partDeactivated(org.eclipse.ui.
-		 * IWorkbenchPartReference)
-		 */
 		@Override
 		public void partDeactivated(IWorkbenchPartReference ref) {
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partHidden(org.eclipse.ui.
-		 * IWorkbenchPartReference)
-		 */
 		@Override
 		public void partHidden(IWorkbenchPartReference ref) {
 
@@ -274,11 +225,6 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 			}
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.
-		 * IWorkbenchPartReference)
-		 */
 		@Override
 		public void partVisible(IWorkbenchPartReference ref) {
 			IWorkbenchPart part = ref.getPart(false);
@@ -287,14 +233,8 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 				setVisible(true);
 				restoreView();
 			}
-
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.ui.IPartListener2#partInputChanged(org.eclipse.ui.
-		 * IWorkbenchPartReference)
-		 */
 		@Override
 		public void partInputChanged(IWorkbenchPartReference ref) {
 		}
@@ -310,8 +250,9 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 
 		fViewCnt++;
 		String secondaryId = site.getSecondaryId();
-		if (secondaryId != null)
+		if (secondaryId != null) {
 			MemoryViewIdRegistry.registerView(secondaryId);
+		}
 
 		// only do this the first time
 		// not sure if there is a bug in the UI... if the view is
@@ -332,12 +273,6 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 		fSyncService = new MemoryViewSynchronizationService();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets
-	 * .Composite)
-	 */
 	@Override
 	public void createPartControl(Composite parent) {
 		fSashForm = new SashForm(parent, SWT.HORIZONTAL);
@@ -428,8 +363,9 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 					IMemoryRenderingContainer container = getContainer(fActivePaneId);
 					if (container != null) {
 						if (container instanceof RenderingViewPane) {
-							if (!((RenderingViewPane) container).canRemoveRendering())
+							if (!((RenderingViewPane) container).canRemoveRendering()) {
 								return null;
+							}
 						}
 						IMemoryRendering activeRendering = container.getActiveRendering();
 						if (activeRendering != null) {
@@ -451,8 +387,9 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 
 					if (container != null && container instanceof RenderingViewPane) {
 						RenderingViewPane pane = (RenderingViewPane) container;
-						if (pane.canAddRendering())
+						if (pane.canAddRendering()) {
 							pane.showCreateRenderingTab();
+						}
 					}
 					return null;
 				}
@@ -479,8 +416,9 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 		viewerViewForm.setContent(viewerControl);
 
 		ISelection selection = fMemBlkViewer.getSelectionProvider().getSelection();
-		if (selection != null)
+		if (selection != null) {
 			fSelectionProvider.setSelection(selection);
+		}
 
 		ToolBarManager viewerToolBarMgr = new ToolBarManager(SWT.FLAT);
 		IAction[] actions = fMemBlkViewer.getActions();
@@ -512,8 +450,9 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 
 			@Override
 			public void handleEvent(Event event) {
-				if (fActivePaneId.equals(id))
+				if (fActivePaneId.equals(id)) {
 					viewPane.removeSelctionListener(fSelectionProvider);
+				}
 			}
 		};
 		return deactivateListener;
@@ -558,14 +497,11 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
-	 */
 	@Override
 	public void setFocus() {
-		if (fActivePaneId == null)
+		if (fActivePaneId == null) {
 			fActivePaneId = fMemBlkViewer.getId();
+		}
 
 		IMemoryViewPane pane = getViewPane(fActivePaneId);
 		pane.getControl().setFocus();
@@ -587,19 +523,23 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 
 		IViewSite viewSite = getViewSite();
 		String secondaryId = viewSite.getSecondaryId();
-		if (secondaryId != null)
+		if (secondaryId != null) {
 			MemoryViewIdRegistry.deregisterView(secondaryId);
+		}
 
 		fSyncService.shutdown();
 
-		if (fAddHandler != null)
+		if (fAddHandler != null) {
 			fAddHandler.dispose();
+		}
 
-		if (fToggleMonitorsHandler != null)
+		if (fToggleMonitorsHandler != null) {
 			fToggleMonitorsHandler.dispose();
+		}
 
-		if (fNextMemoryBlockHandler != null)
+		if (fNextMemoryBlockHandler != null) {
 			fNextMemoryBlockHandler.dispose();
+		}
 
 		super.dispose();
 	}
@@ -611,11 +551,12 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 			// if currently visible, take view pane's visibility into account
 			// else force view pane to be visible if it is listed in
 			// "visible view panes" array list.
-			if (fVisible)
+			if (fVisible) {
 				viewPanes[i].setVisible(visible && viewPanes[i].isVisible());
-			else {
-				if (isViewPaneVisible(viewPanes[i].getId()))
+			} else {
+				if (isViewPaneVisible(viewPanes[i].getId())) {
 					viewPanes[i].setVisible(visible);
+				}
 			}
 		}
 
@@ -623,7 +564,6 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 	}
 
 	/*
-	 * (non-Javadoc)
 	 * @see
 	 * org.eclipse.debug.internal.ui.views.memory.IMultipaneMemoryView#getViewPane
 	 * (java.lang.String)
@@ -633,7 +573,6 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 	}
 
 	/*
-	 * (non-Javadoc)
 	 * @see
 	 * org.eclipse.debug.internal.ui.views.memory.IMultipaneMemoryView#getViewPanes
 	 * ()
@@ -663,7 +602,6 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 	}
 
 	/*
-	 * (non-Javadoc)
 	 * @see
 	 * org.eclipse.debug.internal.ui.views.memory.IMultipaneMemoryView#showViewPane
 	 * (boolean, java.lang.String)
@@ -679,8 +617,9 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 				if (children[i] == viewPaneControl) {
 					children[i].setVisible(show);
 					IMemoryViewPane viewPane = fViewPanes.get(paneId);
-					if (viewPane != null)
+					if (viewPane != null) {
 						viewPane.setVisible(show);
+					}
 				}
 			}
 			fSashForm.layout();
@@ -690,7 +629,6 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 	}
 
 	/*
-	 * (non-Javadoc)
 	 * @see org.eclipse.debug.internal.ui.views.memory.IMultipaneMemoryView#
 	 * isViewPaneVisible(java.lang.String)
 	 */
@@ -744,8 +682,9 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 		while (enumeration.hasMoreElements()) {
 			String paneId = enumeration.nextElement();
 			boolean visible = false;
-			if (fVisibleViewPanes.contains(paneId))
+			if (fVisibleViewPanes.contains(paneId)) {
 				visible = true;
+			}
 
 			Control control = fViewPaneControls.get(paneId);
 			control.setVisible(visible);
@@ -791,48 +730,32 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.ui.memory.IMemoryRenderingSite#getSynchronizationService
-	 * ()
-	 */
 	@Override
 	public IMemoryRenderingSynchronizationService getSynchronizationService() {
 		return fSyncService;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.ui.memory.IMemoryRenderingSite#getMemoryRenderingContainers
-	 * ()
-	 */
 	@Override
 	public IMemoryRenderingContainer[] getMemoryRenderingContainers() {
 		Enumeration<IMemoryViewPane> enumeration = fViewPanes.elements();
 		ArrayList<Object> containers = new ArrayList<>();
 		while (enumeration.hasMoreElements()) {
 			Object obj = enumeration.nextElement();
-			if (obj instanceof IMemoryRenderingContainer)
+			if (obj instanceof IMemoryRenderingContainer) {
 				containers.add(obj);
+			}
 		}
 
 		return containers.toArray(new IMemoryRenderingContainer[containers.size()]);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.ui.memory.IMemoryRenderingSite#getContainer(java.lang
-	 * .String)
-	 */
 	@Override
 	public IMemoryRenderingContainer getContainer(String id) {
 		Object viewPane = fViewPanes.get(id);
 
-		if (viewPane instanceof IMemoryRenderingContainer)
+		if (viewPane instanceof IMemoryRenderingContainer) {
 			return (IMemoryRenderingContainer) viewPane;
+		}
 
 		return null;
 	}
@@ -850,7 +773,9 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 		String viewId = vs.getSecondaryId();
 
 		if (viewId != null)
+		 {
 			return VISIBILITY_PREF + "." + viewId; //$NON-NLS-1$
+		}
 
 		return VISIBILITY_PREF;
 	}
@@ -860,7 +785,9 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 		String viewId = vs.getSecondaryId();
 
 		if (viewId != null)
+		 {
 			return VIEW_PANE_ORIENTATION_PREF + "." + viewId; //$NON-NLS-1$
+		}
 
 		return VIEW_PANE_ORIENTATION_PREF;
 	}
@@ -883,10 +810,11 @@ public class MemoryView extends ViewPart implements IMemoryRenderingSite2 {
 
 	public void setViewPanesOrientation(int orientation) {
 		fViewOrientation = orientation;
-		if (fViewOrientation == VERTICAL_VIEW_ORIENTATION)
+		if (fViewOrientation == VERTICAL_VIEW_ORIENTATION) {
 			fSashForm.setOrientation(SWT.VERTICAL);
-		else
+		} else {
 			fSashForm.setOrientation(SWT.HORIZONTAL);
+		}
 
 		saveOrientation();
 		updateOrientationActions();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java
index 7587c6031..a14fcf7d6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewSynchronizationService.java
@@ -107,12 +107,6 @@ public class MemoryViewSynchronizationService implements IMemoryRenderingSynchro
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.ui.IMemoryBlockViewSynchronizer#getSynchronizedProperty
-	 * (org.eclipse.debug.ui.ISynchronizedMemoryBlockView, java.lang.String)
-	 */
 	public Object getSynchronizedProperty(IMemoryBlock memoryBlock, String propertyId) {
 		SynchronizeInfo info = fSynchronizeInfo.get(memoryBlock);
 
@@ -124,12 +118,6 @@ public class MemoryViewSynchronizationService implements IMemoryRenderingSynchro
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.ui.IMemoryBlockListener#MemoryBlockAdded(org.eclipse
-	 * .debug.core.model.IMemoryBlock)
-	 */
 	@Override
 	public void memoryBlocksAdded(IMemoryBlock[] memoryBlocks) {
 		// do nothing when a memory block is added
@@ -138,12 +126,6 @@ public class MemoryViewSynchronizationService implements IMemoryRenderingSynchro
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.ui.IMemoryBlockListener#MemoryBlockRemoved(org.eclipse
-	 * .debug.core.model.IMemoryBlock)
-	 */
 	@Override
 	public void memoryBlocksRemoved(IMemoryBlock[] memoryBlocks) {
 
@@ -193,23 +175,11 @@ public class MemoryViewSynchronizationService implements IMemoryRenderingSynchro
 		MemoryViewUtil.getMemoryBlockManager().removeListener(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRenderingSynchronizationService#
-	 * addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener,
-	 * java.lang.String[])
-	 */
 	@Override
 	public void addPropertyChangeListener(IPropertyChangeListener listener, String[] properties) {
 		fPropertyListeners.put(listener, new PropertyListener(listener, properties));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRenderingSynchronizationService#
-	 * removePropertyChangeListener
-	 * (org.eclipse.jface.util.IPropertyChangeListener)
-	 */
 	@Override
 	public void removePropertyChangeListener(IPropertyChangeListener listener) {
 		if (fPropertyListeners.containsKey(listener)) {
@@ -263,11 +233,6 @@ public class MemoryViewSynchronizationService implements IMemoryRenderingSynchro
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRenderingSynchronizationService#
-	 * getProperty(org.eclipse.debug.core.model.IMemoryBlock, java.lang.String)
-	 */
 	@Override
 	public Object getProperty(IMemoryBlock block, String property) {
 
@@ -289,12 +254,6 @@ public class MemoryViewSynchronizationService implements IMemoryRenderingSynchro
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse
-	 * .jface.util.PropertyChangeEvent)
-	 */
 	@Override
 	public void propertyChange(PropertyChangeEvent event) {
 		if (event == null || !(event.getSource() instanceof IMemoryRendering)) {
@@ -404,11 +363,6 @@ public class MemoryViewSynchronizationService implements IMemoryRenderingSynchro
 		return fEnableState == ENABLED;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRenderingSynchronizationService#
-	 * setSynchronizationProvider(org.eclipse.debug.ui.memory.IMemoryRendering)
-	 */
 	@Override
 	public void setSynchronizationProvider(IMemoryRendering rendering) {
 
@@ -424,11 +378,6 @@ public class MemoryViewSynchronizationService implements IMemoryRenderingSynchro
 		fSyncServiceProvider = rendering;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRenderingSynchronizationService#
-	 * getSynchronizationProvider()
-	 */
 	@Override
 	public IMemoryRendering getSynchronizationProvider() {
 		return fSyncServiceProvider;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java
index 069b58f66..999904591 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTab.java
@@ -59,8 +59,9 @@ public class MemoryViewTab implements IMemoryViewTab, IPropertyChangeListener, L
 		// as the new rendering should be in focus and have control
 		// after it's created
 
-		if (container.getMemoryRenderingSite().getSynchronizationService() != null)
+		if (container.getMemoryRenderingSite().getSynchronizationService() != null) {
 			container.getMemoryRenderingSite().getSynchronizationService().setSynchronizationProvider(rendering);
+		}
 		Control control = createViewTab();
 
 		control.addListener(SWT.Activate, this);
@@ -116,15 +117,12 @@ public class MemoryViewTab implements IMemoryViewTab, IPropertyChangeListener, L
 		return fRendering.getImage();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#dispose()
-	 */
 	@Override
 	public void dispose() {
 
-		if (fIsDisposed)
+		if (fIsDisposed) {
 			return;
+		}
 
 		fIsDisposed = true;
 
@@ -146,70 +144,38 @@ public class MemoryViewTab implements IMemoryViewTab, IPropertyChangeListener, L
 		return fIsDisposed;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#isEnabled()
-	 */
 	@Override
 	public boolean isEnabled() {
 		return fEnabled;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#setEnabled(
-	 * boolean)
-	 */
 	@Override
 	public void setEnabled(boolean enabled) {
 		fEnabled = enabled;
 
-		if (fEnabled)
+		if (fEnabled) {
 			fRendering.becomesVisible();
-		else
+		} else {
 			fRendering.becomesHidden();
+		}
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#setTabLabel
-	 * (java.lang.String)
-	 */
 	@Override
 	public void setTabLabel(String label) {
 		fTabItem.setText(label);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#getTabLabel()
-	 */
 	@Override
 	public String getTabLabel() {
 		return fTabItem.getText();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.views.memory.IMemoryViewTab#getRendering()
-	 */
 	@Override
 	public IMemoryRendering getRendering() {
 		return fRendering;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse
-	 * .jface.util.PropertyChangeEvent)
-	 */
 	@Override
 	public void propertyChange(final PropertyChangeEvent event) {
 
@@ -220,8 +186,9 @@ public class MemoryViewTab implements IMemoryViewTab, IPropertyChangeListener, L
 
 			@Override
 			public IStatus runInUIThread(IProgressMonitor monitor) {
-				if (isDisposed())
+				if (isDisposed()) {
 					return Status.OK_STATUS;
+				}
 
 				if (event.getSource() == fRendering) {
 					if (event.getProperty().equals(IBasicPropertyConstants.P_TEXT)) {
@@ -255,12 +222,6 @@ public class MemoryViewTab implements IMemoryViewTab, IPropertyChangeListener, L
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.
-	 * Event)
-	 */
 	@Override
 	public void handleEvent(Event event) {
 		if (event.type == SWT.Activate) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeViewer.java
index 608336cbf..73b7ede44 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MemoryViewTreeViewer.java
@@ -39,10 +39,8 @@ public class MemoryViewTreeViewer extends TreeModelViewer {
 	}
 
 	/*
-	 * Need to have a customized content provider to define a special update
-	 * policy for the Memory View (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.viewers.model.InternalTreeModelViewer#
-	 * createContentProvider()
+	 * Need to have a customized content provider to define a special update policy
+	 * for the Memory View
 	 */
 	@Override
 	protected ITreeModelContentProvider createContentProvider() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java
index 23f2a4364..23b0b0004 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/MonitorMemoryBlockDialog.java
@@ -59,20 +59,15 @@ public class MonitorMemoryBlockDialog extends TrayDialog implements ModifyListen
 	public MonitorMemoryBlockDialog(Shell parentShell, IMemoryBlockRetrieval memRetrieval, String prefillExp, String prefillLength) {
 		super(parentShell);
 
-		if (memRetrieval instanceof IMemoryBlockRetrievalExtension)
+		if (memRetrieval instanceof IMemoryBlockRetrievalExtension) {
 			needLength = false;
+		}
 
 		fPrefillExp = prefillExp;
 		fPrefillLength = prefillLength;
 		setShellStyle(getShellStyle() | SWT.RESIZE);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets
-	 * .Composite)
-	 */
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite comp = (Composite) super.createDialogArea(parent);
@@ -95,12 +90,6 @@ public class MonitorMemoryBlockDialog extends TrayDialog implements ModifyListen
 		return comp;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets
-	 * .Shell)
-	 */
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
@@ -122,10 +111,6 @@ public class MonitorMemoryBlockDialog extends TrayDialog implements ModifyListen
 		return length;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
 	@Override
 	protected void okPressed() {
 
@@ -134,18 +119,13 @@ public class MonitorMemoryBlockDialog extends TrayDialog implements ModifyListen
 		// add to HISTORY list
 		MemoryViewUtil.addHistory(expression);
 
-		if (needLength)
+		if (needLength) {
 			length = lengthInput.getText();
+		}
 
 		super.okPressed();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events
-	 * .ModifyEvent)
-	 */
 	@Override
 	public void modifyText(ModifyEvent e) {
 		updateOKButtonState();
@@ -164,22 +144,17 @@ public class MonitorMemoryBlockDialog extends TrayDialog implements ModifyListen
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.jface.dialogs.Dialog#createButtonBar(org.eclipse.swt.widgets
-	 * .Composite)
-	 */
 	@Override
 	protected Control createButtonBar(Composite parent) {
 
 		Control ret = super.createButtonBar(parent);
 
-		if (needLength)
+		if (needLength) {
 			updateOKButtonState();
-		else
+		} else {
 			// always enable the OK button if we only need the expression
 			getButton(IDialogConstants.OK_ID).setEnabled(true);
+		}
 
 		return ret;
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PropertyChangeNotifier.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PropertyChangeNotifier.java
index 0f7c68621..c0f3c85a3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PropertyChangeNotifier.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/PropertyChangeNotifier.java
@@ -35,21 +35,11 @@ public class PropertyChangeNotifier implements ISafeRunnable {
 		fEvt = evt;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable
-	 * )
-	 */
 	@Override
 	public void handleException(Throwable exception) {
 		DebugUIPlugin.log(exception);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.ISafeRunnable#run()
-	 */
 	@Override
 	public void run() throws Exception {
 		fListener.propertyChange(fEvt);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java
index 2356492bd..586e996a6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveMemoryRenderingAction.java
@@ -46,10 +46,6 @@ public class RemoveMemoryRenderingAction extends Action {
 		fViewPane = viewPane;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 
@@ -65,12 +61,6 @@ public class RemoveMemoryRenderingAction extends Action {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * com.ibm.debug.defaultrenderings.internal.actions.AbstractMemoryAction
-	 * #getViewTab()
-	 */
 	IMemoryViewTab getViewTab() {
 		if (fViewPane instanceof IMemoryView) {
 			return ((IMemoryView) fViewPane).getTopMemoryTab();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveRenderingContextAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveRenderingContextAction.java
index 070004686..92d2653a3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveRenderingContextAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RemoveRenderingContextAction.java
@@ -28,10 +28,6 @@ public class RemoveRenderingContextAction implements IViewActionDelegate {
 
 	private IMemoryRenderingSite fMemoryView;
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
 	@Override
 	public void init(IViewPart view) {
 		if (view instanceof IMemoryRenderingSite) {
@@ -39,14 +35,11 @@ public class RemoveRenderingContextAction implements IViewActionDelegate {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void run(IAction action) {
-		if (fMemoryView == null)
+		if (fMemoryView == null) {
 			return;
+		}
 
 		IMemoryRenderingContainer container = getRenderingContainer(action);
 		if (container != null) {
@@ -55,20 +48,15 @@ public class RemoveRenderingContextAction implements IViewActionDelegate {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action
-	 * .IAction, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		IMemoryRenderingContainer container = getRenderingContainer(action);
 		if (container instanceof RenderingViewPane) {
-			if (!((RenderingViewPane) container).canRemoveRendering())
+			if (!((RenderingViewPane) container).canRemoveRendering()) {
 				action.setEnabled(false);
-			else
+			} else {
 				action.setEnabled(true);
+			}
 		}
 	}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java
index ae5006cc1..90ef9daaf 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/RenderingViewPane.java
@@ -115,12 +115,6 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.core.memory.IMemoryBlockListener#MemoryBlockAdded
-	 * (org.eclipse.debug.core.model.IMemoryBlock)
-	 */
 	@Override
 	public void memoryBlocksAdded(final IMemoryBlock[] memoryBlocks) {
 		Display.getDefault().asyncExec(() -> {
@@ -146,11 +140,6 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.memory.IMemoryBlockListener#
-	 * MemoryBlockRemoved(org.eclipse.debug.core.model.IMemoryBlock)
-	 */
 	@Override
 	public void memoryBlocksRemoved(final IMemoryBlock[] memoryBlocks) {
 		Display.getDefault().asyncExec(() -> {
@@ -241,11 +230,6 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.
-	 * IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	public void selectionChanged(final IWorkbenchPart part, final ISelection selection) {
 		if (isDisposed()) {
@@ -498,12 +482,6 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.core.memory.IMemoryRenderingListener#
-	 * MemoryBlockRenderingRemoved
-	 * (org.eclipse.debug.internal.core.memory.IMemoryRendering)
-	 */
 	public void memoryBlockRenderingRemoved(final IMemoryRendering rendering) {
 		final IMemoryBlock memory = rendering.getMemoryBlock();
 
@@ -680,12 +658,6 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 		fParent.getSite().getSelectionProvider().removeSelectionChangedListener(this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt
-	 * .events.SelectionEvent)
-	 */
 	@Override
 	public void widgetSelected(SelectionEvent e) {
 
@@ -701,12 +673,6 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse
-	 * .swt.events.SelectionEvent)
-	 */
 	@Override
 	public void widgetDefaultSelected(SelectionEvent e) {
 	}
@@ -721,10 +687,6 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see com.ibm.debug.extended.ui.IMemoryView#getAllViewTabs()
-	 */
 	@Override
 	public IMemoryViewTab[] getAllViewTabs() {
 
@@ -741,12 +703,6 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 		return viewTabs;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * com.ibm.debug.extended.ui.IMemoryView#moveToTop(com.ibm.debug.extended
-	 * .ui.IMemoryViewTab)
-	 */
 	@Override
 	public void moveToTop(IMemoryViewTab viewTab) {
 
@@ -958,12 +914,6 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 	protected void updateToolBarActionsEnablement() {
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.views.memory.AbstractMemoryViewPane#emptyFolder
-	 * ()
-	 */
 	@Override
 	protected void emptyFolder() {
 		super.emptyFolder();
@@ -971,12 +921,6 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 		fSelectionProvider.setSelection(AbstractMemoryViewPane.EMPTY);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.memory.IRenderingViewPane#
-	 * addMemoryRendering
-	 * (org.eclipse.debug.internal.ui.views.memory.IMemoryRendering)
-	 */
 	@Override
 	public void addMemoryRendering(IMemoryRendering rendering) {
 
@@ -989,12 +933,6 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.memory.IRenderingViewPane#
-	 * removeMemoryRendering
-	 * (org.eclipse.debug.internal.ui.views.memory.IMemoryRendering)
-	 */
 	@Override
 	public void removeMemoryRendering(IMemoryRendering rendering) {
 
@@ -1045,41 +983,21 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.memory.IRenderingViewPane#
-	 * getMemoryRenderingSite()
-	 */
 	@Override
 	public IMemoryRenderingSite getMemoryRenderingSite() {
 		return fRenderingSite;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRenderingContainer#getId()
-	 */
 	@Override
 	public String getId() {
 		return getPaneId();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.ui.memory.IMemoryRenderingContainer#getRenderings()
-	 */
 	@Override
 	public IMemoryRendering[] getRenderings() {
 		return fRenderingMgr.getRenderings();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.ui.memory.IMemoryRenderingContainer#getActiveRendering
-	 * ()
-	 */
 	@Override
 	public IMemoryRendering getActiveRendering() {
 		if (getTopMemoryTab() == null) {
@@ -1267,13 +1185,6 @@ public class RenderingViewPane extends AbstractMemoryViewPane implements IMemory
 		folder.setSelection(0);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextListener
-	 * #contextEvent
-	 * (org.eclipse.debug.internal.ui.contexts.provisional.DebugContextEvent)
-	 */
 	@Override
 	public void debugContextChanged(DebugContextEvent event) {
 		if ((event.getFlags() & DebugContextEvent.ACTIVATED) > 0) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockAction.java
index a69ae2a34..a1c8b76ad 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ResetMemoryBlockAction.java
@@ -39,19 +39,11 @@ public class ResetMemoryBlockAction implements IViewActionDelegate {
 	private IViewPart fView;
 	private ArrayList<Object> fSelectedMB = new ArrayList<>();
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
 	@Override
 	public void init(IViewPart view) {
 		fView = view;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void run(IAction action) {
 		if (fSelectedMB.isEmpty()) {
@@ -78,12 +70,6 @@ public class ResetMemoryBlockAction implements IViewActionDelegate {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action
-	 * .IAction, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		action.setEnabled(!selection.isEmpty());
@@ -92,10 +78,12 @@ public class ResetMemoryBlockAction implements IViewActionDelegate {
 			Object[] objs = strucSel.toArray();
 			fSelectedMB.clear();
 			for (int i = 0; i < objs.length; i++) {
-				if (objs[i] instanceof IMemoryBlock)
+				if (objs[i] instanceof IMemoryBlock) {
 					fSelectedMB.add(objs[i]);
-				if (objs[i] instanceof IMemoryRendering)
+				}
+				if (objs[i] instanceof IMemoryRendering) {
 					fSelectedMB.add(((IMemoryRendering) objs[i]).getMemoryBlock());
+				}
 			}
 		}
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java
index a7b976ec4..a2604aef1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/SwitchMemoryBlockAction.java
@@ -73,12 +73,6 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega
 			setSystem(true);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see
-		 * org.eclipse.ui.progress.UIJob#runInUIThread(org.eclipse.core.runtime
-		 * .IProgressMonitor)
-		 */
 		@Override
 		public IStatus runInUIThread(IProgressMonitor monitor) {
 			if (fAction != null) {
@@ -148,10 +142,6 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega
 	class SwitchToAction extends Action {
 		private IMemoryBlock fMemoryblock;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.jface.action.IAction#run()
-		 */
 		@Override
 		public void run() {
 			if (fView == null) {
@@ -219,22 +209,13 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega
 	class MenuCreator implements IMenuCreator {
 		Menu dropdown;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.eclipse.jface.action.IMenuCreator#dispose()
-		 */
 		@Override
 		public void dispose() {
-			if (dropdown != null)
+			if (dropdown != null) {
 				dropdown.dispose();
+			}
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see
-		 * org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets
-		 * .Control)
-		 */
 		@Override
 		public Menu getMenu(Control parent) {
 			if (dropdown != null) {
@@ -270,12 +251,6 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega
 			return dropdown;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see
-		 * org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets
-		 * .Menu)
-		 */
 		@Override
 		public Menu getMenu(Menu parent) {
 			return null;
@@ -283,10 +258,6 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
 	@Override
 	public void init(IViewPart view) {
 		fView = view;
@@ -312,19 +283,11 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void run(IAction action) {
 		switchToNext();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
 	@Override
 	public void run() {
 		switchToNext();
@@ -366,21 +329,10 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action
-	 * .IAction, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void init(IAction action) {
 		fAction = action;
@@ -389,10 +341,6 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega
 		action.setMenuCreator(fMenuCreator);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#dispose()
-	 */
 	@Override
 	public void dispose() {
 		fAction = null;
@@ -403,12 +351,6 @@ public class SwitchMemoryBlockAction extends Action implements IViewActionDelega
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action
-	 * .IAction, org.eclipse.swt.widgets.Event)
-	 */
 	@Override
 	public void runWithEvent(IAction action, Event event) {
 		switchToNext();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleMemoryMonitorsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleMemoryMonitorsAction.java
index a83d53bde..3dfa23989 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleMemoryMonitorsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleMemoryMonitorsAction.java
@@ -21,12 +21,6 @@ package org.eclipse.debug.internal.ui.views.memory;
  */
 public class ToggleMemoryMonitorsAction extends ToggleViewPaneAction {
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.views.memory.ToggleViewPaneAction#getPaneId
-	 * ()
-	 */
 	@Override
 	public String getPaneId() {
 		return MemoryBlocksTreeViewPane.PANE_ID;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleSplitPaneAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleSplitPaneAction.java
index c8efc10f4..33f58d3f3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleSplitPaneAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleSplitPaneAction.java
@@ -23,12 +23,6 @@ import org.eclipse.debug.ui.IDebugUIConstants;
  */
 public class ToggleSplitPaneAction extends ToggleViewPaneAction {
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.internal.ui.views.memory.ToggleViewPaneAction#getPaneId
-	 * ()
-	 */
 	@Override
 	public String getPaneId() {
 		return IDebugUIConstants.ID_RENDERING_VIEW_PANE_2;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleViewPaneAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleViewPaneAction.java
index 6e5a01a28..e4d932d09 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleViewPaneAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ToggleViewPaneAction.java
@@ -32,10 +32,6 @@ abstract public class ToggleViewPaneAction extends Action implements IViewAction
 	MemoryView fView;
 	IAction fAction;
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
 	@Override
 	public void init(IViewPart view) {
 		if (view instanceof MemoryView) {
@@ -43,45 +39,39 @@ abstract public class ToggleViewPaneAction extends Action implements IViewAction
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void run(IAction action) {
 
-		if (fView == null)
+		if (fView == null) {
 			return;
+		}
 
 		fView.showViewPane(!fView.isViewPaneVisible(getPaneId()), getPaneId());
 
-		if (fView.isViewPaneVisible(getPaneId()))
+		if (fView.isViewPaneVisible(getPaneId())) {
 			action.setChecked(true);
-		else
+		} else {
 			action.setChecked(false);
+		}
 
 	}
 
 	@Override
 	public void run() {
-		if (fView == null)
+		if (fView == null) {
 			return;
+		}
 
 		fView.showViewPane(!fView.isViewPaneVisible(getPaneId()), getPaneId());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action
-	 * .IAction, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
-		if (fView.isViewPaneVisible(getPaneId()))
+		if (fView.isViewPaneVisible(getPaneId())) {
 			action.setChecked(true);
-		else
+		} else {
 			action.setChecked(false);
+		}
 	}
 
 	@Override
@@ -103,10 +93,11 @@ abstract public class ToggleViewPaneAction extends Action implements IViewAction
 	@Override
 	public void propertyChange(PropertyChangeEvent event) {
 		if (fView != null && fAction != null) {
-			if (fView.isViewPaneVisible(getPaneId()))
+			if (fView.isViewPaneVisible(getPaneId())) {
 				fAction.setChecked(true);
-			else
+			} else {
 				fAction.setChecked(false);
+			}
 		}
 	}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneSelectionProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneSelectionProvider.java
index ef3e08c76..691a0714c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneSelectionProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewPaneSelectionProvider.java
@@ -31,47 +31,27 @@ public class ViewPaneSelectionProvider implements ISelectionProvider {
 	ArrayList<ISelectionChangedListener> fListeners = new ArrayList<>();
 	ISelection fSelection;
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener
-	 * (org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
 	@Override
 	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		if (!fListeners.contains(listener))
+		if (!fListeners.contains(listener)) {
 			fListeners.add(listener);
+		}
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
-	 */
 	@Override
 	public ISelection getSelection() {
 		return fSelection;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener
-	 * (org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
 	@Override
 	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-		if (fListeners.contains(listener))
+		if (fListeners.contains(listener)) {
 			fListeners.remove(listener);
+		}
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse
-	 * .jface.viewers.ISelection)
-	 */
 	@Override
 	public void setSelection(ISelection selection) {
 		fSelection = selection;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabEnablementManager.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabEnablementManager.java
index e340fc903..168e44d65 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabEnablementManager.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/ViewTabEnablementManager.java
@@ -27,12 +27,6 @@ import org.eclipse.swt.events.SelectionListener;
  */
 public class ViewTabEnablementManager implements SelectionListener {
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt
-	 * .events.SelectionEvent)
-	 */
 	@Override
 	public void widgetSelected(SelectionEvent e) {
 		if (e.getSource() instanceof CTabFolder) {
@@ -40,12 +34,6 @@ public class ViewTabEnablementManager implements SelectionListener {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse
-	 * .swt.events.SelectionEvent)
-	 */
 	@Override
 	public void widgetDefaultSelected(SelectionEvent e) {
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRendering.java
index 484c6573b..a02e4d87d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRendering.java
@@ -45,18 +45,11 @@ public class ASCIIRendering extends AbstractAsyncTextRendering{
 		super.dispose();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.AbstractMemoryRendering#getNumCharsPerByte()
-	 */
 	@Override
 	public int getNumCharsPerByte() {
 		return numCharsPerByte;
 	}
 
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.AbstractTableRendering#getBytes(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[], java.lang.String)
-	 */
 	@Override
 	public byte[] getBytes(
 		String renderingId,
@@ -79,9 +72,6 @@ public class ASCIIRendering extends AbstractAsyncTextRendering{
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.AbstractTableRendering#getString(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[])
-	 */
 	@Override
 	public String getString(
 		String renderingId,
@@ -109,9 +99,6 @@ public class ASCIIRendering extends AbstractAsyncTextRendering{
 		return super.getString(renderingId, address, copy);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
 	@Override
 	public void propertyChange(PropertyChangeEvent event) {
 
@@ -121,9 +108,10 @@ public class ASCIIRendering extends AbstractAsyncTextRendering{
 			String codePage = (String)event.getNewValue();
 			setCodePage(codePage);
 
-			if (isVisible())
+			if (isVisible()) {
 				// just update labels, don't need to reget memory
 				updateLabels();
+			}
 		}
 
 		super.propertyChange(event);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRenderingTypeDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRenderingTypeDelegate.java
index 3ebaea577..b05805730 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRenderingTypeDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ASCIIRenderingTypeDelegate.java
@@ -23,9 +23,6 @@ import org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate;
  */
 public class ASCIIRenderingTypeDelegate implements IMemoryRenderingTypeDelegate {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate#createRendering(java.lang.String)
-	 */
 	@Override
 	public IMemoryRendering createRendering(String id) throws CoreException {
 		return new ASCIIRendering(id);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractBaseTableRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractBaseTableRendering.java
index b191600ae..65f82edbd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractBaseTableRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractBaseTableRendering.java
@@ -142,7 +142,7 @@ public abstract class AbstractBaseTableRendering extends AbstractMemoryRendering
 	 */
 	abstract public int getNumCharsPerByte();
 
-	/* (non-Javadoc)
+	/*
 	 * @see org.eclipse.debug.ui.memory.IResettableMemoryRendering#resetRendering()
 	 */
 	abstract public void resetRendering() throws DebugException;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractTableRenderingLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractTableRenderingLabelProvider.java
index fae80be78..7480a95df 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractTableRenderingLabelProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AbstractTableRenderingLabelProvider.java
@@ -44,18 +44,12 @@ abstract public class AbstractTableRenderingLabelProvider extends LabelProvider
 		fRendering = rendering;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
 	@Override
 	public void dispose() {
 		fRendering = null;
 		super.dispose();
 	}
 
-	/**
-	 * @see ITableLabelProvider#getColumnImage(Object, int)
-	 */
 	@Override
 	public Image getColumnImage(Object element, int columnIndex) {
 
@@ -80,9 +74,6 @@ abstract public class AbstractTableRenderingLabelProvider extends LabelProvider
 	}
 
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
-	 */
 	@Override
 	public String getColumnText(Object element, int columnIndex) {
 		String columnLabel = null;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingCellModifier.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingCellModifier.java
index 2952264ec..a48396771 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingCellModifier.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingCellModifier.java
@@ -60,18 +60,13 @@ public class AsyncTableRenderingCellModifier implements ICellModifier {
 		job.schedule();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object,
-     *      java.lang.String)
-     */
     @Override
 	public boolean canModify(Object element, String property) {
         boolean canModify = true;
         try {
-            if (!(element instanceof MemorySegment))
-                return false;
+            if (!(element instanceof MemorySegment)) {
+				return false;
+			}
 
             if (!isValueModificationSupported()) {
                 return false;
@@ -116,29 +111,26 @@ public class AsyncTableRenderingCellModifier implements ICellModifier {
      */
     private int getAddressableSize() {
         int addressableSize = fRendering.getAddressableSize();
-        if (addressableSize < 1)
-            addressableSize = 1;
+        if (addressableSize < 1) {
+			addressableSize = 1;
+		}
         return addressableSize;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object,
-     *      java.lang.String)
-     */
     @Override
 	public Object getValue(Object element, String property) {
 
         // give back the value of the column
 
-        if (!(element instanceof MemorySegment))
-            return null;
+        if (!(element instanceof MemorySegment)) {
+			return null;
+		}
 
         MemorySegment line = (MemorySegment) element;
         try {
-            if (TableRenderingLine.P_ADDRESS.equals(property))
-                return line.getAddress();
+            if (TableRenderingLine.P_ADDRESS.equals(property)) {
+				return line.getAddress();
+			}
 
             int offsetToLineBuffer = Integer.valueOf(property, 16).intValue() * getAddressableSize();
             MemoryByte[] memory = line.getBytes(offsetToLineBuffer, fRendering.getBytesPerColumn());
@@ -160,27 +152,23 @@ public class AsyncTableRenderingCellModifier implements ICellModifier {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object,
-     *      java.lang.String, java.lang.Object)
-     */
     @Override
 	public void modify(Object element, final String property, final Object value) {
 
         MemorySegment segment = null;
         if (element instanceof TableItem) {
         	Object data = ((TableItem)element).getData();
-        	if (data != null && data instanceof MemorySegment)
-        		segment = (MemorySegment)data;
+        	if (data != null && data instanceof MemorySegment) {
+				segment = (MemorySegment)data;
+			}
 
         } else if (element instanceof MemorySegment){
         	segment = (MemorySegment) element;
         }
 
-        if (segment == null)
-        	return;
+        if (segment == null) {
+			return;
+		}
 
         final MemorySegment line = segment;
 
@@ -226,11 +214,13 @@ public class AsyncTableRenderingCellModifier implements ICellModifier {
 		          if (!oldValue.equals(value)) {
 		                bytes = fRendering.getBytes(fRendering.getRenderingId(), address, oldArray, (String) value);
 
-		                if (bytes == null)
-		                    return Status.OK_STATUS;
+		                if (bytes == null) {
+							return Status.OK_STATUS;
+						}
 
-		                if (bytes.length == 0)
-		                	 return Status.OK_STATUS;
+		                if (bytes.length == 0) {
+							return Status.OK_STATUS;
+						}
 
 		                if (bytes.length <= oldArray.length) {
 		                    boolean changed = false;
@@ -241,8 +231,9 @@ public class AsyncTableRenderingCellModifier implements ICellModifier {
 		                            break;
 		                        }
 		                    }
-		                    if (!changed)
-		                    	 return Status.OK_STATUS;
+		                    if (!changed) {
+								return Status.OK_STATUS;
+							}
 		                }
 		            } else {
 		                // return if value has not changed
@@ -251,10 +242,11 @@ public class AsyncTableRenderingCellModifier implements ICellModifier {
 
 		            final byte[] newByteValues = bytes;
 
-		            if (memoryBlk instanceof IMemoryBlockExtension)
-		                ((IMemoryBlockExtension) memoryBlk).setValue(offsetFromMBBase, newByteValues);
-		            else
-		                memoryBlk.setValue(offsetFromMBBase.longValue(), newByteValues);
+		            if (memoryBlk instanceof IMemoryBlockExtension) {
+						((IMemoryBlockExtension) memoryBlk).setValue(offsetFromMBBase, newByteValues);
+					} else {
+						memoryBlk.setValue(offsetFromMBBase.longValue(), newByteValues);
+					}
 		        } catch (DebugException e) {
 		            MemoryViewUtil.openError(DebugUIMessages.MemoryViewCellModifier_failure_title, DebugUIMessages.MemoryViewCellModifier_failed, e);
 		        } catch (NumberFormatException e) {
@@ -278,7 +270,9 @@ public class AsyncTableRenderingCellModifier implements ICellModifier {
         }
 
         if (memoryAddr == null)
-            memoryAddr = new BigInteger("0"); //$NON-NLS-1$
+		 {
+			memoryAddr = new BigInteger("0"); //$NON-NLS-1$
+		}
 
         return lineAddress.subtract(memoryAddr).add(BigInteger.valueOf(lineOffset));
     }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java
index 398296ccf..bdb80ff7d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/AsyncTableRenderingViewer.java
@@ -898,11 +898,10 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer {
 		return fTableCursor;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ContentViewer#getLabelProvider()
-	 * Implemented minimum to work with PrintTableRendering action.
-	 * This is not a real table labe provider, only goes to the table
-	 * to get the text at the specified row and column.
+	/*
+	 * Implemented minimum to work with PrintTableRendering action. This is not a
+	 * real table labe provider, only goes to the table to get the text at the
+	 * specified row and column.
 	 */
 	@Override
 	public IBaseLabelProvider getLabelProvider() {
@@ -1016,9 +1015,6 @@ public class AsyncTableRenderingViewer extends AsyncVirtualContentTableViewer {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.viewers.model.provisional.viewers.AsynchronousViewer#getModel()
-	 */
 	@Override
 	public AsynchronousModel getModel() {
 		return super.getModel();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BasicDebugViewContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BasicDebugViewContentProvider.java
index c6d762b0c..08fb101ff 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BasicDebugViewContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BasicDebugViewContentProvider.java
@@ -30,9 +30,6 @@ public abstract class BasicDebugViewContentProvider implements IStructuredConten
 	protected StructuredViewer fViewer;
 	protected boolean fDisposed= false;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
 	@Override
 	public void dispose() {
 		fDisposed= true;
@@ -47,9 +44,6 @@ public abstract class BasicDebugViewContentProvider implements IStructuredConten
 		return fDisposed;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 		fViewer= (StructuredViewer) viewer;
@@ -113,9 +107,6 @@ public abstract class BasicDebugViewContentProvider implements IStructuredConten
 		asyncExec(r);
 	}
 
-	/* (non-Javadoc)
-	 * @see IDebugEventSetListener#handleDebugEvents(DebugEvent[])
-	 */
 	@Override
 	public void handleDebugEvents(DebugEvent[] events) {
 		for (int i=0; i < events.length; i++) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BigEndianAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BigEndianAction.java
index ce0fadaf3..6e0ac933a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BigEndianAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/BigEndianAction.java
@@ -27,21 +27,16 @@ public class BigEndianAction implements IObjectActionDelegate {
 
 	AbstractIntegerRendering fRendering;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
 	@Override
 	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void run(IAction action) {
 
-		if (fRendering == null)
+		if (fRendering == null) {
 			return;
+		}
 
 		if (fRendering.getDisplayEndianess() != RenderingsUtil.BIG_ENDIAN){
 			fRendering.setDisplayEndianess(RenderingsUtil.BIG_ENDIAN);
@@ -49,20 +44,19 @@ public class BigEndianAction implements IObjectActionDelegate {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 
-		if (selection == null)
+		if (selection == null) {
 			return;
+		}
 
 		if (selection instanceof IStructuredSelection)
 		{
 			Object obj = ((IStructuredSelection)selection).getFirstElement();
-			if (obj == null)
+			if (obj == null) {
 				return;
+			}
 
 			if (obj instanceof AbstractIntegerRendering)
 			{
@@ -94,14 +88,15 @@ public class BigEndianAction implements IObjectActionDelegate {
 						}
 					}
 				}
-			}
-			else
+			} else {
 				endianess = fRendering.getDisplayEndianess();
+			}
 
-			if (endianess == RenderingsUtil.BIG_ENDIAN)
+			if (endianess == RenderingsUtil.BIG_ENDIAN) {
 				action.setChecked(true);
-			else
+			} else {
 				action.setChecked(false);
+			}
 		}
 	}
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java
index 732cd96ec..5e04d5560 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CopyTableRenderingToClipboardAction.java
@@ -61,7 +61,9 @@ public class CopyTableRenderingToClipboardAction extends Action
 	}
 
 	protected String concatenateTableAsString(TableItem[] itemList) {
-		if (itemList.length == 0) return null;
+		if (itemList.length == 0) {
+			return null;
+		}
 
 		StringBuffer tableContents = new StringBuffer();
 
@@ -77,8 +79,9 @@ public class CopyTableRenderingToClipboardAction extends Action
 		tableContents.append(COLUMN_SEPERATOR);
 
 		int charsPerByte = fRendering.getNumCharsPerByte();
-		if (charsPerByte < 0)
+		if (charsPerByte < 0) {
 			charsPerByte = 4;
+		}
 
 		//get the column headers and line them up properly
 		for (int k=0; k < numColumns; k++) {
@@ -106,13 +109,14 @@ public class CopyTableRenderingToClipboardAction extends Action
 						} catch (DebugException e) {
 							numBytes = 0;
 						}
-					}
-					else
+					} else {
 						numBytes = descriptor.getAddressSize();
+					}
 
 					// check address size
-					if (numBytes <= 0)
+					if (numBytes <= 0) {
 						numBytes = 4;
+					}
 				}
 				else
 				{
@@ -158,22 +162,22 @@ public class CopyTableRenderingToClipboardAction extends Action
 		return tableContents.toString();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 
-		if (fRendering == null)
+		if (fRendering == null) {
 			return;
+		}
 
-		if (! (fViewer.getControl() instanceof Table))
+		if (! (fViewer.getControl() instanceof Table)) {
 			return;
+		}
 
 		Table table = (Table)fViewer.getControl();
 
-		if (table == null)
+		if (table == null) {
 			return;
+		}
 		Clipboard clip= null;
 		try {
 			clip = new Clipboard(table.getDisplay());
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java
index ed750a04a..e0617e1b9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/CreateRendering.java
@@ -83,18 +83,12 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR
 	class MemoryRenderingLabelProvider implements ILabelProvider
 	{
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-		 */
 		@Override
 		public Image getImage(Object element) {
 			return DebugUIPlugin.getImageDescriptorRegistry().get(
 					DebugPluginImages.getImageDescriptor(IInternalDebugUIConstants.IMG_ELCL_MONITOR_EXPRESSION));
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-		 */
 		@Override
 		public String getText(Object element) {
 			if (element instanceof IMemoryRenderingType)
@@ -105,31 +99,19 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR
             return element.toString();
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-		 */
 		@Override
 		public void addListener(ILabelProviderListener listener) {
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-		 */
 		@Override
 		public void dispose() {
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
-		 */
 		@Override
 		public boolean isLabelProperty(Object element, String property) {
 			return false;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-		 */
 		@Override
 		public void removeListener(ILabelProviderListener listener) {
 		}
@@ -139,35 +121,23 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR
 	class MemoryRenderingContentProvider implements IStructuredContentProvider
 	{
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-		 */
 		@Override
 		public Object[] getElements(Object inputElement) {
 			IMemoryRenderingType[] renderings = DebugUITools.getMemoryRenderingManager().getRenderingTypes((IMemoryBlock)inputElement);
 			return renderings;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-		 */
 		@Override
 		public void dispose() {
 
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
 		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 		}
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#createControl(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	public Control createControl(Composite parent) {
 		fCanvas = new Composite(parent, SWT.NONE);
@@ -227,8 +197,9 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR
 		fViewer.getList().addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyPressed(KeyEvent e) {
-				if (e.character == SWT.CR)
+				if (e.character == SWT.CR) {
 					addRenderings();
+				}
 			}});
 
 		Button addButton = new Button(fCanvas, SWT.NONE);
@@ -279,8 +250,9 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR
 		// ask for debug target and memory block retrieval
 		IMemoryBlockRetrieval standardMemRetrieval = MemoryViewUtil.getMemoryBlockRetrieval(getMemoryBlock());
 
-		if (standardMemRetrieval == null)
+		if (standardMemRetrieval == null) {
 			return;
+		}
 
 		// make a copy of the container, may be diposed when a rendering is added
 		IMemoryRenderingContainer container = fContainer;
@@ -304,9 +276,6 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#dispose()
-	 */
 	@Override
 	public void dispose() {
 		fViewer = null;
@@ -316,17 +285,15 @@ public class CreateRendering extends AbstractMemoryRendering implements IMemoryR
 		DebugUITools.getMemoryRenderingManager().removeListener(this);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.memory.AbstractMemoryRendering#getControl()
-	 */
 	@Override
 	public Control getControl() {
 		return fCanvas;
 	}
 	@Override
 	public void memoryRenderingBindingsChanged() {
-		if (fViewer != null)
+		if (fViewer != null) {
 			fViewer.refresh();
+		}
 	}
 
 	@Override
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ErrorRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ErrorRendering.java
index 56ee44e61..19923141f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ErrorRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ErrorRendering.java
@@ -48,9 +48,6 @@ public class ErrorRendering extends AbstractMemoryRendering {
 		fException = exception;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#createControl(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	public Control createControl(Composite parent) {
 		fTextViewer = new TextViewer(parent, SWT.READ_ONLY);
@@ -81,9 +78,6 @@ public class ErrorRendering extends AbstractMemoryRendering {
 		return "Unknown"; //$NON-NLS-1$
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.memory.AbstractMemoryRendering#getControl()
-	 */
 	@Override
 	public Control getControl() {
 		return fTextViewer.getControl();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressAction.java
index e09df71de..3ee45d4db 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressAction.java
@@ -60,9 +60,6 @@ public class GoToAddressAction extends Action
 
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".GoToAddressAction_context"); //$NON-NLS-1$
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run()
 	{
@@ -175,8 +172,9 @@ public class GoToAddressAction extends Action
 	{
 		Object elem = DebugUITools.getPartDebugContext(fContainer.getMemoryRenderingSite().getSite());
 
-		if (!(elem instanceof IDebugElement))
+		if (!(elem instanceof IDebugElement)) {
 			return;
+		}
 
 		try {
 			if (retrieval != null)
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java
index f2ce5bba8..0982ff7a1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/GoToAddressDialog.java
@@ -51,12 +51,6 @@ public class GoToAddressDialog extends TrayDialog implements ModifyListener {
 		setShellStyle(getShellStyle() | SWT.RESIZE);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets
-	 * .Composite)
-	 */
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite comp = (Composite) super.createDialogArea(parent);
@@ -95,12 +89,6 @@ public class GoToAddressDialog extends TrayDialog implements ModifyListener {
 		return comp;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets
-	 * .Shell)
-	 */
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
@@ -112,10 +100,6 @@ public class GoToAddressDialog extends TrayDialog implements ModifyListener {
 		return expression;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
 	@Override
 	protected void okPressed() {
 
@@ -129,12 +113,6 @@ public class GoToAddressDialog extends TrayDialog implements ModifyListener {
 		super.okPressed();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events
-	 * .ModifyEvent)
-	 */
 	@Override
 	public void modifyText(ModifyEvent e) {
 
@@ -148,12 +126,6 @@ public class GoToAddressDialog extends TrayDialog implements ModifyListener {
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.jface.dialogs.Dialog#createButtonBar(org.eclipse.swt.widgets
-	 * .Composite)
-	 */
 	@Override
 	protected Control createButtonBar(Composite parent) {
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRendering.java
index a60361063..49c640520 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexIntegerRendering.java
@@ -30,9 +30,6 @@ public class HexIntegerRendering extends AbstractIntegerRendering {
 		super(renderingId);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.memory.AbstractTableRendering#getString(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[], java.lang.String)
-	 */
 	@Override
 	public String getString(String dataType, BigInteger address,
 			MemoryByte[] data) {
@@ -74,14 +71,12 @@ public class HexIntegerRendering extends AbstractIntegerRendering {
         // if the user has not set an endianess to the rendering
         // take default
         int endianess = getDisplayEndianess();
-        if (endianess == RenderingsUtil.ENDIANESS_UNKNOWN)
-            endianess = getBytesEndianess(data);
+        if (endianess == RenderingsUtil.ENDIANESS_UNKNOWN) {
+			endianess = getBytesEndianess(data);
+		}
         return endianess;
     }
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.memory.AbstractTableRendering#getBytes(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[], java.lang.String)
-	 */
 	@Override
 	public byte[] getBytes(String dataType, BigInteger address,
 			MemoryByte[] currentValues, String data) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRendering.java
index 90ae22a08..8246b00b6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRendering.java
@@ -31,9 +31,6 @@ public class HexRendering extends AbstractAsyncTableRendering {
 		super(renderingId);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.memory.AbstractTableRendering#getString(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[], java.lang.String)
-	 */
 	@Override
 	public String getString(String dataType, BigInteger address,
 			MemoryByte[] data) {
@@ -57,9 +54,6 @@ public class HexRendering extends AbstractAsyncTableRendering {
 		return strBuffer.toString().toUpperCase();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.memory.AbstractTableRendering#getBytes(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[], java.lang.String)
-	 */
 	@Override
 	public byte[] getBytes(String dataType, BigInteger address,
 			MemoryByte[] currentValues, String data) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRenderingTypeDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRenderingTypeDelegate.java
index d589835f8..cbced5661 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRenderingTypeDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/HexRenderingTypeDelegate.java
@@ -23,9 +23,6 @@ import org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate;
  */
 public class HexRenderingTypeDelegate implements IMemoryRenderingTypeDelegate {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate#createRendering(java.lang.String)
-	 */
 	@Override
 	public IMemoryRendering createRendering(String id) throws CoreException {
 		HexRendering rendering = new HexRendering(id);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/LittleEndianAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/LittleEndianAction.java
index 65fb5e384..b0fde66cd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/LittleEndianAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/LittleEndianAction.java
@@ -29,21 +29,16 @@ public class LittleEndianAction implements IObjectActionDelegate {
 
 	AbstractIntegerRendering fRendering;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
 	@Override
 	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void run(IAction action) {
 
-		if (fRendering == null)
+		if (fRendering == null) {
 			return;
+		}
 
 		if (fRendering.getDisplayEndianess() != RenderingsUtil.LITTLE_ENDIAN){
 			fRendering.setDisplayEndianess(RenderingsUtil.LITTLE_ENDIAN);
@@ -51,19 +46,18 @@ public class LittleEndianAction implements IObjectActionDelegate {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
-		if (selection == null)
+		if (selection == null) {
 			return;
+		}
 
 		if (selection instanceof IStructuredSelection)
 		{
 			Object obj = ((IStructuredSelection)selection).getFirstElement();
-			if (obj == null)
+			if (obj == null) {
 				return;
+			}
 
 			if (obj instanceof AbstractIntegerRendering)
 			{
@@ -96,14 +90,15 @@ public class LittleEndianAction implements IObjectActionDelegate {
 						}
 					}
 				}
-			}
-			else
+			} else {
 				endianess = fRendering.getDisplayEndianess();
+			}
 
-			if (endianess == RenderingsUtil.LITTLE_ENDIAN)
+			if (endianess == RenderingsUtil.LITTLE_ENDIAN) {
 				action.setChecked(true);
-			else
+			} else {
 				action.setChecked(false);
+			}
 		}
 	}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java
index b405bf658..df746e514 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/PrintTableRenderingAction.java
@@ -72,8 +72,9 @@ public class PrintTableRenderingAction extends Action
 		int lineNum = 1;
 
 		int charsPerByte = fRendering.getNumCharsPerByte();
-		if (charsPerByte < 0)
+		if (charsPerByte < 0) {
 			charsPerByte = 4;
+		}
 
 		// return line number after column labels are printed
 		lineNum = printColumnLabels(printGC, lineNum);
@@ -112,8 +113,9 @@ public class PrintTableRenderingAction extends Action
 		TableColumn columns[] = ((Table)fViewer.getControl()).getColumns();
 
 		int charsPerByte = fRendering.getNumCharsPerByte();
-		if (charsPerByte < 0)
+		if (charsPerByte < 0) {
 			charsPerByte = 4;
+		}
 
 		int addressSizeInBytes = 0;
 		TableRenderingContentDescriptor descriptor = fRendering.getAdapter(TableRenderingContentDescriptor.class);
@@ -129,8 +131,9 @@ public class PrintTableRenderingAction extends Action
 					addressSizeInBytes = 0;
 				}
 
-				if (addressSizeInBytes <= 0)
+				if (addressSizeInBytes <= 0) {
 					addressSizeInBytes = 4;
+				}
 			}
 			else
 			{
@@ -171,14 +174,12 @@ public class PrintTableRenderingAction extends Action
 		return lineNum;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 
-		if (!(fViewer.getControl() instanceof Table))
+		if (!(fViewer.getControl() instanceof Table)) {
 			return;
+		}
 
 		PrintDialog printDialog = new PrintDialog(DebugUIPlugin.getShell());
 		PrinterData printerData = printDialog.open();	// pop up a system print dialog
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ReformatAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ReformatAction.java
index 7e9d9be78..5009ee9f0 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ReformatAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ReformatAction.java
@@ -34,9 +34,6 @@ public class ReformatAction extends Action {
 		fRendering = rendering;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 		fRendering.resizeColumnsToPreferredSize();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ResetToBaseAddressAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ResetToBaseAddressAction.java
index 47ee0e2d2..d35c85960 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ResetToBaseAddressAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/ResetToBaseAddressAction.java
@@ -46,10 +46,6 @@ public class ResetToBaseAddressAction extends Action {
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugUIConstants.PLUGIN_ID + ".ResetBaseAddressContextAction_context"); //$NON-NLS-1$
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@SuppressWarnings("deprecation")
 	@Override
 	public void run() {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRendering.java
index 72c611b81..8416dbbb9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRendering.java
@@ -123,8 +123,9 @@ public class SignedIntegerRendering extends AbstractIntegerRendering {
 					fMax = fMax.subtract(BigInteger.valueOf(1));
 				}
 
-				if (i.compareTo(fMax) > 0 || i.compareTo(fMin) < 0)
+				if (i.compareTo(fMax) > 0 || i.compareTo(fMin) < 0) {
 					throw new NumberFormatException();
+				}
 
 				bytes = RenderingsUtil.convertSignedBigIntToByteArray(i, endianess, colSize);
 				return bytes;
@@ -136,9 +137,6 @@ public class SignedIntegerRendering extends AbstractIntegerRendering {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see com.ibm.debug.extended.ui.AbstractMemoryRenderer#getString(java.lang.String, java.math.BigInteger, byte[])
-	 */
 	@Override
 	public String getString(String dataType, BigInteger address, MemoryByte[] data) {
 
@@ -168,8 +166,9 @@ public class SignedIntegerRendering extends AbstractIntegerRendering {
 		// if the user has not set an endianess to the rendering
 		// take default endianess from bytes
 		int endianess = getDisplayEndianess();
-		if (endianess == RenderingsUtil.ENDIANESS_UNKNOWN)
+		if (endianess == RenderingsUtil.ENDIANESS_UNKNOWN) {
 			endianess = getBytesEndianess(data);
+		}
 
 		byte[] byteArray = new byte[data.length];
 		for (int i=0; i<byteArray.length;i ++)
@@ -190,9 +189,6 @@ public class SignedIntegerRendering extends AbstractIntegerRendering {
 		return convertToString(byteArray, columnSize, endianess);
 	}
 
-	/* (non-Javadoc)
-	 * @see com.ibm.debug.extended.ui.AbstractMemoryRenderer#getBytes(java.lang.String, java.math.BigInteger, java.lang.String)
-	 */
 	@Override
 	public byte[] getBytes(String dataType, BigInteger address, MemoryByte[] currentValues, String data) {
 
@@ -201,15 +197,17 @@ public class SignedIntegerRendering extends AbstractIntegerRendering {
 		// if the user has not set an endianess to the rendering
 		// take default
 		int endianess = getDisplayEndianess();
-		if (endianess == RenderingsUtil.ENDIANESS_UNKNOWN)
+		if (endianess == RenderingsUtil.ENDIANESS_UNKNOWN) {
 			endianess = getBytesEndianess(currentValues);
+		}
 
 		// if endianess is unknown, do not try to render new data to bytes
 		if (endianess == RenderingsUtil.ENDIANESS_UNKNOWN)
 		{
 			byte[] retBytes = new byte[currentValues.length];
-			for (int i=0 ;i<currentValues.length; i++)
+			for (int i=0 ;i<currentValues.length; i++) {
 				retBytes[i] = currentValues[i].getValue();
+			}
 			return retBytes;
 		}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRenderingTypeDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRenderingTypeDelegate.java
index 35118c30b..cf270ebdc 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRenderingTypeDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/SignedIntegerRenderingTypeDelegate.java
@@ -24,9 +24,6 @@ import org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate;
 public class SignedIntegerRenderingTypeDelegate implements
 		IMemoryRenderingTypeDelegate {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate#createRendering(java.lang.String)
-	 */
 	@Override
 	public IMemoryRendering createRendering(String id) throws CoreException {
 		return new SignedIntegerRendering(id);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingCellModifier.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingCellModifier.java
index 70c425517..bc1e47d10 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingCellModifier.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingCellModifier.java
@@ -41,24 +41,21 @@ public class TableRenderingCellModifier implements ICellModifier {
         fRendering = rendering;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object,
-     *      java.lang.String)
-     */
     @Override
 	public boolean canModify(Object element, String property) {
         boolean canModify = true;
         try {
-            if (!(element instanceof TableRenderingLine))
-                return false;
+            if (!(element instanceof TableRenderingLine)) {
+				return false;
+			}
 
-            if (!editActionInvoked)
-                return false;
+            if (!editActionInvoked) {
+				return false;
+			}
 
-            if (fRendering == null)
-                return false;
+            if (fRendering == null) {
+				return false;
+			}
 
             if (fRendering.getMemoryBlock().supportsValueModification() == false) {
                 return false;
@@ -97,28 +94,25 @@ public class TableRenderingCellModifier implements ICellModifier {
      */
     private int getAddressableSize() {
         int addressableSize = fRendering.getAddressableSize();
-        if (addressableSize < 1)
-            addressableSize = 1;
+        if (addressableSize < 1) {
+			addressableSize = 1;
+		}
         return addressableSize;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object,
-     *      java.lang.String)
-     */
     @Override
 	public Object getValue(Object element, String property) {
         // give back the value of the column
 
-        if (!(element instanceof TableRenderingLine))
-            return null;
+        if (!(element instanceof TableRenderingLine)) {
+			return null;
+		}
 
         TableRenderingLine line = (TableRenderingLine) element;
         try {
-            if (TableRenderingLine.P_ADDRESS.equals(property))
-                return line.getAddress();
+            if (TableRenderingLine.P_ADDRESS.equals(property)) {
+				return line.getAddress();
+			}
 
             int offset = Integer.valueOf(property, 16).intValue() * getAddressableSize();
             int end = offset + fRendering.getBytesPerColumn();
@@ -142,12 +136,6 @@ public class TableRenderingCellModifier implements ICellModifier {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object,
-     *      java.lang.String, java.lang.Object)
-     */
     @Override
 	public void modify(Object element, String property, Object value) {
         TableRenderingLine line = null;
@@ -158,8 +146,9 @@ public class TableRenderingCellModifier implements ICellModifier {
         }
 
         // validate data
-        if (!(value instanceof String))
-            return;
+        if (!(value instanceof String)) {
+			return;
+		}
 
         try {
             // calculate offset to update
@@ -189,11 +178,13 @@ public class TableRenderingCellModifier implements ICellModifier {
 
                 bytes = fRendering.getBytes(fRendering.getRenderingId(), address, oldArray, (String) value);
 
-                if (bytes == null)
-                    return;
+                if (bytes == null) {
+					return;
+				}
 
-                if (bytes.length == 0)
-                    return;
+                if (bytes.length == 0) {
+					return;
+				}
 
                 if (bytes.length <= oldArray.length) {
                     boolean changed = false;
@@ -204,18 +195,20 @@ public class TableRenderingCellModifier implements ICellModifier {
                             break;
                         }
                     }
-                    if (!changed)
-                        return;
+                    if (!changed) {
+						return;
+					}
                 }
             } else {
                 // return if value has not changed
                 return;
             }
 
-            if (memoryBlk instanceof IMemoryBlockExtension)
-                ((IMemoryBlockExtension) memoryBlk).setValue(offset, bytes);
-            else
-                memoryBlk.setValue(offset.longValue(), bytes);
+            if (memoryBlk instanceof IMemoryBlockExtension) {
+				((IMemoryBlockExtension) memoryBlk).setValue(offset, bytes);
+			} else {
+				memoryBlk.setValue(offset.longValue(), bytes);
+			}
         } catch (DebugException e) {
             MemoryViewUtil.openError(DebugUIMessages.MemoryViewCellModifier_failure_title, DebugUIMessages.MemoryViewCellModifier_failed, e);
         } catch (NumberFormatException e) {
@@ -236,7 +229,9 @@ public class TableRenderingCellModifier implements ICellModifier {
         }
 
         if (memoryAddr == null)
-            memoryAddr = new BigInteger("0"); //$NON-NLS-1$
+		 {
+			memoryAddr = new BigInteger("0"); //$NON-NLS-1$
+		}
 
         return lineAddr.subtract(memoryAddr).add(BigInteger.valueOf(lineOffset));
     }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java
index 739312719..4fd0f3547 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingContentProvider.java
@@ -88,9 +88,6 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 		fViewer = viewer;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public void inputChanged(Viewer v, Object oldInput, Object newInput) {
 		try {
@@ -117,9 +114,6 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 		super.dispose();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
 	@Override
 	public Object[] getElements(Object parent) {
 
@@ -635,9 +629,6 @@ public class TableRenderingContentProvider extends BasicDebugViewContentProvider
 		return memoryBuffer;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.internal.views.BasicDebugViewContentProvider#doHandleDebugEvent(org.eclipse.debug.core.DebugEvent)
-	 */
 	@Override
 	protected void doHandleDebugEvent(DebugEvent event) {
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProvider.java
index 4d4993672..eab2e5090 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProvider.java
@@ -41,10 +41,6 @@ public class TableRenderingLabelProvider extends AbstractTableRenderingLabelProv
 		fTablePresentation = rendering.getAdapter(IMemoryBlockTablePresentation.class);
 	}
 
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
 	@Override
 	public void dispose() {
 		if (fTablePresentation != null) {
@@ -54,9 +50,6 @@ public class TableRenderingLabelProvider extends AbstractTableRenderingLabelProv
 		super.dispose();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
-	 */
 	@Override
 	public Color getForeground(Object element) {
 		if (element instanceof TableRenderingLine)
@@ -71,18 +64,12 @@ public class TableRenderingLabelProvider extends AbstractTableRenderingLabelProv
 		return DebugUIPlugin.getPreferenceColor(IDebugUIConstants.PREF_MEMORY_HISTORY_KNOWN_COLOR);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
-	 */
 	@Override
 	public Color getBackground(Object element) {
 
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
-	 */
 	@Override
 	public String getColumnText(Object element, int columnIndex) {
 
@@ -98,8 +85,9 @@ public class TableRenderingLabelProvider extends AbstractTableRenderingLabelProv
 				// get address presentation
 				String tempLabel = fTablePresentation.getRowLabel(fRendering.getMemoryBlock(), new BigInteger(address, 16));
 
-				if (tempLabel != null)
+				if (tempLabel != null) {
 					return tempLabel;
+				}
 			}
 			return label;
 		}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProviderEx.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProviderEx.java
index baa5f1ac5..9db10395c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProviderEx.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLabelProviderEx.java
@@ -47,11 +47,6 @@ public class TableRenderingLabelProviderEx extends TableRenderingLabelProvider i
 		fFontProvider = rendering.getAdapter(IFontProvider.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-	 */
 	@Override
 	public void dispose() {
 		if (fFontProvider != null) {
@@ -67,65 +62,57 @@ public class TableRenderingLabelProviderEx extends TableRenderingLabelProvider i
 		super.dispose();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITableColorProvider#getBackground(java.lang.Object, int)
-	 */
 	@Override
 	public Color getBackground(Object element, int columnIndex) {
 		if (fColorProvider != null && columnIndex > 0) {
 			MemoryRenderingElement renderingElement = getMemoryRenderingElement(element, columnIndex);
 			if (renderingElement != null) {
 				Color color = fColorProvider.getBackground(renderingElement);
-				if (color != null)
+				if (color != null) {
 					return color;
+				}
 			}
 		}
 		return super.getBackground(element);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITableColorProvider#getForeground(java.lang.Object, int)
-	 */
 	@Override
 	public Color getForeground(Object element, int columnIndex) {
 		if (fColorProvider != null && columnIndex > 0) {
 			MemoryRenderingElement renderingElement = getMemoryRenderingElement(element, columnIndex);
 			if (renderingElement != null) {
 				Color color = fColorProvider.getForeground(renderingElement);
-				if (color != null)
+				if (color != null) {
 					return color;
+				}
 			}
 		}
 		return super.getForeground(element);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
-	 */
 	@Override
 	public Image getColumnImage(Object element, int columnIndex) {
 		if (fLabelProvider != null && columnIndex > 0) {
 			MemoryRenderingElement renderingElement = getMemoryRenderingElement(element, columnIndex);
 			if (renderingElement != null) {
 				Image image = fLabelProvider.getImage(renderingElement);
-				if (image != null)
+				if (image != null) {
 					return image;
+				}
 			}
 		}
 		return super.getColumnImage(element, columnIndex);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITableFontProvider#getFont(java.lang.Object, int)
-	 */
 	@Override
 	public Font getFont(Object element, int columnIndex) {
 		if (fFontProvider != null && columnIndex > 0) {
 			MemoryRenderingElement renderingElement = getMemoryRenderingElement(element, columnIndex);
 			if (renderingElement != null) {
 				Font font = fFontProvider.getFont(renderingElement);
-				if (font != null)
+				if (font != null) {
 					return font;
+				}
 			}
 		}
 		return null;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLine.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLine.java
index 3faef8d40..e8acc11d6 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLine.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingLine.java
@@ -58,8 +58,9 @@ public class TableRenderingLine extends PlatformObject {
 
 	public MemoryByte getByte(int offset)
 	{
-		if (fBytes == null)
+		if (fBytes == null) {
 			return null;
+		}
 
 		if (offset < fBytes.length) {
 			return fBytes[offset];
@@ -101,8 +102,9 @@ public class TableRenderingLine extends PlatformObject {
 					{
 						paddedString = fPaddedString;
 
-						if (paddedString.length() > TableRenderingLine.numCharPerByteForHex)
+						if (paddedString.length() > TableRenderingLine.numCharPerByteForHex) {
 							paddedString = paddedString.substring(0, TableRenderingLine.numCharPerByteForHex);
+						}
 					}
 					buffer.replace(bufferCounter, bufferCounter+TableRenderingLine.numCharPerByteForHex, paddedString);
 				}
@@ -163,12 +165,14 @@ public class TableRenderingLine extends PlatformObject {
 
 	public void markDeltas(TableRenderingLine oldData)
 	{
-		if (oldData == null)
+		if (oldData == null) {
 			return;
+		}
 
 		// if address is not the same, no need to compare
-		if (!oldData.getAddress().equals(this.getAddress()))
+		if (!oldData.getAddress().equals(this.getAddress())) {
 			return;
+		}
 
 		// if the string representation is the same, no need to compare
 		if (oldData.getRawMemoryString().equals(getRawMemoryString()))
@@ -183,8 +187,9 @@ public class TableRenderingLine extends PlatformObject {
 
 		MemoryByte[] oldMemory = oldData.getBytes();
 
-		if (oldMemory.length != fBytes.length)
+		if (oldMemory.length != fBytes.length) {
 			return;
+		}
 
 		for (int i=0; i<fBytes.length; i++)
 		{
@@ -209,18 +214,21 @@ public class TableRenderingLine extends PlatformObject {
 
 	public void copyDeltas(TableRenderingLine oldData)
 	{
-		if (oldData == null)
+		if (oldData == null) {
 			return;
+		}
 
 		// if address is not the same, do not copy
-		if (!oldData.getAddress().equals(this.getAddress()))
+		if (!oldData.getAddress().equals(this.getAddress())) {
 			return;
+		}
 
 		// reuse delta information from old data
 		MemoryByte[] oldMemory = oldData.getBytes();
 
-		if (oldMemory.length != fBytes.length)
+		if (oldMemory.length != fBytes.length) {
 			return;
+		}
 
 		for (int i=0; i<fBytes.length; i++)
 		{
@@ -230,12 +238,14 @@ public class TableRenderingLine extends PlatformObject {
 
 	public boolean isLineChanged(TableRenderingLine oldData)
 	{
-		if (oldData == null)
+		if (oldData == null) {
 			return false;
+		}
 
 		// if address is not the same, no need to compare
-		if (!oldData.getAddress().equals(this.getAddress()))
+		if (!oldData.getAddress().equals(this.getAddress())) {
 			return false;
+		}
 
 		// if the string representation is not the same, this line has changed
 		if (oldData.getRawMemoryString().equals(getRawMemoryString())) {
@@ -257,10 +267,12 @@ public class TableRenderingLine extends PlatformObject {
 
 		for (int i=offset; i<=endOffset; i++)
 		{
-			if (!fBytes[i].isHistoryKnown())
+			if (!fBytes[i].isHistoryKnown()) {
 				allBytesKnown = false;
-			if (fBytes[i].isChanged())
+			}
+			if (fBytes[i].isChanged()) {
 				allBytesUnchanged = false;
+			}
 		}
 
 		if (allBytesKnown && !allBytesUnchanged) {
@@ -274,14 +286,12 @@ public class TableRenderingLine extends PlatformObject {
 		for (int i=0; i<fBytes.length; i++)
 		{
 			// unset the change bit
-			if (fBytes[i].isChanged())
+			if (fBytes[i].isChanged()) {
 				fBytes[i].setChanged(false);
+			}
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString()
 	{
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPrefAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPrefAction.java
index e2108a3f2..42ba8d286 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPrefAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/TableRenderingPrefAction.java
@@ -30,18 +30,12 @@ import org.eclipse.ui.actions.ActionDelegate;
 
 public class TableRenderingPrefAction extends ActionDelegate implements IViewActionDelegate {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void run(IAction action) {
 		IPreferencePage page = new TableRenderingPreferencePage(DebugUIMessages.TableRenderingPrefAction_0);
 		showPreferencePage("org.eclipse.debug.ui.tableRenderingPreferencepage", page);	 //$NON-NLS-1$
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
 	@Override
 	public void init(IViewPart view) {
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRendering.java
index 3f21ed32c..0888836f3 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRendering.java
@@ -122,9 +122,6 @@ public class UnsignedIntegerRendering extends AbstractIntegerRendering {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see com.ibm.debug.extended.ui.AbstractMemoryRenderer#getString(java.lang.String, java.math.BigInteger, byte[])
-	 */
 	@Override
 	public String getString(String dataType, BigInteger address, MemoryByte[] data) {
 
@@ -151,8 +148,9 @@ public class UnsignedIntegerRendering extends AbstractIntegerRendering {
 
 		int columnSize = getBytesPerColumn();
 		int endianess = getDisplayEndianess();
-		if (endianess == RenderingsUtil.ENDIANESS_UNKNOWN)
+		if (endianess == RenderingsUtil.ENDIANESS_UNKNOWN) {
 			endianess = getBytesEndianess(data);
+		}
 
 		byte[] byteArray = new byte[data.length];
 		for (int i=0; i<byteArray.length;i ++)
@@ -174,23 +172,22 @@ public class UnsignedIntegerRendering extends AbstractIntegerRendering {
 		return convertToString(byteArray, columnSize, endianess);
 	}
 
-	/* (non-Javadoc)
-	 * @see com.ibm.debug.extended.ui.AbstractMemoryRenderer#getBytes(java.lang.String, java.math.BigInteger, java.lang.String)
-	 */
 	@Override
 	public byte[] getBytes(String dataType, BigInteger address, MemoryByte[] currentValues, String data) {
 
 		int columnSize = getBytesPerColumn();
 		int endianess = getDisplayEndianess();
-		if (endianess == RenderingsUtil.ENDIANESS_UNKNOWN)
+		if (endianess == RenderingsUtil.ENDIANESS_UNKNOWN) {
 			endianess = getBytesEndianess(currentValues);
+		}
 
 		// if endianess is unknown, do not try to render new data to bytes
 		if (endianess == RenderingsUtil.ENDIANESS_UNKNOWN)
 		{
 			byte[] retBytes = new byte[currentValues.length];
-			for (int i=0 ;i<currentValues.length; i++)
+			for (int i=0 ;i<currentValues.length; i++) {
 				retBytes[i] = currentValues[i].getValue();
+			}
 			return retBytes;
 		}
 
@@ -199,8 +196,9 @@ public class UnsignedIntegerRendering extends AbstractIntegerRendering {
 
 	private byte[] extractBytes(byte[] bytes, int endianess, int colSize) {
 
-		if (colSize > bytes.length)
+		if (colSize > bytes.length) {
 			throw new NumberFormatException();
+		}
 
 		// take the least significant 'colSize' bytes out of the bytes array
 		// if it's big endian, it's the last 'colSize' bytes
@@ -211,8 +209,9 @@ public class UnsignedIntegerRendering extends AbstractIntegerRendering {
 			// number is invalid, throw number format exception
 			for (int i=0; i<colSize; i++)
 			{
-				if (bytes[i] != 0)
+				if (bytes[i] != 0) {
 					throw new NumberFormatException();
+				}
 			}
 
 			byte[] copy = new byte[colSize];
@@ -230,8 +229,9 @@ public class UnsignedIntegerRendering extends AbstractIntegerRendering {
 			// number is invalid, throw number format exception
 			for (int i=colSize; i<bytes.length; i++)
 			{
-				if (bytes[i] != 0)
+				if (bytes[i] != 0) {
 					throw new NumberFormatException();
+				}
 			}
 
 			byte[] copy = new byte[colSize];
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRenderingTypeDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRenderingTypeDelegate.java
index 094680905..52859e0a8 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRenderingTypeDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/memory/renderings/UnsignedIntegerRenderingTypeDelegate.java
@@ -24,9 +24,6 @@ import org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate;
 public class UnsignedIntegerRenderingTypeDelegate implements
 		IMemoryRenderingTypeDelegate {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate#createRendering(java.lang.String)
-	 */
 	@Override
 	public IMemoryRendering createRendering(String id) throws CoreException {
 		return new UnsignedIntegerRendering(id);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesView.java
index 32b1fd9f8..9d0fec797 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/modules/ModulesView.java
@@ -40,17 +40,11 @@ import org.eclipse.ui.PlatformUI;
  */
 public class ModulesView extends VariablesView {
 
-	/**
-	 * @see org.eclipse.debug.ui.AbstractDebugView#getHelpContextId()
-	 */
 	@Override
 	protected String getHelpContextId() {
 		return IDebugHelpContextIds.MODULES_VIEW;
 	}
 
-	/**
-	 * @see org.eclipse.debug.ui.AbstractDebugView#configureToolBar(org.eclipse.jface.action.IToolBarManager)
-	 */
 	@Override
 	protected void configureToolBar(IToolBarManager tbm) {
         tbm.add(new Separator(this.getClass().getName()));
@@ -59,9 +53,6 @@ public class ModulesView extends VariablesView {
         tbm.add( new Separator( IDebugUIConstants.MODULES_GROUP ) );
 	}
 
-	   /* (non-Javadoc)
-     * @see org.eclipse.debug.ui.AbstractDebugView#fillContextMenu(org.eclipse.jface.action.IMenuManager)
-     */
     @Override
 	protected void fillContextMenu( IMenuManager menu ) {
         menu.add( new Separator( IDebugUIConstants.EMPTY_MODULES_GROUP ) );
@@ -77,17 +68,11 @@ public class ModulesView extends VariablesView {
         menu.add( new Separator( IWorkbenchActionConstants.MB_ADDITIONS ) );
     }
 
-	/**
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getDetailPanePreferenceKey()
-	 */
 	@Override
 	protected String getDetailPanePreferenceKey() {
 		return IDebugPreferenceConstants.MODULES_DETAIL_PANE_ORIENTATION;
 	}
 
-	/**
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getToggleActionLabel()
-	 */
 	@Override
 	protected String getToggleActionLabel() {
 
@@ -108,9 +93,6 @@ public class ModulesView extends VariablesView {
 		return ModulesViewMessages.ModulesView_0;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getPresentationContextId()
-	 */
 	@Override
 	protected String getPresentationContextId() {
 		return IDebugUIConstants.ID_MODULE_VIEW;
@@ -151,13 +133,15 @@ public class ModulesView extends VariablesView {
 		String viewName = getViewName(context);
 
 		// only update label if the name has changed
-		if (!getPartName().equals(viewName))
+		if (!getPartName().equals(viewName)) {
 			setPartName(viewName);
+		}
 
 		// only update image if the image has changed
 		Image image = getViewImage(context);
-		if (!getTitleImage().equals(image))
+		if (!getTitleImage().equals(image)) {
 			setTitleImage(image);
+		}
 	}
 
 	/**
@@ -170,8 +154,9 @@ public class ModulesView extends VariablesView {
 				ILabelProvider provider = adaptable
 						.getAdapter(ILabelProvider.class);
 				String label = provider.getText(this);
-				if (label != null)
+				if (label != null) {
 					return label;
+				}
 			}
 		}
 		return ModulesViewMessages.ModulesView_2;
@@ -185,8 +170,9 @@ public class ModulesView extends VariablesView {
 				ILabelProvider provider = adaptable
 						.getAdapter(ILabelProvider.class);
 				Image image = provider.getImage(this);
-				if (image != null)
+				if (image != null) {
 					return image;
+				}
 			}
 		}
 		return DebugPluginImages.getImage(IInternalDebugUIConstants.IMG_CVIEW_MODULES_VIEW);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java
index c5d3ca6bd..da8ae129e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/registers/RegistersView.java
@@ -25,17 +25,11 @@ import org.eclipse.jface.action.Separator;
  */
 public class RegistersView extends VariablesView {
 
-	/**
-	 * @see org.eclipse.debug.ui.AbstractDebugView#getHelpContextId()
-	 */
 	@Override
 	protected String getHelpContextId() {
 		return IDebugHelpContextIds.REGISTERS_VIEW;
 	}
 
-	/**
-	 * @see org.eclipse.debug.ui.AbstractDebugView#configureToolBar(org.eclipse.jface.action.IToolBarManager)
-	 */
 	@Override
 	protected void configureToolBar(IToolBarManager tbm) {
 		super.configureToolBar(tbm);
@@ -43,25 +37,16 @@ public class RegistersView extends VariablesView {
 		tbm.add(new Separator(IDebugUIConstants.REGISTER_GROUP));
 	}
 
-	/**
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getDetailPanePreferenceKey()
-	 */
 	@Override
 	protected String getDetailPanePreferenceKey() {
 		return IDebugPreferenceConstants.REGISTERS_DETAIL_PANE_ORIENTATION;
 	}
 
-	/**
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getToggleActionLabel()
-	 */
 	@Override
 	protected String getToggleActionLabel() {
 		return RegistersViewMessages.RegistersView_0;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.VariablesView#getPresentationContextId()
-	 */
 	@Override
 	protected String getPresentationContextId() {
 		return IDebugUIConstants.ID_REGISTER_VIEW;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/AvailableLogicalStructuresAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/AvailableLogicalStructuresAction.java
index a237c2923..6dd1e218e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/AvailableLogicalStructuresAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/AvailableLogicalStructuresAction.java
@@ -55,9 +55,6 @@ public class AvailableLogicalStructuresAction extends Action implements IMenuCre
 		init();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 	}
@@ -70,9 +67,6 @@ public class AvailableLogicalStructuresAction extends Action implements IMenuCre
 		fView = view;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuCreator#dispose()
-	 */
 	@Override
 	public void dispose() {
 		if (fMenu != null) {
@@ -83,9 +77,6 @@ public class AvailableLogicalStructuresAction extends Action implements IMenuCre
 		fTypes = null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control)
-	 */
 	@Override
 	public Menu getMenu(Control parent) {
 		return null;
@@ -96,9 +87,6 @@ public class AvailableLogicalStructuresAction extends Action implements IMenuCre
 		item.fill(parent, -1);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu)
-	 */
 	@Override
 	public Menu getMenu(Menu parent) {
 		if (fMenu != null) {
@@ -137,9 +125,6 @@ public class AvailableLogicalStructuresAction extends Action implements IMenuCre
 		return fMenu;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
 	public void init() {
 		setValue(null);
 		setTypes(null);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/EditVariableLogicalStructureAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/EditVariableLogicalStructureAction.java
index dc7c81742..4dc0e525c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/EditVariableLogicalStructureAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/EditVariableLogicalStructureAction.java
@@ -48,12 +48,6 @@ public class EditVariableLogicalStructureAction extends Action {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.
-	 * action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
 	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
     }
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java
index 7522875ce..b97446fdd 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedValuePartition.java
@@ -47,105 +47,66 @@ public class IndexedValuePartition implements IIndexedValue {
 		fLength = length;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IIndexedValue#getSize()
-	 */
 	@Override
 	public int getSize() {
 		return fLength;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IIndexedValue#getVariable(int)
-	 */
 	@Override
 	public IVariable getVariable(int offset) throws DebugException {
 		return fValue.getVariable(offset);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IValue#getReferenceTypeName()
-	 */
 	@Override
 	public String getReferenceTypeName() throws DebugException {
 		return fValue.getReferenceTypeName();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IValue#getValueString()
-	 */
 	@Override
 	public String getValueString() {
 		return IInternalDebugCoreConstants.EMPTY_STRING;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IValue#getVariables()
-	 */
 	@Override
 	public IVariable[] getVariables() throws DebugException {
 		return getVariables(fOffset, fLength);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IValue#hasVariables()
-	 */
 	@Override
 	public boolean hasVariables() {
 		return fLength > 0;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IValue#isAllocated()
-	 */
 	@Override
 	public boolean isAllocated() throws DebugException {
 		return fValue.isAllocated();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
-	 */
 	@Override
 	public IDebugTarget getDebugTarget() {
 		return fValue.getDebugTarget();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
-	 */
 	@Override
 	public ILaunch getLaunch() {
 		return fValue.getLaunch();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
-	 */
 	@Override
 	public String getModelIdentifier() {
 		return fValue.getModelIdentifier();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
 	@Override
 	public <T> T getAdapter(Class<T> adapter) {
 		return fValue.getAdapter(adapter);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IIndexedValue#getVariables(int, int)
-	 */
 	@Override
 	public IVariable[] getVariables(int offset, int length) throws DebugException {
 		return fValue.getVariables(offset, length);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IIndexedValue#getInitialOffset()
-	 */
 	@Override
 	public int getInitialOffset() {
 		return fOffset;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java
index 2ab9a3586..8f0038d69 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/IndexedVariablePartition.java
@@ -65,17 +65,11 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl
 		fValuePartition = new IndexedValuePartition(value, offset, length);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IVariable#getValue()
-	 */
 	@Override
 	public IValue getValue() {
 		return fValuePartition;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IVariable#getName()
-	 */
 	@Override
 	public String getName() {
 		if (fName == null) {
@@ -90,9 +84,6 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl
 		return fName;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IVariable#getReferenceTypeName()
-	 */
 	@Override
 	public String getReferenceTypeName() throws DebugException {
 		if (fOriginalVariable instanceof IVariable) {
@@ -102,81 +93,51 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl
 		return IInternalDebugCoreConstants.EMPTY_STRING;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IVariable#hasValueChanged()
-	 */
 	@Override
 	public boolean hasValueChanged() {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugElement#getModelIdentifier()
-	 */
 	@Override
 	public String getModelIdentifier() {
 		return fOriginalValue.getModelIdentifier();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugElement#getDebugTarget()
-	 */
 	@Override
 	public IDebugTarget getDebugTarget() {
 		return fOriginalValue.getDebugTarget();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IDebugElement#getLaunch()
-	 */
 	@Override
 	public ILaunch getLaunch() {
 		return fOriginalValue.getLaunch();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IValueModification#setValue(java.lang.String)
-	 */
 	@Override
 	public void setValue(String expression) throws DebugException {
 		throw new DebugException(new Status(IStatus.ERROR, IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.INTERNAL_ERROR, "Value modification not supported for indexed partitions.", null));  //$NON-NLS-1$
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IValueModification#setValue(org.eclipse.debug.core.model.IValue)
-	 */
 	@Override
 	public void setValue(IValue value) throws DebugException {
 		throw new DebugException(new Status(IStatus.ERROR, IDebugUIConstants.PLUGIN_ID, IDebugUIConstants.INTERNAL_ERROR, "Value modification not supported for indexed partitions.", null));  //$NON-NLS-1$
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IValueModification#supportsValueModification()
-	 */
 	@Override
 	public boolean supportsValueModification() {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IValueModification#verifyValue(java.lang.String)
-	 */
 	@Override
 	public boolean verifyValue(String expression) {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.model.IValueModification#verifyValue(org.eclipse.debug.core.model.IValue)
-	 */
 	@Override
 	public boolean verifyValue(IValue value) {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object obj) {
 		if (obj instanceof IndexedVariablePartition) {
@@ -187,9 +148,6 @@ public class IndexedVariablePartition extends PlatformObject implements IVariabl
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return fOriginalVariable.hashCode() + fOffset;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectLogicalStructureAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectLogicalStructureAction.java
index b10546ce3..f7d8139f9 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectLogicalStructureAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectLogicalStructureAction.java
@@ -45,9 +45,6 @@ public class SelectLogicalStructureAction extends Action {
 		fType= type;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 		valueChanged();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectionDragAdapter.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectionDragAdapter.java
index c6b6f46a2..eac9916cb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectionDragAdapter.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/SelectionDragAdapter.java
@@ -46,17 +46,11 @@ public class SelectionDragAdapter extends DragSourceAdapter implements TransferD
         fViewer = viewer;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.util.TransferDragSourceListener#getTransfer()
-     */
     @Override
 	public Transfer getTransfer() {
         return LocalSelectionTransfer.getTransfer();
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.swt.dnd.DragSourceAdapter#dragStart(org.eclipse.swt.dnd.DragSourceEvent)
-     */
     @Override
 	public void dragStart(DragSourceEvent event) {
         ISelection selection = fViewer.getSelection();
@@ -65,9 +59,6 @@ public class SelectionDragAdapter extends DragSourceAdapter implements TransferD
         event.doit = !selection.isEmpty();
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.swt.dnd.DragSourceAdapter#dragSetData(org.eclipse.swt.dnd.DragSourceEvent)
-     */
     @Override
 	public void dragSetData(DragSourceEvent event) {
         // For consistency set the data to the selection even though
@@ -76,9 +67,6 @@ public class SelectionDragAdapter extends DragSourceAdapter implements TransferD
         event.data = LocalSelectionTransfer.getTransfer().getSelection();
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.swt.dnd.DragSourceAdapter#dragFinished(org.eclipse.swt.dnd.DragSourceEvent)
-     */
     @Override
 	public void dragFinished(DragSourceEvent event) {
         LocalSelectionTransfer.getTransfer().setSelection(null);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java
index 37c6bceaf..71b94ef70 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleLogicalStructureAction.java
@@ -45,9 +45,6 @@ public class ToggleLogicalStructureAction extends Action {
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.VARIABLES_CONTENT_PROVIDERS_ACTION);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
 	@Override
 	public void run() {
 		if (!getView().isAvailable()) {
@@ -57,9 +54,6 @@ public class ToggleLogicalStructureAction extends Action {
 		BusyIndicator.showWhile(getView().getViewer().getControl().getDisplay(), () -> getView().getViewer().refresh());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#setChecked(boolean)
-	 */
 	@Override
 	public void setChecked(boolean value) {
 		super.setChecked(value);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleShowColumnsAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleShowColumnsAction.java
index 66295762a..e2d61bad2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleShowColumnsAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/ToggleShowColumnsAction.java
@@ -43,9 +43,6 @@ public class ToggleShowColumnsAction extends Action implements IUpdate {
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IDebugHelpContextIds.SHOW_COLUMNS_ACTION);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#run()
-	 */
 	@Override
 	public void run() {
 		if (fViewer.getControl().isDisposed()) {
@@ -54,9 +51,6 @@ public class ToggleShowColumnsAction extends Action implements IUpdate {
 		BusyIndicator.showWhile(fViewer.getControl().getDisplay(), () -> fViewer.setShowColumns(isChecked()));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IUpdate#update()
-	 */
 	@Override
 	public void update() {
 		setEnabled(fViewer.canToggleColumns());
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariableViewToggleAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariableViewToggleAction.java
index e017761f4..d88325008 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariableViewToggleAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariableViewToggleAction.java
@@ -38,9 +38,6 @@ public abstract class VariableViewToggleAction implements IViewActionDelegate, I
 		super();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
 	@Override
 	public void init(IViewPart view) {
 		fView = view;
@@ -49,32 +46,20 @@ public abstract class VariableViewToggleAction implements IViewActionDelegate, I
 		run(fAction);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void init(IAction action) {
 		fAction = action;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#dispose()
-	 */
 	@Override
 	public void dispose() {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
-	 */
 	@Override
 	public void runWithEvent(IAction action, Event event) {
 		run(action);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void run(IAction action) {
 		IPreferenceStore store = getPreferenceStore();
@@ -82,9 +67,6 @@ public abstract class VariableViewToggleAction implements IViewActionDelegate, I
 		store.setValue(key, action.isChecked());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AbstractDetailPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AbstractDetailPane.java
index e398d33ac..609570c7a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AbstractDetailPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AbstractDetailPane.java
@@ -50,18 +50,12 @@ public abstract class AbstractDetailPane implements IDetailPane {
 	 */
 	private List<String> fSelectionActions = new ArrayList<>();
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#init(org.eclipse.ui.IWorkbenchPartSite)
-	 */
 	@Override
 	public void init(IWorkbenchPartSite workbench) {
 		fWorkbenchPartSite = workbench;
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#dispose()
-	 */
 	@Override
 	public void dispose() {
 		fActionMap.clear();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AvailableDetailPanesAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AvailableDetailPanesAction.java
index a9e100090..3c400f796 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AvailableDetailPanesAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/AvailableDetailPanesAction.java
@@ -77,16 +77,10 @@ public class AvailableDetailPanesAction extends Action implements IMenuCreator {
 		init();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuCreator#dispose()
-	 */
 	@Override
 	public void dispose() {
 		if (fMenu != null) {
@@ -95,9 +89,6 @@ public class AvailableDetailPanesAction extends Action implements IMenuCreator {
 		fAvailableIDs.clear();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control)
-	 */
 	@Override
 	public Menu getMenu(Control parent) {
 		return null;
@@ -108,9 +99,6 @@ public class AvailableDetailPanesAction extends Action implements IMenuCreator {
 		item.fill(parent, -1);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu)
-	 */
 	@Override
 	public Menu getMenu(Menu parent) {
 		if (fMenu != null) {
@@ -147,9 +135,6 @@ public class AvailableDetailPanesAction extends Action implements IMenuCreator {
 		return fMenu;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-	 */
 	public void init() {
 		fAvailableIDs = DetailPaneManager.getDefault().getAvailablePaneIDs(fDetailPaneContainer.getCurrentSelection());
 		if (fAvailableIDs.size() > 1){
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java
index 1f18e0b7c..a6eda1fcf 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java
@@ -190,9 +190,6 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane
 			fModel = model;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
-		 */
 		@Override
 		protected IStatus run(IProgressMonitor monitor) {
 			fMonitor = monitor;
@@ -262,9 +259,6 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane
 			return Status.OK_STATUS;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.jobs.Job#canceling()
-		 */
 		@Override
 		protected void canceling() {
 			super.canceling();
@@ -273,9 +267,6 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane
 			}
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.debug.ui.IValueDetailListener#detailComputed(org.eclipse.debug.core.model.IValue, java.lang.String)
-		 */
 		@Override
 		public void detailComputed(IValue value, final String result) {
 			synchronized (this) {
@@ -438,9 +429,6 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane
 	private IPropertyChangeListener fPreferenceStorePropertyChangeListener;
 	private WhitespaceCharacterPainter fWhiteSpacePainter;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#createControl(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	public Control createControl(Composite parent) {
 
@@ -732,9 +720,6 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#display(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
 	@Override
 	public void display(IStructuredSelection selection) {
 
@@ -776,9 +761,6 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#setFocus()
-	 */
 	@Override
 	public boolean setFocus(){
 		if (fSourceViewer != null){
@@ -788,9 +770,6 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.details.AbstractDetailPane#dispose()
-	 */
 	@Override
 	public void dispose(){
 		if (fDetailJob != null) {
@@ -829,33 +808,21 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane
 		super.dispose();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#getDescription()
-	 */
 	@Override
 	public String getDescription() {
 		return DESCRIPTION;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#getID()
-	 */
 	@Override
 	public String getID() {
 		return ID;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#getName()
-	 */
 	@Override
 	public String getName() {
 		return NAME;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T getAdapter(Class<T> required) {
@@ -1085,9 +1052,6 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
 	@Override
 	public void propertyChange(PropertyChangeEvent event) {
 		String propertyName= event.getProperty();
@@ -1121,17 +1085,11 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane
 			fTarget = target;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.text.IFindReplaceTarget#canPerformFind()
-		 */
 		@Override
 		public boolean canPerformFind() {
 			return fTarget.canPerformFind();
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.text.IFindReplaceTarget#findAndSelect(int, java.lang.String, boolean, boolean, boolean)
-		 */
 		@Override
 		public int findAndSelect(int widgetOffset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord) {
 			int position = fTarget.findAndSelect(widgetOffset, findString, searchForward, caseSensitive, wholeWord);
@@ -1145,42 +1103,27 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane
 			return position;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.text.IFindReplaceTarget#getSelection()
-		 */
 		@Override
 		public Point getSelection() {
 			return fTarget.getSelection();
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.text.IFindReplaceTarget#getSelectionText()
-		 */
 		@Override
 		public String getSelectionText() {
 			return fTarget.getSelectionText();
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.text.IFindReplaceTarget#isEditable()
-		 */
 		@Override
 		public boolean isEditable() {
 			return fTarget.isEditable();
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.text.IFindReplaceTarget#replaceSelection(java.lang.String)
-		 */
 		@Override
 		public void replaceSelection(String text) {
 			fTarget.replaceSelection(text);
 		}
 	}
 
-	/*
-	 * @see org.eclipse.debug.ui.IDetailPane2#getSelectionProvider()
-	 */
 	@Override
 	public ISelectionProvider getSelectionProvider() {
 		return fSourceViewer.getSelectionProvider();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPaneFactory.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPaneFactory.java
index 23bf9948b..e3eca1dc8 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPaneFactory.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPaneFactory.java
@@ -31,9 +31,6 @@ public class DefaultDetailPaneFactory implements IDetailPaneFactory {
 
 	public static final String DEFAULT_DETAIL_PANE_ID = DefaultDetailPane.ID;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#createDetailsArea(java.lang.String)
-	 */
 	@Override
 	public IDetailPane createDetailPane(String id) {
 		if (MessageDetailPane.ID.equals(id)) {
@@ -43,12 +40,6 @@ public class DefaultDetailPaneFactory implements IDetailPaneFactory {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see
-	 * org.eclipse.debug.ui.IDetailPaneFactory#getDetailPaneTypes(org.eclipse
-	 * .jface.viewers.IStructuredSelection)
-	 */
 	@Override
 	public Set<String> getDetailPaneTypes(IStructuredSelection selection) {
 		Set<String> possibleIDs = new HashSet<>(1);
@@ -56,18 +47,12 @@ public class DefaultDetailPaneFactory implements IDetailPaneFactory {
 		return possibleIDs;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPaneFactory#getDefaultDetailPane(java.util.Set, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
 	@Override
 	public String getDefaultDetailPane(IStructuredSelection selection) {
 		// Return null so that any contributed detail pane can override the default
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getName(java.lang.String)
-	 */
 	@Override
 	public String getDetailPaneName(String id) {
 		if (id.equals(DefaultDetailPane.ID)){
@@ -79,10 +64,6 @@ public class DefaultDetailPaneFactory implements IDetailPaneFactory {
 		return null;
 	}
 
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getDescription(java.lang.String)
-	 */
 	@Override
 	public String getDetailPaneDescription(String id) {
 		if (id.equals(DefaultDetailPane.ID)){
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneProxy.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneProxy.java
index 85b7ee9f0..1cea2f95d 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneProxy.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DetailPaneProxy.java
@@ -290,9 +290,6 @@ public class DetailPaneProxy implements ISaveablePart {
 		fParentContainer.getParentComposite().layout();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
-	 */
 	@Override
 	public void doSave(IProgressMonitor monitor) {
 		ISaveablePart saveable = getSaveable();
@@ -301,9 +298,6 @@ public class DetailPaneProxy implements ISaveablePart {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISaveablePart#doSaveAs()
-	 */
 	@Override
 	public void doSaveAs() {
 		ISaveablePart saveable = getSaveable();
@@ -312,9 +306,6 @@ public class DetailPaneProxy implements ISaveablePart {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISaveablePart#isDirty()
-	 */
 	@Override
 	public boolean isDirty() {
 		ISaveablePart saveable = getSaveable();
@@ -324,9 +315,6 @@ public class DetailPaneProxy implements ISaveablePart {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISaveablePart#isSaveAsAllowed()
-	 */
 	@Override
 	public boolean isSaveAsAllowed() {
 		ISaveablePart saveable = getSaveable();
@@ -336,9 +324,6 @@ public class DetailPaneProxy implements ISaveablePart {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.ISaveablePart#isSaveOnCloseNeeded()
-	 */
 	@Override
 	public boolean isSaveOnCloseNeeded() {
 		ISaveablePart saveable = getSaveable();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/MessageDetailPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/MessageDetailPane.java
index 81039a7cc..e6ce5f871 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/MessageDetailPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/MessageDetailPane.java
@@ -46,24 +46,15 @@ public class MessageDetailPane implements IDetailPane {
 	 */
 	private Label fLabel;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#init(org.eclipse.ui.IWorkbenchPartSite)
-	 */
 	@Override
 	public void init(IWorkbenchPartSite partSite) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#dispose()
-	 */
 	@Override
 	public void dispose() {
 		fControlParent.dispose();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#createControl(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	public Control createControl(Composite parent) {
 		fControlParent = SWTFactory.createComposite(parent, 1, 1, GridData.FILL_BOTH);
@@ -72,17 +63,11 @@ public class MessageDetailPane implements IDetailPane {
 		return fControlParent;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#setFocus()
-	 */
 	@Override
 	public boolean setFocus() {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#display(org.eclipse.jface.viewers.IStructuredSelection)
-	 */
 	@Override
 	public void display(IStructuredSelection selection) {
 		// re-create controls if the layout has changed
@@ -100,25 +85,16 @@ public class MessageDetailPane implements IDetailPane {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#getID()
-	 */
 	@Override
 	public String getID() {
 		return ID;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#getName()
-	 */
 	@Override
 	public String getName() {
 		return NAME;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IDetailPane#getDescription()
-	 */
 	@Override
 	public String getDescription() {
 		return DESCRIPTION;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java
index 49c129a30..060a5dd6a 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AbstractLaunchHistoryAction.java
@@ -294,9 +294,6 @@ public abstract class AbstractLaunchHistoryAction implements IActionDelegate2, I
 		return fMenu;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowPulldownDelegate2#getMenu(org.eclipse.swt.widgets.Menu)
-	 */
 	@Override
 	public Menu getMenu(Menu parent) {
 		setMenu(new Menu(parent));
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AddMemoryRenderingActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AddMemoryRenderingActionDelegate.java
index 1983f1fad..b0095ab7c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AddMemoryRenderingActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/AddMemoryRenderingActionDelegate.java
@@ -149,8 +149,9 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct
 		private void contextActivated(ISelection selection) {
 			setupActionDelegate(selection);
 
-			if(fAction != null)
+			if(fAction != null) {
 				updateAction(fAction, fCurrentSelection);
+			}
 		}
 
 		@Override
@@ -166,25 +167,30 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct
 		IAdaptable debugContext = null;
 		if (context instanceof IStructuredSelection)
 		{
-			if (((IStructuredSelection)context).getFirstElement() instanceof IAdaptable)
+			if (((IStructuredSelection)context).getFirstElement() instanceof IAdaptable) {
 				debugContext = (IAdaptable)((IStructuredSelection)context).getFirstElement();
+			}
 		}
 
-		if (debugContext == null)
+		if (debugContext == null) {
 			fActionDelegate = null;
+		}
 
-		if (debugContext == fDebugContext)
+		if (debugContext == fDebugContext) {
 			return;
+		}
 
 		fDebugContext = debugContext;
 
-		if (fDebugContext == null)
+		if (fDebugContext == null) {
 			return;
+		}
 
 		IMemoryBlockRetrieval retrieval = MemoryViewUtil.getMemoryBlockRetrieval(fDebugContext);
 
-		if (retrieval == null)
+		if (retrieval == null) {
 			return;
+		}
 
 		IAddMemoryRenderingsTarget target = null;
 		if (fCurrentSelection instanceof IStructuredSelection)
@@ -208,25 +214,16 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct
 		fActionDelegate = target;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
 	@Override
 	public void init(IViewPart view) {
 		bindPart(view);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void run(IAction action) {
 		// do nothing
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		fCurrentSelection = selection;
@@ -259,8 +256,9 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct
 	 */
 	private void bindAction(IAction action) {
 		if (action != fAction) {
-			if (fMenuCreator == null)
+			if (fMenuCreator == null) {
 				fMenuCreator = new AddMemoryRenderingMenuCreator();
+			}
 	        action.setMenuCreator(fMenuCreator);
 	        fAction= action;
 	    }
@@ -280,9 +278,6 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct
 		return target;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart)
-	 */
 	@Override
 	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
 		bindPart(targetEditor);
@@ -293,9 +288,6 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
 	@Override
 	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
 		bindPart(targetPart);
@@ -306,9 +298,6 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void init(IAction action) {
 		if (action != null) {
@@ -321,9 +310,6 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#dispose()
-	 */
 	@Override
 	public void dispose() {
 		// remove as debug context listener
@@ -336,9 +322,6 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct
 		bindPart(null);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
-	 */
 	@Override
 	public void runWithEvent(IAction action, Event event) {
 		// do nothing
@@ -366,11 +349,13 @@ public class AddMemoryRenderingActionDelegate extends Action implements IViewAct
 			fWindow = window;
 		}
 
-		if (part != fPart)
+		if (part != fPart) {
 			fPart = part;
+		}
 
-		if (fWindow != null)
+		if (fWindow != null) {
 			setupActionDelegate(DebugUITools.getDebugContextManager().getContextService(fWindow).getActiveContext());
+		}
 	}
 
 }
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/BreakpointTypesContribution.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/BreakpointTypesContribution.java
index 8c2340e5e..8ff311d3f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/BreakpointTypesContribution.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/BreakpointTypesContribution.java
@@ -112,9 +112,6 @@ public class BreakpointTypesContribution extends CompoundContributionItem implem
     	}
     };
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.actions.CompoundContributionItem#getContributionItems()
-     */
     @Override
 	protected IContributionItem[] getContributionItems() {
         IWorkbenchPart part = null;
@@ -160,9 +157,6 @@ public class BreakpointTypesContribution extends CompoundContributionItem implem
         return items;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.menus.IWorkbenchContribution#initialize(org.eclipse.ui.services.IServiceLocator)
-     */
     @Override
 	public void initialize(IServiceLocator serviceLocator) {
         fServiceLocator = serviceLocator;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java
index 0d415c6e7..04eae0f16 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ContextualLaunchAction.java
@@ -105,24 +105,18 @@ public abstract class ContextualLaunchAction implements IObjectActionDelegate, I
 	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
 		// We don't have a need for the active part.
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuCreator#dispose()
-	 */
+
 	@Override
 	public void dispose() {
 		// nothing to do
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control)
-	 */
+
 	@Override
 	public Menu getMenu(Control parent) {
 		// never called
 		return null;
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu)
-	 */
+
 	@Override
 	public Menu getMenu(Menu parent) {
 		//Create the new menu. The menu will get filled when it is about to be shown. see fillMenu(Menu).
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandAction.java
index c396d5c4b..641f6beda 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandAction.java
@@ -244,10 +244,6 @@ public abstract class DebugCommandAction extends Action implements IDebugContext
         return getDebugContextService().getActiveContext();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.jface.action.Action#run()
-     */
     @Override
 	public void run() {
         synchronized (this) {
@@ -268,10 +264,6 @@ public abstract class DebugCommandAction extends Action implements IDebugContext
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.jface.action.Action#runWithEvent(org.eclipse.swt.widgets.Event)
-     */
     @Override
 	public void runWithEvent(Event event) {
         run();
@@ -308,45 +300,21 @@ public abstract class DebugCommandAction extends Action implements IDebugContext
      */
     public abstract String getHelpContextId();
 
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.jface.action.Action#getId()
-     */
     @Override
 	public abstract String getId();
 
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.jface.action.Action#getText()
-     */
     @Override
 	public abstract String getText();
 
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.jface.action.Action#getToolTipText()
-     */
     @Override
 	public abstract String getToolTipText();
 
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.jface.action.Action#getDisabledImageDescriptor()
-     */
     @Override
 	public abstract ImageDescriptor getDisabledImageDescriptor();
 
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.jface.action.Action#getHoverImageDescriptor()
-     */
     @Override
 	public abstract ImageDescriptor getHoverImageDescriptor();
 
-    /*
-     * (non-Javadoc)
-     * @see org.eclipse.jface.action.Action#getImageDescriptor()
-     */
     @Override
 	public abstract ImageDescriptor getImageDescriptor();
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandHandler.java
index f0c457323..32a11b7aa 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/DebugCommandHandler.java
@@ -158,9 +158,6 @@ public abstract class DebugCommandHandler extends AbstractHandler {
         PlatformUI.getWorkbench().addWindowListener(fWindowListener);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object)
-     */
     @Override
 	public void setEnabled(Object evaluationContext) {
         // This method is called with the current evaluation context
@@ -179,9 +176,6 @@ public abstract class DebugCommandHandler extends AbstractHandler {
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.core.commands.AbstractHandler#isEnabled()
-     */
     @Override
 	public boolean isEnabled() {
         if (fCurrentEnabledTarget == null) {
@@ -200,9 +194,6 @@ public abstract class DebugCommandHandler extends AbstractHandler {
         return target;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-     */
     @Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
         IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindow(event);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ExportBreakpointsOperation.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ExportBreakpointsOperation.java
index 711c3c761..90b4c8973 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ExportBreakpointsOperation.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ExportBreakpointsOperation.java
@@ -85,9 +85,6 @@ public class ExportBreakpointsOperation implements IRunnableWithProgress {
 		fWriter = new StringWriter();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
-	 */
 	@Override
 	public void run(IProgressMonitor monitor) throws InvocationTargetException {
 		SubMonitor localmonitor = SubMonitor.convert(monitor, ImportExportMessages.ExportOperation_0, fBreakpoints.length);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/OpenLaunchDialogAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/OpenLaunchDialogAction.java
index 0484b8326..9eabdfa9b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/OpenLaunchDialogAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/OpenLaunchDialogAction.java
@@ -86,31 +86,19 @@ public class OpenLaunchDialogAction extends Action implements IActionDelegate2,
 		notifyResult(result == Window.OK);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
-	 */
 	@Override
 	public void runWithEvent(IAction action, Event event) {
 		run();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void run(IAction action) {
 		run();
 	}
 
-	/**
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-	 */
 	@Override
 	public void dispose() {}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void init(IAction action) {
 		if(action != null) {
@@ -136,15 +124,9 @@ public class OpenLaunchDialogAction extends Action implements IActionDelegate2,
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-	 */
 	@Override
 	public void init(IWorkbenchWindow window) {}
 
-	/**
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	public void selectionChanged(IAction action, ISelection selection) {}
 
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RelaunchLastAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RelaunchLastAction.java
index cac036850..2539c5ff0 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RelaunchLastAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RelaunchLastAction.java
@@ -62,9 +62,6 @@ import com.ibm.icu.text.MessageFormat;
 public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelegate, IActionDelegate2 {

 

 	private class Listener implements IPreferenceChangeListener {

-		/* (non-Javadoc)

-		 * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)

-		 */

 		@Override

 		public void preferenceChange(PreferenceChangeEvent event) {

 			if(event.getKey().equals(IInternalDebugUIConstants.PREF_USE_CONTEXTUAL_LAUNCH)) {

@@ -77,9 +74,6 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega
 	private IWorkbenchWindow fWorkbenchWindow;

 	private IAction fAction;

 

-	/* (non-Javadoc)

-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()

-	 */

 	@Override

 	public void dispose(){

 		IEclipsePreferences prefs = InstanceScope.INSTANCE.getNode(DebugUIPlugin.getUniqueIdentifier());

@@ -88,9 +82,6 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega
 		}

 	}

 

-	/* (non-Javadoc)

-	 * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)

-	 */

 	@Override

 	public void init(IWorkbenchWindow window){

 		fWorkbenchWindow = window;

@@ -100,11 +91,6 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega
 		}

 	}

 

-	/*

-	 * (non-Javadoc)

-	 * @see

-	 * org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)

-	 */

 	/**

 	 * @since 3.12

 	 */

@@ -117,21 +103,11 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega
 		}

 	}

 

-	/* (non-Javadoc)

-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)

-	 */

 	@Override

 	public void run(IAction action) {

 		runInternal(false);

 	}

 

-	/*

-	 * (non-Javadoc)

-	 * @see

-	 * org.eclipse.ui.IActionDelegate2#runwithEvent(org.eclipse.jface.action.

-	 * IAction, org.eclipse.swt.widgets.Event)

-	 */

-

 	/**

 	 * @since 3.12

 	 */

@@ -180,9 +156,6 @@ public abstract class RelaunchLastAction implements IWorkbenchWindowActionDelega
 		dialog.open();

 	}

 

-	/* (non-Javadoc)

-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)

-	 */

 	@Override

 	public void selectionChanged(IAction action, ISelection selection){

 		if (fAction == null) {

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerBreakpointTypesActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerBreakpointTypesActionDelegate.java
index eb72e8932..8b145bfdf 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerBreakpointTypesActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerBreakpointTypesActionDelegate.java
@@ -121,9 +121,6 @@ public class RulerBreakpointTypesActionDelegate implements IEditorActionDelegate
         // Do nothing, this is a pull-down menu.
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart)
-     */
     @Override
 	public void setActiveEditor(IAction callerAction, IEditorPart targetEditor) {
         // Clean up old editor data.
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerEnableDisableBreakpointActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerEnableDisableBreakpointActionDelegate.java
index e27e253ab..7fff221a0 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerEnableDisableBreakpointActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerEnableDisableBreakpointActionDelegate.java
@@ -47,9 +47,6 @@ import org.eclipse.ui.texteditor.ITextEditor;
  */
 public class RulerEnableDisableBreakpointActionDelegate extends AbstractRulerActionDelegate {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo)
-	 */
 	@Override
 	protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
 		return new RulerEnableDisableBreakpointAction(editor, rulerInfo);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerRunToLineActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerRunToLineActionDelegate.java
index f3abc61fe..fa4f0b1ea 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerRunToLineActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerRunToLineActionDelegate.java
@@ -77,18 +77,12 @@ public class RulerRunToLineActionDelegate extends AbstractRulerActionDelegate im
 	private IEditorPart fEditor = null;
 	private RunToLineAction fDelegate = null;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo)
-	 */
 	@Override
 	protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
 		fDelegate = new RunToLineAction(editor, null, rulerInfo);
 		return fDelegate;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart)
-	 */
 	@Override
 	public void setActiveEditor(IAction callerAction, IEditorPart targetEditor) {
 		if (fEditor != null) {
@@ -101,16 +95,10 @@ public class RulerRunToLineActionDelegate extends AbstractRulerActionDelegate im
 		super.setActiveEditor(callerAction, targetEditor);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void init(IAction action) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#dispose()
-	 */
 	@Override
 	public void dispose() {
 		if (fDelegate != null) {
@@ -120,9 +108,6 @@ public class RulerRunToLineActionDelegate extends AbstractRulerActionDelegate im
 		fEditor = null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
-	 */
 	@Override
 	public void runWithEvent(IAction action, Event event) {
 		if(fDelegate != null) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerToggleBreakpointActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerToggleBreakpointActionDelegate.java
index 5469fa3cb..1697aeb9f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerToggleBreakpointActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RulerToggleBreakpointActionDelegate.java
@@ -79,18 +79,12 @@ public class RulerToggleBreakpointActionDelegate extends AbstractRulerActionDele
 	private IEditorPart fEditor = null;
 	private ToggleBreakpointAction fDelegate = null;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo)
-	 */
 	@Override
 	protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
 		fDelegate = new ToggleBreakpointAction(editor, null, rulerInfo);
 		return fDelegate;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart)
-	 */
 	@Override
 	public void setActiveEditor(IAction callerAction, IEditorPart targetEditor) {
 		if (fEditor != null) {
@@ -103,16 +97,10 @@ public class RulerToggleBreakpointActionDelegate extends AbstractRulerActionDele
 		super.setActiveEditor(callerAction, targetEditor);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void init(IAction action) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#dispose()
-	 */
 	@Override
 	public void dispose() {
 		if (fDelegate != null) {
@@ -122,9 +110,6 @@ public class RulerToggleBreakpointActionDelegate extends AbstractRulerActionDele
 		fEditor = null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
-	 */
 	@Override
 	public void runWithEvent(IAction action, Event event) {
 		if(fDelegate != null) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineAction.java
index 2f8f235e7..15c9cf1f2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineAction.java
@@ -106,18 +106,11 @@ public class RunToLineAction extends Action implements IUpdate {
 		initializeListeners();
 	}
 
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 		doIt();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#runWithEvent(org.eclipse.swt.widgets.Event)
-	 */
 	@Override
 	public void runWithEvent(Event event) {
 		if (event.widget instanceof MenuItem) {
@@ -166,11 +159,6 @@ public class RunToLineAction extends Action implements IUpdate {
 
 	}
 
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IUpdate#update()
-	 */
 	@Override
 	public void update() {
 		Runnable r = () -> setEnabled(isTargetEnabled());
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java
index 6748f64e2..0cab974eb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineActionDelegate.java
@@ -86,9 +86,6 @@ public class RunToLineActionDelegate implements IEditorActionDelegate, IActionDe
 
 	}
 
-	/*(non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#dispose()
-	 */
 	@Override
 	public void dispose() {
 		DebugUITools.getDebugContextManager().getContextService(fActivePart.getSite().getWorkbenchWindow()).removeDebugContextListener(fContextListener);
@@ -96,9 +93,7 @@ public class RunToLineActionDelegate implements IEditorActionDelegate, IActionDe
 		fPartTarget = null;
 
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
+
 	@Override
 	public void run(IAction action) {
 		if (fPartTarget != null && fTargetElement != null) {
@@ -109,18 +104,13 @@ public class RunToLineActionDelegate implements IEditorActionDelegate, IActionDe
 			}
 		}
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
+
 	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		this.fAction = action;
 		update();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.texteditor.IUpdate#update()
-	 */
 	public void update() {
 		if (fAction == null) {
 			return;
@@ -143,9 +133,6 @@ public class RunToLineActionDelegate implements IEditorActionDelegate, IActionDe
 		DebugUIPlugin.getStandardDisplay().asyncExec(r);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	public void init(IAction action) {
 		this.fAction = action;
@@ -155,25 +142,18 @@ public class RunToLineActionDelegate implements IEditorActionDelegate, IActionDe
 			action.setDisabledImageDescriptor(DebugUITools.getImageDescriptor(IInternalDebugUIConstants.IMG_DLCL_RUN_TO_LINE));
 		}
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
-	 */
+
 	@Override
 	public void runWithEvent(IAction action, Event event) {
 		run(action);
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart)
-	 */
+
 	@Override
 	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
 		init(action);
 		bindTo(targetEditor);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
-	 */
 	@Override
 	public void init(IViewPart view) {
 		bindTo(view);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineHandler.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineHandler.java
index 82e9cf671..64a419765 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineHandler.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/RunToLineHandler.java
@@ -65,9 +65,6 @@ public class RunToLineHandler implements IDebugEventSetListener, IBreakpointMana
         fBreakpoint = breakpoint;
     }
 
-    /* (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++) {
@@ -92,9 +89,6 @@ public class RunToLineHandler implements IDebugEventSetListener, IBreakpointMana
 
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.debug.core.IBreakpointManagerListener#breakpointManagerEnablementChanged(boolean)
-     */
     @Override
 	public void breakpointManagerEnablementChanged(boolean enabled) {
         // if the user changes the breakpoint manager enablement, don't restore it
@@ -125,9 +119,6 @@ public class RunToLineHandler implements IDebugEventSetListener, IBreakpointMana
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.core.resources.IWorkspaceRunnable#run(org.eclipse.core.runtime.IProgressMonitor)
-     */
     @Override
 	public void run(IProgressMonitor monitor) throws CoreException {
         getDebugPlugin().addDebugEventListener(this);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java
index e68a0c061..a71280595 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleBreakpointAction.java
@@ -78,18 +78,11 @@ public class ToggleBreakpointAction extends Action implements IUpdate {
 		DebugUITools.getToggleBreakpointsTargetManager().addChangedListener(fListener);
 	}
 
-	/*
-	 *  (non-Javadoc)
-	 * @see org.eclipse.jface.action.IAction#run()
-	 */
 	@Override
 	public void run() {
 		doIt(null);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.Action#runWithEvent(org.eclipse.swt.widgets.Event)
-	 */
 	@Override
 	public void runWithEvent(Event event) {
 		doIt(event);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleMethodBreakpointActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleMethodBreakpointActionDelegate.java
index a5814ed20..5920eefe1 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleMethodBreakpointActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleMethodBreakpointActionDelegate.java
@@ -31,9 +31,7 @@ import org.eclipse.ui.IWorkbenchPart;
  * @noinstantiate This class is not intended to be instantiated by clients.
  */
 public class ToggleMethodBreakpointActionDelegate extends ToggleBreakpointObjectActionDelegate {
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.actions.ToggleBreakpointObjectActionDelegate#performAction(org.eclipse.debug.internal.ui.actions.IToggleBreakpointsTarget, org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
+
 	@Override
 	protected void performAction(IToggleBreakpointsTarget target, IWorkbenchPart part, ISelection selection) throws CoreException {
 		target.toggleMethodBreakpoints(part, selection);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleWatchpointActionDelegate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleWatchpointActionDelegate.java
index 21776b06c..1cf289a70 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleWatchpointActionDelegate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/ToggleWatchpointActionDelegate.java
@@ -31,9 +31,7 @@ import org.eclipse.ui.IWorkbenchPart;
  * @noinstantiate This class is not intended to be instantiated by clients.
  */
 public class ToggleWatchpointActionDelegate extends ToggleBreakpointObjectActionDelegate {
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.actions.ToggleBreakpointObjectActionDelegate#performAction(org.eclipse.debug.internal.ui.actions.IToggleBreakpointsTarget, org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
+
 	@Override
 	protected void performAction(IToggleBreakpointsTarget target, IWorkbenchPart part, ISelection selection) throws CoreException {
 		target.toggleWatchpoints(part, selection);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/ConsoleColorProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/ConsoleColorProvider.java
index 103608b57..f87d48838 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/ConsoleColorProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/ConsoleColorProvider.java
@@ -34,9 +34,6 @@ public class ConsoleColorProvider implements IConsoleColorProvider {
 	private IProcess fProcess;
 	private IConsole fConsole;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.console.IConsoleColorProvider#connect(org.eclipse.debug.core.model.IProcess, org.eclipse.debug.ui.console.IConsole)
-	 */
 	@Override
 	public void connect(IProcess process, IConsole console) {
 		fProcess = process;
@@ -47,26 +44,17 @@ public class ConsoleColorProvider implements IConsoleColorProvider {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.console.IConsoleColorProvider#disconnect()
-	 */
 	@Override
 	public void disconnect() {
 		fConsole = null;
 		fProcess = null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.console.IConsoleColorProvider#isReadOnly()
-	 */
 	@Override
 	public boolean isReadOnly() {
 		return fProcess == null || fProcess.isTerminated();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.console.IConsoleColorProvider#getColor(java.lang.String)
-	 */
 	@Override
 	public Color getColor(String streamIdentifer) {
 		if (IDebugUIConstants.ID_STANDARD_OUTPUT_STREAM.equals(streamIdentifer)) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/FileLink.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/FileLink.java
index f29c386bd..e10d4e05f 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/FileLink.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/console/FileLink.java
@@ -73,9 +73,6 @@ public class FileLink implements IConsoleHyperlink {
 		fEditorId = editorId;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.console.IConsoleHyperlink#linkActivated()
-	 */
 	@Override
 	public void linkActivated() {
 		IWorkbenchWindow window = DebugUIPlugin.getActiveWorkbenchWindow();
@@ -125,16 +122,10 @@ public class FileLink implements IConsoleHyperlink {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.console.IConsoleHyperlink#linkEntered()
-	 */
 	@Override
 	public void linkEntered() {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.console.IConsoleHyperlink#linkExited()
-	 */
 	@Override
 	public void linkExited() {
 	}
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/contexts/AbstractDebugContextProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/contexts/AbstractDebugContextProvider.java
index d2abab3ef..93ed08eb7 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/contexts/AbstractDebugContextProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/contexts/AbstractDebugContextProvider.java
@@ -47,25 +47,16 @@ public abstract class AbstractDebugContextProvider implements IDebugContextProvi
 		fPart = part;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextProvider#addDebugContextEventListener(org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextEventListener)
-	 */
 	@Override
 	public void addDebugContextListener(IDebugContextListener listener) {
 		fListeners.add(listener);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextProvider#getPart()
-	 */
 	@Override
 	public IWorkbenchPart getPart() {
 		return fPart;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextProvider#removeDebugContextEventListener(org.eclipse.debug.internal.ui.contexts.provisional.IDebugContextEventListener)
-	 */
 	@Override
 	public void removeDebugContextListener(IDebugContextListener listener) {
 		fListeners.remove(listener);
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java
index 72f7dc756..959162a87 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRendering.java
@@ -100,9 +100,6 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements
 		fRenderingId = renderingId;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#init(org.eclipse.debug.ui.memory.IMemoryRenderingSite, org.eclipse.debug.core.model.IMemoryBlock)
-	 */
 	@Override
 	public void init(IMemoryRenderingContainer container, IMemoryBlock block) {
 		fContainer = container;
@@ -111,9 +108,6 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements
 		fLabelDecorator = fMemoryBlock.getAdapter(ILabelDecorator.class);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#dispose()
-	 */
 	@Override
 	public void dispose()
 	{
@@ -137,9 +131,6 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#activated()
-	 */
 	@Override
 	public void activated() {
 		if (fContainer.getMemoryRenderingSite().getSynchronizationService() != null) {
@@ -147,9 +138,6 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#deactivated()
-	 */
 	@Override
 	public void deactivated() {
 		// do nothing when deactivated
@@ -159,9 +147,6 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements
 		// up synchronization on Linux GTK.
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#becomesVisible()
-	 */
 	@Override
 	public void becomesVisible() {
 		fVisible = true;
@@ -173,9 +158,6 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#becomesHidden()
-	 */
 	@Override
 	public void becomesHidden() {
 		fVisible = false;
@@ -186,26 +168,17 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#getMemoryBlock()
-	 */
 	@Override
 	public IMemoryBlock getMemoryBlock() {
 		return fMemoryBlock;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#getRenderingId()
-	 */
 	@Override
 	public String getRenderingId()
 	{
 		return fRenderingId;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
-	 */
 	@Override
 	public void addPropertyChangeListener(IPropertyChangeListener listener) {
 
@@ -216,9 +189,6 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements
 		fPropertyListeners.add(listener);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
-	 */
 	@Override
 	public void removePropertyChangeListener(IPropertyChangeListener listener) {
 
@@ -228,9 +198,6 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements
 		fPropertyListeners.remove(listener);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#getImage()
-	 */
 	@Override
 	public Image getImage() {
 		return decorateImage(null);
@@ -250,9 +217,6 @@ public abstract class AbstractMemoryRendering extends PlatformObject implements
 		return image;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#getLabel()
-	 */
 	@Override
 	public  String getLabel()
 	{
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRenderingBindingsProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRenderingBindingsProvider.java
index 3bf514aa8..83afb34fb 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRenderingBindingsProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractMemoryRenderingBindingsProvider.java
@@ -31,9 +31,6 @@ public abstract class AbstractMemoryRenderingBindingsProvider implements IMemory
 	// list of binding listeners
 	private ListenerList<IMemoryRenderingBindingsListener> fListeners;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider#addListener(org.eclipse.debug.ui.memory.IMemoryRenderingBindingsListener)
-	 */
 	@Override
 	public void addListener(IMemoryRenderingBindingsListener listener) {
 		if (fListeners == null) {
@@ -41,9 +38,7 @@ public abstract class AbstractMemoryRenderingBindingsProvider implements IMemory
 		}
 		fListeners.add(listener);
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRenderingBindingsProvider#removeListener(org.eclipse.debug.ui.memory.IMemoryRenderingBindingsListener)
-	 */
+
 	@Override
 	public void removeListener(IMemoryRenderingBindingsListener listener) {
 		if (fListeners != null) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java
index 3ba7945c2..39d8053de 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTableRendering.java
@@ -264,11 +264,6 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering
 			updateActionLabel();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 *
-		 * @see org.eclipse.jface.action.IAction#run()
-		 */
 		@Override
 		public void run() {
 			fIsShowAddressColumn = !fIsShowAddressColumn;
@@ -276,9 +271,6 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering
 			updateActionLabel();
 		}
 
-		/**
-		 *
-		 */
 		private void updateActionLabel() {
 			if (fIsShowAddressColumn) {
 				setText(DebugUIMessages.ShowAddressColumnAction_0);
@@ -332,9 +324,6 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering
 		super(renderingId);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
 	@Override
 	public void propertyChange(PropertyChangeEvent event) {
 		// if memory view table font has changed
@@ -721,9 +710,6 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#createControl(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	public Control createControl(Composite parent) {
 
@@ -1645,9 +1631,6 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering
 		return fIsShowingErrorPage;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#getControl()
-	 */
 	@Override
 	public Control getControl() {
 		return fPageBook;
@@ -2361,9 +2344,6 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering
 		return fTableViewer;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#dispose()
-	 */
 	@Override
 	public void dispose() {
 		try {
@@ -2433,8 +2413,9 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering
 		return bytesPerLine/columnSize;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.IMemoryViewTab#setFont(org.eclipse.swt.graphics.Font)
+	/*
+	 * @see
+	 * org.eclipse.debug.ui.IMemoryViewTab#setFont(org.eclipse.swt.graphics.Font)
 	 */
 	private void setFont(Font font)
 	{
@@ -3168,9 +3149,6 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering
 		fTableViewer.getCellModifier().modify(tableItem, (String)property, newValue);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#becomesHidden()
-	 */
 	@Override
 	public void becomesHidden() {
 
@@ -3195,9 +3173,6 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IMemoryRendering#becomesVisible()
-	 */
 	@Override
 	public void becomesVisible() {
 
@@ -3386,9 +3361,6 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering
 		return table.getItemHeight();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T> T getAdapter(Class<T> adapter) {
@@ -3760,10 +3732,6 @@ public abstract class AbstractTableRendering extends AbstractBaseTableRendering
 		return fToolTipLabel;
 	}
 
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.IResettableMemoryRendering#resetRendering()
-	 */
 	@Override
 	public void resetRendering() throws DebugException {
 		resetToBaseAddress();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java
index 3e06b1e95..c068d6acc 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/memory/AbstractTextRendering.java
@@ -84,15 +84,13 @@ abstract public class AbstractTextRendering extends AbstractTableRendering {
 		return fCodePage;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.AbstractTableRendering#getString(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[])
-	 */
 	@Override
 	public String getString(String dataType, BigInteger address,  MemoryByte[] data) {
 		try {
 			String paddedStr = DebugUIPlugin.getDefault().getPreferenceStore().getString(IDebugUIConstants.PREF_PADDED_STR);
-			if(fCodePage == null)
+			if(fCodePage == null) {
 				return IInternalDebugCoreConstants.EMPTY_STRING;
+			}
 
 			boolean[] invalid = new boolean[data.length];
 			boolean hasInvalid = false;
@@ -112,10 +110,11 @@ abstract public class AbstractTextRendering extends AbstractTableRendering {
 				StringBuffer strBuf = new StringBuffer();
 				for (int i=0; i<data.length; i++)
 				{
-					if (invalid[i])
+					if (invalid[i]) {
 						strBuf.append(paddedStr);
-					else
+					} else {
 						strBuf.append(new String(new byte[]{byteArray[i]}, fCodePage));
+					}
 				}
 				return strBuf.toString();
 			}
@@ -127,16 +126,13 @@ abstract public class AbstractTextRendering extends AbstractTableRendering {
 		}
 	}
 
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.memory.AbstractTableRendering#getBytes(java.lang.String, java.math.BigInteger, org.eclipse.debug.core.model.MemoryByte[], java.lang.String)
-	 */
 	@Override
 	public byte[] getBytes(String dataType, BigInteger address, MemoryByte[] currentValues, String data) {
 		try {
 
-			if (fCodePage == null)
+			if (fCodePage == null) {
 				return new byte[0];
+			}
 
 			byte[] bytes =  data.getBytes(fCodePage);
 			return bytes;
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/AbstractSourceContainerBrowser.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/AbstractSourceContainerBrowser.java
index 7bb8789c2..06c785321 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/AbstractSourceContainerBrowser.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/AbstractSourceContainerBrowser.java
@@ -26,37 +26,29 @@ import org.eclipse.swt.widgets.Shell;
  * @since 3.0
  */
 public class AbstractSourceContainerBrowser implements ISourceContainerBrowser {
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#addSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.sourcelookup.ISourceLookupDirector)
-	 */
+
 	@Override
 	public ISourceContainer[] addSourceContainers(Shell shell, ISourceLookupDirector director) {
 		return new ISourceContainer[0];
 	}
-	/* (non-Javadoc)
-	 *
+
+	/*
 	 * Generally, a source container browser can add source containers. Subclasses
 	 * should override as required.
-	 *
-	 * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#canAddSourceContainers(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector)
 	 */
 	@Override
 	public boolean canAddSourceContainers(ISourceLookupDirector director) {
 		return true;
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#editSourceContainers(org.eclipse.swt.widgets.Shell, org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[])
-	 */
+
 	@Override
 	public ISourceContainer[] editSourceContainers(Shell shell, ISourceLookupDirector director, ISourceContainer[] containers) {
 		return new ISourceContainer[0];
 	}
-	/* (non-Javadoc)
-	 *
-	 * Not all source containers can be edited. Subclasses should override
-	 * as required.
-	 *
-	 * @see org.eclipse.debug.internal.ui.sourcelookup.ISourceContainerBrowser#canEditSourceContainers(org.eclipse.debug.core.sourcelookup.ISourceLookupDirector, org.eclipse.debug.core.sourcelookup.ISourceContainer[])
+
+	/*
+	 * Not all source containers can be edited. Subclasses should override as
+	 * required.
 	 */
 	@Override
 	public boolean canEditSourceContainers(ISourceLookupDirector director, ISourceContainer[] containers) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditor.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditor.java
index 65fc50369..85a9531af 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditor.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditor.java
@@ -75,23 +75,14 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE
 	 */
 	private ILaunchesListener2 fLaunchesListener;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor)
-	 */
 	@Override
 	public void doSave(IProgressMonitor monitor) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#doSaveAs()
-	 */
 	@Override
 	public void doSaveAs() {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
-	 */
 	@Override
 	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
 		setSite(site);
@@ -99,25 +90,16 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE
 		initialize();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#isDirty()
-	 */
 	@Override
 	public boolean isDirty() {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()
-	 */
 	@Override
 	public boolean isSaveAsAllowed() {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	public void createPartControl(Composite parent) {
 		GridLayout topLayout = new GridLayout();
@@ -206,9 +188,6 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
-	 */
 	@Override
 	public void setFocus() {
 		if (fText != null) {
@@ -216,9 +195,6 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.EditorPart#setInput(org.eclipse.ui.IEditorInput)
-	 */
 	@Override
 	public void setInput(IEditorInput input) {
 		super.setInput(input);
@@ -256,12 +232,6 @@ public class CommonSourceNotFoundEditor extends EditorPart implements IReusableE
 		});
 	}
 
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
 	@Override
 	public void dispose() {
 		if (fLaunchesListener != null) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java
index ec9279699..f0a3ed757 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/CommonSourceNotFoundEditorInput.java
@@ -61,41 +61,26 @@ public class CommonSourceNotFoundEditorInput extends PlatformObject implements I
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#exists()
-	 */
 	@Override
 	public boolean exists() {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
-	 */
 	@Override
 	public ImageDescriptor getImageDescriptor() {
 		return DebugUITools.getDefaultImageDescriptor(fArtifact);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
 	@Override
 	public String getName() {
 		return fLabel;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getPersistable()
-	 */
 	@Override
 	public IPersistableElement getPersistable() {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
-	 */
 	@Override
 	public String getToolTipText() {
 		return MessageFormat.format(SourceLookupUIMessages.addSourceLocation_editorMessage, new Object[] { fLabel });
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java
index 17021cd34..9cdac51ce 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupDialog.java
@@ -65,9 +65,6 @@ public class SourceLookupDialog extends TitleAreaDialog {
 		fDirector = director;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		// create a composite with standard margins and spacing
@@ -102,9 +99,6 @@ public class SourceLookupDialog extends TitleAreaDialog {
 		return composite;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-	 */
 	@Override
 	protected void okPressed() {
 		ILaunchConfiguration config = fDirector.getLaunchConfiguration();
@@ -120,28 +114,18 @@ public class SourceLookupDialog extends TitleAreaDialog {
 		super.okPressed();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
-	 */
 	@Override
 	protected void configureShell(Shell shell) {
 		super.configureShell(shell);
 		shell.setText(SourceLookupUIMessages.manageSourceDialog_title);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.window.Window#close()
-	 */
 	@Override
 	public boolean close() {
 		fPanel.dispose();
 		return super.close();
 	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings()
-     * @since 3.2
-     */
     @Override
 	protected IDialogSettings getDialogBoundsSettings() {
     	 IDialogSettings settings = DebugUIPlugin.getDefault().getDialogSettings();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java
index 32101e2e0..6fdc0f877 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/SourceLookupTab.java
@@ -58,9 +58,6 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab {
 		setHelpContextId(IDebugHelpContextIds.SOURCELOOKUP_TAB);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	public void createControl(Composite parent) {
 		Composite comp = new Composite(parent, SWT.NONE);
@@ -83,65 +80,41 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab {
 		Dialog.applyDialogFont(comp);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
 	@Override
 	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
-	 */
 	@Override
 	public void initializeFrom(ILaunchConfiguration configuration) {
 		fSourceLookupPanel.initializeFrom(configuration);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
 	@Override
 	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
 		fSourceLookupPanel.performApply(configuration);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getId()
-	 */
 	@Override
 	public String getId() {
 	    return "org.eclipse.debug.ui.sourceLookupTab"; //$NON-NLS-1$
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
-	 */
 	@Override
 	public String getName() {
 		return SourceLookupUIMessages.sourceTab_tabTitle;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
-	 */
 	@Override
 	public Image getImage() {
 		return DebugPluginImages.getImage(IInternalDebugUIConstants.IMG_SRC_LOOKUP_TAB);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
-	 */
 	@Override
 	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
 		fSourceLookupPanel.activated(workingCopy);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#dispose()
-	 */
 	@Override
 	public void dispose() {
 		if (fSourceLookupPanel != null) {
@@ -154,9 +127,6 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab {
 		super.dispose();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getErrorMessage()
-	 */
 	@Override
 	public String getErrorMessage() {
 		if (fSourceLookupPanel != null) {
@@ -164,9 +134,7 @@ public class SourceLookupTab extends AbstractLaunchConfigurationTab {
 		}
 		return super.getErrorMessage();
 	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getMessage()
-	 */
+
 	@Override
 	public String getMessage() {
 		if (fSourceLookupPanel != null) {
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/WorkingSetSourceContainer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/WorkingSetSourceContainer.java
index cdd57f79a..722cef429 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/WorkingSetSourceContainer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/sourcelookup/WorkingSetSourceContainer.java
@@ -54,17 +54,11 @@ public class WorkingSetSourceContainer extends CompositeSourceContainer{
 		fWorkingSet = workingSet;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.debug.core.sourcelookup.ISourceContainer#getName()
-	 */
 	@Override
 	public String getName() {
 		return fWorkingSet.getName();
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object obj) {
 		if (obj != null && obj instanceof WorkingSetSourceContainer) {
@@ -78,17 +72,11 @@ public class WorkingSetSourceContainer extends CompositeSourceContainer{
 		return fWorkingSet.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 {
 		IAdaptable[] elements = fWorkingSet.getElements();