Bug 483778 - Update Eclipse editor template with @Override

Change-Id: I1cd82192b84449056da3d9e2d77b0da683fa2616
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

8 files changed, 26 insertions, 40 deletions

diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/$editorClass$.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/$editorClass$.java
index d248dae9b1..3f72b327d2 100644
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/$editorClass$.java
+++ b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/$editorClass$.java
@@ -12,6 +12,7 @@ public class $editorClass$ extends TextEditor {
 		setSourceViewerConfiguration(new XMLConfiguration(colorManager));
 		setDocumentProvider(new XMLDocumentProvider());
 	}
+	@Override
 	public void dispose() {
 		colorManager.dispose();
 		super.dispose();
diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/NonRuleBasedDamagerRepairer.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/NonRuleBasedDamagerRepairer.java
index cc7b9e420d..6022512e95 100644
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/NonRuleBasedDamagerRepairer.java
+++ b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/NonRuleBasedDamagerRepairer.java
@@ -13,26 +13,20 @@ import org.eclipse.jface.text.presentation.IPresentationRepairer;
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.swt.custom.StyleRange;
 
-public class NonRuleBasedDamagerRepairer
-	implements IPresentationDamager, IPresentationRepairer {
+public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPresentationRepairer {
 
 	/** The document this object works on */
 	protected IDocument fDocument;
 	/** The default text attribute if non is returned as data by the current token */
 	protected TextAttribute fDefaultTextAttribute;
-	
-	/**
-	 * Constructor for NonRuleBasedDamagerRepairer.
-	 */
+
 	public NonRuleBasedDamagerRepairer(TextAttribute defaultTextAttribute) {
 		Assert.isNotNull(defaultTextAttribute);
 
 		fDefaultTextAttribute = defaultTextAttribute;
 	}
-
-	/**
-	 * @see IPresentationRepairer#setDocument(IDocument)
-	 */
+	
+	@Override
 	public void setDocument(IDocument document) {
 		fDocument = document;
 	}
@@ -60,9 +54,7 @@ public class NonRuleBasedDamagerRepairer
 		}
 	}
 
-	/**
-	 * @see IPresentationDamager#getDamageRegion(ITypedRegion, DocumentEvent, boolean)
-	 */
+	@Override
 	public IRegion getDamageRegion(
 		ITypedRegion partition,
 		DocumentEvent event,
@@ -70,8 +62,7 @@ public class NonRuleBasedDamagerRepairer
 		if (!documentPartitioningChanged) {
 			try {
 
-				IRegion info =
-					fDocument.getLineInformationOfOffset(event.getOffset());
+				IRegion info = fDocument.getLineInformationOfOffset(event.getOffset());
 				int start = Math.max(partition.getOffset(), info.getOffset());
 
 				int end =
@@ -100,12 +91,8 @@ public class NonRuleBasedDamagerRepairer
 		return partition;
 	}
 
-	/**
-	 * @see IPresentationRepairer#createPresentation(TextPresentation, ITypedRegion)
-	 */
-	public void createPresentation(
-		TextPresentation presentation,
-		ITypedRegion region) {
+	@Override
+	public void createPresentation(TextPresentation presentation, ITypedRegion region) {
 		addRange(
 			presentation,
 			region.getOffset(),
diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/TagRule.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/TagRule.java
index a9efd227a9..c14e1a1e65 100644
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/TagRule.java
+++ b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/TagRule.java
@@ -7,10 +7,9 @@ public class TagRule extends MultiLineRule {
 	public TagRule(IToken token) {
 		super("<", ">", token);
 	}
-	protected boolean sequenceDetected(
-		ICharacterScanner scanner,
-		char[] sequence,
-		boolean eofAllowed) {
+	
+	@Override
+	protected boolean sequenceDetected(ICharacterScanner scanner, char[] sequence, boolean eofAllowed) {
 		int c = scanner.read();
 		if (sequence[0] == '<') {
 			if (c == '?') {
diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLConfiguration.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLConfiguration.java
index 31d0c0c430..ec671cb738 100644
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLConfiguration.java
+++ b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLConfiguration.java
@@ -19,12 +19,16 @@ public class XMLConfiguration extends SourceViewerConfiguration {
 	public XMLConfiguration(ColorManager colorManager) {
 		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) {
@@ -54,11 +58,11 @@ public class XMLConfiguration extends SourceViewerConfiguration {
 		return tagScanner;
 	}
 
+	@Override
 	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
 		PresentationReconciler reconciler = new PresentationReconciler();
 
-		DefaultDamagerRepairer dr =
-			new DefaultDamagerRepairer(getXMLTagScanner());
+		DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getXMLTagScanner());
 		reconciler.setDamager(dr, XMLPartitionScanner.XML_TAG);
 		reconciler.setRepairer(dr, XMLPartitionScanner.XML_TAG);
 
@@ -66,10 +70,8 @@ public class XMLConfiguration extends SourceViewerConfiguration {
 		reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
 		reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
 
-		NonRuleBasedDamagerRepairer ndr =
-			new NonRuleBasedDamagerRepairer(
-				new TextAttribute(
-					colorManager.getColor(IXMLColorConstants.XML_COMMENT)));
+		NonRuleBasedDamagerRepairer ndr = new NonRuleBasedDamagerRepairer(
+				new TextAttribute(colorManager.getColor(IXMLColorConstants.XML_COMMENT)));
 		reconciler.setDamager(ndr, XMLPartitionScanner.XML_COMMENT);
 		reconciler.setRepairer(ndr, XMLPartitionScanner.XML_COMMENT);
 
diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLDocumentProvider.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLDocumentProvider.java
index 9536ecf648..aeefc24af5 100644
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLDocumentProvider.java
+++ b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLDocumentProvider.java
@@ -8,15 +8,12 @@ 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) {
-			IDocumentPartitioner partitioner =
-				new FastPartitioner(
-					new XMLPartitionScanner(),
-					new String[] {
-						XMLPartitionScanner.XML_TAG,
-						XMLPartitionScanner.XML_COMMENT });
+			IDocumentPartitioner partitioner = new FastPartitioner(new XMLPartitionScanner(),
+					new String[] { XMLPartitionScanner.XML_TAG, XMLPartitionScanner.XML_COMMENT });
 			partitioner.connect(document);
 			document.setDocumentPartitioner(partitioner);
 		}
diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLDoubleClickStrategy.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLDoubleClickStrategy.java
index bc901f7656..622de5e89e 100644
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLDoubleClickStrategy.java
+++ b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLDoubleClickStrategy.java
@@ -5,6 +5,7 @@ import org.eclipse.jface.text.*;
 public class XMLDoubleClickStrategy implements ITextDoubleClickStrategy {
 	protected ITextViewer fText;
 
+	@Override
 	public void doubleClicked(ITextViewer part) {
 		int pos = part.getSelectedRange().x;
 
diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLTagScanner.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLTagScanner.java
index 109a6ee503..5fed7d6e58 100644
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLTagScanner.java
+++ b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLTagScanner.java
@@ -6,9 +6,7 @@ import org.eclipse.jface.text.rules.*;
 public class XMLTagScanner extends RuleBasedScanner {
 
 	public XMLTagScanner(ColorManager manager) {
-		IToken string =
-			new Token(
-				new TextAttribute(manager.getColor(IXMLColorConstants.STRING)));
+		IToken string = new Token(new TextAttribute(manager.getColor(IXMLColorConstants.STRING)));
 
 		IRule[] rules = new IRule[3];
 
diff --git a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLWhitespaceDetector.java b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLWhitespaceDetector.java
index 3faa92acdc..20077afb7b 100644
--- a/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLWhitespaceDetector.java
+++ b/ui/org.eclipse.pde.ui.templates/templates_3.1/editor/java/XMLWhitespaceDetector.java
@@ -4,6 +4,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');
 	}