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

26 files changed, 90 insertions, 183 deletions

diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaActionContributor.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaActionContributor.java
index 45854859bc4..f2a8768f59b 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaActionContributor.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaActionContributor.java
@@ -48,9 +48,7 @@ public class JavaActionContributor extends TextEditorActionContributor {
 		fTogglePresentation= new PresentationAction();
 	}
 
-	/*
-	 * @see IEditorActionBarContributor#init(IActionBars)
-	 */
+	@Override
 	public void init(IActionBars bars) {
 		super.init(bars);
 
@@ -83,17 +81,13 @@ public class JavaActionContributor extends TextEditorActionContributor {
 		fTogglePresentation.update();
 	}
 
-	/*
-	 * @see IEditorActionBarContributor#setActiveEditor(IEditorPart)
-	 */
+	@Override
 	public void setActiveEditor(IEditorPart part) {
 		super.setActiveEditor(part);
 		doSetActiveEditor(part);
 	}
 
-	/*
-	 * @see IEditorActionBarContributor#dispose()
-	 */
+	@Override
 	public void dispose() {
 		doSetActiveEditor(null);
 		super.dispose();
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaAnnotationHover.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaAnnotationHover.java
index 91728124442..d812b11381e 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaAnnotationHover.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaAnnotationHover.java
@@ -24,9 +24,7 @@ import org.eclipse.jface.text.source.ISourceViewer;
 
 public class JavaAnnotationHover implements IAnnotationHover {
 
-	/* (non-Javadoc)
-	 * Method declared on IAnnotationHover
-	 */
+	@Override
 	public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
 		IDocument document= sourceViewer.getDocument();
 
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaContentOutlinePage.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaContentOutlinePage.java
index 48c9c4b142e..78ec2f00c4c 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaContentOutlinePage.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaContentOutlinePage.java
@@ -56,6 +56,7 @@ public class JavaContentOutlinePage extends ContentOutlinePage {
 			this.position= position;
 		}
 
+		@Override
 		public String toString() {
 			return name;
 		}
@@ -96,9 +97,7 @@ public class JavaContentOutlinePage extends ContentOutlinePage {
 			}
 		}
 
-		/*
-		 * @see IContentProvider#inputChanged(Viewer, Object, Object)
-		 */
+		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 			if (oldInput != null) {
 				IDocument document= fDocumentProvider.getDocument(oldInput);
@@ -127,6 +126,7 @@ public class JavaContentOutlinePage extends ContentOutlinePage {
 		/*
 		 * @see IContentProvider#dispose
 		 */
+		@Override
 		public void dispose() {
 			if (fContent != null) {
 				fContent.clear();
@@ -134,32 +134,24 @@ public class JavaContentOutlinePage extends ContentOutlinePage {
 			}
 		}
 
-		/*
-		 * @see IStructuredContentProvider#getElements(Object)
-		 */
+		@Override
 		public Object[] getElements(Object element) {
 			return fContent.toArray();
 		}
 
-		/*
-		 * @see ITreeContentProvider#hasChildren(Object)
-		 */
+		@Override
 		public boolean hasChildren(Object element) {
 			return element == fInput;
 		}
 
-		/*
-		 * @see ITreeContentProvider#getParent(Object)
-		 */
+		@Override
 		public Object getParent(Object element) {
 			if (element instanceof Segment)
 				return fInput;
 			return null;
 		}
 
-		/*
-		 * @see ITreeContentProvider#getChildren(Object)
-		 */
+		@Override
 		public Object[] getChildren(Object element) {
 			if (element == fInput)
 				return fContent.toArray();
@@ -183,9 +175,7 @@ public class JavaContentOutlinePage extends ContentOutlinePage {
 		fTextEditor= editor;
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on ContentOutlinePage
-	 */
+	@Override
 	public void createControl(Composite parent) {
 
 		super.createControl(parent);
@@ -199,9 +189,7 @@ public class JavaContentOutlinePage extends ContentOutlinePage {
 			viewer.setInput(fInput);
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on ContentOutlinePage
-	 */
+	@Override
 	public void selectionChanged(SelectionChangedEvent event) {
 
 		super.selectionChanged(event);
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaDocumentSetupParticipant.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaDocumentSetupParticipant.java
index c315bc1c2d9..41ae1b1b19a 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaDocumentSetupParticipant.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaDocumentSetupParticipant.java
@@ -27,9 +27,7 @@ public class JavaDocumentSetupParticipant implements IDocumentSetupParticipant {
 	public JavaDocumentSetupParticipant() {
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IDocumentSetupParticipant#setup(org.eclipse.jface.text.IDocument)
-	 */
+	@Override
 	public void setup(IDocument document) {
 		if (document instanceof IDocumentExtension3) {
 			IDocumentExtension3 extension3= (IDocumentExtension3) document;
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java
index c5106b79ed3..3ee57028498 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaEditor.java
@@ -61,9 +61,7 @@ public class JavaEditor extends TextEditor {
 			return (IAnnotationModel) editor.getAdapter(ProjectionAnnotationModel.class);
 		}
 
-		/*
-		 * @see org.eclipse.jface.action.Action#run()
-		 */
+		@Override
 		public void run() {
 			ITextEditor editor= getTextEditor();
 			ISelection selection= editor.getSelectionProvider().getSelection();
@@ -107,6 +105,7 @@ public class JavaEditor extends TextEditor {
 	 * <code>AbstractTextEditor</code> method extend the
 	 * actions to add those specific to the receiver
 	 */
+	@Override
 	protected void createActions() {
 		super.createActions();
 
@@ -118,6 +117,7 @@ public class JavaEditor extends TextEditor {
 	 * <code>AbstractTextEditor</code> method performs any extra
 	 * disposal actions required by the java editor.
 	 */
+	@Override
 	public void dispose() {
 		if (fOutlinePage != null)
 			fOutlinePage.setInput(null);
@@ -128,6 +128,7 @@ public class JavaEditor extends TextEditor {
 	 * <code>AbstractTextEditor</code> method performs any extra
 	 * revert behavior required by the java editor.
 	 */
+	@Override
 	public void doRevertToSaved() {
 		super.doRevertToSaved();
 		if (fOutlinePage != null)
@@ -140,6 +141,7 @@ public class JavaEditor extends TextEditor {
 	 *
 	 * @param monitor the progress monitor
 	 */
+	@Override
 	public void doSave(IProgressMonitor monitor) {
 		super.doSave(monitor);
 		if (fOutlinePage != null)
@@ -150,6 +152,7 @@ public class JavaEditor extends TextEditor {
 	 * <code>AbstractTextEditor</code> method performs any extra
 	 * save as behavior required by the java editor.
 	 */
+	@Override
 	public void doSaveAs() {
 		super.doSaveAs();
 		if (fOutlinePage != null)
@@ -163,15 +166,14 @@ public class JavaEditor extends TextEditor {
 	 * @param input the editor input
 	 * @throws CoreException in case the input can not be set
 	 */
+	@Override
 	public void doSetInput(IEditorInput input) throws CoreException {
 		super.doSetInput(input);
 		if (fOutlinePage != null)
 			fOutlinePage.setInput(input);
 	}
 
-	/*
-	 * @see org.eclipse.ui.texteditor.ExtendedTextEditor#editorContextMenuAboutToShow(org.eclipse.jface.action.IMenuManager)
-	 */
+	@Override
 	protected void editorContextMenuAboutToShow(IMenuManager menu) {
 		super.editorContextMenuAboutToShow(menu);
 		addAction(menu, "ContentAssistProposal"); //$NON-NLS-1$
@@ -187,6 +189,7 @@ public class JavaEditor extends TextEditor {
 	 * @param required the required type
 	 * @return an adapter for the required type or <code>null</code>
 	 */
+	@Override
 	public Object getAdapter(Class required) {
 		if (IContentOutlinePage.class.equals(required)) {
 			if (fOutlinePage == null) {
@@ -206,17 +209,13 @@ public class JavaEditor extends TextEditor {
 		return super.getAdapter(required);
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on AbstractTextEditor
-	 */
+	@Override
 	protected void initializeEditor() {
 		super.initializeEditor();
 		setSourceViewerConfiguration(new JavaSourceViewerConfiguration());
 	}
 
-	/*
-	 * @see org.eclipse.ui.texteditor.ExtendedTextEditor#createSourceViewer(org.eclipse.swt.widgets.Composite, org.eclipse.jface.text.source.IVerticalRuler, int)
-	 */
+	@Override
 	protected ISourceViewer createSourceViewer(Composite parent, IVerticalRuler ruler, int styles) {
 
 		fAnnotationAccess= createAnnotationAccess();
@@ -229,9 +228,7 @@ public class JavaEditor extends TextEditor {
 		return viewer;
 	}
 
-	/*
-	 * @see org.eclipse.ui.texteditor.ExtendedTextEditor#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
+	@Override
 	public void createPartControl(Composite parent) {
 		super.createPartControl(parent);
 		ProjectionViewer viewer= (ProjectionViewer) getSourceViewer();
@@ -242,9 +239,7 @@ public class JavaEditor extends TextEditor {
 		viewer.doOperation(ProjectionViewer.TOGGLE);
 	}
 
-	/*
-	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#adjustHighlightRange(int, int)
-	 */
+	@Override
 	protected void adjustHighlightRange(int offset, int length) {
 		ISourceViewer viewer= getSourceViewer();
 		if (viewer instanceof ITextViewerExtension5) {
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaPartitionScanner.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaPartitionScanner.java
index bf62b5a76a9..66c0fc143e8 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaPartitionScanner.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaPartitionScanner.java
@@ -39,16 +39,12 @@ public class JavaPartitionScanner extends RuleBasedPartitionScanner {
 	 */
 	static class EmptyCommentDetector implements IWordDetector {
 
-		/* (non-Javadoc)
-		* Method declared on IWordDetector
-	 	*/
+		@Override
 		public boolean isWordStart(char c) {
 			return (c == '/');
 		}
 
-		/* (non-Javadoc)
-		* Method declared on IWordDetector
-	 	*/
+		@Override
 		public boolean isWordPart(char c) {
 			return (c == '*' || c == '/');
 		}
@@ -67,16 +63,12 @@ public class JavaPartitionScanner extends RuleBasedPartitionScanner {
 			addWord("/**/", fSuccessToken); //$NON-NLS-1$
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.rules.IPredicateRule#evaluate(ICharacterScanner, boolean)
-		 */
+		@Override
 		public IToken evaluate(ICharacterScanner scanner, boolean resume) {
 			return super.evaluate(scanner);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.rules.IPredicateRule#getSuccessToken()
-		 */
+		@Override
 		public IToken getSuccessToken() {
 			return fSuccessToken;
 		}
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaSourceViewerConfiguration.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaSourceViewerConfiguration.java
index 65c59103f87..a040e7d40b2 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaSourceViewerConfiguration.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaSourceViewerConfiguration.java
@@ -58,38 +58,28 @@ public class JavaSourceViewerConfiguration extends SourceViewerConfiguration {
 	public JavaSourceViewerConfiguration() {
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on SourceViewerConfiguration
-	 */
+	@Override
 	public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
 		return new JavaAnnotationHover();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getAutoEditStrategies(org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
-	 */
+	@Override
 	public IAutoEditStrategy[] getAutoEditStrategies(ISourceViewer sourceViewer, String contentType) {
 		IAutoEditStrategy strategy= (IDocument.DEFAULT_CONTENT_TYPE.equals(contentType) ? new JavaAutoIndentStrategy() : new DefaultIndentLineAutoEditStrategy());
 		return new IAutoEditStrategy[] { strategy };
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getConfiguredDocumentPartitioning(org.eclipse.jface.text.source.ISourceViewer)
-	 */
+	@Override
 	public String getConfiguredDocumentPartitioning(ISourceViewer sourceViewer) {
 		return JavaEditorExamplePlugin.JAVA_PARTITIONING;
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on SourceViewerConfiguration
-	 */
+	@Override
 	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
 		return new String[] { IDocument.DEFAULT_CONTENT_TYPE, JavaPartitionScanner.JAVA_DOC, JavaPartitionScanner.JAVA_MULTILINE_COMMENT };
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on SourceViewerConfiguration
-	 */
+	@Override
 	public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
 
 		ContentAssistant assistant= new ContentAssistant();
@@ -106,23 +96,17 @@ public class JavaSourceViewerConfiguration extends SourceViewerConfiguration {
 		return assistant;
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on SourceViewerConfiguration
-	 */
+	@Override
 	public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) {
 		return new JavaDoubleClickSelector();
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on SourceViewerConfiguration
-	 */
+	@Override
 	public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) {
 		return new String[] { "\t", "    " }; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on SourceViewerConfiguration
-	 */
+	@Override
 	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
 
 		JavaColorProvider provider= JavaEditorExamplePlugin.getDefault().getJavaColorProvider();
@@ -144,16 +128,12 @@ public class JavaSourceViewerConfiguration extends SourceViewerConfiguration {
 		return reconciler;
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on SourceViewerConfiguration
-	 */
+	@Override
 	public int getTabWidth(ISourceViewer sourceViewer) {
 		return 4;
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on SourceViewerConfiguration
-	 */
+	@Override
 	public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
 		return new JavaTextHover();
 	}
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaTextHover.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaTextHover.java
index 2af16fabfad..2c182798075 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaTextHover.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/JavaTextHover.java
@@ -31,6 +31,8 @@ public class JavaTextHover implements ITextHover {
 	 * @deprecated As of 3.4, replaced by
 	 *             {@link ITextHoverExtension2#getHoverInfo2(ITextViewer, IRegion)}
 	 */
+	@Deprecated
+	@Override
 	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
 		if (hoverRegion != null) {
 			try {
@@ -42,9 +44,7 @@ public class JavaTextHover implements ITextHover {
 		return JavaEditorMessages.getString("JavaTextHover.emptySelection"); //$NON-NLS-1$
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on ITextHover
-	 */
+	@Override
 	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
 		Point selection= textViewer.getSelectedRange();
 		if (selection.x <= offset && offset < selection.x + selection.y)
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/PresentationAction.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/PresentationAction.java
index 92f38f60a06..f2d551ecb41 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/PresentationAction.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/PresentationAction.java
@@ -29,9 +29,7 @@ public class PresentationAction extends TextEditorAction {
 		update();
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on IAction
-	 */
+	@Override
 	public void run() {
 
 		ITextEditor editor= getTextEditor();
@@ -42,9 +40,7 @@ public class PresentationAction extends TextEditorAction {
 		editor.showHighlightRangeOnly(!show);
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on TextEditorAction
-	 */
+	@Override
 	public void update() {
 		setChecked(getTextEditor() != null && getTextEditor().showsHighlightRangeOnly());
 		setEnabled(true);
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaAutoIndentStrategy.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaAutoIndentStrategy.java
index 5f7b3926615..b078d06b2af 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaAutoIndentStrategy.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaAutoIndentStrategy.java
@@ -25,9 +25,7 @@ public class JavaAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy {
 	public JavaAutoIndentStrategy() {
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on IAutoIndentStrategy
-	 */
+	@Override
 	public void customizeDocumentCommand(IDocument d, DocumentCommand c) {
 		if (c.length == 0 && c.text != null && endsWithDelimiter(d, c.text))
 			smartIndentAfterNewLine(d, c);
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaCompletionProcessor.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaCompletionProcessor.java
index fea12638c2c..5a45d1cc6a1 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaCompletionProcessor.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaCompletionProcessor.java
@@ -36,23 +36,17 @@ public class JavaCompletionProcessor implements IContentAssistProcessor {
 
 		protected int fInstallOffset;
 
-		/*
-		 * @see IContextInformationValidator#isContextInformationValid(int)
-		 */
+		@Override
 		public boolean isContextInformationValid(int offset) {
 			return Math.abs(fInstallOffset - offset) < 5;
 		}
 
-		/*
-		 * @see IContextInformationValidator#install(IContextInformation, ITextViewer, int)
-		 */
+		@Override
 		public void install(IContextInformation info, ITextViewer viewer, int offset) {
 			fInstallOffset= offset;
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.contentassist.IContextInformationPresenter#updatePresentation(int, TextPresentation)
-		 */
+		@Override
 		public boolean updatePresentation(int documentPosition, TextPresentation presentation) {
 			return false;
 		}
@@ -63,9 +57,7 @@ public class JavaCompletionProcessor implements IContentAssistProcessor {
 
 	protected IContextInformationValidator fValidator= new Validator();
 
-	/* (non-Javadoc)
-	 * Method declared on IContentAssistProcessor
-	 */
+	@Override
 	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) {
 		ICompletionProposal[] result= new ICompletionProposal[fgProposals.length];
 		for (int i= 0; i < fgProposals.length; i++) {
@@ -75,9 +67,7 @@ public class JavaCompletionProcessor implements IContentAssistProcessor {
 		return result;
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on IContentAssistProcessor
-	 */
+	@Override
 	public IContextInformation[] computeContextInformation(ITextViewer viewer, int documentOffset) {
 		IContextInformation[] result= new IContextInformation[5];
 		for (int i= 0; i < result.length; i++)
@@ -87,30 +77,22 @@ public class JavaCompletionProcessor implements IContentAssistProcessor {
 		return result;
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on IContentAssistProcessor
-	 */
+	@Override
 	public char[] getCompletionProposalAutoActivationCharacters() {
 		return new char[] { '.', '(' };
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on IContentAssistProcessor
-	 */
+	@Override
 	public char[] getContextInformationAutoActivationCharacters() {
 		return new char[] { '#' };
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on IContentAssistProcessor
-	 */
+	@Override
 	public IContextInformationValidator getContextInformationValidator() {
 		return fValidator;
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on IContentAssistProcessor
-	 */
+	@Override
 	public String getErrorMessage() {
 		return null;
 	}
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaDoubleClickSelector.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaDoubleClickSelector.java
index bbd59f8de37..377024bfe2a 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaDoubleClickSelector.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/java/JavaDoubleClickSelector.java
@@ -35,9 +35,7 @@ public class JavaDoubleClickSelector implements ITextDoubleClickStrategy {
 		super();
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on ITextDoubleClickStrategy
-	 */
+	@Override
 	public void doubleClicked(ITextViewer text) {
 
 		fPos= text.getSelectedRange().x;
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocCompletionProcessor.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocCompletionProcessor.java
index c8b5bc7e23d..be2081d4e14 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocCompletionProcessor.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocCompletionProcessor.java
@@ -25,9 +25,7 @@ public class JavaDocCompletionProcessor implements IContentAssistProcessor {
 
 	protected final static String[] fgProposals= { "@author", "@deprecated", "@exception", "@param", "@return", "@see", "@serial", "@serialData", "@serialField", "@since", "@throws", "@version" }; //$NON-NLS-12$ //$NON-NLS-11$ //$NON-NLS-10$ //$NON-NLS-7$ //$NON-NLS-9$ //$NON-NLS-8$ //$NON-NLS-6$ //$NON-NLS-5$ //$NON-NLS-4$ //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
 
-	/* (non-Javadoc)
-	 * Method declared on IContentAssistProcessor
-	 */
+	@Override
 	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) {
 		ICompletionProposal[] result= new ICompletionProposal[fgProposals.length];
 		for (int i= 0; i < fgProposals.length; i++)
@@ -35,37 +33,27 @@ public class JavaDocCompletionProcessor implements IContentAssistProcessor {
 		return result;
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on IContentAssistProcessor
-	 */
+	@Override
 	public IContextInformation[] computeContextInformation(ITextViewer viewer, int documentOffset) {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on IContentAssistProcessor
-	 */
+	@Override
 	public char[] getCompletionProposalAutoActivationCharacters() {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on IContentAssistProcessor
-	 */
+	@Override
 	public char[] getContextInformationAutoActivationCharacters() {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on IContentAssistProcessor
-	 */
+	@Override
 	public IContextInformationValidator getContextInformationValidator() {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on IContentAssistProcessor
-	 */
+	@Override
 	public String getErrorMessage() {
 		return null;
 	}
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocScanner.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocScanner.java
index fe479545459..85e6af4b351 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocScanner.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/javadoc/JavaDocScanner.java
@@ -37,16 +37,12 @@ public class JavaDocScanner extends RuleBasedScanner {
 	 */
 	static class JavaDocWordDetector implements IWordDetector {
 
-	/* (non-Javadoc)
-	 * Method declared on IWordDetector
-	 */
+		@Override
 		public boolean isWordStart(char c) {
 			return (c == '@');
 		}
 
-		/* (non-Javadoc)
-	 	* Method declared on IWordDetector
-	 	*/
+		@Override
 		public boolean isWordPart(char c) {
 			return Character.isLetter(c);
 		}
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWhitespaceDetector.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWhitespaceDetector.java
index fa41e7979c6..a3aac716251 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWhitespaceDetector.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWhitespaceDetector.java
@@ -18,9 +18,7 @@ import org.eclipse.jface.text.rules.IWhitespaceDetector;
  */
 public class JavaWhitespaceDetector implements IWhitespaceDetector {
 
-	/* (non-Javadoc)
-	 * Method declared on IWhitespaceDetector
-	 */
+	@Override
 	public boolean isWhitespace(char character) {
 		return Character.isWhitespace(character);
 	}
diff --git a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWordDetector.java b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWordDetector.java
index 8357964a808..4edf67baf13 100644
--- a/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWordDetector.java
+++ b/org.eclipse.ui.examples.javaeditor/Eclipse Java Editor Example/org/eclipse/ui/examples/javaeditor/util/JavaWordDetector.java
@@ -18,16 +18,12 @@ import org.eclipse.jface.text.rules.IWordDetector;
  */
 public class JavaWordDetector implements IWordDetector {
 
-	/* (non-Javadoc)
-	 * Method declared on IWordDetector.
-	 */
+	@Override
 	public boolean isWordPart(char character) {
 		return Character.isJavaIdentifierPart(character);
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on IWordDetector.
-	 */
+	@Override
 	public boolean isWordStart(char character) {
 		return Character.isJavaIdentifierStart(character);
 	}
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/NonRuleBasedDamagerRepairer.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/NonRuleBasedDamagerRepairer.java
index 8e747b3c001..61d5f60695a 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/NonRuleBasedDamagerRepairer.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/NonRuleBasedDamagerRepairer.java
@@ -42,9 +42,7 @@ public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPrese
 		fDefaultTextAttribute= defaultTextAttribute;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.presentation.IPresentationRepairer#setDocument(org.eclipse.jface.text.IDocument)
-	 */
+	@Override
 	public void setDocument(IDocument document) {
 		fDocument= document;
 	}
@@ -73,9 +71,7 @@ public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPrese
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.presentation.IPresentationDamager#getDamageRegion(org.eclipse.jface.text.ITypedRegion, org.eclipse.jface.text.DocumentEvent, boolean)
-	 */
+	@Override
 	public IRegion getDamageRegion(ITypedRegion partition, DocumentEvent event, boolean documentPartitioningChanged) {
 		if (!documentPartitioningChanged) {
 			try {
@@ -100,9 +96,7 @@ public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPrese
 		return partition;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.presentation.IPresentationRepairer#createPresentation(org.eclipse.jface.text.TextPresentation, org.eclipse.jface.text.ITypedRegion)
-	 */
+	@Override
 	public void createPresentation(TextPresentation presentation, ITypedRegion region) {
 		addRange(presentation, region.getOffset(), region.getLength(), fDefaultTextAttribute);
 	}
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TagRule.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TagRule.java
index c99705e002a..7df6475a8f2 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TagRule.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TagRule.java
@@ -19,6 +19,7 @@ public class TagRule extends MultiLineRule {
 	public TagRule(IToken token) {
 		super("<", ">", token);  //$NON-NLS-1$//$NON-NLS-2$
 	}
+	@Override
 	protected boolean sequenceDetected(
 		ICharacterScanner scanner,
 		char[] sequence,
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditor.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditor.java
index 48ea1bf77cc..353b647a807 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditor.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/TemplateEditor.java
@@ -32,11 +32,13 @@ public class TemplateEditor extends AbstractDecoratedTextEditor {
 		setDocumentProvider(new XMLDocumentProvider());
 	}
 
+	@Override
 	public void dispose() {
 		colorManager.dispose();
 		super.dispose();
 	}
 
+	@Override
 	protected void createActions() {
 		super.createActions();
 
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLConfiguration.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLConfiguration.java
index e22cc73979a..c75f5bc5eb3 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLConfiguration.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLConfiguration.java
@@ -37,11 +37,13 @@ public class XMLConfiguration extends TextSourceViewerConfiguration {
 		this.colorManager= colorManager;
 	}
 
+	@Override
 	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
 		return new String[]{IDocument.DEFAULT_CONTENT_TYPE, XMLPartitionScanner.XML_COMMENT,
 				XMLPartitionScanner.XML_TAG};
 	}
 
+	@Override
 	public ITextDoubleClickStrategy getDoubleClickStrategy(ISourceViewer sourceViewer, String contentType) {
 		if (doubleClickStrategy == null)
 			doubleClickStrategy= new XMLDoubleClickStrategy();
@@ -66,6 +68,7 @@ public class XMLConfiguration extends TextSourceViewerConfiguration {
 		return tagScanner;
 	}
 
+	@Override
 	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
 		PresentationReconciler reconciler= new PresentationReconciler();
 
@@ -85,6 +88,7 @@ public class XMLConfiguration extends TextSourceViewerConfiguration {
 		return reconciler;
 	}
 
+	@Override
 	public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
 		ContentAssistant assistant= new ContentAssistant();
 		assistant.setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer));
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDocumentProvider.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDocumentProvider.java
index ac1068f373e..b6a1f60b36f 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDocumentProvider.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDocumentProvider.java
@@ -20,6 +20,7 @@ import org.eclipse.ui.editors.text.FileDocumentProvider;
 
 public class XMLDocumentProvider extends FileDocumentProvider {
 
+	@Override
 	protected IDocument createDocument(Object element) throws CoreException {
 		IDocument document = super.createDocument(element);
 		if (document != null) {
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDoubleClickStrategy.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDoubleClickStrategy.java
index 66f623d3d87..4d44971be0b 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDoubleClickStrategy.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLDoubleClickStrategy.java
@@ -18,6 +18,7 @@ import org.eclipse.jface.text.ITextViewer;
 public class XMLDoubleClickStrategy implements ITextDoubleClickStrategy {
 	protected ITextViewer fText;
 
+	@Override
 	public void doubleClicked(ITextViewer part) {
 		int pos = part.getSelectedRange().x;
 
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLWhitespaceDetector.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLWhitespaceDetector.java
index aa9483db6d7..83cc855fa93 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLWhitespaceDetector.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/editors/XMLWhitespaceDetector.java
@@ -14,6 +14,7 @@ import org.eclipse.jface.text.rules.IWhitespaceDetector;
 
 public class XMLWhitespaceDetector implements IWhitespaceDetector {
 
+	@Override
 	public boolean isWhitespace(char c) {
 		return (c == ' ' || c == '\t' || c == '\n' || c == '\r');
 	}
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/preferences/TemplatesPreferencePage.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/preferences/TemplatesPreferencePage.java
index 6bb6260035b..aaeb852e97a 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/preferences/TemplatesPreferencePage.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/preferences/TemplatesPreferencePage.java
@@ -26,11 +26,13 @@ public class TemplatesPreferencePage extends TemplatePreferencePage {
 		setContextTypeRegistry(TemplateEditorUI.getDefault().getContextTypeRegistry());
 	}
 
+	@Override
 	protected boolean isShowFormatterSetting() {
 		return false;
 	}
 
 
+	@Override
 	public boolean performOk() {
 		boolean ok= super.performOk();
 
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/AntVariableResolver.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/AntVariableResolver.java
index 401feea921e..f94551325e7 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/AntVariableResolver.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/AntVariableResolver.java
@@ -21,14 +21,13 @@ import org.eclipse.jface.text.templates.TemplateVariableResolver;
  * their prefix-likeness with the variable type.
  */
 public class AntVariableResolver extends TemplateVariableResolver {
-	/*
-	 * @see org.eclipse.jface.text.templates.TemplateVariableResolver#resolveAll(org.eclipse.jface.text.templates.TemplateContext)
-	 */
+	@Override
 	protected String[] resolveAll(TemplateContext context) {
 		String[] proposals= new String[] { "${srcDir}", "${dstDir}" }; //$NON-NLS-1$ //$NON-NLS-2$
 
 		Arrays.sort(proposals, new Comparator() {
 
+			@Override
 			public int compare(Object o1, Object o2) {
 				return getCommonPrefixLength(getType(), (String) o2) - getCommonPrefixLength(getType(), (String) o1);
 			}
diff --git a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java
index 6998a026343..481870b9a67 100644
--- a/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java
+++ b/org.eclipse.ui.examples.javaeditor/Template Editor Example/org/eclipse/ui/examples/templateeditor/template/XMLCompletionProcessor.java
@@ -40,6 +40,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor {
 	 * @param offset the offset left of which the prefix is detected
 	 * @return the detected prefix
 	 */
+	@Override
 	protected String extractPrefix(ITextViewer viewer, int offset) {
 		IDocument document= viewer.getDocument();
 		int i= offset;
@@ -67,6 +68,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor {
 	 * @param prefix the prefix
 	 * @return the relevance of the <code>template</code> for the given <code>prefix</code>
 	 */
+	@Override
 	protected int getRelevance(Template template, String prefix) {
 		if (prefix.startsWith("<")) //$NON-NLS-1$
 			prefix= prefix.substring(1);
@@ -81,6 +83,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor {
 	 * @param contextTypeId the context type, ignored in this implementation
 	 * @return all templates
 	 */
+	@Override
 	protected Template[] getTemplates(String contextTypeId) {
 		return TemplateEditorUI.getDefault().getTemplateStore().getTemplates();
 	}
@@ -92,6 +95,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor {
 	 * @param region the region, ignored in this implementation
 	 * @return the supported XML context type
 	 */
+	@Override
 	protected TemplateContextType getContextType(ITextViewer viewer, IRegion region) {
 		return TemplateEditorUI.getDefault().getContextTypeRegistry().getContextType(XMLContextType.XML_CONTEXT_TYPE);
 	}
@@ -102,6 +106,7 @@ public class XMLCompletionProcessor extends TemplateCompletionProcessor {
 	 * @param template the template, ignored in this implementation
 	 * @return the default template image
 	 */
+	@Override
 	protected Image getImage(Template template) {
 		ImageRegistry registry= TemplateEditorUI.getDefault().getImageRegistry();
 		Image image= registry.get(DEFAULT_IMAGE);