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

25 files changed, 91 insertions, 52 deletions

diff --git a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionDocumentTest.java b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionDocumentTest.java
index baf5a85f484..314073d9094 100644
--- a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionDocumentTest.java
+++ b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionDocumentTest.java
@@ -60,18 +60,14 @@ public class ProjectionDocumentTest extends TestCase {
 			return super.adaptProjectionToMasterChange(masterEvent);
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.projection.ProjectionDocument#isUpdating()
-		 */
+		@Override
 		protected boolean isUpdating() {
 			return super.isUpdating() || isUpdating;
 		}
 	}
 
 	static private class ProjectionDocumentManager extends org.eclipse.jface.text.projection.ProjectionDocumentManager {
-		/*
-		 * @see org.eclipse.jface.text.projection.ProjectionDocumentManager#createProjectionDocument(org.eclipse.jface.text.IDocument)
-		 */
+		@Override
 		protected org.eclipse.jface.text.projection.ProjectionDocument createProjectionDocument(IDocument master) {
 			return new ProjectionDocument(master);
 		}
@@ -112,6 +108,7 @@ public class ProjectionDocumentTest extends TestCase {
 			"99999999999999999999";
 	}
 
+	@Override
 	protected void setUp() {
 		fMasterDocument= new Document();
 		fMasterDocument.set(getOriginalMasterContents());
@@ -119,6 +116,7 @@ public class ProjectionDocumentTest extends TestCase {
 		fSlaveDocument= (ProjectionDocument) fSlaveDocumentManager.createSlaveDocument(fMasterDocument);
 	}
 
+	@Override
 	protected void tearDown () {
 		fSlaveDocumentManager.freeSlaveDocument(fSlaveDocument);
 		fSlaveDocument= null;
@@ -1581,7 +1579,9 @@ public class ProjectionDocumentTest extends TestCase {
 		final List receivedEvents= new ArrayList();
 
 		IDocumentListener listener= new IDocumentListener() {
+			@Override
 			public void documentAboutToBeChanged(DocumentEvent event) {}
+			@Override
 			public void documentChanged(DocumentEvent event) {
 				receivedEvents.add(event);
 			}
@@ -1609,7 +1609,9 @@ public class ProjectionDocumentTest extends TestCase {
 		final List receivedEvents= new ArrayList();
 
 		IDocumentListener listener= new IDocumentListener() {
+			@Override
 			public void documentAboutToBeChanged(DocumentEvent event) {}
+			@Override
 			public void documentChanged(DocumentEvent event) {
 				receivedEvents.add(event);
 			}
diff --git a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionMappingTest.java b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionMappingTest.java
index 3b47cb32c89..56860db2997 100644
--- a/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionMappingTest.java
+++ b/org.eclipse.text.tests/projection/org/eclipse/text/tests/ProjectionMappingTest.java
@@ -103,9 +103,7 @@ public class ProjectionMappingTest extends TestCase {
 		addProjection(70, 30, 10);
 	}
 
-	/*
-	 * @see junit.framework.TestCase#setUp()
-	 */
+	@Override
 	protected void setUp() throws Exception {
 		fMasterDocument= new Document();
 		fSlaveDocument= new Document();
@@ -117,9 +115,7 @@ public class ProjectionMappingTest extends TestCase {
 	}
 
 
-	/*
-	 * @see junit.framework.TestCase#tearDown()
-	 */
+	@Override
 	protected void tearDown() throws Exception {
 		fMasterDocument= null;
 		fSlaveDocument= null;
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractGapTextTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractGapTextTest.java
index 00d9e35ce65..589678cc682 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractGapTextTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/AbstractGapTextTest.java
@@ -31,6 +31,7 @@ public class AbstractGapTextTest extends TestCase {
 		 *            shrunken (>= 0)
 		 * @deprecated use {@link GapTextStore#GapTextStore(int, int, float)} instead
 		 */
+		@Deprecated
 		public GapText(int lowWatermark, int highWatermark) {
 			super(lowWatermark, highWatermark);
 		}
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/AdaptiveGapTextTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/AdaptiveGapTextTest.java
index 3d040cfe6da..ec3905b9392 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/AdaptiveGapTextTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/AdaptiveGapTextTest.java
@@ -15,6 +15,7 @@ import junit.framework.TestSuite;
 
 
 public class AdaptiveGapTextTest extends AbstractGapTextTest {
+	@Override
 	protected void setUp() {
 		fText= new GapText(2, 10, 0.5f);
 		fText.set("xxxxx");
@@ -24,6 +25,7 @@ public class AdaptiveGapTextTest extends AbstractGapTextTest {
 		return new TestSuite(AdaptiveGapTextTest.class);
 	}
 
+	@Override
 	protected void tearDown () {
 		fText= null;
 	}
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelExtension2Test.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelExtension2Test.java
index 68b41860c8e..764712c150b 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelExtension2Test.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelExtension2Test.java
@@ -40,31 +40,39 @@ public class AnnotationModelExtension2Test extends TestCase {
 
 		private final HashMap fAnnotations= new HashMap();
 
+		@Override
 		public void addAnnotation(Annotation annotation, Position position) {
 			fAnnotations.put(annotation, position);
 		}
 
+		@Override
 		public void addAnnotationModelListener(IAnnotationModelListener listener) {
 		}
 
+		@Override
 		public void connect(IDocument document) {
 		}
 
+		@Override
 		public void disconnect(IDocument document) {
 		}
 
+		@Override
 		public Iterator getAnnotationIterator() {
 			return fAnnotations.keySet().iterator();
 		}
 
+		@Override
 		public Position getPosition(Annotation annotation) {
 			return (Position) fAnnotations.get(annotation);
 		}
 
+		@Override
 		public void removeAnnotation(Annotation annotation) {
 			fAnnotations.remove(annotation);
 		}
 
+		@Override
 		public void removeAnnotationModelListener(IAnnotationModelListener listener) {
 		}
 
@@ -94,9 +102,7 @@ public class AnnotationModelExtension2Test extends TestCase {
 		return new TestSuite(AnnotationModelExtension2Test.class);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	protected void setUp() throws Exception {
 		fDocument= new Document("How much wood\nwould a woodchuck chuck\nif a woodchuck\ncould chuck wood?\n42");
 
@@ -123,9 +129,7 @@ public class AnnotationModelExtension2Test extends TestCase {
 		fAnnotationModel.connect(fDocument);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	protected void tearDown() throws Exception {
 		fAnnotationModel.disconnect(fDocument);
 	}
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelStressTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelStressTest.java
index 898868a0843..6926f671e90 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelStressTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/AnnotationModelStressTest.java
@@ -1214,9 +1214,7 @@ public class AnnotationModelStressTest extends TestCase {
 		return new TestSuite(AnnotationModelStressTest.class);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	protected void setUp() throws Exception {
 		fDocument= new Document(RANDOM_CONTENT);
 
@@ -1231,9 +1229,7 @@ public class AnnotationModelStressTest extends TestCase {
 		fAnnotationModel.connect(fDocument);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	protected void tearDown() throws Exception {
 		fAnnotationModel.disconnect(fDocument);
 		
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/ChildDocumentTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/ChildDocumentTest.java
index 96633cd7729..85b79f9c135 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/ChildDocumentTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/ChildDocumentTest.java
@@ -90,6 +90,7 @@ public class ChildDocumentTest extends TestCase {
 		}
 	}
 
+	@Override
 	protected void setUp() {
 
 		fParent= new Document();
@@ -139,6 +140,7 @@ public class ChildDocumentTest extends TestCase {
 		return new TestSuite(ChildDocumentTest.class);
 	}
 
+	@Override
 	protected void tearDown () {
 		fDocument= null;
 	}
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/CopyOnWriteTextStoreTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/CopyOnWriteTextStoreTest.java
index 48ebaa243a8..569dfd9484e 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/CopyOnWriteTextStoreTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/CopyOnWriteTextStoreTest.java
@@ -48,6 +48,7 @@ public class CopyOnWriteTextStoreTest extends TestCase {
 	}
 
 
+	@Override
 	protected void setUp() {
 
 		fText= new COWTextStore();
@@ -58,6 +59,7 @@ public class CopyOnWriteTextStoreTest extends TestCase {
 		return new TestSuite(CopyOnWriteTextStoreTest.class);
 	}
 
+	@Override
 	protected void tearDown () {
 		fText= null;
 	}
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentExtensionTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentExtensionTest.java
index 615213ab949..47ed07ee7d9 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentExtensionTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentExtensionTest.java
@@ -38,10 +38,12 @@ public class DocumentExtensionTest extends TestCase {
 		private int fInvocations= 0;
 		private boolean fIsPostNotificationSupported= true;
 
+		@Override
 		public void documentAboutToBeChanged(DocumentEvent e) {
 			++ fInvocations;
 		}
 
+		@Override
 		public void documentChanged(DocumentEvent e) {
 
 			if (fInvocations > fRepetitions) {
@@ -87,9 +89,7 @@ public class DocumentExtensionTest extends TestCase {
 		public Replace() {
 		}
 
-		/*
-		 * @see IReplace#perform(IDocument, IDocumentListener)
-		 */
+		@Override
 		public void perform(IDocument document, IDocumentListener owner) {
 			try {
 				document.replace(fOffset, fLength, fText);
@@ -130,6 +130,7 @@ public class DocumentExtensionTest extends TestCase {
 			fTrace2= t2;
 		}
 
+		@Override
 		public void documentAboutToBeChanged(DocumentEvent received) {
 			if (!fPopped) {
 				fPopped= true;
@@ -141,6 +142,7 @@ public class DocumentExtensionTest extends TestCase {
 			assertTrue(e.isSameAs(received));
 		}
 
+		@Override
 		public void documentChanged(DocumentEvent received) {
 			TestDocumentEvent e= (received.getDocument() == fDocument1 ? fExpected1 : fExpected2);
 			assertTrue(e.isSameAs(received));
@@ -161,6 +163,7 @@ public class DocumentExtensionTest extends TestCase {
 
 	public void testAppend() {
 		Listener listener= new Listener() {
+			@Override
 			protected Replace getReplace(DocumentEvent e) {
 				String t= e.getText();
 				if (t != null && t.length() > 0) {
@@ -190,6 +193,7 @@ public class DocumentExtensionTest extends TestCase {
 
 	public void testRemove() {
 		Listener listener= new Listener() {
+			@Override
 			protected Replace getReplace(DocumentEvent e) {
 				String t= e.getText();
 				if (t == null || t.length() == 0) {
@@ -219,6 +223,7 @@ public class DocumentExtensionTest extends TestCase {
 
 	public void testRepeatedAppend() {
 		Listener listener= new Listener() {
+			@Override
 			protected Replace getReplace(DocumentEvent e) {
 				String t= e.getText();
 				if (t != null && t.length() > 0) {
@@ -286,6 +291,7 @@ public class DocumentExtensionTest extends TestCase {
 		childDocument.addDocumentListener(l);
 
 		Listener modifier= new Listener() {
+			@Override
 			protected Replace getReplace(DocumentEvent e) {
 				String t= e.getText();
 				if (t != null && t.length() > 0) {
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentTest.java
index b31bf346310..1bb465913fa 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentTest.java
@@ -54,6 +54,7 @@ public class DocumentTest extends TestCase {
 
 	}
 
+	@Override
 	protected void setUp() {
 
 		fDocument= new Document();
@@ -93,6 +94,7 @@ public class DocumentTest extends TestCase {
 		return new TestSuite(DocumentTest.class);
 	}
 
+	@Override
 	protected void tearDown () {
 		fDocument= null;
 	}
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentUndoManagerTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentUndoManagerTest.java
index 67dd80cc94f..4c82803bb4c 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentUndoManagerTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/DocumentUndoManagerTest.java
@@ -59,17 +59,13 @@ public class DocumentUndoManagerTest extends TestCase {
 	/** The undo manager. */
 	private IDocumentUndoManager fUndoManager;
 
-	/*
-	 *  @see TestCase#setUp()
-	 */
+	@Override
 	protected void setUp() {
 		fUndoManager= null;
 	}
 
 
-	/*
-	 *  @see TestCase#tearDown()
-	 */
+	@Override
 	protected void tearDown() {
 		fUndoManager.disconnect(this);
 		fUndoManager= null;
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java
index fcd662a5faa..98121c63640 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/ExclusivePositionUpdaterTest.java
@@ -36,9 +36,7 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 	private static final String CATEGORY= "testcategory";
 	private Position fPos;
 	private IDocument fDoc;
-	/*
-	 * @see junit.framework.TestCase#setUp()
-	 */
+	@Override
 	protected void setUp() throws Exception {
 		fUpdater= new DefaultPositionUpdater(CATEGORY);
 		fDoc= new Document("ccccccccccccccccccccccccccccccccccccccccccccc");
@@ -49,9 +47,7 @@ public class ExclusivePositionUpdaterTest extends TestCase {
 		fDoc.addPosition(CATEGORY, fPos);
 	}
 
-	/*
-	 * @see junit.framework.TestCase#tearDown()
-	 */
+	@Override
 	protected void tearDown() throws Exception {
 		fDoc.removePositionUpdater(fUpdater);
 		fDoc.removePositionCategory(CATEGORY);
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/FindReplaceDocumentAdapterTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/FindReplaceDocumentAdapterTest.java
index 65863fe6f7a..d9c4fd5a008 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/FindReplaceDocumentAdapterTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/FindReplaceDocumentAdapterTest.java
@@ -45,6 +45,7 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 	}
 
 
+	@Override
 	protected void setUp() {
 
 		fDocument= new Document();
@@ -71,6 +72,7 @@ public class FindReplaceDocumentAdapterTest extends TestCase {
 		return new TestSuite(FindReplaceDocumentAdapterTest.class);
 	}
 
+	@Override
 	protected void tearDown () {
 		fDocument= null;
 	}
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextStoreTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextStoreTest.java
index 30cbd723c0f..d09f5cad1de 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextStoreTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextStoreTest.java
@@ -22,6 +22,7 @@ public class GapTextStoreTest extends TextStoreTest {
 		return new TestSuite(GapTextStoreTest.class);
 	}
 
+	@Override
 	protected ITextStore createTextStore() {
 		return new GapTextStore(256, 4096, 0.1f);
 	}
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextTest.java
index 566c1cb95b7..f62f97221be 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/GapTextTest.java
@@ -17,6 +17,8 @@ public class GapTextTest extends AbstractGapTextTest {
 	/**
 	 * @deprecated tests the legacy constructor of GapTextStore
 	 */
+	@Deprecated
+	@Override
 	protected void setUp() {
 		fText= new GapText(5, 10);
 		fText.set("xxxxx");
@@ -26,6 +28,7 @@ public class GapTextTest extends AbstractGapTextTest {
 		return new TestSuite(GapTextTest.class);
 	}
 
+	@Override
 	protected void tearDown () {
 		fText= null;
 	}
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest3.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest3.java
index d793786f933..ddf7876c32d 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest3.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest3.java
@@ -28,17 +28,20 @@ public class LineTrackerTest3 extends AbstractLineTrackerTest {
 		super(name);
 	}
 
+	@Override
 	protected void setUp() {
 		fText= new GapTextStore();
 		fTracker= new ConfigurableLineTracker(new String[] { "\n" });
 		set("x\nx\nx\nx\nx\n");
 	}
 
+	@Override
 	protected void tearDown() {
 		fTracker= null;
 		fText= null;
 	}
 
+	@Override
 	protected int getLineOffset(int line, int[] lines) {
 		int offset= 0;
 		for (int i= 0; i < line; i++)
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest4.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest4.java
index 32c391d68ac..70bf030e14c 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest4.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/LineTrackerTest4.java
@@ -27,17 +27,20 @@ public class LineTrackerTest4 extends AbstractLineTrackerTest {
 		super(name);
 	}
 
+	@Override
 	protected void setUp() {
 		fText= new GapTextStore();
 		fTracker= new ConfigurableLineTracker(new String[] { "\r\n" });
 		set("x\r\nx\r\nx\r\nx\r\nx\r\n");
 	}
 
+	@Override
 	protected void tearDown() {
 		fTracker= null;
 		fText= null;
 	}
 
+	@Override
 	protected int getLineOffset(int line, int[] lines) {
 		int offset= 0;
 		for (int i= 0; i < line; i++)
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java
index 07d80a7ab06..8123d6a3c67 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/PositionUpdatingCornerCasesTest.java
@@ -45,6 +45,7 @@ public class PositionUpdatingCornerCasesTest extends TestCase {
 		return new TestSuite(PositionUpdatingCornerCasesTest.class);
 	}
 
+	@Override
 	protected void tearDown() {
 		fDocument= null;
 	}
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java
index 7ab10747516..c5c7b687ba6 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextEditTests.java
@@ -57,11 +57,13 @@ public class TextEditTests extends TestCase {
 		return new TestSuite(THIS);
 	}
 
+	@Override
 	protected void setUp() throws Exception {
 		fDocument= new Document("0123456789");
 		fRoot= new MultiTextEdit();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		fRoot= null;
 		fRoot= null;
@@ -1226,9 +1228,11 @@ public class TextEditTests extends TestCase {
 		RangeMarker r1= new RangeMarker(3,2);
 		ms.addChild(r1);
 		ms.setSourceModifier(new ISourceModifier() {
+			@Override
 			public ISourceModifier copy() {
 				return this;
 			}
+			@Override
 			public ReplaceEdit[] getModifications(String source) {
 				return new ReplaceEdit[] { new ReplaceEdit(1,1,"aa") };
 			}
@@ -1252,9 +1256,11 @@ public class TextEditTests extends TestCase {
 		RangeMarker r3= new RangeMarker(4,2);
 		ms.addChild(r3);
 		ms.setSourceModifier(new ISourceModifier() {
+			@Override
 			public ISourceModifier copy() {
 				return this;
 			}
+			@Override
 			public ReplaceEdit[] getModifications(String source) {
 				return new ReplaceEdit[] { new ReplaceEdit(0,2,"aa") };
 			}
@@ -1275,9 +1281,11 @@ public class TextEditTests extends TestCase {
 		RangeMarker r1= new RangeMarker(3,2);
 		ms.addChild(r1);
 		ms.setSourceModifier(new ISourceModifier() {
+			@Override
 			public ISourceModifier copy() {
 				return this;
 			}
+			@Override
 			public ReplaceEdit[] getModifications(String source) {
 				return new ReplaceEdit[] { new ReplaceEdit(0,2,"aa") };
 			}
@@ -1296,9 +1304,11 @@ public class TextEditTests extends TestCase {
 		RangeMarker r1= new RangeMarker(3,2);
 		ms.addChild(r1);
 		ms.setSourceModifier(new ISourceModifier() {
+			@Override
 			public ISourceModifier copy() {
 				return this;
 			}
+			@Override
 			public ReplaceEdit[] getModifications(String source) {
 				return new ReplaceEdit[] { new ReplaceEdit(2,2,"aa") };
 			}
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextStoreTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextStoreTest.java
index 802bec9a476..efb218b761b 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextStoreTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextStoreTest.java
@@ -28,6 +28,7 @@ public abstract class TextStoreTest extends TestCase {
 	private ITextStore fTextStore;
 	private ILineTracker fTracker;
 
+	@Override
 	protected void setUp() {
 
 		fTextStore= createTextStore();
@@ -51,6 +52,7 @@ public abstract class TextStoreTest extends TestCase {
 
 	abstract protected ITextStore createTextStore();
 
+	@Override
 	protected void tearDown() {
 		fTextStore= null;
 		fTracker= null;
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextUtilitiesTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextUtilitiesTest.java
index 82d56f9f687..9bddfec24a4 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/TextUtilitiesTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/TextUtilitiesTest.java
@@ -44,7 +44,9 @@ public class TextUtilitiesTest extends TestCase {
 	private static class LazilyMirroredDocument extends Document {
 
 		private final class DocumentListener implements IDocumentListener {
+			@Override
 			public void documentAboutToBeChanged(DocumentEvent event) {}
+			@Override
 			public void documentChanged(DocumentEvent event) {
 				fEvents.add(event);
 			}
@@ -74,6 +76,7 @@ public class TextUtilitiesTest extends TestCase {
 		 *
 		 * @see org.eclipse.jface.text.IDocument#get()
 		 */
+		@Override
 		public String get() {
 			try {
 				flush();
@@ -91,7 +94,9 @@ public class TextUtilitiesTest extends TestCase {
 	private static class LazilyMirroredDocument2 extends Document {
 
 		private final class DocumentListener implements IDocumentListener {
+			@Override
 			public void documentAboutToBeChanged(DocumentEvent event) {}
+			@Override
 			public void documentChanged(DocumentEvent event) {
 				event= new DocumentEvent(event.getDocument(), event.getOffset(), event.getLength(), event.getText());
 				fEvents.add(event);
@@ -122,6 +127,7 @@ public class TextUtilitiesTest extends TestCase {
 		 *
 		 * @see org.eclipse.jface.text.IDocument#get()
 		 */
+		@Override
 		public String get() {
 			try {
 				flush();
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/InclusivePositionUpdaterTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/InclusivePositionUpdaterTest.java
index fad146cc204..c5f485eeb22 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/InclusivePositionUpdaterTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/InclusivePositionUpdaterTest.java
@@ -27,9 +27,7 @@ public class InclusivePositionUpdaterTest extends TestCase {
 	private static final String CATEGORY= "testcategory";
 	private Position fPos;
 	private IDocument fDoc;
-	/*
-	 * @see junit.framework.TestCase#setUp()
-	 */
+	@Override
 	protected void setUp() throws Exception {
 		fUpdater= new InclusivePositionUpdater(CATEGORY);
 		fDoc= new Document("ccccccccccccccccccccccccccccccccccccccccccccc");
@@ -39,9 +37,7 @@ public class InclusivePositionUpdaterTest extends TestCase {
 		fDoc.addPosition(CATEGORY, fPos);
 	}
 
-	/*
-	 * @see junit.framework.TestCase#tearDown()
-	 */
+	@Override
 	protected void tearDown() throws Exception {
 		fDoc.removePositionUpdater(fUpdater);
 		fDoc.removePositionCategory(CATEGORY);
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedModeModelTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedModeModelTest.java
index 5c16c06da74..eb145a344b0 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedModeModelTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedModeModelTest.java
@@ -312,6 +312,7 @@ public class LinkedModeModelTest extends TestCase {
 
 		final boolean[] isExit= { false } ;
 		env.addLinkingListener(new LinkedAdapter() {
+			@Override
 			public void left(LinkedModeModel environment, int flags) {
 				isExit[0]= true;
 			}
@@ -366,6 +367,7 @@ public class LinkedModeModelTest extends TestCase {
 
 		final boolean[] isExit= { false } ;
 		env.addLinkingListener(new LinkedAdapter() {
+			@Override
 			public void left(LinkedModeModel environment, int flags) {
 				isExit[0]= true;
 			}
@@ -391,6 +393,7 @@ public class LinkedModeModelTest extends TestCase {
 		LinkedModeModel env= new LinkedModeModel();
 		final boolean[] isExit= { false } ;
 		env.addLinkingListener(new LinkedAdapter() {
+			@Override
 			public void left(LinkedModeModel environment, int flags) {
 				isExit[0]= true;
 			}
@@ -418,6 +421,7 @@ public class LinkedModeModelTest extends TestCase {
 		LinkedModeModel env= new LinkedModeModel();
 		final boolean[] isExit= { false } ;
 		env.addLinkingListener(new LinkedAdapter() {
+			@Override
 			public void left(LinkedModeModel environment, int flags) {
 				isExit[0]= true;
 			}
@@ -445,6 +449,7 @@ public class LinkedModeModelTest extends TestCase {
 		LinkedModeModel env= new LinkedModeModel();
 		final boolean[] isExit= { false } ;
 		env.addLinkingListener(new LinkedAdapter() {
+			@Override
 			public void left(LinkedModeModel environment, int flags) {
 				isExit[0]= true;
 			}
@@ -476,6 +481,7 @@ public class LinkedModeModelTest extends TestCase {
 		LinkedModeModel env= new LinkedModeModel();
 		final boolean[] isExit= { false } ;
 		env.addLinkingListener(new LinkedAdapter() {
+			@Override
 			public void left(LinkedModeModel environment, int flags) {
 				isExit[0]= true;
 			}
@@ -506,6 +512,7 @@ public class LinkedModeModelTest extends TestCase {
 		LinkedModeModel env= new LinkedModeModel();
 		final boolean[] isExit= { false } ;
 		env.addLinkingListener(new LinkedAdapter() {
+			@Override
 			public void left(LinkedModeModel environment, int flags) {
 				isExit[0]= true;
 			}
@@ -582,9 +589,7 @@ public class LinkedModeModelTest extends TestCase {
 	}
 
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	protected void setUp() throws Exception {
 		fPositions.clear();
 		fDocumentMap.clear();
@@ -801,13 +806,17 @@ public class LinkedModeModelTest extends TestCase {
 		"	Das mir zu tun fast nichts mehr ubrigbleibt.";
 
 	private class LinkedAdapter implements ILinkedModeListener {
+		@Override
 		public void left(LinkedModeModel environment, int flags) {}
+		@Override
 		public void suspend(LinkedModeModel environment) {}
+		@Override
 		public void resume(LinkedModeModel environment, int flags) {}
 	}
 
 	public class PositionComparator implements Comparator {
 
+		@Override
 		public int compare(Object o1, Object o2) {
 			LinkedPosition p1= (LinkedPosition) o1;
 			LinkedPosition p2= (LinkedPosition) o2;
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionTest.java
index 31db5c20310..8ff9df77420 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/link/LinkedPositionTest.java
@@ -23,6 +23,7 @@ import org.eclipse.jface.text.link.LinkedPositionGroup;
 
 public class LinkedPositionTest extends TestCase {
 
+	@Override
 	public void setUp() {
 		fDoc= new Document(GARTEN1);
 		fPos= new LinkedPosition(fDoc, 3, 10);
diff --git a/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplateTranslatorTest.java b/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplateTranslatorTest.java
index 07276e32435..7ded6114746 100644
--- a/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplateTranslatorTest.java
+++ b/org.eclipse.text.tests/src/org/eclipse/text/tests/templates/TemplateTranslatorTest.java
@@ -34,10 +34,7 @@ public class TemplateTranslatorTest extends TestCase {
 
 	private TemplateTranslator fTranslator;
 
-	/*
-	 * @see junit.framework.TestCase#setUp()
-	 * @since 3.3
-	 */
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		fTranslator= new TemplateTranslator();