Bug 478673: added @Override/@Deprecated and removed non-Javadoc boilerplate

151 files changed, 1676 insertions, 3555 deletions

diff --git a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotation.java b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotation.java
index fb4cec2de5f..2ffc33fddb4 100644
--- a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotation.java
+++ b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotation.java
@@ -41,6 +41,7 @@ public class ProjectionAnnotation extends Annotation implements IAnnotationPrese
 
 	private static class DisplayDisposeRunnable implements Runnable {
 
+		@Override
 		public void run() {
 			if (fgCollapsedImage != null) {
 				fgCollapsedImage.dispose();
@@ -109,9 +110,7 @@ public class ProjectionAnnotation extends Annotation implements IAnnotationPrese
 		gc.drawLine(r.x + 4, height, r.x + r.width - MARGIN, height);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationPresentation#paint(org.eclipse.swt.graphics.GC, org.eclipse.swt.widgets.Canvas, org.eclipse.swt.graphics.Rectangle)
-	 */
+	@Override
 	public void paint(GC gc, Canvas canvas, Rectangle rectangle) {
 		Image image= getImage(canvas.getDisplay());
 		if (image != null) {
@@ -126,9 +125,7 @@ public class ProjectionAnnotation extends Annotation implements IAnnotationPrese
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationPresentation#getLayer()
-	 */
+	@Override
 	public int getLayer() {
 		return IAnnotationPresentation.DEFAULT_LAYER;
 	}
diff --git a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationHover.java b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationHover.java
index a65d06a9c40..2374073e703 100644
--- a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationHover.java
+++ b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionAnnotationHover.java
@@ -62,9 +62,7 @@ class ProjectionAnnotationHover implements IAnnotationHover, IAnnotationHoverExt
 		fInformationPresenterControlCreator= creator;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationHover#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer, int)
-	 */
+	@Override
 	public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
 		// this is a no-op as semantics is defined by the implementation of the annotation hover extension
 		return null;
@@ -138,33 +136,26 @@ class ProjectionAnnotationHover implements IAnnotationHover, IAnnotationHoverExt
 		return document.get(offset, endOffset - offset);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer, org.eclipse.jface.text.source.ILineRange, int)
-	 */
+	@Override
 	public Object getHoverInfo(ISourceViewer sourceViewer, ILineRange lineRange, int visibleLines) {
 		return getProjectionTextAtLine(sourceViewer, lineRange.getStartLine(), visibleLines);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverLineRange(org.eclipse.jface.text.source.ISourceViewer, int)
-	 */
+	@Override
 	public ILineRange getHoverLineRange(ISourceViewer viewer, int lineNumber) {
 		return new LineRange(lineNumber, 1);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#canHandleMouseCursor()
-	 */
+	@Override
 	public boolean canHandleMouseCursor() {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverControlCreator()
-	 */
+	@Override
 	public IInformationControlCreator getHoverControlCreator() {
 		if (fInformationControlCreator == null) {
 			fInformationControlCreator= new IInformationControlCreator() {
+				@Override
 				public IInformationControl createInformationControl(Shell parent) {
 					return new SourceViewerInformationControl(parent, false, JFaceResources.TEXT_FONT, null);
 				}
@@ -173,13 +164,11 @@ class ProjectionAnnotationHover implements IAnnotationHover, IAnnotationHoverExt
 		return fInformationControlCreator;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.information.IInformationProviderExtension2#getInformationPresenterControlCreator()
-	 * @since 3.3
-	 */
+	@Override
 	public IInformationControlCreator getInformationPresenterControlCreator() {
 		if (fInformationPresenterControlCreator == null) {
 			fInformationPresenterControlCreator= new IInformationControlCreator() {
+				@Override
 				public IInformationControl createInformationControl(Shell parent) {
 					return new SourceViewerInformationControl(parent, true, JFaceResources.TEXT_FONT, null);
 				}
diff --git a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionRulerColumn.java b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionRulerColumn.java
index d268731f230..d7c156a226b 100644
--- a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionRulerColumn.java
+++ b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionRulerColumn.java
@@ -66,9 +66,7 @@ class ProjectionRulerColumn extends AnnotationRulerColumn {
 		super(width, annotationAccess);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.AnnotationRulerColumn#mouseClicked(int)
-	 */
+	@Override
 	protected void mouseClicked(int line) {
 		clearCurrentAnnotation();
 		if (fMouseDownLine != line)
@@ -80,18 +78,12 @@ class ProjectionRulerColumn extends AnnotationRulerColumn {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.AnnotationRulerColumn#mouseDown(int)
-	 * @since 3.5
-	 */
+	@Override
 	protected void mouseDown(int rulerLine) {
 		fMouseDownLine= rulerLine;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.AnnotationRulerColumn#mouseDoubleClicked(int)
-	 * @since 3.5
-	 */
+	@Override
 	protected void mouseDoubleClicked(int rulerLine) {
 		if (findAnnotation(rulerLine, true) != null)
 			return;
@@ -193,9 +185,7 @@ class ProjectionRulerColumn extends AnnotationRulerColumn {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerColumn#createControl(org.eclipse.jface.text.source.CompositeRuler, org.eclipse.swt.widgets.Composite)
-	 */
+	@Override
 	public Control createControl(CompositeRuler parentRuler, Composite parentControl) {
 		Control control= super.createControl(parentRuler, parentControl);
 
@@ -205,6 +195,7 @@ class ProjectionRulerColumn extends AnnotationRulerColumn {
 
 		// install hover listener
 		control.addMouseTrackListener(new MouseTrackAdapter() {
+			@Override
 			public void mouseExit(MouseEvent e) {
 				if (clearCurrentAnnotation())
 					redraw();
@@ -213,6 +204,7 @@ class ProjectionRulerColumn extends AnnotationRulerColumn {
 
 		// install mouse move listener
 		control.addMouseMoveListener(new MouseMoveListener() {
+			@Override
 			public void mouseMove(MouseEvent e) {
 				boolean redraw= false;
 				ProjectionAnnotation annotation= findAnnotation(toDocumentLineNumber(e.y), false);
@@ -234,9 +226,7 @@ class ProjectionRulerColumn extends AnnotationRulerColumn {
 		return control;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.AnnotationRulerColumn#setModel(org.eclipse.jface.text.source.IAnnotationModel)
-	 */
+	@Override
 	public void setModel(IAnnotationModel model) {
 		if (model instanceof IAnnotationModelExtension) {
 			IAnnotationModelExtension extension= (IAnnotationModelExtension) model;
@@ -245,16 +235,12 @@ class ProjectionRulerColumn extends AnnotationRulerColumn {
 		super.setModel(model);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.AnnotationRulerColumn#isPropagatingMouseListener()
-	 */
+	@Override
 	protected boolean isPropagatingMouseListener() {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.AnnotationRulerColumn#hasAnnotation(int)
-	 */
+	@Override
 	protected boolean hasAnnotation(int lineNumber) {
 		return findAnnotation(lineNumber, true) != null;
 	}
diff --git a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSummary.java b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSummary.java
index eccbeb46902..1475139012d 100644
--- a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSummary.java
+++ b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSummary.java
@@ -58,9 +58,7 @@ class ProjectionSummary {
 			}
 		}
 
-		/*
-		 * @see java.lang.Thread#run()
-		 */
+		@Override
 		public void run() {
 			while (true) {
 				synchronized (fLock) {
diff --git a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSupport.java b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSupport.java
index 8cb567ba105..e6722f766eb 100644
--- a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSupport.java
+++ b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionSupport.java
@@ -60,9 +60,7 @@ public class ProjectionSupport {
 			super(sourceViewer, access);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.source.AnnotationPainter#findAnnotationModel(org.eclipse.jface.text.source.ISourceViewer)
-		 */
+		@Override
 		protected IAnnotationModel findAnnotationModel(ISourceViewer sourceViewer) {
 			if (sourceViewer instanceof ProjectionViewer) {
 				ProjectionViewer projectionViewer= (ProjectionViewer) sourceViewer;
@@ -71,9 +69,7 @@ public class ProjectionSupport {
 			return null;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.source.AnnotationPainter#skip(org.eclipse.jface.text.source.Annotation)
-		 */
+		@Override
 		protected boolean skip(Annotation annotation) {
 			if (annotation instanceof ProjectionAnnotation)
 				return !((ProjectionAnnotation) annotation).isCollapsed();
@@ -83,9 +79,7 @@ public class ProjectionSupport {
 	}
 
 	private static class ProjectionDrawingStrategy implements AnnotationPainter.IDrawingStrategy {
-		/*
-		 * @see org.eclipse.jface.text.source.AnnotationPainter.IDrawingStrategy#draw(org.eclipse.swt.graphics.GC, org.eclipse.swt.custom.StyledText, int, int, org.eclipse.swt.graphics.Color)
-		 */
+		@Override
 		public void draw(Annotation annotation, GC gc, StyledText textWidget, int offset, int length, Color color) {
 			if (annotation instanceof ProjectionAnnotation) {
 				ProjectionAnnotation projectionAnnotation= (ProjectionAnnotation) annotation;
@@ -136,16 +130,12 @@ public class ProjectionSupport {
 
 	private class ProjectionListener implements IProjectionListener {
 
-		/*
-		 * @see org.eclipse.jface.text.source.projection.IProjectionListener#projectionEnabled()
-		 */
+		@Override
 		public void projectionEnabled() {
 			doEnableProjection();
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.source.projection.IProjectionListener#projectionDisabled()
-		 */
+		@Override
 		public void projectionDisabled() {
 			doDisableProjection();
 		}
diff --git a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java
index 7e3d27ef0f5..123b8bb8d28 100644
--- a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java
+++ b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/ProjectionViewer.java
@@ -101,16 +101,12 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 	 */
 	private class AnnotationModelListener implements IAnnotationModelListener, IAnnotationModelListenerExtension {
 
-		/*
-		 * @see org.eclipse.jface.text.source.IAnnotationModelListener#modelChanged(org.eclipse.jface.text.source.IAnnotationModel)
-		 */
+		@Override
 		public void modelChanged(IAnnotationModel model) {
 			processModelChanged(model, null);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.source.IAnnotationModelListenerExtension#modelChanged(org.eclipse.jface.text.source.AnnotationModelEvent)
-		 */
+		@Override
 		public void modelChanged(AnnotationModelEvent event) {
 			processModelChanged(event.getAnnotationModel(), event);
 		}
@@ -156,15 +152,11 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 			}
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-		 */
+		@Override
 		public void documentAboutToBeChanged(DocumentEvent event) {
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)
-		 */
+		@Override
 		public void documentChanged(DocumentEvent event) {
 			fExecutionTrigger.removeDocumentListener(this);
 			executeReplaceVisibleDocument(fSlaveDocument);
@@ -357,9 +349,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.SourceViewer#setDocument(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.source.IAnnotationModel, int, int)
-	 */
+	@Override
 	public void setDocument(IDocument document, IAnnotationModel annotationModel, int modelRangeOffset, int modelRangeLength) {
 		boolean wasProjectionEnabled= false;
 
@@ -380,9 +370,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.SourceViewer#createVisualAnnotationModel(org.eclipse.jface.text.source.IAnnotationModel)
-	 */
+	@Override
 	protected IAnnotationModel createVisualAnnotationModel(IAnnotationModel annotationModel) {
 		IAnnotationModel model= super.createVisualAnnotationModel(annotationModel);
 		fProjectionAnnotationModel= new ProjectionAnnotationModel();
@@ -403,16 +391,12 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextViewer#createSlaveDocumentManager()
-	 */
+	@Override
 	protected ISlaveDocumentManager createSlaveDocumentManager() {
 		return new ProjectionDocumentManager();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextViewer#updateSlaveDocument(org.eclipse.jface.text.IDocument, int, int)
-	 */
+	@Override
 	protected boolean updateSlaveDocument(IDocument slaveDocument, int modelRangeOffset, int modelRangeLength) throws BadLocationException {
 		if (slaveDocument instanceof ProjectionDocument) {
 			ProjectionDocument projection= (ProjectionDocument) slaveDocument;
@@ -694,18 +678,14 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		return document.getLineInformationOfOffset(offset).getOffset();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextViewer#setVisibleRegion(int, int)
-	 */
+	@Override
 	public void setVisibleRegion(int start, int length) {
 		fWasProjectionEnabled= isProjectionMode();
 		disableProjection();
 		super.setVisibleRegion(start, length);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextViewer#setVisibleDocument(org.eclipse.jface.text.IDocument)
-	 */
+	@Override
 	protected void setVisibleDocument(IDocument document) {
 		if (!isProjectionMode()) {
 			super.setVisibleDocument(document);
@@ -718,18 +698,14 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		fFindReplaceDocumentAdapter= adapter;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextViewer#resetVisibleRegion()
-	 */
+	@Override
 	public void resetVisibleRegion() {
 		super.resetVisibleRegion();
 		if (fWasProjectionEnabled)
 			enableProjection();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextViewer#getVisibleRegion()
-	 */
+	@Override
 	public IRegion getVisibleRegion() {
 		disableProjection();
 		IRegion visibleRegion= getModelCoverage();
@@ -739,9 +715,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		return visibleRegion;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextViewer#overlapsWithVisibleRegion(int,int)
-	 */
+	@Override
 	public boolean overlapsWithVisibleRegion(int offset, int length) {
 		disableProjection();
 		IRegion coverage= getModelCoverage();
@@ -901,6 +875,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 					Display display= widget.getDisplay();
 					if (display != null) {
 						display.asyncExec(new Runnable() {
+							@Override
 							public void run() {
 								try {
 									while (true) {
@@ -1239,9 +1214,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		replaceVisibleDocument(projection);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextViewer#handleVerifyEvent(org.eclipse.swt.events.VerifyEvent)
-	 */
+	@Override
 	protected void handleVerifyEvent(VerifyEvent e) {
 		if (getTextWidget().getBlockSelection()) {
 			ITextSelection selection= (ITextSelection) getSelection();
@@ -1270,9 +1243,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 			super.handleVerifyEvent(e);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextViewerExtension5#exposeModelRange(org.eclipse.jface.text.IRegion)
-	 */
+	@Override
 	public boolean exposeModelRange(IRegion modelRange) {
 		if (isProjectionMode())
 			return fProjectionAnnotationModel.expandAll(modelRange.getOffset(), modelRange.getLength());
@@ -1285,9 +1256,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.SourceViewer#setRangeIndication(int, int, boolean)
-	 */
+	@Override
 	public void setRangeIndication(int offset, int length, boolean moveCursor) {
 		IRegion rangeIndication= getRangeIndication();
 		if (moveCursor && fProjectionAnnotationModel != null && (rangeIndication == null || offset != rangeIndication.getOffset() || length != rangeIndication.getLength())) {
@@ -1321,10 +1290,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.SourceViewer#handleDispose()
-	 * @since 3.0
-	 */
+	@Override
 	protected void handleDispose() {
 		fWasProjectionEnabled= false;
 		super.handleDispose();
@@ -1333,6 +1299,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 	/*
 	 * @see org.eclipse.jface.text.TextViewer#handleVisibleDocumentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
 	 */
+	@Override
 	protected void handleVisibleDocumentChanged(DocumentEvent event) {
 		if (fHandleProjectionChanges && event instanceof ProjectionDocumentEvent && isProjectionMode()) {
 			ProjectionDocumentEvent e= (ProjectionDocumentEvent) event;
@@ -1363,10 +1330,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextViewer#handleVisibleDocumentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-	 * @since 3.1
-	 */
+	@Override
 	protected void handleVisibleDocumentAboutToBeChanged(DocumentEvent event) {
 		if (fHandleProjectionChanges && event instanceof ProjectionDocumentEvent && isProjectionMode()) {
 			int deletedLines;
@@ -1379,9 +1343,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextViewerExtension5#getCoveredModelRanges(org.eclipse.jface.text.IRegion)
-	 */
+	@Override
 	public IRegion[] getCoveredModelRanges(IRegion modelRange) {
 		if (fInformationMapping == null)
 			return new IRegion[] { new Region(modelRange.getOffset(), modelRange.getLength()) };
@@ -1397,9 +1359,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextOperationTarget#doOperation(int)
-	 */
+	@Override
 	public void doOperation(int operation) {
 		switch (operation) {
 			case TOGGLE:
@@ -1502,9 +1462,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.SourceViewer#canDoOperation(int)
-	 */
+	@Override
 	public boolean canDoOperation(int operation) {
 
 		switch (operation) {
@@ -1541,9 +1499,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		return start > end ? new Region (end, start - end) : new Region(start, end - start);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextViewer#copyMarkedRegion(boolean)
-	 */
+	@Override
 	protected void copyMarkedRegion(boolean delete) {
 		IRegion markedRegion= getMarkedRegion();
 		if (markedRegion != null)
@@ -1614,6 +1570,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 	 * @param widgetSelection the widget selection
 	 * @return the model selection while respecting line based folding
 	 */
+	@Override
 	protected Point widgetSelection2ModelSelection(Point widgetSelection) {
 
 		if (!isProjectionMode())
@@ -1699,9 +1656,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		return (Position[]) positions.toArray(new Position[positions.size()]);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextViewer#getFindReplaceDocumentAdapter()
-	 */
+	@Override
 	protected FindReplaceDocumentAdapter getFindReplaceDocumentAdapter() {
 		if (fFindReplaceDocumentAdapter == null) {
 			IDocument document= isProjectionMode() ? getDocument() : getVisibleDocument();
@@ -1710,9 +1665,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		return fFindReplaceDocumentAdapter;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextViewer#findAndSelect(int, java.lang.String, boolean, boolean, boolean, boolean)
-	 */
+	@Override
 	protected int findAndSelect(int startPosition, String findString, boolean forwardSearch, boolean caseSensitive, boolean wholeWord, boolean regExSearch) {
 
 		if (!isProjectionMode())
@@ -1738,9 +1691,7 @@ public class ProjectionViewer extends SourceViewer implements ITextViewerExtensi
 		return -1;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextViewer#findAndSelectInRange(int, java.lang.String, boolean, boolean, boolean, int, int, boolean)
-	 */
+	@Override
 	protected int findAndSelectInRange(int startPosition, String findString, boolean forwardSearch, boolean caseSensitive, boolean wholeWord, int rangeOffset, int rangeLength, boolean regExSearch) {
 
 		if (!isProjectionMode())
diff --git a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/SourceViewerInformationControl.java b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/SourceViewerInformationControl.java
index 7970a8217a4..8266ab28236 100644
--- a/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/SourceViewerInformationControl.java
+++ b/org.eclipse.jface.text/projection/org/eclipse/jface/text/source/projection/SourceViewerInformationControl.java
@@ -140,11 +140,13 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio
 
 		fText.addKeyListener(new KeyListener() {
 
+			@Override
 			public void keyPressed(KeyEvent e)  {
 				if (e.character == 0x1B) // ESC
 					fShell.dispose();
 			}
 
+			@Override
 			public void keyReleased(KeyEvent e) {}
 		});
 
@@ -213,9 +215,7 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio
 			setInformation(null);
 	}
 
-	/*
-	 * @see IInformationControl#setInformation(String)
-	 */
+	@Override
 	public void setInformation(String content) {
 		if (content == null) {
 			fViewer.setInput(null);
@@ -226,16 +226,12 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio
 		fViewer.setInput(doc);
 	}
 
-	/*
-	 * @see IInformationControl#setVisible(boolean)
-	 */
+	@Override
 	public void setVisible(boolean visible) {
 			fShell.setVisible(visible);
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)
-	 */
+	@Override
 	public void widgetDisposed(DisposeEvent event) {
 		if (fStatusTextFont != null && !fStatusTextFont.isDisposed())
 			fStatusTextFont.dispose();
@@ -249,9 +245,7 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio
 		fText= null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControl#dispose()
-	 */
+	@Override
 	public final void dispose() {
 		if (fShell != null && !fShell.isDisposed())
 			fShell.dispose();
@@ -259,9 +253,7 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio
 			widgetDisposed(null);
 	}
 
-	/*
-	 * @see IInformationControl#setSize(int, int)
-	 */
+	@Override
 	public void setSize(int width, int height) {
 
 		if (fStatusField != null) {
@@ -276,24 +268,18 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio
 			fShell.pack(true);
 	}
 
-	/*
-	 * @see IInformationControl#setLocation(Point)
-	 */
+	@Override
 	public void setLocation(Point location) {
 		fShell.setLocation(location);
 	}
 
-	/*
-	 * @see IInformationControl#setSizeConstraints(int, int)
-	 */
+	@Override
 	public void setSizeConstraints(int maxWidth, int maxHeight) {
 		fMaxWidth= maxWidth;
 		fMaxHeight= maxHeight;
 	}
 
-	/*
-	 * @see IInformationControl#computeSizeHint()
-	 */
+	@Override
 	public Point computeSizeHint() {
 		// compute the preferred size
 		int x= SWT.DEFAULT;
@@ -311,74 +297,53 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio
 		return size;
 	}
 
-	/*
-	 * @see IInformationControl#addDisposeListener(DisposeListener)
-	 */
+	@Override
 	public void addDisposeListener(DisposeListener listener) {
 		fShell.addDisposeListener(listener);
 	}
 
-	/*
-	 * @see IInformationControl#removeDisposeListener(DisposeListener)
-	 */
+	@Override
 	public void removeDisposeListener(DisposeListener listener) {
 		fShell.removeDisposeListener(listener);
 	}
 
-	/*
-	 * @see IInformationControl#setForegroundColor(Color)
-	 */
+	@Override
 	public void setForegroundColor(Color foreground) {
 		fText.setForeground(foreground);
 	}
 
-	/*
-	 * @see IInformationControl#setBackgroundColor(Color)
-	 */
+	@Override
 	public void setBackgroundColor(Color background) {
 		fText.setBackground(background);
 	}
 
-	/*
-	 * @see IInformationControl#isFocusControl()
-	 */
+	@Override
 	public boolean isFocusControl() {
 		return fShell.getDisplay().getActiveShell() == fShell;
 	}
 
-	/*
-	 * @see IInformationControl#setFocus()
-	 */
+	@Override
 	public void setFocus() {
 		fShell.forceFocus();
 		fText.setFocus();
 	}
 
-	/*
-	 * @see IInformationControl#addFocusListener(FocusListener)
-	 */
+	@Override
 	public void addFocusListener(FocusListener listener) {
 		fText.addFocusListener(listener);
 	}
 
-	/*
-	 * @see IInformationControl#removeFocusListener(FocusListener)
-	 */
+	@Override
 	public void removeFocusListener(FocusListener listener) {
 		fText.removeFocusListener(listener);
 	}
 
-	/*
-	 * @see IInformationControlExtension#hasContents()
-	 */
+	@Override
 	public boolean hasContents() {
 		return fText.getCharCount() > 0;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlExtension3#computeTrim()
-	 * @since 3.4
-	 */
+	@Override
 	public Rectangle computeTrim() {
 		Rectangle trim= fShell.computeTrim(0, 0, 0, 0);
 		addInternalTrim(trim);
@@ -398,46 +363,32 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlExtension3#getBounds()
-	 * @since 3.4
-	 */
+	@Override
 	public Rectangle getBounds() {
 		return fShell.getBounds();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlExtension3#restoresLocation()
-	 * @since 3.4
-	 */
+	@Override
 	public boolean restoresLocation() {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlExtension3#restoresSize()
-	 * @since 3.4
-	 */
+	@Override
 	public boolean restoresSize() {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlExtension5#getInformationPresenterControlCreator()
-	 * @since 3.4
-	 */
+	@Override
 	public IInformationControlCreator getInformationPresenterControlCreator() {
 		return new IInformationControlCreator() {
+			@Override
 			public IInformationControl createInformationControl(Shell parent) {
 				return new SourceViewerInformationControl(parent, true, fSymbolicFontName, null);
 			}
 		};
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlExtension5#containsControl(org.eclipse.swt.widgets.Control)
-	 * @since 3.4
-	 */
+	@Override
 	public boolean containsControl(Control control) {
 		do {
 			if (control == fShell)
@@ -449,17 +400,12 @@ class SourceViewerInformationControl implements IInformationControl, IInformatio
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlExtension5#isVisible()
-	 * @since 3.4
-	 */
+	@Override
 	public boolean isVisible() {
 		return fShell != null && !fShell.isDisposed() && fShell.isVisible();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlExtension5#computeSizeConstraints(int, int)
-	 */
+	@Override
 	public Point computeSizeConstraints(int widthInChars, int heightInChars) {
 		GC gc= new GC(fText);
 		gc.setFont(fTextFont);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/AbstractControlContentAssistSubjectAdapter.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/AbstractControlContentAssistSubjectAdapter.java
index 311e36b6f4f..57b16ebe092 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/AbstractControlContentAssistSubjectAdapter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/AbstractControlContentAssistSubjectAdapter.java
@@ -50,6 +50,7 @@ import org.eclipse.jface.text.IEventConsumer;
  * @since 3.0
  * @deprecated As of 3.2, replaced by Platform UI's field assist support
  */
+@Deprecated
 public abstract class AbstractControlContentAssistSubjectAdapter implements IContentAssistSubjectControl {
 
 	protected static final boolean DEBUG= "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.jface.text/debug/ContentAssistSubjectAdapters"));  //$NON-NLS-1$//$NON-NLS-2$
@@ -91,14 +92,10 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon
 		fKeyListeners= new HashSet(1);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getControl()
-	 */
+	@Override
 	public abstract Control getControl();
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#addKeyListener(org.eclipse.swt.events.KeyListener)
-	 */
+	@Override
 	public void addKeyListener(KeyListener keyListener) {
 		fKeyListeners.add(keyListener);
 
@@ -108,9 +105,7 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon
 		installControlListener();
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#removeKeyListener(org.eclipse.swt.events.KeyListener)
-	 */
+	@Override
 	public void removeKeyListener(KeyListener keyListener) {
 		boolean deleted= fKeyListeners.remove(keyListener);
 
@@ -123,16 +118,12 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon
 		uninstallControlListener();
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#supportsVerifyKeyListener()
-	 */
+	@Override
 	public boolean supportsVerifyKeyListener() {
 		return true;
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#appendVerifyKeyListener(org.eclipse.swt.custom.VerifyKeyListener)
-	 */
+	@Override
 	public boolean appendVerifyKeyListener(final VerifyKeyListener verifyKeyListener) {
 		fVerifyKeyListeners.add(verifyKeyListener);
 
@@ -143,9 +134,7 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon
 		return true;
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#prependVerifyKeyListener(org.eclipse.swt.custom.VerifyKeyListener)
-	 */
+	@Override
 	public boolean prependVerifyKeyListener(final VerifyKeyListener verifyKeyListener) {
 		fVerifyKeyListeners.add(0, verifyKeyListener);
 
@@ -156,9 +145,7 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon
 		return true;
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#removeVerifyKeyListener(org.eclipse.swt.custom.VerifyKeyListener)
-	 */
+	@Override
 	public void removeVerifyKeyListener(VerifyKeyListener verifyKeyListener) {
 		fVerifyKeyListeners.remove(verifyKeyListener);
 
@@ -168,18 +155,14 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon
 		uninstallControlListener();
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#setEventConsumer(org.eclipse.jface.text.IEventConsumer)
-	 */
+	@Override
 	public void setEventConsumer(IEventConsumer eventConsumer) {
 		// this is not supported
 		if (DEBUG)
 			System.out.println("AbstractControlContentAssistSubjectAdapter#setEventConsumer()"); //$NON-NLS-1$
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getLineDelimiter()
-	 */
+	@Override
 	public String getLineDelimiter() {
 		return System.getProperty("line.separator"); //$NON-NLS-1$
 	}
@@ -196,6 +179,7 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon
 			return;
 
 		fControlListener= new Listener() {
+			@Override
 			public void handleEvent(Event e) {
 				if (! getControl().isFocusControl())
 					return; //SWT.TRAVERSE_MNEMONIC events can also come in to inactive widgets
@@ -345,6 +329,7 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon
 			if (fControlDecoration == null) {
 				fControlDecoration= new ControlDecoration(getControl(), (SWT.TOP | SWT.LEFT));
 				getControl().addDisposeListener(new DisposeListener() {
+					@Override
 					public void widgetDisposed(DisposeEvent e) {
 						if (fCueLabelProvider != null) {
 							fCueLabelProvider.dispose();
@@ -365,6 +350,7 @@ public abstract class AbstractControlContentAssistSubjectAdapter implements ICon
 			}
 
 			ILabelProviderListener listener= new ILabelProviderListener() {
+				@Override
 				public void labelProviderChanged(LabelProviderChangedEvent event) {
 					fControlDecoration.setDescriptionText(labelProvider.getText(getControl()));
 					Image image= labelProvider.getImage(getControl());
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java
index 508999e61ba..c4b719507cd 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ComboContentAssistSubjectAdapter.java
@@ -49,6 +49,7 @@ import org.eclipse.jface.text.IDocument;
  * @since 3.0
  * @deprecated As of 3.2, replaced by Platform UI's field assist support
  */
+@Deprecated
 public class ComboContentAssistSubjectAdapter extends AbstractControlContentAssistSubjectAdapter {
 
 	/**
@@ -63,9 +64,7 @@ public class ComboContentAssistSubjectAdapter extends AbstractControlContentAssi
 		private InternalDocument() {
 			super(fCombo.getText());
 			fModifyListener= new ModifyListener() {
-				/*
-				 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-				 */
+				@Override
 				public void modifyText(ModifyEvent e) {
 					set(fCombo.getText());
 				}
@@ -73,9 +72,7 @@ public class ComboContentAssistSubjectAdapter extends AbstractControlContentAssi
 			fCombo.addModifyListener(fModifyListener);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.AbstractDocument#replace(int, int, java.lang.String)
-		 */
+		@Override
 		public void replace(int pos, int length, String text) throws BadLocationException {
 			super.replace(pos, length, text);
 			fCombo.removeModifyListener(fModifyListener);
@@ -101,30 +98,22 @@ public class ComboContentAssistSubjectAdapter extends AbstractControlContentAssi
 		fModifyListeners= new HashMap();
 	 }
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getControl()
-	 */
+	@Override
 	public Control getControl() {
 		return fCombo;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getLineHeight()
-	 */
+	@Override
 	public int getLineHeight() {
 		return fCombo.getTextHeight();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getCaretOffset()
-	 */
+	@Override
 	public int getCaretOffset() {
 		return fCombo.getCaretPosition();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getLocationAtOffset(int)
-	 */
+	@Override
 	public Point getLocationAtOffset(int offset) {
 		String comboString= fCombo.getText();
 		GC gc = new GC(fCombo);
@@ -139,23 +128,17 @@ public class ComboContentAssistSubjectAdapter extends AbstractControlContentAssi
 		return new Point(x, fCombo.getClientArea().y);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getSelectionRange()
-	 */
+	@Override
 	public Point getWidgetSelectionRange() {
 		return new Point(fCombo.getSelection().x, Math.abs(fCombo.getSelection().y - fCombo.getSelection().x));
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getSelectedRange()
-	 */
+	@Override
 	public Point getSelectedRange() {
 		return new Point(fCombo.getSelection().x, Math.abs(fCombo.getSelection().y - fCombo.getSelection().x));
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getDocument()
-	 */
+	@Override
 	public IDocument getDocument() {
 		IDocument document= (IDocument)fCombo.getData("document"); //$NON-NLS-1$
 		if (document == null) {
@@ -165,30 +148,25 @@ public class ComboContentAssistSubjectAdapter extends AbstractControlContentAssi
 		return document;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#setSelectedRange(int, int)
-	 */
+	@Override
 	public void setSelectedRange(int i, int j) {
 		fCombo.setSelection(new Point(i, i+j));
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#revealRange(int, int)
-	 */
+	@Override
 	public void revealRange(int i, int j) {
 		// XXX: this should be improved
 		fCombo.setSelection(new Point(i, i+j));
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#addSelectionListener(org.eclipse.swt.events.SelectionListener)
-	 */
+	@Override
 	public boolean addSelectionListener(final SelectionListener selectionListener) {
 		fCombo.addSelectionListener(selectionListener);
 		Listener listener= new Listener() {
 			/*
 			 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
 			 */
+			@Override
 			public void handleEvent(Event e) {
 				selectionListener.widgetSelected(new SelectionEvent(e));
 
@@ -199,9 +177,7 @@ public class ComboContentAssistSubjectAdapter extends AbstractControlContentAssi
 		return true;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#removeSelectionListener(org.eclipse.swt.events.SelectionListener)
-	 */
+	@Override
 	public void removeSelectionListener(SelectionListener selectionListener) {
 		fCombo.removeSelectionListener(selectionListener);
 		Object listener= fModifyListeners.get(selectionListener);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistProcessor.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistProcessor.java
index d802990859d..23292ac4843 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistProcessor.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistProcessor.java
@@ -23,6 +23,7 @@ import org.eclipse.jface.text.contentassist.IContextInformation;
  * @since 3.0
  * @deprecated As of 3.2, replaced by Platform UI's field assist support
  */
+@Deprecated
 public interface ISubjectControlContentAssistProcessor extends IContentAssistProcessor {
 
 	/**
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistant.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistant.java
index 0547d62fbf1..29bc616ba52 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistant.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContentAssistant.java
@@ -21,6 +21,7 @@ import org.eclipse.jface.text.contentassist.IContentAssistant;
  * @since 3.0
  * @deprecated As of 3.2, replaced by Platform UI's field assist support
  */
+@Deprecated
 public interface ISubjectControlContentAssistant extends IContentAssistant {
 
 	/**
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationPresenter.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationPresenter.java
index a172b773a49..f609605e3b3 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationPresenter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationPresenter.java
@@ -22,6 +22,7 @@ import org.eclipse.jface.text.contentassist.IContextInformationPresenter;
  * @since 3.0
  * @deprecated As of 3.2, replaced by Platform UI's field assist support
  */
+@Deprecated
 public interface ISubjectControlContextInformationPresenter extends IContextInformationPresenter {
 
 	/**
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationValidator.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationValidator.java
index 0d1e32eb282..63b4886a047 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationValidator.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/ISubjectControlContextInformationValidator.java
@@ -22,6 +22,7 @@ import org.eclipse.jface.text.contentassist.IContextInformationValidator;
  * @since 3.0
  * @deprecated As of 3.2, replaced by Platform UI's field assist support
  */
+@Deprecated
 public interface ISubjectControlContextInformationValidator extends IContextInformationValidator {
 
 	/**
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContentAssistant.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContentAssistant.java
index c8c6d215bb9..798c1414206 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContentAssistant.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContentAssistant.java
@@ -20,11 +20,10 @@ import org.eclipse.core.runtime.Assert;
  * @since 3.0
  * @deprecated As of 3.2, replaced by Platform UI's field assist support *
  */
+@Deprecated
 public class SubjectControlContentAssistant extends org.eclipse.jface.text.contentassist.ContentAssistant implements ISubjectControlContentAssistant {
 
-	/*
-	 * @see ISubjectControlContentAssistant#install(IContentAssistSubjectControl)
-	 */
+	@Override
 	public void install(IContentAssistSubjectControl contentAssistSubjectControl) {
 		Assert.isNotNull(contentAssistSubjectControl);
 		super.install(contentAssistSubjectControl);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContextInformationValidator.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContextInformationValidator.java
index 11280bc4537..42974894cab 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContextInformationValidator.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/SubjectControlContextInformationValidator.java
@@ -25,6 +25,7 @@ import org.eclipse.jface.text.contentassist.IContextInformation;
  * @since 3.0
  * @deprecated As of 3.2, replaced by Platform UI's field assist support
  */
+@Deprecated
 public final class SubjectControlContextInformationValidator implements ISubjectControlContextInformationValidator {
 
 	/** The content assist processor. */
@@ -44,24 +45,18 @@ public final class SubjectControlContextInformationValidator implements ISubject
 		fProcessor= processor;
 	}
 
-	/*
-	 * @see IContextInformationValidator#install(IContextInformation, ITextViewer, int)
-	 */
+	@Override
 	public void install(IContextInformation contextInformation, ITextViewer viewer, int offset) {
 		throw new UnsupportedOperationException();
 	}
 
-	/*
-	 * @see ISubjectControlContextInformationValidator#install(IContextInformation, IContentAssistSubjectControl, int)
-	 */
+	@Override
 	public void install(IContextInformation contextInformation, IContentAssistSubjectControl contentAssistSubjectControl, int offset) {
 		fContextInformation= contextInformation;
 		fContentAssistSubjectControl= contentAssistSubjectControl;
 	}
 
-	/*
-	 * @see IContentAssistTipCloser#isContextInformationValid(int)
-	 */
+	@Override
 	public boolean isContextInformationValid(int offset) {
 		if (fContentAssistSubjectControl != null && fProcessor instanceof ISubjectControlContentAssistProcessor) {
 			IContextInformation[] infos= ((ISubjectControlContentAssistProcessor)fProcessor).computeContextInformation(fContentAssistSubjectControl, offset);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java
index e6252f347ee..8dd2244aaee 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/contentassist/TextContentAssistSubjectAdapter.java
@@ -38,6 +38,7 @@ import org.eclipse.jface.text.IDocument;
  * @since 3.0
  * @deprecated As of 3.2, replaced by Platform UI's field assist support
  */
+@Deprecated
 public class TextContentAssistSubjectAdapter extends AbstractControlContentAssistSubjectAdapter {
 
 	/**
@@ -53,9 +54,7 @@ public class TextContentAssistSubjectAdapter extends AbstractControlContentAssis
 		private InternalDocument() {
 			super(fText.getText());
 			fModifyListener= new ModifyListener() {
-				/*
-				 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-				 */
+				@Override
 				public void modifyText(ModifyEvent e) {
 					set(fText.getText());
 				}
@@ -63,9 +62,7 @@ public class TextContentAssistSubjectAdapter extends AbstractControlContentAssis
 			fText.addModifyListener(fModifyListener);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.AbstractDocument#replace(int, int, java.lang.String)
-		 */
+		@Override
 		public void replace(int pos, int length, String text) throws BadLocationException {
 			super.replace(pos, length, text);
 			fText.removeModifyListener(fModifyListener);
@@ -89,30 +86,22 @@ public class TextContentAssistSubjectAdapter extends AbstractControlContentAssis
 		fText= text;
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getControl()
-	 */
+	@Override
 	public Control getControl() {
 		return fText;
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getLineHeight()
-	 */
+	@Override
 	public int getLineHeight() {
 		return fText.getLineHeight();
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getCaretOffset()
-	 */
+	@Override
 	public int getCaretOffset() {
 		return fText.getCaretPosition();
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getLocationAtOffset(int)
-	 */
+	@Override
 	public Point getLocationAtOffset(int offset) {
 		Point caretLocation= fText.getCaretLocation();
 		/*
@@ -122,23 +111,17 @@ public class TextContentAssistSubjectAdapter extends AbstractControlContentAssis
 		return caretLocation;
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getWidgetSelectionRange()
-	 */
+	@Override
 	public Point getWidgetSelectionRange() {
 		return new Point(fText.getSelection().x, Math.abs(fText.getSelection().y - fText.getSelection().x));
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getSelectedRange()
-	 */
+	@Override
 	public Point getSelectedRange() {
 		return new Point(fText.getSelection().x, Math.abs(fText.getSelection().y - fText.getSelection().x));
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#getDocument()
-	 */
+	@Override
 	public IDocument getDocument() {
 		IDocument document= (IDocument)fText.getData("document"); //$NON-NLS-1$
 		if (document == null) {
@@ -148,30 +131,22 @@ public class TextContentAssistSubjectAdapter extends AbstractControlContentAssis
 		return document;
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#setSelectedRange(int, int)
-	 */
+	@Override
 	public void setSelectedRange(int i, int j) {
 		fText.setSelection(new Point(i, i+j));
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#revealRange(int, int)
-	 */
+	@Override
 	public void revealRange(int i, int j) {
 		// XXX: this should be improved
 		fText.setSelection(new Point(i, i+j));
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#addSelectionListener(org.eclipse.swt.events.SelectionListener)
-	 */
+	@Override
 	public boolean addSelectionListener(final SelectionListener selectionListener) {
 		fText.addSelectionListener(selectionListener);
 		Listener listener= new Listener() {
-			/*
-			 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-			 */
+			@Override
 			public void handleEvent(Event e) {
 				selectionListener.widgetSelected(new SelectionEvent(e));
 
@@ -182,9 +157,7 @@ public class TextContentAssistSubjectAdapter extends AbstractControlContentAssis
 		return true;
 	}
 
-	/*
-	 * @see org.eclipse.jface.contentassist.IContentAssistSubjectControl#removeSelectionListener(org.eclipse.swt.events.SelectionListener)
-	 */
+	@Override
 	public void removeSelectionListener(SelectionListener selectionListener) {
 		fText.removeSelectionListener(selectionListener);
 		Object listener= fModifyListeners.get(selectionListener);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/DelayedInputChangeListener.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/DelayedInputChangeListener.java
index 09092a459b6..bde90bc9b45 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/DelayedInputChangeListener.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/DelayedInputChangeListener.java
@@ -35,9 +35,7 @@ public final class DelayedInputChangeListener implements IInputChangedListener {
 		fInformationControlReplacer= informationControlReplacer;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDelayedInputChangeListener#inputChanged(java.lang.Object)
-	 */
+	@Override
 	public void inputChanged(Object newInput) {
 		fChangeProvider.setDelayedInputChangeListener(null);
 		fInformationControlReplacer.setDelayedInput(newInput);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/InformationControlReplacer.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/InformationControlReplacer.java
index 2284a6581d2..9fdf80e1097 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/InformationControlReplacer.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/InformationControlReplacer.java
@@ -50,6 +50,7 @@ public class InformationControlReplacer extends AbstractInformationControlManage
 	 * Default control creator.
 	 */
 	protected static class DefaultInformationControlCreator extends AbstractReusableInformationControlCreator {
+		@Override
 		public IInformationControl doCreateInformationControl(Shell shell) {
 			return new DefaultInformationControl(shell, true);
 		}
@@ -106,9 +107,7 @@ public class InformationControlReplacer extends AbstractInformationControlManage
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#computeInformation()
-	 */
+	@Override
 	protected void computeInformation() {
 		if (fIsReplacing && fReplacableInformation != null) {
 			setInformation(fReplacableInformation, fReplaceableArea);
@@ -162,9 +161,7 @@ public class InformationControlReplacer extends AbstractInformationControlManage
 		showInformationControl(subjectArea);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#hideInformationControl()
-	 */
+	@Override
 	public void hideInformationControl() {
 		super.hideInformationControl();
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/NonDeletingPositionUpdater.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/NonDeletingPositionUpdater.java
index a93f958117a..0383e6f99e8 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/NonDeletingPositionUpdater.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/NonDeletingPositionUpdater.java
@@ -38,9 +38,7 @@ public final class NonDeletingPositionUpdater implements IPositionUpdater {
 		fCategory= category;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPositionUpdater#update(org.eclipse.jface.text.DocumentEvent)
-	 */
+	@Override
 	public void update(DocumentEvent event) {
 
 		int eventOffset= event.getOffset();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java
index 30a7a0e5ad2..0f34d8f15df 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/SelectionProcessor.java
@@ -161,26 +161,31 @@ public final class SelectionProcessor {
 	private final Implementation NULL_IMPLEMENTATION= new Implementation();
 
 	private final Implementation RANGE_IMPLEMENTATION= new Implementation() {
+		@Override
 		TextEdit replace(ISelection selection, String replacement) {
 			ITextSelection ts= (ITextSelection)selection;
 			return new ReplaceEdit(ts.getOffset(), ts.getLength(), replacement);
 		}
 
+		@Override
 		String getText(ISelection selection) {
 			ITextSelection ts= (ITextSelection)selection;
 			return ts.getText();
 		}
 
+		@Override
 		boolean isEmpty(ISelection selection) {
 			ITextSelection ts= (ITextSelection)selection;
 			return ts.getLength() <= 0;
 		}
 
+		@Override
 		boolean isMultiline(ISelection selection) throws BadLocationException {
 			ITextSelection ts= (ITextSelection)selection;
 			return fDocument.getLineOfOffset(ts.getOffset()) < fDocument.getLineOfOffset(ts.getOffset() + ts.getLength());
 		}
 
+		@Override
 		TextEdit delete(ISelection selection) {
 			ITextSelection ts= (ITextSelection)selection;
 			if (isEmpty(selection))
@@ -188,6 +193,7 @@ public final class SelectionProcessor {
 			return new DeleteEdit(ts.getOffset(), ts.getLength());
 		}
 
+		@Override
 		TextEdit backspace(ISelection selection) throws BadLocationException {
 			ITextSelection ts= (ITextSelection)selection;
 			if (isEmpty(selection))
@@ -195,6 +201,7 @@ public final class SelectionProcessor {
 			return new DeleteEdit(ts.getOffset(), ts.getLength());
 		}
 
+		@Override
 		ISelection makeEmpty(ISelection selection, boolean beginning) {
 			ITextSelection ts= (ITextSelection)selection;
 			return beginning ? 
@@ -202,16 +209,19 @@ public final class SelectionProcessor {
 					: new TextSelection(fDocument, ts.getOffset() + ts.getLength(), 0);
 		}
 
+		@Override
 		IRegion[] getRanges(ISelection selection) {
 			ITextSelection ts= (ITextSelection)selection;
 			return new IRegion[] { new Region(ts.getOffset(), ts.getLength()) };
 		}
 		
+		@Override
 		int getCoveredLines(ISelection selection) throws BadLocationException {
 			ITextSelection ts= (ITextSelection)selection;
 			return ts.getEndLine() - ts.getStartLine() + 1;
 		}
 		
+		@Override
 		ISelection makeReplaceSelection(ISelection selection, String replacement) {
 			ITextSelection ts= (ITextSelection)selection;
 			return new TextSelection(fDocument, ts.getOffset() + replacement.length(), 0);
@@ -284,10 +294,12 @@ public final class SelectionProcessor {
 			}
 		}
 
+		@Override
 		TextEdit replace(ISelection selection, String replacement) throws BadLocationException {
 			return replace(selection, replacement, false);
 		}
 
+		@Override
 		String getText(ISelection selection) throws BadLocationException {
 			IBlockTextSelection cts= (IBlockTextSelection)selection;
 			StringBuffer buf= new StringBuffer(cts.getLength());
@@ -307,6 +319,7 @@ public final class SelectionProcessor {
 			return buf.toString();
 		}
 
+		@Override
 		boolean isEmpty(ISelection selection) throws BadLocationException {
 			IBlockTextSelection cts= (IBlockTextSelection)selection;
 			int startLine= cts.getStartLine();
@@ -318,11 +331,13 @@ public final class SelectionProcessor {
 			return visualEndColumn == visualStartColumn;
 		}
 
+		@Override
 		boolean isMultiline(ISelection selection) {
 			ITextSelection ts= (ITextSelection)selection;
 			return ts.getEndLine() > ts.getStartLine();
 		}
 
+		@Override
 		TextEdit delete(ISelection selection) throws BadLocationException {
 			if (isEmpty(selection)) {
 				IBlockTextSelection cts= (IBlockTextSelection)selection;
@@ -331,6 +346,7 @@ public final class SelectionProcessor {
 			return replace(selection, "", true); //$NON-NLS-1$
 		}
 
+		@Override
 		TextEdit backspace(ISelection selection) throws BadLocationException {
 			IBlockTextSelection cts= (IBlockTextSelection)selection;
 			if (isEmpty(selection) && cts.getStartColumn() > 0) {
@@ -339,6 +355,7 @@ public final class SelectionProcessor {
 			return replace(selection, ""); //$NON-NLS-1$
 		}
 
+		@Override
 		ISelection makeEmpty(ISelection selection, boolean beginning) throws BadLocationException {
 			IBlockTextSelection cts= (IBlockTextSelection)selection;
 			int startLine, startColumn, endLine, endColumn;
@@ -356,6 +373,7 @@ public final class SelectionProcessor {
 			return new BlockTextSelection(fDocument, startLine, startColumn, endLine, endColumn, fTabWidth);
 		}
 		
+		@Override
 		ISelection makeReplaceSelection(ISelection selection, String replacement) throws BadLocationException {
 			IBlockTextSelection bts= (IBlockTextSelection)selection;
 			String[] delimiters= fDocument.getLegalLineDelimiters();
@@ -373,6 +391,7 @@ public final class SelectionProcessor {
 			return new BlockTextSelection(fDocument, startLine, column, endLine, endColumn, fTabWidth);
 		}
 
+		@Override
 		IRegion[] getRanges(ISelection selection) throws BadLocationException {
 			IBlockTextSelection cts= (IBlockTextSelection)selection;
 			final int startLine= cts.getStartLine();
@@ -394,6 +413,7 @@ public final class SelectionProcessor {
 			return ranges;
 		}
 		
+		@Override
 		int getCoveredLines(ISelection selection) throws BadLocationException {
 			ITextSelection ts= (ITextSelection)selection;
 			return ts.getEndLine() - ts.getStartLine() + 1;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/StickyHoverManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/StickyHoverManager.java
index c8b2a9ded0c..921dc012ce2 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/StickyHoverManager.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/StickyHoverManager.java
@@ -84,23 +84,17 @@ public class StickyHoverManager extends InformationControlReplacer implements IW
 		/** The display. */
 		private Display fDisplay;
 
-		/*
-		 * @see IInformationControlCloser#setSubjectControl(Control)
-		 */
+		@Override
 		public void setSubjectControl(Control control) {
 			fSubjectControl= control;
 		}
 
-		/*
-		 * @see IInformationControlCloser#setInformationControl(IInformationControl)
-		 */
+		@Override
 		public void setInformationControl(IInformationControl control) {
 			// NOTE: we use getCurrentInformationControl2() from the outer class
 		}
 
-		/*
-		 * @see IInformationControlCloser#start(Rectangle)
-		 */
+		@Override
 		public void start(Rectangle informationArea) {
 
 			if (fIsActive)
@@ -126,9 +120,7 @@ public class StickyHoverManager extends InformationControlReplacer implements IW
 			}
 		}
 
-		/*
-		 * @see IInformationControlCloser#stop()
-		 */
+		@Override
 		public void stop() {
 
 			if (!fIsActive)
@@ -155,83 +147,62 @@ public class StickyHoverManager extends InformationControlReplacer implements IW
 			fDisplay= null;
 		}
 
-		/*
-		 * @see ControlListener#controlResized(ControlEvent)
-		 */
-		 public void controlResized(ControlEvent e) {
+		 @Override
+		public void controlResized(ControlEvent e) {
 			 hideInformationControl();
 		}
 
-		/*
-		 * @see ControlListener#controlMoved(ControlEvent)
-		 */
-		 public void controlMoved(ControlEvent e) {
+		 @Override
+		public void controlMoved(ControlEvent e) {
 			 hideInformationControl();
 		}
 
-		/*
-		 * @see MouseListener#mouseDown(MouseEvent)
-		 */
-		 public void mouseDown(MouseEvent e) {
+		 @Override
+		public void mouseDown(MouseEvent e) {
 			 hideInformationControl();
 		}
 
-		/*
-		 * @see MouseListener#mouseUp(MouseEvent)
-		 */
+		@Override
 		public void mouseUp(MouseEvent e) {
 		}
 
-		/*
-		 * @see MouseListener#mouseDoubleClick(MouseEvent)
-		 */
+		@Override
 		public void mouseDoubleClick(MouseEvent e) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see IViewportListenerListener#viewportChanged(int)
-		 */
+		@Override
 		public void viewportChanged(int topIndex) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see KeyListener#keyPressed(KeyEvent)
-		 */
+		@Override
 		public void keyPressed(KeyEvent e) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see KeyListener#keyReleased(KeyEvent)
-		 */
+		@Override
 		public void keyReleased(KeyEvent e) {
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent)
-		 */
+		@Override
 		public void focusGained(FocusEvent e) {
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent)
-		 */
+		@Override
 		public void focusLost(FocusEvent e) {
 			if (DEBUG) System.out.println("StickyHoverManager.Closer.focusLost(): " + e); //$NON-NLS-1$
 			Display d= fSubjectControl.getDisplay();
 			d.asyncExec(new Runnable() {
 				// Without the asyncExec, mouse clicks to the workbench window are swallowed.
+				@Override
 				public void run() {
 					hideInformationControl();
 				}
 			});
 		}
 
-		/*
-		 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-		 */
+		@Override
 		public void handleEvent(Event event) {
 			if (event.type == SWT.MouseMove) {
 				if (!(event.widget instanceof Control) || event.widget.isDisposed())
@@ -287,9 +258,7 @@ public class StickyHoverManager extends InformationControlReplacer implements IW
 		install(fTextViewer.getTextWidget());
 	}
 
-	/*
-	 * @see AbstractInformationControlManager#showInformationControl(Rectangle)
-	 */
+	@Override
 	protected void showInformationControl(Rectangle subjectArea) {
 		if (fTextViewer != null && fTextViewer.requestWidgetToken(this, WIDGET_PRIORITY))
 			super.showInformationControl(subjectArea);
@@ -298,9 +267,7 @@ public class StickyHoverManager extends InformationControlReplacer implements IW
 				System.out.println("cancelled StickyHoverManager.showInformationControl(..): did not get widget token (with prio)"); //$NON-NLS-1$
 	}
 
-	/*
-	 * @see AbstractInformationControlManager#hideInformationControl()
-	 */
+	@Override
 	public void hideInformationControl() {
 		try {
 			super.hideInformationControl();
@@ -310,9 +277,7 @@ public class StickyHoverManager extends InformationControlReplacer implements IW
 		}
 	}
 
-	/*
-	 * @see AbstractInformationControlManager#handleInformationControlDisposed()
-	 */
+	@Override
 	protected void handleInformationControlDisposed() {
 		try {
 			super.handleInformationControlDisposed();
@@ -322,9 +287,7 @@ public class StickyHoverManager extends InformationControlReplacer implements IW
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenKeeper#requestWidgetToken(IWidgetTokenOwner)
-	 */
+	@Override
 	public boolean requestWidgetToken(IWidgetTokenOwner owner) {
 		hideInformationControl();
 		if (DEBUG)
@@ -332,9 +295,7 @@ public class StickyHoverManager extends InformationControlReplacer implements IW
 		return true;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner, int)
-	 */
+	@Override
 	public boolean requestWidgetToken(IWidgetTokenOwner owner, int priority) {
 		if (getCurrentInformationControl2() != null) {
 			if (getCurrentInformationControl2().isFocusControl()) {
@@ -357,9 +318,7 @@ public class StickyHoverManager extends InformationControlReplacer implements IW
 		return true;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#setFocus(org.eclipse.jface.text.IWidgetTokenOwner)
-	 */
+	@Override
 	public boolean setFocus(IWidgetTokenOwner owner) {
 		IInformationControl iControl= getCurrentInformationControl2();
 		if (iControl instanceof IInformationControlExtension5) {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/TableOwnerDrawSupport.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/TableOwnerDrawSupport.java
index 114fff28f80..f8551c18942 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/TableOwnerDrawSupport.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/TableOwnerDrawSupport.java
@@ -70,9 +70,7 @@ public class TableOwnerDrawSupport implements Listener {
 		fLayout.setOrientation(orientation);
 	}
 
-	/*
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 */
+	@Override
 	public void handleEvent(Event event) {
 		switch (event.type) {
 			case SWT.MeasureItem:
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControl.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControl.java
index ad33c9e07a6..67f9b3d74cb 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControl.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControl.java
@@ -211,9 +211,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem
 		create();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControl#createContent(org.eclipse.swt.widgets.Composite)
-	 */
+	@Override
 	protected void createContent(Composite parent) {
 		fBrowser= new Browser(parent, SWT.NONE);
 		fBrowser.setJavascriptEnabled(false);
@@ -223,12 +221,14 @@ public class BrowserInformationControl extends AbstractInformationControl implem
 		fBrowser.setBackground(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
 
 		fBrowser.addProgressListener(new ProgressAdapter() {
+			@Override
 			public void completed(ProgressEvent event) {
 				fCompleted= true;
 			}
 		});
 
 		fBrowser.addOpenWindowListener(new OpenWindowListener() {
+			@Override
 			public void open(WindowEvent event) {
 				event.required= true; // Cancel opening of new windows
 			}
@@ -244,16 +244,21 @@ public class BrowserInformationControl extends AbstractInformationControl implem
 	 * {@inheritDoc}
 	 * @deprecated use {@link #setInput(Object)}
 	 */
+	@Deprecated
+	@Override
 	public void setInformation(final String content) {
 		setInput(new BrowserInformationControlInput(null) {
+			@Override
 			public String getHtml() {
 				return content;
 			}
 
+			@Override
 			public String getInputName() {
 				return ""; //$NON-NLS-1$
 			}
 
+			@Override
 			public Object getInputElement() {
 				return content;
 			}
@@ -264,6 +269,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem
 	 * {@inheritDoc} This control can handle {@link String} and
 	 * {@link BrowserInformationControlInput}.
 	 */
+	@Override
 	public void setInput(Object input) {
 		Assert.isLegal(input == null || input instanceof String || input instanceof BrowserInformationControlInput);
 
@@ -318,9 +324,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem
 			((IInputChangedListener)listeners[i]).inputChanged(fInput);
 	}
 
-	/*
-	 * @see IInformationControl#setVisible(boolean)
-	 */
+	@Override
 	public void setVisible(boolean visible) {
 		Shell shell= getShell();
 		if (shell.isVisible() == visible)
@@ -341,6 +345,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem
 
 		// Make sure the display wakes from sleep after timeout:
 		display.timerExec(100, new Runnable() {
+			@Override
 			public void run() {
 				fCompleted= true;
 			}
@@ -367,9 +372,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem
 		super.setVisible(true);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControl#setSize(int, int)
-	 */
+	@Override
 	public void setSize(int width, int height) {
 		fBrowser.setRedraw(false); // avoid flickering
 		try {
@@ -403,10 +406,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem
 		fTextLayout.setText(""); //$NON-NLS-1$
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControl#handleDispose()
-	 * @since 3.6
-	 */
+	@Override
 	protected void handleDispose() {
 		if (fTextLayout != null) {
 			fTextLayout.dispose();
@@ -417,9 +417,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem
 		super.handleDispose();
 	}
 
-	/*
-	 * @see IInformationControl#computeSizeHint()
-	 */
+	@Override
 	public Point computeSizeHint() {
 		Point sizeConstraints= getSizeConstraints();
 		Rectangle trim= computeTrim();
@@ -482,9 +480,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem
 		return new Point(width, height);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlExtension3#computeTrim()
-	 */
+	@Override
 	public Rectangle computeTrim() {
 		Rectangle trim= super.computeTrim();
 		if (isResizable()) {
@@ -509,25 +505,19 @@ public class BrowserInformationControl extends AbstractInformationControl implem
 		fBrowser.addLocationListener(listener);
 	}
 
-	/*
-	 * @see IInformationControl#setForegroundColor(Color)
-	 */
+	@Override
 	public void setForegroundColor(Color foreground) {
 		super.setForegroundColor(foreground);
 		fBrowser.setForeground(foreground);
 	}
 
-	/*
-	 * @see IInformationControl#setBackgroundColor(Color)
-	 */
+	@Override
 	public void setBackgroundColor(Color background) {
 		super.setBackgroundColor(background);
 		fBrowser.setBackground(background);
 	}
 
-	/*
-	 * @see IInformationControlExtension#hasContents()
-	 */
+	@Override
 	public boolean hasContents() {
 		return fBrowserHasContent;
 	}
@@ -555,10 +545,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem
 		fInputChangeListeners.remove(inputChangeListener);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDelayedInputChangeProvider#setDelayedInputChangeListener(org.eclipse.jface.text.IInputChangedListener)
-	 * @since 3.4
-	 */
+	@Override
 	public void setDelayedInputChangeListener(IInputChangedListener inputChangeListener) {
 		fDelayedInputChangeListener= inputChangeListener;
 	}
@@ -585,10 +572,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem
 			fDelayedInputChangeListener.inputChanged(newInput);
 	}
 
-	/*
-	 * @see java.lang.Object#toString()
-	 * @since 3.4
-	 */
+	@Override
 	public String toString() {
 		String style= (getShell().getStyle() & SWT.RESIZE) == 0 ? "fixed" : "resizeable"; //$NON-NLS-1$ //$NON-NLS-2$
 		return super.toString() + " -  style: " + style; //$NON-NLS-1$
@@ -601,9 +585,7 @@ public class BrowserInformationControl extends AbstractInformationControl implem
 		return fInput;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlExtension5#computeSizeConstraints(int, int)
-	 */
+	@Override
 	public Point computeSizeConstraints(int widthInChars, int heightInChars) {
 		if (fSymbolicFontName == null)
 			return null;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControlInput.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControlInput.java
index 25da7836c42..9f505f28da8 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControlInput.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/BrowserInformationControlInput.java
@@ -51,6 +51,7 @@ public abstract class BrowserInformationControlInput extends BrowserInput {
 	 *
 	 * @return {@link #getHtml()}
 	 */
+	@Override
 	public String toString() {
 		return getHtml();
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java
index a4f4ec15cce..290a684de35 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTML2TextReader.java
@@ -90,6 +90,7 @@ public class HTML2TextReader extends SubstitutionTextReader {
 		fTextPresentation= presentation;
 	}
 
+	@Override
 	public int read() throws IOException {
 		int c= super.read();
 		if (c != -1)
@@ -174,9 +175,7 @@ public class HTML2TextReader extends SubstitutionTextReader {
 	}
 
 
-	/*
-	 * @see org.eclipse.jdt.internal.ui.text.SubstitutionTextReader#computeSubstitution(int)
-	 */
+	@Override
 	protected String computeSubstitution(int c) throws IOException {
 
 		if (c == '<')
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLPrinter.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLPrinter.java
index a7fd2068089..04e4903c8aa 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLPrinter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLPrinter.java
@@ -47,9 +47,7 @@ public class HTMLPrinter {
 		if (display != null && !display.isDisposed()) {
 			try {
 				display.asyncExec(new Runnable() {
-					/*
-					 * @see java.lang.Runnable#run()
-					 */
+					@Override
 					public void run() {
 						cacheColors(display);
 						installColorUpdater(display);
@@ -73,6 +71,7 @@ public class HTMLPrinter {
 	
 	private static void installColorUpdater(final Display display) {
 		display.addListener(SWT.Settings, new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				cacheColors(display);
 			}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLTextPresenter.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLTextPresenter.java
index cff9634b1ff..341452782dd 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLTextPresenter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/HTMLTextPresenter.java
@@ -104,14 +104,13 @@ public class HTMLTextPresenter implements DefaultInformationControl.IInformation
 	 * @deprecated Use {@link #updatePresentation(Drawable, String, TextPresentation, int, int)}
 	 *             instead
 	 */
+	@Deprecated
+	@Override
 	public String updatePresentation(Display display, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight) {
 		return updatePresentation((Drawable)display, hoverInfo, presentation, maxWidth, maxHeight);
 	}
 
-	/*
-	 * @see IHoverInformationPresenterExtension#updatePresentation(Drawable drawable, String, TextPresentation, int, int)
-	 * @since 3.2
-	 */
+	@Override
 	public String updatePresentation(Drawable drawable, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight) {
 
 		if (hoverInfo == null)
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SingleCharReader.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SingleCharReader.java
index 362daecf9fa..924c3554964 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SingleCharReader.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SingleCharReader.java
@@ -23,11 +23,13 @@ public abstract class SingleCharReader extends Reader {
 	/**
 	 * @see Reader#read()
 	 */
+	@Override
 	public abstract int read() throws IOException;
 
 	/**
 	 * @see Reader#read(char[],int,int)
 	 */
+	@Override
 	public int read(char cbuf[], int off, int len) throws IOException {
 		int end= off + len;
 		for (int i= off; i < end; i++) {
@@ -45,7 +47,8 @@ public abstract class SingleCharReader extends Reader {
 	/**
 	 * @see Reader#ready()
 	 */
-    public boolean ready() throws IOException {
+    @Override
+	public boolean ready() throws IOException {
 		return true;
 	}
 
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java
index 36a2bc6f0e1..5a18b6ba255 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/html/SubstitutionTextReader.java
@@ -105,6 +105,7 @@ public abstract class SubstitutionTextReader extends SingleCharReader {
 	/**
 	 * @see Reader#read()
 	 */
+	@Override
 	public int read() throws IOException {
 		int c;
 		do {
@@ -127,13 +128,15 @@ public abstract class SubstitutionTextReader extends SingleCharReader {
 	/**
 	 * @see Reader#ready()
 	 */
-    public boolean ready() throws IOException {
+    @Override
+	public boolean ready() throws IOException {
 		return fReader.ready();
 	}
 
 	/**
 	 * @see Reader#close()
 	 */
+	@Override
 	public void close() throws IOException {
 		fReader.close();
 	}
@@ -141,6 +144,7 @@ public abstract class SubstitutionTextReader extends SingleCharReader {
 	/**
 	 * @see Reader#reset()
 	 */
+	@Override
 	public void reset() throws IOException {
 		fReader.reset();
 		fWasWhiteSpace= true;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/AdditionalInfoController2.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/AdditionalInfoController2.java
index af454c1c626..48bb8b5720d 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/AdditionalInfoController2.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/AdditionalInfoController2.java
@@ -42,16 +42,12 @@ class AdditionalInfoController2 extends AbstractInformationControlManager implem
 	 */
 	private class TableSelectionListener implements SelectionListener {
 
-		/*
-		 * @see SelectionListener#widgetSelected(SelectionEvent)
-		 */
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			handleTableSelectionChanged();
 		}
 
-		/*
-		 * @see SelectionListener#widgetDefaultSelected(SelectionEvent)
-		 */
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
 		}
 	}
@@ -88,9 +84,7 @@ class AdditionalInfoController2 extends AbstractInformationControlManager implem
 		setFallbackAnchors(new Anchor[] {ANCHOR_RIGHT, ANCHOR_LEFT, ANCHOR_BOTTOM });
 	}
 
-	/*
-	 * @see AbstractInformationControlManager#install(Control)
-	 */
+	@Override
 	public void install(Control control) {
 
 		if (fProposalTable == control) {
@@ -120,10 +114,8 @@ class AdditionalInfoController2 extends AbstractInformationControlManager implem
 		}
 	}
 
-	/*
-	 * @see AbstractInformationControlManager#disposeInformationControl()
-	 */
-	 public void disposeInformationControl() {
+	 @Override
+	public void disposeInformationControl() {
 
 	 	synchronized (fThreadAccess) {
 	 		if (fThread != null) {
@@ -140,9 +132,7 @@ class AdditionalInfoController2 extends AbstractInformationControlManager implem
 		super.disposeInformationControl();
 	}
 
-	/*
-	 * @see java.lang.Runnable#run()
-	 */
+	@Override
 	public void run() {
 		try {
 			while (true) {
@@ -170,6 +160,7 @@ class AdditionalInfoController2 extends AbstractInformationControlManager implem
 
 				if (fProposalTable != null && !fProposalTable.isDisposed()) {
 					fProposalTable.getDisplay().asyncExec(new Runnable() {
+						@Override
 						public void run() {
 							if (!fIsReset)
 								showInformation();
@@ -201,9 +192,7 @@ class AdditionalInfoController2 extends AbstractInformationControlManager implem
 		}
 	}
 
-	/*
-	 * @see AbstractInformationControlManager#computeInformation()
-	 */
+	@Override
 	protected void computeInformation() {
 
 		if (fProposalTable == null || fProposalTable.isDisposed())
@@ -239,9 +228,7 @@ class AdditionalInfoController2 extends AbstractInformationControlManager implem
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#computeSizeConstraints(Control, IInformationControl)
-	 */
+	@Override
 	protected Point computeSizeConstraints(Control subjectControl, IInformationControl informationControl) {
 		// at least as big as the proposal table
 		Point sizeConstraint= super.computeSizeConstraints(subjectControl, informationControl);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java
index 712b33e2c77..188df4e69ac 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/CompletionProposalPopup2.java
@@ -114,10 +114,12 @@ class CompletionProposalPopup2 implements IContentAssistListener2 {
 
 	private final IEditingSupport fFocusEditingSupport= new IEditingSupport() {
 
+		@Override
 		public boolean isOriginator(DocumentEvent event, IRegion focus) {
 			return false;
 		}
 
+		@Override
 		public boolean ownsFocusShell() {
 			return Helper2.okToUse(fProposalShell) && fProposalShell.isFocusControl()
 					|| Helper2.okToUse(fProposalTable) && fProposalTable.isFocusControl();
@@ -126,6 +128,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 {
 	};
 	private final IEditingSupport fModificationEditingSupport= new IEditingSupport() {
 
+		@Override
 		public boolean isOriginator(DocumentEvent event, IRegion focus) {
 			if (fViewer != null) {
 				Point selection= fViewer.getSelectedRange();
@@ -134,6 +137,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 {
 			return false;
 		}
 
+		@Override
 		public boolean ownsFocusShell() {
 			return false;
 		}
@@ -166,6 +170,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 {
 
 		if (fKeyListener == null) {
 			fKeyListener= new KeyListener() {
+				@Override
 				public void keyPressed(KeyEvent e) {
 					if (!Helper2.okToUse(fProposalShell))
 						return;
@@ -178,6 +183,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 {
 					}
 				}
 
+				@Override
 				public void keyReleased(KeyEvent e) {
 					if (!Helper2.okToUse(fProposalShell))
 						return;
@@ -294,8 +300,10 @@ class CompletionProposalPopup2 implements IContentAssistListener2 {
 		if (fAdditionalInfoController != null) {
 			fProposalShell.addControlListener(new ControlListener() {
 
+				@Override
 				public void controlMoved(ControlEvent e) {}
 
+				@Override
 				public void controlResized(ControlEvent e) {
 					// resets the cached resize constraints
 					fAdditionalInfoController.setSizeConstraints(50, 10, true, false);
@@ -313,8 +321,10 @@ class CompletionProposalPopup2 implements IContentAssistListener2 {
 
 		fProposalTable.addSelectionListener(new SelectionListener() {
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {}
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 				selectProposalWithMask(e.stateMask);
 			}
@@ -323,6 +333,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 {
 		fPopupCloser.install(fContentAssistant, fProposalTable);
 
 		fProposalShell.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				unregister(); // but don't dispose the shell, since we're being called from its disposal event!
 			}
@@ -660,11 +671,13 @@ class CompletionProposalPopup2 implements IContentAssistListener2 {
 
 			if (fDocumentListener == null)
 				fDocumentListener=  new IDocumentListener()  {
+					@Override
 					public void documentAboutToBeChanged(DocumentEvent event) {
 						if (!fInserting)
 							fDocumentEvents.add(event);
 					}
 
+					@Override
 					public void documentChanged(DocumentEvent event) {
 						if (!fInserting)
 							filterProposals();
@@ -695,9 +708,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 {
 		}
 	}
 
-		/*
-		 * @see IContentAssistListener#verifyKey(VerifyEvent)
-		 */
+		@Override
 		public boolean verifyKey(VerifyEvent e) {
 			if (!Helper2.okToUse(fProposalShell))
 				return true;
@@ -842,9 +853,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 {
 		return false;
 	}
 
-	/*
-	 * @see IEventConsumer#processEvent(VerifyEvent)
-	 */
+	@Override
 	public void processEvent(VerifyEvent e) {
 	}
 
@@ -856,6 +865,7 @@ class CompletionProposalPopup2 implements IContentAssistListener2 {
 		Control control= fViewer.getTextWidget();
 		control.getDisplay().asyncExec(new Runnable() {
 			long fCounter= fInvocationCounter;
+			@Override
 			public void run() {
 
 				if (fCounter != fInvocationCounter)
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java
index 823674e267b..e9df55d5d16 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContentAssistant2.java
@@ -134,49 +134,35 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 			fViewer.removeViewportListener(this);
 		}
 
-		/*
-		 * @see ControlListener#controlResized(ControlEvent)
-		 */
+		@Override
 		public void controlResized(ControlEvent e) {
 			hide();
 		}
 
-		/*
-		 * @see ControlListener#controlMoved(ControlEvent)
-		 */
+		@Override
 		public void controlMoved(ControlEvent e) {
 			hide();
 		}
 
-		/*
-		 * @see MouseListener#mouseDown(MouseEvent)
-		 */
+		@Override
 		public void mouseDown(MouseEvent e) {
 			hide();
 		}
 
-		/*
-		 * @see MouseListener#mouseUp(MouseEvent)
-		 */
+		@Override
 		public void mouseUp(MouseEvent e) {
 		}
 
-		/*
-		 * @see MouseListener#mouseDoubleClick(MouseEvent)
-		 */
+		@Override
 		public void mouseDoubleClick(MouseEvent e) {
 			hide();
 		}
 
-		/*
-		 * @see FocusListener#focusGained(FocusEvent)
-		 */
+		@Override
 		public void focusGained(FocusEvent e) {
 		}
 
-		/*
-		 * @see FocusListener#focusLost(FocusEvent)
-		 */
+		@Override
 		public void focusLost(FocusEvent e) {
 			if (fViewer != null) {
 				Control control= fViewer.getTextWidget();
@@ -184,6 +170,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 					Display d= control.getDisplay();
 					if (d != null) {
 						d.asyncExec(new Runnable() {
+							@Override
 							public void run() {
 								if (!hasFocus())
 									hide();
@@ -197,6 +184,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 		/*
 		 * @seeDisposeListener#widgetDisposed(DisposeEvent)
 		 */
+		@Override
 		public void widgetDisposed(DisposeEvent e) {
 			/*
 			 * 1GGYYWK: ITPJUI:ALL - Dismissing editor with code assist up causes lots of Internal Errors
@@ -204,9 +192,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 			hide();
 		}
 
-		/*
-		 * @see IViewportListener#viewportChanged(int)
-		 */
+		@Override
 		public void viewportChanged(int topIndex) {
 			if (System.currentTimeMillis() > fViewportListenerStartTime)
 				hide();
@@ -241,6 +227,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 			fThread.start();
 		}
 
+		@Override
 		public void run() {
 			try {
 				while (true) {
@@ -284,6 +271,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 			return false;
 		}
 
+		@Override
 		public void verifyKey(VerifyEvent e) {
 			// Only act on typed characters and ignore modifier-only events
 			if (e.character == 0 && (e.keyCode & SWT.KEYCODE_BIT) == 0)
@@ -321,6 +309,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 			if (d != null) {
 				try {
 					d.syncExec(new Runnable() {
+						@Override
 						public void run() {
 							if (showStyle == SHOW_PROPOSALS)
 								fProposalPopup.showProposals(true);
@@ -378,6 +367,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 				type == LAYOUT_CONTEXT_SELECTOR || type == LAYOUT_CONTEXT_INFO_POPUP);
 		}
 
+		@Override
 		public void handleEvent(Event event) {
 			Widget source= event.widget;
 			source.removeListener(SWT.Dispose, this);
@@ -624,6 +614,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 		 * @param e the verify event
 		 * @see VerifyKeyListener#verifyKey(org.eclipse.swt.events.VerifyEvent)
 		 */
+		@Override
 		public void verifyKey(VerifyEvent e) {
 			IContentAssistListener2[] listeners= (IContentAssistListener2[]) fListeners.clone();
 			for (int i= 0; i < listeners.length; i++) {
@@ -637,6 +628,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 		/*
 		 * @see IEventConsumer#processEvent
 		 */
+		@Override
 		public void processEvent(VerifyEvent event) {
 
 			installKeyListener();
@@ -737,6 +729,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 	 */
 	private IInformationControlCreator getInformationControlCreator() {
 		return new IInformationControlCreator() {
+			@Override
 			public IInformationControl createInformationControl(Shell parent) {
 				return new DefaultInformationControl(parent, false);
 			}
@@ -753,10 +746,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 		fPartitioning= partitioning;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension#getDocumentPartitioning()
-	 * @since 3.0
-	 */
+	@Override
 	public String getDocumentPartitioning() {
 		return fPartitioning;
 	}
@@ -785,6 +775,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 	/*
 	 * @see IContentAssistant#getContentAssistProcessor
 	 */
+	@Override
 	public IContentAssistProcessor getContentAssistProcessor(String contentType) {
 		if (fProcessors == null)
 			return null;
@@ -1007,6 +998,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 	/*
 	 * @see IContentAssist#install
 	 */
+	@Override
 	public void install(ITextViewer textViewer) {
 		Assert.isNotNull(textViewer);
 
@@ -1028,6 +1020,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 	/*
 	 * @see IContentAssist#uninstall
 	 */
+	@Override
 	public void uninstall() {
 
 		if (fProposalPopup != null)
@@ -1261,6 +1254,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 	/*
 	 * @see IContentAssist#showPossibleCompletions
 	 */
+	@Override
 	public String showPossibleCompletions() {
 		return fProposalPopup.showProposals(false);
 	}
@@ -1293,6 +1287,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 	/*
 	 * @see IContentAssist#showContextInformation
 	 */
+	@Override
 	public String showContextInformation() {
 		return fContextInfoPopup.showContextProposals(false);
 	}
@@ -1456,10 +1451,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 		return p != null ? p.getContextInformationAutoActivationCharacters() : null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenKeeper#requestWidgetToken(IWidgetTokenOwner)
-	 * @since 2.0
-	 */
+	@Override
 	public boolean requestWidgetToken(IWidgetTokenOwner owner) {
 		hidePossibleCompletions();
 		return true;
@@ -1493,10 +1485,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 		fProposals= proposals;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner, int)
-	 * @since 3.0
-	 */
+	@Override
 	public boolean requestWidgetToken(IWidgetTokenOwner owner, int priority) {
 		if (priority > WIDGET_PRIORITY) {
 			hidePossibleCompletions();
@@ -1505,10 +1494,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#setFocus(org.eclipse.jface.text.IWidgetTokenOwner)
-	 * @since 3.0
-	 */
+	@Override
 	public boolean setFocus(IWidgetTokenOwner owner) {
 		if (fProposalPopup != null) {
 			fProposalPopup.setFocus();
@@ -1527,9 +1513,7 @@ public class ContentAssistant2 implements IContentAssistant, IContentAssistantEx
 				|| (fContextInfoPopup != null && fContextInfoPopup.hasFocus());
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension#completePrefix()
-	 */
+	@Override
 	public String completePrefix() {
 		return null;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java
index 9b4c70da53f..766c134b338 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/ContextInformationPopup2.java
@@ -107,6 +107,7 @@ class ContextInformationPopup2 implements IContentAssistListener2 {
 	public String showContextProposals(final boolean autoActivated) {
 		final StyledText styledText= fViewer.getTextWidget();
 		BusyIndicator.showWhile(styledText.getDisplay(), new Runnable() {
+			@Override
 			public void run() {
 
 				int position= fViewer.getSelectedRange().x;
@@ -145,6 +146,7 @@ class ContextInformationPopup2 implements IContentAssistListener2 {
 	public void showContextInformation(final IContextInformation info, final int position) {
 		Control control= fViewer.getTextWidget();
 		BusyIndicator.showWhile(control.getDisplay(), new Runnable() {
+			@Override
 			public void run() {
 				internalShowContextInfo(info, position);
 				hideContextSelector();
@@ -347,9 +349,11 @@ class ContextInformationPopup2 implements IContentAssistListener2 {
 		fContextSelectorTable.setForeground(c);
 
 		fContextSelectorTable.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 			}
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 				insertSelectedContext();
 				hideContextSelector();
@@ -459,9 +463,7 @@ class ContextInformationPopup2 implements IContentAssistListener2 {
 		return (Helper2.okToUse(fContextInfoPopup) || Helper2.okToUse(fContextSelectorShell));
 	}
 
-	/*
-	 * @see IContentAssistListener#verifyKey(VerifyEvent)
-	 */
+	@Override
 	public boolean verifyKey(VerifyEvent e) {
 		if (Helper2.okToUse(fContextSelectorShell))
 			return contextSelectorKeyPressed(e);
@@ -572,9 +574,7 @@ class ContextInformationPopup2 implements IContentAssistListener2 {
 		return true;
 	}
 
-	/*
-	 * @see IEventConsumer#processEvent(VerifyEvent)
-	 */
+	@Override
 	public void processEvent(VerifyEvent event) {
 		if (Helper2.okToUse(fContextSelectorShell))
 			contextSelectorProcessEvent(event);
@@ -621,6 +621,7 @@ class ContextInformationPopup2 implements IContentAssistListener2 {
 
 			private ContextFrame fFrame= (ContextFrame) fContextFrameStack.peek();
 
+			@Override
 			public void run() {
 				if (Helper2.okToUse(fContextInfoPopup) && fFrame == fContextFrameStack.peek()) {
 					int offset= fViewer.getSelectedRange().x;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/PopupCloser2.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/PopupCloser2.java
index 28f058f3d65..a8cb2bfb54f 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/PopupCloser2.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/link/contentassist/PopupCloser2.java
@@ -79,33 +79,26 @@ class PopupCloser2 extends ShellAdapter implements FocusListener, SelectionListe
 			fTable.removeFocusListener(this);
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
+	@Override
 	public void widgetSelected(SelectionEvent e) {
 		fScrollbarClicked= true;
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
+	@Override
 	public void widgetDefaultSelected(SelectionEvent e) {
 		fScrollbarClicked= true;
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent)
-	 */
+	@Override
 	public void focusGained(FocusEvent e) {
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent)
-	 */
+	@Override
 	public void focusLost(final FocusEvent e) {
 		fScrollbarClicked= false;
 		Display d= fTable.getDisplay();
 		d.asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				if (Helper2.okToUse(fTable) && !fTable.isFocusControl() && !fScrollbarClicked && fContentAssistant != null)
 					fContentAssistant.popupFocusLost(e);
@@ -113,20 +106,14 @@ class PopupCloser2 extends ShellAdapter implements FocusListener, SelectionListe
 		});
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.ShellAdapter#shellDeactivated(org.eclipse.swt.events.ShellEvent)
-	 * @since 3.1
-	 */
+	@Override
 	public void shellDeactivated(ShellEvent e) {
 		if (fContentAssistant != null)
 			fContentAssistant.hide();
 	}
 
 
-	/*
-	 * @see org.eclipse.swt.events.ShellAdapter#shellClosed(org.eclipse.swt.events.ShellEvent)
-	 * @since 3.1
-	 */
+	@Override
 	public void shellClosed(ShellEvent e) {
 		if (fContentAssistant != null)
 			fContentAssistant.hide();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/ChangeRegion.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/ChangeRegion.java
index 86cac108ed0..ac3aeef7648 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/ChangeRegion.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/ChangeRegion.java
@@ -156,9 +156,7 @@ public final class ChangeRegion {
 		return Math.max(0, cutCount);
 	}
 
-	/*
-	 * @see java.lang.Object#toString()
-	 */
+	@Override
 	public String toString() {
 		return "ChangeRegion [" + fRevision.toString() + ", [" + fLines.getStartLine() + "+" + fLines.getNumberOfLines() + ")]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Hunk.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Hunk.java
index 8e1292f4f0a..467cdb34b97 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Hunk.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Hunk.java
@@ -48,16 +48,12 @@ public final class Hunk {
 		this.changed= changed;
 	}
 
-	/*
-	 * @see java.lang.Object#toString()
-	 */
+	@Override
 	public String toString() {
 		return "Hunk [" + line + ">" + changed + (delta < 0 ? "-" : "+") + Math.abs(delta) + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
 	}
 
-	/*
-	 * @see java.lang.Object#hashCode()
-	 */
+	@Override
 	public int hashCode() {
 		final int prime= 31;
 		int result= 1;
@@ -67,9 +63,7 @@ public final class Hunk {
 		return result;
 	}
 
-	/*
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
+	@Override
 	public boolean equals(Object obj) {
 		if (obj == this)
 			return true;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Range.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Range.java
index ade2d13961d..4aa56247cf7 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Range.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/Range.java
@@ -86,16 +86,12 @@ public final class Range implements ILineRange, Cloneable {
 		setLength(length);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.ILineRange#getStartLine()
-	 */
+	@Override
 	public int getStartLine() {
 		return start();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.ILineRange#getNumberOfLines()
-	 */
+	@Override
 	public int getNumberOfLines() {
 		return length();
 	}
@@ -258,9 +254,7 @@ public final class Range implements ILineRange, Cloneable {
 		return range.getStartLine() == start() && range.getNumberOfLines() == length();
 	}
 
-	/*
-	 * @see java.lang.Object#clone()
-	 */
+	@Override
 	public Object clone() {
 		return Range.copy(this);
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java
index ced3ca81b8d..2fbbb36dea9 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionPainter.java
@@ -290,9 +290,7 @@ public final class RevisionPainter {
 			}
 		}
 
-		/*
-		 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-		 */
+		@Override
 		public void handleEvent(Event event) {
 			switch (event.type) {
 				case SWT.MouseVerticalWheel:
@@ -309,29 +307,21 @@ public final class RevisionPainter {
 			}
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseTrackListener#mouseEnter(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseEnter(MouseEvent e) {
 			updateFocusLine(toDocumentLineNumber(e.y));
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseTrackListener#mouseExit(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseExit(MouseEvent e) {
 			updateFocusLine(-1);
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseTrackListener#mouseHover(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseHover(MouseEvent e) {
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseMove(MouseEvent e) {
 			updateFocusLine(toDocumentLineNumber(e.y));
 		}
@@ -341,9 +331,7 @@ public final class RevisionPainter {
 	 * Internal listener class that will update the ruler when the underlying model changes.
 	 */
 	private class AnnotationListener implements IAnnotationModelListener {
-		/*
-		 * @see org.eclipse.jface.text.source.IAnnotationModelListener#modelChanged(org.eclipse.jface.text.source.IAnnotationModel)
-		 */
+		@Override
 		public void modelChanged(IAnnotationModel model) {
 			clearRangeCache();
 			postRedraw();
@@ -361,9 +349,7 @@ public final class RevisionPainter {
 			fIsFocusable= isFocusable;
 		}
 
-		/*
-		 * @see org.eclipse.jface.internal.text.revisions.AbstractReusableInformationControlCreator#doCreateInformationControl(org.eclipse.swt.widgets.Shell)
-		 */
+		@Override
 		protected IInformationControl doCreateInformationControl(Shell parent) {
 			if (BrowserInformationControl.isAvailable(parent)) {
 	            return new BrowserInformationControl(parent, JFaceResources.DIALOG_FONT, fIsFocusable) {
@@ -372,7 +358,9 @@ public final class RevisionPainter {
 					 *
 					 * @deprecated use {@link #setInput(Object)}
 					 */
-	            	public void setInformation(String content) {
+	            	@Deprecated
+					@Override
+					public void setInformation(String content) {
         				content= addCSSToHTMLFragment(content);
 	            		super.setInformation(content);
 	            	}
@@ -402,9 +390,7 @@ public final class RevisionPainter {
 			return new DefaultInformationControl(parent, fIsFocusable);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.AbstractReusableInformationControlCreator#canReplace(org.eclipse.jface.text.IInformationControlCreator)
-		 */
+		@Override
 		public boolean canReplace(IInformationControlCreator creator) {
 			return creator.getClass() == getClass()
 					&& ((HoverInformationControlCreator) creator).fIsFocusable == fIsFocusable;
@@ -448,18 +434,13 @@ public final class RevisionPainter {
 	 */
 	private final class RevisionHover implements IAnnotationHover, IAnnotationHoverExtension, IAnnotationHoverExtension2, IInformationProviderExtension2 {
 
-		/*
-		 * @see org.eclipse.jface.text.source.IAnnotationHover#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer,
-		 *      int)
-		 */
+		@Override
 		public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
 			Object info= getHoverInfo(sourceViewer, getHoverLineRange(sourceViewer, lineNumber), 0);
 			return info == null ? null : info.toString();
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverControlCreator()
-		 */
+		@Override
 		public IInformationControlCreator getHoverControlCreator() {
 			RevisionInformation revisionInfo= fRevisionInfo;
 			if (revisionInfo != null) {
@@ -470,43 +451,31 @@ public final class RevisionPainter {
 			return new HoverInformationControlCreator(false);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#canHandleMouseCursor()
-		 */
+		@Override
 		public boolean canHandleMouseCursor() {
 			return false;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.source.IAnnotationHoverExtension2#canHandleMouseWheel()
-		 */
+		@Override
 		public boolean canHandleMouseWheel() {
 			return true;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer,
-		 *      org.eclipse.jface.text.source.ILineRange, int)
-		 */
+		@Override
 		public Object getHoverInfo(ISourceViewer sourceViewer, ILineRange lineRange, int visibleNumberOfLines) {
 			RevisionRange range= getRange(lineRange.getStartLine());
 			Object info= range == null ? null : range.getRevision().getHoverInfo();
 			return info;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverLineRange(org.eclipse.jface.text.source.ISourceViewer,
-		 *      int)
-		 */
+		@Override
 		public ILineRange getHoverLineRange(ISourceViewer viewer, int lineNumber) {
 			RevisionRange range= getRange(lineNumber);
 			return range == null ? null : new LineRange(lineNumber, 1);
 		}
 
-		/*
-         * @see org.eclipse.jface.text.information.IInformationProviderExtension2#getInformationPresenterControlCreator()
-         */
-        public IInformationControlCreator getInformationPresenterControlCreator() {
+        @Override
+		public IInformationControlCreator getInformationPresenterControlCreator() {
 			RevisionInformation revisionInfo= fRevisionInfo;
 			if (revisionInfo != null) {
 				IInformationControlCreator creator= revisionInfo.getInformationPresenterControlCreator();
@@ -756,9 +725,7 @@ public final class RevisionPainter {
 		fControl.addListener(SWT.MouseUp, fMouseHandler);
 		fControl.addListener(SWT.MouseDown, fMouseHandler);
 		fControl.addDisposeListener(new DisposeListener() {
-			/*
-			 * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)
-			 */
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				handleDispose();
 			}
@@ -1376,6 +1343,7 @@ public final class RevisionPainter {
 			Display d= fControl.getDisplay();
 			if (d != null) {
 				d.asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						redraw();
 					}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionSelectionProvider.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionSelectionProvider.java
index 6469bafb6b2..6108f85117c 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionSelectionProvider.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/RevisionSelectionProvider.java
@@ -51,6 +51,7 @@ public final class RevisionSelectionProvider implements ISelectionProvider {
 			fPostProvider= postProvider;
         }
 
+		@Override
 		public void selectionChanged(SelectionChangedEvent event) {
 	    	ISelection selection= event.getSelection();
 	    	if (selection instanceof ITextSelection) {
@@ -97,33 +98,25 @@ public final class RevisionSelectionProvider implements ISelectionProvider {
 		fPainter= painter;
     }
 
-	/*
-     * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-     */
-    public void addSelectionChangedListener(ISelectionChangedListener listener) {
+    @Override
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
     	fListeners.add(listener);
     }
 
-    /*
-     * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-     */
-    public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+    @Override
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
     	fListeners.remove(listener);
     }
 
-	/*
-     * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
-     */
-    public ISelection getSelection() {
+    @Override
+	public ISelection getSelection() {
     	if (fSelection == null)
     		return StructuredSelection.EMPTY;
 	    return new StructuredSelection(fSelection);
     }
 
-	/*
-     * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
-     */
-    public void setSelection(ISelection selection) {
+    @Override
+	public void setSelection(ISelection selection) {
     	if (fIgnoreEvents)
     		return;
     	if (selection instanceof IStructuredSelection) {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/source/DiffPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/source/DiffPainter.java
index 7ecf3f41e06..6f68e1365f4 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/source/DiffPainter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/source/DiffPainter.java
@@ -50,9 +50,7 @@ public final class DiffPainter {
 	 * Internal listener class that will update the ruler when the underlying model changes.
 	 */
 	private class AnnotationListener implements IAnnotationModelListener {
-		/*
-		 * @see org.eclipse.jface.text.source.IAnnotationModelListener#modelChanged(org.eclipse.jface.text.source.IAnnotationModel)
-		 */
+		@Override
 		public void modelChanged(IAnnotationModel model) {
 			postRedraw();
 		}
@@ -180,9 +178,7 @@ public final class DiffPainter {
 			return;
 
 		fControl.addDisposeListener(new DisposeListener() {
-			/*
-			 * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)
-			 */
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				handleDispose();
 			}
@@ -367,6 +363,7 @@ public final class DiffPainter {
 			Display d= fControl.getDisplay();
 			if (d != null) {
 				d.asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						redraw();
 					}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractHoverInformationControlManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractHoverInformationControlManager.java
index f136335866b..b14e47d120e 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractHoverInformationControlManager.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractHoverInformationControlManager.java
@@ -91,9 +91,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 		public Closer() {
 		}
 
-		/*
-		 * @see IInformationControlCloser#setSubjectControl(Control)
-		 */
+		@Override
 		public void setSubjectControl(Control control) {
 			fSubjectControl= control;
 		}
@@ -101,13 +99,12 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 		/*
 		 * @see IInformationControlCloser#setHoverControl(IHoverControl)
 		 */
+		@Override
 		public void setInformationControl(IInformationControl control) {
 			// NOTE: we use getCurrentInformationControl() from the outer class
 		}
 
-		/*
-		 * @see IInformationControlCloser#start(Rectangle)
-		 */
+		@Override
 		public void start(Rectangle subjectArea) {
 
 			if (fIsActive)
@@ -149,9 +146,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 			}
 		}
 
-		/*
-		 * @see IInformationControlCloser#stop()
-		 */
+		@Override
 		public void stop() {
 			if (!fIsActive)
 				return;
@@ -193,9 +188,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 			fDisplay= null;
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseMove(MouseEvent event) {
 			if (!hasInformationControlReplacer() || !canMoveIntoInformationControl(getCurrentInformationControl())) {
 				if (!fSubjectArea.contains(event.x, event.y)) {
@@ -209,70 +202,49 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 			}
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseUp(MouseEvent event) {
 		}
 
-		/*
-		 * @see MouseListener#mouseDown(MouseEvent)
-		 */
+		@Override
 		public void mouseDown(MouseEvent event) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see MouseListener#mouseDoubleClick(MouseEvent)
-		 */
+		@Override
 		public void mouseDoubleClick(MouseEvent event) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see ControlListener#controlResized(ControlEvent)
-		 */
+		@Override
 		public void controlResized(ControlEvent event) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see ControlListener#controlMoved(ControlEvent)
-		 */
+		@Override
 		public void controlMoved(ControlEvent event) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see KeyListener#keyReleased(KeyEvent)
-		 */
+		@Override
 		public void keyReleased(KeyEvent event) {
 		}
 
-		/*
-		 * @see KeyListener#keyPressed(KeyEvent)
-		 */
+		@Override
 		public void keyPressed(KeyEvent event) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-		 */
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-		 */
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
 		}
 
-		/*
-		 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-		 * @since 3.1
-		 */
+		@Override
 		public void handleEvent(Event event) {
 			switch (event.type) {
 				case SWT.Activate:
@@ -315,6 +287,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 										delayedICP.setDelayedInputChangeListener(inputChangeListener);
 										// cancel automatic input updating after a small timeout:
 										control.getShell().getDisplay().timerExec(1000, new Runnable() {
+											@Override
 											public void run() {
 												delayedICP.setDelayedInputChangeListener(null);
 											}
@@ -323,6 +296,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 
 									// XXX: workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=212392 :
 									control.getShell().getDisplay().asyncExec(new Runnable() {
+										@Override
 										public void run() {
 											replaceInformationControl(true);
 										}
@@ -490,6 +464,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 		 *
 		 * @param event the mouse hover event
 		 */
+		@Override
 		public void mouseHover(MouseEvent event) {
 			if (fIsComputing || fIsInRestartMode ||
 					(fSubjectControl != null && !fSubjectControl.isDisposed() && fSubjectControl.getShell() != fSubjectControl.getShell().getDisplay().getActiveShell())) {
@@ -535,15 +510,11 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 			}
 		}
 
-		/*
-		 * @see MouseTrackListener#mouseEnter(MouseEvent)
-		 */
+		@Override
 		public void mouseEnter(MouseEvent e) {
 		}
 
-		/*
-		 * @see MouseTrackListener#mouseExit(MouseEvent)
-		 */
+		@Override
 		public void mouseExit(MouseEvent e) {
 			if (!hasInformationControlReplacer() || !canMoveIntoInformationControl(getCurrentInformationControl()) || !inKeepUpZone(e.x, e.y, fSubjectControl, fSubjectArea, false)) {
 				fMouseLostWhileComputing= true;
@@ -551,9 +522,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 			}
 		}
 
-		/*
-		 * @see MouseMoveListener#mouseMove(MouseEvent)
-		 */
+		@Override
 		public void mouseMove(MouseEvent event) {
 			if (!hasInformationControlReplacer() || !canMoveIntoInformationControl(getCurrentInformationControl())) {
 				if (!fSubjectArea.contains(event.x, event.y))
@@ -564,17 +533,13 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 			}
 		}
 
-		/*
-		 * @see ShellListener#shellDeactivated(ShellEvent)
-		 */
+		@Override
 		public void shellDeactivated(ShellEvent e) {
 			fShellDeactivatedWhileComputing= true;
 			deactivate();
 		}
 
-		/*
-		 * @see ShellListener#shellIconified(ShellEvent)
-		 */
+		@Override
 		public void shellIconified(ShellEvent e) {
 			fShellDeactivatedWhileComputing= true;
 			deactivate();
@@ -780,9 +745,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 		return fEnrichMode != null && canReplace(iControl);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#hideInformationControl()
-	 */
+	@Override
 	protected void hideInformationControl() {
 		cancelReplacingDelay();
 		super.hideInformationControl();
@@ -801,9 +764,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 		fEnrichMode= mode;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#replaceInformationControl(boolean)
-	 */
+	@Override
 	void replaceInformationControl(boolean takeFocus) {
 		fWaitForMouseUp= false;
 		super.replaceInformationControl(takeFocus);
@@ -858,11 +819,13 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 		}
 
 		fReplacingDelayJob= new Job("AbstractHoverInformationControlManager Replace Delayer") { //$NON-NLS-1$
+			@Override
 			public IStatus run(final IProgressMonitor monitor) {
 		        if (monitor.isCanceled() || display.isDisposed()) {
 					return Status.CANCEL_STATUS;
 				}
 				display.syncExec(new Runnable() {
+					@Override
 					public void run() {
 						fReplacingDelayJob= null;
 						if (monitor.isCanceled())
@@ -881,9 +844,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 		fReplacingDelayJob.schedule(HOVER_AUTO_REPLACING_DELAY);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#presentInformation()
-	 */
+	@Override
 	protected void presentInformation() {
 		if (fMouseTracker == null) {
 			super.presentInformation();
@@ -907,6 +868,8 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 	 * {@inheritDoc}
 	 * @deprecated visibility will be changed to protected
 	 */
+	@Deprecated
+	@Override
 	public void setEnabled(boolean enabled) {
 
 		boolean was= isEnabled();
@@ -924,6 +887,7 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 	/**
 	 * Disposes this manager's information control.
 	 */
+	@Override
 	public void dispose() {
 		if (fMouseTracker != null) {
 			fMouseTracker.stop();
@@ -972,8 +936,10 @@ abstract public class AbstractHoverInformationControlManager extends AbstractInf
 	 * @noreference This method is not intended to be referenced by clients.
 	 * @nooverride This method is not intended to be re-implemented or extended by clients.
 	 */
+	@Override
 	public InternalAccessor getInternalAccessor() {
 		return new MyInternalAccessor() {
+			@Override
 			public void setHoverEnrichMode(EnrichMode mode) {
 				AbstractHoverInformationControlManager.this.setHoverEnrichMode(mode);
 			}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java
index 4d0c8ec9c8b..68c0e1d56a7 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java
@@ -169,6 +169,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 	 *
 	 * @deprecated clients should use one of the public constructors
 	 */
+	@Deprecated
 	AbstractInformationControl(Shell parentShell, int shellStyle, final String statusFieldText, final ToolBarManager toolBarManager) {
 		Assert.isTrue(statusFieldText == null || toolBarManager == null);
 		fResizeHandleSize= -1;
@@ -198,6 +199,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 		createStatusComposite(statusFieldText, toolBarManager, foreground, background);
 		
 		addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				handleDispose();
 			}
@@ -288,6 +290,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 		data.heightHint= size;
 		resizer.setLayoutData(data);
 		resizer.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent e) {
 				Point s= resizer.getSize();
 				int x= s.x - 2;
@@ -325,6 +328,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 		MouseAdapter resizeSupport= new MouseAdapter() {
 			private MouseMoveListener fResizeListener;
 
+			@Override
 			public void mouseDown(MouseEvent e) {
 				Rectangle shellBounds= fShell.getBounds();
 				final int shellX= shellBounds.x;
@@ -335,6 +339,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 				final int mouseX= mouseLoc.x;
 				final int mouseY= mouseLoc.y;
 				fResizeListener= new MouseMoveListener() {
+					@Override
 					public void mouseMove(MouseEvent e2) {
 						Point mouseLoc2= resizer.toDisplay(e2.x, e2.y);
 						int dx= mouseLoc2.x - mouseX;
@@ -350,6 +355,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 				resizer.addMouseMoveListener(fResizeListener);
 			}
 
+			@Override
 			public void mouseUp(MouseEvent e) {
 				resizer.removeMouseMoveListener(fResizeListener);
 				fResizeListener= null;
@@ -381,6 +387,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 		MouseAdapter moveSupport= new MouseAdapter() {
 			private MouseMoveListener fMoveListener;
 
+			@Override
 			public void mouseDown(MouseEvent e) {
 				Point shellLoc= fShell.getLocation();
 				final int shellX= shellLoc.x;
@@ -389,6 +396,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 				final int mouseX= mouseLoc.x;
 				final int mouseY= mouseLoc.y;
 				fMoveListener= new MouseMoveListener() {
+					@Override
 					public void mouseMove(MouseEvent e2) {
 						Point mouseLoc2= control.toDisplay(e2.x, e2.y);
 						int dx= mouseLoc2.x - mouseX;
@@ -399,6 +407,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 				control.addMouseMoveListener(fMoveListener);
 			}
 
+			@Override
 			public void mouseUp(MouseEvent e) {
 				control.removeMouseMoveListener(fMoveListener);
 				fMoveListener= null;
@@ -481,6 +490,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 	 *
 	 * @see org.eclipse.jface.text.IInformationControl#setInformation(java.lang.String)
 	 */
+	@Override
 	public void setInformation(String information) {
 
 	}
@@ -495,9 +505,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 		return fResizable;
 	}
 
-	/*
-	 * @see IInformationControl#setVisible(boolean)
-	 */
+	@Override
 	public void setVisible(boolean visible) {
 		if (fShell.isVisible() == visible)
 			return;
@@ -505,9 +513,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 		fShell.setVisible(visible);
 	}
 
-	/*
-	 * @see IInformationControl#dispose()
-	 */
+	@Override
 	public void dispose() {
 		if (fShell != null && !fShell.isDisposed())
 			fShell.dispose();
@@ -530,23 +536,17 @@ public abstract class AbstractInformationControl implements IInformationControl,
 		}
 	}
 
-	/*
-	 * @see IInformationControl#setSize(int, int)
-	 */
+	@Override
 	public void setSize(int width, int height) {
 		fShell.setSize(width, height);
 	}
 
-	/*
-	 * @see IInformationControl#setLocation(Point)
-	 */
+	@Override
 	public void setLocation(Point location) {
 		fShell.setLocation(location);
 	}
 
-	/*
-	 * @see IInformationControl#setSizeConstraints(int, int)
-	 */
+	@Override
 	public void setSizeConstraints(int maxWidth, int maxHeight) {
 		fSizeConstraints= new Point(maxWidth, maxHeight);
 	}
@@ -561,9 +561,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 		return fSizeConstraints != null ? Geometry.copy(fSizeConstraints) : null;
 	}
 
-	/*
-	 * @see IInformationControl#computeSizeHint()
-	 */
+	@Override
 	public Point computeSizeHint() {
 		// XXX: Verify whether this is a good default implementation. If yes, document it.
 		Point constrains= getSizeConstraints();
@@ -580,6 +578,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 	 *
 	 * @see org.eclipse.jface.text.IInformationControlExtension3#computeTrim()
 	 */
+	@Override
 	public Rectangle computeTrim() {
 		Rectangle trim= fShell.computeTrim(0, 0, 0, 0);
 
@@ -589,9 +588,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 		return trim;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlExtension3#getBounds()
-	 */
+	@Override
 	public Rectangle getBounds() {
 		return fShell.getBounds();
 	}
@@ -603,6 +600,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 	 * </p>
 	 * @see org.eclipse.jface.text.IInformationControlExtension3#restoresLocation()
 	 */
+	@Override
 	public boolean restoresLocation() {
 		return false;
 	}
@@ -614,34 +612,27 @@ public abstract class AbstractInformationControl implements IInformationControl,
 	 * </p>
 	 * @see org.eclipse.jface.text.IInformationControlExtension3#restoresSize()
 	 */
+	@Override
 	public boolean restoresSize() {
 		return false;
 	}
 
-	/*
-	 * @see IInformationControl#addDisposeListener(DisposeListener)
-	 */
+	@Override
 	public void addDisposeListener(DisposeListener listener) {
 		fShell.addDisposeListener(listener);
 	}
 
-	/*
-	 * @see IInformationControl#removeDisposeListener(DisposeListener)
-	 */
+	@Override
 	public void removeDisposeListener(DisposeListener listener) {
 		fShell.removeDisposeListener(listener);
 	}
 
-	/*
-	 * @see IInformationControl#setForegroundColor(Color)
-	 */
+	@Override
 	public void setForegroundColor(Color foreground) {
 		fContentComposite.setForeground(foreground);
 	}
 
-	/*
-	 * @see IInformationControl#setBackgroundColor(Color)
-	 */
+	@Override
 	public void setBackgroundColor(Color background) {
 		fContentComposite.setBackground(background);
 	}
@@ -650,6 +641,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 	 * {@inheritDoc}
 	 * This method is not intended to be overridden by subclasses.
 	 */
+	@Override
 	public boolean isFocusControl() {
 		return fShell.getDisplay().getActiveShell() == fShell;
 	}
@@ -660,6 +652,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 	 *
 	 * @see IInformationControl#setFocus()
 	 */
+	@Override
 	public void setFocus() {
 		boolean focusTaken= fShell.setFocus();
 		if (!focusTaken)
@@ -670,10 +663,12 @@ public abstract class AbstractInformationControl implements IInformationControl,
 	 * {@inheritDoc}
 	 * This method is not intended to be overridden by subclasses.
 	 */
+	@Override
 	public void addFocusListener(final FocusListener listener) {
 		if (fFocusListeners.isEmpty()) {
 			fShellListener= new Listener() {
 
+				@Override
 				public void handleEvent(Event event) {
 					Object[] listeners= fFocusListeners.getListeners();
 					for (int i= 0; i < listeners.length; i++) {
@@ -696,6 +691,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 	 * {@inheritDoc}
 	 * This method is not intended to be overridden by subclasses.
 	 */
+	@Override
 	public void removeFocusListener(FocusListener listener) {
 		fFocusListeners.remove(listener);
 		if (fFocusListeners.isEmpty()) {
@@ -719,6 +715,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 	 *
 	 * @see org.eclipse.jface.text.IInformationControlExtension4#setStatusText(java.lang.String)
 	 */
+	@Override
 	public void setStatusText(String statusFieldText) {
 		if (fStatusLabel != null && ! getShell().isVisible()) {
 			if (statusFieldText == null	) {
@@ -730,9 +727,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlExtension5#containsControl(org.eclipse.swt.widgets.Control)
-	 */
+	@Override
 	public boolean containsControl(Control control) {
 		do {
 			if (control == fShell)
@@ -744,9 +739,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlExtension5#isVisible()
-	 */
+	@Override
 	public boolean isVisible() {
 		return fShell != null && !fShell.isDisposed() && fShell.isVisible();
 	}
@@ -755,6 +748,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 	 * {@inheritDoc}
 	 * This default implementation returns <code>null</code>. Subclasses may override.
 	 */
+	@Override
 	public IInformationControlCreator getInformationPresenterControlCreator() {
 		return null;
 	}
@@ -766,6 +760,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
 	 *
 	 * @see org.eclipse.jface.text.IInformationControlExtension5#computeSizeConstraints(int, int)
 	 */
+	@Override
 	public Point computeSizeConstraints(int widthInChars, int heightInChars) {
 		GC gc= new GC(fContentComposite);
 		gc.setFont(JFaceResources.getDialogFont());
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java
index 91492736a6d..f5ee2396d13 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControlManager.java
@@ -58,38 +58,47 @@ abstract public class AbstractInformationControlManager {
 	 * @since 3.4
 	 */
 	class MyInternalAccessor extends InternalAccessor {
+		@Override
 		public IInformationControl getCurrentInformationControl() {
 			return AbstractInformationControlManager.this.getCurrentInformationControl();
 		}
 
+		@Override
 		public void setInformationControlReplacer(InformationControlReplacer replacer) {
 			AbstractInformationControlManager.this.setInformationControlReplacer(replacer);
 		}
 
+		@Override
 		public InformationControlReplacer getInformationControlReplacer() {
 			return AbstractInformationControlManager.this.getInformationControlReplacer();
 		}
 
+		@Override
 		public boolean canReplace(IInformationControl control) {
 			return AbstractInformationControlManager.this.canReplace(control);
 		}
 
+		@Override
 		public boolean isReplaceInProgress() {
 			return AbstractInformationControlManager.this.isReplaceInProgress();
 		}
 
+		@Override
 		public void replaceInformationControl(boolean takeFocus) {
 			AbstractInformationControlManager.this.replaceInformationControl(takeFocus);
 		}
 
+		@Override
 		public void cropToClosestMonitor(Rectangle bounds) {
 			AbstractInformationControlManager.this.cropToClosestMonitor(bounds);
 		}
 
+		@Override
 		public void setHoverEnrichMode(EnrichMode mode) {
 			throw new UnsupportedOperationException("only implemented in AbstractHoverInformationControlManager"); //$NON-NLS-1$
 		}
 
+		@Override
 		public boolean getAllowMouseExit() {
 			throw new UnsupportedOperationException("only implemented in AnnotationBarHoverManager"); //$NON-NLS-1$
 		}
@@ -161,6 +170,7 @@ abstract public class AbstractInformationControlManager {
 			return fFlag;
 		}
 
+		@Override
 		public String toString() {
 			switch (fFlag) {
 				case SWT.BOTTOM: return "BOTTOM"; //$NON-NLS-1$
@@ -667,6 +677,7 @@ abstract public class AbstractInformationControlManager {
 	private DisposeListener getSubjectControlDisposeListener() {
 		if (fSubjectControlDisposeListener == null) {
 			fSubjectControlDisposeListener= new DisposeListener() {
+				@Override
 				public void widgetDisposed(DisposeEvent e) {
 					handleSubjectControlDisposed();
 				}
@@ -699,6 +710,7 @@ abstract public class AbstractInformationControlManager {
 	 * @param enabled the enable state
 	 * @deprecated visibility will be changed to protected
 	 */
+	@Deprecated
 	public void setEnabled(boolean enabled) {
 		fEnabled= enabled;
 	}
@@ -818,6 +830,7 @@ abstract public class AbstractInformationControlManager {
 		if (fInformationControl == null) {
 			fInformationControl= creator.createInformationControl(fSubjectControl.getShell());
 			fInformationControl.addDisposeListener(new DisposeListener() {
+				@Override
 				public void widgetDisposed(DisposeEvent e) {
 					handleInformationControlDisposed();
 				}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractReusableInformationControlCreator.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractReusableInformationControlCreator.java
index 0817afacf93..94fc583607b 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractReusableInformationControlCreator.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractReusableInformationControlCreator.java
@@ -36,9 +36,7 @@ public abstract class AbstractReusableInformationControlCreator implements IInfo
 	 */
 	protected abstract IInformationControl doCreateInformationControl(Shell parent);
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlCreator#createInformationControl(org.eclipse.swt.widgets.Shell)
-	 */
+	@Override
 	public IInformationControl createInformationControl(Shell parent) {
 		IInformationControl control= (IInformationControl)fInformationControls.get(parent);
 		if (control == null) {
@@ -49,9 +47,7 @@ public abstract class AbstractReusableInformationControlCreator implements IInfo
 		return control;
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)
-	 */
+	@Override
 	public void widgetDisposed(DisposeEvent e) {
 		Composite parent= null;
 		if (e.widget instanceof Shell)
@@ -61,16 +57,12 @@ public abstract class AbstractReusableInformationControlCreator implements IInfo
 	}
 
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlCreatorExtension#canReuse(org.eclipse.jface.text.IInformationControl)
-	 */
+	@Override
 	public boolean canReuse(IInformationControl control) {
 		return fInformationControls.containsValue(control);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlCreatorExtension#canReplace(org.eclipse.jface.text.IInformationControlCreator)
-	 */
+	@Override
 	public boolean canReplace(IInformationControlCreator creator) {
 		return creator.getClass() == getClass();
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/BlockTextSelection.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/BlockTextSelection.java
index 4bafd0b22b7..97484036313 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/BlockTextSelection.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/BlockTextSelection.java
@@ -82,37 +82,27 @@ public class BlockTextSelection extends TextSelection implements IBlockTextSelec
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextSelection#getStartLine()
-	 */
+	@Override
 	public int getStartLine() {
 		return fStartLine;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IColumnTextSelection#getStartColumn()
-	 */
+	@Override
 	public int getStartColumn() {
 		return fStartColumn;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextSelection#getEndLine()
-	 */
+	@Override
 	public int getEndLine() {
 		return fEndLine;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IColumnTextSelection#getEndColumn()
-	 */
+	@Override
 	public int getEndColumn() {
 		return fEndColumn;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextSelection#getText()
-	 */
+	@Override
 	public String getText() {
 		IDocument document= getDocument();
 		if (document != null) {
@@ -125,9 +115,7 @@ public class BlockTextSelection extends TextSelection implements IBlockTextSelec
 		return super.getText();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextSelection#hashCode()
-	 */
+	@Override
 	public int hashCode() {
 		final int prime= 31;
 		int result= super.hashCode();
@@ -138,9 +126,7 @@ public class BlockTextSelection extends TextSelection implements IBlockTextSelec
 		return result;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextSelection#equals(java.lang.Object)
-	 */
+	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;
@@ -158,9 +144,7 @@ public class BlockTextSelection extends TextSelection implements IBlockTextSelec
 		return true;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IColumnTextSelection#getRegions()
-	 */
+	@Override
 	public IRegion[] getRegions() {
 		IDocument document= getDocument();
 		if (document != null) {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/CursorLinePainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/CursorLinePainter.java
index 69efd3f508a..83171688c5e 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/CursorLinePainter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/CursorLinePainter.java
@@ -68,9 +68,7 @@ public class CursorLinePainter implements IPainter, LineBackgroundListener {
 		fHighlightColor= highlightColor;
 	}
 
-	/*
-	 * @see LineBackgroundListener#lineGetBackground(LineBackgroundEvent)
-	 */
+	@Override
 	public void lineGetBackground(LineBackgroundEvent event) {
 		// don't use cached line information because of asynchronous painting
 
@@ -195,9 +193,7 @@ public class CursorLinePainter implements IPainter, LineBackgroundListener {
 		textWidget.redraw(0, upperLeft.y, width, height, false);
 	}
 
-	/*
-	 * @see IPainter#deactivate(boolean)
-	 */
+	@Override
 	public void deactivate(boolean redraw) {
 		if (fIsActive) {
 			fIsActive= false;
@@ -219,15 +215,11 @@ public class CursorLinePainter implements IPainter, LineBackgroundListener {
 		}
 	}
 
-	/*
-	 * @see IPainter#dispose()
-	 */
+	@Override
 	public void dispose() {
 	}
 
-	/*
-	 * @see IPainter#paint(int)
-	 */
+	@Override
 	public void paint(int reason) {
 		if (fViewer.getDocument() == null) {
 			deactivate(false);
@@ -280,9 +272,7 @@ public class CursorLinePainter implements IPainter, LineBackgroundListener {
 		}
 	}
 
-	/*
-	 * @see IPainter#setPositionManager(IPaintPositionManager)
-	 */
+	@Override
 	public void setPositionManager(IPaintPositionManager manager) {
 		fPositionManager = manager;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultAutoIndentStrategy.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultAutoIndentStrategy.java
index 76c9c2d4121..9f8f7cd0600 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultAutoIndentStrategy.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultAutoIndentStrategy.java
@@ -20,6 +20,7 @@ package org.eclipse.jface.text;
  * @deprecated since 3.1 use {@link org.eclipse.jface.text.DefaultIndentLineAutoEditStrategy} instead
  * @noextend This class is not intended to be subclassed by clients.
  */
+@Deprecated
 public class DefaultAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy implements IAutoIndentStrategy {
 
 	/**
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java
index 38764f7be03..9c4704e7517 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultDocumentAdapter.java
@@ -82,6 +82,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo
 	 *
 	 * @param document the document to be adapted or <code>null</code> if there is no document
 	 */
+	@Override
 	public void setDocument(IDocument document) {
 
 		if (fDocument != null)
@@ -105,18 +106,14 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo
 			fDocument.addPrenotifiedDocumentListener(this);
 	}
 
-	/*
-	 * @see StyledTextContent#addTextChangeListener(TextChangeListener)
-	 */
+	@Override
 	public void addTextChangeListener(TextChangeListener listener) {
 		Assert.isNotNull(listener);
 		if (!fTextChangeListeners.contains(listener))
 			fTextChangeListeners.add(listener);
 	}
 
-	/*
-	 * @see StyledTextContent#removeTextChangeListener(TextChangeListener)
-	 */
+	@Override
 	public void removeTextChangeListener(TextChangeListener listener) {
 		Assert.isNotNull(listener);
 		fTextChangeListeners.remove(listener);
@@ -163,9 +160,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo
 		return fDocument;
 	}
 
-	/*
-	 * @see StyledTextContent#getLine(int)
-	 */
+	@Override
 	public String getLine(int line) {
 
 		IDocument document= getDocumentForRead();
@@ -183,9 +178,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo
 		return null;
 	}
 
-	/*
-	 * @see StyledTextContent#getLineAtOffset(int)
-	 */
+	@Override
 	public int getLineAtOffset(int offset) {
 		IDocument document= getDocumentForRead();
 		try {
@@ -202,16 +195,12 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo
 		return -1;
 	}
 
-	/*
-	 * @see StyledTextContent#getLineCount()
-	 */
+	@Override
 	public int getLineCount() {
 		return getDocumentForRead().getNumberOfLines();
 	}
 
-	/*
-	 * @see StyledTextContent#getOffsetAtLine(int)
-	 */
+	@Override
 	public int getOffsetAtLine(int line) {
 		IDocument document= getDocumentForRead();
 		try {
@@ -228,9 +217,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo
 		return -1;
 	}
 
-	/*
-	 * @see StyledTextContent#getTextRange(int, int)
-	 */
+	@Override
 	public String getTextRange(int offset, int length) {
 		try {
 			return getDocumentForRead().get(offset, length);
@@ -240,9 +227,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo
 		}
 	}
 
-	/*
-	 * @see StyledTextContent#replaceTextRange(int, int, String)
-	 */
+	@Override
 	public void replaceTextRange(int pos, int length, String text) {
 		try {
 			fDocument.replace(pos, length, text);
@@ -251,32 +236,24 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo
 		}
 	}
 
-	/*
-	 * @see StyledTextContent#setText(String)
-	 */
+	@Override
 	public void setText(String text) {
 		fDocument.set(text);
 	}
 
-	/*
-	 * @see StyledTextContent#getCharCount()
-	 */
+	@Override
 	public int getCharCount() {
 		return getDocumentForRead().getLength();
 	}
 
-	/*
-	 * @see StyledTextContent#getLineDelimiter()
-	 */
+	@Override
 	public String getLineDelimiter() {
 		if (fLineDelimiter == null)
 			fLineDelimiter= TextUtilities.getDefaultLineDelimiter(fDocument);
 		return fLineDelimiter;
 	}
 
-	/*
-	 * @see IDocumentListener#documentChanged(DocumentEvent)
-	 */
+	@Override
 	public void documentChanged(DocumentEvent event) {
 		// check whether the given event is the one which was remembered
 		if (fEvent == null || event != fEvent)
@@ -292,9 +269,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo
 		}
 	}
 
-	/*
-	 * @see IDocumentListener#documentAboutToBeChanged(DocumentEvent)
-	 */
+	@Override
 	public void documentAboutToBeChanged(DocumentEvent event) {
 
 		fRememberedLengthOfDocument= fDocument.getLength();
@@ -396,10 +371,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo
 		}
 	}
 
-	/*
-	 * @see IDocumentAdapterExtension#resumeForwardingDocumentChanges()
-	 * @since 2.0
-	 */
+	@Override
 	public void resumeForwardingDocumentChanges() {
 		fIsForwarding= true;
 		fDocumentClone= null;
@@ -408,10 +380,7 @@ class DefaultDocumentAdapter implements IDocumentAdapter, IDocumentListener, IDo
 		fireTextSet();
 	}
 
-	/*
-	 * @see IDocumentAdapterExtension#stopForwardingDocumentChanges()
-	 * @since 2.0
-	 */
+	@Override
 	public void stopForwardingDocumentChanges() {
 		fDocumentClone= null;
 		fOriginalContent= fDocument.get();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultIndentLineAutoEditStrategy.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultIndentLineAutoEditStrategy.java
index 48cc0808ec6..1012cd568b7 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultIndentLineAutoEditStrategy.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultIndentLineAutoEditStrategy.java
@@ -82,9 +82,7 @@ public class DefaultIndentLineAutoEditStrategy implements IAutoEditStrategy {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IAutoEditStrategy#customizeDocumentCommand(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.DocumentCommand)
-	 */
+	@Override
 	public void customizeDocumentCommand(IDocument d, DocumentCommand c) {
 		if (c.length == 0 && c.text != null && TextUtilities.endsWith(d.getLegalLineDelimiters(), c.text) != -1)
 			autoIndentAfterNewLine(d, c);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultInformationControl.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultInformationControl.java
index fa158158ed6..4d6a2a096a4 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultInformationControl.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultInformationControl.java
@@ -64,6 +64,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem
 		 * @return the manipulated information
 		 * @deprecated As of 3.2, replaced by {@link DefaultInformationControl.IInformationPresenterExtension#updatePresentation(Drawable, String, TextPresentation, int, int)}
 		 */
+		@Deprecated
 		String updatePresentation(Display display, String hoverInfo, TextPresentation presentation, int maxWidth, int maxHeight);
 	}
 
@@ -227,6 +228,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem
 	 * @param presenter the presenter to be used
 	 * @deprecated As of 3.4, replaced by simpler constructors
 	 */
+	@Deprecated
 	public DefaultInformationControl(Shell parent, int shellStyle, int style, IInformationPresenter presenter) {
 		this(parent, shellStyle, style, presenter, null);
 	}
@@ -245,6 +247,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem
 	 * @since 3.0
 	 * @deprecated As of 3.4, replaced by simpler constructors
 	 */
+	@Deprecated
 	public DefaultInformationControl(Shell parentShell, int shellStyle, final int style, IInformationPresenter presenter, String statusFieldText) {
 		super(parentShell, SWT.NO_FOCUS | SWT.ON_TOP | shellStyle, statusFieldText, null);
 		fAdditionalTextStyles= style;
@@ -262,6 +265,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem
 	 * @param presenter the presenter to be used
 	 * @deprecated As of 3.4, replaced by {@link #DefaultInformationControl(Shell, DefaultInformationControl.IInformationPresenter)}
 	 */
+	@Deprecated
 	public DefaultInformationControl(Shell parent, int textStyles, IInformationPresenter presenter) {
 		this(parent, textStyles, presenter, null);
 	}
@@ -278,6 +282,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem
 	 * @since 3.0
 	 * @deprecated As of 3.4, replaced by {@link #DefaultInformationControl(Shell, String, DefaultInformationControl.IInformationPresenter)}
 	 */
+	@Deprecated
 	public DefaultInformationControl(Shell parent, int textStyles, IInformationPresenter presenter, String statusFieldText) {
 		super(parent, statusFieldText);
 		fAdditionalTextStyles= textStyles;
@@ -285,9 +290,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem
 		create();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControl#createContent(org.eclipse.swt.widgets.Composite)
-	 */
+	@Override
 	protected void createContent(Composite parent) {
 		fText= new StyledText(parent, SWT.MULTI | SWT.READ_ONLY | fAdditionalTextStyles);
 		fText.setForeground(parent.getForeground());
@@ -303,9 +306,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem
 		}
 	}
 
-	/*
-	 * @see IInformationControl#setInformation(String)
-	 */
+	@Override
 	public void setInformation(String content) {
 		if (fPresenter == null) {
 			fText.setText(content);
@@ -346,9 +347,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem
 		}
 	}
 
-	/*
-	 * @see IInformationControl#setVisible(boolean)
-	 */
+	@Override
 	public void setVisible(boolean visible) {
 		if (visible) {
 			if (fText.getWordWrap()) {
@@ -363,9 +362,7 @@ public class DefaultInformationControl extends AbstractInformationControl implem
 		super.setVisible(visible);
 	}
 
-	/*
-	 * @see IInformationControl#computeSizeHint()
-	 */
+	@Override
 	public Point computeSizeHint() {
 		// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=117602
 		int widthHint= SWT.DEFAULT;
@@ -376,32 +373,24 @@ public class DefaultInformationControl extends AbstractInformationControl implem
 		return getShell().computeSize(widthHint, SWT.DEFAULT, true);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControl#computeTrim()
-	 */
+	@Override
 	public Rectangle computeTrim() {
 		return Geometry.add(super.computeTrim(), fText.computeTrim(0, 0, 0, 0));
 	}
 
-	/*
-	 * @see IInformationControl#setForegroundColor(Color)
-	 */
+	@Override
 	public void setForegroundColor(Color foreground) {
 		super.setForegroundColor(foreground);
 		fText.setForeground(foreground);
 	}
 
-	/*
-	 * @see IInformationControl#setBackgroundColor(Color)
-	 */
+	@Override
 	public void setBackgroundColor(Color background) {
 		super.setBackgroundColor(background);
 		fText.setBackground(background);
 	}
 
-	/*
-	 * @see IInformationControlExtension#hasContents()
-	 */
+	@Override
 	public boolean hasContents() {
 		return fText.getCharCount() > 0;
 	}
@@ -411,18 +400,15 @@ public class DefaultInformationControl extends AbstractInformationControl implem
 	 * @since 3.0
 	 * @deprecated As of 3.2, no longer used and called
 	 */
+	@Deprecated
+	@Override
 	public void widgetDisposed(DisposeEvent event) {
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IInformationControlExtension5#getInformationPresenterControlCreator()
-	 * @since 3.4
-	 */
+	@Override
 	public IInformationControlCreator getInformationPresenterControlCreator() {
 		return new IInformationControlCreator() {
-			/*
-			 * @see org.eclipse.jface.text.IInformationControlCreator#createInformationControl(org.eclipse.swt.widgets.Shell)
-			 */
+			@Override
 			public IInformationControl createInformationControl(Shell parent) {
 				return new DefaultInformationControl(parent, (ToolBarManager) null, fPresenter);
 			}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.java
index 46c37dcaec4..6ccb56e9661 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextDoubleClickStrategy.java
@@ -64,25 +64,19 @@ public class DefaultTextDoubleClickStrategy implements ITextDoubleClickStrategy
 			fEndOffset= fOffset + iteratorRange.getLength();
 		}
 
-		/*
-		 * @see CharacterIterator#first()
-		 */
+		@Override
 		public char first() {
 			fIndex= fOffset;
 			return current();
 		}
 
-		/*
-		 * @see CharacterIterator#last()
-		 */
+		@Override
 		public char last() {
 	        fIndex= fOffset < fEndOffset ? fEndOffset -1 : fEndOffset;
         	return current();
 		}
 
-		/*
-		 * @see CharacterIterator#current()
-		 */
+		@Override
 		public char current() {
 			if (fOffset <= fIndex && fIndex < fEndOffset) {
 				try {
@@ -93,9 +87,7 @@ public class DefaultTextDoubleClickStrategy implements ITextDoubleClickStrategy
 			return DONE;
 		}
 
-		/*
-		 * @see CharacterIterator#next()
-		 */
+		@Override
 		public char next() {
 			++fIndex;
 			int end= getEndIndex();
@@ -106,9 +98,7 @@ public class DefaultTextDoubleClickStrategy implements ITextDoubleClickStrategy
 			return current();
 		}
 
-		/*
-		 * @see CharacterIterator#previous()
-		 */
+		@Override
 		public char previous() {
 			if (fIndex == fOffset)
 				return DONE;
@@ -119,38 +109,28 @@ public class DefaultTextDoubleClickStrategy implements ITextDoubleClickStrategy
 			return current();
 		}
 
-		/*
-		 * @see CharacterIterator#setIndex(int)
-		 */
+		@Override
 		public char setIndex(int index) {
 			fIndex= index;
 			return current();
 		}
 
-		/*
-		 * @see CharacterIterator#getBeginIndex()
-		 */
+		@Override
 		public int getBeginIndex() {
 			return fOffset;
 		}
 
-		/*
-		 * @see CharacterIterator#getEndIndex()
-		 */
+		@Override
 		public int getEndIndex() {
 			return fEndOffset;
 		}
 
-		/*
-		 * @see CharacterIterator#getIndex()
-		 */
+		@Override
 		public int getIndex() {
 			return fIndex;
 		}
 
-		/*
-		 * @see CharacterIterator#clone()
-		 */
+		@Override
 		public Object clone() {
 			DocumentCharacterIterator i= new DocumentCharacterIterator();
 			i.fDocument= fDocument;
@@ -192,9 +172,7 @@ public class DefaultTextDoubleClickStrategy implements ITextDoubleClickStrategy
 	public DefaultTextDoubleClickStrategy() {
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextDoubleClickStrategy#doubleClicked(org.eclipse.jface.text.ITextViewer)
-	 */
+	@Override
 	public void doubleClicked(ITextViewer text) {
 
 		int offset= text.getSelectedRange().x;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java
index 612fd20fbff..d7551522243 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultTextHover.java
@@ -44,6 +44,8 @@ public class DefaultTextHover implements ITextHover {
 	 *
 	 * @deprecated As of 3.4, replaced by {@link ITextHoverExtension2#getHoverInfo2(ITextViewer, IRegion)}
 	 */
+	@Deprecated
+	@Override
 	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
 		IAnnotationModel model= getAnnotationModel(fSourceViewer);
 		if (model == null)
@@ -65,9 +67,7 @@ public class DefaultTextHover implements ITextHover {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int)
-	 */
+	@Override
 	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
 		return findWord(textViewer.getDocument(), offset);
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java
index 0f80aefb23f..ae95f9bb426 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DefaultUndoManager.java
@@ -69,6 +69,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
  * @deprecated As of 3.2, replaced by {@link TextViewerUndoManager}
  * @noextend This class is not intended to be subclassed by clients.
  */
+@Deprecated
 public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 
 	/**
@@ -127,10 +128,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 			fPreservedText= null;
 		}
 
-		/*
-		 * @see org.eclipse.core.commands.operations.IUndoableOperation#dispose()
-		 * @since 3.1
-		 */
+		@Override
 		public void dispose() {
 		    reinitialize();
 		}
@@ -151,10 +149,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 			}
 		}
 
-		/*
-		 * @see org.eclipse.core.commands.operations.IUndoableOperation#canUndo()
-		 * @since 3.1
-		 */
+		@Override
 		public boolean canUndo() {
 
 			if (isConnected() && isValid()) {
@@ -208,10 +203,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 			return false;
 		}
 
-		/*
-		 * @see org.eclipse.core.commands.operations.IUndoableOperation#canRedo()
-		 * @since 3.1
-		 */
+		@Override
 		public boolean canRedo() {
 			if (isConnected() && isValid()) {
 				IDocument doc= fTextViewer.getDocument();
@@ -226,18 +218,12 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 			return false;
 		}
 
-		/*
-		 * @see org.eclipse.core.commands.operations.IUndoableOperation#canExecute()
-		 * @since 3.1
-		 */
+		@Override
 		public boolean canExecute() {
 		    return isConnected();
 		}
 
-		/*
-		 * @see org.eclipse.core.commands.operations.IUndoableOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-		 * @since 3.1
-		 */
+		@Override
 		public IStatus execute(IProgressMonitor monitor, IAdaptable uiInfo) {
 			// Text commands execute as they are typed, so executing one has no effect.
 		    return Status.OK_STATUS;
@@ -256,6 +242,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		 * @param uiInfo	an adaptable that can provide UI info if needed
 		 * @return the status
 		 */
+		@Override
 		public IStatus undo(IProgressMonitor monitor, IAdaptable uiInfo) {
 			if (isValid()) {
 				undoTextChange();
@@ -290,6 +277,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		 * @param uiInfo	an adaptable that can provide UI info if needed
 		 * @return the status
 		 */
+		@Override
 		public IStatus redo(IProgressMonitor monitor, IAdaptable uiInfo) {
 			if (isValid()) {
 				redoTextChange();
@@ -382,10 +370,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		    	fText != null;
 		}
 
-		/*
-		 * @see java.lang.Object#toString()
-		 * @since 3.1
-		 */
+		@Override
 		public String toString() {
 			String delimiter= ", "; //$NON-NLS-1$
 		    StringBuffer text= new StringBuffer(super.toString());
@@ -460,9 +445,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 			fCommands.add(command);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.DefaultUndoManager.TextCommand#undo()
-		 */
+		@Override
 		public IStatus undo(IProgressMonitor monitor, IAdaptable uiInfo) {
 			resetProcessChangeSate();
 
@@ -483,9 +466,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 			return Status.OK_STATUS;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.DefaultUndoManager.TextCommand#redo()
-		 */
+		@Override
 		public IStatus redo(IProgressMonitor monitor, IAdaptable uiInfo) {
 			resetProcessChangeSate();
 
@@ -510,6 +491,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 
 		 */
 
+		@Override
 		protected void updateCommand() {
 			// first gather the data from the buffers
 			super.updateCommand();
@@ -531,6 +513,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		/*
 		 * @see TextCommand#createCurrent
 		 */
+		@Override
 		protected TextCommand createCurrent() {
 
 			if (!fFoldingIntoCompoundChange)
@@ -540,9 +523,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 			return this;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.DefaultUndoManager.TextCommand#commit()
-		 */
+		@Override
 		protected void commit() {
 			// if there is pending data, update the command
 			if (fStart > -1)
@@ -557,6 +538,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		 * @return true if the command is valid.
 		 * @since 3.1
 		 */
+		@Override
 		protected boolean isValid() {
 			if (isConnected())
 				return (fStart > -1 || fCommands.size() > 0);
@@ -569,6 +551,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		 * @return the undo modification stamp
 		 * @since 3.1
 		 */
+		@Override
 		protected long getUndoModificationStamp() {
 			if (fStart > -1)
 				return super.getUndoModificationStamp();
@@ -584,6 +567,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		 * @return the redo modification stamp
 		 * @since 3.1
 		 */
+		@Override
 		protected long getRedoModificationStamp() {
 			if (fStart > -1)
 				return super.getRedoModificationStamp();
@@ -602,6 +586,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		/*
 		 * @see MouseListener#mouseDoubleClick
 		 */
+		@Override
 		public void mouseDoubleClick(MouseEvent e) {
 		}
 
@@ -609,6 +594,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		 * If the right mouse button is pressed, the current editing command is closed
 		 * @see MouseListener#mouseDown
 		 */
+		@Override
 		public void mouseDown(MouseEvent e) {
 			if (e.button == 1)
 				commit();
@@ -617,12 +603,14 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		/*
 		 * @see MouseListener#mouseUp
 		 */
+		@Override
 		public void mouseUp(MouseEvent e) {
 		}
 
 		/*
 		 * @see KeyListener#keyPressed
 		 */
+		@Override
 		public void keyReleased(KeyEvent e) {
 		}
 
@@ -630,6 +618,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		 * On cursor keys, the current editing command is closed
 		 * @see KeyListener#keyPressed
 		 */
+		@Override
 		public void keyPressed(KeyEvent e) {
 			switch (e.keyCode) {
 				case SWT.ARROW_UP:
@@ -649,9 +638,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 
 		private String fReplacedText;
 
-		/*
-		 * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-		 */
+		@Override
 		public void documentAboutToBeChanged(DocumentEvent event) {
 			try {
 				fReplacedText= event.getDocument().get(event.getOffset(), event.getLength());
@@ -661,9 +648,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 			}
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)
-		 */
+		@Override
 		public void documentChanged(DocumentEvent event) {
 			fPreservedRedoModificationStamp= event.getModificationStamp();
 
@@ -700,9 +685,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 	 */
 	class TextInputListener implements ITextInputListener {
 
-		/*
-		 * @see org.eclipse.jface.text.ITextInputListener#inputDocumentAboutToBeChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument)
-		 */
+		@Override
 		public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) {
 			if (oldInput != null && fDocumentListener != null) {
 				oldInput.removeDocumentListener(fDocumentListener);
@@ -710,9 +693,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 			}
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.ITextInputListener#inputDocumentChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument)
-		 */
+		@Override
 		public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
 			if (newInput != null) {
 				if (fDocumentListener == null)
@@ -730,6 +711,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 	class HistoryListener implements IOperationHistoryListener {
 		private IUndoableOperation fOperation;
 
+		@Override
 		public void historyNotification(final OperationHistoryEvent event) {
 			final int type= event.getEventType();
 			switch (type) {
@@ -738,6 +720,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 				// if this is one of our operations
 				if (event.getOperation().hasContext(fUndoContext)) {
 					fTextViewer.getTextWidget().getDisplay().syncExec(new Runnable() {
+						@Override
 						public void run() {
 							// if we are undoing/redoing a command we generated, then ignore
 							// the document changes associated with this undo or redo.
@@ -769,6 +752,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 			case OperationHistoryEvent.OPERATION_NOT_OK:
 				if (event.getOperation() == fOperation) {
 					fTextViewer.getTextWidget().getDisplay().syncExec(new Runnable() {
+						@Override
 						public void run() {
 							listenToTextChanges(true);
 							fOperation= null;
@@ -863,6 +847,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 	/*
 	 * @see IUndoManager#beginCompoundChange
 	 */
+	@Override
 	public void beginCompoundChange() {
 		if (isConnected()) {
 			fFoldingIntoCompoundChange= true;
@@ -874,6 +859,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 	/*
 	 * @see IUndoManager#endCompoundChange
 	 */
+	@Override
 	public void endCompoundChange() {
 		if (isConnected()) {
 			fFoldingIntoCompoundChange= false;
@@ -1193,6 +1179,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 			else
 				display= Display.getDefault();
 			display.syncExec(new Runnable() {
+				@Override
 				public void run() {
 					MessageDialog.openError(finalShell, title, ex.getLocalizedMessage());
 				}
@@ -1200,9 +1187,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#setMaximalUndoLevel(int)
-	 */
+	@Override
 	public void setMaximalUndoLevel(int undoLevel) {
 		fUndoLevel= Math.max(0, undoLevel);
 		if (isConnected()) {
@@ -1210,9 +1195,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#connect(org.eclipse.jface.text.ITextViewer)
-	 */
+	@Override
 	public void connect(ITextViewer textViewer) {
 		if (!isConnected() && textViewer != null) {
 			fTextViewer= textViewer;
@@ -1233,9 +1216,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#disconnect()
-	 */
+	@Override
 	public void disconnect() {
 		if (isConnected()) {
 
@@ -1250,9 +1231,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#reset()
-	 */
+	@Override
 	public void reset() {
 		if (isConnected()) {
 			initializeCommandStack();
@@ -1267,23 +1246,17 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#redoable()
-	 */
+	@Override
 	public boolean redoable() {
 	    return fHistory.canRedo(fUndoContext);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#undoable()
-	 */
+	@Override
 	public boolean undoable() {
 	    return fHistory.canUndo(fUndoContext);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#redo()
-	 */
+	@Override
 	public void redo() {
 		if (isConnected() && redoable()) {
 			try {
@@ -1294,9 +1267,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#undo()
-	 */
+	@Override
 	public void undo() {
 		if (isConnected() && undoable()) {
 			try {
@@ -1325,10 +1296,7 @@ public class DefaultUndoManager implements IUndoManager, IUndoManagerExtension {
 		fTextViewer.revealRange(offset, length);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManagerExtension#getUndoContext()
-	 * @since 3.1
-	 */
+	@Override
 	public IUndoContext getUndoContext() {
 		return fUndoContext;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentClone.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentClone.java
index 2998f1e6d67..313240360b5 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentClone.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentClone.java
@@ -34,36 +34,26 @@ class DocumentClone extends AbstractDocument {
 			fContent= content;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.ITextStore#get(int)
-		 */
+		@Override
 		public char get(int offset) {
 			return fContent.charAt(offset);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.ITextStore#get(int, int)
-		 */
+		@Override
 		public String get(int offset, int length) {
 			return fContent.substring(offset, offset + length);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.ITextStore#getLength()
-		 */
+		@Override
 		public int getLength() {
 			return fContent.length();
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.ITextStore#replace(int, int, java.lang.String)
-		 */
+		@Override
 		public void replace(int offset, int length, String text) {
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.ITextStore#set(java.lang.String)
-		 */
+		@Override
 		public void set(String text) {
 		}
 
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentCommand.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentCommand.java
index d29bf7135d7..554032cfefe 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentCommand.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/DocumentCommand.java
@@ -88,6 +88,7 @@ public class DocumentCommand {
 		/*
 		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
 		 */
+		@Override
 		public int compareTo(final Object object) {
 			if (isEqual(object))
 				return 0;
@@ -132,23 +133,17 @@ public class DocumentCommand {
 			fListIterator= listIterator;
 		}
 
-		/*
-		 * @see java.util.Iterator#hasNext()
-		 */
+		@Override
 		public boolean hasNext() {
 			return fListIterator.hasPrevious();
 		}
 
-		/*
-		 * @see java.util.Iterator#next()
-		 */
+		@Override
 		public Object next() {
 			return fListIterator.previous();
 		}
 
-		/*
-		 * @see java.util.Iterator#remove()
-		 */
+		@Override
 		public void remove() {
 			throw new UnsupportedOperationException();
 		}
@@ -183,16 +178,12 @@ public class DocumentCommand {
 			fForward= forward;
 		}
 
-		/*
-		 * @see java.util.Iterator#hasNext()
-		 */
+		@Override
 		public boolean hasNext() {
 			return fCommand != null || fIterator.hasNext();
 		}
 
-		/*
-		 * @see java.util.Iterator#next()
-		 */
+		@Override
 		public Object next() {
 
 			if (!hasNext())
@@ -223,9 +214,7 @@ public class DocumentCommand {
 			}
 		}
 
-		/*
-		 * @see java.util.Iterator#remove()
-		 */
+		@Override
 		public void remove() {
 			throw new UnsupportedOperationException();
 		}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapterContentProposalProvider.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapterContentProposalProvider.java
index c06ec31a070..37089e74f54 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapterContentProposalProvider.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/FindReplaceDocumentAdapterContentProposalProvider.java
@@ -335,9 +335,7 @@ public class FindReplaceDocumentAdapterContentProposalProvider implements IConte
 		fIsFind= isFind;
 	}
 
-	/*
-	 * @see org.eclipse.jface.fieldassist.IContentProposalProvider#getProposals(java.lang.String, int)
-	 */
+	@Override
 	public IContentProposal [] getProposals(String contents, int position) {
 		if (fIsFind)
 			return new ProposalComputer(contents, position).computeFindProposals();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/IAutoIndentStrategy.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/IAutoIndentStrategy.java
index cc6d5128e71..2ce53444f9c 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/IAutoIndentStrategy.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/IAutoIndentStrategy.java
@@ -17,5 +17,6 @@ package org.eclipse.jface.text;
  *
  * @deprecated since 3.0, use <code>IAutoEditStrategy</code> directly
  */
+@Deprecated
 public interface IAutoIndentStrategy extends IAutoEditStrategy {
 }
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/IBlockTextSelection.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/IBlockTextSelection.java
index 657e5473517..7c9c806b8c0 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/IBlockTextSelection.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/IBlockTextSelection.java
@@ -66,6 +66,7 @@ public interface IBlockTextSelection extends ITextSelection {
 	 * 
 	 * @see org.eclipse.jface.text.ITextSelection#getText()
 	 */
+	@Override
 	String getText();
 	/**
 	 * Returns a non-empty array containing the selected text range for each line covered by the
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextHover.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextHover.java
index 9ee2ab2d773..48f07097ee3 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextHover.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextHover.java
@@ -49,6 +49,7 @@ public interface ITextHover {
 	 * @return the hover popup display information, or <code>null</code> if none available
 	 * @deprecated As of 3.4, replaced by {@link ITextHoverExtension2#getHoverInfo2(ITextViewer, IRegion)}
 	 */
+	@Deprecated
 	String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion);
 
 	/**
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewer.java
index cc8e74307c1..b9547312a6b 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewer.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewer.java
@@ -167,6 +167,7 @@ public interface ITextViewer {
 	 *             {@link ITextViewerExtension2#prependAutoEditStrategy(IAutoEditStrategy, String)} and
 	 *             {@link ITextViewerExtension2#removeAutoEditStrategy(IAutoEditStrategy, String)} instead
 	 */
+	@Deprecated
 	void setAutoIndentStrategy(IAutoIndentStrategy strategy, String contentType);
 
 	/**
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension3.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension3.java
index 82adc0d3fdc..da2ef3ea6e1 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension3.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension3.java
@@ -19,6 +19,7 @@ package org.eclipse.jface.text;
  * @since 2.1
  * @deprecated replaced by {@link org.eclipse.jface.text.ITextViewerExtension5}
  */
+@Deprecated
 public interface ITextViewerExtension3 {
 
 
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension5.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension5.java
index 206cfc3cee3..65615e272d2 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension5.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension5.java
@@ -41,6 +41,7 @@ public interface ITextViewerExtension5 extends ITextViewerExtension3 {
 	 * @return the minimal region of the viewer's document comprising the
 	 *         contents of the viewer's widget or <code>null</code>
 	 */
+	@Override
 	IRegion getModelCoverage();
 
 	/**
@@ -50,6 +51,7 @@ public interface ITextViewerExtension5 extends ITextViewerExtension3 {
 	 * @param modelLine the line of the viewer's document
 	 * @return the corresponding widget line or <code>-1</code>
 	 */
+	@Override
 	int modelLine2WidgetLine(int modelLine);
 
 	/**
@@ -59,6 +61,7 @@ public interface ITextViewerExtension5 extends ITextViewerExtension3 {
 	 * @param modelOffset the offset in the viewer's document
 	 * @return the corresponding widget offset or <code>-1</code>
 	 */
+	@Override
 	int modelOffset2WidgetOffset(int modelOffset);
 
 	/**
@@ -70,6 +73,7 @@ public interface ITextViewerExtension5 extends ITextViewerExtension3 {
 	 * @return the minimal region of the widget comprising
 	 *         <code>modelRange</code> or <code>null</code>
 	 */
+	@Override
 	IRegion modelRange2WidgetRange(IRegion modelRange);
 
 	/**
@@ -80,6 +84,7 @@ public interface ITextViewerExtension5 extends ITextViewerExtension3 {
 	 * @return the corresponding offset in the viewer's document or
 	 *         <code>-1</code>
 	 */
+	@Override
 	int widgetOffset2ModelOffset(int widgetOffset);
 
 	/**
@@ -91,6 +96,7 @@ public interface ITextViewerExtension5 extends ITextViewerExtension3 {
 	 * @return the minimal region of the viewer's document comprising
 	 *         <code>widgetlRange</code> or <code>null</code>
 	 */
+	@Override
 	IRegion widgetRange2ModelRange(IRegion widgetRange);
 
 	/**
@@ -109,6 +115,7 @@ public interface ITextViewerExtension5 extends ITextViewerExtension3 {
 	 * @param widgetOffset the widget offset
 	 * @return the widget line of the widget offset
 	 */
+	@Override
 	int widgetLineOfWidgetOffset(int widgetOffset);
 
 
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension8.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension8.java
index 9288ac9919f..93e11e8cffb 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension8.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/ITextViewerExtension8.java
@@ -78,9 +78,7 @@ public interface ITextViewerExtension8 {
 			fName= name;
 		}
 
-		/*
-		 * @see java.lang.Object#toString()
-		 */
+		@Override
 		public String toString() {
 			return fName;
 		}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/MarginPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/MarginPainter.java
index a57d4d17de4..1d667d8d42c 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/MarginPainter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/MarginPainter.java
@@ -118,9 +118,7 @@ public class MarginPainter implements IPainter, PaintListener {
 		fCachedWidgetX= pixels * fMarginWidth;
 	}
 
-	/*
-	 * @see IPainter#deactivate(boolean)
-	 */
+	@Override
 	public void deactivate(boolean redraw) {
 		if (fIsActive) {
 			fIsActive= false;
@@ -131,16 +129,12 @@ public class MarginPainter implements IPainter, PaintListener {
 		}
 	}
 
-	/*
-	 * @see IPainter#dispose()
-	 */
+	@Override
 	public void dispose() {
 		fTextWidget= null;
 	}
 
-	/*
-	 * @see IPainter#paint(int)
-	 */
+	@Override
 	public void paint(int reason) {
 		if (!fIsActive) {
 			fIsActive= true;
@@ -152,9 +146,7 @@ public class MarginPainter implements IPainter, PaintListener {
 			fTextWidget.redraw();
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.PaintListener#paintControl(org.eclipse.swt.events.PaintEvent)
-	 */
+	@Override
 	public void paintControl(PaintEvent e) {
 		if (fTextWidget != null) {
 			int x= fCachedWidgetX - fTextWidget.getHorizontalPixel();
@@ -168,9 +160,7 @@ public class MarginPainter implements IPainter, PaintListener {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPainter#setPositionManager(org.eclipse.jface.text.IPaintPositionManager)
-	 */
+	@Override
 	public void setPositionManager(IPaintPositionManager manager) {
 	}
 }
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/MarkSelection.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/MarkSelection.java
index 59be8d4905e..c2b87b7923e 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/MarkSelection.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/MarkSelection.java
@@ -39,30 +39,22 @@ public class MarkSelection implements IMarkSelection {
 		fLength= length;
 	}
 
-	/*
-	 * @see IMarkSelection#getDocument()
-	 */
+	@Override
 	public IDocument getDocument() {
 		return fDocument;
 	}
 
-	/*
-	 * @see IMarkSelection#getOffset()
-	 */
+	@Override
 	public int getOffset() {
 		return fOffset;
 	}
 
-	/*
-	 * @see IMarkSelection#getLength()
-	 */
+	@Override
 	public int getLength() {
 		return fLength;
 	}
 
-	/*
-	 * @see ISelection#isEmpty()
-	 */
+	@Override
 	public boolean isEmpty() {
 		return fLength == 0;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/PaintManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/PaintManager.java
index dc403188bef..0220b5f2984 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/PaintManager.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/PaintManager.java
@@ -59,6 +59,7 @@ public final class PaintManager implements KeyListener, MouseListener, ISelectio
 		 * right behind the end of the position, the position is extended rather
 		 * than kept stable.
 		 */
+		@Override
 		protected void adaptToInsert() {
 
 			int myStart= fPosition.offset;
@@ -145,6 +146,7 @@ public final class PaintManager implements KeyListener, MouseListener, ISelectio
 		/*
 		 * @see IPositionManager#addManagedPosition(Position)
 		 */
+		@Override
 		public void managePosition(Position position) {
 			try {
 				fDocument.addPosition(fCategory, position);
@@ -158,6 +160,7 @@ public final class PaintManager implements KeyListener, MouseListener, ISelectio
 		/*
 		 * @see IPositionManager#removeManagedPosition(Position)
 		 */
+		@Override
 		public void unmanagePosition(Position position) {
 			try {
 				fDocument.removePosition(fCategory, position);
@@ -299,48 +302,34 @@ public final class PaintManager implements KeyListener, MouseListener, ISelectio
 			((IPainter) e.next()).paint(reason);
 	}
 
-	/*
-	 * @see KeyListener#keyPressed(KeyEvent)
-	 */
+	@Override
 	public void keyPressed(KeyEvent e) {
 		paint(IPainter.KEY_STROKE);
 	}
 
-	/*
-	 * @see KeyListener#keyReleased(KeyEvent)
-	 */
+	@Override
 	public void keyReleased(KeyEvent e) {
 	}
 
-	/*
-	 * @see MouseListener#mouseDoubleClick(MouseEvent)
-	 */
+	@Override
 	public void mouseDoubleClick(MouseEvent e) {
 	}
 
-	/*
-	 * @see MouseListener#mouseDown(MouseEvent)
-	 */
+	@Override
 	public void mouseDown(MouseEvent e) {
 		paint(IPainter.MOUSE_BUTTON);
 	}
 
-	/*
-	 * @see MouseListener#mouseUp(MouseEvent)
-	 */
+	@Override
 	public void mouseUp(MouseEvent e) {
 	}
 
-	/*
-	 * @see ISelectionChangedListener#selectionChanged(SelectionChangedEvent)
-	 */
+	@Override
 	public void selectionChanged(SelectionChangedEvent event) {
 		paint(IPainter.SELECTION);
 	}
 
-	/*
-	 * @see ITextListener#textChanged(TextEvent)
-	 */
+	@Override
 	public void textChanged(TextEvent event) {
 
 		if (!event.getViewerRedrawState())
@@ -349,6 +338,7 @@ public final class PaintManager implements KeyListener, MouseListener, ISelectio
 		Control control= fTextViewer.getTextWidget();
 		if (control != null) {
 			control.getDisplay().asyncExec(new Runnable() {
+				@Override
 				public void run() {
 					if (fTextViewer != null)
 						paint(IPainter.TEXT_CHANGE);
@@ -357,9 +347,7 @@ public final class PaintManager implements KeyListener, MouseListener, ISelectio
 		}
 	}
 
-	/*
-	 * @see ITextInputListener#inputDocumentAboutToBeChanged(IDocument, IDocument)
-	 */
+	@Override
 	public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) {
 		if (oldInput != null) {
 			for (Iterator e= fPainters.iterator(); e.hasNext();)
@@ -369,9 +357,7 @@ public final class PaintManager implements KeyListener, MouseListener, ISelectio
 		}
 	}
 
-	/*
-	 * @see ITextInputListener#inputDocumentChanged(IDocument, IDocument)
-	 */
+	@Override
 	public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
 		if (newInput != null && newInput != fManager.fDocument) {
 			fManager.install(newInput);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java
index a825d01d780..5ff9b3e6ad5 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/PropagatingFontFieldEditor.java
@@ -37,6 +37,7 @@ import org.eclipse.jface.util.PropertyChangeEvent;
  * @since 2.0
  * @deprecated since 3.0 not longer in use, no longer supported
  */
+@Deprecated
 public class PropagatingFontFieldEditor extends FontFieldEditor {
 
 	/** The editor's parent widget */
@@ -58,9 +59,7 @@ public class PropagatingFontFieldEditor extends FontFieldEditor {
 		fDefaultFontLabel= defaultFontLabel == null ? "" : defaultFontLabel; //$NON-NLS-1$
 	}
 
-	/*
-	 * @see FontFieldEditor#doLoad()
-	 */
+	@Override
 	protected void doLoad() {
 		if (getPreferenceStore().isDefault(getPreferenceName()))
 			loadDefault();
@@ -68,9 +67,7 @@ public class PropagatingFontFieldEditor extends FontFieldEditor {
 		checkForDefault();
 	}
 
-	/*
-	 * @see FontFieldEditor#doLoadDefault()
-	 */
+	@Override
 	protected void doLoadDefault() {
 		super.doLoadDefault();
 		checkForDefault();
@@ -121,6 +118,7 @@ public class PropagatingFontFieldEditor extends FontFieldEditor {
 	 */
 	public static void startPropagate(final IPreferenceStore source, final String sourceKey, final IPreferenceStore target, final String targetKey) {
 		source.addPropertyChangeListener(new IPropertyChangeListener() {
+			@Override
 			public void propertyChange(PropertyChangeEvent event) {
 				if (sourceKey.equals(event.getProperty()))
 					propagateFont(source, sourceKey, target, targetKey);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TabsToSpacesConverter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TabsToSpacesConverter.java
index 3fa7f6b3849..6e01547ed4b 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TabsToSpacesConverter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TabsToSpacesConverter.java
@@ -46,6 +46,7 @@ public class TabsToSpacesConverter implements IAutoEditStrategy {
 		return remainder;
 	}
 
+	@Override
 	public void customizeDocumentCommand(IDocument document, DocumentCommand command) {
 		String text= command.text;
 		if (text == null)
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextAttribute.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextAttribute.java
index 9d70dffba74..81c4404f35d 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextAttribute.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextAttribute.java
@@ -99,9 +99,7 @@ public class TextAttribute {
 		this(foreground, null, SWT.NORMAL);
 	}
 
-	/*
-	 * @see Object#equals(Object)
-	 */
+	@Override
 	public boolean equals(Object object) {
 
 		if (object == this)
@@ -128,10 +126,8 @@ public class TextAttribute {
 		return (o2 == null);
 	}
 
-	/*
-	 * @see Object#hashCode()
-	 */
-	 public int hashCode() {
+	 @Override
+	public int hashCode() {
 		 if (fHashCode == 0) {
 			 int multiplier= 37; // some prime
 			 fHashCode= 13; // some random value
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextPresentation.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextPresentation.java
index 2d160e71c38..6730ae24f52 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextPresentation.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextPresentation.java
@@ -90,9 +90,7 @@ public class TextPresentation {
 				computeIndex();
 		}
 
-		/*
-		 * @see Iterator#next()
-		 */
+		@Override
 		public Object next() {
 			try {
 				StyleRange r= (StyleRange) fRanges.get(fIndex++);
@@ -105,16 +103,12 @@ public class TextPresentation {
 			}
 		}
 
-		/*
-		 * @see Iterator#hasNext()
-		 */
+		@Override
 		public boolean hasNext() {
 			return fIndex < fLength;
 		}
 
-		/*
-		 * @see Iterator#remove()
-		 */
+		@Override
 		public void remove() {
 			throw new UnsupportedOperationException();
 		}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextSelection.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextSelection.java
index 33d1516e055..b29e1eae5eb 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextSelection.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextSelection.java
@@ -101,27 +101,22 @@ public class TextSelection implements ITextSelection {
 	 * @return <code>true</code> if this selection is empty
 	 * @see #emptySelection()
 	 */
+	@Override
 	public boolean isEmpty() {
 		return this == NULL || /* backwards compatibility: */ fOffset < 0 || fLength < 0;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextSelection#getOffset()
-	 */
+	@Override
 	public int getOffset() {
 		return fOffset;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextSelection#getLength()
-	 */
+	@Override
 	public int getLength() {
 		return fLength;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextSelection#getStartLine()
-	 */
+	@Override
 	public int getStartLine() {
 
 		try {
@@ -133,9 +128,7 @@ public class TextSelection implements ITextSelection {
 		return -1;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextSelection#getEndLine()
-	 */
+	@Override
 	public int getEndLine() {
 		try {
 			if (fDocument != null) {
@@ -150,9 +143,7 @@ public class TextSelection implements ITextSelection {
 		return -1;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextSelection#getText()
-	 */
+	@Override
 	public String getText() {
 		try {
 			if (fDocument != null)
@@ -163,9 +154,7 @@ public class TextSelection implements ITextSelection {
 		return null;
 	}
 
-	/*
-	 * @see java.lang.Object#equals(Object)
-	 */
+	@Override
 	public boolean equals(Object obj) {
 		if (obj == this)
 			return true;
@@ -193,9 +182,7 @@ public class TextSelection implements ITextSelection {
 		return false;
 	}
 
-	/*
-	 * @see java.lang.Object#hashCode()
-	 */
+	@Override
 	public int hashCode() {
 	 	int low= fDocument != null ? fDocument.hashCode() : 0;
 	 	return (fOffset << 24) | (fLength << 16) | low;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
index 2028462b002..fe62f16a3f7 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewer.java
@@ -203,18 +203,12 @@ public class TextViewer extends Viewer implements
 		/** Internal flag to remember the last double-click selection. */
 		private Point fDoubleClickSelection;
 
-		/*
-		 * @see org.eclipse.swt.events.MouseAdapter#mouseUp(org.eclipse.swt.events.MouseEvent)
-		 * @since 3.2
-		 */
+		@Override
 		public void mouseUp(MouseEvent e) {
 			fDoubleClickSelection= null;
 		}
 
-		/*
-		 * @see org.eclipse.swt.custom.MovementListener#getNextOffset(org.eclipse.swt.custom.MovementEvent)
-		 * @since 3.3
-		 */
+		@Override
 		public void getNextOffset(MovementEvent event) {
 			if (event.movement != SWT.MOVEMENT_WORD_END)
 				return;
@@ -230,10 +224,7 @@ public class TextViewer extends Viewer implements
 			}
 		}
 
-		/*
-		 * @see org.eclipse.swt.custom.MovementListener#getPreviousOffset(org.eclipse.swt.custom.MovementEvent)
-		 * @since 3.3
-		 */
+		@Override
 		public void getPreviousOffset(MovementEvent event) {
 			if (event.movement != SWT.MOVEMENT_WORD_START)
 				return;
@@ -282,22 +273,19 @@ public class TextViewer extends Viewer implements
 	class ViewportGuard extends MouseAdapter
 		implements ControlListener, KeyListener, SelectionListener {
 
-		/*
-		 * @see ControlListener#controlResized(ControlEvent)
-		 */
+		@Override
 		public void controlResized(ControlEvent e) {
 			updateViewportListeners(RESIZE);
 		}
 
-		/*
-		 * @see ControlListener#controlMoved(ControlEvent)
-		 */
+		@Override
 		public void controlMoved(ControlEvent e) {
 		}
 
 		/*
 		 * @see KeyListener#keyReleased
 		 */
+		@Override
 		public void keyReleased(KeyEvent e) {
 			updateViewportListeners(KEY);
 		}
@@ -305,6 +293,7 @@ public class TextViewer extends Viewer implements
 		/*
 		 * @see KeyListener#keyPressed
 		 */
+		@Override
 		public void keyPressed(KeyEvent e) {
 			updateViewportListeners(KEY);
 		}
@@ -312,6 +301,7 @@ public class TextViewer extends Viewer implements
 		/*
 		 * @see MouseListener#mouseUp
 		 */
+		@Override
 		public void mouseUp(MouseEvent e) {
 			if (fTextWidget != null)
 				fTextWidget.removeSelectionListener(this);
@@ -321,6 +311,7 @@ public class TextViewer extends Viewer implements
 		/*
 		 * @see MouseListener#mouseDown
 		 */
+		@Override
 		public void mouseDown(MouseEvent e) {
 			if (fTextWidget != null)
 				fTextWidget.addSelectionListener(this);
@@ -329,6 +320,7 @@ public class TextViewer extends Viewer implements
 		/*
 		 * @see SelectionListener#widgetSelected
 		 */
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			if (e.widget == fScroller)
 				updateViewportListeners(SCROLLER);
@@ -339,6 +331,7 @@ public class TextViewer extends Viewer implements
 		/*
 		 * @see SelectionListener#widgetDefaultSelected
 		 */
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {}
 	}
 
@@ -360,6 +353,7 @@ public class TextViewer extends Viewer implements
 		 * If an insertion happens at the selection's start offset,
 		 * the position is extended rather than shifted.
 		 */
+		@Override
 		protected void adaptToInsert() {
 
 			int myStart= fPosition.offset;
@@ -391,6 +385,7 @@ public class TextViewer extends Viewer implements
 		/*
 		 * @see IDocumentListener#documentAboutToBeChanged
 		 */
+		@Override
 		public void documentAboutToBeChanged(DocumentEvent e) {
 			if (e.getDocument() == getVisibleDocument())
 				fWidgetCommand.setEvent(e);
@@ -400,6 +395,7 @@ public class TextViewer extends Viewer implements
 		/*
 		 * @see IDocumentListener#documentChanged
 		 */
+		@Override
 		public void documentChanged(DocumentEvent e) {
 			if (fWidgetCommand.event == e)
 				updateTextListeners(fWidgetCommand);
@@ -429,9 +425,7 @@ public class TextViewer extends Viewer implements
 			fForward= forward;
 		}
 
-		/*
-		 * @see VerifyListener#verifyText(VerifyEvent)
-		 */
+		@Override
 		public void verifyText(VerifyEvent e) {
 			if (fForward)
 				handleVerifyEvent(e);
@@ -478,9 +472,7 @@ public class TextViewer extends Viewer implements
 		/** The reentrance count. */
 		private int fReentranceCount= 0;
 
-		/*
-		 * @see VerifyKeyListener#verifyKey(VerifyEvent)
-		 */
+		@Override
 		public void verifyKey(VerifyEvent event) {
 			if (fListeners.isEmpty())
 				return;
@@ -669,10 +661,7 @@ public class TextViewer extends Viewer implements
 			paint();
 		}
 
-		/*
-		 * @see LineBackgroundListener#lineGetBackground(LineBackgroundEvent)
-		 * @since 2.0
-		 */
+		@Override
 		public void lineGetBackground(LineBackgroundEvent event) {
 			/* Don't use cached line information because of patched redrawing events. */
 
@@ -759,19 +748,13 @@ public class TextViewer extends Viewer implements
 			fTextWidget.redrawRange(offset, length, true);
 		}
 
-		/*
-		 * @see ITextListener#textChanged(TextEvent)
-		 * @since 2.0
-		 */
+		@Override
 		public void textChanged(TextEvent event) {
 			if (event.getViewerRedrawState())
 				paint();
 		}
 
-		/*
-		 * @see IPositionUpdater#update(DocumentEvent)
-		 * @since 2.0
-		 */
+		@Override
 		public void update(DocumentEvent event) {
 			int offset= event.getOffset();
 			int length= event.getLength();
@@ -801,9 +784,7 @@ public class TextViewer extends Viewer implements
 		 */
 		private DocumentRewriteSession fRewriteSession;
 
-		/*
-		 * @see IFindReplaceTarget#getSelectionText()
-		 */
+		@Override
 		public String getSelectionText() {
 			Point s= TextViewer.this.getSelectedRange();
 			if (s.x > -1 && s.y > -1) {
@@ -816,16 +797,12 @@ public class TextViewer extends Viewer implements
 			return ""; //$NON-NLS-1$
 		}
 
-		/*
-		 * @see IFindReplaceTarget#replaceSelection(String)
-		 */
+		@Override
 		public void replaceSelection(String text) {
 			replaceSelection(text, false);
 		}
 
-		/*
-		 * @see IFindReplaceTarget#replaceSelection(String)
-		 */
+		@Override
 		public void replaceSelection(String text, boolean regExReplace) {
 			Point s= TextViewer.this.getSelectedRange();
 			if (s.x > -1 && s.y > -1) {
@@ -842,25 +819,19 @@ public class TextViewer extends Viewer implements
 			}
 		}
 
-		/*
-		 * @see IFindReplaceTarget#isEditable()
-		 */
+		@Override
 		public boolean isEditable() {
 			return TextViewer.this.isEditable();
 		}
 
-		/*
-		 * @see IFindReplaceTarget#getSelection()
-		 */
+		@Override
 		public Point getSelection() {
 			Point modelSelection= TextViewer.this.getSelectedRange();
 			Point widgetSelection= modelSelection2WidgetSelection(modelSelection);
 			return widgetSelection != null ? widgetSelection : new Point(-1, -1);
 		}
 
-		/*
-		 * @see IFindReplaceTarget#findAndSelect(int, String, boolean, boolean, boolean)
-		 */
+		@Override
 		public int findAndSelect(int widgetOffset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord) {
 			try {
 				return findAndSelect(widgetOffset, findString, searchForward, caseSensitive, wholeWord, false);
@@ -869,9 +840,7 @@ public class TextViewer extends Viewer implements
 			}
 		}
 
-		/*
-		 * @see IFindReplaceTarget#findAndSelect(int, String, boolean, boolean, boolean)
-		 */
+		@Override
 		public int findAndSelect(int widgetOffset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord, boolean regExSearch) {
 
 			int modelOffset= widgetOffset == -1 ? -1 : widgetOffset2ModelOffset(widgetOffset);
@@ -887,25 +856,17 @@ public class TextViewer extends Viewer implements
 			return widgetOffset;
 		}
 
-		/*
-		 * @see IFindReplaceTarget#canPerformFind()
-		 */
+		@Override
 		public boolean canPerformFind() {
 			return TextViewer.this.canPerformFind();
 		}
 
-		/*
-		 * @see IFindReplaceTargetExtension#beginSession()
-		 * @since 2.0
-		 */
+		@Override
 		public void beginSession() {
 			fRange= null;
 		}
 
-		/*
-		 * @see IFindReplaceTargetExtension#endSession()
-		 * @since 2.0
-		 */
+		@Override
 		public void endSession() {
 			if (fRange != null) {
 				fRange.uninstall();
@@ -913,18 +874,12 @@ public class TextViewer extends Viewer implements
 			}
 		}
 
-		/*
-		 * @see IFindReplaceTargetExtension#getScope()
-		 * @since 2.0
-		 */
+		@Override
 		public IRegion getScope() {
 			return fRange == null ? null : fRange.getRange();
 		}
 
-		/*
-		 * @see IFindReplaceTargetExtension#getLineSelection()
-		 * @since 2.0
-		 */
+		@Override
 		public Point getLineSelection() {
 			Point point= TextViewer.this.getSelectedRange();
 
@@ -952,18 +907,12 @@ public class TextViewer extends Viewer implements
 			}
 		}
 
-		/*
-		 * @see IFindReplaceTargetExtension#setSelection(int, int)
-		 * @since 2.0
-		 */
+		@Override
 		public void setSelection(int modelOffset, int modelLength) {
 			TextViewer.this.setSelectedRange(modelOffset, modelLength);
 		}
 
-		/*
-		 * @see IFindReplaceTargetExtension#setScope(IRegion)
-		 * @since 2.0
-		 */
+		@Override
 		public void setScope(IRegion scope) {
 			if (fRange != null)
 				fRange.uninstall();
@@ -978,20 +927,14 @@ public class TextViewer extends Viewer implements
 			fRange.install();
 		}
 
-		/*
-		 * @see IFindReplaceTargetExtension#setScopeHighlightColor(Color)
-		 * @since 2.0
-		 */
+		@Override
 		public void setScopeHighlightColor(Color color) {
 			if (fRange != null)
 				fRange.setHighlightColor(color);
 			fScopeHighlightColor= color;
 		}
 
-		/*
-		 * @see IFindReplaceTargetExtension#setReplaceAllMode(boolean)
-		 * @since 2.0
-		 */
+		@Override
 		public void setReplaceAllMode(boolean replaceAll) {
 
 			// http://bugs.eclipse.org/bugs/show_bug.cgi?id=18232
@@ -1039,32 +982,24 @@ public class TextViewer extends Viewer implements
 	 */
 	class RewriteTarget implements IRewriteTarget {
 
-		/*
-		 * @see org.eclipse.jface.text.IRewriteTarget#beginCompoundChange()
-		 */
+		@Override
 		public void beginCompoundChange() {
 			if (fUndoManager != null)
 				fUndoManager.beginCompoundChange();
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.IRewriteTarget#endCompoundChange()
-		 */
+		@Override
 		public void endCompoundChange() {
 			if (fUndoManager != null)
 				fUndoManager.endCompoundChange();
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.IRewriteTarget#getDocument()
-		 */
+		@Override
 		public IDocument getDocument() {
 			return TextViewer.this.getDocument();
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.IRewriteTarget#setRedraw(boolean)
-		 */
+		@Override
 		public void setRedraw(boolean redraw) {
 			TextViewer.this.setRedraw(redraw);
 		}
@@ -1096,9 +1031,7 @@ public class TextViewer extends Viewer implements
 			fStateMask= stateMask;
 		}
 
-		/*
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
+		@Override
 		public boolean equals(Object obj) {
 			if (obj == null || obj.getClass() != getClass())
 				return false;
@@ -1106,9 +1039,7 @@ public class TextViewer extends Viewer implements
 			return textHoverKey.fContentType.equals(fContentType) && textHoverKey.fStateMask == fStateMask;
 		}
 
-		/*
-		 * @see java.lang.Object#hashCode()
-		 */
+		@Override
 		public int hashCode() {
 	 		return fStateMask << 16 | fContentType.hashCode();
 		}
@@ -1404,15 +1335,14 @@ public class TextViewer extends Viewer implements
 			}
 		}
 
-		/*
-		 * @see KeyListener#keyPressed(org.eclipse.swt.events.KeyEvent)
-		 */
+		@Override
 		public void keyPressed(KeyEvent event) {
 		}
 
 		/*
 		 * @see KeyListener#keyPressed(org.eclipse.swt.events.KeyEvent)
 		 */
+		@Override
 		public void keyReleased(KeyEvent e) {
 			if (!fTextWidget.isTextSelected()) {
 				fLastSentSelectionChange= null;
@@ -1420,21 +1350,15 @@ public class TextViewer extends Viewer implements
 			}
 		}
 
-		/*
-		 * @see MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseDoubleClick(MouseEvent e) {
 		}
 
-		/*
-		 * @see MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseDown(MouseEvent e) {
 		}
 
-		/*
-		 * @see MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseUp(MouseEvent event) {
 			if (!fTextWidget.isTextSelected())
 				queuePostSelectionChanged(false);
@@ -1447,9 +1371,7 @@ public class TextViewer extends Viewer implements
 	 */
 	private class DocumentRewriteSessionListener implements IDocumentRewriteSessionListener {
 
-		/*
-		 * @see org.eclipse.jface.text.IDocumentRewriteSessionListener#documentRewriteSessionChanged(org.eclipse.jface.text.DocumentRewriteSessionEvent)
-		 */
+		@Override
 		public void documentRewriteSessionChanged(DocumentRewriteSessionEvent event) {
 			IRewriteTarget target= TextViewer.this.getRewriteTarget();
 			final boolean toggleRedraw;
@@ -1779,6 +1701,7 @@ public class TextViewer extends Viewer implements
 		// Support scroll page upon MOD1+MouseWheel
 		fTextWidget.addListener(SWT.MouseVerticalWheel, new Listener() {
 
+			@Override
 			public void handleEvent(Event event) {
 				if (((event.stateMask & SWT.MOD1) == 0))
 					return;
@@ -1797,6 +1720,7 @@ public class TextViewer extends Viewer implements
 
 		fTextWidget.addDisposeListener(
 			new DisposeListener() {
+				@Override
 				public void widgetDisposed(DisposeEvent e) {
 					fDisposedControl= getControl();
 					handleDispose();
@@ -1812,6 +1736,7 @@ public class TextViewer extends Viewer implements
 		 * 1GIYQ9K: ITPUI:WINNT - StyledText swallows Shift+TAB
 		 */
 		fTextWidget.addTraverseListener(new TraverseListener() {
+			@Override
 			public void keyTraversed(TraverseEvent e) {
 				if ((SWT.SHIFT == e.stateMask) && ('\t' == e.character))
 					e.doit= !fTextWidget.getEditable();
@@ -1825,9 +1750,11 @@ public class TextViewer extends Viewer implements
 		fTextWidget.addVerifyListener(fVerifyListener);
 
 		fTextWidget.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetDefaultSelected(SelectionEvent event) {
 				selectionChanged(event.x, event.y - event.x);
 			}
+			@Override
 			public void widgetSelected(SelectionEvent event) {
 				selectionChanged(event.x, event.y - event.x);
 			}
@@ -1839,16 +1766,12 @@ public class TextViewer extends Viewer implements
 		initializeViewportUpdate();
 	}
 
-	/*
-	 * @see Viewer#getControl()
-	 */
+	@Override
 	public Control getControl() {
 		return fTextWidget != null ? fTextWidget : fDisposedControl;
 	}
 
-	/*
-	 * @see ITextViewer#activatePlugins()
-	 */
+	@Override
 	public void activatePlugins() {
 
 		if (fDoubleClickStrategies != null && !fDoubleClickStrategies.isEmpty() && fDoubleClickStrategyConnector == null) {
@@ -1878,9 +1801,7 @@ public class TextViewer extends Viewer implements
 		}
 	}
 
-	/*
-	 * @see ITextViewer#resetPlugins()
-	 */
+	@Override
 	public void resetPlugins() {
 		if (fUndoManager != null)
 			fUndoManager.reset();
@@ -1987,9 +1908,7 @@ public class TextViewer extends Viewer implements
 
 	//---- simple getters and setters
 
-	/*
-	 * @see org.eclipse.jface.text.ITextViewer#getTextWidget()
-	 */
+	@Override
 	public StyledText getTextWidget() {
 		return fTextWidget;
 	}
@@ -2019,6 +1938,8 @@ public class TextViewer extends Viewer implements
 	 *             {@link ITextViewerExtension2#prependAutoEditStrategy(IAutoEditStrategy, String)} and
 	 *             {@link ITextViewerExtension2#removeAutoEditStrategy(IAutoEditStrategy, String)} instead
 	 */
+	@Deprecated
+	@Override
 	public void setAutoIndentStrategy(IAutoIndentStrategy strategy, String contentType) {
 		setAutoEditStrategies(new IAutoEditStrategy[] { strategy }, contentType);
 	}
@@ -2053,10 +1974,7 @@ public class TextViewer extends Viewer implements
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextViewerExtension2#prependAutoEditStrategy(org.eclipse.jface.text.IAutoEditStrategy, java.lang.String)
-	 * @since 2.1
-	 */
+	@Override
 	public void prependAutoEditStrategy(IAutoEditStrategy strategy, String contentType) {
 
 		if (strategy == null || contentType == null)
@@ -2074,10 +1992,7 @@ public class TextViewer extends Viewer implements
 		autoEditStrategies.add(0, strategy);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextViewerExtension2#removeAutoEditStrategy(org.eclipse.jface.text.IAutoEditStrategy, java.lang.String)
-	 * @since 2.1
-	 */
+	@Override
 	public void removeAutoEditStrategy(IAutoEditStrategy strategy, String contentType) {
 		if (fAutoIndentStrategies == null)
 			return;
@@ -2097,16 +2012,12 @@ public class TextViewer extends Viewer implements
 			fAutoIndentStrategies.put(contentType, null);
 	}
 
-	/*
-	 * @see ITextViewer#setEventConsumer(IEventConsumer)
-	 */
+	@Override
 	public void setEventConsumer(IEventConsumer consumer) {
 		fEventConsumer= consumer;
 	}
 
-	/*
-	 * @see ITextViewer#setIndentPrefixes(String[], String)
-	 */
+	@Override
 	public void setIndentPrefixes(String[] indentPrefixes, String contentType) {
 
 		int i= -1;
@@ -2125,25 +2036,19 @@ public class TextViewer extends Viewer implements
 			fIndentChars.remove(contentType);
 	}
 
-	/*
-	 * @see ITextViewer#getTopInset()
-	 */
+	@Override
 	public int getTopInset() {
 		return fTopInset;
 	}
 
-	/*
-	 * @see ITextViewer#isEditable()
-	 */
+	@Override
 	public boolean isEditable() {
 		if (fTextWidget == null)
 			return false;
 		return fTextWidget.getEditable();
 	}
 
-	/*
-	 * @see ITextViewer#setEditable(boolean)
-	 */
+	@Override
 	public void setEditable(boolean editable) {
 		if (fTextWidget != null)
 			fTextWidget.setEditable(editable);
@@ -2153,6 +2058,7 @@ public class TextViewer extends Viewer implements
 	 * @see ITextViewer#setDefaultPrefixes
 	 * @since 2.0
 	 */
+	@Override
 	public void setDefaultPrefixes(String[] defaultPrefixes, String contentType) {
 
 		if (defaultPrefixes != null && defaultPrefixes.length > 0) {
@@ -2163,32 +2069,22 @@ public class TextViewer extends Viewer implements
 			fDefaultPrefixChars.remove(contentType);
 	}
 
-	/*
-	 * @see ITextViewer#setUndoManager(IUndoManager)
-	 */
+	@Override
 	public void setUndoManager(IUndoManager undoManager) {
 		fUndoManager= undoManager;
 	}
 
-	/*
-	 * @see ITextViewerExtension6#getUndoManager()
-	 * @since 3.1
-	 */
+	@Override
 	public IUndoManager getUndoManager() {
 		return fUndoManager;
 	}
 
-	/*
-	 * @see ITextViewer#setTextHover(ITextHover, String)
-	 */
+	@Override
 	public void setTextHover(ITextHover hover, String contentType) {
 		setTextHover(hover, contentType, ITextViewerExtension2.DEFAULT_HOVER_STATE_MASK);
 	}
 
-	/*
-	 * @see ITextViewerExtension2#setTextHover(ITextHover, String, int)
-	 * @since 2.1
-	 */
+	@Override
 	public void setTextHover(ITextHover hover, String contentType, int stateMask) {
 		TextHoverKey key= new TextHoverKey(contentType, stateMask);
 		if (hover != null) {
@@ -2202,10 +2098,7 @@ public class TextViewer extends Viewer implements
 		ensureHoverControlManagerInstalled();
 	}
 
-	/*
-	 * @see ITextViewerExtension2#removeTextHovers(String)
-	 * @since 2.1
-	 */
+	@Override
 	public void removeTextHovers(String contentType) {
 		if (fTextHovers == null)
 			return;
@@ -2285,17 +2178,15 @@ public class TextViewer extends Viewer implements
 	 *
 	 * @since 3.4
 	 */
+	@Override
 	public void setHoverEnrichMode(ITextViewerExtension8.EnrichMode mode) {
 		if (fTextHoverManager == null)
 			return;
 		fTextHoverManager.setHoverEnrichMode(mode);
 	}
 
-	/*
-	 * @see IWidgetTokenOwner#requestWidgetToken(IWidgetTokenKeeper)
-	 * @since 2.0
-	 */
-	 public boolean requestWidgetToken(IWidgetTokenKeeper requester) {
+	 @Override
+	public boolean requestWidgetToken(IWidgetTokenKeeper requester) {
 		 if (fTextWidget != null) {
 			 if (fWidgetTokenKeeper != null) {
 				 if (fWidgetTokenKeeper == requester)
@@ -2312,10 +2203,7 @@ public class TextViewer extends Viewer implements
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenOwnerExtension#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenKeeper, int)
-	 * @since 3.0
-	 */
+	@Override
 	public boolean requestWidgetToken(IWidgetTokenKeeper requester, int priority) {
 		if (fTextWidget != null) {
 			if (fWidgetTokenKeeper != null) {
@@ -2344,10 +2232,7 @@ public class TextViewer extends Viewer implements
 	   return false;
    }
 
-	/*
-	 * @see IWidgetTokenOwner#releaseWidgetToken(IWidgetTokenKeeper)
-	 * @since 2.0
-	 */
+	@Override
 	public void releaseWidgetToken(IWidgetTokenKeeper tokenKeeper) {
 		if (fWidgetTokenKeeper == tokenKeeper)
 			fWidgetTokenKeeper= null;
@@ -2356,9 +2241,7 @@ public class TextViewer extends Viewer implements
 
 	//---- Selection
 
-	/*
-	 * @see ITextViewer#getSelectedRange()
-	 */
+	@Override
 	public Point getSelectedRange() {
 
 		if (!redraws() && fViewerState != null)
@@ -2374,9 +2257,7 @@ public class TextViewer extends Viewer implements
 		return new Point(-1, -1);
 	}
 
-	/*
-	 * @see ITextViewer#setSelectedRange(int, int)
-	 */
+	@Override
 	public void setSelectedRange(int selectionOffset, int selectionLength) {
 
 		if (!redraws()) {
@@ -2485,9 +2366,7 @@ public class TextViewer extends Viewer implements
 		}
 	}
 
-	/*
-	 * @see Viewer#setSelection(ISelection)
-	 */
+	@Override
 	public void setSelection(ISelection selection, boolean reveal) {
 		if (selection instanceof IBlockTextSelection && getTextWidget().getBlockSelection()) {
 			IBlockTextSelection s= (IBlockTextSelection) selection;
@@ -2536,9 +2415,7 @@ public class TextViewer extends Viewer implements
 		}
 	}
 
-	/*
-	 * @see Viewer#getSelection()
-	 */
+	@Override
 	public ISelection getSelection() {
 		if (fTextWidget != null && fTextWidget.getBlockSelection()) {
 			int[] ranges= fTextWidget.getSelectionRanges();
@@ -2598,17 +2475,12 @@ public class TextViewer extends Viewer implements
 		return diff > 0 ? diff / avgCharWidth : 0;
 	}
 
-	/*
-	 * @see ITextViewer#getSelectionProvider()
-	 */
+	@Override
 	public ISelectionProvider getSelectionProvider() {
 		return this;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPostSelectionProvider#addPostSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 * @since 3.0
-	 */
+	@Override
 	public void addPostSelectionChangedListener(ISelectionChangedListener listener)  {
 
 		Assert.isNotNull(listener);
@@ -2620,10 +2492,7 @@ public class TextViewer extends Viewer implements
 			fPostSelectionChangedListeners.add(listener);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPostSelectionProvider#removePostSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 * @since 3.0
-	 */
+	@Override
 	public void removePostSelectionChangedListener(ISelectionChangedListener listener)  {
 
 		Assert.isNotNull(listener);
@@ -2666,6 +2535,7 @@ public class TextViewer extends Viewer implements
 		fNumberOfPostSelectionChangedEvents[0]++;
 		display.timerExec(getEmptySelectionChangedEventDelay(), new Runnable() {
 			final int id= fNumberOfPostSelectionChangedEvents[0];
+			@Override
 			public void run() {
 				if (id == fNumberOfPostSelectionChangedEvents[0]) {
 					// Check again because this is executed after the delay
@@ -2778,9 +2648,7 @@ public class TextViewer extends Viewer implements
 
 	//---- Text listeners
 
-	/*
-	 * @see ITextViewer#addTextListener(ITextListener)
-	 */
+	@Override
 	public void addTextListener(ITextListener listener) {
 
 		Assert.isNotNull(listener);
@@ -2792,9 +2660,7 @@ public class TextViewer extends Viewer implements
 			fTextListeners.add(listener);
 	}
 
-	/*
-	 * @see ITextViewer#removeTextListener(ITextListener)
-	 */
+	@Override
 	public void removeTextListener(ITextListener listener) {
 
 		Assert.isNotNull(listener);
@@ -2830,9 +2696,7 @@ public class TextViewer extends Viewer implements
 
 	//---- Text input listeners
 
-	/*
-	 * @see ITextViewer#addTextInputListener(ITextInputListener)
-	 */
+	@Override
 	public void addTextInputListener(ITextInputListener listener) {
 
 		Assert.isNotNull(listener);
@@ -2844,9 +2708,7 @@ public class TextViewer extends Viewer implements
 			fTextInputListeners.add(listener);
 	}
 
-	/*
-	 * @see ITextViewer#removeTextInputListener(ITextInputListener)
-	 */
+	@Override
 	public void removeTextInputListener(ITextInputListener listener) {
 
 		Assert.isNotNull(listener);
@@ -2894,23 +2756,17 @@ public class TextViewer extends Viewer implements
 
 	//---- Document
 
-	/*
-	 * @see Viewer#getInput()
-	 */
+	@Override
 	public Object getInput() {
 		return getDocument();
 	}
 
-	/*
-	 * @see ITextViewer#getDocument()
-	 */
+	@Override
 	public IDocument getDocument() {
 		return fDocument;
 	}
 
-	/*
-	 * @see Viewer#setInput(Object)
-	 */
+	@Override
 	public void setInput(Object input) {
 
 		IDocument document= null;
@@ -2920,9 +2776,7 @@ public class TextViewer extends Viewer implements
 		setDocument(document);
 	}
 
-	/*
-	 * @see ITextViewer#setDocument(IDocument)
-	 */
+	@Override
 	public void setDocument(IDocument document) {
 
 		fReplaceTextPresentation= true;
@@ -2941,9 +2795,7 @@ public class TextViewer extends Viewer implements
 		fReplaceTextPresentation= false;
 	}
 
-	/*
-	 * @see ITextViewer#setDocument(IDocument, int, int)
-	 */
+	@Override
 	public void setDocument(IDocument document, int modelRangeOffset, int modelRangeLength) {
 
 		fReplaceTextPresentation= true;
@@ -2999,6 +2851,7 @@ public class TextViewer extends Viewer implements
 	 * @since 2.1
  	 * @deprecated use <code>updateSlaveDocument</code> instead
 	 */
+	@Deprecated
 	protected boolean updateVisibleDocument(IDocument visibleDocument, int visibleRegionOffset, int visibleRegionLength) throws BadLocationException {
 		if (visibleDocument instanceof ChildDocument) {
 			ChildDocument childDocument= (ChildDocument) visibleDocument;
@@ -3080,9 +2933,7 @@ public class TextViewer extends Viewer implements
 		}
 	}
 
-	/*
-	 * @see ITextViewer#addViewportListener(IViewportListener)
-	 */
+	@Override
 	public void addViewportListener(IViewportListener listener) {
 
 		if (fViewportListeners == null) {
@@ -3094,9 +2945,7 @@ public class TextViewer extends Viewer implements
 			fViewportListeners.add(listener);
 	}
 
-	/*
-	 * @see ITextViewer#removeViewportListener(IVewportListener)
-	 */
+	@Override
 	public void removeViewportListener(IViewportListener listener) {
 		if (fViewportListeners != null)
 			fViewportListeners.remove(listener);
@@ -3128,9 +2977,7 @@ public class TextViewer extends Viewer implements
 
 	//---- scrolling and revealing
 
-	/*
-	 * @see ITextViewer#getTopIndex()
-	 */
+	@Override
 	public int getTopIndex() {
 
 		if (fTextWidget != null) {
@@ -3141,9 +2988,7 @@ public class TextViewer extends Viewer implements
 		return -1;
 	}
 
-	/*
-	 * @see ITextViewer#setTopIndex(int)
-	 */
+	@Override
 	public void setTopIndex(int index) {
 
 		if (fTextWidget != null) {
@@ -3169,6 +3014,7 @@ public class TextViewer extends Viewer implements
 	 * @return the view port height in lines
 	 * @deprecated as of 3.2
 	 */
+	@Deprecated
 	protected int getVisibleLinesInViewport() {
 		if (fTextWidget != null) {
 			Rectangle clArea= fTextWidget.getClientArea();
@@ -3178,9 +3024,7 @@ public class TextViewer extends Viewer implements
 		return -1;
 	}
 
-	/*
-	 * @see ITextViewer#getBottomIndex()
-	 */
+	@Override
 	public int getBottomIndex() {
 
 		if (fTextWidget == null)
@@ -3190,9 +3034,7 @@ public class TextViewer extends Viewer implements
 		return widgetLine2ModelLine(widgetBottom);
 	}
 
-	/*
-	 * @see ITextViewer#getTopIndexStartOffset()
-	 */
+	@Override
 	public int getTopIndexStartOffset() {
 
 		if (fTextWidget != null) {
@@ -3209,9 +3051,7 @@ public class TextViewer extends Viewer implements
 		return -1;
 	}
 
-	/*
-	 * @see ITextViewer#getBottomIndexEndOffset()
-	 */
+	@Override
 	public int getBottomIndexEndOffset() {
 		try {
 
@@ -3232,9 +3072,7 @@ public class TextViewer extends Viewer implements
 		}
 	}
 
-	/*
-	 * @see ITextViewer#revealRange(int, int)
-	 */
+	@Override
 	public void revealRange(int start, int length) {
 
 		if (fTextWidget == null || !redraws())
@@ -3383,6 +3221,7 @@ public class TextViewer extends Viewer implements
 	 * @return the width of the presentation of the given string
 	 * @deprecated use <code>getWidthInPixels(int, int)</code> instead
 	 */
+	@Deprecated
 	final protected int getWidthInPixels(String text) {
 		GC gc= new GC(fTextWidget);
 		gc.setFont(fTextWidget.getFont());
@@ -3434,9 +3273,7 @@ public class TextViewer extends Viewer implements
 		return JFaceTextUtil.getAverageCharWidth(getTextWidget());
 	}
 
-	/*
-	 * @see Viewer#refresh()
-	 */
+	@Override
 	public void refresh() {
 		setDocument(getDocument());
 	}
@@ -3466,9 +3303,7 @@ public class TextViewer extends Viewer implements
 		return new ChildDocumentManager();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextViewer#invalidateTextPresentation()
-	 */
+	@Override
 	public final void invalidateTextPresentation() {
 		if (fVisibleDocument != null) {
 			fWidgetCommand.event= null;
@@ -3486,6 +3321,7 @@ public class TextViewer extends Viewer implements
 	 * @param length the length of the range to be invalidated
 	 * @since 2.1
 	 */
+	@Override
 	public final void invalidateTextPresentation(int offset, int length) {
 		if (fVisibleDocument != null) {
 
@@ -3627,9 +3463,7 @@ public class TextViewer extends Viewer implements
 		return 0;
 	}
 
-	/*
-	 * @see ITextViewer#getVisibleRegion()
-	 */
+	@Override
 	public IRegion getVisibleRegion() {
 
 		IDocument document= getVisibleDocument();
@@ -3641,9 +3475,7 @@ public class TextViewer extends Viewer implements
 		return new Region(0, document == null ? 0 : document.getLength());
 	}
 
-	/*
-	 * @see ITextViewer#overlapsWithVisibleRegion(int, int)
-	 */
+	@Override
 	public boolean overlapsWithVisibleRegion(int start, int length) {
 		IDocument document= getVisibleDocument();
 		if (document instanceof ChildDocument) {
@@ -3656,9 +3488,7 @@ public class TextViewer extends Viewer implements
 		return false;
 	}
 
-	/*
-	 * @see ITextViewer#setVisibleRegion(int, int)
-	 */
+	@Override
 	public void setVisibleRegion(int start, int length) {
 
 		IRegion region= getVisibleRegion();
@@ -3681,9 +3511,7 @@ public class TextViewer extends Viewer implements
 		}
 	}
 
-	/*
-	 * @see ITextViewer#resetVisibleRegion()
-	 */
+	@Override
 	public void resetVisibleRegion() {
 		ISlaveDocumentManager manager= getSlaveDocumentManager();
 		if (manager != null) {
@@ -3699,9 +3527,7 @@ public class TextViewer extends Viewer implements
 
 	//--------------------------------------
 
-	/*
-	 * @see ITextViewer#setTextDoubleClickStrategy(ITextDoubleClickStrategy, String)
-	 */
+	@Override
 	public void setTextDoubleClickStrategy(ITextDoubleClickStrategy strategy, String contentType) {
 
 		if (strategy != null) {
@@ -3889,6 +3715,7 @@ public class TextViewer extends Viewer implements
 		fLastEventTime= e.time;
 		if (isFirst) {
 			wrapCompoundChange(new Runnable() {
+				@Override
 				public void run() {
 					SelectionProcessor processor= new SelectionProcessor(TextViewer.this);
 					try {
@@ -3937,9 +3764,7 @@ public class TextViewer extends Viewer implements
 			modelRange2WidgetRange(fMarkPosition) == null;
 	}
 
-	/*
-	 * @see ITextViewer#canDoOperation(int)
-	 */
+	@Override
 	public boolean canDoOperation(int operation) {
 
 		if (fTextWidget == null || !redraws())
@@ -3979,9 +3804,7 @@ public class TextViewer extends Viewer implements
 		return false;
 	}
 
-	/*
-	 * @see ITextViewer#doOperation(int)
-	 */
+	@Override
 	public void doOperation(int operation) {
 
 		if (fTextWidget == null || !redraws())
@@ -4010,6 +3833,7 @@ public class TextViewer extends Viewer implements
 					copyMarkedRegion(true);
 				else
 					wrapCompoundChange(new Runnable() {
+						@Override
 						public void run() {
 							fTextWidget.cut();
 						}
@@ -4080,6 +3904,7 @@ public class TextViewer extends Viewer implements
 			fTextWidget.invokeAction(ST.DELETE_NEXT);
 		} else {
 			wrapCompoundChange(new Runnable(){
+				@Override
 				public void run() {
 					try {
 						new SelectionProcessor(TextViewer.this).doDelete(getSelection());
@@ -4100,6 +3925,7 @@ public class TextViewer extends Viewer implements
 			fTextWidget.paste();
 		} else {
 			wrapCompoundChange(new Runnable(){
+				@Override
 				public void run() {
 					SelectionProcessor processor= new SelectionProcessor(TextViewer.this);
 					Clipboard clipboard= new Clipboard(getDisplay());
@@ -4207,10 +4033,7 @@ public class TextViewer extends Viewer implements
 		return fIgnoreAutoIndent;
 	}
 
-	/*
-	 * @see ITextOperationTargetExtension#enableOperation(int, boolean)
-	 * @since 2.0
-	 */
+	@Override
 	public void enableOperation(int operation, boolean enable) {
 		/*
 		 * NO-OP by default.
@@ -4241,6 +4064,7 @@ public class TextViewer extends Viewer implements
 
 		if (delete) {
 			wrapCompoundChange(new Runnable() {
+				@Override
 				public void run() {
 					fTextWidget.cut();
 				}
@@ -4258,6 +4082,7 @@ public class TextViewer extends Viewer implements
 	 *
 	 * @deprecated use <code>StyledText.invokeAction</code> instead
 	 */
+	@Deprecated
 	protected void deleteText() {
 		fTextWidget.invokeAction(ST.DELETE_NEXT);
 	}
@@ -4374,6 +4199,7 @@ public class TextViewer extends Viewer implements
 	 *
 	 * @deprecated use shift(boolean, boolean, boolean) instead
 	 */
+	@Deprecated
 	protected void shift(boolean useDefaultPrefixes, boolean right) {
 		shift(useDefaultPrefixes, right, false);
 	}
@@ -4562,6 +4388,7 @@ public class TextViewer extends Viewer implements
 	 *
 	 * @since 3.4
 	 */
+	@Override
 	public void print(StyledTextPrintOptions options) {
 		final Shell shell= fTextWidget.getShell();
 
@@ -4581,6 +4408,7 @@ public class TextViewer extends Viewer implements
 			final Runnable styledTextPrinter= fTextWidget.print(printer, options);
 
 			Thread printingThread= new Thread("Printing") { //$NON-NLS-1$
+				@Override
 				public void run() {
 					styledTextPrinter.run();
 					printer.dispose();
@@ -4635,6 +4463,7 @@ public class TextViewer extends Viewer implements
 	 * @return the model offset of the first match
 	 * @deprecated as of 3.0 use {@link #findAndSelect(int, String, boolean, boolean, boolean, boolean)}
 	 */
+	@Deprecated
 	protected int findAndSelect(int startPosition, String findString, boolean forwardSearch, boolean caseSensitive, boolean wholeWord) {
 		try {
 			return findAndSelect(startPosition, findString, forwardSearch, caseSensitive, wholeWord, false);
@@ -4780,17 +4609,13 @@ public class TextViewer extends Viewer implements
 
 	//---------- text presentation support
 
-	/*
-	 * @see ITextViewer#setTextColor(Color)
-	 */
+	@Override
 	public void setTextColor(Color color) {
 		if (color != null)
 			setTextColor(color, 0, getDocument().getLength(), true);
 	}
 
-	/*
-	 * @see ITextViewer#setTextColor(Color, start, length, boolean)
-	 */
+	@Override
 	public void setTextColor(Color color, int start, int length, boolean controlRedraw) {
 		if (fTextWidget != null) {
 
@@ -4902,9 +4727,7 @@ public class TextViewer extends Viewer implements
 		return null;
 	}
 
-	/*
-	 * @see ITextViewer#changeTextPresentation(TextPresentation, boolean)
-	 */
+	@Override
 	public void changeTextPresentation(TextPresentation presentation, boolean controlRedraw) {
 
 		if (presentation == null || !redraws())
@@ -4941,9 +4764,7 @@ public class TextViewer extends Viewer implements
 			fTextWidget.setRedraw(true);
 	}
 
-	/*
-	 * @see ITextViewer#getFindReplaceTarget()
-	 */
+	@Override
 	public IFindReplaceTarget getFindReplaceTarget() {
 		if (fFindReplaceTarget == null)
 			fFindReplaceTarget= new FindReplaceTarget();
@@ -4962,51 +4783,34 @@ public class TextViewer extends Viewer implements
 		return fFindReplaceDocumentAdapter;
 	}
 
-	/*
-	 * @see ITextViewer#getTextOperationTarget()
-	 */
+	@Override
 	public ITextOperationTarget getTextOperationTarget() {
 		return this;
 	}
 
-	/*
-	 * @see ITextViewerExtension#appendVerifyKeyListener(VerifyKeyListener)
-	 * @since 2.0
-	 */
+	@Override
 	public void appendVerifyKeyListener(VerifyKeyListener listener) {
 		int index= fVerifyKeyListenersManager.numberOfListeners();
 		fVerifyKeyListenersManager.insertListener(listener, index);
 	}
 
-	/*
-	 * @see ITextViewerExtension#prependVerifyKeyListener(VerifyKeyListener)
-	 * @since 2.0
-	 */
+	@Override
 	public void prependVerifyKeyListener(VerifyKeyListener listener) {
 		fVerifyKeyListenersManager.insertListener(listener, 0);
 
 	}
 
-	/*
-	 * @see ITextViewerExtension#removeVerifyKeyListener(VerifyKeyListener)
-	 * @since 2.0
-	 */
+	@Override
 	public void removeVerifyKeyListener(VerifyKeyListener listener) {
 		fVerifyKeyListenersManager.removeListener(listener);
 	}
 
-	/*
-	 * @see ITextViewerExtension#getMark()
-	 * @since 2.0
-	 */
+	@Override
 	public int getMark() {
 		return fMarkPosition == null || fMarkPosition.isDeleted() ? -1 : fMarkPosition.getOffset();
 	}
 
-	/*
-	 * @see ITextViewerExtension#setMark(int)
-	 * @since 2.0
-	 */
+	@Override
 	public void setMark(int offset) {
 
 		// clear
@@ -5052,10 +4856,7 @@ public class TextViewer extends Viewer implements
 		}
 	}
 
-	/*
-	 * @see Viewer#inputChanged(Object, Object)
-	 * @since 2.0
-	 */
+	@Override
 	protected void inputChanged(Object newInput, Object oldInput) {
 
 		IDocument oldDocument= (IDocument) oldInput;
@@ -5164,10 +4965,7 @@ public class TextViewer extends Viewer implements
 		fireRedrawChanged();
 	}
 
-	/*
-	 * @see ITextViewerExtension#setRedraw(boolean)
-	 * @since 2.0
-	 */
+	@Override
 	public final void setRedraw(boolean redraw) {
 		setRedraw(redraw, -1);
 	}
@@ -5219,6 +5017,7 @@ public class TextViewer extends Viewer implements
 	 * @since 2.0
 	 * @deprecated since 3.1 use {@link IDocumentExtension4#startRewriteSession(DocumentRewriteSessionType)} instead
 	 */
+	@Deprecated
 	protected final void startSequentialRewriteMode(boolean normalized) {
 		IDocument document= getDocument();
 		if (document instanceof IDocumentExtension) {
@@ -5233,6 +5032,7 @@ public class TextViewer extends Viewer implements
 	 * @since 2.0
 	 * @deprecated since 3.1 use {@link IDocumentExtension4#stopRewriteSession(DocumentRewriteSession)} instead
 	 */
+	@Deprecated
 	protected final void stopSequentialRewriteMode() {
 		IDocument document= getDocument();
 		if (document instanceof IDocumentExtension) {
@@ -5241,28 +5041,21 @@ public class TextViewer extends Viewer implements
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextViewerExtension#getRewriteTarget()
-	 * @since 2.0
-	 */
+	@Override
 	public IRewriteTarget getRewriteTarget() {
 		if (fRewriteTarget == null)
 			fRewriteTarget= new RewriteTarget();
 		return fRewriteTarget;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextViewerExtension2#getCurrentTextHover()
-	 */
+	@Override
 	public ITextHover getCurrentTextHover() {
 		if (fTextHoverManager == null)
 			return null;
 		return fTextHoverManager.getCurrentTextHover();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextViewerExtension2#getHoverEventLocation()
-	 */
+	@Override
 	public Point getHoverEventLocation() {
 		if (fTextHoverManager == null)
 			return null;
@@ -5288,6 +5081,7 @@ public class TextViewer extends Viewer implements
 	 * @param painter the painter to be added
 	 * @since 2.1
 	 */
+	@Override
 	public void addPainter(IPainter painter) {
 		getPaintManager().addPainter(painter);
 	}
@@ -5299,6 +5093,7 @@ public class TextViewer extends Viewer implements
 	 * @param painter the painter to be removed
 	 * @since 2.1
 	 */
+	@Override
 	public void removePainter(IPainter painter) {
 		getPaintManager().removePainter(painter);
 	}
@@ -5626,10 +5421,7 @@ public class TextViewer extends Viewer implements
 		return -1;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextViewerExtension4#moveFocusToWidgetToken()
-	 * @since 3.0
-	 */
+	@Override
 	public boolean moveFocusToWidgetToken() {
 		if (fWidgetTokenKeeper instanceof IWidgetTokenKeeperExtension) {
 			IWidgetTokenKeeperExtension extension= (IWidgetTokenKeeperExtension) fWidgetTokenKeeper;
@@ -5661,10 +5453,7 @@ public class TextViewer extends Viewer implements
 
 	//---- Text presentation listeners ----
 
-	/*
-	 * @see ITextViewerExtension4#addTextPresentationListener(ITextPresentationListener)
-	 * @since 3.0
-	 */
+	@Override
 	public void addTextPresentationListener(ITextPresentationListener listener) {
 
 		Assert.isNotNull(listener);
@@ -5676,10 +5465,7 @@ public class TextViewer extends Viewer implements
 			fTextPresentationListeners.add(listener);
 	}
 
-	/*
-	 * @see ITextViewerExtension4#removeTextPresentationListener(ITextPresentationListener)
-	 * @since 3.0
-	 */
+	@Override
 	public void removeTextPresentationListener(ITextPresentationListener listener) {
 
 		Assert.isNotNull(listener);
@@ -5695,6 +5481,7 @@ public class TextViewer extends Viewer implements
 	 * @see org.eclipse.jface.text.IEditingSupportRegistry#registerHelper(org.eclipse.jface.text.IEditingSupport)
 	 * @since 3.1
 	 */
+	@Override
 	public void register(IEditingSupport helper) {
 		Assert.isLegal(helper != null);
 		fEditorHelpers.add(helper);
@@ -5704,6 +5491,7 @@ public class TextViewer extends Viewer implements
 	 * @see org.eclipse.jface.text.IEditingSupportRegistry#deregisterHelper(org.eclipse.jface.text.IEditingSupport)
 	 * @since 3.1
 	 */
+	@Override
 	public void unregister(IEditingSupport helper) {
 		fEditorHelpers.remove(helper);
 	}
@@ -5712,14 +5500,12 @@ public class TextViewer extends Viewer implements
 	 * @see org.eclipse.jface.text.IEditingSupportRegistry#getCurrentHelpers()
 	 * @since 3.1
 	 */
+	@Override
 	public IEditingSupport[] getRegisteredSupports() {
 		return (IEditingSupport[]) fEditorHelpers.toArray(new IEditingSupport[fEditorHelpers.size()]);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextViewerExtension6#setHyperlinkDetectors(org.eclipse.jface.text.hyperlink.IHyperlinkDetector[], int)
-	 * @since 3.1
-	 */
+	@Override
 	public void setHyperlinkDetectors(IHyperlinkDetector[] hyperlinkDetectors, int eventStateMask) {
 		if (fHyperlinkDetectors != null) {
 			for (int i= 0; i < fHyperlinkDetectors.length; i++) {
@@ -5777,10 +5563,7 @@ public class TextViewer extends Viewer implements
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextViewerExtension7#setTabsToSpacesConverter(org.eclipse.jface.text.IAutoEditStrategy)
-	 * @since 3.3
-	 */
+	@Override
 	public void setTabsToSpacesConverter(IAutoEditStrategy converter) {
 		fTabsToSpacesConverter= converter;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java
index 14e9738f468..0148a3a3b10 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerHoverManager.java
@@ -84,6 +84,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl
 		super(creator);
 		fTextViewer= textViewer;
 		fStopper= new ITextListener() {
+			@Override
 			public void textChanged(TextEvent event) {
 				synchronized (fMutex) {
 					if (fThread != null) {
@@ -94,18 +95,14 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl
 			}
 		};
 		fViewportListener= new IViewportListener() {
-			/*
-			 * @see org.eclipse.jface.text.IViewportListener#viewportChanged(int)
-			 */
+			@Override
 			public void viewportChanged(int verticalOffset) {
 				fProcessMouseHoverEvent= false;
 			}
 		};
 		fTextViewer.addViewportListener(fViewportListener);
 		fMouseMoveListener= new MouseMoveListener() {
-			/*
-			 * @see MouseMoveListener#mouseMove(MouseEvent)
-			 */
+			@Override
 			public void mouseMove(MouseEvent event) {
 				fProcessMouseHoverEvent= true;
 			}
@@ -117,6 +114,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl
 	 * Determines all necessary details and delegates the computation into
 	 * a background thread.
 	 */
+	@Override
 	protected void computeInformation() {
 
 		if (!fProcessMouseHoverEvent) {
@@ -155,6 +153,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl
 		}
 
 		fThread= new Thread("Text Viewer Hover Presenter") { //$NON-NLS-1$
+			@Override
 			public void run() {
 				// http://bugs.eclipse.org/bugs/show_bug.cgi?id=17693
 				boolean hasFinished= false;
@@ -218,6 +217,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl
 	 * flow back into the UI thread, in order to allow displaying the
 	 * information in the information control.
 	 */
+	@Override
 	protected void presentInformation() {
 		if (fTextViewer == null)
 			return;
@@ -229,6 +229,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl
 				return;
 
 			display.asyncExec(new Runnable() {
+				@Override
 				public void run() {
 					doPresentInformation();
 				}
@@ -275,9 +276,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#showInformationControl(org.eclipse.swt.graphics.Rectangle)
-	 */
+	@Override
 	protected void showInformationControl(Rectangle subjectArea) {
 		if (fTextViewer != null && fTextViewer.requestWidgetToken(this, WIDGET_PRIORITY))
 			super.showInformationControl(subjectArea);
@@ -286,9 +285,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl
 				System.out.println("TextViewerHoverManager#showInformationControl(..) did not get widget token"); //$NON-NLS-1$
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#hideInformationControl()
-	 */
+	@Override
 	protected void hideInformationControl() {
 		try {
 			fTextHover= null;
@@ -299,19 +296,14 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#replaceInformationControl(boolean)
-	 * @since 3.4
-	 */
+	@Override
 	void replaceInformationControl(boolean takeFocus) {
 		if (fTextViewer != null)
 			fTextViewer.releaseWidgetToken(this);
 		super.replaceInformationControl(takeFocus);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#handleInformationControlDisposed()
-	 */
+	@Override
 	protected void handleInformationControlDisposed() {
 		try {
 			super.handleInformationControlDisposed();
@@ -321,19 +313,14 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenKeeper#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner)
-	 */
+	@Override
 	public boolean requestWidgetToken(IWidgetTokenOwner owner) {
 		fTextHover= null;
 		super.hideInformationControl();
 		return true;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner, int)
-	 * @since 3.0
-	 */
+	@Override
 	public boolean requestWidgetToken(IWidgetTokenOwner owner, int priority) {
 		if (priority > WIDGET_PRIORITY) {
 			fTextHover= null;
@@ -343,10 +330,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#setFocus(org.eclipse.jface.text.IWidgetTokenOwner)
-	 * @since 3.0
-	 */
+	@Override
 	public boolean setFocus(IWidgetTokenOwner owner) {
 		if (! hasInformationControlReplacer())
 			return false;
@@ -375,10 +359,7 @@ class TextViewerHoverManager extends AbstractHoverInformationControlManager impl
 		return fTextHover;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractHoverInformationControlManager#dispose()
-	 * @since 3.0
-	 */
+	@Override
 	public void dispose() {
 		if (fTextViewer != null) {
 			fTextViewer.removeViewportListener(fViewportListener);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerUndoManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerUndoManager.java
index 827a523430f..f71786e7065 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerUndoManager.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/TextViewerUndoManager.java
@@ -65,6 +65,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 		/*
 		 * @see MouseListener#mouseDoubleClick
 		 */
+		@Override
 		public void mouseDoubleClick(MouseEvent e) {
 		}
 
@@ -72,6 +73,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 		 * If the right mouse button is pressed, the current editing command is closed
 		 * @see MouseListener#mouseDown
 		 */
+		@Override
 		public void mouseDown(MouseEvent e) {
 			if (e.button == 1)
 				if (isConnected())
@@ -81,12 +83,14 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 		/*
 		 * @see MouseListener#mouseUp
 		 */
+		@Override
 		public void mouseUp(MouseEvent e) {
 		}
 
 		/*
 		 * @see KeyListener#keyPressed
 		 */
+		@Override
 		public void keyReleased(KeyEvent e) {
 		}
 
@@ -94,6 +98,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 		 * On cursor keys, the current editing command is closed
 		 * @see KeyListener#keyPressed
 		 */
+		@Override
 		public void keyPressed(KeyEvent e) {
 			switch (e.keyCode) {
 				case SWT.ARROW_UP:
@@ -114,16 +119,12 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 	 */
 	private class TextInputListener implements ITextInputListener {
 
-		/*
-		 * @see org.eclipse.jface.text.ITextInputListener#inputDocumentAboutToBeChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument)
-		 */
+		@Override
 		public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) {
 			disconnectDocumentUndoManager();
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.ITextInputListener#inputDocumentChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument)
-		 */
+		@Override
 		public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
 			connectDocumentUndoManager(newInput);
 		}
@@ -135,9 +136,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 	 */
 	private class DocumentUndoListener implements IDocumentUndoListener {
 
-		/*
-		 * @see org.eclipse.jface.text.IDocumentUndoListener#documentUndoNotification(DocumentUndoEvent)
-		 */
+		@Override
 		public void documentUndoNotification(DocumentUndoEvent event ){
 			if (!isConnected()) return;
 
@@ -152,6 +151,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 						extension.setRedraw(false);
 				}
 				fTextViewer.getTextWidget().getDisplay().syncExec(new Runnable() {
+					@Override
 					public void run() {
 						if (fTextViewer instanceof TextViewer)
 							((TextViewer)fTextViewer).ignoreAutoEditStrategies(true);
@@ -160,6 +160,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 
 			} else if (((eventType & DocumentUndoEvent.UNDONE) != 0) || ((eventType & DocumentUndoEvent.REDONE) != 0))  {
 				fTextViewer.getTextWidget().getDisplay().syncExec(new Runnable() {
+					@Override
 					public void run() {
 						if (fTextViewer instanceof TextViewer)
 							((TextViewer)fTextViewer).ignoreAutoEditStrategies(false);
@@ -227,6 +228,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 	/*
 	 * @see IUndoManager#beginCompoundChange
 	 */
+	@Override
 	public void beginCompoundChange() {
 		if (isConnected()) {
 			fDocumentUndoManager.beginCompoundChange();
@@ -237,6 +239,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 	/*
 	 * @see IUndoManager#endCompoundChange
 	 */
+	@Override
 	public void endCompoundChange() {
 		if (isConnected()) {
 			fDocumentUndoManager.endCompoundChange();
@@ -298,6 +301,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 			else
 				display= Display.getDefault();
 			display.syncExec(new Runnable() {
+				@Override
 				public void run() {
 					MessageDialog.openError(finalShell, title, ex.getLocalizedMessage());
 				}
@@ -305,9 +309,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#setMaximalUndoLevel(int)
-	 */
+	@Override
 	public void setMaximalUndoLevel(int undoLevel) {
 		fUndoLevel= Math.max(0, undoLevel);
 		if (isConnected()) {
@@ -315,9 +317,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#connect(org.eclipse.jface.text.ITextViewer)
-	 */
+	@Override
 	public void connect(ITextViewer textViewer) {
 		if (fTextViewer == null && textViewer != null) {
 			fTextViewer= textViewer;
@@ -327,9 +327,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 		connectDocumentUndoManager(doc);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#disconnect()
-	 */
+	@Override
 	public void disconnect() {
 		if (fTextViewer != null) {
 			removeListeners();
@@ -338,36 +336,28 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 		disconnectDocumentUndoManager();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#reset()
-	 */
+	@Override
 	public void reset() {
 		if (isConnected())
 			fDocumentUndoManager.reset();
 
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#redoable()
-	 */
+	@Override
 	public boolean redoable() {
 		if (isConnected())
 			return fDocumentUndoManager.redoable();
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#undoable()
-	 */
+	@Override
 	public boolean undoable() {
 		if (isConnected())
 			return fDocumentUndoManager.undoable();
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#redo()
-	 */
+	@Override
 	public void redo() {
 		if (isConnected()) {
 			try {
@@ -378,9 +368,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManager#undo()
-	 */
+	@Override
 	public void undo() {
 		if (isConnected()) {
 			try {
@@ -408,9 +396,7 @@ public class TextViewerUndoManager implements IUndoManager, IUndoManagerExtensio
 		fTextViewer.revealRange(offset, length);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IUndoManagerExtension#getUndoContext()
-	 */
+	@Override
 	public IUndoContext getUndoContext() {
 		if (isConnected()) {
 			return fDocumentUndoManager.getUndoContext();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/WhitespaceCharacterPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/WhitespaceCharacterPainter.java
index 2e2458a8f1a..3093d98e7a0 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/WhitespaceCharacterPainter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/WhitespaceCharacterPainter.java
@@ -130,17 +130,13 @@ public class WhitespaceCharacterPainter implements IPainter, PaintListener {
 		fAlpha= alpha;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPainter#dispose()
-	 */
+	@Override
 	public void dispose() {
 		fTextViewer= null;
 		fTextWidget= null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPainter#paint(int)
-	 */
+	@Override
 	public void paint(int reason) {
 		IDocument document= fTextViewer.getDocument();
 		if (document == null) {
@@ -156,9 +152,7 @@ public class WhitespaceCharacterPainter implements IPainter, PaintListener {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPainter#deactivate(boolean)
-	 */
+	@Override
 	public void deactivate(boolean redraw) {
 		if (fIsActive) {
 			fIsActive= false;
@@ -169,16 +163,12 @@ public class WhitespaceCharacterPainter implements IPainter, PaintListener {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPainter#setPositionManager(org.eclipse.jface.text.IPaintPositionManager)
-	 */
+	@Override
 	public void setPositionManager(IPaintPositionManager manager) {
 		// no need for a position manager
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.PaintListener#paintControl(org.eclipse.swt.events.PaintEvent)
-	 */
+	@Override
 	public void paintControl(PaintEvent event) {
 		if (fTextWidget != null) {
 			handleDrawRequest(event.gc, event.x, event.y, event.width, event.height);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java
index d0364f562bb..6016c81f646 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/AdditionalInfoController.java
@@ -64,7 +64,8 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 	        /**
 	         * Runs this task.
 	         */
-	        public abstract void run();
+	        @Override
+			public abstract void run();
 	        /**
 	         * @return the task to be scheduled after this task has been run
 	         */
@@ -76,19 +77,23 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 		 * but specifies an infinite delay.
 		 */
 		private final Task IDLE= new Task() {
+			@Override
 			public void run() {
 				Assert.isTrue(false);
 			}
 
+			@Override
 			public Task nextTask() {
 				Assert.isTrue(false);
 			    return null;
 			}
 
+			@Override
 			public long delay() {
 				return Long.MAX_VALUE;
 			}
 
+			@Override
 			public String toString() {
 				return "IDLE"; //$NON-NLS-1$
 			}
@@ -97,9 +102,11 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 		 * FIRST_WAIT: Schedules a platform {@link Job} to fetch additional info from an {@link ICompletionProposalExtension5}.
 		 */
 		private final Task FIRST_WAIT= new Task() {
+			@Override
 			public void run() {
 				final ICompletionProposalExtension5 proposal= getCurrentProposalEx();
 				Job job= new Job(JFaceTextMessages.getString("AdditionalInfoController.job_name")) { //$NON-NLS-1$
+					@Override
 					protected IStatus run(IProgressMonitor monitor) {
 						Object info;
                         try {
@@ -118,14 +125,17 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 				job.schedule();
 			}
 
+			@Override
 			public Task nextTask() {
 				return SECOND_WAIT;
 			}
 
+			@Override
 			public long delay() {
 				return DELAY_UNTIL_JOB_IS_SCHEDULED;
 			}
 
+			@Override
 			public String toString() {
 				return "FIRST_WAIT"; //$NON-NLS-1$
 			}
@@ -135,19 +145,23 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 		 * {@link ICompletionProposalExtension5}.
 		 */
 		private final Task SECOND_WAIT= new Task() {
+			@Override
 			public void run() {
 				// show the info
 				allowShowing();
 			}
 
+			@Override
 			public Task nextTask() {
 				return IDLE;
 			}
 
+			@Override
 			public long delay() {
 				return fDelay - DELAY_UNTIL_JOB_IS_SCHEDULED;
 			}
 
+			@Override
 			public String toString() {
 				return "SECOND_WAIT"; //$NON-NLS-1$
 			}
@@ -156,10 +170,12 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 		 * LEGACY_WAIT: Posts a runnable into the display thread to fetch additional info from non-{@link ICompletionProposalExtension5}s.
 		 */
 		private final Task LEGACY_WAIT= new Task() {
+			@Override
 			public void run() {
 				final ICompletionProposal proposal= getCurrentProposal();
 				if (!fDisplay.isDisposed()) {
 					fDisplay.asyncExec(new Runnable() {
+						@Override
 						public void run() {
 							synchronized (Timer.this) {
 								if (proposal == getCurrentProposal()) {
@@ -172,14 +188,17 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 				}
 			}
 
+			@Override
 			public Task nextTask() {
 				return IDLE;
 			}
 
+			@Override
 			public long delay() {
 				return fDelay;
 			}
 
+			@Override
 			public String toString() {
 			    return "LEGACY_WAIT"; //$NON-NLS-1$
 			}
@@ -188,19 +207,23 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 		 * EXIT: The task that triggers termination of the timer thread.
 		 */
 		private final Task EXIT= new Task() {
+			@Override
 			public long delay() {
 		        return 1;
 	        }
 
+			@Override
 			public Task nextTask() {
 				Assert.isTrue(false);
 		        return EXIT;
 	        }
 
+			@Override
 			public void run() {
 				Assert.isTrue(false);
 	        }
 
+			@Override
 			public String toString() {
 				return "EXIT"; //$NON-NLS-1$
 			}
@@ -234,7 +257,8 @@ class AdditionalInfoController extends AbstractInformationControlManager {
     		schedule(IDLE, current);
 
     		fThread= new Thread(new Runnable() {
-    			public void run() {
+    			@Override
+				public void run() {
     				try {
 	                    loop();
                     } catch (InterruptedException x) {
@@ -336,6 +360,7 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 			final Object info= fCurrentInfo;
 			if (!fDisplay.isDisposed()) {
 				fDisplay.asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						synchronized (Timer.this) {
 							if (info == fCurrentInfo) {
@@ -365,16 +390,12 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 	 */
 	private class TableSelectionListener implements SelectionListener {
 
-		/*
-		 * @see SelectionListener#widgetSelected(SelectionEvent)
-		 */
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			handleTableSelectionChanged();
 		}
 
-		/*
-		 * @see SelectionListener#widgetDefaultSelected(SelectionEvent)
-		 */
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
 		}
 	}
@@ -384,6 +405,7 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 	 * @since 3.4
 	 */
 	private static class DefaultPresenterControlCreator extends AbstractReusableInformationControlCreator {
+		@Override
 		public IInformationControl doCreateInformationControl(Shell shell) {
 			return new DefaultInformationControl(shell, true);
 		}
@@ -437,9 +459,7 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 		getInternalAccessor().setInformationControlReplacer(replacer);
 	}
 
-	/*
-	 * @see AbstractInformationControlManager#install(Control)
-	 */
+	@Override
 	public void install(Control control) {
 
 		if (fProposalTable == control) {
@@ -455,6 +475,7 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 		getInternalAccessor().getInformationControlReplacer().install(fProposalTable);
 
 		fTimer= new Timer(fProposalTable.getDisplay(), fDelay) {
+			@Override
 			protected void showInformation(ICompletionProposal proposal, Object info) {
 				InformationControlReplacer replacer= getInternalAccessor().getInformationControlReplacer();
 				if (replacer != null)
@@ -464,9 +485,7 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 		};
 	}
 
-	/*
-	 * @see AbstractInformationControlManager#disposeInformationControl()
-	 */
+	@Override
 	public void disposeInformationControl() {
 
 		if (fTimer !=null) {
@@ -517,9 +536,7 @@ class AdditionalInfoController extends AbstractInformationControlManager {
         showInformation();
     }
 
-	/*
-	 * @see AbstractInformationControlManager#computeInformation()
-	 */
+	@Override
 	protected void computeInformation() {
 		if (fProposal instanceof ICompletionProposalExtension3)
 			setCustomInformationControlCreator(((ICompletionProposalExtension3) fProposal).getInformationControlCreator());
@@ -533,9 +550,7 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 		setInformation(fInformation, new Rectangle(0, 0, size.x, size.y));
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#computeLocation(org.eclipse.swt.graphics.Rectangle, org.eclipse.swt.graphics.Point, org.eclipse.jface.text.AbstractInformationControlManager.Anchor)
-	 */
+	@Override
 	protected Point computeLocation(Rectangle subjectArea, Point controlSize, Anchor anchor) {
 	    Point location= super.computeLocation(subjectArea, controlSize, anchor);
 
@@ -551,9 +566,7 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 		return location;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#computeSizeConstraints(Control, IInformationControl)
-	 */
+	@Override
 	protected Point computeSizeConstraints(Control subjectControl, IInformationControl informationControl) {
 		// at least as big as the proposal table
 		Point sizeConstraint= super.computeSizeConstraints(subjectControl, informationControl);
@@ -575,19 +588,14 @@ class AdditionalInfoController extends AbstractInformationControlManager {
 		return sizeConstraint;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#hideInformationControl()
-	 */
+	@Override
 	protected void hideInformationControl() {
 		super.hideInformationControl();
 		if (fTimer != null)
 			fTimer.reset(null);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#canClearDataOnHide()
-	 * @since 3.6
-	 */
+	@Override
 	protected boolean canClearDataOnHide() {
 		return false; // see https://bugs.eclipse.org/bugs/show_bug.cgi?id=293176
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposal.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposal.java
index 17b15ca4e5d..c46bfd48fc0 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposal.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposal.java
@@ -82,9 +82,7 @@ public final class CompletionProposal implements ICompletionProposal {
 		fAdditionalProposalInfo= additionalProposalInfo;
 	}
 
-	/*
-	 * @see ICompletionProposal#apply(IDocument)
-	 */
+	@Override
 	public void apply(IDocument document) {
 		try {
 			document.replace(fReplacementOffset, fReplacementLength, fReplacementString);
@@ -93,39 +91,29 @@ public final class CompletionProposal implements ICompletionProposal {
 		}
 	}
 
-	/*
-	 * @see ICompletionProposal#getSelection(IDocument)
-	 */
+	@Override
 	public Point getSelection(IDocument document) {
 		return new Point(fReplacementOffset + fCursorPosition, 0);
 	}
 
-	/*
-	 * @see ICompletionProposal#getContextInformation()
-	 */
+	@Override
 	public IContextInformation getContextInformation() {
 		return fContextInformation;
 	}
 
-	/*
-	 * @see ICompletionProposal#getImage()
-	 */
+	@Override
 	public Image getImage() {
 		return fImage;
 	}
 
-	/*
-	 * @see ICompletionProposal#getDisplayString()
-	 */
+	@Override
 	public String getDisplayString() {
 		if (fDisplayString != null)
 			return fDisplayString;
 		return fReplacementString;
 	}
 
-	/*
-	 * @see ICompletionProposal#getAdditionalProposalInfo()
-	 */
+	@Override
 	public String getAdditionalProposalInfo() {
 		return fAdditionalProposalInfo;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java
index 350a5e281ca..cb28c396118 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/CompletionProposalPopup.java
@@ -139,10 +139,7 @@ class CompletionProposalPopup implements IContentAssistListener {
 			fOperationCode= operationCode;
 		}
 
-		/*
-		 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-		 * @since 3.4
-		 */
+		@Override
 		public Object execute(ExecutionEvent event) throws ExecutionException {
 			int itemCount= fProposalTable.getItemCount();
 			int selectionIndex= fProposalTable.getSelectionIndex();
@@ -176,76 +173,57 @@ class CompletionProposalPopup implements IContentAssistListener {
 
 		String fDisplayString;
 		int fOffset;
-		/*
-		 * @see ICompletionProposal#apply(IDocument)
-		 */
+		@Override
 		public void apply(IDocument document) {
 		}
 
-		/*
-		 * @see ICompletionProposal#getSelection(IDocument)
-		 */
+		@Override
 		public Point getSelection(IDocument document) {
 			return new Point(fOffset, 0);
 		}
 
-		/*
-		 * @see ICompletionProposal#getContextInformation()
-		 */
+		@Override
 		public IContextInformation getContextInformation() {
 			return null;
 		}
 
-		/*
-		 * @see ICompletionProposal#getImage()
-		 */
+		@Override
 		public Image getImage() {
 			return null;
 		}
 
-		/*
-		 * @see ICompletionProposal#getDisplayString()
-		 */
+		@Override
 		public String getDisplayString() {
 			return fDisplayString;
 		}
 
-		/*
-		 * @see ICompletionProposal#getAdditionalProposalInfo()
-		 */
+		@Override
 		public String getAdditionalProposalInfo() {
 			return null;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#apply(org.eclipse.jface.text.IDocument, char, int)
-		 */
+		@Override
 		public void apply(IDocument document, char trigger, int offset) {
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#isValidFor(org.eclipse.jface.text.IDocument, int)
-		 */
+		@Override
 		public boolean isValidFor(IDocument document, int offset) {
 			return false;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getTriggerCharacters()
-		 */
+		@Override
 		public char[] getTriggerCharacters() {
 			return null;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getContextInformationPosition()
-		 */
+		@Override
 		public int getContextInformationPosition() {
 			return -1;
 		}
 	}
 
 	private final class ProposalSelectionListener implements KeyListener {
+		@Override
 		public void keyPressed(KeyEvent e) {
 			if (!Helper.okToUse(fProposalShell))
 				return;
@@ -258,6 +236,7 @@ class CompletionProposalPopup implements IContentAssistListener {
 			}
 		}
 
+		@Override
 		public void keyReleased(KeyEvent e) {
 			if (!Helper.okToUse(fProposalShell))
 				return;
@@ -278,6 +257,7 @@ class CompletionProposalPopup implements IContentAssistListener {
 			fCommandSequence= keySequence;
 		}
 
+		@Override
 		public void keyPressed(KeyEvent e) {
 			if (!Helper.okToUse(fProposalShell))
 				return;
@@ -365,6 +345,7 @@ class CompletionProposalPopup implements IContentAssistListener {
 	 * @since 3.1.1
 	 */
 	private final Runnable fFilterRunnable= new Runnable() {
+		@Override
 		public void run() {
 			if (!fIsFilterPending)
 				return;
@@ -497,6 +478,7 @@ class CompletionProposalPopup implements IContentAssistListener {
 			fContentAssistSubjectControlAdapter.addKeyListener(fKeyListener);
 
 			BusyIndicator.showWhile(control.getDisplay(), new Runnable() {
+				@Override
 				public void run() {
 
 					fInvocationOffset= fContentAssistSubjectControlAdapter.getSelectedRange().x;
@@ -596,6 +578,7 @@ class CompletionProposalPopup implements IContentAssistListener {
 			fProposalTable= new Table(fProposalShell, SWT.H_SCROLL | SWT.V_SCROLL | SWT.VIRTUAL);
 
 			Listener listener= new Listener() {
+				@Override
 				public void handleEvent(Event event) {
 					handleSetData(event);
 				}
@@ -644,8 +627,10 @@ class CompletionProposalPopup implements IContentAssistListener {
 
 		fProposalShell.addControlListener(new ControlListener() {
 
+			@Override
 			public void controlMoved(ControlEvent e) {}
 
+			@Override
 			public void controlResized(ControlEvent e) {
 				if (fAdditionalInfoController != null) {
 					// reset the cached resize constraints
@@ -668,8 +653,10 @@ class CompletionProposalPopup implements IContentAssistListener {
 
 		fProposalTable.addSelectionListener(new SelectionListener() {
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {}
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 				insertSelectedProposalWithMask(e.stateMask);
 			}
@@ -678,6 +665,7 @@ class CompletionProposalPopup implements IContentAssistListener {
 		fPopupCloser.install(fContentAssistant, fProposalTable, fAdditionalInfoController);
 
 		fProposalShell.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				unregister(); // but don't dispose the shell, since we're being called from its disposal event!
 			}
@@ -718,7 +706,8 @@ class CompletionProposalPopup implements IContentAssistListener {
     	if (commandSequence != null && !commandSequence.isEmpty() && fContentAssistant.isRepeatedInvocationMode()) {
     		control.addFocusListener(new FocusListener() {
     			private CommandKeyListener fCommandKeyListener;
-    			public void focusGained(FocusEvent e) {
+    			@Override
+				public void focusGained(FocusEvent e) {
     				if (Helper.okToUse(control)) {
     					if (fCommandKeyListener == null) {
     						fCommandKeyListener= new CommandKeyListener(commandSequence);
@@ -726,7 +715,8 @@ class CompletionProposalPopup implements IContentAssistListener {
     					}
     				}
     			}
-    			public void focusLost(FocusEvent e) {
+    			@Override
+				public void focusLost(FocusEvent e) {
     				if (fCommandKeyListener != null) {
     					control.removeKeyListener(fCommandKeyListener);
     					fCommandKeyListener= null;
@@ -737,11 +727,13 @@ class CompletionProposalPopup implements IContentAssistListener {
     	if (fAdditionalInfoController != null) {
 	    	control.addFocusListener(new FocusListener() {
 	    		private TraverseListener fTraverseListener;
-	    		public void focusGained(FocusEvent e) {
+	    		@Override
+				public void focusGained(FocusEvent e) {
 	    			if (Helper.okToUse(control)) {
 	    				if (fTraverseListener == null) {
 	    					fTraverseListener= new TraverseListener() {
-	    						public void keyTraversed(TraverseEvent event) {
+	    						@Override
+								public void keyTraversed(TraverseEvent event) {
 	    							if (event.detail == SWT.TRAVERSE_TAB_NEXT) {
 	    								IInformationControl iControl= fAdditionalInfoController.getCurrentInformationControl2();
 	    								if (fAdditionalInfoController.getInternalAccessor().canReplace(iControl)) {
@@ -755,7 +747,8 @@ class CompletionProposalPopup implements IContentAssistListener {
 	    				}
 	    			}
 	    		}
-	    		public void focusLost(FocusEvent e) {
+	    		@Override
+				public void focusLost(FocusEvent e) {
 	    			if (fTraverseListener != null) {
 	    				control.removeTraverseListener(fTraverseListener);
 	    				fTraverseListener= null;
@@ -819,12 +812,14 @@ class CompletionProposalPopup implements IContentAssistListener {
 			if (fContentAssistant.isRepeatedInvocationMode()) {
 				fMessageText.setCursor(fProposalShell.getDisplay().getSystemCursor(SWT.CURSOR_HAND));
 				fMessageText.addMouseListener(new MouseAdapter() {
+					@Override
 					public void mouseUp(MouseEvent e) {
 						fLastCompletionOffset= fFilterOffset;
 						fProposalTable.setFocus();
 						handleRepeatedInvocation();
 					}
 
+					@Override
 					public void mouseDown(MouseEvent e) {
 					}
 				});
@@ -930,10 +925,12 @@ class CompletionProposalPopup implements IContentAssistListener {
 		IRewriteTarget target= null;
 		IEditingSupport helper= new IEditingSupport() {
 
+			@Override
 			public boolean isOriginator(DocumentEvent event, IRegion focus) {
 				return focus.getOffset() <= offset && focus.getOffset() + focus.getLength() >= offset;
 			}
 
+			@Override
 			public boolean ownsFocusShell() {
 				return false;
 			}
@@ -1221,10 +1218,12 @@ class CompletionProposalPopup implements IContentAssistListener {
 			if (fFocusHelper == null) {
 				fFocusHelper= new IEditingSupport() {
 
+					@Override
 					public boolean isOriginator(DocumentEvent event, IRegion focus) {
 						return false; // this helper just covers the focus change to the proposal shell, no remote editions
 					}
 
+					@Override
 					public boolean ownsFocusShell() {
 						return true;
 					}
@@ -1265,11 +1264,13 @@ class CompletionProposalPopup implements IContentAssistListener {
 	private void ensureDocumentListenerInstalled() {
 		if (fDocumentListener == null) {
 			fDocumentListener=  new IDocumentListener()  {
+				@Override
 				public void documentAboutToBeChanged(DocumentEvent event) {
 					if (!fInserting)
 						fDocumentEvents.add(event);
 				}
 
+				@Override
 				public void documentChanged(DocumentEvent event) {
 					if (!fInserting)
 						filterProposals();
@@ -1281,9 +1282,7 @@ class CompletionProposalPopup implements IContentAssistListener {
 		}
 	}
 
-	/*
-	 * @see IContentAssistListener#verifyKey(VerifyEvent)
-	 */
+	@Override
 	public boolean verifyKey(VerifyEvent e) {
 		if (!Helper.okToUse(fProposalShell))
 			return true;
@@ -1454,9 +1453,7 @@ class CompletionProposalPopup implements IContentAssistListener {
 		return false;
 	}
 
-	/*
-	 * @see IEventConsumer#processEvent(VerifyEvent)
-	 */
+	@Override
 	public void processEvent(VerifyEvent e) {
 	}
 
@@ -1602,6 +1599,7 @@ class CompletionProposalPopup implements IContentAssistListener {
 				fContentAssistSubjectControlAdapter.addKeyListener(fKeyListener);
 
 			BusyIndicator.showWhile(control.getDisplay(), new Runnable() {
+				@Override
 				public void run() {
 
 					fInvocationOffset= fContentAssistSubjectControlAdapter.getSelectedRange().x;
@@ -1907,6 +1905,7 @@ class CompletionProposalPopup implements IContentAssistListener {
 	 */
 	private void sortProposals(final ICompletionProposal[] proposals) {
 		Arrays.sort(proposals, new Comparator() {
+			@Override
 			public int compare(Object o1, Object o2) {
 				return fSorter.compare((ICompletionProposal)o1,
 						(ICompletionProposal)o2);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistSubjectControlAdapter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistSubjectControlAdapter.java
index 5b9da382ed9..eef3647bc1c 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistSubjectControlAdapter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistSubjectControlAdapter.java
@@ -69,9 +69,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC
 		fViewer= viewer;
 	}
 
-	/*
-	 * @see IContentAssistSubjectControl#getLineHeight()
-	 */
+	@Override
 	public int getLineHeight() {
 		if (fContentAssistSubjectControl != null)
 			return fContentAssistSubjectControl.getLineHeight();
@@ -79,63 +77,49 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC
 		return fViewer.getTextWidget().getLineHeight(getCaretOffset());
 	}
 
-	/*
-	 * @see IContentAssistSubjectControl#getControl()
-	 */
+	@Override
 	public Control getControl() {
 		if (fContentAssistSubjectControl != null)
 			return fContentAssistSubjectControl.getControl();
 		return fViewer.getTextWidget();
 	}
 
-	/*
-	 * @see IContentAssistSubjectControl#getLocationAtOffset(int)
-	 */
+	@Override
 	public Point getLocationAtOffset(int offset) {
 		if (fContentAssistSubjectControl != null)
 			return fContentAssistSubjectControl.getLocationAtOffset(offset);
 		return fViewer.getTextWidget().getLocationAtOffset(offset);
 	}
 
-	/*
-	 * @see IContentAssistSubjectControl#getWidgetSelectionRange()
-	 */
+	@Override
 	public Point getWidgetSelectionRange() {
 		if (fContentAssistSubjectControl != null)
 			return fContentAssistSubjectControl.getWidgetSelectionRange();
 		return fViewer.getTextWidget().getSelectionRange();
 	}
 
-	/*
-	 * @see IContentAssistSubjectControl#getSelectedRange()
-	 */
+	@Override
 	public Point getSelectedRange() {
 		if (fContentAssistSubjectControl != null)
 			return fContentAssistSubjectControl.getSelectedRange();
 		return fViewer.getSelectedRange();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getCaretOffset()
-	 */
+	@Override
 	public int getCaretOffset() {
 		if (fContentAssistSubjectControl != null)
 			return fContentAssistSubjectControl.getCaretOffset();
 		return fViewer.getTextWidget().getCaretOffset();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getLineDelimiter()
-	 */
+	@Override
 	public String getLineDelimiter() {
 		if (fContentAssistSubjectControl != null)
 			return fContentAssistSubjectControl.getLineDelimiter();
 		return fViewer.getTextWidget().getLineDelimiter();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#addKeyListener(org.eclipse.swt.events.KeyListener)
-	 */
+	@Override
 	public void addKeyListener(KeyListener keyListener) {
 		if (fContentAssistSubjectControl != null)
 			fContentAssistSubjectControl.addKeyListener(keyListener);
@@ -143,9 +127,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC
 			fViewer.getTextWidget().addKeyListener(keyListener);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#removeKeyListener(org.eclipse.swt.events.KeyListener)
-	 */
+	@Override
 	public void removeKeyListener(KeyListener keyListener) {
 		if (fContentAssistSubjectControl != null)
 			fContentAssistSubjectControl.removeKeyListener(keyListener);
@@ -153,18 +135,14 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC
 			fViewer.getTextWidget().removeKeyListener(keyListener);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#getDocument()
-	 */
+	@Override
 	public IDocument getDocument() {
 		if (fContentAssistSubjectControl != null)
 			return fContentAssistSubjectControl.getDocument();
 		return fViewer.getDocument();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#prependVerifyKeyListener(VerifyKeyListener)
-	 */
+	@Override
 	public boolean prependVerifyKeyListener(VerifyKeyListener verifyKeyListener) {
 		if (fContentAssistSubjectControl != null) {
 			return fContentAssistSubjectControl.prependVerifyKeyListener(verifyKeyListener);
@@ -183,9 +161,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#appendVerifyKeyListener(org.eclipse.swt.custom.VerifyKeyListener)
-	 */
+	@Override
 	public boolean appendVerifyKeyListener(VerifyKeyListener verifyKeyListener) {
 		if (fContentAssistSubjectControl != null)
 			return fContentAssistSubjectControl.appendVerifyKeyListener(verifyKeyListener);
@@ -203,9 +179,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#removeVerifyKeyListener(org.eclipse.swt.custom.VerifyKeyListener)
-	 */
+	@Override
 	public void removeVerifyKeyListener(VerifyKeyListener verifyKeyListener) {
 		if (fContentAssistSubjectControl != null) {
 			fContentAssistSubjectControl.removeVerifyKeyListener(verifyKeyListener);
@@ -219,9 +193,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#setEventConsumer(org.eclipse.jface.text.contentassist.ContentAssistant.InternalListener)
-	 */
+	@Override
 	public void setEventConsumer(IEventConsumer eventConsumer) {
 		if (fContentAssistSubjectControl != null)
 			fContentAssistSubjectControl.setEventConsumer(eventConsumer);
@@ -229,9 +201,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC
 			fViewer.setEventConsumer(eventConsumer);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#setSelectedRange(int, int)
-	 */
+	@Override
 	public void setSelectedRange(int i, int j) {
 		if (fContentAssistSubjectControl != null)
 			fContentAssistSubjectControl.setSelectedRange(i, j);
@@ -239,9 +209,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC
 			fViewer.setSelectedRange(i, j);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#revealRange(int, int)
-	 */
+	@Override
 	public void revealRange(int i, int j) {
 		if (fContentAssistSubjectControl != null)
 			fContentAssistSubjectControl.revealRange(i, j);
@@ -252,6 +220,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC
 	/*
 	 * @see org.eclipse.jface.text.contentassist.IContentAssistSubjectControl#canAddVerifyKeyListener()
 	 */
+	@Override
 	public boolean supportsVerifyKeyListener() {
 		if (fContentAssistSubjectControl != null)
 			return fContentAssistSubjectControl.supportsVerifyKeyListener();
@@ -390,9 +359,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC
 		return contentAssistant.computeContextInformation(fViewer, offset);
 	}
 
-	/*
-	 * @see IContentAssistSubjectControl#addSelectionListener(SelectionListener)
-	 */
+	@Override
 	public boolean addSelectionListener(SelectionListener selectionListener) {
 		if (fContentAssistSubjectControl != null)
 			return fContentAssistSubjectControl.addSelectionListener(selectionListener);
@@ -400,9 +367,7 @@ final class ContentAssistSubjectControlAdapter implements IContentAssistSubjectC
 		return true;
 	}
 
-	/*
-	 * @see IContentAssistSubjectControl#removeSelectionListener(SelectionListener)
-	 */
+	@Override
 	public void removeSelectionListener(SelectionListener selectionListener) {
 		if (fContentAssistSubjectControl != null)
 			fContentAssistSubjectControl.removeSelectionListener(selectionListener);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java
index 24373a654c5..eedb7689356 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContentAssistant.java
@@ -166,55 +166,42 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 				fViewer.removeViewportListener(this);
 		}
 
-		/*
-		 * @see ControlListener#controlResized(ControlEvent)
-		 */
+		@Override
 		public void controlResized(ControlEvent e) {
 			hide();
 		}
 
-		/*
-		 * @see ControlListener#controlMoved(ControlEvent)
-		 */
+		@Override
 		public void controlMoved(ControlEvent e) {
 			hide();
 		}
 
-		/*
-		 * @see MouseListener#mouseDown(MouseEvent)
-		 */
+		@Override
 		public void mouseDown(MouseEvent e) {
 			hide();
 		}
 
-		/*
-		 * @see MouseListener#mouseUp(MouseEvent)
-		 */
+		@Override
 		public void mouseUp(MouseEvent e) {
 		}
 
-		/*
-		 * @see MouseListener#mouseDoubleClick(MouseEvent)
-		 */
+		@Override
 		public void mouseDoubleClick(MouseEvent e) {
 			hide();
 		}
 
-		/*
-		 * @see FocusListener#focusGained(FocusEvent)
-		 */
+		@Override
 		public void focusGained(FocusEvent e) {
 		}
 
-		/*
-		 * @see FocusListener#focusLost(FocusEvent)
-		 */
+		@Override
 		public void focusLost(FocusEvent e) {
 			Control control= fControl;
 			if (Helper.okToUse(control)) {
 				Display d= control.getDisplay();
 				if (d != null) {
 					d.asyncExec(new Runnable() {
+						@Override
 						public void run() {
 							if (!fProposalPopup.hasFocus() && (fContextInfoPopup == null || !fContextInfoPopup.hasFocus()))
 								hide();
@@ -227,6 +214,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		/*
 		 * @seeDisposeListener#widgetDisposed(DisposeEvent)
 		 */
+		@Override
 		public void widgetDisposed(DisposeEvent e) {
 			/*
 			 * 1GGYYWK: ITPJUI:ALL - Dismissing editor with code assist up causes lots of Internal
@@ -235,9 +223,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 			hide();
 		}
 
-		/*
-		 * @see IViewportListener#viewportChanged(int)
-		 */
+		@Override
 		public void viewportChanged(int topIndex) {
 			hide();
 		}
@@ -271,6 +257,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 			fThread.start();
 		}
 
+		@Override
 		public void run() {
 			try {
 				while (true) {
@@ -314,6 +301,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 			return false;
 		}
 
+		@Override
 		public void keyPressed(KeyEvent e) {
 			// Only act on typed characters and ignore modifier-only events
 			if (e.character == 0 && (e.keyCode & SWT.KEYCODE_BIT) == 0)
@@ -353,9 +341,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 				start(showStyle);
 		}
 
-		/*
-		 * @see org.eclipse.swt.custom.VerifyKeyListener#verifyKey(org.eclipse.swt.events.VerifyEvent)
-		 */
+		@Override
 		public void verifyKey(VerifyEvent event) {
 			keyPressed(event);
 		}
@@ -371,6 +357,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 
 			try {
 				d.syncExec(new Runnable() {
+					@Override
 					public void run() {
 						if (isProposalPopupActive())
 							return;
@@ -437,6 +424,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 				type == LAYOUT_CONTEXT_SELECTOR || type == LAYOUT_CONTEXT_INFO_POPUP);
 		}
 
+		@Override
 		public void handleEvent(Event event) {
 			Widget source= event.widget;
 			source.removeListener(SWT.Dispose, this);
@@ -807,6 +795,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		 * @param e the verify event
 		 * @see VerifyKeyListener#verifyKey(org.eclipse.swt.events.VerifyEvent)
 		 */
+		@Override
 		public void verifyKey(VerifyEvent e) {
 			IContentAssistListener[] listeners= (IContentAssistListener[]) fListeners.clone();
 			for (int i= 0; i < listeners.length; i++) {
@@ -822,6 +811,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		/*
 		 * @see IEventConsumer#processEvent
 		 */
+		@Override
 		public void processEvent(VerifyEvent event) {
 
 			installKeyListener();
@@ -853,6 +843,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 			fMessageKey= messageKey;
 		}
 
+		@Override
 		public void handleException(Throwable exception) {
 			String message= JFaceTextMessages.getString(fMessageKey);
 
@@ -1071,10 +1062,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		fPartitioning= partitioning;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension#getDocumentPartitioning()
-	 * @since 3.0
-	 */
+	@Override
 	public String getDocumentPartitioning() {
 		return fPartitioning;
 	}
@@ -1103,6 +1091,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 	/*
 	 * @see IContentAssistant#getContentAssistProcessor
 	 */
+	@Override
 	public IContentAssistProcessor getContentAssistProcessor(String contentType) {
 		if (fProcessors == null)
 			return null;
@@ -1420,6 +1409,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 	 * @see IContentAssist#install
 	 * @since 3.0
 	 */
+	@Override
 	public void install(ITextViewer textViewer) {
 		fViewer= textViewer;
 		fContentAssistSubjectControlAdapter= new ContentAssistSubjectControlAdapter(fViewer);
@@ -1445,6 +1435,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		if (Helper.okToUse(fContentAssistSubjectControlAdapter.getControl())) {
 			fContentAssistSubjectControlShell= fContentAssistSubjectControlAdapter.getControl().getShell();
 			fCASCSTraverseListener= new TraverseListener() {
+				@Override
 				public void keyTraversed(TraverseEvent e) {
 					if (e.detail == SWT.TRAVERSE_ESCAPE && isProposalPopupActive())
 						e.doit= false;
@@ -1459,6 +1450,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 	/*
 	 * @see IContentAssist#uninstall
 	 */
+	@Override
 	public void uninstall() {
 		hide();
 		manageAutoActivation(false);
@@ -1712,6 +1704,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 	/*
 	 * @see IContentAssist#showPossibleCompletions
 	 */
+	@Override
 	public String showPossibleCompletions() {
 		if (!prepareToShowCompletions(false))
 			return null;
@@ -1720,10 +1713,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		return fProposalPopup.showProposals(false);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension#completePrefix()
-	 * @since 3.0
-	 */
+	@Override
 	public String completePrefix() {
 		if (!prepareToShowCompletions(false))
 			return null;
@@ -1766,6 +1756,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 	/*
 	 * @see IContentAssist#showContextInformation
 	 */
+	@Override
 	public String showContextInformation() {
 		promoteKeyListener();
 		if (fContextInfoPopup != null)
@@ -1871,6 +1862,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		if (p instanceof ISubjectControlContentAssistProcessor) {
 			// Ensure that the assist session ends cleanly even if the processor throws an exception.
 			SafeRunner.run(new ExceptionLoggingSafeRunnable(COMPLETION_ERROR_MESSAGE_KEY) {
+				@Override
 				public void run() throws Exception {
 					result[0]= ((ISubjectControlContentAssistProcessor) p)
 							.computeCompletionProposals(contentAssistSubjectControl, offset);
@@ -1900,6 +1892,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		if (p != null) {
 			// Ensure that the assist session ends cleanly even if the processor throws an exception.
 			SafeRunner.run(new ExceptionLoggingSafeRunnable(COMPLETION_ERROR_MESSAGE_KEY) {
+				@Override
 				public void run() throws Exception {
 					result[0]= p.computeCompletionProposals(viewer, offset);
 					fLastErrorMessage= p.getErrorMessage();
@@ -1929,6 +1922,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		if (p != null) {
 			// Ensure that the assist session ends cleanly even if the processor throws an exception.
 			SafeRunner.run(new ExceptionLoggingSafeRunnable(CONTEXT_ERROR_MESSAGE_KEY) {
+				@Override
 				public void run() throws Exception {
 					result[0]= p.computeContextInformation(viewer, offset);
 					fLastErrorMessage= p.getErrorMessage();
@@ -1960,6 +1954,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		if (p instanceof ISubjectControlContentAssistProcessor) {
 			// Ensure that the assist session ends cleanly even if the processor throws an exception.
 			SafeRunner.run(new ExceptionLoggingSafeRunnable(CONTEXT_ERROR_MESSAGE_KEY) {
+				@Override
 				public void run() throws Exception {
 					result[0]= ((ISubjectControlContentAssistProcessor) p)
 							.computeContextInformation(contentAssistSubjectControl, offset);
@@ -2098,19 +2093,12 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		return p != null ? p.getContextInformationAutoActivationCharacters() : null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenKeeper#requestWidgetToken(IWidgetTokenOwner)
-	 * @since 2.0
-	 */
+	@Override
 	public boolean requestWidgetToken(IWidgetTokenOwner owner) {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner,
-	 *      int)
-	 * @since 3.0
-	 */
+	@Override
 	public boolean requestWidgetToken(IWidgetTokenOwner owner, int priority) {
 		if (priority > WIDGET_PRIORITY) {
 			hide();
@@ -2119,10 +2107,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#setFocus(org.eclipse.jface.text.IWidgetTokenOwner)
-	 * @since 3.0
-	 */
+	@Override
 	public boolean setFocus(IWidgetTokenOwner owner) {
 		if (fProposalPopup != null) {
 			fProposalPopup.setFocus();
@@ -2329,19 +2314,13 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		return fProposalPopup.hasFocus();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension2#addCompletionListener(org.eclipse.jface.text.contentassist.ICompletionListener)
-	 * @since 3.2
-	 */
+	@Override
 	public void addCompletionListener(ICompletionListener listener) {
 		Assert.isLegal(listener != null);
 		fCompletionListeners.add(listener);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension2#removeCompletionListener(org.eclipse.jface.text.contentassist.ICompletionListener)
-	 * @since 3.2
-	 */
+	@Override
 	public void removeCompletionListener(ICompletionListener listener) {
 		fCompletionListeners.remove(listener);
 	}
@@ -2399,10 +2378,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension2#setRepeatedInvocationMode(boolean)
-	 * @since 3.2
-	 */
+	@Override
 	public void setRepeatedInvocationMode(boolean cycling) {
 		fIsRepetitionMode= cycling;
 	}
@@ -2419,10 +2395,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		return fIsRepetitionMode;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension2#setShowEmptyList(boolean)
-	 * @since 3.2
-	 */
+	@Override
 	public void setShowEmptyList(boolean showEmpty) {
 		fShowEmptyList= showEmpty;
 	}
@@ -2439,10 +2412,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		return fShowEmptyList;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension2#setStatusLineVisible(boolean)
-	 * @since 3.2
-	 */
+	@Override
 	public void setStatusLineVisible(boolean show) {
 		fIsStatusLineVisible= show;
 		if (fProposalPopup != null)
@@ -2461,10 +2431,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		return fIsStatusLineVisible;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension2#setStatusMessage(java.lang.String)
-	 * @since 3.2
-	 */
+	@Override
 	public void setStatusMessage(String message) {
 		Assert.isLegal(message != null);
 		fMessage= message;
@@ -2482,10 +2449,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 		return fMessage;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension2#setEmptyMessage(java.lang.String)
-	 * @since 3.2
-	 */
+	@Override
 	public void setEmptyMessage(String message) {
 		Assert.isLegal(message != null);
 		if (fProposalPopup != null)
@@ -2526,6 +2490,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 	 * @see org.eclipse.jface.text.contentassist.IContentAssistantExtension3#setInvocationTrigger(org.eclipse.jface.bindings.keys.KeySequence)
 	 * @since 3.2
 	 */
+	@Override
 	public void setRepeatedInvocationTrigger(KeySequence sequence) {
 		fRepeatedInvocationKeySequence= sequence;
 	}
@@ -2565,6 +2530,7 @@ public class ContentAssistant implements IContentAssistant, IContentAssistantExt
 	 *
 	 * @since 3.4
 	 */
+	@Override
 	public final IHandler getHandler(String commandId) {
 		if (fHandlers == null)
 			throw new IllegalStateException();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformation.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformation.java
index ed393281893..a375aabcd42 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformation.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformation.java
@@ -55,9 +55,7 @@ public final class ContextInformation implements IContextInformation {
 		fInformationDisplayString= informationDisplayString;
 	}
 
-	/*
-	 * @see IContextInformation#equals(Object)
-	 */
+	@Override
 	public boolean equals(Object object) {
 		if (object instanceof IContextInformation) {
 			IContextInformation contextInformation= (IContextInformation) object;
@@ -69,32 +67,23 @@ public final class ContextInformation implements IContextInformation {
 		return false;
 	}
 
-	/*
-	 * @see java.lang.Object#hashCode()
-	 * @since 3.1
-	 */
+	@Override
 	public int hashCode() {
 	 	int low= fContextDisplayString != null ? fContextDisplayString.hashCode() : 0;
 	 	return (fInformationDisplayString.hashCode() << 16) | low;
 	}
 
-	/*
-	 * @see IContextInformation#getInformationDisplayString()
-	 */
+	@Override
 	public String getInformationDisplayString() {
 		return fInformationDisplayString;
 	}
 
-	/*
-	 * @see IContextInformation#getImage()
-	 */
+	@Override
 	public Image getImage() {
 		return fImage;
 	}
 
-	/*
-	 * @see IContextInformation#getContextDisplayString()
-	 */
+	@Override
 	public String getContextDisplayString() {
 		if (fContextDisplayString != null)
 			return fContextDisplayString;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java
index 4f00d1a48c9..0bc4eb0360b 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java
@@ -88,10 +88,7 @@ class ContextInformationPopup implements IContentAssistListener {
 			fPresenter = presenter;
 		}
 
-		/*
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 * @since 3.0
-		 */
+		@Override
 		public boolean equals(Object obj) {
 			if (obj instanceof ContextFrame) {
 				ContextFrame frame= (ContextFrame) obj;
@@ -100,10 +97,7 @@ class ContextInformationPopup implements IContentAssistListener {
 			return super.equals(obj);
 		}
 
-		/*
-		 * @see java.lang.Object#hashCode()
-		 * @since 3.1
-		 */
+		@Override
 		public int hashCode() {
 			return (fInformation.hashCode() << 16) | fBeginOffset;
 		}
@@ -187,6 +181,7 @@ class ContextInformationPopup implements IContentAssistListener {
 	public String showContextProposals(final boolean autoActivated) {
 		final Control control= fContentAssistSubjectControlAdapter.getControl();
 		BusyIndicator.showWhile(control.getDisplay(), new Runnable() {
+			@Override
 			public void run() {
 
 				int offset= fContentAssistSubjectControlAdapter.getSelectedRange().x;
@@ -258,6 +253,7 @@ class ContextInformationPopup implements IContentAssistListener {
 	public void showContextInformation(final IContextInformation info, final int offset) {
 		Control control= fContentAssistSubjectControlAdapter.getControl();
 		BusyIndicator.showWhile(control.getDisplay(), new Runnable() {
+			@Override
 			public void run() {
 				if (info == null)
 					validateContextInformation();
@@ -370,9 +366,7 @@ class ContextInformationPopup implements IContentAssistListener {
 			if (fContentAssistant.addContentAssistListener(this, ContentAssistant.CONTEXT_INFO_POPUP)) {
 				if (fContentAssistSubjectControlAdapter.getControl() != null) {
 					fTextWidgetSelectionListener= new SelectionAdapter() {
-						/*
-						 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-						 */
+						@Override
 						public void widgetSelected(SelectionEvent e) {
 							validateContextInformation();
 						}};
@@ -514,9 +508,11 @@ class ContextInformationPopup implements IContentAssistListener {
 
 		fContextSelectorShell.addControlListener(new ControlListener() {
 
+			@Override
 			public void controlMoved(ControlEvent e) {
 			}
 
+			@Override
 			public void controlResized(ControlEvent e) {
 				fContextSelectorPopupSize= fContextSelectorShell.getSize();
 			}
@@ -528,6 +524,7 @@ class ContextInformationPopup implements IContentAssistListener {
 			final StyledText textWidget= fViewer.getTextWidget();
 
 			final VerifyKeyListener verifyListener= new VerifyKeyListener() {
+				@Override
 				public void verifyKey(VerifyEvent event) {
 					if (isActive() && event.keyCode == 13 && event.character == '\r' && event.widget == textWidget) {
 						event.doit= false;
@@ -540,6 +537,7 @@ class ContextInformationPopup implements IContentAssistListener {
 			textViewerExtension.prependVerifyKeyListener(verifyListener);
 
 			fContextSelectorShell.addDisposeListener(new DisposeListener() {
+				@Override
 				public void widgetDisposed(DisposeEvent e) {
 					textViewerExtension.removeVerifyKeyListener(verifyListener);
 				}
@@ -570,9 +568,11 @@ class ContextInformationPopup implements IContentAssistListener {
 		fContextSelectorTable.setForeground(c);
 
 		fContextSelectorTable.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 			}
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 				insertSelectedContext();
 				hideContextSelector();
@@ -711,9 +711,7 @@ class ContextInformationPopup implements IContentAssistListener {
 		return (Helper.okToUse(fContextInfoPopup) || Helper.okToUse(fContextSelectorShell));
 	}
 
-	/*
-	 * @see IContentAssistListener#verifyKey(VerifyEvent)
-	 */
+	@Override
 	public boolean verifyKey(VerifyEvent e) {
 		if (Helper.okToUse(fContextSelectorShell))
 			return contextSelectorKeyPressed(e);
@@ -826,9 +824,7 @@ class ContextInformationPopup implements IContentAssistListener {
 		return true;
 	}
 
-	/*
-	 * @see IEventConsumer#processEvent(VerifyEvent)
-	 */
+	@Override
 	public void processEvent(VerifyEvent event) {
 		if (Helper.okToUse(fContextSelectorShell))
 			contextSelectorProcessEvent(event);
@@ -878,6 +874,7 @@ class ContextInformationPopup implements IContentAssistListener {
 
 			private ContextFrame fFrame= (ContextFrame) fContextFrameStack.peek();
 
+			@Override
 			public void run() {
 				// only do this if no other frames have been added in between
 				if (!fContextFrameStack.isEmpty() && fFrame == fContextFrameStack.peek()) {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationValidator.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationValidator.java
index 0ac4de770c4..694018a8a67 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationValidator.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationValidator.java
@@ -39,17 +39,13 @@ public final class ContextInformationValidator implements IContextInformationVal
 		fProcessor= processor;
 	}
 
-	/*
-	 * @see IContextInformationValidator#install(IContextInformation, ITextViewer, int)
-	 */
+	@Override
 	public void install(IContextInformation contextInformation, ITextViewer viewer, int offset) {
 		fContextInformation= contextInformation;
 		fViewer= viewer;
 	}
 
-	/*
-	 * @see IContentAssistTipCloser#isContextInformationValid(int)
-	 */
+	@Override
 	public boolean isContextInformationValid(int offset) {
 		IContextInformation[] infos= fProcessor.computeContextInformation(fViewer, offset);
 		if (infos != null && infos.length > 0) {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/IContextInformation.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/IContextInformation.java
index 3d6c63b9456..041c87e3d71 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/IContextInformation.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/IContextInformation.java
@@ -72,6 +72,7 @@ public interface IContextInformation {
 	 * 
 	 * @see Object#equals(Object)
 	 */
+	@Override
 	boolean equals(Object object);
 }
 
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java
index ac45f218b61..5248c500feb 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/PopupCloser.java
@@ -128,33 +128,26 @@ class PopupCloser extends ShellAdapter implements FocusListener, SelectionListen
 		}
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
+	@Override
 	public void widgetSelected(SelectionEvent e) {
 		fScrollbarClicked= true;
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-	 */
+	@Override
 	public void widgetDefaultSelected(SelectionEvent e) {
 		fScrollbarClicked= true;
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent)
-	 */
+	@Override
 	public void focusGained(FocusEvent e) {
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent)
-	 */
+	@Override
 	public void focusLost(final FocusEvent e) {
 		fScrollbarClicked= false;
 		Display d= fTable.getDisplay();
 		d.asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				if (Helper.okToUse(fTable) && !fTable.isFocusControl() && !fScrollbarClicked && fContentAssistant != null)
 					fContentAssistant.popupFocusLost(e);
@@ -162,13 +155,11 @@ class PopupCloser extends ShellAdapter implements FocusListener, SelectionListen
 		});
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.ShellAdapter#shellDeactivated(org.eclipse.swt.events.ShellEvent)
-	 * @since 3.1
-	 */
+	@Override
 	public void shellDeactivated(ShellEvent e) {
 		if (fContentAssistant != null && fDisplay != null) {
 			fDisplay.asyncExec(new Runnable() {
+				@Override
 				public void run() {
 					/*
 					 * The asyncExec is a workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=235556 :
@@ -182,19 +173,13 @@ class PopupCloser extends ShellAdapter implements FocusListener, SelectionListen
 	}
 
 
-	/*
-	 * @see org.eclipse.swt.events.ShellAdapter#shellClosed(org.eclipse.swt.events.ShellEvent)
-	 * @since 3.1
-	 */
+	@Override
 	public void shellClosed(ShellEvent e) {
 		if (fContentAssistant != null)
 			fContentAssistant.hide();
 	}
 
-	/*
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 * @since 3.4
-	 */
+	@Override
 	public void handleEvent(Event event) {
 		switch (event.type) {
 			case SWT.Activate:
@@ -237,6 +222,7 @@ class PopupCloser extends ShellAdapter implements FocusListener, SelectionListen
 								delayedICP.setDelayedInputChangeListener(inputChangeListener);
 								// cancel automatic input updating after a small timeout:
 								control.getShell().getDisplay().timerExec(1000, new Runnable() {
+									@Override
 									public void run() {
 										delayedICP.setDelayedInputChangeListener(null);
 									}
@@ -245,6 +231,7 @@ class PopupCloser extends ShellAdapter implements FocusListener, SelectionListen
 
 							// XXX: workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=212392 :
 							control.getShell().getDisplay().asyncExec(new Runnable() {
+								@Override
 								public void run() {
 									fAdditionalInfoController.getInternalAccessor().replaceInformationControl(true);
 								}
@@ -265,6 +252,7 @@ class PopupCloser extends ShellAdapter implements FocusListener, SelectionListen
 						IInformationControlExtension5 iControl5= (IInformationControlExtension5) iControl;
 						if (iControl5.containsControl(control)) {
 							control.getDisplay().asyncExec(new Runnable() {
+								@Override
 								public void run() {
 									if (fContentAssistant != null && ! fContentAssistant.hasProposalPopupFocus())
 										fContentAssistant.hide();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContentFormatter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContentFormatter.java
index 32fcd62110f..e02b999a493 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContentFormatter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContentFormatter.java
@@ -166,9 +166,7 @@ public class ContentFormatter implements IContentFormatter {
 			return getOffset() + getLength();
 		}
 
-		/*
-		 * @see Comparable#compareTo(Object)
-		 */
+		@Override
 		public int compareTo(Object obj) {
 
 			if (obj instanceof PositionReference) {
@@ -197,9 +195,7 @@ public class ContentFormatter implements IContentFormatter {
 			super(category);
 		}
 
-		/*
-		 * @see DefaultPositionUpdater#notDeleted()
-		 */
+		@Override
 		protected boolean notDeleted() {
 			return true;
 		}
@@ -213,9 +209,7 @@ public class ContentFormatter implements IContentFormatter {
 	 * @see IPositionUpdater
 	 */
 	class RemoveAffectedPositions implements IPositionUpdater {
-		/*
-		 * @see IPositionUpdater#update(DocumentEvent)
-		 */
+		@Override
 		public void update(DocumentEvent event) {
 			removeAffectedPositions(event.getDocument());
 		}
@@ -246,9 +240,7 @@ public class ContentFormatter implements IContentFormatter {
 			fOffset= offset;
 		}
 
-		/*
-		 * @see IPositionUpdater#update(DocumentEvent)
-		 */
+		@Override
 		public void update(DocumentEvent event) {
 			updateAffectedPositions(event.getDocument(), fPositions, fOffset);
 		}
@@ -331,6 +323,7 @@ public class ContentFormatter implements IContentFormatter {
 	 * @deprecated incompatible with an open set of document partitionings. The provided information is only used
 	 * 		if this formatter can not compute the partition managing position categories.
 	 */
+	@Deprecated
 	public void setPartitionManagingPositionCategories(String[] categories) {
 		fExternalPartitonManagingCategories= TextUtilities.copy(categories);
 	}
@@ -354,9 +347,7 @@ public class ContentFormatter implements IContentFormatter {
 		fIsPartitionAware= enable;
 	}
 
-	/*
-	 * @see IContentFormatter#getFormattingStrategy(String)
-	 */
+	@Override
 	public IFormattingStrategy getFormattingStrategy(String contentType) {
 
 		Assert.isNotNull(contentType);
@@ -367,9 +358,7 @@ public class ContentFormatter implements IContentFormatter {
 		return (IFormattingStrategy) fStrategies.get(contentType);
 	}
 
-	/*
-	 * @see IContentFormatter#format(IDocument, IRegion)
-	 */
+	@Override
 	public void format(IDocument document, IRegion region) {
 		fNeedsComputation= true;
 		fDocument= document;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContextBasedFormattingStrategy.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContextBasedFormattingStrategy.java
index 5bc9b4a4e9a..ddeccc8d140 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContextBasedFormattingStrategy.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/ContextBasedFormattingStrategy.java
@@ -30,37 +30,27 @@ public abstract class ContextBasedFormattingStrategy implements IFormattingStrat
 	/** The list of preferences for initiated the formatting steps */
 	private final LinkedList fPreferences= new LinkedList();
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingStrategyExtension#format()
-	 */
+	@Override
 	public void format() {
 		fCurrentPreferences= (Map)fPreferences.removeFirst();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingStrategy#format(java.lang.String, boolean, java.lang.String, int[])
-	 */
+	@Override
 	public String format(String content, boolean start, String indentation, int[] positions) {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingStrategyExtension#formatterStarts(org.eclipse.jface.text.formatter.IFormattingContext)
-	 */
+	@Override
 	public void formatterStarts(final IFormattingContext context) {
 		fPreferences.addLast(context.getProperty(FormattingContextProperties.CONTEXT_PREFERENCES));
 	}
 
-	/*
-	 * @see IFormattingStrategy#formatterStarts(String)
-	 */
+	@Override
 	public void formatterStarts(final String indentation) {
 		// Do nothing
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingStrategyExtension#formatterStops()
-	 */
+	@Override
 	public void formatterStops() {
 		fPreferences.clear();
 
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/FormattingContext.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/FormattingContext.java
index f7cda8b02d0..9b76ced365e 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/FormattingContext.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/FormattingContext.java
@@ -26,73 +26,53 @@ public class FormattingContext implements IFormattingContext {
 	/** Map to store the properties */
 	private final Map fMap= new HashMap();
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingContext#dispose()
-	 */
+	@Override
 	public void dispose() {
 		fMap.clear();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingContext#getPreferenceKeys()
-	 */
+	@Override
 	public String[] getPreferenceKeys() {
 		return new String[] {
 		};
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingContext#getProperty(java.lang.Object)
-	 */
+	@Override
 	public Object getProperty(Object key) {
 		return fMap.get(key);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingContext#isBooleanPreference(java.lang.String)
-	 */
+	@Override
 	public boolean isBooleanPreference(String key) {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingContext#isDoublePreference(java.lang.String)
-	 */
+	@Override
 	public boolean isDoublePreference(String key) {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingContext#isFloatPreference(java.lang.String)
-	 */
+	@Override
 	public boolean isFloatPreference(String key) {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingContext#isIntegerPreference(java.lang.String)
-	 */
+	@Override
 	public boolean isIntegerPreference(String key) {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingContext#isLongPreference(java.lang.String)
-	 */
+	@Override
 	public boolean isLongPreference(String key) {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingContext#isStringPreference(java.lang.String)
-	 */
+	@Override
 	public boolean isStringPreference(String key) {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingContext#mapToStore(java.util.Map, org.eclipse.jface.preference.IPreferenceStore)
-	 */
+	@Override
 	public void mapToStore(Map map, IPreferenceStore store) {
 
 		final String[] preferences= getPreferenceKeys();
@@ -128,16 +108,12 @@ public class FormattingContext implements IFormattingContext {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingContext#setProperty(java.lang.Object, java.lang.Object)
-	 */
+	@Override
 	public void setProperty(Object key, Object property) {
 		fMap.put(key, property);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IFormattingContext#storeToMap(org.eclipse.jface.preference.IPreferenceStore, java.util.Map, boolean)
-	 */
+	@Override
 	public void storeToMap(IPreferenceStore store, Map map, boolean useDefault) {
 
 		final String[] preferences= getPreferenceKeys();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/MultiPassContentFormatter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/MultiPassContentFormatter.java
index 6965a18cc86..be8d549897c 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/MultiPassContentFormatter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/formatter/MultiPassContentFormatter.java
@@ -64,9 +64,7 @@ public class MultiPassContentFormatter implements IContentFormatter, IContentFor
 			super(category);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.DefaultPositionUpdater#notDeleted()
-		 */
+		@Override
 		protected final boolean notDeleted() {
 
 			if (fOffset < fPosition.offset && (fPosition.offset + fPosition.length < fOffset + fLength)) {
@@ -120,9 +118,7 @@ public class MultiPassContentFormatter implements IContentFormatter, IContentFor
 		fType= type;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IContentFormatterExtension#format(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.formatter.IFormattingContext)
-	 */
+	@Override
 	public final void format(final IDocument medium, final IFormattingContext context) {
 
 		context.setProperty(FormattingContextProperties.CONTEXT_MEDIUM, medium);
@@ -147,9 +143,7 @@ public class MultiPassContentFormatter implements IContentFormatter, IContentFor
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IContentFormatter#format(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IRegion)
-	 */
+	@Override
 	public final void format(final IDocument medium, final IRegion region) {
 
 		final FormattingContext context= new FormattingContext();
@@ -281,9 +275,7 @@ public class MultiPassContentFormatter implements IContentFormatter, IContentFor
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.formatter.IContentFormatter#getFormattingStrategy(java.lang.String)
-	 */
+	@Override
 	public final IFormattingStrategy getFormattingStrategy(final String type) {
 		return null;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.java
index 8854bbc626c..cd73b4f4480 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/AbstractHyperlinkDetector.java
@@ -46,9 +46,7 @@ public abstract class AbstractHyperlinkDetector implements IHyperlinkDetector, I
 		fContext= context;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlinkDetectorExtension#dispose()
-	 */
+	@Override
 	public void dispose() {
 		fContext= null;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/DefaultHyperlinkPresenter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/DefaultHyperlinkPresenter.java
index 109ab6ee3a3..6a5bf5604e0 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/DefaultHyperlinkPresenter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/DefaultHyperlinkPresenter.java
@@ -130,9 +130,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin
 		fDisposeColor= true;
 	}
 
-	/*
-	 * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlinkControl#canShowMultipleHyperlinks()
-	 */
+	@Override
 	public boolean canShowMultipleHyperlinks() {
 		return false;
 	}
@@ -140,6 +138,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin
 	/*
 	 * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlinkControl#activate(org.eclipse.jdt.internal.ui.javaeditor.IHyperlink[])
 	 */
+	@Override
 	public void showHyperlinks(IHyperlink[] hyperlinks) {
 		Assert.isLegal(hyperlinks != null && hyperlinks.length == 1);
 		highlightRegion(hyperlinks[0].getHyperlinkRegion());
@@ -150,6 +149,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin
 	 *
 	 * @since 3.4
 	 */
+	@Override
 	public boolean canHideHyperlinks() {
 		return true;
 	}
@@ -157,14 +157,13 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin
 	/*
 	 * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlinkControl#deactivate()
 	 */
+	@Override
 	public void hideHyperlinks() {
 		repairRepresentation();
 		fRememberedPosition= null;
 	}
 
-	/*
-	 * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlinkControl#install(org.eclipse.jface.text.ITextViewer)
-	 */
+	@Override
 	public void install(ITextViewer textViewer) {
 		Assert.isNotNull(textViewer);
 		fTextViewer= textViewer;
@@ -184,9 +183,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlinkControl#uninstall()
-	 */
+	@Override
 	public void uninstall() {
 		fTextViewer.removeTextInputListener(this);
 		IDocument document= fTextViewer.getDocument();
@@ -223,9 +220,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin
 		fColor= color;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextPresentationListener#applyTextPresentation(org.eclipse.jface.text.TextPresentation)
-	 */
+	@Override
 	public void applyTextPresentation(TextPresentation textPresentation) {
 		if (fActiveRegion == null)
 			return;
@@ -277,9 +272,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin
 
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-	 */
+	@Override
 	public void documentAboutToBeChanged(DocumentEvent event) {
 		if (fActiveRegion != null) {
 			fRememberedPosition= new Position(fActiveRegion.getOffset(), fActiveRegion.getLength());
@@ -291,9 +284,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)
-	 */
+	@Override
 	public void documentChanged(DocumentEvent event) {
 		if (fRememberedPosition != null) {
 			if (!fRememberedPosition.isDeleted()) {
@@ -307,6 +298,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin
 			StyledText widget= fTextViewer.getTextWidget();
 			if (widget != null && !widget.isDisposed()) {
 				widget.getDisplay().asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						hideHyperlinks();
 					}
@@ -315,9 +307,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextInputListener#inputDocumentAboutToBeChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument)
-	 */
+	@Override
 	public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) {
 		if (oldInput == null)
 			return;
@@ -325,9 +315,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin
 		oldInput.removeDocumentListener(this);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextInputListener#inputDocumentChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument)
-	 */
+	@Override
 	public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
 		if (newInput == null)
 			return;
@@ -361,9 +349,7 @@ public class DefaultHyperlinkPresenter implements IHyperlinkPresenter, IHyperlin
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
+	@Override
 	public void propertyChange(PropertyChangeEvent event) {
 		if (HYPERLINK_COLOR.equals(event.getProperty())) {
 			if (fColor != null && fDisposeColor)
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java
index cb644299c52..419e4bb0bf2 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/HyperlinkManager.java
@@ -69,9 +69,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M
 			fName= name;
 		}
 
-		/*
-		 * @see java.lang.Object#toString()
-		 */
+		@Override
 		public String toString() {
 			return fName;
 		}
@@ -349,9 +347,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M
 		return JFaceTextUtil.getOffsetForCursorLocation(fTextViewer);
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.KeyListener#keyPressed(org.eclipse.swt.events.KeyEvent)
-	 */
+	@Override
 	public void keyPressed(KeyEvent event) {
 
 		if (!isRegisteredStateMask((event.keyCode | event.stateMask) & SWT.MODIFIER_MASK)) {
@@ -364,22 +360,16 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M
 		// do not show hyperlink, since that would often be confusing (e.g. when pressing Ctrl+C)
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.KeyListener#keyReleased(org.eclipse.swt.events.KeyEvent)
-	 */
+	@Override
 	public void keyReleased(KeyEvent event) {
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent)
-	 */
+	@Override
 	public void mouseDoubleClick(MouseEvent e) {
 
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent)
-	 */
+	@Override
 	public void mouseDown(MouseEvent event) {
 
 		if (fHyperlinkPresenter instanceof IHyperlinkPresenterExtension) {
@@ -417,9 +407,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M
 		showHyperlinks(false);
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent)
-	 */
+	@Override
 	public void mouseUp(MouseEvent e) {
 
 		if (!fActive) {
@@ -436,9 +424,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M
 			fActiveHyperlinks[0].open();
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent)
-	 */
+	@Override
 	public void mouseMove(MouseEvent event) {
 		if (fHyperlinkPresenter instanceof IHyperlinkPresenterExtension) {
 			if (!((IHyperlinkPresenterExtension)fHyperlinkPresenter).canHideHyperlinks())
@@ -492,31 +478,21 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.FocusListener#focusGained(org.eclipse.swt.events.FocusEvent)
-	 */
+	@Override
 	public void focusGained(FocusEvent e) {}
 
-	/*
-	 * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent)
-	 */
+	@Override
 	public void focusLost(FocusEvent event) {
 		deactivate();
 	}
 
-	/*
-	 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-	 * @since 3.2
-	 */
+	@Override
 	public void handleEvent(Event event) {
 		//key up
 		deactivate();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextListener#textChanged(TextEvent)
-	 * @since 3.2
-	 */
+	@Override
 	public void textChanged(TextEvent event) {
 		if (event.getDocumentEvent() != null)
 			deactivate();
@@ -527,6 +503,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M
 	 *
 	 * @since 3.4
 	 */
+	@Override
 	public void mouseExit(MouseEvent e) {
 		if (fHyperlinkPresenter instanceof IHyperlinkPresenterExtension) {
 			if (!((IHyperlinkPresenterExtension)fHyperlinkPresenter).canHideHyperlinks())
@@ -540,6 +517,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M
 	 *
 	 * @since 3.4
 	 */
+	@Override
 	public void mouseEnter(MouseEvent e) {
 	}
 
@@ -548,6 +526,7 @@ public class HyperlinkManager implements ITextListener, Listener, KeyListener, M
 	 *
 	 * @since 3.4
 	 */
+	@Override
 	public void mouseHover(MouseEvent e) {
 	}
 
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java
index 35a8d7bfbe2..2972bca1ada 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/MultipleHyperlinkPresenter.java
@@ -102,30 +102,22 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 
 		private static final class LinkContentProvider implements IStructuredContentProvider {
 
-			/*
-			 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-			 */
+			@Override
 			public Object[] getElements(Object inputElement) {
 				return (Object[]) inputElement;
 			}
 
-			/*
-			 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-			 */
+			@Override
 			public void dispose() {
 			}
 
-			/*
-			 * @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) {
 			}
 		}
 
 		private static final class LinkLabelProvider extends ColumnLabelProvider {
-			/*
-			 * @see org.eclipse.jface.viewers.ColumnLabelProvider#getText(java.lang.Object)
-			 */
+			@Override
 			public String getText(Object element) {
 				IHyperlink link= (IHyperlink)element;
 				String text= link.getHyperlinkText();
@@ -161,24 +153,18 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 			create();
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.IInformationControl#setInformation(java.lang.String)
-		 */
+		@Override
 		public void setInformation(String information) {
 			//replaced by IInformationControlExtension2#setInput(java.lang.Object)
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.IInformationControlExtension2#setInput(java.lang.Object)
-		 */
+		@Override
 		public void setInput(Object input) {
 			fInput= (IHyperlink[]) input;
 			deferredCreateContent(fParent);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.AbstractInformationControl#createContent(org.eclipse.swt.widgets.Composite)
-		 */
+		@Override
 		protected void createContent(Composite parent) {
 			fParent= parent;
 			GridLayout layout= new GridLayout();
@@ -207,9 +193,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 			fParent.setBackground(fBackgroundColor);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.AbstractInformationControl#computeSizeHint()
-		 */
+		@Override
 		public Point computeSizeHint() {
 			Point preferedSize= getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
 
@@ -269,9 +253,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 
 			getShell().addShellListener(new ShellAdapter() {
 
-				/*
-				 * @see org.eclipse.swt.events.ShellAdapter#shellActivated(org.eclipse.swt.events.ShellEvent)
-				 */
+				@Override
 				public void shellActivated(ShellEvent e) {
 					if (viewer.getTable().getSelectionCount() == 0) {
 						viewer.getTable().setSelection(0);
@@ -287,6 +269,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 			fTable.addMouseMoveListener(new MouseMoveListener() {
 				TableItem fLastItem= null;
 
+				@Override
 				public void mouseMove(MouseEvent e) {
 					if (fTable.equals(e.getSource())) {
 						Object o= fTable.getItem(new Point(e.x, e.y));
@@ -321,12 +304,14 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 			});
 
 			fTable.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetDefaultSelected(SelectionEvent e) {
 					openSelectedLink();
 				}
 			});
 
 			fTable.addMouseListener(new MouseAdapter() {
+				@Override
 				public void mouseUp(MouseEvent e) {
 					if (fTable.getSelectionCount() < 1)
 						return;
@@ -344,6 +329,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 			});
 
 			fTable.addTraverseListener(new TraverseListener() {
+				@Override
 				public void keyTraversed(TraverseEvent e) {
 					if (e.keyCode == SWT.ESC) {
 						fManager.hideInformationControl();
@@ -352,9 +338,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 			});
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.IInformationControlExtension#hasContents()
-		 */
+		@Override
 		public boolean hasContents() {
 			return true;
 		}
@@ -381,29 +365,26 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 		 * @deprecated As of 3.4, replaced by
 		 *             {@link ITextHoverExtension2#getHoverInfo2(ITextViewer, IRegion)}
 		 */
+		@Deprecated
+		@Override
 		public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
 			return null;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int)
-		 */
+		@Override
 		public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
 			return fSubjectRegion;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.ITextHoverExtension2#getHoverInfo2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
-		 */
+		@Override
 		public Object getHoverInfo2(ITextViewer textViewer, IRegion hoverRegion) {
 			return fHyperlinks;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator()
-		 */
+		@Override
 		public IInformationControlCreator getHoverControlCreator() {
 			return new IInformationControlCreator() {
+				@Override
 				public IInformationControl createInformationControl(Shell parent) {
 					Color foregroundColor= fTextViewer.getTextWidget().getForeground();
 					Color backgroundColor= fTextViewer.getTextWidget().getBackground();
@@ -422,23 +403,17 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 			private IInformationControl fControl;
 			private Rectangle fSubjectArea;
 
-			/*
-			 * @see org.eclipse.jface.text.AbstractInformationControlManager.IInformationControlCloser#setInformationControl(org.eclipse.jface.text.IInformationControl)
-			 */
+			@Override
 			public void setInformationControl(IInformationControl control) {
 				fControl= control;
 			}
 
-			/*
-			 * @see org.eclipse.jface.text.AbstractInformationControlManager.IInformationControlCloser#setSubjectControl(org.eclipse.swt.widgets.Control)
-			 */
+			@Override
 			public void setSubjectControl(Control subject) {
 				fSubjectControl= subject;
 			}
 
-			/*
-			 * @see org.eclipse.jface.text.AbstractInformationControlManager.IInformationControlCloser#start(org.eclipse.swt.graphics.Rectangle)
-			 */
+			@Override
 			public void start(Rectangle subjectArea) {
 				fSubjectArea= subjectArea;
 
@@ -451,9 +426,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 				}
 			}
 
-			/*
-			 * @see org.eclipse.jface.text.AbstractInformationControlManager.IInformationControlCloser#stop()
-			 */
+			@Override
 			public void stop() {
 				if (fDisplay != null && !fDisplay.isDisposed()) {
 					fDisplay.removeFilter(SWT.FocusOut, this);
@@ -465,9 +438,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 				fSubjectArea= null;
 			}
 
-			/*
-			 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-			 */
+			@Override
 			public void handleEvent(Event event) {
 				switch (event.type) {
 					case SWT.FocusOut:
@@ -538,39 +509,26 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 				return alsoKeepUp.contains(x, y);
 			}
 
-			/*
-			 * @see org.eclipse.swt.events.KeyListener#keyPressed(org.eclipse.swt.events.KeyEvent)
-			 */
+			@Override
 			public void keyPressed(KeyEvent e) {
 				hideInformationControl();
 			}
 
-			/*
-			 * @see org.eclipse.swt.events.KeyListener#keyReleased(org.eclipse.swt.events.KeyEvent)
-			 */
+			@Override
 			public void keyReleased(KeyEvent e) {
 				if (!isTakingFocusWhenVisible())
 					hideInformationControl();
 			}
 
-			/*
-			 * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent)
-			 * @since 3.5
-			 */
+			@Override
 			public void mouseDoubleClick(MouseEvent e) {
 			}
 
-			/*
-			 * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent)
-			 * @since 3.5
-			 */
+			@Override
 			public void mouseDown(MouseEvent e) {
 			}
 
-			/*
-			 * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent)
-			 * @since 3.5
-			 */
+			@Override
 			public void mouseUp(MouseEvent e) {
 				hideInformationControl();
 			}
@@ -611,9 +569,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 			fIsControlVisible= false;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.AbstractInformationControlManager#computeInformation()
-		 */
+		@Override
 		protected void computeInformation() {
 			IRegion region= fHover.getHoverRegion(fTextViewer, -1);
 			if (region == null) {
@@ -632,9 +588,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 			setInformation(information, area);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.AbstractInformationControlManager#computeInformationControlLocation(org.eclipse.swt.graphics.Rectangle, org.eclipse.swt.graphics.Point)
-		 */
+		@Override
 		protected Point computeInformationControlLocation(Rectangle subjectArea, Point controlSize) {
 			Point result= super.computeInformationControlLocation(subjectArea, controlSize);
 
@@ -646,9 +600,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 			return result;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.AbstractInformationControlManager#showInformationControl(org.eclipse.swt.graphics.Rectangle)
-		 */
+		@Override
 		protected void showInformationControl(Rectangle subjectArea) {
 			if (fTextViewer instanceof IWidgetTokenOwnerExtension) {
 				if (((IWidgetTokenOwnerExtension)fTextViewer).requestWidgetToken(this, WIDGET_TOKEN_PRIORITY)) {
@@ -675,9 +627,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 			fHyperlinkPresenter.setCaret();
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.AbstractInformationControlManager#hideInformationControl()
-		 */
+		@Override
 		protected void hideInformationControl() {
 			super.hideInformationControl();
 
@@ -689,9 +639,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 			fHyperlinkPresenter.hideHyperlinks();
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.AbstractInformationControlManager#disposeInformationControl()
-		 */
+		@Override
 		public void disposeInformationControl() {
 			super.disposeInformationControl();
 
@@ -703,17 +651,13 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 			fHyperlinkPresenter.hideHyperlinks();
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.IWidgetTokenKeeper#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner)
-		 */
+		@Override
 		public boolean requestWidgetToken(IWidgetTokenOwner owner) {
 			hideInformationControl();
 			return true;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner, int)
-		 */
+		@Override
 		public boolean requestWidgetToken(IWidgetTokenOwner owner, int priority) {
 			if (priority < WIDGET_TOKEN_PRIORITY)
 				return false;
@@ -722,9 +666,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 			return true;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#setFocus(org.eclipse.jface.text.IWidgetTokenOwner)
-		 */
+		@Override
 		public boolean setFocus(IWidgetTokenOwner owner) {
 			return isTakingFocusWhenVisible();
 		}
@@ -771,9 +713,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 		super(color);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#install(org.eclipse.jface.text.ITextViewer)
-	 */
+	@Override
 	public void install(ITextViewer viewer) {
 		super.install(viewer);
 		fTextViewer= viewer;
@@ -783,9 +723,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 		fManager.setSizeConstraints(100, 12, false, true);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#uninstall()
-	 */
+	@Override
 	public void uninstall() {
 		super.uninstall();
 
@@ -796,31 +734,23 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#canShowMultipleHyperlinks()
-	 */
+	@Override
 	public boolean canShowMultipleHyperlinks() {
 		return true;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#canHideHyperlinks()
-	 */
+	@Override
 	public boolean canHideHyperlinks() {
 		return !fManager.isInformationControlVisible();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#hideHyperlinks()
-	 */
+	@Override
 	public void hideHyperlinks() {
 		super.hideHyperlinks();
 		fHyperlinks= null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.hyperlink.DefaultHyperlinkPresenter#showHyperlinks(org.eclipse.jface.text.hyperlink.IHyperlink[])
-	 */
+	@Override
 	public void showHyperlinks(IHyperlink[] hyperlinks) {
 		showHyperlinks(hyperlinks, false);
 	}
@@ -830,6 +760,7 @@ public class MultipleHyperlinkPresenter extends DefaultHyperlinkPresenter implem
 	 * 
 	 * @since 3.7
 	 */
+	@Override
 	public void showHyperlinks(IHyperlink[] activeHyperlinks, boolean takesFocusWhenVisible) {
 		fManager.takesFocusWhenVisible(takesFocusWhenVisible);
 		super.showHyperlinks(new IHyperlink[] { activeHyperlinks[0] });
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java
index 8b032893fb2..851eae0f205 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlink.java
@@ -43,16 +43,12 @@ public class URLHyperlink implements IHyperlink {
 		fURLString= urlString;
 	}
 
-	/*
-	 * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlink#getHyperlinkRegion()
-	 */
+	@Override
 	public IRegion getHyperlinkRegion() {
 		return fRegion;
 	}
 
-	/*
-	 * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlink#open()
-	 */
+	@Override
 	public void open() {
 		if (fURLString != null) {
 			Program.launch(fURLString);
@@ -60,16 +56,12 @@ public class URLHyperlink implements IHyperlink {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlink#getTypeLabel()
-	 */
+	@Override
 	public String getTypeLabel() {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlink#getHyperlinkText()
-	 */
+	@Override
 	public String getHyperlinkText() {
 		return MessageFormat.format(HyperlinkMessages.getString("URLHyperlink.hyperlinkText"), new Object[] { fURLString }); //$NON-NLS-1$
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlinkDetector.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlinkDetector.java
index 62710dbf6d6..c8b6fedade5 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlinkDetector.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/hyperlink/URLHyperlinkDetector.java
@@ -44,12 +44,11 @@ public class URLHyperlinkDetector extends AbstractHyperlinkDetector {
 	 * @param textViewer the text viewer in which to detect the hyperlink
 	 * @deprecated As of 3.2, replaced by {@link URLHyperlinkDetector}
 	 */
+	@Deprecated
 	public URLHyperlinkDetector(ITextViewer textViewer) {
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlinkDetector#detectHyperlinks(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion, boolean)
-	 */
+	@Override
 	public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {
 		if (region == null || textViewer == null)
 			return null;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/information/IInformationProvider.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/information/IInformationProvider.java
index 872f5413a0a..697a1cba1e1 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/information/IInformationProvider.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/information/IInformationProvider.java
@@ -63,5 +63,6 @@ public interface IInformationProvider {
 	 * @see IInformationPresenter
 	 * @deprecated As of 2.1, replaced by {@link IInformationProviderExtension#getInformation2(ITextViewer, IRegion)}
 	 */
+	@Deprecated
 	String getInformation(ITextViewer textViewer, IRegion subject);
 }
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/information/InformationPresenter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/information/InformationPresenter.java
index a691c449de5..c9c73534e47 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/information/InformationPresenter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/information/InformationPresenter.java
@@ -90,23 +90,17 @@ public class InformationPresenter extends AbstractInformationControlManager impl
 		/** Indicates whether this closer is active. */
 		private boolean fIsActive= false;
 
-		/*
-		 * @see IInformationControlCloser#setSubjectControl(Control)
-		 */
+		@Override
 		public void setSubjectControl(Control control) {
 			fSubjectControl= control;
 		}
 
-		/*
-		 * @see IInformationControlCloser#setInformationControl(IInformationControl)
-		 */
+		@Override
 		public void setInformationControl(IInformationControl control) {
 			fInformationControlToClose= control;
 		}
 
-		/*
-		 * @see IInformationControlCloser#start(Rectangle)
-		 */
+		@Override
 		public void start(Rectangle informationArea) {
 
 			if (fIsActive)
@@ -126,9 +120,7 @@ public class InformationPresenter extends AbstractInformationControlManager impl
 			fTextViewer.addViewportListener(this);
 		}
 
-		/*
-		 * @see IInformationControlCloser#stop()
-		 */
+		@Override
 		public void stop() {
 
 			if (!fIsActive)
@@ -148,53 +140,40 @@ public class InformationPresenter extends AbstractInformationControlManager impl
 			}
 		}
 
-		/*
-		 * @see ControlListener#controlResized(ControlEvent)
-		 */
-		 public void controlResized(ControlEvent e) {
+		 @Override
+		public void controlResized(ControlEvent e) {
 			 hideInformationControl();
 		}
 
-		/*
-		 * @see ControlListener#controlMoved(ControlEvent)
-		 */
-		 public void controlMoved(ControlEvent e) {
+		 @Override
+		public void controlMoved(ControlEvent e) {
 			 hideInformationControl();
 		}
 
-		/*
-		 * @see MouseListener#mouseDown(MouseEvent)
-		 */
-		 public void mouseDown(MouseEvent e) {
+		 @Override
+		public void mouseDown(MouseEvent e) {
 			 hideInformationControl();
 		}
 
-		/*
-		 * @see MouseListener#mouseUp(MouseEvent)
-		 */
+		@Override
 		public void mouseUp(MouseEvent e) {
 		}
 
-		/*
-		 * @see MouseListener#mouseDoubleClick(MouseEvent)
-		 */
+		@Override
 		public void mouseDoubleClick(MouseEvent e) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see FocusListener#focusGained(FocusEvent)
-		 */
+		@Override
 		public void focusGained(FocusEvent e) {
 		}
 
-		/*
-		 * @see FocusListener#focusLost(FocusEvent)
-		 */
-		 public void focusLost(FocusEvent e) {
+		 @Override
+		public void focusLost(FocusEvent e) {
 			Display d= fSubjectControl.getDisplay();
 			d.asyncExec(new Runnable() {
 				// Without the asyncExec, mouse clicks to the workbench window are swallowed.
+				@Override
 				public void run() {
 					if (fInformationControlToClose == null || !fInformationControlToClose.isFocusControl())
 						hideInformationControl();
@@ -202,23 +181,17 @@ public class InformationPresenter extends AbstractInformationControlManager impl
 			});
 		}
 
-		/*
-		 * @see IViewportListenerListener#viewportChanged(int)
-		 */
+		@Override
 		public void viewportChanged(int topIndex) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see KeyListener#keyPressed(KeyEvent)
-		 */
+		@Override
 		public void keyPressed(KeyEvent e) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see KeyListener#keyReleased(KeyEvent)
-		 */
+		@Override
 		public void keyReleased(KeyEvent e) {
 		}
 	}
@@ -265,10 +238,7 @@ public class InformationPresenter extends AbstractInformationControlManager impl
 		fPartitioning= partitioning;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.information.IInformationPresenterExtension#getDocumentPartitioning()
-	 * @since 3.0
-	 */
+	@Override
 	public String getDocumentPartitioning() {
 		return fPartitioning;
 	}
@@ -294,9 +264,7 @@ public class InformationPresenter extends AbstractInformationControlManager impl
 			fProviders.put(contentType, provider);
 	}
 
-	/*
-	 * @see IInformationPresenter#getInformationProvider(String)
-	 */
+	@Override
 	public IInformationProvider getInformationProvider(String contentType) {
 		if (fProviders == null)
 			return null;
@@ -314,9 +282,7 @@ public class InformationPresenter extends AbstractInformationControlManager impl
 		fOffset= offset;
 	}
 
-	/*
-	 * @see AbstractInformationControlManager#computeInformation()
-	 */
+	@Override
 	protected void computeInformation() {
 
 		int offset= fOffset < 0 ? fTextViewer.getSelectedRange().x : fOffset;
@@ -409,24 +375,18 @@ public class InformationPresenter extends AbstractInformationControlManager impl
 		return new Region(start, end - start);
 	}
 
-	/*
-	 * @see IInformationPresenter#install(ITextViewer)
-	 */
+	@Override
 	public void install(ITextViewer textViewer) {
 		fTextViewer= textViewer;
 		install(fTextViewer.getTextWidget());
 	}
 
-	/*
-	 * @see IInformationPresenter#uninstall()
-	 */
+	@Override
 	public void uninstall() {
 		dispose();
 	}
 
-	/*
-	 * @see AbstractInformationControlManager#showInformationControl(Rectangle)
-	 */
+	@Override
 	protected void showInformationControl(Rectangle subjectArea) {
 		if (fTextViewer instanceof IWidgetTokenOwnerExtension && fTextViewer instanceof IWidgetTokenOwner) {
 			IWidgetTokenOwnerExtension extension= (IWidgetTokenOwnerExtension) fTextViewer;
@@ -441,9 +401,7 @@ public class InformationPresenter extends AbstractInformationControlManager impl
 			super.showInformationControl(subjectArea);
 	}
 
-	/*
-	 * @see AbstractInformationControlManager#hideInformationControl()
-	 */
+	@Override
 	protected void hideInformationControl() {
 		try {
 			super.hideInformationControl();
@@ -455,9 +413,7 @@ public class InformationPresenter extends AbstractInformationControlManager impl
 		}
 	}
 
-	/*
-	 * @see AbstractInformationControlManager#handleInformationControlDisposed()
-	 */
+	@Override
 	protected void handleInformationControlDisposed() {
 		try {
 			super.handleInformationControlDisposed();
@@ -469,25 +425,17 @@ public class InformationPresenter extends AbstractInformationControlManager impl
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenKeeper#requestWidgetToken(IWidgetTokenOwner)
-	 */
+	@Override
 	public boolean requestWidgetToken(IWidgetTokenOwner owner) {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#requestWidgetToken(org.eclipse.jface.text.IWidgetTokenOwner, int)
-	 * @since 3.0
-	 */
+	@Override
 	public boolean requestWidgetToken(IWidgetTokenOwner owner, int priority) {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IWidgetTokenKeeperExtension#setFocus(org.eclipse.jface.text.IWidgetTokenOwner)
-	 * @since 3.0
-	 */
+	@Override
 	public boolean setFocus(IWidgetTokenOwner owner) {
 		return false;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java
index 225465bad68..4f2a5492d0c 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedModeUI.java
@@ -129,10 +129,12 @@ public class LinkedModeUI {
 	 */
 	private static final class EmtpyFocusListener implements ILinkedModeUIFocusListener {
 
+		@Override
 		public void linkingFocusGained(LinkedPosition position, LinkedModeUITarget target) {
 			// ignore
 		}
 
+		@Override
 		public void linkingFocusLost(LinkedPosition position, LinkedModeUITarget target) {
 			// ignore
 		}
@@ -185,22 +187,16 @@ public class LinkedModeUI {
 			fTextViewer= viewer;
 		}
 
-		/*
-		 * @see org.eclipse.jdt.internal.ui.text.link2.LinkedModeUI.ILinkedUITarget#getViewer()
-		 */
+		@Override
 		public ITextViewer getViewer() {
 			return fTextViewer;
 		}
 
-		/**
-		 * {@inheritDoc}
-		 */
+		@Override
 		public void linkingFocusLost(LinkedPosition position, LinkedModeUITarget target) {
 		}
 
-		/**
-		 * {@inheritDoc}
-		 */
+		@Override
 		public void linkingFocusGained(LinkedPosition position, LinkedModeUITarget target) {
 		}
 
@@ -210,15 +206,18 @@ public class LinkedModeUI {
 	 * Listens for state changes in the model.
 	 */
 	private final class ExitListener implements ILinkedModeListener {
+		@Override
 		public void left(LinkedModeModel model, int flags) {
 			leave(ILinkedModeListener.EXIT_ALL | flags);
 		}
 
+		@Override
 		public void suspend(LinkedModeModel model) {
 			disconnect();
 			redraw();
 		}
 
+		@Override
 		public void resume(LinkedModeModel model, int flags) {
 			if ((flags & ILinkedModeListener.EXIT_ALL) != 0) {
 				leave(flags);
@@ -283,9 +282,7 @@ public class LinkedModeUI {
 	 * A NullObject implementation of <code>IExitPolicy</code>.
 	 */
 	private static class NullExitPolicy implements IExitPolicy {
-		/*
-		 * @see org.eclipse.jdt.internal.ui.text.link2.LinkedModeUI.IExitPolicy#doExit(org.eclipse.swt.events.VerifyEvent, int, int)
-		 */
+		@Override
 		public ExitFlags doExit(LinkedModeModel model, VerifyEvent event, int offset, int length) {
 			return null;
 		}
@@ -296,13 +293,16 @@ public class LinkedModeUI {
 	 */
 	private class Closer implements ShellListener, ITextInputListener {
 
+		@Override
 		public void shellActivated(ShellEvent e) {
 		}
 
+		@Override
 		public void shellClosed(ShellEvent e) {
 			leave(ILinkedModeListener.EXIT_ALL);
 		}
 
+		@Override
 		public void shellDeactivated(ShellEvent e) {
 // 			TODO re-enable after debugging
 //			if (true) return;
@@ -335,6 +335,7 @@ public class LinkedModeUI {
 			{
 				// Post in UI thread since the assistant popup will only get the focus after we lose it.
 				display.asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						if (fIsActive && viewer instanceof IEditingSupportRegistry) {
 							IEditingSupport[] helpers= ((IEditingSupportRegistry) viewer).getRegisteredSupports();
@@ -352,23 +353,21 @@ public class LinkedModeUI {
 			}
 		}
 
+		@Override
 		public void shellDeiconified(ShellEvent e) {
 		}
 
+		@Override
 		public void shellIconified(ShellEvent e) {
 			leave(ILinkedModeListener.EXIT_ALL);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.ITextInputListener#inputDocumentAboutToBeChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument)
-		 */
+		@Override
 		public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) {
 			leave(ILinkedModeListener.EXIT_ALL);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.ITextInputListener#inputDocumentChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument)
-		 */
+		@Override
 		public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
 		}
 
@@ -378,9 +377,7 @@ public class LinkedModeUI {
 	 * @since 3.1
 	 */
 	private class DocumentListener implements IDocumentListener {
-		/*
-		 * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-		 */
+		@Override
 		public void documentAboutToBeChanged(DocumentEvent event) {
 
 			// default behavior: any document change outside a linked position
@@ -407,9 +404,7 @@ public class LinkedModeUI {
 
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)
-		 */
+		@Override
 		public void documentChanged(DocumentEvent event) {
 		}
 	}
@@ -422,6 +417,7 @@ public class LinkedModeUI {
 
 		private boolean fIsEnabled= true;
 
+		@Override
 		public void verifyKey(VerifyEvent event) {
 
 			if (!event.doit || !fIsEnabled)
@@ -528,9 +524,7 @@ public class LinkedModeUI {
 	 */
 	private class MySelectionListener implements ISelectionChangedListener {
 
-		/*
-		 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-		 */
+		@Override
 		public void selectionChanged(SelectionChangedEvent event) {
 			ISelection selection= event.getSelection();
 			if (selection instanceof ITextSelection) {
@@ -558,9 +552,7 @@ public class LinkedModeUI {
 
 	private class ProposalListener implements IProposalListener {
 
-		/*
-		 * @see org.eclipse.jface.internal.text.link.contentassist.IProposalListener#proposalChosen(org.eclipse.jface.text.contentassist.ICompletionProposal)
-		 */
+		@Override
 		public void proposalChosen(ICompletionProposal proposal) {
 			next();
 		}
@@ -617,9 +609,7 @@ public class LinkedModeUI {
 	private ILinkedModeUIFocusListener fPositionListener= new EmtpyFocusListener();
 	private IAutoEditStrategy fAutoEditVetoer= new IAutoEditStrategy() {
 
-		/*
-		 * @see org.eclipse.jface.text.IAutoEditStrategy#customizeDocumentCommand(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.DocumentCommand)
-		 */
+		@Override
 		public void customizeDocumentCommand(IDocument document, DocumentCommand command) {
 			// invalidate the change to ensure that the change is performed on the document only.
 			if (fModel.anyPositionContains(command.offset)) {
@@ -982,6 +972,7 @@ public class LinkedModeUI {
 
 		// See https://bugs.eclipse.org/bugs/show_bug.cgi?id=132263
 		widget.getDisplay().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				if (!widget.isDisposed())
 					try {
@@ -1168,6 +1159,7 @@ public class LinkedModeUI {
 		fModel.stopForwarding(flags);
 
 		Runnable runnable= new Runnable() {
+			@Override
 			public void run() {
 				if (fExitPosition != null)
 					fExitPosition.getDocument().removePosition(fExitPosition);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedPositionAnnotations.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedPositionAnnotations.java
index 32609cd84e2..b379b88ca4c 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedPositionAnnotations.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/LinkedPositionAnnotations.java
@@ -251,25 +251,19 @@ final class LinkedPositionAnnotations extends AnnotationModel {
 		fExitPosition = position;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.AnnotationModel#addPosition(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.Position)
-	 */
+	@Override
 	protected void addPosition(IDocument document, Position position) {
 		// don't to anything as our positions are managed by custom
 		// position updaters
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.AnnotationModel#removePosition(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.Position)
-	 */
+	@Override
 	protected void removePosition(IDocument document, Position pos) {
 		// don't to anything as our positions are managed by custom
 		// position updaters
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.AnnotationModel#fireModelChanged()
-	 */
+	@Override
 	public void fireModelChanged() {
 		super.fireModelChanged();
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/ProposalPosition.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/ProposalPosition.java
index 2c93ff16627..e8b9e09c945 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/ProposalPosition.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/ProposalPosition.java
@@ -69,9 +69,7 @@ public class ProposalPosition extends LinkedPosition {
 		return null;
 	}
 
-	/*
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
+	@Override
 	public boolean equals(Object o) {
 		if (o instanceof ProposalPosition) {
 			if (super.equals(o)) {
@@ -92,9 +90,7 @@ public class ProposalPosition extends LinkedPosition {
 		return fProposals;
 	}
 
-	/*
-	 * @see org.eclipse.jdt.internal.ui.text.link.LinkedPosition#hashCode()
-	 */
+	@Override
 	public int hashCode() {
 		return super.hashCode() | (fProposals == null ? 0 : fProposals.hashCode());
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/TabStopIterator.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/TabStopIterator.java
index 3300e8e11f2..e45acee3371 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/link/TabStopIterator.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/link/TabStopIterator.java
@@ -44,6 +44,7 @@ class TabStopIterator {
 		 * <p><code>o1</code> and <code>o2</code> are required to be instances
 		 * of <code>LinkedPosition</code>.</p>
 		 */
+		@Override
 		public int compare(Object o1, Object o2) {
 			LinkedPosition p1= (LinkedPosition)o1;
 			LinkedPosition p2= (LinkedPosition)o2;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/presentation/PresentationReconciler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/presentation/PresentationReconciler.java
index a4d963820e7..d530446456b 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/presentation/PresentationReconciler.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/presentation/PresentationReconciler.java
@@ -77,9 +77,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent
 		 */
 		private boolean fCachedRedrawState= true;
 
-		/*
-		 * @see ITextInputListener#inputDocumentAboutToBeChanged(IDocument, IDocument)
-		 */
+		@Override
 		public void inputDocumentAboutToBeChanged(IDocument oldDocument, IDocument newDocument) {
 			if (oldDocument != null) {
 				try {
@@ -100,6 +98,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent
 		/*
 		 * @see ITextInputListener#inputDocumenChanged(IDocument, IDocument)
 		 */
+		@Override
 		public void inputDocumentChanged(IDocument oldDocument, IDocument newDocument) {
 
 			fDocumentChanging= false;
@@ -120,9 +119,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent
 			}
 		}
 
-		/*
-		 * @see IDocumentPartitioningListener#documentPartitioningChanged(IDocument)
-		 */
+		@Override
 		public void documentPartitioningChanged(IDocument document) {
 			if (!fDocumentChanging && fCachedRedrawState)
 				processDamage(new Region(0, document.getLength()), document);
@@ -130,10 +127,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent
 				fDocumentPartitioningChanged= true;
 		}
 
-		/*
-		 * @see IDocumentPartitioningListenerExtension#documentPartitioningChanged(IDocument, IRegion)
-		 * @since 2.0
-		 */
+		@Override
 		public void documentPartitioningChanged(IDocument document, IRegion changedRegion) {
 			if (!fDocumentChanging && fCachedRedrawState) {
 				processDamage(new Region(changedRegion.getOffset(), changedRegion.getLength()), document);
@@ -143,19 +137,14 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent
 			}
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.IDocumentPartitioningListenerExtension2#documentPartitioningChanged(org.eclipse.jface.text.DocumentPartitioningChangedEvent)
-		 * @since 3.0
-		 */
+		@Override
 		public void documentPartitioningChanged(DocumentPartitioningChangedEvent event) {
 			IRegion changedRegion= event.getChangedRegion(getDocumentPartitioning());
 			if (changedRegion != null)
 				documentPartitioningChanged(event.getDocument(), changedRegion);
 		}
 
-		/*
-		 * @see IDocumentListener#documentAboutToBeChanged(DocumentEvent)
-		 */
+		@Override
 		public void documentAboutToBeChanged(DocumentEvent e) {
 
 			fDocumentChanging= true;
@@ -173,9 +162,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent
 			}
 		}
 
-		/*
-		 * @see IDocumentListener#documentChanged(DocumentEvent)
-		 */
+		@Override
 		public void documentChanged(DocumentEvent e) {
 			if (fCachedRedrawState) {
 				try {
@@ -187,9 +174,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent
 			fDocumentChanging= false;
 		}
 
-		/*
-		 * @see ITextListener#textChanged(TextEvent)
-		 */
+		@Override
 		public void textChanged(TextEvent e) {
 
 			fCachedRedrawState= e.getViewerRedrawState();
@@ -305,6 +290,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent
 	 * @see org.eclipse.jface.text.presentation.IPresentationReconcilerExtension#geDocumenttPartitioning()
 	 * @since 3.0
 	 */
+	@Override
 	public String getDocumentPartitioning() {
 		return fPartitioning;
 	}
@@ -351,9 +337,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent
 			fRepairers.put(contentType, repairer);
 	}
 
-	/*
-	 * @see IPresentationReconciler#install(ITextViewer)
-	 */
+	@Override
 	public void install(ITextViewer viewer) {
 		Assert.isNotNull(viewer);
 
@@ -365,9 +349,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent
 			fInternalListener.inputDocumentChanged(null, document);
 	}
 
-	/*
-	 * @see IPresentationReconciler#uninstall()
-	 */
+	@Override
 	public void uninstall() {
 		fViewer.removeTextInputListener(fInternalListener);
 
@@ -375,9 +357,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent
 		fInternalListener.inputDocumentAboutToBeChanged(fViewer.getDocument(), null);
 	}
 
-	/*
-	 * @see IPresentationReconciler#getDamager(String)
-	 */
+	@Override
 	public IPresentationDamager getDamager(String contentType) {
 
 		if (fDamagers == null)
@@ -386,9 +366,7 @@ public class PresentationReconciler implements IPresentationReconciler, IPresent
 		return (IPresentationDamager) fDamagers.get(contentType);
 	}
 
-	/*
-	 * @see IPresentationReconciler#getRepairer(String)
-	 */
+	@Override
 	public IPresentationRepairer getRepairer(String contentType) {
 
 		if (fRepairers == null)
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/quickassist/QuickAssistAssistant.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/quickassist/QuickAssistAssistant.java
index 598d1851449..3f74c5baa27 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/quickassist/QuickAssistAssistant.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/quickassist/QuickAssistAssistant.java
@@ -39,17 +39,12 @@ public class QuickAssistAssistant implements IQuickAssistAssistant, IQuickAssist
 
 
 	private static final class QuickAssistAssistantImpl extends ContentAssistant {
-		/*
-		 * @see org.eclipse.jface.text.contentassist.ContentAssistant#possibleCompletionsClosed()
-		 */
+		@Override
 		public void possibleCompletionsClosed() {
 			super.possibleCompletionsClosed();
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.contentassist.ContentAssistant#hide()
-		 * @since 3.4
-		 */
+		@Override
 		protected void hide() {
 			super.hide();
 		}
@@ -64,9 +59,7 @@ public class QuickAssistAssistant implements IQuickAssistAssistant, IQuickAssist
 			fQuickAssistProcessor= processor;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int)
-		 */
+		@Override
 		public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
 			// panic code - should not happen
 			if (!(viewer instanceof ISourceViewer))
@@ -75,37 +68,27 @@ public class QuickAssistAssistant implements IQuickAssistAssistant, IQuickAssist
 			return fQuickAssistProcessor.computeQuickAssistProposals(new TextInvocationContext((ISourceViewer)viewer, offset, -1));
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int)
-		 */
+		@Override
 		public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
 			return null;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
-		 */
+		@Override
 		public char[] getCompletionProposalAutoActivationCharacters() {
 			return null;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
-		 */
+		@Override
 		public char[] getContextInformationAutoActivationCharacters() {
 			return null;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getErrorMessage()
-		 */
+		@Override
 		public String getErrorMessage() {
 			return null;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
-		 */
+		@Override
 		public IContextInformationValidator getContextInformationValidator() {
 			return null;
 		}
@@ -121,74 +104,54 @@ public class QuickAssistAssistant implements IQuickAssistAssistant, IQuickAssist
 		fQuickAssistAssistantImpl.enableAutoInsert(false);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#showPossibleQuickAssists()
-	 */
+	@Override
 	public String showPossibleQuickAssists() {
 		return fQuickAssistAssistantImpl.showPossibleCompletions();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#getQuickAssistProcessor(java.lang.String)
-	 */
+	@Override
 	public IQuickAssistProcessor getQuickAssistProcessor() {
 		return fQuickAssistProcessor;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#setQuickAssistProcessor(org.eclipse.jface.text.quickassist.IQuickAssistProcessor)
-	 */
+	@Override
 	public void setQuickAssistProcessor(IQuickAssistProcessor processor) {
 		fQuickAssistProcessor= processor;
 		fQuickAssistAssistantImpl.setDocumentPartitioning("__" + getClass().getName() + "_partitioning"); //$NON-NLS-1$ //$NON-NLS-2$
 		fQuickAssistAssistantImpl.setContentAssistProcessor(new ContentAssistProcessor(processor), IDocument.DEFAULT_CONTENT_TYPE);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#canFix(org.eclipse.jface.text.source.Annotation)
-	 */
+	@Override
 	public boolean canFix(Annotation annotation) {
 		return fQuickAssistProcessor != null && fQuickAssistProcessor.canFix(annotation);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#canAssist(org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext)
-	 */
+	@Override
 	public boolean canAssist(IQuickAssistInvocationContext invocationContext) {
 		return fQuickAssistProcessor != null && fQuickAssistProcessor.canAssist(invocationContext);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#install(org.eclipse.jface.text.ITextViewer)
-	 */
+	@Override
 	public void install(ISourceViewer sourceViewer) {
 		fQuickAssistAssistantImpl.install(sourceViewer);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#setInformationControlCreator(org.eclipse.jface.text.IInformationControlCreator)
-	 */
+	@Override
 	public void setInformationControlCreator(IInformationControlCreator creator) {
 		fQuickAssistAssistantImpl.setInformationControlCreator(creator);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#uninstall()
-	 */
+	@Override
 	public void uninstall() {
 		fQuickAssistAssistantImpl.uninstall();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#setProposalSelectorBackground(org.eclipse.swt.graphics.Color)
-	 */
+	@Override
 	public void setProposalSelectorBackground(Color background) {
 		fQuickAssistAssistantImpl.setProposalSelectorBackground(background);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#setProposalSelectorForeground(org.eclipse.swt.graphics.Color)
-	 */
+	@Override
 	public void setProposalSelectorForeground(Color foreground) {
 		fQuickAssistAssistantImpl.setProposalSelectorForeground(foreground);
 	}
@@ -225,31 +188,23 @@ public class QuickAssistAssistant implements IQuickAssistAssistant, IQuickAssist
 		fQuickAssistAssistantImpl.possibleCompletionsClosed();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#addCompletionListener(org.eclipse.jface.text.contentassist.ICompletionListener)
-	 */
+	@Override
 	public void addCompletionListener(ICompletionListener listener) {
 		fQuickAssistAssistantImpl.addCompletionListener(listener);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#removeCompletionListener(org.eclipse.jface.text.contentassist.ICompletionListener)
-	 */
+	@Override
 	public void removeCompletionListener(ICompletionListener listener) {
 		fQuickAssistAssistantImpl.removeCompletionListener(listener);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#setStatusLineVisible(boolean)
-	 */
+	@Override
 	public void setStatusLineVisible(boolean show) {
 		fQuickAssistAssistantImpl.setStatusLineVisible(show);
 
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistAssistant#setStatusMessage(java.lang.String)
-	 */
+	@Override
 	public void setStatusMessage(String message) {
 		fQuickAssistAssistantImpl.setStatusMessage(message);
 	}
@@ -259,6 +214,7 @@ public class QuickAssistAssistant implements IQuickAssistAssistant, IQuickAssist
 	 *
 	 * @since 3.4
 	 */
+	@Override
 	public final IHandler getHandler(String commandId) {
 		return fQuickAssistAssistantImpl.getHandler(commandId);
 	}
@@ -277,6 +233,7 @@ public class QuickAssistAssistant implements IQuickAssistAssistant, IQuickAssist
 	 *
 	 * @since 3.4
 	 */
+	@Override
 	public void enableColoredLabels(boolean isEnabled) {
 		fQuickAssistAssistantImpl.enableColoredLabels(isEnabled);
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconcileStep.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconcileStep.java
index eae51bcc9b1..111607fd63d 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconcileStep.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconcileStep.java
@@ -50,17 +50,17 @@ public abstract class AbstractReconcileStep implements IReconcileStep {
 	public AbstractReconcileStep() {
 	}
 
+	@Override
 	public boolean isLastStep() {
 		return fNextStep == null;
 	}
 
+	@Override
 	public boolean isFirstStep() {
 		return fPreviousStep == null;
 	}
 
-	/*
-	 * @see org.eclipse.text.reconcilerpipe.IReconcilerResultCollector#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public void setProgressMonitor(IProgressMonitor monitor) {
 		fProgressMonitor= monitor;
 
@@ -68,16 +68,12 @@ public abstract class AbstractReconcileStep implements IReconcileStep {
 			fNextStep.setProgressMonitor(monitor);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.reconciler.IReconcileStep#getProgressMonitor()
-	 */
+	@Override
 	public IProgressMonitor getProgressMonitor() {
 		return fProgressMonitor;
 	}
 
-	/*
-	 * @see IReconcileStep#reconcile(IRegion)
-	 */
+	@Override
 	public final IReconcileResult[] reconcile(IRegion partition) {
 		IReconcileResult[] result= reconcileModel(null, partition);
 		if (!isLastStep()) {
@@ -88,9 +84,7 @@ public abstract class AbstractReconcileStep implements IReconcileStep {
 		return result;
 	}
 
-	/*
-	 * @see IReconcileStep#reconcile(org.eclipse.jface.text.reconciler.DirtyRegion, org.eclipse.jface.text.IRegion)
-	 */
+	@Override
 	public final IReconcileResult[] reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
 		IReconcileResult[] result= reconcileModel(dirtyRegion, subRegion);
 		if (!isLastStep()) {
@@ -150,18 +144,14 @@ public abstract class AbstractReconcileStep implements IReconcileStep {
 		return fProgressMonitor != null && fProgressMonitor.isCanceled();
 	}
 
-	/*
-	 * @see IReconcileStep#setPreviousStep(IReconcileStep)
-	 */
+	@Override
 	public void setPreviousStep(IReconcileStep step) {
 		Assert.isNotNull(step);
 		Assert.isTrue(fPreviousStep == null);
 		fPreviousStep= step;
 	}
 
-	/*
-	 * @see IReconcileStep#setInputModel(Object)
-	 */
+	@Override
 	public void setInputModel(IReconcilableModel inputModel) {
 		fInputModel= inputModel;
 
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconciler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconciler.java
index 1965ba17a85..b1f22441578 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconciler.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/AbstractReconciler.java
@@ -158,6 +158,7 @@ abstract public class AbstractReconciler implements IReconciler {
 		 * Calls {@link AbstractReconciler#initialProcess()} on entrance.
 		 * </p>
 		 */
+		@Override
 		public void run() {
 
 			synchronized (fDirtyRegionQueue) {
@@ -224,15 +225,11 @@ abstract public class AbstractReconciler implements IReconciler {
 	 */
 	class Listener implements IDocumentListener, ITextInputListener {
 
-		/*
-		 * @see IDocumentListener#documentAboutToBeChanged(DocumentEvent)
-		 */
+		@Override
 		public void documentAboutToBeChanged(DocumentEvent e) {
 		}
 
-		/*
-		 * @see IDocumentListener#documentChanged(DocumentEvent)
-		 */
+		@Override
 		public void documentChanged(DocumentEvent e) {
 
 			if (fThread.isActive() || !fThread.isDirty() && fThread.isAlive()) {
@@ -255,9 +252,7 @@ abstract public class AbstractReconciler implements IReconciler {
 
 		}
 
-		/*
-		 * @see ITextInputListener#inputDocumentAboutToBeChanged(IDocument, IDocument)
-		 */
+		@Override
 		public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) {
 
 			if (oldInput == fDocument) {
@@ -281,9 +276,7 @@ abstract public class AbstractReconciler implements IReconciler {
 			}
 		}
 
-		/*
-		 * @see ITextInputListener#inputDocumentChanged(IDocument, IDocument)
-		 */
+		@Override
 		public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
 
 			fDocument= newInput;
@@ -445,9 +438,7 @@ abstract public class AbstractReconciler implements IReconciler {
 		return fProgressMonitor;
 	}
 
-	/*
-	 * @see IReconciler#install(ITextViewer)
-	 */
+	@Override
 	public void install(ITextViewer textViewer) {
 
 		Assert.isNotNull(textViewer);
@@ -477,9 +468,7 @@ abstract public class AbstractReconciler implements IReconciler {
 		}
 	}
 
-	/*
-	 * @see IReconciler#uninstall()
-	 */
+	@Override
 	public void uninstall() {
 		if (fListener != null) {
 
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/DirtyRegion.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/DirtyRegion.java
index 83b07ac530a..46483feba3b 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/DirtyRegion.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/DirtyRegion.java
@@ -67,16 +67,12 @@ public class DirtyRegion implements ITypedRegion {
 		return null;
 	}
 
-	/*
-	 * @see ITypedRegion#getOffset()
-	 */
+	@Override
 	public int getOffset() {
 		return fOffset;
 	}
 
-	/*
-	 * @see ITypedRegion#getLength()
-	 */
+	@Override
 	public int getLength() {
 		return fLength;
 	}
@@ -84,6 +80,7 @@ public class DirtyRegion implements ITypedRegion {
 	/*
 	 * @see ITypedRegion#getType
 	 */
+	@Override
 	public String getType() {
 		return fType;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/MonoReconciler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/MonoReconciler.java
index 13e1ec97e41..b01185404ae 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/MonoReconciler.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/MonoReconciler.java
@@ -56,17 +56,13 @@ public class MonoReconciler extends AbstractReconciler {
 		setIsIncrementalReconciler(isIncremental);
 	}
 
-	/*
-	 * @see IReconciler#getReconcilingStrategy(String)
-	 */
+	@Override
 	public IReconcilingStrategy getReconcilingStrategy(String contentType) {
 		Assert.isNotNull(contentType);
 		return fStrategy;
 	}
 
-	/*
-	 * @see AbstractReconciler#process(DirtyRegion)
-	 */
+	@Override
 	protected void process(DirtyRegion dirtyRegion) {
 
 		if(dirtyRegion != null)
@@ -78,16 +74,12 @@ public class MonoReconciler extends AbstractReconciler {
 		}
 	}
 
-	/*
-	 * @see AbstractReconciler#reconcilerDocumentChanged(IDocument)
-	 */
+	@Override
 	protected void reconcilerDocumentChanged(IDocument document) {
 		fStrategy.setDocument(document);
 	}
 
-	/*
-	 * @see AbstractReconciler#setProgressMonitor(IProgressMonitor)
-	 */
+	@Override
 	public void setProgressMonitor(IProgressMonitor monitor) {
 		super.setProgressMonitor(monitor);
 		if (fStrategy instanceof IReconcilingStrategyExtension) {
@@ -96,9 +88,7 @@ public class MonoReconciler extends AbstractReconciler {
 		}
 	}
 
-	/*
-	 * @see AbstractReconciler#initialProcess()
-	 */
+	@Override
 	protected void initialProcess() {
 		if (fStrategy instanceof IReconcilingStrategyExtension) {
 			IReconcilingStrategyExtension extension= (IReconcilingStrategyExtension) fStrategy;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/Reconciler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/Reconciler.java
index 0e0046d3aa7..4ff26dd2238 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/Reconciler.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/reconciler/Reconciler.java
@@ -74,10 +74,7 @@ public class Reconciler extends AbstractReconciler implements IReconcilerExtensi
 		fPartitioning= partitioning;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.reconciler.IReconcilerExtension#getDocumentPartitioning()
-	 * @since 3.0
-	 */
+	@Override
 	public String getDocumentPartitioning() {
 		return fPartitioning;
 	}
@@ -108,9 +105,7 @@ public class Reconciler extends AbstractReconciler implements IReconcilerExtensi
 		}
 	}
 
-	/*
-	 * @see IReconciler#getReconcilingStrategy(String)
-	 */
+	@Override
 	public IReconcilingStrategy getReconcilingStrategy(String contentType) {
 
 		Assert.isNotNull(contentType);
@@ -130,6 +125,7 @@ public class Reconciler extends AbstractReconciler implements IReconcilerExtensi
 	 * @param dirtyRegion the dirty region to be processed
 	 * @see AbstractReconciler#process(DirtyRegion)
 	 */
+	@Override
 	protected void process(DirtyRegion dirtyRegion) {
 
 		IRegion region= dirtyRegion;
@@ -152,10 +148,7 @@ public class Reconciler extends AbstractReconciler implements IReconcilerExtensi
 		}
 	}
 
-	/*
-	 * @see AbstractReconciler#reconcilerDocumentChanged(IDocument)
-	 * @since 2.0
-	 */
+	@Override
 	protected void reconcilerDocumentChanged(IDocument document) {
 		if (fStrategies != null) {
 			Iterator e= fStrategies.values().iterator();
@@ -166,10 +159,7 @@ public class Reconciler extends AbstractReconciler implements IReconcilerExtensi
 		}
 	}
 
-	/*
-	 * @see AbstractReconciler#setProgressMonitor(IProgressMonitor)
-	 * @since 2.0
-	 */
+	@Override
 	public void setProgressMonitor(IProgressMonitor monitor) {
 		super.setProgressMonitor(monitor);
 
@@ -185,10 +175,7 @@ public class Reconciler extends AbstractReconciler implements IReconcilerExtensi
 		}
 	}
 
-	/*
-	 * @see AbstractReconciler#initialProcess()
-	 * @since 2.0
-	 */
+	@Override
 	protected void initialProcess() {
 		ITypedRegion[] regions= computePartitioning(0, getDocument().getLength());
 		List contentTypes= new ArrayList(regions.length);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/Revision.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/Revision.java
index dbb1395e013..9765150f933 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/Revision.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/Revision.java
@@ -141,9 +141,7 @@ public abstract class Revision {
 	 */
 	public abstract Date getDate();
 
-	/*
-	 * @see java.lang.Object#toString()
-	 */
+	@Override
 	public String toString() {
 		return "Revision " + getId(); //$NON-NLS-1$
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionInformation.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionInformation.java
index 99140ca62ed..42f04a2bed8 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionInformation.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionInformation.java
@@ -105,6 +105,7 @@ public final class RevisionInformation implements ITextHoverExtension, IInformat
 
 			// sort by start line
 			Collections.sort(ranges, new Comparator() {
+				@Override
 				public int compare(Object o1, Object o2) {
 					RevisionRange r1= (RevisionRange) o1;
 					RevisionRange r2= (RevisionRange) o2;
@@ -133,10 +134,7 @@ public final class RevisionInformation implements ITextHoverExtension, IInformat
 			((Revision) revisions.next()).applyDiff(hunks);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator()
-	 * @since 3.3
-	 */
+	@Override
 	public IInformationControlCreator getHoverControlCreator() {
 		return fHoverControlCreator;
 	}
@@ -146,6 +144,7 @@ public final class RevisionInformation implements ITextHoverExtension, IInformat
 	 * @return the information control creator or <code>null</code>
 	 * @since 3.3
 	 */
+	@Override
 	public IInformationControlCreator getInformationPresenterControlCreator() {
 		return fInformationPresenterControlCreator;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionRange.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionRange.java
index c2a05a24ce6..8a67d5d476f 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionRange.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/revisions/RevisionRange.java
@@ -42,23 +42,17 @@ public final class RevisionRange implements ILineRange {
 		return fRevision;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.ILineRange#getStartLine()
-	 */
+	@Override
 	public int getStartLine() {
 		return fStartLine;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.ILineRange#getNumberOfLines()
-	 */
+	@Override
 	public int getNumberOfLines() {
 		return fNumberOfLines;
 	}
 
-	/*
-	 * @see java.lang.Object#toString()
-	 */
+	@Override
 	public String toString() {
 		return "RevisionRange [" + fRevision.toString() + ", [" + getStartLine() + "+" + getNumberOfLines() + ")]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/BufferedRuleBasedScanner.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/BufferedRuleBasedScanner.java
index 6f804a832b2..1b7762261e1 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/BufferedRuleBasedScanner.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/BufferedRuleBasedScanner.java
@@ -90,9 +90,7 @@ public class BufferedRuleBasedScanner extends RuleBasedScanner {
 		}
 	}
 
-	/*
-	 * @see RuleBasedScanner#setRange(IDocument, int, int)
-	 */
+	@Override
 	public void setRange(IDocument document, int offset, int length) {
 
 		super.setRange(document, offset, length);
@@ -101,9 +99,7 @@ public class BufferedRuleBasedScanner extends RuleBasedScanner {
 		shiftBuffer(offset);
 	}
 
-	/*
-	 * @see RuleBasedScanner#read()
-	 */
+	@Override
 	public int read() {
 		fColumn= UNDEFINED;
 		if (fOffset >= fRangeEnd) {
@@ -119,9 +115,7 @@ public class BufferedRuleBasedScanner extends RuleBasedScanner {
 		return fBuffer[fOffset++ - fStart];
 	}
 
-	/*
-	 * @see RuleBasedScanner#unread()
-	 */
+	@Override
 	public void unread() {
 
 		if (fOffset == fStart)
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultDamagerRepairer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultDamagerRepairer.java
index 6f9bc723b64..578cee27034 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultDamagerRepairer.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultDamagerRepairer.java
@@ -58,6 +58,7 @@ public class DefaultDamagerRepairer implements IPresentationDamager, IPresentati
 	 *
 	 * @deprecated use DefaultDamagerRepairer(ITokenScanner) instead
 	 */
+	@Deprecated
 	public DefaultDamagerRepairer(ITokenScanner scanner, TextAttribute defaultTextAttribute) {
 
 		Assert.isNotNull(defaultTextAttribute);
@@ -84,6 +85,7 @@ public class DefaultDamagerRepairer implements IPresentationDamager, IPresentati
 	 * @see IPresentationDamager#setDocument(IDocument)
 	 * @see IPresentationRepairer#setDocument(IDocument)
 	 */
+	@Override
 	public void setDocument(IDocument document) {
 		fDocument= document;
 	}
@@ -124,6 +126,7 @@ public class DefaultDamagerRepairer implements IPresentationDamager, IPresentati
 	 *         clipped by the given partition. If there was a partitioning change then the whole
 	 *         partition is returned.
 	 */
+	@Override
 	public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent e, boolean documentPartitioningChanged) {
 
 		if (!documentPartitioningChanged) {
@@ -152,9 +155,7 @@ public class DefaultDamagerRepairer implements IPresentationDamager, IPresentati
 
 	//---- IPresentationRepairer
 
-	/*
-	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
-	 */
+	@Override
 	public void createPresentation(TextPresentation presentation, ITypedRegion region) {
 
 		if (fScanner == null) {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultPartitioner.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultPartitioner.java
index ad2ee9276ec..210e6bacddb 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultPartitioner.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/DefaultPartitioner.java
@@ -48,12 +48,14 @@ import org.eclipse.jface.text.TypedRegion;
  * @since 2.0
  * @deprecated As of 3.1, replaced by {@link org.eclipse.jface.text.rules.FastPartitioner} instead
  */
+@Deprecated
 public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartitionerExtension, IDocumentPartitionerExtension2, IDocumentPartitionerExtension3 {
 
 	/**
 	 * The position category this partitioner uses to store the document's partitioning information.
 	 * @deprecated As of 3.0, use <code>getManagingPositionCategories()</code> instead.
 	 */
+	@Deprecated
 	public final static String CONTENT_TYPES_CATEGORY= "__content_types_category"; //$NON-NLS-1$
 
 
@@ -103,25 +105,17 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit
 		fPositionUpdater= new DefaultPositionUpdater(fPositionCategory);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#getManagingPositionCategories()
-	 * @since 3.0
-	 */
+	@Override
 	public String[] getManagingPositionCategories() {
 		return new String[] { fPositionCategory };
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitioner#connect(org.eclipse.jface.text.IDocument)
-	 */
+	@Override
 	public void connect(IDocument document) {
 		connect(document, false);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitionerExtension3#connect(org.eclipse.jface.text.IDocument, boolean)
-	 * @since 3.1
-	 */
+	@Override
 	public void connect(IDocument document, boolean delayInitialization) {
 		Assert.isNotNull(document);
 		Assert.isTrue(!document.containsPositionCategory(fPositionCategory));
@@ -169,9 +163,7 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit
 		}
 	}
 
-	/*
-	 * @see IDocumentPartitioner#disconnect()
-	 */
+	@Override
 	public void disconnect() {
 
 		Assert.isTrue(fDocument.containsPositionCategory(fPositionCategory));
@@ -183,9 +175,7 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit
 		}
 	}
 
-	/*
-	 * @see IDocumentPartitioner#documentAboutToBeChanged(DocumentEvent)
-	 */
+	@Override
 	public void documentAboutToBeChanged(DocumentEvent e) {
 		if (fIsInitialized) {
 
@@ -198,9 +188,7 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit
 		}
 	}
 
-	/*
-	 * @see IDocumentPartitioner#documentChanged(DocumentEvent)
-	 */
+	@Override
 	public boolean documentChanged(DocumentEvent e) {
 		if (fIsInitialized) {
 			IRegion region= documentChanged2(e);
@@ -262,10 +250,7 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit
 		}
 	}
 
-	/*
-	 * @see IDocumentPartitionerExtension#documentChanged2(DocumentEvent)
-	 * @since 2.0
-	 */
+	@Override
 	public IRegion documentChanged2(DocumentEvent e) {
 
 		if (!fIsInitialized)
@@ -428,9 +413,7 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit
 	}
 
 
-	/*
-	 * @see IDocumentPartitioner#getContentType(int)
-	 */
+	@Override
 	public String getContentType(int offset) {
 		checkInitialization();
 
@@ -441,9 +424,7 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit
 		return IDocument.DEFAULT_CONTENT_TYPE;
 	}
 
-	/*
-	 * @see IDocumentPartitioner#getPartition(int)
-	 */
+	@Override
 	public ITypedRegion getPartition(int offset) {
 		checkInitialization();
 
@@ -488,16 +469,12 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit
 		return new TypedRegion(0, fDocument.getLength(), IDocument.DEFAULT_CONTENT_TYPE);
 	}
 
-	/*
-	 * @see IDocumentPartitioner#computePartitioning(int, int)
-	 */
+	@Override
 	public ITypedRegion[] computePartitioning(int offset, int length) {
 		return computePartitioning(offset, length, false);
 	}
 
-	/*
-	 * @see IDocumentPartitioner#getLegalContentTypes()
-	 */
+	@Override
 	public String[] getLegalContentTypes() {
 		return TextUtilities.copy(fLegalContentTypes);
 	}
@@ -536,18 +513,12 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit
 
     /* zero-length partition support */
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#getContentType(int)
-	 * @since 3.0
-	 */
+	@Override
 	public String getContentType(int offset, boolean preferOpenPartitions) {
 		return getPartition(offset, preferOpenPartitions).getType();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#getPartition(int)
-	 * @since 3.0
-	 */
+	@Override
 	public ITypedRegion getPartition(int offset, boolean preferOpenPartitions) {
 		ITypedRegion region= getPartition(offset);
 		if (preferOpenPartitions) {
@@ -563,10 +534,7 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit
         return region;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#computePartitioning(int, int, boolean)
-	 * @since 3.0
-	 */
+	@Override
 	public ITypedRegion[] computePartitioning(int offset, int length, boolean includeZeroLengthPartitions) {
 		checkInitialization();
 		List list= new ArrayList();
@@ -686,29 +654,20 @@ public class DefaultPartitioner implements IDocumentPartitioner, IDocumentPartit
 		return j;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitionerExtension3#startRewriteSession(org.eclipse.jface.text.DocumentRewriteSession)
-	 * @since 3.1
-	 */
+	@Override
 	public void startRewriteSession(DocumentRewriteSession session) throws IllegalStateException {
 		if (fActiveRewriteSession != null)
 			throw new IllegalStateException();
 		fActiveRewriteSession= session;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitionerExtension3#stopRewriteSession(org.eclipse.jface.text.DocumentRewriteSession)
-	 * @since 3.1
-	 */
+	@Override
 	public void stopRewriteSession(DocumentRewriteSession session) {
 		if (fActiveRewriteSession == session)
 			flushRewriteSession();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitionerExtension3#getActiveRewriteSession()
-	 * @since 3.1
-	 */
+	@Override
 	public DocumentRewriteSession getActiveRewriteSession() {
 		return fActiveRewriteSession;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/FastPartitioner.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/FastPartitioner.java
index df08dd407ca..cb2937ec8a5 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/FastPartitioner.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/FastPartitioner.java
@@ -111,16 +111,12 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 		fPositionUpdater= new DefaultPositionUpdater(fPositionCategory);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#getManagingPositionCategories()
-	 */
+	@Override
 	public String[] getManagingPositionCategories() {
 		return new String[] { fPositionCategory };
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitioner#connect(org.eclipse.jface.text.IDocument)
-	 */
+	@Override
 	public final void connect(IDocument document) {
 		connect(document, false);
 	}
@@ -131,6 +127,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 	 * May be extended by subclasses.
 	 * </p>
 	 */
+	@Override
 	public void connect(IDocument document, boolean delayInitialization) {
 		Assert.isNotNull(document);
 		Assert.isTrue(!document.containsPositionCategory(fPositionCategory));
@@ -188,6 +185,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 	 * May be extended by subclasses.
 	 * </p>
 	 */
+	@Override
 	public void disconnect() {
 
 		Assert.isTrue(fDocument.containsPositionCategory(fPositionCategory));
@@ -205,6 +203,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 	 * May be extended by subclasses.
 	 * </p>
 	 */
+	@Override
 	public void documentAboutToBeChanged(DocumentEvent e) {
 		if (fIsInitialized) {
 
@@ -217,9 +216,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 		}
 	}
 
-	/*
-	 * @see IDocumentPartitioner#documentChanged(DocumentEvent)
-	 */
+	@Override
 	public final boolean documentChanged(DocumentEvent e) {
 		if (fIsInitialized) {
 			IRegion region= documentChanged2(e);
@@ -287,6 +284,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 	 * May be extended by subclasses.
 	 * </p>
 	 */
+	@Override
 	public IRegion documentChanged2(DocumentEvent e) {
 
 		if (!fIsInitialized)
@@ -455,6 +453,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 	 * May be replaced or extended by subclasses.
 	 * </p>
 	 */
+	@Override
 	public String getContentType(int offset) {
 		checkInitialization();
 
@@ -471,6 +470,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 	 * May be replaced or extended by subclasses.
 	 * </p>
 	 */
+	@Override
 	public ITypedRegion getPartition(int offset) {
 		checkInitialization();
 
@@ -515,9 +515,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 		return new TypedRegion(0, fDocument.getLength(), IDocument.DEFAULT_CONTENT_TYPE);
 	}
 
-	/*
-	 * @see IDocumentPartitioner#computePartitioning(int, int)
-	 */
+	@Override
 	public final ITypedRegion[] computePartitioning(int offset, int length) {
 		return computePartitioning(offset, length, false);
 	}
@@ -528,6 +526,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 	 * May be replaced or extended by subclasses.
 	 * </p>
 	 */
+	@Override
 	public String[] getLegalContentTypes() {
 		return TextUtilities.copy(fLegalContentTypes);
 	}
@@ -578,6 +577,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 	 * May be replaced or extended by subclasses.
 	 * </p>
 	 */
+	@Override
 	public String getContentType(int offset, boolean preferOpenPartitions) {
 		return getPartition(offset, preferOpenPartitions).getType();
 	}
@@ -588,6 +588,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 	 * May be replaced or extended by subclasses.
 	 * </p>
 	 */
+	@Override
 	public ITypedRegion getPartition(int offset, boolean preferOpenPartitions) {
 		ITypedRegion region= getPartition(offset);
 		if (preferOpenPartitions) {
@@ -609,6 +610,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 	 * May be replaced or extended by subclasses.
 	 * </p>
 	 */
+	@Override
 	public ITypedRegion[] computePartitioning(int offset, int length, boolean includeZeroLengthPartitions) {
 		checkInitialization();
 		List list= new ArrayList();
@@ -729,9 +731,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 		return j;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitionerExtension3#startRewriteSession(org.eclipse.jface.text.DocumentRewriteSession)
-	 */
+	@Override
 	public void startRewriteSession(DocumentRewriteSession session) throws IllegalStateException {
 		if (fActiveRewriteSession != null)
 			throw new IllegalStateException();
@@ -744,6 +744,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 	 * May be extended by subclasses.
 	 * </p>
 	 */
+	@Override
 	public void stopRewriteSession(DocumentRewriteSession session) {
 		if (fActiveRewriteSession == session)
 			flushRewriteSession();
@@ -755,6 +756,7 @@ public class FastPartitioner implements IDocumentPartitioner, IDocumentPartition
 	 * May be extended by subclasses.
 	 * </p>
 	 */
+	@Override
 	public DocumentRewriteSession getActiveRewriteSession() {
 		return fActiveRewriteSession;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/NumberRule.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/NumberRule.java
index 9ae9a22ca23..952a945a9c8 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/NumberRule.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/NumberRule.java
@@ -51,9 +51,7 @@ public class NumberRule implements IRule {
 		fColumn= column;
 	}
 
-	/*
-	 * @see IRule#evaluate(ICharacterScanner)
-	 */
+	@Override
 	public IToken evaluate(ICharacterScanner scanner) {
 		int c= scanner.read();
 		if (Character.isDigit((char)c)) {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/PatternRule.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/PatternRule.java
index d1d92f94496..bb9ffa87090 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/PatternRule.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/PatternRule.java
@@ -34,6 +34,7 @@ public class PatternRule implements IPredicateRule {
 	 * @since 3.1
 	 */
 	private static class DecreasingCharArrayLengthComparator implements Comparator {
+		@Override
 		public int compare(Object o1, Object o2) {
 			return ((char[]) o2).length - ((char[]) o1).length;
 		}
@@ -202,9 +203,7 @@ public class PatternRule implements IPredicateRule {
 		return Token.UNDEFINED;
 	}
 
-	/*
-	 * @see IRule#evaluate(ICharacterScanner)
-	 */
+	@Override
 	public IToken evaluate(ICharacterScanner scanner) {
 		return evaluate(scanner, false);
 	}
@@ -299,10 +298,7 @@ public class PatternRule implements IPredicateRule {
 		return true;
 	}
 
-	/*
-	 * @see IPredicateRule#evaluate(ICharacterScanner, boolean)
-	 * @since 2.0
-	 */
+	@Override
 	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
 		if (fColumn == UNDEFINED)
 			return doEvaluate(scanner, resume);
@@ -314,10 +310,7 @@ public class PatternRule implements IPredicateRule {
 		return Token.UNDEFINED;
 	}
 
-	/*
-	 * @see IPredicateRule#getSuccessToken()
-	 * @since 2.0
-	 */
+	@Override
 	public IToken getSuccessToken() {
 		return fToken;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedDamagerRepairer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedDamagerRepairer.java
index 4157ddf92d1..fafbfaf9923 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedDamagerRepairer.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedDamagerRepairer.java
@@ -18,6 +18,7 @@ import org.eclipse.jface.text.TextAttribute;
 /**
  * @deprecated use <code>DefaultDamagerRepairer</code>
  */
+@Deprecated
 public class RuleBasedDamagerRepairer extends DefaultDamagerRepairer {
 
 	/**
@@ -30,6 +31,7 @@ public class RuleBasedDamagerRepairer extends DefaultDamagerRepairer {
 	 *
 	 * @deprecated use RuleBasedDamagerRepairer(RuleBasedScanner) instead
 	 */
+	@Deprecated
 	public RuleBasedDamagerRepairer(RuleBasedScanner scanner, TextAttribute defaultTextAttribute) {
 		super(scanner, defaultTextAttribute);
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitionScanner.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitionScanner.java
index 55dde65d5b0..3e0491d1854 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitionScanner.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitionScanner.java
@@ -39,6 +39,7 @@ public class RuleBasedPartitionScanner extends BufferedRuleBasedScanner implemen
 	 *
 	 * @param rules the sequence of rules controlling this scanner
 	 */
+	@Override
 	public void setRules(IRule[] rules) {
 		throw new UnsupportedOperationException();
 	}
@@ -50,9 +51,7 @@ public class RuleBasedPartitionScanner extends BufferedRuleBasedScanner implemen
 		super.setRules(rules);
 	}
 
-	/*
-	 * @see ITokenScanner#setRange(IDocument, int, int)
-	 */
+	@Override
 	public void setRange(IDocument document, int offset, int length) {
 		setPartialRange(document, offset, length, null, -1);
 	}
@@ -64,6 +63,7 @@ public class RuleBasedPartitionScanner extends BufferedRuleBasedScanner implemen
 	 * that match the given content type.
 	 * </p>
 	 */
+	@Override
 	public void setPartialRange(IDocument document, int offset, int length, String contentType, int partitionOffset) {
 		fContentType= contentType;
 		fPartitionOffset= partitionOffset;
@@ -78,9 +78,7 @@ public class RuleBasedPartitionScanner extends BufferedRuleBasedScanner implemen
 		super.setRange(document, offset, length);
 	}
 
-	/*
-	 * @see ITokenScanner#nextToken()
-	 */
+	@Override
 	public IToken nextToken() {
 
 
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitioner.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitioner.java
index 1647230ea6b..e6150e68f0b 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitioner.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedPartitioner.java
@@ -48,12 +48,14 @@ import org.eclipse.jface.text.TypedRegion;
  *
  * @deprecated use <code>FastPartitioner</code> instead
  */
+@Deprecated
 public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPartitionerExtension, IDocumentPartitionerExtension2 {
 
 	/**
 	 * The position category this partitioner uses to store the document's partitioning information
 	 * @deprecated As of 3.0, use <code>getManagingPositionCategories()</code>.
 	 */
+	@Deprecated
 	public final static String CONTENT_TYPES_CATEGORY= "__content_types_category"; //$NON-NLS-1$
 
 
@@ -94,10 +96,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart
 		fPositionUpdater= new DefaultPositionUpdater(fPositionCategory);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#getManagingPositionCategories()
-	 * @since 3.0
-	 */
+	@Override
 	public String[] getManagingPositionCategories() {
 		return new String[] { fPositionCategory };
 	}
@@ -105,6 +104,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart
 	/*
 	 * @see IDocumentPartitioner#connect
 	 */
+	@Override
 	public void connect(IDocument document) {
 		Assert.isNotNull(document);
 		Assert.isTrue(!document.containsPositionCategory(fPositionCategory));
@@ -145,6 +145,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart
 	/*
 	 * @see IDocumentPartitioner#disconnect
 	 */
+	@Override
 	public void disconnect() {
 
 		Assert.isTrue(fDocument.containsPositionCategory(fPositionCategory));
@@ -159,6 +160,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart
 	/*
 	 * @see IDocumentPartitioner#documentAboutToBeChanged
 	 */
+	@Override
 	public void documentAboutToBeChanged(DocumentEvent e) {
 
 		Assert.isTrue(e.getDocument() == fDocument);
@@ -172,6 +174,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart
 	/*
 	 * @see IDocumentPartitioner#documentChanged
 	 */
+	@Override
 	public boolean documentChanged(DocumentEvent e) {
 		IRegion region= documentChanged2(e);
 		return (region != null);
@@ -229,10 +232,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart
 		}
 	}
 
-	/*
-	 * @see IDocumentPartitionerExtension#documentChanged2(DocumentEvent)
-	 * @since 2.0
-	 */
+	@Override
 	public IRegion documentChanged2(DocumentEvent e) {
 
 		try {
@@ -398,6 +398,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart
 	/*
 	 * @see IDocumentPartitioner#getContentType
 	 */
+	@Override
 	public String getContentType(int offset) {
 
 		TypedPosition p= findClosestPosition(offset);
@@ -410,6 +411,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart
 	/*
 	 * @see IDocumentPartitioner#getPartition
 	 */
+	@Override
 	public ITypedRegion getPartition(int offset) {
 
 		try {
@@ -456,6 +458,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart
 	/*
 	 * @see IDocumentPartitioner#computePartitioning
 	 */
+	@Override
 	public ITypedRegion[] computePartitioning(int offset, int length) {
 		return computePartitioning(offset, length, false);
 	}
@@ -463,6 +466,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart
 	/*
 	 * @see IDocumentPartitioner#getLegalContentTypes
 	 */
+	@Override
 	public String[] getLegalContentTypes() {
 		return TextUtilities.copy(fLegalContentTypes);
 	}
@@ -501,18 +505,12 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart
 
     /* zero-length partition support */
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#getContentType(int)
-	 * @since 3.0
-	 */
+	@Override
 	public String getContentType(int offset, boolean preferOpenPartitions) {
 		return getPartition(offset, preferOpenPartitions).getType();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#getPartition(int)
-	 * @since 3.0
-	 */
+	@Override
 	public ITypedRegion getPartition(int offset, boolean preferOpenPartitions) {
 		ITypedRegion region= getPartition(offset);
 		if (preferOpenPartitions) {
@@ -528,10 +526,7 @@ public class RuleBasedPartitioner implements IDocumentPartitioner, IDocumentPart
         return region;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentPartitionerExtension2#computePartitioning(int, int)
-	 * @since 3.0
-	 */
+	@Override
 	public ITypedRegion[] computePartitioning(int offset, int length, boolean includeZeroLengthPartitions) {
 		List list= new ArrayList();
 
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedScanner.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedScanner.java
index dc2777672bf..efe9ab4d5e9 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedScanner.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/RuleBasedScanner.java
@@ -83,9 +83,7 @@ public class RuleBasedScanner implements ICharacterScanner, ITokenScanner {
 		fDefaultReturnToken= defaultReturnToken;
 	}
 
-	/*
-	 * @see ITokenScanner#setRange(IDocument, int, int)
-	 */
+	@Override
 	public void setRange(final IDocument document, int offset, int length) {
 		Assert.isLegal(document != null);
 		final int documentLength= document.getLength();
@@ -120,16 +118,12 @@ public class RuleBasedScanner implements ICharacterScanner, ITokenScanner {
 		Assert.isLegal(offset + length <= documentLength);
 	}
 
-	/*
-	 * @see ITokenScanner#getTokenOffset()
-	 */
+	@Override
 	public int getTokenOffset() {
 		return fTokenOffset;
 	}
 
-	/*
-	 * @see ITokenScanner#getTokenLength()
-	 */
+	@Override
 	public int getTokenLength() {
 		if (fOffset < fRangeEnd)
 			return fOffset - getTokenOffset();
@@ -137,9 +131,7 @@ public class RuleBasedScanner implements ICharacterScanner, ITokenScanner {
 	}
 
 
-	/*
-	 * @see ICharacterScanner#getColumn()
-	 */
+	@Override
 	public int getColumn() {
 		if (fColumn == UNDEFINED) {
 			try {
@@ -154,16 +146,12 @@ public class RuleBasedScanner implements ICharacterScanner, ITokenScanner {
 		return fColumn;
 	}
 
-	/*
-	 * @see ICharacterScanner#getLegalLineDelimiters()
-	 */
+	@Override
 	public char[][] getLegalLineDelimiters() {
 		return fDelimiters;
 	}
 
-	/*
-	 * @see ITokenScanner#nextToken()
-	 */
+	@Override
 	public IToken nextToken() {
 
 		fTokenOffset= fOffset;
@@ -182,9 +170,7 @@ public class RuleBasedScanner implements ICharacterScanner, ITokenScanner {
 		return fDefaultReturnToken;
 	}
 
-	/*
-	 * @see ICharacterScanner#read()
-	 */
+	@Override
 	public int read() {
 
 		try {
@@ -204,9 +190,7 @@ public class RuleBasedScanner implements ICharacterScanner, ITokenScanner {
 		}
 	}
 
-	/*
-	 * @see ICharacterScanner#unread()
-	 */
+	@Override
 	public void unread() {
     	--fOffset;
 		fColumn= UNDEFINED;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/Token.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/Token.java
index 24f48a458f6..2153627ef31 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/Token.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/Token.java
@@ -46,6 +46,7 @@ public class Token implements IToken {
 	 * Standard token: Neither {@link #UNDEFINED}, {@link #WHITESPACE}, nor {@link #EOF}.
 	 * @deprecated will be removed
 	 */
+	@Deprecated
 	public static final IToken OTHER= new Token(T_OTHER);
 
 	/** The type of this token */
@@ -88,37 +89,27 @@ public class Token implements IToken {
 		fData= data;
 	}
 
-	/*
-	 * @see IToken#getData()
-	 */
+	@Override
 	public Object getData() {
 		return fData;
 	}
 
-	/*
-	 * @see IToken#isOther()
-	 */
+	@Override
 	public boolean isOther() {
 		return (fType == T_OTHER);
 	}
 
-	/*
-	 * @see IToken#isEOF()
-	 */
+	@Override
 	public boolean isEOF() {
 		return (fType == T_EOF);
 	}
 
-	/*
-	 * @see IToken#isWhitespace()
-	 */
+	@Override
 	public boolean isWhitespace() {
 		return (fType == T_WHITESPACE);
 	}
 
-	/*
-	 * @see IToken#isUndefined()
-	 */
+	@Override
 	public boolean isUndefined() {
 		return (fType == T_UNDEFINED);
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WhitespaceRule.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WhitespaceRule.java
index 6bd1af7f25c..d48d35393ad 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WhitespaceRule.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WhitespaceRule.java
@@ -64,6 +64,7 @@ public class WhitespaceRule implements IRule {
 	 * @return {@link #fWhitespaceToken} if whitespace got detected, {@link Token#UNDEFINED}
 	 *         otherwise
 	 */
+	@Override
 	public IToken evaluate(ICharacterScanner scanner) {
 		int c= scanner.read();
 		if (fDetector.isWhitespace((char) c)) {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordPatternRule.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordPatternRule.java
index a6f4b875a76..3c1762c8fcb 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordPatternRule.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordPatternRule.java
@@ -70,6 +70,7 @@ public class WordPatternRule extends SingleLineRule {
 	 * @param scanner the scanner to be used
 	 * @return <code>true</code> if the word ends on the given end sequence
 	 */
+	@Override
 	protected boolean endSequenceDetected(ICharacterScanner scanner) {
 		fBuffer.setLength(0);
 		int c= scanner.read();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordRule.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordRule.java
index b52a7ea38ad..12ec542a543 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordRule.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/rules/WordRule.java
@@ -125,9 +125,7 @@ public class WordRule implements IRule {
 		fColumn= column;
 	}
 
-	/*
-	 * @see IRule#evaluate(ICharacterScanner)
-	 */
+	@Override
 	public IToken evaluate(ICharacterScanner scanner) {
 		int c= scanner.read();
 		if (c != ICharacterScanner.EOF && fDetector.isWordStart((char) c)) {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AbstractRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AbstractRulerColumn.java
index ffa1fa13381..0d566a31f2c 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AbstractRulerColumn.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AbstractRulerColumn.java
@@ -78,29 +78,21 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert
 	 */
 	private final class MouseHandler implements MouseListener, MouseMoveListener {
 
-		/*
-		 * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseUp(MouseEvent event) {
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseDown(MouseEvent event) {
 			fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y);
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseDoubleClick(MouseEvent event) {
 			fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y);
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseMove(MouseEvent event) {
 			fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y);
 		}
@@ -111,18 +103,14 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert
 	 */
 	private final class InternalListener implements IViewportListener, ITextListener {
 
-		/*
-		 * @see IViewportListener#viewportChanged(int)
-		 */
+		@Override
 		public void viewportChanged(int topPixel) {
 			int delta= topPixel - fLastTopPixel;
 			if (scrollVertical(delta))
 				fCanvas.update(); // force update the invalidated regions
 		}
 
-		/*
-		 * @see ITextListener#textChanged(TextEvent)
-		 */
+		@Override
 		public void textChanged(TextEvent event) {
 			/*
 			 * Redraw: - when the viewer is drawing, and any of the following - the widget was not
@@ -187,10 +175,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert
 	protected AbstractRulerColumn() {
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerColumn#createControl(org.eclipse.jface.text.source.CompositeRuler,
-	 *      org.eclipse.swt.widgets.Composite)
-	 */
+	@Override
 	public Control createControl(CompositeRuler parentRuler, Composite parentControl) {
 		Assert.isLegal(parentControl != null);
 		Assert.isLegal(parentRuler != null);
@@ -210,6 +195,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert
 		fCanvas.setFont(getFont());
 
 		fCanvas.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent event) {
 				AbstractRulerColumn.this.paintControl(event);
 			}
@@ -235,9 +221,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert
 		return SWT.NO_BACKGROUND;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerColumn#getControl()
-	 */
+	@Override
 	public final Control getControl() {
 		return fCanvas;
 	}
@@ -258,9 +242,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerColumn#getWidth()
-	 */
+	@Override
 	public final int getWidth() {
 		return fWidth;
 	}
@@ -280,6 +262,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert
 	 *
 	 * @param font the font or <code>null</code> to use the default font
 	 */
+	@Override
 	public final void setFont(Font font) {
 		if (fFont != font) {
 			fFont= font;
@@ -323,9 +306,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert
 		return fTextInset;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerColumn#setModel(org.eclipse.jface.text.source.IAnnotationModel)
-	 */
+	@Override
 	public void setModel(IAnnotationModel model) {
 		if (fModel != model) {
 			fModel= model;
@@ -333,9 +314,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getModel()
-	 */
+	@Override
 	public final IAnnotationModel getModel() {
 		return fModel;
 	}
@@ -387,9 +366,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert
 			fHover= hover;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getHover()
-	 */
+	@Override
 	public IAnnotationHover getHover() {
 		return fHover;
 	}
@@ -418,9 +395,7 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerColumn#redraw()
-	 */
+	@Override
 	public final void redraw() {
 		if (fCanvas != null && !fCanvas.isDisposed())
 			fCanvas.redraw();
@@ -577,30 +552,22 @@ public abstract class AbstractRulerColumn implements IVerticalRulerColumn, IVert
 		return fStyledText.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getLineOfLastMouseButtonActivity()
-	 */
+	@Override
 	public final int getLineOfLastMouseButtonActivity() {
 		return getParentRuler().getLineOfLastMouseButtonActivity();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#toDocumentLineNumber(int)
-	 */
+	@Override
 	public final int toDocumentLineNumber(int y_coordinate) {
 		return getParentRuler().toDocumentLineNumber(y_coordinate);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#addVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener)
-	 */
+	@Override
 	public void addVerticalRulerListener(IVerticalRulerListener listener) {
 		throw new UnsupportedOperationException();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#removeVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener)
-	 */
+	@Override
 	public void removeVerticalRulerListener(IVerticalRulerListener listener) {
 		throw new UnsupportedOperationException();
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java
index 5593ba01dd1..760b2b6ed7c 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationBarHoverManager.java
@@ -66,6 +66,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa
 	 * @since 3.0
 	 * @deprecated As of 3.4, no longer used as closer from super class is used
 	 */
+	@Deprecated
 	protected class Closer extends MouseTrackAdapter implements IInformationControlCloser, MouseListener, MouseMoveListener, ControlListener, KeyListener, DisposeListener, ShellListener, Listener {
 
 		/** The closer's subject control */
@@ -94,9 +95,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa
 		public Closer() {
 		}
 
-		/*
-		 * @see IInformationControlCloser#setSubjectControl(Control)
-		 */
+		@Override
 		public void setSubjectControl(Control control) {
 			fSubjectControl= control;
 		}
@@ -104,13 +103,12 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa
 		/*
 		 * @see IInformationControlCloser#setHoverControl(IHoverControl)
 		 */
+		@Override
 		public void setInformationControl(IInformationControl control) {
 			fInformationControlToClose= control;
 		}
 
-		/*
-		 * @see IInformationControlCloser#start(Rectangle)
-		 */
+		@Override
 		public void start(Rectangle subjectArea) {
 
 			if (fIsActive) return;
@@ -136,9 +134,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa
 			}
 		}
 
-		/*
-		 * @see IInformationControlCloser#stop()
-		 */
+		@Override
 		public void stop() {
 
 			if (!fIsActive)
@@ -170,121 +166,84 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa
 		 * @param delayRestart <code>true</code> if restart should be delayed
 		 * @deprecated As of 3.4, replaced by {@link #stop()}. Note that <code>delayRestart</code> was never honored.
 		 */
+		@Deprecated
 		protected void stop(boolean delayRestart) {
 			stop();
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseMove(MouseEvent event) {
 			if (!fSubjectArea.contains(event.x, event.y))
 				hideInformationControl();
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseUp(MouseEvent event) {
 		}
 
-		/*
-		 * @see MouseListener#mouseDown(MouseEvent)
-		 */
+		@Override
 		public void mouseDown(MouseEvent event) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see MouseListener#mouseDoubleClick(MouseEvent)
-		 */
+		@Override
 		public void mouseDoubleClick(MouseEvent event) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-		 * @since 3.2
-		 */
+		@Override
 		public void handleEvent(Event event) {
 			if (event.type == SWT.MouseHorizontalWheel || event.type == SWT.MouseVerticalWheel)
 				hideInformationControl();
 		}
 
-		/*
-		 * @see MouseTrackAdapter#mouseExit(MouseEvent)
-		 */
+		@Override
 		public void mouseExit(MouseEvent event) {
 			if (!fAllowMouseExit)
 				hideInformationControl();
 		}
 
-		/*
-		 * @see ControlListener#controlResized(ControlEvent)
-		 */
+		@Override
 		public void controlResized(ControlEvent event) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see ControlListener#controlMoved(ControlEvent)
-		 */
+		@Override
 		public void controlMoved(ControlEvent event) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see KeyListener#keyReleased(KeyEvent)
-		 */
+		@Override
 		public void keyReleased(KeyEvent event) {
 		}
 
-		/*
-		 * @see KeyListener#keyPressed(KeyEvent)
-		 */
+		@Override
 		public void keyPressed(KeyEvent event) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.ShellListener#shellActivated(org.eclipse.swt.events.ShellEvent)
-		 * @since 3.1
-		 */
+		@Override
 		public void shellActivated(ShellEvent e) {
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.ShellListener#shellClosed(org.eclipse.swt.events.ShellEvent)
-		 * @since 3.1
-		 */
+		@Override
 		public void shellClosed(ShellEvent e) {
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.ShellListener#shellDeactivated(org.eclipse.swt.events.ShellEvent)
-		 * @since 3.1
-		 */
+		@Override
 		public void shellDeactivated(ShellEvent e) {
 			hideInformationControl();
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.ShellListener#shellDeiconified(org.eclipse.swt.events.ShellEvent)
-		 * @since 3.1
-		 */
+		@Override
 		public void shellDeiconified(ShellEvent e) {
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.ShellListener#shellIconified(org.eclipse.swt.events.ShellEvent)
-		 * @since 3.1
-		 */
+		@Override
 		public void shellIconified(ShellEvent e) {
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)
-		 */
+		@Override
 		public void widgetDisposed(DisposeEvent e) {
 			hideInformationControl();
 		}
@@ -324,6 +283,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa
 	 * @param creator the information control creator
 	 * @deprecated As of 2.1, replaced by {@link AnnotationBarHoverManager#AnnotationBarHoverManager(IVerticalRulerInfo, ISourceViewer, IAnnotationHover, IInformationControlCreator)}
 	 */
+	@Deprecated
 	public AnnotationBarHoverManager(ISourceViewer sourceViewer, IVerticalRuler ruler, IAnnotationHover annotationHover, IInformationControlCreator creator) {
 		this(ruler, sourceViewer, annotationHover, creator);
 	}
@@ -352,9 +312,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa
 		// use closer from super class
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#computeInformation()
-	 */
+	@Override
 	protected void computeInformation() {
 		fAllowMouseExit= false;
 		MouseEvent event= getHoverEvent();
@@ -387,19 +345,13 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa
 
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#showInformationControl(org.eclipse.swt.graphics.Rectangle)
-	 * @since 3.2
-	 */
+	@Override
 	protected void showInformationControl(Rectangle subjectArea) {
 	    super.showInformationControl(subjectArea);
 	    fCurrentHover= getHover(getHoverEvent());
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#hideInformationControl()
-	 * @since 3.2
-	 */
+	@Override
 	protected void hideInformationControl() {
 		fCurrentHover= null;
 	    super.hideInformationControl();
@@ -680,10 +632,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa
 		return fVerticalRulerInfo;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#computeSizeConstraints(org.eclipse.swt.widgets.Control, org.eclipse.swt.graphics.Rectangle, org.eclipse.jface.text.IInformationControl)
-	 * @since 3.0
-	 */
+	@Override
 	protected Point computeSizeConstraints(Control subjectControl, Rectangle subjectArea, IInformationControl informationControl) {
 
 		Point constraints= super.computeSizeConstraints(subjectControl, subjectArea, informationControl);
@@ -701,10 +650,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa
 		return constraints;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#computeInformationControlLocation(org.eclipse.swt.graphics.Rectangle, org.eclipse.swt.graphics.Point)
-	 * @since 3.7
-	 */
+	@Override
 	protected Point computeInformationControlLocation(Rectangle subjectArea, Point controlSize) {
 		MouseEvent event= getHoverEvent();
 		IAnnotationHover hover= getHover(event);
@@ -719,10 +665,7 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa
 		return super.computeInformationControlLocation(subjectArea, controlSize);
 	}
 	
-	/*
-	 * @see org.eclipse.jface.text.AbstractInformationControlManager#computeLocation(org.eclipse.swt.graphics.Rectangle, org.eclipse.swt.graphics.Point, org.eclipse.jface.text.AbstractInformationControlManager.Anchor)
-	 * @since 3.0
-	 */
+	@Override
 	protected Point computeLocation(Rectangle subjectArea, Point controlSize, Anchor anchor) {
 		MouseEvent event= getHoverEvent();
 		IAnnotationHover hover= getHover(event);
@@ -776,40 +719,50 @@ public class AnnotationBarHoverManager extends AbstractHoverInformationControlMa
 	 * @noreference This method is not intended to be referenced by clients.
 	 * @nooverride This method is not intended to be re-implemented or extended by clients.
 	 */
-    public InternalAccessor getInternalAccessor() {
+    @Override
+	public InternalAccessor getInternalAccessor() {
     	return new InternalAccessor() {
+			@Override
 			public IInformationControl getCurrentInformationControl() {
 				return AnnotationBarHoverManager.super.getInternalAccessor().getCurrentInformationControl();
 			}
 
+			@Override
 			public void setInformationControlReplacer(InformationControlReplacer replacer) {
 				AnnotationBarHoverManager.super.getInternalAccessor().setInformationControlReplacer(replacer);
 			}
 
+			@Override
 			public InformationControlReplacer getInformationControlReplacer() {
 				return AnnotationBarHoverManager.super.getInternalAccessor().getInformationControlReplacer();
 			}
 
+			@Override
 			public boolean canReplace(IInformationControl control) {
 				return AnnotationBarHoverManager.super.getInternalAccessor().canReplace(control);
 			}
 
+			@Override
 			public boolean isReplaceInProgress() {
 				return AnnotationBarHoverManager.super.getInternalAccessor().isReplaceInProgress();
 			}
 
+			@Override
 			public void replaceInformationControl(boolean takeFocus) {
 				AnnotationBarHoverManager.super.getInternalAccessor().replaceInformationControl(takeFocus);
 			}
 
+			@Override
 			public void cropToClosestMonitor(Rectangle bounds) {
 				AnnotationBarHoverManager.super.getInternalAccessor().cropToClosestMonitor(bounds);
 			}
 
+			@Override
 			public void setHoverEnrichMode(EnrichMode mode) {
 				AnnotationBarHoverManager.super.getInternalAccessor().setHoverEnrichMode(mode);
 			}
 
+			@Override
 			public boolean getAllowMouseExit() {
 				return fAllowMouseExit;
 			}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationColumn.java
index e456454427d..b3ad60389f3 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationColumn.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationColumn.java
@@ -18,6 +18,7 @@ package org.eclipse.jface.text.source;
  *             instead.
  * @since 2.0
  */
+@Deprecated
 public final class AnnotationColumn extends AnnotationRulerColumn {
 
 	/**
@@ -28,6 +29,7 @@ public final class AnnotationColumn extends AnnotationRulerColumn {
 	 *             {@link org.eclipse.jface.text.source.AnnotationRulerColumn#AnnotationRulerColumn(int)}
 	 *             instead
 	 */
+	@Deprecated
 	public AnnotationColumn(int width) {
 		super(width);
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java
index 7f6fe06231f..b1361603e23 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationPainter.java
@@ -105,12 +105,10 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 	 * @since 3.0
 	 * @deprecated As of 3.4, replaced by {@link AnnotationPainter.UnderlineStrategy}
 	 */
+	@Deprecated
 	public static class SquigglesStrategy implements IDrawingStrategy {
 
-		/*
-		 * @see org.eclipse.jface.text.source.AnnotationPainter.IDrawingStrategy#draw(org.eclipse.jface.text.source.Annotation, org.eclipse.swt.graphics.GC, org.eclipse.swt.custom.StyledText, int, int, org.eclipse.swt.graphics.Color)
-		 * @since 3.0
-		 */
+		@Override
 		public void draw(Annotation annotation, GC gc, StyledText textWidget, int offset, int length, Color color) {
 			if (gc != null) {
 
@@ -191,10 +189,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 	 */
 	public static final class NullStrategy implements IDrawingStrategy {
 
-		/*
-		 * @see org.eclipse.jface.text.source.AnnotationPainter.IDrawingStrategy#draw(org.eclipse.jface.text.source.Annotation, org.eclipse.swt.graphics.GC, org.eclipse.swt.custom.StyledText, int, int, org.eclipse.swt.graphics.Color)
-		 * @since 3.0
-		 */
+		@Override
 		public void draw(Annotation annotation, GC gc, StyledText textWidget, int offset, int length, Color color) {
 			// do nothing
 		}
@@ -224,6 +219,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 	 * @since 3.4
 	 */
 	public static final class HighlightingStrategy implements ITextStyleStrategy {
+		@Override
 		public void applyTextStyle(StyleRange styleRange, Color annotationColor) {
 			styleRange.background= annotationColor;
 		}
@@ -244,6 +240,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 			fUnderlineStyle= style;
 		}
 
+		@Override
 		public void applyTextStyle(StyleRange styleRange, Color annotationColor) {
 			styleRange.underline= true;
 			styleRange.underlineStyle= fUnderlineStyle;
@@ -266,6 +263,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 			fBorderStyle= style;
 		}
 
+		@Override
 		public void applyTextStyle(StyleRange styleRange, Color annotationColor) {
 			styleRange.borderStyle= fBorderStyle;
 			styleRange.borderColor= annotationColor;
@@ -976,10 +974,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ITextPresentationListener#applyTextPresentation(org.eclipse.jface.text.TextPresentation)
-	 * @since 3.0
-	 */
+	@Override
 	public void applyTextPresentation(TextPresentation tp) {
 		Set decorations;
 
@@ -1033,9 +1028,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationModelListener#modelChanged(org.eclipse.jface.text.source.IAnnotationModel)
-	 */
+	@Override
 	public synchronized void modelChanged(final IAnnotationModel model) {
 		if (DEBUG)
 			System.err.println("AP: OLD API of AnnotationModelListener called"); //$NON-NLS-1$
@@ -1043,9 +1036,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 		modelChanged(new AnnotationModelEvent(model));
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationModelListenerExtension#modelChanged(org.eclipse.jface.text.source.AnnotationModelEvent)
-	 */
+	@Override
 	public void modelChanged(final AnnotationModelEvent event) {
 		Display textWidgetDisplay;
 		try {
@@ -1082,6 +1073,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 			// now and running the posted runnable, the position information
 			// is not accurate any longer.
 			textWidgetDisplay.asyncExec(new Runnable() {
+				@Override
 				public void run() {
 					if (fTextWidget != null && !fTextWidget.isDisposed())
 						updatePainting(event);
@@ -1114,6 +1106,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 	 *             {@link #addTextStyleStrategy(Object, AnnotationPainter.ITextStyleStrategy)} and
 	 *             {@link UnderlineStrategy}
 	 */
+	@Deprecated
 	public void addAnnotationType(Object annotationType) {
 		addAnnotationType(annotationType, SQUIGGLES);
 	}
@@ -1135,16 +1128,12 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 		if (fTextInputListener == null) {
 			fTextInputListener= new ITextInputListener() {
 
-				/*
-				 * @see org.eclipse.jface.text.ITextInputListener#inputDocumentAboutToBeChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument)
-				 */
+				@Override
 				public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) {
 					fInputDocumentAboutToBeChanged= true;
 				}
 
-				/*
-				 * @see org.eclipse.jface.text.ITextInputListener#inputDocumentChanged(org.eclipse.jface.text.IDocument, org.eclipse.jface.text.IDocument)
-				 */
+				@Override
 				public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
 					fInputDocumentAboutToBeChanged= false;
 				}
@@ -1266,9 +1255,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 		return !fAnnotationType2PaintingStrategyId.isEmpty();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPainter#dispose()
-	 */
+	@Override
 	public void dispose() {
 
 		if (fAnnotationType2Color != null) {
@@ -1347,9 +1334,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 		return -1;
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.PaintListener#paintControl(org.eclipse.swt.events.PaintEvent)
-	 */
+	@Override
 	public void paintControl(PaintEvent event) {
 		if (fTextWidget != null)
 			handleDrawRequest(event);
@@ -1601,9 +1586,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 		return (offset1 <= offset2+length2) && (offset2 <= offset1+length1);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPainter#deactivate(boolean)
-	 */
+	@Override
 	public void deactivate(boolean redraw) {
 		if (fIsActive) {
 			fIsActive= false;
@@ -1637,9 +1620,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPainter#paint(int)
-	 */
+	@Override
 	public void paint(int reason) {
 		if (fSourceViewer.getDocument() == null) {
 			deactivate(false);
@@ -1656,9 +1637,7 @@ public class AnnotationPainter implements IPainter, PaintListener, IAnnotationMo
 			updatePainting(null);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPainter#setPositionManager(org.eclipse.jface.text.IPaintPositionManager)
-	 */
+	@Override
 	public void setPositionManager(IPaintPositionManager manager) {
 	}
 }
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java
index 9fc8927189c..3673751fa0b 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java
@@ -72,24 +72,18 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 	 */
 	class InternalListener implements IViewportListener, IAnnotationModelListener, ITextListener {
 
-		/*
-		 * @see IViewportListener#viewportChanged(int)
-		 */
+		@Override
 		public void viewportChanged(int verticalPosition) {
 			if (verticalPosition != fScrollPos)
 				redraw();
 		}
 
-		/*
-		 * @see IAnnotationModelListener#modelChanged(IAnnotationModel)
-		 */
+		@Override
 		public void modelChanged(IAnnotationModel model) {
 			postRedraw();
 		}
 
-		/*
-		 * @see ITextListener#textChanged(TextEvent)
-		 */
+		@Override
 		public void textChanged(TextEvent e) {
 			if (e.getViewerRedrawState())
 				postRedraw();
@@ -122,9 +116,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 	 * @since 3.0
 	 */
 	private static class TupleComparator implements Comparator {
-		/*
-		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-		 */
+		@Override
 		public int compare(Object o1, Object o2) {
 			Position p1= ((Tuple) o1).position;
 			Position p2= ((Tuple) o2).position;
@@ -250,23 +242,17 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 		fWidth= width;
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#getControl()
-	 */
+	@Override
 	public Control getControl() {
 		return fCanvas;
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#getWidth()
-	 */
+	@Override
 	public int getWidth() {
 		return fWidth;
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#createControl(CompositeRuler, Composite)
-	 */
+	@Override
 	public Control createControl(CompositeRuler parentRuler, Composite parentControl) {
 
 		fParentRuler= parentRuler;
@@ -278,6 +264,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 		fCanvas= createCanvas(parentControl);
 
 		fCanvas.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent event) {
 				if (fCachedTextViewer != null)
 					doubleBufferPaint(event.gc);
@@ -285,6 +272,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 		});
 
 		fCanvas.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				handleDispose();
 				fCachedTextViewer= null;
@@ -293,6 +281,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 		});
 
 		fMouseListener= new MouseListener() {
+			@Override
 			public void mouseUp(MouseEvent event) {
 				int lineNumber;
 				if (isPropagatingMouseListener()) {
@@ -305,6 +294,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 					mouseClicked(lineNumber);
 			}
 
+			@Override
 			public void mouseDown(MouseEvent event) {
 				int lineNumber;
 				if (isPropagatingMouseListener()) {
@@ -317,6 +307,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 					AnnotationRulerColumn.this.mouseDown(lineNumber);
 			}
 
+			@Override
 			public void mouseDoubleClick(MouseEvent event) {
 				int lineNumber;
 				if (isPropagatingMouseListener()) {
@@ -332,16 +323,14 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 		fCanvas.addMouseListener(fMouseListener);
 
 		fCanvas.addMouseMoveListener(new MouseMoveListener() {
-			/*
-			 * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent)
-			 * @since 3.0
-			 */
+			@Override
 			public void mouseMove(MouseEvent e) {
 				handleMouseMove(e);
 			}
 		});
 
 		fCanvas.addMouseWheelListener(new MouseWheelListener() {
+			@Override
 			public void mouseScrolled(MouseEvent e) {
 				handleMouseScrolled(e);
 			}
@@ -352,6 +341,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 			fCachedTextViewer.addTextListener(fInternalListener);
 			// on word wrap toggle a "resized" ControlEvent is fired: suggest a redraw of the ruler
 			fCachedTextWidget.addControlListener(new ControlAdapter() {
+				@Override
 				public void controlResized(ControlEvent e) {
 					if (fCachedTextWidget != null && fCachedTextWidget.getWordWrap()) {
 						redraw();
@@ -371,10 +361,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 	 */
 	private Canvas createCanvas(Composite parent) {
 		return new Canvas(parent, SWT.NO_BACKGROUND | SWT.NO_FOCUS) {
-			/*
-			 * @see org.eclipse.swt.widgets.Control#addMouseListener(org.eclipse.swt.events.MouseListener)
-			 * @since 3.0
-			 */
+			@Override
 			public void addMouseListener(MouseListener listener) {
 				if (isPropagatingMouseListener() || listener == fMouseListener)
 					super.addMouseListener(listener);
@@ -830,6 +817,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 			Display d= fCanvas.getDisplay();
 			if (d != null) {
 				d.asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						redraw();
 					}
@@ -838,9 +826,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 		}
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#redraw()
-	 */
+	@Override
 	public void redraw() {
 		if (fCanvas != null && !fCanvas.isDisposed()) {
 			if (VerticalRuler.IS_MAC_BUG_298936) {
@@ -857,6 +843,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 	/*
 	 * @see IVerticalRulerColumn#setModel
 	 */
+	@Override
 	public void setModel(IAnnotationModel model) {
 		if (fAllowSetModel && model != fModel) {
 
@@ -872,9 +859,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 		}
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#setFont(Font)
-	 */
+	@Override
 	public void setFont(Font font) {
 	}
 
@@ -887,9 +872,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 		return fCachedTextViewer;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getModel()
-	 */
+	@Override
 	public IAnnotationModel getModel() {
 		return fModel;
 	}
@@ -907,18 +890,12 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 		fAllowedAnnotationTypes.clear();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getLineOfLastMouseButtonActivity()
-	 * @since 3.0
-	 */
+	@Override
 	public int getLineOfLastMouseButtonActivity() {
 		return fParentRuler.getLineOfLastMouseButtonActivity();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#toDocumentLineNumber(int)
-	 * @since 3.0
-	 */
+	@Override
 	public int toDocumentLineNumber(int y_coordinate) {
 		return fParentRuler.toDocumentLineNumber(y_coordinate);
 	}
@@ -977,10 +954,7 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 		return !fConfiguredAnnotationTypes.contains(annotationType);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getHover()
-	 * @since 3.0
-	 */
+	@Override
 	public IAnnotationHover getHover() {
 		return fHover;
 	}
@@ -993,18 +967,12 @@ public class AnnotationRulerColumn implements IVerticalRulerColumn, IVerticalRul
 		fHover= hover;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#addVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener)
-	 * @since 3.0
-	 */
+	@Override
 	public void addVerticalRulerListener(IVerticalRulerListener listener) {
 		throw new UnsupportedOperationException();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#removeVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener)
-	 * @since 3.0
-	 */
+	@Override
 	public void removeVerticalRulerListener(IVerticalRulerListener listener) {
 		throw new UnsupportedOperationException();
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java
index 7669b1cfe3d..a613503d17d 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java
@@ -60,29 +60,21 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 	 */
 	private class MouseHandler implements MouseListener, MouseMoveListener {
 
-		/*
-		 * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseUp(MouseEvent event) {
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseDown(MouseEvent event) {
 			fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y);
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseDoubleClick(MouseEvent event) {
 			fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y);
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseMove(MouseEvent event) {
 			fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y);
 		}
@@ -93,17 +85,13 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 	 */
 	private class InternalListener implements IViewportListener, ITextListener {
 
-		/*
-		 * @see IViewportListener#viewportChanged(int)
-		 */
+		@Override
 		public void viewportChanged(int verticalPosition) {
 			if (verticalPosition != fScrollPos)
 				redraw();
 		}
 
-		/*
-		 * @see ITextListener#textChanged(TextEvent)
-		 */
+		@Override
 		public void textChanged(TextEvent event) {
 
 			if (!event.getViewerRedrawState())
@@ -162,6 +150,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 	 *
 	 * @deprecated since 3.2 use {@link #ChangeRulerColumn(ISharedTextColors)} instead
 	 */
+	@Deprecated
 	public ChangeRulerColumn() {
 		fRevisionPainter= null;
 		fDiffPainter= new DiffPainter(this, null);
@@ -190,9 +179,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 		return fBackground;
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#createControl(CompositeRuler, Composite)
-	 */
+	@Override
 	public Control createControl(CompositeRuler parentRuler, Composite parentControl) {
 
 		fParentRuler= parentRuler;
@@ -203,6 +190,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 		fCanvas.setBackground(getBackground());
 
 		fCanvas.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent event) {
 				if (fCachedTextViewer != null)
 					doubleBufferPaint(event.gc);
@@ -210,6 +198,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 		});
 
 		fCanvas.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				handleDispose();
 				fCachedTextViewer= null;
@@ -292,6 +281,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 	 * @deprecated as of 3.2 the number of lines in the viewport cannot be computed because
 	 *             StyledText supports variable line heights
 	 */
+	@Deprecated
 	protected int getVisibleLinesInViewport() {
 		// Hack to reduce amount of copied code.
 		return LineNumberRulerColumn.getVisibleLinesInViewport(fCachedTextWidget);
@@ -327,9 +317,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 			fDiffPainter.paint(gc, visibleModelLines);
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#redraw()
-	 */
+	@Override
 	public void redraw() {
 
 		if (fCachedTextViewer != null && fCanvas != null && !fCanvas.isDisposed()) {
@@ -344,9 +332,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 		}
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#setFont(Font)
-	 */
+	@Override
 	public void setFont(Font font) {
 	}
 
@@ -360,23 +346,17 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 		return fParentRuler;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getLineOfLastMouseButtonActivity()
-	 */
+	@Override
 	public int getLineOfLastMouseButtonActivity() {
 		return getParentRuler().getLineOfLastMouseButtonActivity();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#toDocumentLineNumber(int)
-	 */
+	@Override
 	public int toDocumentLineNumber(int y_coordinate) {
 		return getParentRuler().toDocumentLineNumber(y_coordinate);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getHover()
-	 */
+	@Override
 	public IAnnotationHover getHover() {
 		int activeLine= getParentRuler().getLineOfLastMouseButtonActivity();
 		if (fRevisionPainter.hasHover(activeLine))
@@ -386,17 +366,13 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IChangeRulerColumn#setHover(org.eclipse.jface.text.source.IAnnotationHover)
-	 */
+	@Override
 	public void setHover(IAnnotationHover hover) {
 		fRevisionPainter.setHover(hover);
 		fDiffPainter.setHover(hover);
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#setModel(IAnnotationModel)
-	 */
+	@Override
 	public void setModel(IAnnotationModel model) {
 		setAnnotationModel(model);
 		fRevisionPainter.setModel(model);
@@ -408,9 +384,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 			fAnnotationModel= model;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IChangeRulerColumn#setBackground(org.eclipse.swt.graphics.Color)
-	 */
+	@Override
 	public void setBackground(Color background) {
 		fBackground= background;
 		if (fCanvas != null && !fCanvas.isDisposed())
@@ -419,44 +393,32 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 		fDiffPainter.setBackground(background);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IChangeRulerColumn#setAddedColor(org.eclipse.swt.graphics.Color)
-	 */
+	@Override
 	public void setAddedColor(Color addedColor) {
 		fDiffPainter.setAddedColor(addedColor);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IChangeRulerColumn#setChangedColor(org.eclipse.swt.graphics.Color)
-	 */
+	@Override
 	public void setChangedColor(Color changedColor) {
 		fDiffPainter.setChangedColor(changedColor);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IChangeRulerColumn#setDeletedColor(org.eclipse.swt.graphics.Color)
-	 */
+	@Override
 	public void setDeletedColor(Color deletedColor) {
 		fDiffPainter.setDeletedColor(deletedColor);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getModel()
-	 */
+	@Override
 	public IAnnotationModel getModel() {
 		return fAnnotationModel;
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#getControl()
-	 */
+	@Override
 	public Control getControl() {
 		return fCanvas;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getWidth()
-	 */
+	@Override
 	public int getWidth() {
 		return fWidth;
 	}
@@ -469,6 +431,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 			Display d= fCanvas.getDisplay();
 			if (d != null) {
 				d.asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						redraw();
 					}
@@ -477,16 +440,12 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#addVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener)
-	 */
+	@Override
 	public void addVerticalRulerListener(IVerticalRulerListener listener) {
 		throw new UnsupportedOperationException();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#removeVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener)
-	 */
+	@Override
 	public void removeVerticalRulerListener(IVerticalRulerListener listener) {
 		throw new UnsupportedOperationException();
 	}
@@ -542,9 +501,7 @@ public final class ChangeRulerColumn implements IChangeRulerColumn, IRevisionRul
 		return visibleModelLines;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.revisions.IRevisionRulerColumn#setRevisionInformation(org.eclipse.jface.text.revisions.RevisionInformation)
-	 */
+	@Override
 	public void setRevisionInformation(RevisionInformation info) {
 		fRevisionPainter.setRevisionInformation(info);
 		fRevisionPainter.setBackground(getBackground());
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java
index 25785012f6a..fca69ff52fb 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/CompositeRuler.java
@@ -83,9 +83,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 		protected RulerLayout() {
 		}
 
-		/*
-		 * @see Layout#computeSize(Composite, int, int, boolean)
-		 */
+		@Override
 		protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) {
 			Control[] children= composite.getChildren();
 			Point size= new Point(0, 0);
@@ -98,9 +96,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 			return size;
 		}
 
-		/*
-		 * @see Layout#layout(Composite, boolean)
-		 */
+		@Override
 		protected void layout(Composite composite, boolean flushCache) {
 			Rectangle clArea= composite.getClientArea();
 			int rulerHeight= clArea.height;
@@ -147,6 +143,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 		public CompositeRulerCanvas(Composite parent, int style) {
 			super(parent, style);
 			fMenuDetectListener= new Listener() {
+				@Override
 				public void handleEvent(Event event) {
 				  	if (event.type == SWT.MenuDetect) {
 						Menu menu= getMenu();
@@ -158,6 +155,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 				}
 			};
 			super.addDisposeListener(new DisposeListener() {
+				@Override
 				public void widgetDisposed(DisposeEvent e) {
 					if (fCachedListeners != null) {
 						fCachedListeners.clear();
@@ -354,89 +352,67 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 			}
 		}
 
-		/*
-		 * @see Control#removeControlListener(ControlListener)
-		 */
+		@Override
 		public void removeControlListener(ControlListener listener) {
 			removeListener(ControlListener.class, listener);
 			super.removeControlListener(listener);
 		}
 
-		/*
-		 * @see Control#removeFocusListener(FocusListener)
-		 */
+		@Override
 		public void removeFocusListener(FocusListener listener) {
 			removeListener(FocusListener.class, listener);
 			super.removeFocusListener(listener);
 		}
 
-		/*
-		 * @see Control#removeHelpListener(HelpListener)
-		 */
+		@Override
 		public void removeHelpListener(HelpListener listener) {
 			removeListener(HelpListener.class, listener);
 			super.removeHelpListener(listener);
 		}
 
-		/*
-		 * @see Control#removeKeyListener(KeyListener)
-		 */
+		@Override
 		public void removeKeyListener(KeyListener listener) {
 			removeListener(KeyListener.class, listener);
 			super.removeKeyListener(listener);
 		}
 
-		/*
-		 * @see Control#removeMouseListener(MouseListener)
-		 */
+		@Override
 		public void removeMouseListener(MouseListener listener) {
 			removeListener(MouseListener.class, listener);
 			super.removeMouseListener(listener);
 		}
 
-		/*
-		 * @see Control#removeMouseMoveListener(MouseMoveListener)
-		 */
+		@Override
 		public void removeMouseMoveListener(MouseMoveListener listener) {
 			removeListener(MouseMoveListener.class, listener);
 			super.removeMouseMoveListener(listener);
 		}
 
-		/*
-		 * @see Control#removeMouseTrackListener(MouseTrackListener)
-		 */
+		@Override
 		public void removeMouseTrackListener(MouseTrackListener listener) {
 			removeListener(MouseTrackListener.class, listener);
 			super.removeMouseTrackListener(listener);
 		}
 
-		/*
-		 * @see Control#removePaintListener(PaintListener)
-		 */
+		@Override
 		public void removePaintListener(PaintListener listener) {
 			removeListener(PaintListener.class, listener);
 			super.removePaintListener(listener);
 		}
 
-		/*
-		 * @see Control#removeTraverseListener(TraverseListener)
-		 */
+		@Override
 		public void removeTraverseListener(TraverseListener listener) {
 			removeListener(TraverseListener.class, listener);
 			super.removeTraverseListener(listener);
 		}
 
-		/*
-		 * @see Widget#removeDisposeListener(DisposeListener)
-		 */
+		@Override
 		public void removeDisposeListener(DisposeListener listener) {
 			removeListener(DisposeListener.class, listener);
 			super.removeDisposeListener(listener);
 		}
 
-		/*
-		 * @see Control#removeGestureListener(GestureListener)
-		 */
+		@Override
 		public void removeGestureListener(GestureListener listener) {
 			removeListener(GestureListener.class, listener);
 			super.removeGestureListener(listener);
@@ -445,54 +421,43 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 		/*
 		 * @seeControl#addControlListener(ControlListener)
 		 */
+		@Override
 		public void addControlListener(ControlListener listener) {
 			super.addControlListener(listener);
 			addListener(ControlListener.class, listener);
 		}
 
-		/*
-		 * @see Control#addFocusListener(FocusListener)
-		 */
+		@Override
 		public void addFocusListener(FocusListener listener) {
 			super.addFocusListener(listener);
 			addListener(FocusListener.class, listener);
 		}
 
-		/*
-		 * @see Control#addHelpListener(HelpListener)
-		 */
+		@Override
 		public void addHelpListener(HelpListener listener) {
 			super.addHelpListener(listener);
 			addListener(HelpListener.class, listener);
 		}
 
-		/*
-		 * @see Control#addKeyListener(KeyListener)
-		 */
+		@Override
 		public void addKeyListener(KeyListener listener) {
 			super.addKeyListener(listener);
 			addListener(KeyListener.class, listener);
 		}
 
-		/*
-		 * @see Control#addMouseListener(MouseListener)
-		 */
+		@Override
 		public void addMouseListener(MouseListener listener) {
 			super.addMouseListener(listener);
 			addListener(MouseListener.class, listener);
 		}
 
-		/*
-		 * @see Control#addMouseMoveListener(MouseMoveListener)
-		 */
+		@Override
 		public void addMouseMoveListener(MouseMoveListener listener) {
 			super.addMouseMoveListener(listener);
 			addListener(MouseMoveListener.class, listener);
 		}
 
-		/*
-		 * @see Control#addMouseTrackListener(MouseTrackListener)
-		 */
+		@Override
 		public void addMouseTrackListener(MouseTrackListener listener) {
 			super.addMouseTrackListener(listener);
 			addListener(MouseTrackListener.class, listener);
@@ -501,30 +466,25 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 		/*
 		 * @seeControl#addPaintListener(PaintListener)
 		 */
+		@Override
 		public void addPaintListener(PaintListener listener) {
 			super.addPaintListener(listener);
 			addListener(PaintListener.class, listener);
 		}
 
-		/*
-		 * @see Control#addTraverseListener(TraverseListener)
-		 */
+		@Override
 		public void addTraverseListener(TraverseListener listener) {
 			super.addTraverseListener(listener);
 			addListener(TraverseListener.class, listener);
 		}
 
-		/*
-		 * @see Widget#addDisposeListener(DisposeListener)
-		 */
+		@Override
 		public void addDisposeListener(DisposeListener listener) {
 			super.addDisposeListener(listener);
 			addListener(DisposeListener.class, listener);
 		}
 
-		/*
-		 * @see Control#addGestureListener(GestureListener)
-		 */
+		@Override
 		public void addGestureListener(GestureListener listener) {
 			super.addGestureListener(listener);
 			addListener(GestureListener.class, listener);
@@ -635,16 +595,12 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 			((Composite) parent).layout(true);
 	}
 
-	/*
-	 * @see IVerticalRuler#getControl()
-	 */
+	@Override
 	public Control getControl() {
 		return fComposite;
 	}
 
-	/*
-	 * @see IVerticalRuler#createControl(Composite, ITextViewer)
-	 */
+	@Override
 	public Control createControl(Composite parent, ITextViewer textViewer) {
 
 		fTextViewer= textViewer;
@@ -662,9 +618,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 		return fComposite;
 	}
 
-	/*
-	 * @see IVerticalRuler#setModel(IAnnotationModel)
-	 */
+	@Override
 	public void setModel(IAnnotationModel model) {
 
 		fModel= model;
@@ -676,21 +630,18 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 		}
 	}
 
-	/*
-	 * @see IVerticalRuler#getModel()
-	 */
+	@Override
 	public IAnnotationModel getModel() {
 		return fModel;
 	}
 
-	/*
-	 * @see IVerticalRuler#update()
-	 */
+	@Override
 	public void update() {
 		if (fComposite != null && !fComposite.isDisposed()) {
 			Display d= fComposite.getDisplay();
 			if (d != null) {
 				d.asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						immediateUpdate();
 					}
@@ -712,9 +663,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 		}
 	}
 
-	/*
-	 * @see IVerticalRulerExtension#setFont(Font)
-	 */
+	@Override
 	public void setFont(Font font) {
 		Iterator e= fDecorators.iterator();
 		while (e.hasNext()) {
@@ -723,9 +672,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 		}
 	}
 
-	/*
-	 * @see IVerticalRulerInfo#getWidth()
-	 */
+	@Override
 	public int getWidth() {
 		int width= 0;
 		Iterator e= fDecorators.iterator();
@@ -736,9 +683,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 		return Math.max(0, width - fGap);
 	}
 
-	/*
-	 * @see IVerticalRulerInfo#getLineOfLastMouseButtonActivity()
-	 */
+	@Override
 	public int getLineOfLastMouseButtonActivity() {
 		if (fLastMouseButtonActivityLine == -1)
 			fLastMouseButtonActivityLine= toDocumentLineNumber(fLocation.y);
@@ -747,9 +692,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 		return fLastMouseButtonActivityLine;
 	}
 
-	/*
-	 * @see IVerticalRulerInfo#toDocumentLineNumber(int)
-	 */
+	@Override
 	public int toDocumentLineNumber(int y_coordinate) {
 		if (fTextViewer == null || y_coordinate == -1)
 			return -1;
@@ -800,9 +743,7 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 		return fTextViewer;
 	}
 
-	/*
-	 * @see IVerticalRulerExtension#setLocationOfLastMouseButtonActivity(int, int)
-	 */
+	@Override
 	public void setLocationOfLastMouseButtonActivity(int x, int y) {
 		fLocation.x= x;
 		fLocation.y= y;
@@ -821,26 +762,17 @@ public class CompositeRuler implements IVerticalRuler, IVerticalRulerExtension,
 		return fDecorators.iterator();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getHover()
-	 * @since 3.0
-	 */
+	@Override
 	public IAnnotationHover getHover() {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#addVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener)
-	 * @since 3.0
-	 */
+	@Override
 	public void addVerticalRulerListener(IVerticalRulerListener listener) {
 		fAnnotationListeners.add(listener);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#removeVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener)
-	 * @since 3.0
-	 */
+	@Override
 	public void removeVerticalRulerListener(IVerticalRulerListener listener) {
 		fAnnotationListeners.remove(listener);
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java
index 70ed3c67429..ade74e15b50 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultAnnotationHover.java
@@ -56,9 +56,7 @@ public class DefaultAnnotationHover implements IAnnotationHover {
 		fShowLineNumber= showLineNumber;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationHover#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer, int)
-	 */
+	@Override
 	public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
 		List javaAnnotations= getAnnotationsForLine(sourceViewer, lineNumber);
 		if (javaAnnotations != null) {
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultCharacterPairMatcher.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultCharacterPairMatcher.java
index f9dc9c9c558..d4a4c57337e 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultCharacterPairMatcher.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/DefaultCharacterPairMatcher.java
@@ -94,7 +94,7 @@ public class DefaultCharacterPairMatcher implements ICharacterPairMatcher, IChar
 		this(chars, IDocumentExtension3.DEFAULT_PARTITIONING);
 	}
 
-	/* @see ICharacterPairMatcher#match(IDocument, int) */
+	@Override
 	public IRegion match(IDocument doc, int offset) {
 		if (doc == null || offset < 0 || offset > doc.getLength()) return null;
 		try {
@@ -109,6 +109,7 @@ public class DefaultCharacterPairMatcher implements ICharacterPairMatcher, IChar
 	 *      int, int)
 	 * @since 3.8
 	 */
+	@Override
 	public IRegion match(IDocument document, int offset, int length) {
 		if (document == null || offset < 0 || offset > document.getLength() || Math.abs(length) > 1)
 			return null;
@@ -133,6 +134,7 @@ public class DefaultCharacterPairMatcher implements ICharacterPairMatcher, IChar
 	 *      int, int)
 	 * @since 3.8
 	 */
+	@Override
 	public IRegion findEnclosingPeerCharacters(IDocument document, int offset, int length) {
 		if (document == null || offset < 0 || offset > document.getLength())
 			return null;
@@ -163,6 +165,7 @@ public class DefaultCharacterPairMatcher implements ICharacterPairMatcher, IChar
 	 * @see org.eclipse.jface.text.source.ICharacterPairMatcherExtension#isMatchedChar(char)
 	 * @since 3.8
 	 */
+	@Override
 	public boolean isMatchedChar(char ch) {
 		return fPairs.contains(ch);
 	}
@@ -172,6 +175,7 @@ public class DefaultCharacterPairMatcher implements ICharacterPairMatcher, IChar
 	 *      org.eclipse.jface.text.IDocument, int)
 	 * @since 3.8
 	 */
+	@Override
 	public boolean isMatchedChar(char ch, IDocument document, int offset) {
 		return isMatchedChar(ch);
 	}
@@ -181,6 +185,7 @@ public class DefaultCharacterPairMatcher implements ICharacterPairMatcher, IChar
 	 *      org.eclipse.jface.text.IRegion, org.eclipse.jface.text.IRegion)
 	 * @since 3.8
 	 */
+	@Override
 	public boolean isRecomputationOfEnclosingPairRequired(IDocument document, IRegion currentSelection, IRegion previousSelection) {
 		int previousStartOffset= previousSelection.getOffset();
 		int currentStartOffset= currentSelection.getOffset();
@@ -445,15 +450,15 @@ public class DefaultCharacterPairMatcher implements ICharacterPairMatcher, IChar
 		return -1;
 	}
 
-	/* @see ICharacterPairMatcher#getAnchor() */
+	@Override
 	public int getAnchor() {
 		return fAnchor;
 	}
 
-	/* @see ICharacterPairMatcher#dispose() */
+	@Override
 	public void dispose() { }
 
-	/* @see ICharacterPairMatcher#clear() */
+	@Override
 	public void clear() {
 		fAnchor= -1;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/IAnnotationAccess.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/IAnnotationAccess.java
index 06c6ab18543..0342f0d581a 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/IAnnotationAccess.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/IAnnotationAccess.java
@@ -41,6 +41,7 @@ public interface IAnnotationAccess {
 	 * @return the type of the given annotation or <code>null</code> if it has none.
 	 * @deprecated use <code>Annotation.getType()</code>
 	 */
+	@Deprecated
 	Object getType(Annotation annotation);
 
 	/**
@@ -52,6 +53,7 @@ public interface IAnnotationAccess {
 	 *
 	 * @deprecated assumed to always return <code>true</code>
 	 */
+	@Deprecated
 	boolean isMultiLine(Annotation annotation);
 
 	/**
@@ -62,5 +64,6 @@ public interface IAnnotationAccess {
 	 * 	<code>false</code> otherwise
 	 * @deprecated use <code>Annotation.isPersistent()</code>
 	 */
+	@Deprecated
 	boolean isTemporary(Annotation annotation);
 }
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineChangeHover.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineChangeHover.java
index 199ca232332..4b9df872431 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineChangeHover.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineChangeHover.java
@@ -34,9 +34,7 @@ import org.eclipse.jface.text.information.IInformationProviderExtension2;
  */
 public class LineChangeHover implements IAnnotationHover, IAnnotationHoverExtension, IInformationProviderExtension2 {
 
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationHover#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer, int)
-	 */
+	@Override
 	public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
 		return null;
 	}
@@ -240,9 +238,7 @@ public class LineChangeHover implements IAnnotationHover, IAnnotationHoverExtens
 		return new Point(first, last);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer, org.eclipse.jface.text.source.ILineRange, int)
-	 */
+	@Override
 	public Object getHoverInfo(ISourceViewer sourceViewer, ILineRange lineRange, int visibleLines) {
 		int first= adaptFirstLine(sourceViewer, lineRange.getStartLine());
 		int last= adaptLastLine(sourceViewer, lineRange.getStartLine() + lineRange.getNumberOfLines() - 1);
@@ -289,9 +285,7 @@ public class LineChangeHover implements IAnnotationHover, IAnnotationHoverExtens
 		return lastLine;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverLineRange(org.eclipse.jface.text.source.ISourceViewer, int)
-	 */
+	@Override
 	public ILineRange getHoverLineRange(ISourceViewer viewer, int lineNumber) {
 		IDocument document= viewer.getDocument();
 		if (document != null) {
@@ -302,26 +296,20 @@ public class LineChangeHover implements IAnnotationHover, IAnnotationHoverExtens
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#canHandleMouseCursor()
-	 */
+	@Override
 	public boolean canHandleMouseCursor() {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IAnnotationHoverExtension#getHoverControlCreator()
-	 */
+	@Override
 	public IInformationControlCreator getHoverControlCreator() {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.information.IInformationProviderExtension2#getInformationPresenterControlCreator()
-	 * @since 3.2
-	 */
+	@Override
 	public IInformationControlCreator getInformationPresenterControlCreator() {
 		return new IInformationControlCreator() {
+			@Override
 			public IInformationControl createInformationControl(Shell parent) {
 				return new DefaultInformationControl(parent, (ToolBarManager)null, null);
 			}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberChangeRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberChangeRulerColumn.java
index ee36bc93da7..daf6e4c4c96 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberChangeRulerColumn.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberChangeRulerColumn.java
@@ -68,9 +68,7 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement
 		fDiffPainter= new DiffPainter(this, sharedColors);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.LineNumberRulerColumn#createControl(org.eclipse.jface.text.source.CompositeRuler, org.eclipse.swt.widgets.Composite)
-	 */
+	@Override
 	public Control createControl(CompositeRuler parentRuler, Composite parentControl) {
 		Control control= super.createControl(parentRuler, parentControl);
 		fRevisionPainter.setParentRuler(parentRuler);
@@ -78,23 +76,17 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement
 		return control;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getLineOfLastMouseButtonActivity()
-	 */
+	@Override
 	public int getLineOfLastMouseButtonActivity() {
 		return getParentRuler().getLineOfLastMouseButtonActivity();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#toDocumentLineNumber(int)
-	 */
+	@Override
 	public int toDocumentLineNumber(int y_coordinate) {
 		return getParentRuler().toDocumentLineNumber(y_coordinate);
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#setModel(IAnnotationModel)
-	 */
+	@Override
 	public void setModel(IAnnotationModel model) {
 		setAnnotationModel(model);
 		fRevisionPainter.setModel(model);
@@ -126,16 +118,12 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getModel()
-	 */
+	@Override
 	public IAnnotationModel getModel() {
 		return fAnnotationModel;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.LineNumberRulerColumn#createDisplayString(int)
-	 */
+	@Override
 	protected String createDisplayString(int line) {
 		StringBuffer buffer= new StringBuffer();
 		if (fShowNumbers)
@@ -145,9 +133,7 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement
 		return buffer.toString();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.LineNumberRulerColumn#computeNumberOfDigits()
-	 */
+	@Override
 	protected int computeNumberOfDigits() {
 		int digits;
 		if (fCharacterDisplay && getModel() != null) {
@@ -166,23 +152,17 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement
 		return digits;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#addVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener)
-	 */
+	@Override
 	public void addVerticalRulerListener(IVerticalRulerListener listener) {
 		throw new UnsupportedOperationException();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#removeVerticalRulerListener(org.eclipse.jface.text.source.IVerticalRulerListener)
-	 */
+	@Override
 	public void removeVerticalRulerListener(IVerticalRulerListener listener) {
 		throw new UnsupportedOperationException();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.LineNumberRulerColumn#doPaint(org.eclipse.swt.graphics.GC)
-	 */
+	@Override
 	void doPaint(GC gc, ILineRange visibleLines) {
 		Color foreground= gc.getForeground();
 		if (visibleLines != null) {
@@ -196,9 +176,7 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement
 			super.doPaint(gc, visibleLines);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfoExtension#getHover()
-	 */
+	@Override
 	public IAnnotationHover getHover() {
 		int activeLine= getParentRuler().getLineOfLastMouseButtonActivity();
 		if (fRevisionPainter.hasHover(activeLine))
@@ -208,47 +186,35 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IChangeRulerColumn#setHover(org.eclipse.jface.text.source.IAnnotationHover)
-	 */
+	@Override
 	public void setHover(IAnnotationHover hover) {
 		fRevisionPainter.setHover(hover);
 		fDiffPainter.setHover(hover);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IChangeRulerColumn#setBackground(org.eclipse.swt.graphics.Color)
-	 */
+	@Override
 	public void setBackground(Color background) {
 		super.setBackground(background);
 		fRevisionPainter.setBackground(background);
 		fDiffPainter.setBackground(background);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IChangeRulerColumn#setAddedColor(org.eclipse.swt.graphics.Color)
-	 */
+	@Override
 	public void setAddedColor(Color addedColor) {
 		fDiffPainter.setAddedColor(addedColor);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IChangeRulerColumn#setChangedColor(org.eclipse.swt.graphics.Color)
-	 */
+	@Override
 	public void setChangedColor(Color changedColor) {
 		fDiffPainter.setChangedColor(changedColor);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IChangeRulerColumn#setDeletedColor(org.eclipse.swt.graphics.Color)
-	 */
+	@Override
 	public void setDeletedColor(Color deletedColor) {
 		fDiffPainter.setDeletedColor(deletedColor);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.revisions.IRevisionRulerColumn#setRevisionInformation(org.eclipse.jface.text.revisions.RevisionInformation)
-	 */
+	@Override
 	public void setRevisionInformation(RevisionInformation info) {
 		fRevisionPainter.setRevisionInformation(info);
 		updateNumberOfDigits();
@@ -257,11 +223,8 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement
 		postRedraw();
 	}
 
-    /*
-     * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#getRevisionSelectionProvider()
-     * @since 3.2
-     */
-    public ISelectionProvider getRevisionSelectionProvider() {
+    @Override
+	public ISelectionProvider getRevisionSelectionProvider() {
 	    return fRevisionPainter.getRevisionSelectionProvider();
     }
 
@@ -269,7 +232,8 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement
      * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#setRenderingMode(org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension.RenderingMode)
      * @since 3.3
      */
-    public void setRevisionRenderingMode(RenderingMode renderingMode) {
+    @Override
+	public void setRevisionRenderingMode(RenderingMode renderingMode) {
 		fRevisionPainter.setRenderingMode(renderingMode);
 	}
 
@@ -289,11 +253,8 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement
     	}
     }
 
-    /*
-     * @see org.eclipse.jface.text.source.LineNumberRulerColumn#getWidth()
-     * @since 3.3
-     */
-    public int getWidth() {
+    @Override
+	public int getWidth() {
    		int width= super.getWidth();
 		return width > 0 ? width : 8; // minimal width to display quick diff / revisions if no textual info is shown
     }
@@ -331,10 +292,7 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement
 		return fDiffPainter.hasInformation();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#showRevisionAuthor(boolean)
-	 * @since 3.3
-	 */
+	@Override
 	public void showRevisionAuthor(boolean show) {
 		fRevisionPainter.showRevisionAuthor(show);
 		updateNumberOfDigits();
@@ -343,10 +301,7 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement
 		postRedraw();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#showRevisionId(boolean)
-	 * @since 3.3
-	 */
+	@Override
 	public void showRevisionId(boolean show) {
 		fRevisionPainter.showRevisionId(show);
 		updateNumberOfDigits();
@@ -355,26 +310,17 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement
 		postRedraw();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#addRevisionListener(org.eclipse.jface.text.revisions.IRevisionListener)
-	 * @since 3.3
-	 */
+	@Override
 	public void addRevisionListener(IRevisionListener listener) {
 		fRevisionPainter.addRevisionListener(listener);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.revisions.IRevisionRulerColumnExtension#removeRevisionListener(org.eclipse.jface.text.revisions.IRevisionListener)
-	 * @since 3.3
-	 */
+	@Override
 	public void removeRevisionListener(IRevisionListener listener) {
 		fRevisionPainter.removeRevisionListener(listener);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.LineNumberRulerColumn#handleDispose()
-	 * @since 3.3
-	 */
+	@Override
 	protected void handleDispose() {
 		fRevisionPainter.setParentRuler(null);
 		fRevisionPainter.setModel(null);
@@ -383,6 +329,7 @@ public class LineNumberChangeRulerColumn extends LineNumberRulerColumn implement
 		super.handleDispose();
 	}
 	
+	@Override
 	void handleMouseScrolled(MouseEvent e) {
 		if (fRevisionPainter.isWheelHandlerInstalled()) {
 			return; // scroll event is already handled; don't interfere
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java
index 679be320157..381680a78c2 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java
@@ -70,17 +70,13 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 		 */
 		private boolean fCachedRedrawState= true;
 
-		/*
-		 * @see IViewportListener#viewportChanged(int)
-		 */
+		@Override
 		public void viewportChanged(int verticalPosition) {
 			if (fCachedRedrawState && verticalPosition != fScrollPos)
 				redraw();
 		}
 
-		/*
-		 * @see ITextListener#textChanged(TextEvent)
-		 */
+		@Override
 		public void textChanged(TextEvent event) {
 
 			fCachedRedrawState= event.getViewerRedrawState();
@@ -116,9 +112,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 		/* @since 3.2 */
 		private boolean fIsListeningForMove= false;
 
-		/*
-		 * @see org.eclipse.swt.events.MouseListener#mouseUp(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseUp(MouseEvent event) {
 			// see bug 45700
 			if (event.button == 1) {
@@ -127,9 +121,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 			}
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseListener#mouseDown(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseDown(MouseEvent event) {
 			fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y);
 			// see bug 45700
@@ -138,18 +130,14 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 			}
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseListener#mouseDoubleClick(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseDoubleClick(MouseEvent event) {
 			fParentRuler.setLocationOfLastMouseButtonActivity(event.x, event.y);
 			stopSelecting();
 			stopAutoScroll();
 		}
 
-		/*
-		 * @see org.eclipse.swt.events.MouseMoveListener#mouseMove(org.eclipse.swt.events.MouseEvent)
-		 */
+		@Override
 		public void mouseMove(MouseEvent event) {
 			if (fIsListeningForMove && !autoScroll(event)) {
 				int newLine= fParentRuler.toDocumentLineNumber(event.y);
@@ -322,6 +310,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 			switch (direction) {
 				case SWT.UP:
 					timer= new Runnable() {
+						@Override
 						public void run() {
 							if (fAutoScrollDirection == SWT.UP) {
 								int top= getInclusiveTopIndex();
@@ -336,6 +325,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 					break;
 				case  SWT.DOWN:
 					timer= new Runnable() {
+						@Override
 						public void run() {
 							if (fAutoScrollDirection == SWT.DOWN) {
 								int top= getInclusiveTopIndex();
@@ -366,6 +356,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 			return -1;
 		}
 
+		@Override
 		public void mouseScrolled(MouseEvent e) {
 			handleMouseScrolled(e);
 		}
@@ -414,6 +405,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 	 * @since 3.0
 	 */
 	private Runnable fRunnable= new Runnable() {
+		@Override
 		public void run() {
 			synchronized (fRunnableLock) {
 				fIsRunnablePosted= false;
@@ -473,9 +465,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 		return fBackground;
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#getControl()
-	 */
+	@Override
 	public Control getControl() {
 		return fCanvas;
 	}
@@ -483,6 +473,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 	/*
 	 * @see IVerticalRuleColumnr#getWidth
 	 */
+	@Override
 	public int getWidth() {
 		return fIndentation[0];
 	}
@@ -581,9 +572,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 		}
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#createControl(CompositeRuler, Composite)
-	 */
+	@Override
 	public Control createControl(CompositeRuler parentRuler, Composite parentControl) {
 
 		fParentRuler= parentRuler;
@@ -592,6 +581,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 
 		// on word wrap toggle a "resized" ControlEvent is fired: suggest a redraw of the line ruler
 		fCachedTextWidget.addControlListener(new ControlAdapter() {
+			@Override
 			public void controlResized(ControlEvent e) {
 				if (fCachedTextWidget != null && fCachedTextWidget.getWordWrap()) {
 					postRedraw();
@@ -600,11 +590,8 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 		});
 
 		fCanvas= new Canvas(parentControl, SWT.NO_FOCUS ) {
- 			/*
- 			 * @see org.eclipse.swt.widgets.Control#addMouseListener(org.eclipse.swt.events.MouseListener)
- 			 * @since 3.4
- 			 */
- 			public void addMouseListener(MouseListener listener) {
+ 			@Override
+			public void addMouseListener(MouseListener listener) {
 				// see bug 40889, bug 230073 and AnnotationRulerColumn#isPropagatingMouseListener()
 				if (listener == fMouseHandler)
 					super.addMouseListener(listener);
@@ -620,6 +607,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 		fCanvas.setForeground(fForeground);
 
 		fCanvas.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent event) {
 				if (fCachedTextViewer != null)
 					doubleBufferPaint(event.gc);
@@ -627,6 +615,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 		});
 
 		fCanvas.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				handleDispose();
 				fCachedTextViewer= null;
@@ -724,6 +713,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 	 * @deprecated as of 3.2 the number of lines in the viewport cannot be computed because
 	 *             StyledText supports variable line heights
 	 */
+	@Deprecated
 	protected int getVisibleLinesInViewport() {
 		return getVisibleLinesInViewport(fCachedTextWidget);
 	}
@@ -870,9 +860,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 		}
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#redraw()
-	 */
+	@Override
 	public void redraw() {
 
 		if (fRelayoutRequired) {
@@ -892,15 +880,11 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 		}
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#setModel(IAnnotationModel)
-	 */
+	@Override
 	public void setModel(IAnnotationModel model) {
 	}
 
-	/*
-	 * @see IVerticalRulerColumn#setFont(Font)
-	 */
+	@Override
 	public void setFont(Font font) {
 		fFont= font;
 		if (fCanvas != null && !fCanvas.isDisposed()) {
@@ -950,6 +934,7 @@ public class LineNumberRulerColumn implements IVerticalRulerColumn {
 	 * @deprecated this method should not be used - it relies on the widget using a uniform line
 	 *             height
 	 */
+	@Deprecated
 	static int getVisibleLinesInViewport(StyledText textWidget) {
 		if (textWidget != null) {
 			Rectangle clArea= textWidget.getClientArea();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineRange.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineRange.java
index 2223e0ebc86..a55a7456e0c 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineRange.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineRange.java
@@ -31,16 +31,12 @@ public final class LineRange implements ILineRange {
 		fNumberOfLines= numberOfLines;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.ILineRange#getStartLine()
-	 */
+	@Override
 	public int getStartLine() {
 		return fStartLine;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.ILineRange#getNumberOfLines()
-	 */
+	@Override
 	public int getNumberOfLines() {
 		return fNumberOfLines;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/MatchingCharacterPainter.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/MatchingCharacterPainter.java
index e8157155b5f..5c89834eb06 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/MatchingCharacterPainter.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/MatchingCharacterPainter.java
@@ -148,9 +148,7 @@ public final class MatchingCharacterPainter implements IPainter, PaintListener {
 		fColor= color;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPainter#dispose()
-	 */
+	@Override
 	public void dispose() {
 		if (fMatcher != null) {
 			if (fMatcher instanceof ICharacterPairMatcherExtension && fTextListener != null) {
@@ -165,9 +163,7 @@ public final class MatchingCharacterPainter implements IPainter, PaintListener {
 		fTextWidget= null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPainter#deactivate(boolean)
-	 */
+	@Override
 	public void deactivate(boolean redraw) {
 		if (fIsActive) {
 			fIsActive= false;
@@ -180,9 +176,7 @@ public final class MatchingCharacterPainter implements IPainter, PaintListener {
 		fPreviousSelection= null;
 	}
 
-	/*
-	 * @see org.eclipse.swt.events.PaintListener#paintControl(org.eclipse.swt.events.PaintEvent)
-	 */
+	@Override
 	public void paintControl(PaintEvent event) {
 		if (fTextWidget != null)
 			handleDrawRequest(event.gc);
@@ -303,9 +297,7 @@ public final class MatchingCharacterPainter implements IPainter, PaintListener {
 		return new Region(viewerSelection.x, viewerSelection.y);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPainter#paint(int)
-	 */
+	@Override
 	public void paint(int reason) {
 
 		IDocument document= fSourceViewer.getDocument();
@@ -405,9 +397,7 @@ public final class MatchingCharacterPainter implements IPainter, PaintListener {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPainter#setPositionManager(org.eclipse.jface.text.IPaintPositionManager)
-	 */
+	@Override
 	public void setPositionManager(IPaintPositionManager manager) {
 		fPaintPositionManager= manager;
 	}
@@ -445,6 +435,7 @@ public final class MatchingCharacterPainter implements IPainter, PaintListener {
 		/**
 		 * @see org.eclipse.jface.text.ITextListener#textChanged(org.eclipse.jface.text.TextEvent)
 		 */
+		@Override
 		public void textChanged(TextEvent event) {
 			if (!fHighlightEnclosingPeerCharacters || !(fMatcher instanceof ICharacterPairMatcherExtension))
 				return;
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java
index 1407e9d2620..153fc777685 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java
@@ -80,6 +80,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 		/*
 		 * @see ITextListener#textChanged
 		 */
+		@Override
 		public void textChanged(TextEvent e) {
 			if (fTextViewer != null && e.getDocumentEvent() == null && e.getViewerRedrawState()) {
 				// handle only changes of visible document
@@ -87,17 +88,12 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 			}
 		}
 
-		/*
-		 * @see IAnnotationModelListener#modelChanged(IAnnotationModel)
-		 */
+		@Override
 		public void modelChanged(IAnnotationModel model) {
 			update();
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.source.IAnnotationModelListenerExtension#modelChanged(org.eclipse.jface.text.source.AnnotationModelEvent)
-		 * @since 3.3
-		 */
+		@Override
 		public void modelChanged(AnnotationModelEvent event) {
 			if (!event.isValid())
 				return;
@@ -215,15 +211,11 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 			return fType.equals(annotationType);
 		}
 
-		/*
-		 * @see Iterator#hasNext()
-		 */
+		@Override
 		public boolean hasNext() {
 			return fNext != null;
 		}
-		/*
-		 * @see Iterator#next()
-		 */
+		@Override
 		public Object next() {
 			try {
 				return fNext;
@@ -232,9 +224,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 					skip();
 			}
 		}
-		/*
-		 * @see Iterator#remove()
-		 */
+		@Override
 		public void remove() {
 			throw new UnsupportedOperationException();
 		}
@@ -274,6 +264,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 			gc.drawLine(x, y + h, x + w, y + h);
 		}
 
+		@Override
 		public void paintControl(PaintEvent e) {
 			if (fIndicatorColor == null)
 				return;
@@ -469,6 +460,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 	 * @since 3.3
 	 */
 	private Runnable fRunnable= new Runnable() {
+		@Override
 		public void run() {
 			synchronized (fRunnableLock) {
 				fIsRunnablePosted= false;
@@ -526,23 +518,17 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 		fIsTemporaryAnnotationDiscolored= discolorTemporaryAnnotation;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getControl()
-	 */
+	@Override
 	public Control getControl() {
 		return fCanvas;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRulerInfo#getWidth()
-	 */
+	@Override
 	public int getWidth() {
 		return fWidth;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRuler#setModel(org.eclipse.jface.text.source.IAnnotationModel)
-	 */
+	@Override
 	public void setModel(IAnnotationModel model) {
 		if (model != fModel || model != null) {
 
@@ -558,9 +544,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRuler#createControl(org.eclipse.swt.widgets.Composite, org.eclipse.jface.text.ITextViewer)
-	 */
+	@Override
 	public Control createControl(Composite parent, ITextViewer textViewer) {
 
 		fTextViewer= textViewer;
@@ -575,6 +559,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 				 * @see org.eclipse.swt.events.MouseTrackAdapter#mouseHover(org.eclipse.swt.events.MouseEvent)
 				 * @since 3.3
 				 */
+				@Override
 				public void mouseEnter(MouseEvent e) {
 					updateHeaderToolTipText();
 				}
@@ -584,6 +569,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 		fCanvas= new Canvas(parent, SWT.NO_BACKGROUND);
 
 		fCanvas.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent event) {
 				if (fTextViewer != null)
 					doubleBufferPaint(event.gc);
@@ -591,6 +577,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 		});
 
 		fCanvas.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent event) {
 				handleDispose();
 				fTextViewer= null;
@@ -598,18 +585,21 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 		});
 
 		fCanvas.addMouseListener(new MouseAdapter() {
+			@Override
 			public void mouseDown(MouseEvent event) {
 				handleMouseDown(event);
 			}
 		});
 
 		fCanvas.addMouseMoveListener(new MouseMoveListener() {
+			@Override
 			public void mouseMove(MouseEvent event) {
 				handleMouseMove(event);
 			}
 		});
 
 		fCanvas.addMouseWheelListener(new MouseWheelListener() {
+			@Override
 			public void mouseScrolled(MouseEvent e) {
 				handleMouseScrolled(e);
 			}
@@ -619,6 +609,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 			fTextViewer.addTextListener(fInternalListener);
 			// on word wrap toggle a "resized" ControlEvent is fired: suggest a redraw of the ruler
 			fTextViewer.getTextWidget().addControlListener(new ControlAdapter() {
+				@Override
 				public void controlResized(ControlEvent e) {
 					if (fTextViewer == null) {
 						return;
@@ -886,10 +877,8 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 		return yy;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRuler#update()
-	 */
-	 public void update() {
+	 @Override
+	public void update() {
 		if (fCanvas != null && !fCanvas.isDisposed()) {
 			Display d= fCanvas.getDisplay();
 			if (d != null) {
@@ -1163,9 +1152,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IOverviewRuler#addAnnotationType(java.lang.Object)
-	 */
+	@Override
 	public void addAnnotationType(Object annotationType) {
 		synchronized (fRunnableLock){
 			fConfiguredAnnotationTypes.add(annotationType);
@@ -1173,9 +1160,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IOverviewRuler#removeAnnotationType(java.lang.Object)
-	 */
+	@Override
 	public void removeAnnotationType(Object annotationType) {
 		synchronized (fRunnableLock){
 			fConfiguredAnnotationTypes.remove(annotationType);
@@ -1183,9 +1168,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IOverviewRuler#setAnnotationTypeLayer(java.lang.Object, int)
-	 */
+	@Override
 	public void setAnnotationTypeLayer(Object annotationType, int layer) {
 		int j= fAnnotationsSortedByLayer.indexOf(annotationType);
 		if (j != -1) {
@@ -1204,9 +1187,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IOverviewRuler#setAnnotationTypeColor(java.lang.Object, org.eclipse.swt.graphics.Color)
-	 */
+	@Override
 	public void setAnnotationTypeColor(Object annotationType, Color color) {
 		if (color != null)
 			fAnnotationTypes2Colors.put(annotationType, color);
@@ -1397,18 +1378,14 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 		return getColor(annotationType, temporary && fIsTemporaryAnnotationDiscolored ? 0.9 : 0.75);
 	}
 
-	/*
-	 * @see IVerticalRulerInfo#getLineOfLastMouseButtonActivity()
-	 */
+	@Override
 	public int getLineOfLastMouseButtonActivity() {
 		if (fLastMouseButtonActivityLine >= fTextViewer.getDocument().getNumberOfLines())
 			fLastMouseButtonActivityLine= -1;
 		return fLastMouseButtonActivityLine;
 	}
 
-	/*
-	 * @see IVerticalRulerInfo#toDocumentLineNumber(int)
-	 */
+	@Override
 	public int toDocumentLineNumber(int y_coordinate) {
 
 		if (fTextViewer == null || y_coordinate == -1)
@@ -1423,37 +1400,27 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 		return	bestLine;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IVerticalRuler#getModel()
-	 */
+	@Override
 	public IAnnotationModel getModel() {
 		return fModel;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IOverviewRuler#getAnnotationHeight()
-	 */
+	@Override
 	public int getAnnotationHeight() {
 		return fAnnotationHeight;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IOverviewRuler#hasAnnotation(int)
-	 */
+	@Override
 	public boolean hasAnnotation(int y) {
 		return findBestMatchingLineNumber(toLineNumbers(y, true)) != -1;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IOverviewRuler#getHeaderControl()
-	 */
+	@Override
 	public Control getHeaderControl() {
 		return fHeader;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IOverviewRuler#addHeaderAnnotationType(java.lang.Object)
-	 */
+	@Override
 	public void addHeaderAnnotationType(Object annotationType) {
 		synchronized (fRunnableLock) {
 			fConfiguredHeaderAnnotationTypes.add(annotationType);
@@ -1461,9 +1428,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.IOverviewRuler#removeHeaderAnnotationType(java.lang.Object)
-	 */
+	@Override
 	public void removeHeaderAnnotationType(Object annotationType) {
 		synchronized (fRunnableLock) {
 			fConfiguredHeaderAnnotationTypes.remove(annotationType);
@@ -1562,6 +1527,7 @@ public class OverviewRuler implements IOverviewRulerExtension, IOverviewRuler {
 	 * 
 	 * @since 3.8
 	 */
+	@Override
 	public void setUseSaturatedColors(boolean useSaturatedColor) {
 		fUseSaturatedColors= useSaturatedColor;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRulerHoverManager.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRulerHoverManager.java
index e10f80eb998..2ac3927ab89 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRulerHoverManager.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRulerHoverManager.java
@@ -46,9 +46,7 @@ class OverviewRulerHoverManager extends AnnotationBarHoverManager {
 		}
 	}
 
-	/*
-	 * @see AbstractHoverInformationControlManager#computeInformation()
-	 */
+	@Override
 	protected void computeInformation() {
 		Point location= getHoverEventLocation();
 		int line= getVerticalRulerInfo().toDocumentLineNumber(location.y);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java
index 58c90f58870..29ed1c65b3c 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java
@@ -108,9 +108,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 			fGap= gap;
 		}
 
-		/*
-		 * @see Layout#computeSize(Composite, int, int, boolean)
-		 */
+		@Override
 		protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) {
 			Control[] children= composite.getChildren();
 			Point s= children[children.length - 1].computeSize(SWT.DEFAULT, SWT.DEFAULT, flushCache);
@@ -119,9 +117,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 			return s;
 		}
 
-		/*
-		 * @see Layout#layout(Composite, boolean)
-		 */
+		@Override
 		protected void layout(Composite composite, boolean flushCache) {
 			Rectangle clArea= composite.getClientArea();
 			StyledText textWidget= getTextWidget();
@@ -388,9 +384,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		createControl(parent, styles);
 	}
 
-	/*
-	 * @see TextViewer#createControl(Composite, int)
-	 */
+	@Override
 	protected void createControl(Composite parent, int styles) {
 
 		if (fVerticalRuler != null || fOverviewRuler != null) {
@@ -419,18 +413,14 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		return new RulerLayout(GAP_SIZE_1);
 	}
 
-	/*
-	 * @see TextViewer#getControl()
-	 */
+	@Override
 	public Control getControl() {
 		if (fComposite != null)
 			return fComposite;
 		return super.getControl();
 	}
 
-	/*
-	 * @see ISourceViewer#setAnnotationHover(IAnnotationHover)
-	 */
+	@Override
 	public void setAnnotationHover(IAnnotationHover annotationHover) {
 		fAnnotationHover= annotationHover;
 	}
@@ -448,9 +438,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		fOverviewRulerAnnotationHover= annotationHover;
 	}
 
-	/*
-	 * @see ISourceViewer#configure(SourceViewerConfiguration)
-	 */
+	@Override
 	public void configure(SourceViewerConfiguration configuration) {
 
 		if (getTextWidget() == null)
@@ -554,10 +542,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextViewer#setHoverEnrichMode(org.eclipse.jface.text.ITextViewerExtension8.EnrichMode)
-	 * @since 3.4
-	 */
+	@Override
 	public void setHoverEnrichMode(EnrichMode mode) {
 		super.setHoverEnrichMode(mode);
 		if (fVerticalRulerHoveringController != null)
@@ -566,32 +551,24 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 			fOverviewRulerHoveringController.getInternalAccessor().setHoverEnrichMode(mode);
 	}
 
-	/*
-	 * @see TextViewer#activatePlugins()
-	 */
+	@Override
 	public void activatePlugins() {
 		ensureAnnotationHoverManagerInstalled();
 		ensureOverviewHoverManagerInstalled();
 		super.activatePlugins();
 	}
 
-	/*
-	 * @see ISourceViewer#setDocument(IDocument, IAnnotationModel)
-	 */
+	@Override
 	public void setDocument(IDocument document) {
 		setDocument(document, null, -1, -1);
 	}
 
-	/*
-	 * @see ISourceViewer#setDocument(IDocument, IAnnotationModel, int, int)
-	 */
+	@Override
 	public void setDocument(IDocument document, int visibleRegionOffset, int visibleRegionLength) {
 		setDocument(document, null, visibleRegionOffset, visibleRegionLength);
 	}
 
-	/*
-	 * @see ISourceViewer#setDocument(IDocument, IAnnotationModel)
-	 */
+	@Override
 	public void setDocument(IDocument document, IAnnotationModel annotationModel) {
 		setDocument(document, annotationModel, -1, -1);
 	}
@@ -626,9 +603,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		}
 	}
 
-	/*
-	 * @see ISourceViewer#setDocument(IDocument, IAnnotationModel, int, int)
-	 */
+	@Override
 	public void setDocument(IDocument document, IAnnotationModel annotationModel, int modelRangeOffset, int modelRangeLength) {
 		disposeVisualAnnotationModel();
 
@@ -656,9 +631,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 			fOverviewRuler.setModel(fVisualAnnotationModel);
 	}
 
-	/*
-	 * @see ISourceViewer#getAnnotationModel()
-	 */
+	@Override
 	public IAnnotationModel getAnnotationModel() {
 		if (fVisualAnnotationModel instanceof IAnnotationModelExtension) {
 			IAnnotationModelExtension extension= (IAnnotationModelExtension) fVisualAnnotationModel;
@@ -667,10 +640,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.ISourceViewerExtension3#getQuickAssistAssistant()
-	 * @since 3.2
-	 */
+	@Override
 	public IQuickAssistAssistant getQuickAssistAssistant() {
 		return fQuickAssistAssistant;
 	}
@@ -680,31 +650,23 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 	 *
 	 * @since 3.4
 	 */
+	@Override
 	public final ContentAssistantFacade getContentAssistantFacade() {
 		return fContentAssistantFacade;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.ISourceViewerExtension3#getQuickAssistInvocationContext()
-	 * @since 3.2
-	 */
+	@Override
 	public IQuickAssistInvocationContext getQuickAssistInvocationContext() {
 		Point selection= getSelectedRange();
 		return new TextInvocationContext(this, selection.x, selection.y);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.ISourceViewerExtension2#getVisualAnnotationModel()
-	 * @since 3.0
-	 */
+	@Override
 	public IAnnotationModel getVisualAnnotationModel() {
 		return fVisualAnnotationModel;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.ISourceViewerExtension2#unconfigure()
-	 * @since 3.0
-	 */
+	@Override
 	public void unconfigure() {
 		clearRememberedSelection();
 
@@ -763,9 +725,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		setHyperlinkDetectors(null, SWT.NONE);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.TextViewer#handleDispose()
-	 */
+	@Override
 	protected void handleDispose() {
 		unconfigure();
 
@@ -781,9 +741,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		super.handleDispose();
 	}
 
-	/*
-	 * @see ITextOperationTarget#canDoOperation(int)
-	 */
+	@Override
 	public boolean canDoOperation(int operation) {
 
 		if (getTextWidget() == null || (!redraws() && operation != FORMAT))
@@ -959,9 +917,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		fSelectionCategory= null;
 	}
 
-	/*
-	 * @see ITextOperationTarget#doOperation(int)
-	 */
+	@Override
 	public void doOperation(int operation) {
 
 		if (getTextWidget() == null || (!redraws() && operation != FORMAT))
@@ -1090,10 +1046,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		}
 	}
 
-	/*
-	 * @see ITextOperationTargetExtension#enableOperation(int, boolean)
-	 * @since 2.0
-	 */
+	@Override
 	public void enableOperation(int operation, boolean enable) {
 
 		switch (operation) {
@@ -1132,16 +1085,12 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		}
 	}
 
-	/*
-	 * @see ISourceViewer#setRangeIndicator(Annotation)
-	 */
+	@Override
 	public void setRangeIndicator(Annotation rangeIndicator) {
 		fRangeIndicator= rangeIndicator;
 	}
 
-	/*
-	 * @see ISourceViewer#setRangeIndication(int, int, boolean)
-	 */
+	@Override
 	public void setRangeIndication(int start, int length, boolean moveCursor) {
 
 		if (moveCursor) {
@@ -1155,9 +1104,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		}
 	}
 
-	/*
-	 * @see ISourceViewer#getRangeIndication()
-	 */
+	@Override
 	public IRegion getRangeIndication() {
 		if (fRangeIndicator != null && fVisualAnnotationModel != null) {
 			Position position= fVisualAnnotationModel.getPosition(fRangeIndicator);
@@ -1168,17 +1115,13 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		return null;
 	}
 
-	/*
-	 * @see ISourceViewer#removeRangeIndication()
-	 */
+	@Override
 	public void removeRangeIndication() {
 		if (fRangeIndicator != null && fVisualAnnotationModel != null)
 			fVisualAnnotationModel.removeAnnotation(fRangeIndicator);
 	}
 
-	/*
-	 * @see ISourceViewer#showAnnotations(boolean)
-	 */
+	@Override
 	public void showAnnotations(boolean show) {
 		boolean old= fIsVerticalRulerVisible;
 
@@ -1249,10 +1192,7 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.ISourceViewerExtension#showAnnotationsOverview(boolean)
-	 * @since 2.1
-	 */
+	@Override
 	public void showAnnotationsOverview(boolean show) {
 		boolean old= fIsOverviewRulerVisible;
 		fIsOverviewRulerVisible= (show && fOverviewRuler != null);
@@ -1268,11 +1208,8 @@ public class SourceViewer extends TextViewer implements ISourceViewer, ISourceVi
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.ISourceViewerExtension3#getCurrentAnnotationHover()
-	 * @since 3.2
-	 */
-    public IAnnotationHover getCurrentAnnotationHover() {
+    @Override
+	public IAnnotationHover getCurrentAnnotationHover() {
     	if (fVerticalRulerHoveringController == null)
     		return null;
     	return fVerticalRulerHoveringController.getCurrentAnnotationHover();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewerConfiguration.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewerConfiguration.java
index 4e87f5ec3e6..54e96502d42 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewerConfiguration.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewerConfiguration.java
@@ -160,6 +160,7 @@ public class SourceViewerConfiguration {
 	 * @return the auto indent strategy or <code>null</code> if automatic indentation is not to be enabled
 	 * @deprecated since 3.1 use {@link #getAutoEditStrategies(ISourceViewer, String)} instead
 	 */
+	@Deprecated
 	public org.eclipse.jface.text.IAutoIndentStrategy getAutoIndentStrategy(ISourceViewer sourceViewer, String contentType) {
 		return new org.eclipse.jface.text.DefaultAutoIndentStrategy();
 	}
@@ -328,6 +329,7 @@ public class SourceViewerConfiguration {
 	 */
 	public IInformationControlCreator getInformationControlCreator(ISourceViewer sourceViewer) {
 		return new IInformationControlCreator() {
+			@Override
 			public IInformationControl createInformationControl(Shell parent) {
 				return new DefaultInformationControl(parent);
 			}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/TextInvocationContext.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/TextInvocationContext.java
index 11ba045cc81..87a9fa05d4d 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/TextInvocationContext.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/TextInvocationContext.java
@@ -33,23 +33,17 @@ public class TextInvocationContext implements IQuickAssistInvocationContext {
 		fLength= length;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext#getOffset()
-	 */
+	@Override
 	public int getOffset() {
 		return fOffset;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext#getLength()
-	 */
+	@Override
 	public int getLength() {
 		return fLength;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext#getSourceViewer()
-	 */
+	@Override
 	public ISourceViewer getSourceViewer() {
 		return fSourceViewer;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java
index 4efa04e9dab..005c8c21a90 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java
@@ -63,24 +63,18 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens
 	 */
 	class InternalListener implements IViewportListener, IAnnotationModelListener, ITextListener {
 
-		/*
-		 * @see IViewportListener#viewportChanged(int)
-		 */
+		@Override
 		public void viewportChanged(int verticalPosition) {
 			if (verticalPosition != fScrollPos)
 				redraw();
 		}
 
-		/*
-		 * @see IAnnotationModelListener#modelChanged(IAnnotationModel)
-		 */
+		@Override
 		public void modelChanged(IAnnotationModel model) {
 			update();
 		}
 
-		/*
-		 * @see ITextListener#textChanged(TextEvent)
-		 */
+		@Override
 		public void textChanged(TextEvent e) {
 			if (fTextViewer != null && e.getViewerRedrawState())
 				redraw();
@@ -138,16 +132,12 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens
 		fAnnotationAccess= annotationAcccess;
 	}
 
-	/*
-	 * @see IVerticalRuler#getControl()
-	 */
+	@Override
 	public Control getControl() {
 		return fCanvas;
 	}
 
-	/*
-	 * @see IVerticalRuler#createControl(Composite, ITextViewer)
-	 */
+	@Override
 	public Control createControl(Composite parent, ITextViewer textViewer) {
 
 		fTextViewer= textViewer;
@@ -155,6 +145,7 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens
 		fCanvas= new Canvas(parent, SWT.NO_BACKGROUND);
 
 		fCanvas.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent event) {
 				if (fTextViewer != null)
 					doubleBufferPaint(event.gc);
@@ -162,6 +153,7 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens
 		});
 
 		fCanvas.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				handleDispose();
 				fTextViewer= null;
@@ -169,13 +161,16 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens
 		});
 
 		fCanvas.addMouseListener(new MouseListener() {
+			@Override
 			public void mouseUp(MouseEvent event) {
 			}
 
+			@Override
 			public void mouseDown(MouseEvent event) {
 				fLastMouseButtonActivityLine= toDocumentLineNumber(event.y);
 			}
 
+			@Override
 			public void mouseDoubleClick(MouseEvent event) {
 				fLastMouseButtonActivityLine= toDocumentLineNumber(event.y);
 			}
@@ -451,14 +446,13 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens
 	 * Thread-safe implementation.
 	 * Can be called from any thread.
 	 */
-	/*
-	 * @see IVerticalRuler#update()
-	 */
+	@Override
 	public void update() {
 		if (fCanvas != null && !fCanvas.isDisposed()) {
 			Display d= fCanvas.getDisplay();
 			if (d != null) {
 				d.asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						redraw();
 					}
@@ -483,9 +477,7 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens
 		}
 	}
 
-	/*
-	 * @see IVerticalRuler#setModel(IAnnotationModel)
-	 */
+	@Override
 	public void setModel(IAnnotationModel model) {
 		if (model != fModel) {
 
@@ -501,23 +493,17 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens
 		}
 	}
 
-	/*
-	 * @see IVerticalRuler#getModel()
-	 */
+	@Override
 	public IAnnotationModel getModel() {
 		return fModel;
 	}
 
-	/*
-	 * @see IVerticalRulerInfo#getWidth()
-	 */
+	@Override
 	public int getWidth() {
 		return fWidth;
 	}
 
-	/*
-	 * @see IVerticalRulerInfo#getLineOfLastMouseButtonActivity()
-	 */
+	@Override
 	public int getLineOfLastMouseButtonActivity() {
 		IDocument doc= fTextViewer.getDocument();
 		if (doc == null || fLastMouseButtonActivityLine >= fTextViewer.getDocument().getNumberOfLines())
@@ -525,9 +511,7 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens
 		return fLastMouseButtonActivityLine;
 	}
 
-	/*
-	 * @see IVerticalRulerInfo#toDocumentLineNumber(int)
-	 */
+	@Override
 	public int toDocumentLineNumber(int y_coordinate) {
 		if (fTextViewer == null  || y_coordinate == -1)
 			return -1;
@@ -568,17 +552,11 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens
 		return widgetLine;
 	}
 
-	/*
-	 * @see IVerticalRulerExtension#setFont(Font)
-	 * @since 2.0
-	 */
+	@Override
 	public void setFont(Font font) {
 	}
 
-	/*
-	 * @see IVerticalRulerExtension#setLocationOfLastMouseButtonActivity(int, int)
-	 * @since 2.0
-	 */
+	@Override
 	public void setLocationOfLastMouseButtonActivity(int x, int y) {
 		fLastMouseButtonActivityLine= toDocumentLineNumber(y);
 	}
@@ -590,6 +568,7 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens
 	 * @deprecated will be removed
 	 * @since 2.0
 	 */
+	@Deprecated
 	public void addMouseListener(MouseListener listener) {
 		if (fCanvas != null && !fCanvas.isDisposed())
 			fCanvas.addMouseListener(listener);
@@ -602,6 +581,7 @@ public final class VerticalRuler implements IVerticalRuler, IVerticalRulerExtens
 	 * @deprecated will be removed
 	 * @since 2.0
 	 */
+	@Deprecated
 	public void removeMouseListener(MouseListener listener) {
 		if (fCanvas != null && !fCanvas.isDisposed())
 			fCanvas.removeMouseListener(listener);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/InclusivePositionUpdater.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/InclusivePositionUpdater.java
index ae720402dfc..56843437a89 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/InclusivePositionUpdater.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/InclusivePositionUpdater.java
@@ -35,9 +35,7 @@ class InclusivePositionUpdater implements IPositionUpdater {
 		fCategory= category;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPositionUpdater#update(org.eclipse.jface.text.DocumentEvent)
-	 */
+	@Override
 	public void update(DocumentEvent event) {
 
 		int eventOffset= event.getOffset();
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/PositionBasedCompletionProposal.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/PositionBasedCompletionProposal.java
index f969eae1cac..e4d3de3bf63 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/PositionBasedCompletionProposal.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/PositionBasedCompletionProposal.java
@@ -85,9 +85,7 @@ final class PositionBasedCompletionProposal implements ICompletionProposal, ICom
 		fAdditionalProposalInfo= additionalProposalInfo;
 	}
 
-	/*
-	 * @see ICompletionProposal#apply(IDocument)
-	 */
+	@Override
 	public void apply(IDocument document) {
 		try {
 			document.replace(fReplacementPosition.getOffset(), fReplacementPosition.getLength(), fReplacementString);
@@ -96,65 +94,47 @@ final class PositionBasedCompletionProposal implements ICompletionProposal, ICom
 		}
 	}
 
-	/*
-	 * @see ICompletionProposal#getSelection(IDocument)
-	 */
+	@Override
 	public Point getSelection(IDocument document) {
 		return new Point(fReplacementPosition.getOffset() + fCursorPosition, 0);
 	}
 
-	/*
-	 * @see ICompletionProposal#getContextInformation()
-	 */
+	@Override
 	public IContextInformation getContextInformation() {
 		return fContextInformation;
 	}
 
-	/*
-	 * @see ICompletionProposal#getImage()
-	 */
+	@Override
 	public Image getImage() {
 		return fImage;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString()
-	 */
+	@Override
 	public String getDisplayString() {
 		if (fDisplayString != null)
 			return fDisplayString;
 		return fReplacementString;
 	}
 
-	/*
-	 * @see ICompletionProposal#getAdditionalProposalInfo()
-	 */
+	@Override
 	public String getAdditionalProposalInfo() {
 		return fAdditionalProposalInfo;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#apply(org.eclipse.jface.text.ITextViewer, char, int, int)
-	 */
+	@Override
 	public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
 		apply(viewer.getDocument());
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#selected(org.eclipse.jface.text.ITextViewer, boolean)
-	 */
+	@Override
 	public void selected(ITextViewer viewer, boolean smartToggle) {
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#unselected(org.eclipse.jface.text.ITextViewer)
-	 */
+	@Override
 	public void unselected(ITextViewer viewer) {
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(org.eclipse.jface.text.IDocument, int, org.eclipse.jface.text.DocumentEvent)
-	 */
+	@Override
 	public boolean validate(IDocument document, int offset, DocumentEvent event) {
 		try {
 			String content= document.get(fReplacementPosition.getOffset(), offset - fReplacementPosition.getOffset());
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateCompletionProcessor.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateCompletionProcessor.java
index ed90bca39b7..f3d6e7ae19e 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateCompletionProcessor.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateCompletionProcessor.java
@@ -39,6 +39,7 @@ import org.eclipse.jface.text.contentassist.IContextInformationValidator;
 public abstract class TemplateCompletionProcessor implements IContentAssistProcessor {
 
 	private static final class ProposalComparator implements Comparator {
+		@Override
 		public int compare(Object o1, Object o2) {
 			return ((TemplateProposal) o2).getRelevance() - ((TemplateProposal) o1).getRelevance();
 		}
@@ -46,10 +47,7 @@ public abstract class TemplateCompletionProcessor implements IContentAssistProce
 
 	private static final Comparator fgProposalComparator= new ProposalComparator();
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer,
-	 *      int)
-	 */
+	@Override
 	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
 
 		ITextSelection selection= (ITextSelection) viewer.getSelectionProvider().getSelection();
@@ -101,6 +99,7 @@ public abstract class TemplateCompletionProcessor implements IContentAssistProce
 	 * @deprecated use the version specifying <code>IRegion</code> as third parameter
 	 * @since 3.1
 	 */
+	@Deprecated
 	protected ICompletionProposal createProposal(Template template, TemplateContext context, Region region, int relevance) {
 		return createProposal(template, context, (IRegion) region, relevance);
 	}
@@ -214,37 +213,27 @@ public abstract class TemplateCompletionProcessor implements IContentAssistProce
 	 */
 	protected abstract Image getImage(Template template);
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int)
-	 */
+	@Override
 	public IContextInformation[] computeContextInformation(ITextViewer viewer, int documentOffset) {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
-	 */
+	@Override
 	public char[] getCompletionProposalAutoActivationCharacters() {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
-	 */
+	@Override
 	public char[] getContextInformationAutoActivationCharacters() {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getErrorMessage()
-	 */
+	@Override
 	public String getErrorMessage() {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
-	 */
+	@Override
 	public IContextInformationValidator getContextInformationValidator() {
 		return null;
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java
index b4449a75a7d..3e10c2bef56 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java
@@ -132,6 +132,8 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa
 	 * @deprecated This method is no longer called by the framework and clients should overwrite
 	 *             {@link #apply(ITextViewer, char, int, int)} instead
 	 */
+	@Deprecated
+	@Override
 	public final void apply(IDocument document) {
 		// not called anymore
 	}
@@ -146,6 +148,7 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa
 	 * @param stateMask {@inheritDoc}
 	 * @param offset {@inheritDoc}
 	 */
+	@Override
 	public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
 
 		IDocument document= viewer.getDocument();
@@ -245,14 +248,14 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa
 
 			model.addLinkingListener(new ILinkedModeListener() {
 
-				/*
-				 * @see org.eclipse.jface.text.link.ILinkedModeListener#left(org.eclipse.jface.text.link.LinkedModeModel, int)
-				 */
+				@Override
 				public void left(LinkedModeModel environment, int flags) {
 					ensurePositionCategoryRemoved(document);
 				}
 
+				@Override
 				public void suspend(LinkedModeModel environment) {}
+				@Override
 				public void resume(LinkedModeModel environment, int flags) {}
 			});
 		}
@@ -323,16 +326,12 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa
 		return end;
 	}
 
-	/*
-	 * @see ICompletionProposal#getSelection(IDocument)
-	 */
+	@Override
 	public Point getSelection(IDocument document) {
 		return new Point(fSelectedRegion.getOffset(), fSelectedRegion.getLength());
 	}
 
-	/*
-	 * @see ICompletionProposal#getAdditionalProposalInfo()
-	 */
+	@Override
 	public String getAdditionalProposalInfo() {
 	    try {
 		    fContext.setReadOnly(true);
@@ -350,9 +349,7 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa
 		}
 	}
 
-	/*
-	 * @see ICompletionProposal#getDisplayString()
-	 */
+	@Override
 	public String getDisplayString() {
 		if (fDisplayString == null) {
 			String[] arguments= new String[] { fTemplate.getName(), fTemplate.getDescription() };
@@ -361,16 +358,12 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa
 		return fDisplayString;
 	}
 
-	/*
-	 * @see ICompletionProposal#getImage()
-	 */
+	@Override
 	public Image getImage() {
 		return fImage;
 	}
 
-	/*
-	 * @see ICompletionProposal#getContextInformation()
-	 */
+	@Override
 	public IContextInformation getContextInformation() {
 		return null;
 	}
@@ -388,28 +381,20 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa
 		return fRelevance;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getInformationControlCreator()
-	 */
+	@Override
 	public IInformationControlCreator getInformationControlCreator() {
 		return fInformationControlCreator;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#selected(org.eclipse.jface.text.ITextViewer, boolean)
-	 */
+	@Override
 	public void selected(ITextViewer viewer, boolean smartToggle) {
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#unselected(org.eclipse.jface.text.ITextViewer)
-	 */
+	@Override
 	public void unselected(ITextViewer viewer) {
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(org.eclipse.jface.text.IDocument, int, org.eclipse.jface.text.DocumentEvent)
-	 */
+	@Override
 	public boolean validate(IDocument document, int offset, DocumentEvent event) {
 		try {
 			int replaceOffset= getReplaceOffset();
@@ -423,16 +408,12 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getPrefixCompletionText(org.eclipse.jface.text.IDocument, int)
-	 */
+	@Override
 	public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) {
 		return fTemplate.getName();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension3#getPrefixCompletionStart(org.eclipse.jface.text.IDocument, int)
-	 */
+	@Override
 	public int getPrefixCompletionStart(IDocument document, int completionOffset) {
 		return getReplaceOffset();
 	}
@@ -443,29 +424,25 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa
 	 * @deprecated This method is no longer called by the framework and clients should overwrite
 	 *             {@link #apply(ITextViewer, char, int, int)} instead
 	 */
+	@Deprecated
+	@Override
 	public void apply(IDocument document, char trigger, int offset) {
 		// not called any longer
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#isValidFor(org.eclipse.jface.text.IDocument, int)
-	 */
+	@Override
 	public boolean isValidFor(IDocument document, int offset) {
 		// not called any longer
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getTriggerCharacters()
-	 */
+	@Override
 	public char[] getTriggerCharacters() {
 		// no triggers
 		return new char[0];
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension#getContextInformationPosition()
-	 */
+	@Override
 	public int getContextInformationPosition() {
 		return fRegion.getOffset();
 	}
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateStore.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateStore.java
index c4fb28d3c47..edbdbcab920 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateStore.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/persistence/TemplateStore.java
@@ -120,6 +120,7 @@ public class TemplateStore {
 	public final void startListeningForPreferenceChanges() {
 		if (fPropertyListener == null) {
 			fPropertyListener= new IPropertyChangeListener() {
+				@Override
 				public void propertyChange(PropertyChangeEvent event) {
 					/*
 					 * Don't load if we are in the process of saving ourselves. We are in sync anyway after the