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

23 files changed, 216 insertions, 449 deletions

diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/FileBuffers.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/FileBuffers.java
index 0a3c914e7c6..9adfed8b336 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/FileBuffers.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/FileBuffers.java
@@ -210,6 +210,7 @@ public final class FileBuffers {
 	 * @return the {@link File} in the local file system for the given location
 	 * @deprecated As of 3.2, replaced by {@link #getFileStoreAtLocation(IPath)}
 	 */
+	@Deprecated
 	public static File getSystemFileAtLocation(IPath location) {
 		IFileStore store= getFileStoreAtLocation(location);
 		if (store != null) {
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IDocumentFactory.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IDocumentFactory.java
index 1b9631dc4d2..e9459ff103b 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IDocumentFactory.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IDocumentFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.jface.text.IDocument;
  * @deprecated As of 3.2 the <code>"org.eclipse.core.filebuffers.documentCreation"</code>
  *				extension point has been deprecated. See the extension point documentation for more details.
  */
+@Deprecated
 public interface IDocumentFactory {
 
 	/**
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IFileBufferManager.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IFileBufferManager.java
index 3c988008322..a90c5f4812f 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IFileBufferManager.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/IFileBufferManager.java
@@ -53,6 +53,7 @@ public interface IFileBufferManager {
 	 * @throws CoreException if the file could not successfully be connected
 	 * @deprecated As of 3.3, replaced by {@link #connect(IPath, LocationKind, IProgressMonitor)}
 	 */
+	@Deprecated
 	void connect(IPath location, IProgressMonitor monitor) throws CoreException;
 
 	/**
@@ -110,6 +111,7 @@ public interface IFileBufferManager {
 	 * @throws CoreException if the file could not successfully be disconnected
 	 * @deprecated As of 3.3, replaced by {@link #disconnect(IPath, LocationKind, IProgressMonitor)}
 	 */
+	@Deprecated
 	void disconnect(IPath location, IProgressMonitor monitor) throws CoreException;
 
 	/**
@@ -165,6 +167,7 @@ public interface IFileBufferManager {
 	 * @return the file buffer managed for that location or <code>null</code>
 	 * @deprecated As of 3.3, replaced by {@link #getFileBuffer(IPath, LocationKind)}
 	 */
+	@Deprecated
 	IFileBuffer getFileBuffer(IPath location);
 
 	/**
@@ -262,6 +265,7 @@ public interface IFileBufferManager {
 	 * @param location the location
 	 * @deprecated As of 3.1, replaced by {@link org.eclipse.core.filebuffers.IFileBuffer#requestSynchronizationContext()}
 	 */
+	@Deprecated
 	void requestSynchronizationContext(IPath location);
 
 	/**
@@ -278,6 +282,7 @@ public interface IFileBufferManager {
 	 * @param location the location
 	 * @deprecated As of 3.1, replaced by {@link IFileBuffer#releaseSynchronizationContext()}
 	 */
+	@Deprecated
 	void releaseSynchronizationContext(IPath location);
 
 	/**
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/ITextFileBufferManager.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/ITextFileBufferManager.java
index 484c37eb825..fcf3a5463d6 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/ITextFileBufferManager.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/ITextFileBufferManager.java
@@ -53,6 +53,7 @@ public interface ITextFileBufferManager extends IFileBufferManager {
 	 * @return the text file buffer managed for that location or <code>null</code>
 	 * @deprecated As of 3.3, replaced by {@link #getTextFileBuffer(IPath, LocationKind)}
 	 */
+	@Deprecated
 	ITextFileBuffer getTextFileBuffer(IPath location);
 
 	/**
@@ -128,6 +129,7 @@ public interface ITextFileBufferManager extends IFileBufferManager {
 	 * @return a new empty document
 	 * @deprecated As of 3.3, replaced by {@link #createEmptyDocument(IPath, LocationKind)}
 	 */
+	@Deprecated
 	IDocument createEmptyDocument(IPath location);
 
 	/**
@@ -158,6 +160,7 @@ public interface ITextFileBufferManager extends IFileBufferManager {
 	 * @return the newly created annotation model
 	 * @deprecated As of 3.3, replaced by {@link #createAnnotationModel(IPath, LocationKind)}
 	 */
+	@Deprecated
 	IAnnotationModel createAnnotationModel(IPath location);
 
 	/**
@@ -194,6 +197,7 @@ public interface ITextFileBufferManager extends IFileBufferManager {
 	 * @since 3.1
 	 * @deprecated As of 3.2, replaced by {@link #isTextFileLocation(IPath, boolean)}
 	 */
+	@Deprecated
 	boolean isTextFileLocation(IPath location);
 	/**
 	 * Returns whether a file at the given location is or can be considered a
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/LocationKind.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/LocationKind.java
index c24e3cf3844..0a0fc96cf42 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/LocationKind.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/LocationKind.java
@@ -61,9 +61,7 @@ public final class LocationKind {
 		fName= name;
 	}
 
-	/*
-	 * @see java.lang.Object#toString()
-	 */
+	@Override
 	public String toString() {
 		return fName;
 	}
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ContainerCreator.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ContainerCreator.java
index a4c2da4f1ef..4dfbaaf1d00 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ContainerCreator.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ContainerCreator.java
@@ -66,6 +66,7 @@ public class ContainerCreator {
 	 */
 	public IContainer createContainer(IProgressMonitor progressMonitor) throws CoreException {
 		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				monitor.beginTask(FileBuffersMessages.ContainerCreator_task_creatingContainer, fContainerFullPath.segmentCount());
 				if (fContainer != null)
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ConvertLineDelimitersOperation.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ConvertLineDelimitersOperation.java
index 68d1d96f8cf..f0bb8b6bc2e 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ConvertLineDelimitersOperation.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/ConvertLineDelimitersOperation.java
@@ -50,9 +50,7 @@ public class ConvertLineDelimitersOperation extends TextFileBufferOperation {
 		fLineDelimiter= lineDelimiter;
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.textmanipulation.TextFileBufferOperation#computeTextEdit(org.eclipse.core.filebuffers.ITextFileBuffer, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	protected MultiTextEditWithProgress computeTextEdit(ITextFileBuffer fileBuffer, IProgressMonitor progressMonitor) throws CoreException {
 		IDocument document= fileBuffer.getDocument();
 		int lineCount= document.getNumberOfLines();
@@ -84,9 +82,7 @@ public class ConvertLineDelimitersOperation extends TextFileBufferOperation {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.manipulation.TextFileBufferOperation#getDocumentRewriteSessionType()
-	 */
+	@Override
 	protected DocumentRewriteSessionType getDocumentRewriteSessionType() {
 		return DocumentRewriteSessionType.SEQUENTIAL;
 	}
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/FileBufferOperationRunner.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/FileBufferOperationRunner.java
index a994be80dfa..3e4aa3de3e7 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/FileBufferOperationRunner.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/FileBufferOperationRunner.java
@@ -45,8 +45,10 @@ public class FileBufferOperationRunner extends GenericFileBufferOperationRunner
 		super(fileBufferManager, validationContext);
 	}
 
+	@Override
 	protected void commit(final IFileBuffer[] fileBuffers, final IProgressMonitor progressMonitor) throws CoreException {
 		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				doCommit(fileBuffers, progressMonitor);
 			}
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/GenericFileBufferOperationRunner.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/GenericFileBufferOperationRunner.java
index 3433130a070..2092ae679c7 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/GenericFileBufferOperationRunner.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/GenericFileBufferOperationRunner.java
@@ -111,13 +111,16 @@ public class GenericFileBufferOperationRunner {
 			synchronized (fCompletionLock) {
 
 				executeInContext(new Runnable() {
+					@Override
 					public void run() {
 						synchronized(fCompletionLock) {
 							try {
 								SafeRunner.run(new ISafeRunnable() {
+									@Override
 									public void handleException(Throwable throwable) {
 										fThrowable= throwable;
 									}
+									@Override
 									public void run() throws Exception {
 										performOperation(synchronizedFileBuffers, operation, progressMonitor);
 									}
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/MultiTextEditWithProgress.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/MultiTextEditWithProgress.java
index 24aa132a1b9..e8fa43fc3dc 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/MultiTextEditWithProgress.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/MultiTextEditWithProgress.java
@@ -65,18 +65,14 @@ public class MultiTextEditWithProgress extends MultiTextEdit {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.text.edits.TextEdit#childDocumentUpdated()
-	 */
+	@Override
 	protected void childDocumentUpdated() {
 		if (fProgressMonitor.isCanceled())
 			throw new OperationCanceledException();
 		fProgressMonitor.worked(1);
 	}
 
-	/*
-	 * @see org.eclipse.text.edits.TextEdit#childRegionUpdated()
-	 */
+	@Override
 	protected void childRegionUpdated() {
 		if (fProgressMonitor.isCanceled())
 			throw new OperationCanceledException();
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/RemoveTrailingWhitespaceOperation.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/RemoveTrailingWhitespaceOperation.java
index ce800eb47c1..55b69af8b82 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/RemoveTrailingWhitespaceOperation.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/RemoveTrailingWhitespaceOperation.java
@@ -43,9 +43,7 @@ public class RemoveTrailingWhitespaceOperation extends TextFileBufferOperation {
 		super(FileBuffersMessages.RemoveTrailingWhitespaceOperation_name);
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.textmanipulation.TextFileBufferOperation#computeTextEdit(org.eclipse.core.filebuffers.ITextFileBuffer, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	protected MultiTextEditWithProgress computeTextEdit(ITextFileBuffer fileBuffer, IProgressMonitor progressMonitor) throws CoreException {
 		IDocument document= fileBuffer.getDocument();
 		int lineCount= document.getNumberOfLines();
@@ -83,9 +81,7 @@ public class RemoveTrailingWhitespaceOperation extends TextFileBufferOperation {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.manipulation.TextFileBufferOperation#getDocumentRewriteSessionType()
-	 */
+	@Override
 	protected DocumentRewriteSessionType getDocumentRewriteSessionType() {
 		return DocumentRewriteSessionType.SEQUENTIAL;
 	}
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/TextFileBufferOperation.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/TextFileBufferOperation.java
index f802f553227..c4321198b2a 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/TextFileBufferOperation.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/filebuffers/manipulation/TextFileBufferOperation.java
@@ -77,16 +77,12 @@ public abstract class TextFileBufferOperation implements IFileBufferOperation {
 		fOperationName= operationName;
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.textmanipulation.IFileBufferOperation#getOperationName()
-	 */
+	@Override
 	public String getOperationName() {
 		return fOperationName;
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.textmanipulation.IFileBufferOperation#run(org.eclipse.core.filebuffers.IFileBuffer, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public void run(IFileBuffer fileBuffer, IProgressMonitor progressMonitor) throws CoreException, OperationCanceledException {
 
 		if (fileBuffer instanceof ITextFileBuffer) {
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/AbstractFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/AbstractFileBuffer.java
index 25762b7318a..756883a18f4 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/AbstractFileBuffer.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/AbstractFileBuffer.java
@@ -69,32 +69,23 @@ public abstract class AbstractFileBuffer implements IFileBuffer, IStateValidatio
 	protected void dispose() {
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IStateValidationSupport#validationStateAboutToBeChanged()
-	 */
+	@Override
 	public void validationStateAboutToBeChanged() {
 		fManager.fireStateChanging(this);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IStateValidationSupport#validationStateChangeFailed()
-	 */
+	@Override
 	public void validationStateChangeFailed() {
 		fManager.fireStateChangeFailed(this);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#getModificationStamp()
-	 */
+	@Override
 	public long getModificationStamp() {
 		IFileInfo info= fFileStore.fetchInfo();
 		return info.exists() ? info.getLastModified() : IDocumentExtension4.UNKNOWN_MODIFICATION_STAMP;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#getFileStore()
-	 * @since 3.3
-	 */
+	@Override
 	public IFileStore getFileStore() {
 		return fFileStore;
 	}
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/DocumentReader.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/DocumentReader.java
index 942ab44eb27..9b96627a855 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/DocumentReader.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/DocumentReader.java
@@ -52,16 +52,12 @@ class DocumentReader extends Reader {
 			fDocument= document;
 		}
 
-		/*
-		 * @see java.lang.CharSequence#length()
-		 */
+		@Override
 		public int length() {
 			return fDocument.getLength();
 		}
 
-		/*
-		 * @see java.lang.CharSequence#charAt(int)
-		 */
+		@Override
 		public char charAt(int index) {
 			try {
 				return fDocument.getChar(index);
@@ -70,9 +66,7 @@ class DocumentReader extends Reader {
 			}
 		}
 
-		/*
-		 * @see java.lang.CharSequence#subSequence(int, int)
-		 */
+		@Override
 		public CharSequence subSequence(int start, int end) {
 			try {
 				return fDocument.get(start, end - start);
@@ -87,16 +81,12 @@ class DocumentReader extends Reader {
 	 */
 	private class InternalDocumentListener implements IDocumentListener {
 
-		/*
-		 * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-		 */
+		@Override
 		public void documentAboutToBeChanged(DocumentEvent event) {
 			handleDocumentAboutToBeChanged();
 		}
 
-		/*
-		 * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)
-		 */
+		@Override
 		public void documentChanged(DocumentEvent event) {
 		}
 	}
@@ -130,9 +120,7 @@ class DocumentReader extends Reader {
 		fLength= fCharSequence.length();
 	}
 
-	/*
-	 * @see java.io.InputStream#close()
-	 */
+	@Override
 	public void close() throws IOException {
 		synchronized (this) {
 			fCharSequence= null;
@@ -166,10 +154,7 @@ class DocumentReader extends Reader {
 		fDocumentListener= null;
 	}
 
-	/*
-	 * @see java.io.Reader#read(char[], int, int)
-	 * @since 3.1
-	 */
+	@Override
 	public int read(char[] cbuf, int off, int len) throws IOException {
 		int i= 0;
 		try {
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ExtensionsRegistry.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ExtensionsRegistry.java
index a0afbbcdee3..63731ff3a1c 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ExtensionsRegistry.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ExtensionsRegistry.java
@@ -71,16 +71,12 @@ public class ExtensionsRegistry {
 			return fContentType.getId();
 		}
 
-		/*
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
+		@Override
 		public boolean equals(Object obj) {
 			return obj instanceof ContentTypeAdapter && fContentType.getId().equals(((ContentTypeAdapter)obj).getId());
 		}
 
-		/*
-		 * @see java.lang.Object#hashCode()
-		 */
+		@Override
 		public int hashCode() {
 			return fContentType.getId().hashCode();
 		}
@@ -258,6 +254,7 @@ public class ExtensionsRegistry {
 	 * @return the sharable document factory or <code>null</code>
 	 * @deprecated As of 3.5
 	 */
+	@Deprecated
 	protected org.eclipse.core.filebuffers.IDocumentFactory getDocumentFactory(String nameOrExtension) {
 		Set set= (Set) fFactoryDescriptors.get(nameOrExtension);
 		if (set != null) {
@@ -274,6 +271,7 @@ public class ExtensionsRegistry {
 	 * @return the sharable document factory or <code>null</code>
 	 * @deprecated As of 3.5
 	 */
+	@Deprecated
 	protected org.eclipse.core.filebuffers.IDocumentFactory doGetDocumentFactory(IContentType[] contentTypes) {
 		Set set= null;
 		int i= 0;
@@ -296,6 +294,7 @@ public class ExtensionsRegistry {
 	 * @return the sharable document factory or <code>null</code>
 	 * @deprecated As of 3.5
 	 */
+	@Deprecated
 	protected org.eclipse.core.filebuffers.IDocumentFactory getDocumentFactory(IContentType[] contentTypes) {
 		org.eclipse.core.filebuffers.IDocumentFactory factory= doGetDocumentFactory(contentTypes);
 		while (factory == null) {
@@ -477,6 +476,7 @@ public class ExtensionsRegistry {
 	 * @since 3.3
 	 * @deprecated As of 3.5
 	 */
+	@Deprecated
 	public org.eclipse.core.filebuffers.IDocumentFactory getDocumentFactory(IPath location, LocationKind locationKind) {
 		org.eclipse.core.filebuffers.IDocumentFactory factory= getDocumentFactory(findContentTypes(location, locationKind));
 		if (factory == null)
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreFileBuffer.java
index 78e8f98c78d..e395f679694 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreFileBuffer.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreFileBuffer.java
@@ -67,11 +67,13 @@ public abstract class FileStoreFileBuffer extends AbstractFileBuffer  {
 		addFileBufferContentListeners();
 	}
 
+	@Override
 	public void create(IPath location, IProgressMonitor monitor) throws CoreException {
 		fLocation= location;
 		create(EFS.getStore(URIUtil.toURI(getLocation())), monitor);
 	}
 
+	@Override
 	public void connect() {
 		++ fReferenceCount;
 		if (fReferenceCount == 1)
@@ -87,6 +89,7 @@ public abstract class FileStoreFileBuffer extends AbstractFileBuffer  {
 	protected void connected() {
 	}
 
+	@Override
 	public void disconnect() throws CoreException {
 		--fReferenceCount;
 		if (fReferenceCount <= 0)
@@ -102,24 +105,17 @@ public abstract class FileStoreFileBuffer extends AbstractFileBuffer  {
 	protected void disconnected() {
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.AbstractFileBuffer#isDisconnected()
-	 * @since 3.1
-	 */
+	@Override
 	protected boolean isDisconnected() {
 		return fReferenceCount <= 0;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#getLocation()
-	 */
+	@Override
 	public IPath getLocation() {
 		return fLocation;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#commit(org.eclipse.core.runtime.IProgressMonitor, boolean)
-	 */
+	@Override
 	public void commit(IProgressMonitor monitor, boolean overwrite) throws CoreException {
 		if (!isDisconnected() && fCanBeSaved) {
 
@@ -141,101 +137,73 @@ public abstract class FileStoreFileBuffer extends AbstractFileBuffer  {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#computeCommitRule()
-	 */
+	@Override
 	public ISchedulingRule computeCommitRule() {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#isDirty()
-	 */
+	@Override
 	public boolean isDirty() {
 		return fCanBeSaved;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#setDirty(boolean)
-	 */
+	@Override
 	public void setDirty(boolean isDirty) {
 		fCanBeSaved= isDirty;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#isShared()
-	 */
+	@Override
 	public boolean isShared() {
 		return fReferenceCount > 1;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#computeValidateStateRule()
-	 */
+	@Override
 	public ISchedulingRule computeValidateStateRule() {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#validateState(org.eclipse.core.runtime.IProgressMonitor, java.lang.Object)
-	 */
+	@Override
 	public void validateState(IProgressMonitor monitor, Object computationContext) throws CoreException {
 		// nop
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#isStateValidated()
-	 */
+	@Override
 	public boolean isStateValidated() {
 		return true;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#resetStateValidation()
-	 */
+	@Override
 	public void resetStateValidation() {
 		// nop
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#isSynchronized()
-	 */
+	@Override
 	public boolean isSynchronized() {
 		return fSynchronizationStamp == getModificationStamp();
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#requestSynchronizationContext()
-	 */
+	@Override
 	public void requestSynchronizationContext() {
 		++ fSynchronizationContextCount;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#releaseSynchronizationContext()
-	 */
+	@Override
 	public void releaseSynchronizationContext() {
 		-- fSynchronizationContextCount;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#isSynchronizationContextRequested()
-	 */
+	@Override
 	public boolean isSynchronizationContextRequested() {
 		return fSynchronizationContextCount > 0;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#isCommitable()
-	 */
+	@Override
 	public boolean isCommitable() {
 		IFileInfo info= fFileStore.fetchInfo();
 		return info.exists() && !info.getAttribute(EFS.ATTRIBUTE_READ_ONLY);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IStateValidationSupport#validationStateChanged(boolean, org.eclipse.core.runtime.IStatus)
-	 */
+	@Override
 	public void validationStateChanged(boolean validationState, IStatus status) {
 		//nop
 	}
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java
index 74a69a2ba12..19bee7bf2ff 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/FileStoreTextFileBuffer.java
@@ -65,15 +65,11 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex
 
 	private class DocumentListener implements IDocumentListener {
 
-		/*
-		 * @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) {
 			fCanBeSaved= true;
 			removeFileBufferContentListeners();
@@ -133,16 +129,12 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex
 		super(manager);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBuffer#getDocument()
-	 */
+	@Override
 	public IDocument getDocument() {
 		return fDocument;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBuffer#getAnnotationModel()
-	 */
+	@Override
 	public IAnnotationModel getAnnotationModel() {
 		synchronized (fAnnotationModelCreationLock) {
 			if (fAnnotationModel == null && !isDisconnected()) {
@@ -154,18 +146,14 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex
 		return fAnnotationModel;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBuffer#getEncoding()
-	 */
+	@Override
 	public String getEncoding() {
 		if (!fIsCacheUpdated)
 			cacheEncodingState();
 		return fEncoding;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBuffer#setEncoding(java.lang.String)
-	 */
+	@Override
 	public void setEncoding(String encoding) {
 		fExplicitEncoding= encoding;
 		if (encoding == null || encoding.equals(fEncoding))
@@ -176,9 +164,7 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBuffer#getStatus()
-	 */
+	@Override
 	public IStatus getStatus() {
 		if (!isDisconnected()) {
 			if (fStatus != null)
@@ -227,9 +213,7 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#revert(org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public void revert(IProgressMonitor monitor) throws CoreException {
 		if (isDisconnected())
 			return;
@@ -297,6 +281,7 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex
 	 * @see org.eclipse.core.filebuffers.IFileBuffer#getContentType()
 	 * @since 3.1
 	 */
+	@Override
 	public IContentType getContentType () throws CoreException {
 		InputStream stream= null;
 		try {
@@ -329,25 +314,19 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.FileBuffer#addFileBufferContentListeners()
-	 */
+	@Override
 	protected void addFileBufferContentListeners() {
 		if (fDocument != null)
 			fDocument.addDocumentListener(fDocumentListener);
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.FileBuffer#removeFileBufferContentListeners()
-	 */
+	@Override
 	protected void removeFileBufferContentListeners() {
 		if (fDocument != null)
 			fDocument.removeDocumentListener(fDocumentListener);
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.FileBuffer#initializeFileBufferContent(org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	protected void initializeFileBufferContent(IProgressMonitor monitor) throws CoreException {
 		try {
 			fDocument= fManager.createEmptyDocument(getLocationOrName(), LocationKind.LOCATION);
@@ -359,18 +338,14 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.ResourceFileBuffer#connected()
-	 */
+	@Override
 	protected void connected() {
 		super.connected();
 		if (fAnnotationModel != null)
 			fAnnotationModel.connect(fDocument);
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.ResourceFileBuffer#disconnected()
-	 */
+	@Override
 	protected void disconnected() {
 		if (fAnnotationModel != null)
 			fAnnotationModel.disconnect(fDocument);
@@ -414,9 +389,7 @@ public class FileStoreTextFileBuffer extends FileStoreFileBuffer implements ITex
 
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.FileBuffer#commitFileBufferContent(org.eclipse.core.runtime.IProgressMonitor, boolean)
-	 */
+	@Override
 	protected void commitFileBufferContent(IProgressMonitor monitor, boolean overwrite) throws CoreException {
 		if (!isSynchronized() && !overwrite) {
 			String message= NLSUtility.format(FileBuffersMessages.FileBuffer_error_outOfSync, getFileStore().toURI());
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceExtensionRegistry.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceExtensionRegistry.java
index 531c6b9e329..0c171b05541 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceExtensionRegistry.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceExtensionRegistry.java
@@ -42,6 +42,7 @@ public class ResourceExtensionRegistry extends ExtensionsRegistry {
 	 * @param locationKind the kind of the given location
 	 * @return the set of content types for the location
 	 */
+	@Override
 	protected IContentType[] findContentTypes(IPath location, LocationKind locationKind) {
 		if (locationKind != LocationKind.LOCATION) {
 			IFile file= FileBuffers.getWorkspaceFileAtLocation(location);
@@ -58,6 +59,7 @@ public class ResourceExtensionRegistry extends ExtensionsRegistry {
 	 * @return the sharable document factory
 	 * @deprecated As of 3.5
 	 */
+	@Deprecated
 	org.eclipse.core.filebuffers.IDocumentFactory getDocumentFactory(IFile file) {
 		org.eclipse.core.filebuffers.IDocumentFactory factory= getDocumentFactory(findContentTypes(file));
 		if (factory == null) {
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java
index 2e409480905..514911246b4 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceFileBuffer.java
@@ -72,9 +72,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer {
 				fManager.fireStateChanging(ResourceFileBuffer.this);
 			}
 
-			/*
-			 * @see java.lang.Runnable#run()
-			 */
+			@Override
 			public void run() {
 
 				if (isDisconnected()) {
@@ -121,9 +119,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer {
 				fIsInstalled= false;
 			}
 
-			/*
-			 * @see IResourceChangeListener#resourceChanged(IResourceChangeEvent)
-			 */
+			@Override
 			public void resourceChanged(IResourceChangeEvent e) {
 				IResourceDelta delta= e.getDelta();
 				if (delta != null)
@@ -138,6 +134,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer {
 							if ((IResourceDelta.ENCODING & flags) != 0) {
 								if (!isDisconnected() && !fCanBeSaved && isSynchronized()) {
 									fileChange= new SafeFileChange() {
+										@Override
 										protected void execute() throws Exception {
 											handleFileContentChanged(false, false);
 										}
@@ -147,6 +144,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer {
 							if (fileChange == null && (IResourceDelta.CONTENT & flags) != 0) {
 								if (!isDisconnected() && !fCanBeSaved && (!isSynchronized() || (IResourceDelta.REPLACED & flags) != 0)) {
 									fileChange= new SafeFileChange() {
+										@Override
 										protected void execute() throws Exception {
 											handleFileContentChanged(false, true);
 										}
@@ -158,6 +156,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer {
 							if ((IResourceDelta.MOVED_TO & flags) != 0) {
 								final IPath path= delta.getMovedToPath();
 								fileChange= new SafeFileChange() {
+									@Override
 									protected void execute() throws Exception {
 										handleFileMoved(path);
 									}
@@ -165,6 +164,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer {
 							} else {
 								if (!isDisconnected() && !fCanBeSaved) {
 									fileChange= new SafeFileChange() {
+										@Override
 										protected void execute() throws Exception {
 											handleFileDeleted();
 										}
@@ -225,6 +225,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer {
 	abstract protected void handleFileContentChanged(boolean revert, boolean updateModificationStamp) throws CoreException;
 
 
+	@Override
 	public void create(IPath location, IProgressMonitor monitor) throws CoreException {
 		monitor= Progress.getMonitor(monitor);
 		monitor.beginTask(FileBuffersMessages.ResourceFileBuffer_task_creatingFileBuffer, 2);
@@ -256,6 +257,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer {
 		}
 	}
 
+	@Override
 	public void connect() {
 		++fReferenceCount;
 		if (fReferenceCount == 1)
@@ -272,6 +274,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer {
 		fFileSynchronizer.install();
 	}
 
+	@Override
 	public void disconnect() throws CoreException {
 		--fReferenceCount;
 		if (fReferenceCount <= 0)
@@ -292,32 +295,23 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer {
 		removeFileBufferContentListeners();
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.AbstractFileBuffer#isDisconnected()
-	 * @since 3.1
-	 */
+	@Override
 	public boolean isDisconnected() {
 		return fFileSynchronizer == null;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#getLocation()
-	 */
+	@Override
 	public IPath getLocation() {
 		return fLocation;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#computeCommitRule()
-	 */
+	@Override
 	public ISchedulingRule computeCommitRule() {
 		IResourceRuleFactory factory= ResourcesPlugin.getWorkspace().getRuleFactory();
 		return factory.modifyRule(fFile);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#commit(org.eclipse.core.runtime.IProgressMonitor, boolean)
-	 */
+	@Override
 	public void commit(IProgressMonitor monitor, boolean overwrite) throws CoreException {
 		if (!isDisconnected() && fCanBeSaved) {
 
@@ -338,9 +332,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#revert(org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public void revert(IProgressMonitor monitor) throws CoreException {
 		if (isDisconnected())
 			return;
@@ -360,38 +352,28 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#isDirty()
-	 */
+	@Override
 	public boolean isDirty() {
 		return fCanBeSaved;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#setDirty(boolean)
-	 */
+	@Override
 	public void setDirty(boolean isDirty) {
 		fCanBeSaved= isDirty;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#isShared()
-	 */
+	@Override
 	public boolean isShared() {
 		return fReferenceCount > 1;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#computeValidateStateRule()
-	 */
+	@Override
 	public ISchedulingRule computeValidateStateRule() {
 		IResourceRuleFactory factory= ResourcesPlugin.getWorkspace().getRuleFactory();
 		return factory.validateEditRule(new IResource[] { fFile });
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#validateState(org.eclipse.core.runtime.IProgressMonitor, java.lang.Object)
-	 */
+	@Override
 	public void validateState(IProgressMonitor monitor, Object computationContext) throws CoreException {
 		if (!isDisconnected() && !fIsStateValidated)  {
 
@@ -425,16 +407,12 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#isStateValidated()
-	 */
+	@Override
 	public boolean isStateValidated() {
 		return fIsStateValidated;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#resetStateValidation()
-	 */
+	@Override
 	public void resetStateValidation() {
 		if (fIsStateValidated) {
 			fIsStateValidated= false;
@@ -483,9 +461,7 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer {
 		log.log(exception.getStatus());
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#isSynchronized()
-	 */
+	@Override
 	public boolean isSynchronized() {
 		if (fSynchronizationStamp == fFile.getModificationStamp() && fFile.isSynchronized(IResource.DEPTH_ZERO))
 			return true;
@@ -494,38 +470,28 @@ public abstract class ResourceFileBuffer extends AbstractFileBuffer {
 		return false;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#requestSynchronizationContext()
-	 */
+	@Override
 	public void requestSynchronizationContext() {
 		++ fSynchronizationContextCount;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#releaseSynchronizationContext()
-	 */
+	@Override
 	public void releaseSynchronizationContext() {
 		-- fSynchronizationContextCount;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#isSynchronizationContextRequested()
-	 */
+	@Override
 	public boolean isSynchronizationContextRequested() {
 		return fSynchronizationContextCount > 0;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#isCommitable()
-	 */
+	@Override
 	public boolean isCommitable() {
 		IFileInfo info= fFileStore.fetchInfo();
 		return info.exists() && !info.getAttribute(EFS.ATTRIBUTE_READ_ONLY);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IStateValidationSupport#validationStateChanged(boolean, org.eclipse.core.runtime.IStatus)
-	 */
+	@Override
 	public void validationStateChanged(boolean validationState, IStatus status) {
 		fIsStateValidated= validationState;
 		fStatus= status;
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java
index c2de3c73409..465995a4ba6 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java
@@ -61,15 +61,11 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF
 
 	private class DocumentListener implements IDocumentListener {
 
-		/*
-		 * @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) {
 			if (fCanBeSaved && fSynchronizationStamp == event.getModificationStamp()) {
 				fCanBeSaved= false;
@@ -142,16 +138,12 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF
 		super(manager);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBuffer#getDocument()
-	 */
+	@Override
 	public IDocument getDocument() {
 		return fDocument;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBuffer#getAnnotationModel()
-	 */
+	@Override
 	public IAnnotationModel getAnnotationModel() {
 		synchronized (fAnnotationModelCreationLock) {
 			if (fAnnotationModel == null && !isDisconnected()) {
@@ -173,16 +165,12 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF
 		return (ResourceTextFileBufferManager)fManager;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBuffer#getEncoding()
-	 */
+	@Override
 	public String getEncoding() {
 		return fEncoding;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBuffer#setEncoding(java.lang.String)
-	 */
+	@Override
 	public void setEncoding(String encoding) {
 		fEncoding= encoding;
 		fExplicitEncoding= encoding;
@@ -197,9 +185,7 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#getStatus()
-	 */
+	@Override
 	public IStatus getStatus() {
 		if (!isDisconnected()) {
 			if (fStatus != null)
@@ -209,10 +195,7 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF
 		return STATUS_ERROR;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBuffer#getContentType()
-	 * @since 3.1
-	 */
+	@Override
 	public IContentType getContentType() throws CoreException {
 		try {
 			if (isDirty()) {
@@ -239,25 +222,19 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.FileBuffer#addFileBufferContentListeners()
-	 */
+	@Override
 	protected void addFileBufferContentListeners() {
 		if (fDocument != null)
 			fDocument.addDocumentListener(fDocumentListener);
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.FileBuffer#removeFileBufferContentListeners()
-	 */
+	@Override
 	protected void removeFileBufferContentListeners() {
 		if (fDocument != null)
 			fDocument.removeDocumentListener(fDocumentListener);
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.FileBuffer#initializeFileBufferContent(org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	protected void initializeFileBufferContent(IProgressMonitor monitor) throws CoreException {
 		try {
 			fEncoding= null;
@@ -306,9 +283,7 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF
 			fBOM= (byte[])description.getProperty(IContentDescription.BYTE_ORDER_MARK);
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.ResourceFileBuffer#connected()
-	 */
+	@Override
 	protected void connected() {
 		super.connected();
 		if (fAnnotationModel != null)
@@ -318,6 +293,7 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF
 	/*
 	 * @see org.eclipse.core.internal.filebuffers.ResourceFileBuffer#disconnected()
 	 */
+	@Override
 	protected void dispose() {
 		try {
 			fDocument.removePositionCategory(IDocument.DEFAULT_CATEGORY);
@@ -330,9 +306,7 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF
 		super.dispose();
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.FileBuffer#commitFileBufferContent(org.eclipse.core.runtime.IProgressMonitor, boolean)
-	 */
+	@Override
 	protected void commitFileBufferContent(IProgressMonitor monitor, boolean overwrite) throws CoreException {
 		if (!isSynchronized() && !overwrite) {
 			String message= NLSUtility.format(FileBuffersMessages.FileBuffer_error_outOfSync, getFileStore().toURI());
@@ -487,9 +461,7 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF
 		cacheBOM();
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.ResourceFileBuffer#handleFileContentChanged()
-	 */
+	@Override
 	protected void handleFileContentChanged(boolean revert, boolean updateModificationStamp) throws CoreException {
 
 		IDocument document= getManager().createEmptyDocument(fFile);
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBufferManager.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBufferManager.java
index edafab86194..d3932fdbe45 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBufferManager.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBufferManager.java
@@ -61,10 +61,7 @@ public class ResourceTextFileBufferManager extends TextFileBufferManager {
 		fRegistry= new ResourceExtensionRegistry();
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBufferManager#isTextFileLocation(org.eclipse.core.runtime.IPath, boolean)
-	 * @since 3.2
-	 */
+	@Override
 	public boolean isTextFileLocation(IPath location, boolean strict) {
 		Assert.isNotNull(location);
 		location= FileBuffers.normalizeLocation(location);
@@ -98,20 +95,17 @@ public class ResourceTextFileBufferManager extends TextFileBufferManager {
 		return isTextFileLocation(FileBuffers.getFileStoreAtLocation(location), strict);
 	}
 
-	/*
-	 * @see org.eclipse.core.buffer.text.IBufferedFileManager#getDefaultEncoding()
-	 */
+	@Override
 	public String getDefaultEncoding() {
 		return ResourcesPlugin.getEncoding();
 	}
 
-	/*
-	 * @see org.eclipse.core.internal.filebuffers.TextFileBufferManager#normalizeLocation(org.eclipse.core.runtime.IPath)
-	 */
+	@Override
 	protected IPath normalizeLocation(IPath location) {
 		return FileBuffers.normalizeLocation(location);
 	}
 
+	@Override
 	protected AbstractFileBuffer createTextFileBuffer(IPath location, LocationKind locationKind) {
 		if (locationKind == LocationKind.IFILE || locationKind == LocationKind.NORMALIZE  && FileBuffers.getWorkspaceFileAtLocation(location, true) != null)
 			return new ResourceTextFileBuffer(this);
@@ -146,6 +140,7 @@ public class ResourceTextFileBufferManager extends TextFileBufferManager {
 			for (int i= 0; i < participants.length; i++) {
 				final IDocumentSetupParticipant participant= participants[i];
 				ISafeRunnable runnable= new ISafeRunnable() {
+					@Override
 					public void run() throws Exception {
 						if (participant instanceof IDocumentSetupParticipantExtension)
 							((IDocumentSetupParticipantExtension)participant).setup(document, file.getFullPath(), LocationKind.IFILE);
@@ -158,6 +153,7 @@ public class ResourceTextFileBufferManager extends TextFileBufferManager {
 							FileBuffersPlugin.getDefault().getLog().log(status);
 						}
 					}
+					@Override
 					public void handleException(Throwable t) {
 						IStatus status= new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, FileBuffersMessages.TextFileBufferManager_error_documentSetupFailed, t);
 						FileBuffersPlugin.getDefault().getLog().log(status);
@@ -178,14 +174,17 @@ public class ResourceTextFileBufferManager extends TextFileBufferManager {
 	 * @since 3.5
 	 * @deprecated As of 3.5
 	 */
+	@Deprecated
 	private IDocument createEmptyDocumentFromFactory(final IFile file) {
 		final IDocument[] runnableResult= new IDocument[1];
 		final org.eclipse.core.filebuffers.IDocumentFactory factory= ((ResourceExtensionRegistry)fRegistry).getDocumentFactory(file);
 		if (factory != null) {
 			ISafeRunnable runnable= new ISafeRunnable() {
+				@Override
 				public void run() throws Exception {
 					runnableResult[0]= factory.createDocument();
 				}
+				@Override
 				public void handleException(Throwable t) {
 					IStatus status= new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, FileBuffersMessages.TextFileBufferManager_error_documentFactoryFailed, t);
 					FileBuffersPlugin.getDefault().getLog().log(status);
@@ -210,6 +209,7 @@ public class ResourceTextFileBufferManager extends TextFileBufferManager {
 		return Platform.getPreferencesService().getString(Platform.PI_RUNTIME, Platform.PREF_LINE_SEPARATOR, null, scopeContext);
 	}
 
+	@Override
 	protected String getLineDelimiterPreference(IPath location, LocationKind locationKind) {
 		IFile file= null;
 		if (locationKind != LocationKind.LOCATION)
@@ -217,12 +217,10 @@ public class ResourceTextFileBufferManager extends TextFileBufferManager {
 		return getLineDelimiterPreference(file);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBufferManager#validateState(org.eclipse.core.filebuffers.IFileBuffer[], org.eclipse.core.runtime.IProgressMonitor, java.lang.Object)
-	 * @since 3.1
-	 */
+	@Override
 	public void validateState(final IFileBuffer[] fileBuffers, IProgressMonitor monitor, final Object computationContext) throws CoreException {
 		IWorkspaceRunnable runnable= new IWorkspaceRunnable() {
+			@Override
 			public void run(IProgressMonitor progressMonitor) throws CoreException {
 				IFileBuffer[] toValidate= findFileBuffersToValidate(fileBuffers);
 				validationStateAboutToBeChanged(toValidate);
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/SynchronizableDocument.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/SynchronizableDocument.java
index d3b0a45bacb..cf4664d1c51 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/SynchronizableDocument.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/SynchronizableDocument.java
@@ -35,16 +35,12 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 
 	private Object fLockObject;
 
-	/*
-	 * @see org.eclipse.jface.text.ISynchronizable#setLockObject(java.lang.Object)
-	 */
+	@Override
 	public synchronized void setLockObject(Object lockObject) {
 		fLockObject= lockObject;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.ISynchronizable#getLockObject()
-	 */
+	@Override
 	public synchronized Object getLockObject() {
 		return fLockObject;
 	}
@@ -55,6 +51,8 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 	 * @deprecated As of 3.1, replaced by
 	 *             {@link IDocumentExtension4#startRewriteSession(DocumentRewriteSessionType)}
 	 */
+	@Deprecated
+	@Override
 	public void startSequentialRewrite(boolean normalized) {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -72,6 +70,8 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 	 * @deprecated As of 3.1, replaced by
 	 *             {@link IDocumentExtension4#stopRewriteSession(DocumentRewriteSession)}
 	 */
+	@Deprecated
+	@Override
 	public void stopSequentialRewrite() {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -83,11 +83,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractDocument#startRewriteSession(org.eclipse.jface.text.DocumentRewriteSessionType)
-	 *
-	 * @since 3.5
-	 */
+	@Override
 	public DocumentRewriteSession startRewriteSession(DocumentRewriteSessionType sessionType) {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -98,11 +94,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractDocument#stopRewriteSession(org.eclipse.jface.text.DocumentRewriteSession)
-	 *
-	 * @since 3.5
-	 */
+	@Override
 	public void stopRewriteSession(DocumentRewriteSession session) {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -114,9 +106,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see IDocument#get()
-	 */
+	@Override
 	public String get() {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -127,9 +117,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see IDocument#get(int, int)
-	 */
+	@Override
 	public String get(int offset, int length) throws BadLocationException {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -140,9 +128,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see IDocument#getChar(int)
-	 */
+	@Override
 	public char getChar(int offset) throws BadLocationException {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -153,10 +139,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IDocumentExtension4#getModificationStamp()
-	 * @since 3.1
-	 */
+	@Override
 	public long getModificationStamp() {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -167,9 +150,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see IDocument#replace(int, int, String)
-	 */
+	@Override
 	public void replace(int offset, int length, String text) throws BadLocationException {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -181,9 +162,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see IDocumentExtension4#replace(int, int, String, long)
-	 */
+	@Override
 	public void replace(int offset, int length, String text, long modificationStamp) throws BadLocationException {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -195,9 +174,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see IDocument#set(String)
-	 */
+	@Override
 	public void set(String text) {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -209,9 +186,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see IDocumentExtension4#set(String, long)
-	 */
+	@Override
 	public void set(String text, long modificationStamp) {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -223,9 +198,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractDocument#addPosition(java.lang.String, org.eclipse.jface.text.Position)
-	 */
+	@Override
 	public void addPosition(String category, Position position) throws BadLocationException, BadPositionCategoryException {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -237,9 +210,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractDocument#removePosition(java.lang.String, org.eclipse.jface.text.Position)
-	 */
+	@Override
 	public void removePosition(String category, Position position) throws BadPositionCategoryException {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -251,9 +222,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractDocument#getPositions(java.lang.String)
-	 */
+	@Override
 	public Position[] getPositions(String category) throws BadPositionCategoryException {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -264,10 +233,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractDocument#getPositions(java.lang.String, int, int, boolean, boolean)
-	 * @since 3.4
-	 */
+	@Override
 	public Position[] getPositions(String category, int offset, int length, boolean canStartBefore, boolean canEndAfter) throws BadPositionCategoryException {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -278,11 +244,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractDocument#computePartitioning(java.lang.String, int, int, boolean)
-	 *
-	 * @since 3.5
-	 */
+	@Override
 	public ITypedRegion[] computePartitioning(String partitioning, int offset, int length, boolean includeZeroLengthPartitions) throws BadLocationException, BadPartitioningException {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -293,11 +255,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractDocument#getLineDelimiter(int)
-	 *
-	 * @since 3.5
-	 */
+	@Override
 	public String getLineDelimiter(int line) throws BadLocationException {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -308,11 +266,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractDocument#getDefaultLineDelimiter()
-	 *
-	 * @since 3.5
-	 */
+	@Override
 	public String getDefaultLineDelimiter() {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -323,11 +277,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractDocument#getLineInformation(int)
-	 *
-	 * @since 3.5
-	 */
+	@Override
 	public IRegion getLineInformation(int line) throws BadLocationException {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -338,11 +288,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractDocument#getLineInformationOfOffset(int)
-	 *
-	 * @since 3.5
-	 */
+	@Override
 	public IRegion getLineInformationOfOffset(int offset) throws BadLocationException {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -353,11 +299,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractDocument#getLineLength(int)
-	 *
-	 * @since 3.5
-	 */
+	@Override
 	public int getLineLength(int line) throws BadLocationException {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -368,11 +310,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractDocument#getLineOffset(int)
-	 *
-	 * @since 3.5
-	 */
+	@Override
 	public int getLineOffset(int line) throws BadLocationException {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
@@ -383,11 +321,7 @@ public class SynchronizableDocument extends Document implements ISynchronizable
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.AbstractDocument#getLineOfOffset(int)
-	 *
-	 * @since 3.5
-	 */
+	@Override
 	public int getLineOfOffset(int pos) throws BadLocationException {
 		Object lockObject= getLockObject();
 		if (lockObject == null) {
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java
index 515156899b3..1a0da3fcec0 100644
--- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java
+++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/TextFileBufferManager.java
@@ -60,6 +60,7 @@ import org.eclipse.jface.text.source.IAnnotationModel;
 public class TextFileBufferManager implements ITextFileBufferManager {
 
 	private static abstract class SafeNotifier implements ISafeRunnable {
+		@Override
 		public void handleException(Throwable ex) {
 			// NOTE: Logging is done by SafeRunner
 		}
@@ -83,14 +84,13 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 	 *
 	 * @deprecated As of 3.3, replaced by {@link #connect(IPath, LocationKind, IProgressMonitor)}
 	 */
+	@Deprecated
+	@Override
 	public void connect(IPath location, IProgressMonitor monitor) throws CoreException {
 		connect(location, LocationKind.NORMALIZE, monitor);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBufferManager#connect(org.eclipse.core.runtime.IPath, org.eclipse.core.filebuffers.IFileBufferManager.LocationKind, org.eclipse.core.runtime.IProgressMonitor)
-	 * @since 3.3
-	 */
+	@Override
 	public void connect(IPath location, LocationKind locationKind, IProgressMonitor monitor) throws CoreException {
 		Assert.isNotNull(location);
 		if (locationKind == LocationKind.NORMALIZE)
@@ -127,10 +127,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		fireBufferCreated(fileBuffer);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBufferManager#connectFileStore(org.eclipse.core.filesystem.IFileStore, org.eclipse.core.runtime.IProgressMonitor)
-	 * @since 3.3
-	 */
+	@Override
 	public void connectFileStore(IFileStore fileStore, IProgressMonitor monitor) throws CoreException {
 		Assert.isLegal(fileStore != null);
 
@@ -170,6 +167,8 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 	 *
 	 * @deprecated As of 3.3, replaced by {@link #disconnect(IPath, LocationKind, IProgressMonitor)}
 	 */
+	@Deprecated
+	@Override
 	public void disconnect(IPath location, IProgressMonitor monitor) throws CoreException {
 		disconnect(location, LocationKind.NORMALIZE, monitor);
 	}
@@ -181,10 +180,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		return location;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBufferManager#disconnect(org.eclipse.core.runtime.IPath, org.eclipse.core.filebuffers.IFileBufferManager.LocationKind, org.eclipse.core.runtime.IProgressMonitor)
-	 * @since 3.3
-	 */
+	@Override
 	public void disconnect(IPath location, LocationKind locationKind, IProgressMonitor monitor) throws CoreException {
 		Assert.isNotNull(location);
 		if (locationKind == LocationKind.NORMALIZE)
@@ -208,10 +204,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		fileBuffer.dispose();
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBufferManager#disconnectFileStore(org.eclipse.core.filesystem.IFileStore, org.eclipse.core.runtime.IProgressMonitor)
-	 * @since 3.3
-	 */
+	@Override
 	public void disconnectFileStore(IFileStore fileStore, IProgressMonitor monitor) throws CoreException {
 		Assert.isLegal(fileStore != null);
 
@@ -238,6 +231,8 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 	 *
 	 * @deprecated As of 3.2, replaced by {@link #isTextFileLocation(IPath, boolean)}
 	 */
+	@Deprecated
+	@Override
 	public boolean isTextFileLocation(IPath location) {
 		return isTextFileLocation(location, false);
 	}
@@ -307,10 +302,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		return !strict;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBufferManager#isTextFileLocation(org.eclipse.core.runtime.IPath, boolean)
-	 * @since 3.2
-	 */
+	@Override
 	public boolean isTextFileLocation(IPath location, boolean strict) {
 		Assert.isNotNull(location);
 		location= normalizeLocation(location);
@@ -326,24 +318,20 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 	 *
 	 * @deprecated As of 3.3, replaced by {@link #getFileBuffer(IPath, LocationKind)}
 	 */
+	@Deprecated
+	@Override
 	public IFileBuffer getFileBuffer(IPath location) {
 		return getFileBuffer(location, LocationKind.NORMALIZE);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBufferManager#getFileBuffer(org.eclipse.core.runtime.IPath, org.eclipse.core.filebuffers.IFileBufferManager.LocationKind)
-	 * @since 3.3
-	 */
+	@Override
 	public IFileBuffer getFileBuffer(IPath location, LocationKind locationKind) {
 		if (locationKind == LocationKind.NORMALIZE)
 			location= normalizeLocation(location);
 		return internalGetFileBuffer(location);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBufferManager#getFileStoreFileBuffer(org.eclipse.core.filesystem.IFileStore)
-	 * @since 3.3
-	 */
+	@Override
 	public IFileBuffer getFileStoreFileBuffer(IFileStore fileStore) {
 		Assert.isLegal(fileStore != null);
 		return internalGetFileBuffer(fileStore);
@@ -366,31 +354,24 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 	 *
 	 * @deprecated As of 3.3, replaced by {@link #getTextFileBuffer(IPath, LocationKind)}
 	 */
+	@Deprecated
+	@Override
 	public ITextFileBuffer getTextFileBuffer(IPath location) {
 		return getTextFileBuffer(location, LocationKind.NORMALIZE);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBufferManager#getTextFileBuffer(org.eclipse.core.runtime.IPath, org.eclipse.core.filebuffers.IFileBufferManager.LocationKind)
-	 * @since 3.3
-	 */
+	@Override
 	public ITextFileBuffer getTextFileBuffer(IPath location, LocationKind locationKind) {
 		return (ITextFileBuffer)getFileBuffer(location, locationKind);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBufferManager#getFileStoreTextFileBuffer(org.eclipse.core.filesystem.IFileStore)
-	 * @since 3.3
-	 */
+	@Override
 	public ITextFileBuffer getFileStoreTextFileBuffer(IFileStore fileStore) {
 		Assert.isLegal(fileStore != null);
 		return (ITextFileBuffer)getFileStoreFileBuffer(fileStore);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBufferManager#getTextFileBuffer(org.eclipse.jface.text.IDocument)
-	 * @since 3.3
-	 */
+	@Override
 	public ITextFileBuffer getTextFileBuffer(IDocument document) {
 		Assert.isLegal(document != null);
 		Iterator iter;
@@ -425,10 +406,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBufferManager#getFileBuffers()
-	 * @since 3.4
-	 */
+	@Override
 	public IFileBuffer[] getFileBuffers() {
 		synchronized (fFilesBuffers) {
 			Collection values= fFilesBuffers.values();
@@ -436,10 +414,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBufferManager#getFileStoreFileBuffers()
-	 * @since 3.4
-	 */
+	@Override
 	public IFileBuffer[] getFileStoreFileBuffers() {
 		synchronized (fFileStoreFileBuffers) {
 			Collection values= fFileStoreFileBuffers.values();
@@ -447,9 +422,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.buffer.text.IBufferedFileManager#getDefaultEncoding()
-	 */
+	@Override
 	public String getDefaultEncoding() {
 		return System.getProperty("file.encoding"); //$NON-NLS-1$;
 	}
@@ -459,14 +432,13 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 	 *
 	 * @deprecated As of 3.3, replaced by {@link #createEmptyDocument(IPath, LocationKind)}
 	 */
+	@Deprecated
+	@Override
 	public IDocument createEmptyDocument(IPath location) {
 		return createEmptyDocument(location, LocationKind.NORMALIZE);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBufferManager#createEmptyDocument(org.eclipse.core.runtime.IPath, org.eclipse.core.filebuffers.LocationKind)
-	 * @since 3.3
-	 */
+	@Override
 	public IDocument createEmptyDocument(final IPath location, final LocationKind locationKind) {
 		IDocument documentFromFactory= createDocumentFromFactory(location, locationKind);
 		final IDocument document;
@@ -490,6 +462,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 			for (int i= 0; i < participants.length; i++) {
 				final IDocumentSetupParticipant participant= participants[i];
 				ISafeRunnable runnable= new ISafeRunnable() {
+					@Override
 					public void run() throws Exception {
 						if (participant instanceof IDocumentSetupParticipantExtension)
 							((IDocumentSetupParticipantExtension)participant).setup(document, location, locationKind);
@@ -502,6 +475,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 							FileBuffersPlugin.getDefault().getLog().log(status);
 						}
 					}
+					@Override
 					public void handleException(Throwable t) {
 						IStatus status= new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, FileBuffersMessages.TextFileBufferManager_error_documentSetupFailed, t);
 						FileBuffersPlugin.getDefault().getLog().log(status);
@@ -523,15 +497,18 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 	 * @since 3.5
 	 * @deprecated As of 3.5
 	 */
+	@Deprecated
 	private IDocument createDocumentFromFactory(final IPath location, final LocationKind locationKind) {
 		final IDocument[] runnableResult= new IDocument[1];
 		if (location != null) {
 			final org.eclipse.core.filebuffers.IDocumentFactory factory= fRegistry.getDocumentFactory(location, locationKind);
 			if (factory != null) {
 				ISafeRunnable runnable= new ISafeRunnable() {
+					@Override
 					public void run() throws Exception {
 						runnableResult[0]= factory.createDocument();
 					}
+					@Override
 					public void handleException(Throwable t) {
 						IStatus status= new Status(IStatus.ERROR, FileBuffersPlugin.PLUGIN_ID, IStatus.OK, FileBuffersMessages.TextFileBufferManager_error_documentFactoryFailed, t);
 						FileBuffersPlugin.getDefault().getLog().log(status);
@@ -548,14 +525,13 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 	 *
 	 * @deprecated As of 3.3, replaced by {@link #createAnnotationModel(IPath, LocationKind)}
 	 */
+	@Deprecated
+	@Override
 	public IAnnotationModel createAnnotationModel(IPath location) {
 		return createAnnotationModel(location, LocationKind.NORMALIZE);
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.ITextFileBufferManager#createAnnotationModel(org.eclipse.core.runtime.IPath, org.eclipse.core.filebuffers.LocationKind)
-	 * @since 3.3
-	 */
+	@Override
 	public IAnnotationModel createAnnotationModel(IPath location, LocationKind locationKind) {
 		Assert.isNotNull(location);
 		IAnnotationModelFactory factory= fRegistry.getAnnotationModelFactory(location, locationKind);
@@ -564,9 +540,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		return null;
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBufferManager#addFileBufferListener(org.eclipse.core.filebuffers.IFileBufferListener)
-	 */
+	@Override
 	public void addFileBufferListener(IFileBufferListener listener) {
 		Assert.isNotNull(listener);
 		synchronized (fFileBufferListeners) {
@@ -575,9 +549,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBufferManager#removeFileBufferListener(org.eclipse.core.filebuffers.IFileBufferListener)
-	 */
+	@Override
 	public void removeFileBufferListener(IFileBufferListener listener) {
 		Assert.isNotNull(listener);
 		synchronized (fFileBufferListeners) {
@@ -585,9 +557,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBufferManager#setSynchronizationContext(org.eclipse.core.filebuffers.ISynchronizationContext)
-	 */
+	@Override
 	public void setSynchronizationContext(ISynchronizationContext context) {
 		fSynchronizationContext= context;
 	}
@@ -598,6 +568,8 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 	 * @deprecated As of 3.1, replaced by
 	 *             {@link org.eclipse.core.filebuffers.IFileBuffer#requestSynchronizationContext()}
 	 */
+	@Deprecated
+	@Override
 	public void requestSynchronizationContext(IPath location) {
 		Assert.isNotNull(location);
 		location= normalizeLocation(location);
@@ -612,6 +584,8 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 	 *
 	 * @deprecated As of 3.1, replaced by {@link IFileBuffer#releaseSynchronizationContext()}
 	 */
+	@Deprecated
+	@Override
 	public void releaseSynchronizationContext(IPath location) {
 		Assert.isNotNull(location);
 		location= normalizeLocation(location);
@@ -621,9 +595,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 			fileBuffer.releaseSynchronizationContext();
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
+	@Override
 	public void execute(Runnable runnable) {
 		if (fSynchronizationContext != null)
 			fSynchronizationContext.run(runnable);
@@ -702,6 +674,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		while (e.hasNext()) {
 			final IFileBufferListener l= (IFileBufferListener) e.next();
 			SafeRunner.run(new SafeNotifier() {
+				@Override
 				public void run() {
 					l.dirtyStateChanged(buffer, isDirty);
 				}
@@ -714,6 +687,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		while (e.hasNext()) {
 			final IFileBufferListener l= (IFileBufferListener) e.next();
 			SafeRunner.run(new SafeNotifier() {
+				@Override
 				public void run() {
 					l.bufferContentAboutToBeReplaced(buffer);
 				}
@@ -726,6 +700,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		while (e.hasNext()) {
 			final IFileBufferListener l= (IFileBufferListener) e.next();
 			SafeRunner.run(new SafeNotifier() {
+				@Override
 				public void run() {
 					l.bufferContentReplaced(buffer);
 				}
@@ -738,6 +713,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		while (e.hasNext()) {
 			final IFileBufferListener l= (IFileBufferListener) e.next();
 			SafeRunner.run(new SafeNotifier() {
+				@Override
 				public void run() {
 					l.underlyingFileMoved(buffer, target);
 				}
@@ -750,6 +726,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		while (e.hasNext()) {
 			final IFileBufferListener l= (IFileBufferListener) e.next();
 			SafeRunner.run(new SafeNotifier() {
+				@Override
 				public void run() {
 					l.underlyingFileDeleted(buffer);
 				}
@@ -762,6 +739,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		while (e.hasNext()) {
 			final IFileBufferListener l= (IFileBufferListener) e.next();
 			SafeRunner.run(new SafeNotifier() {
+				@Override
 				public void run() {
 					l.stateValidationChanged(buffer, isStateValidated);
 				}
@@ -774,6 +752,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		while (e.hasNext()) {
 			final IFileBufferListener l= (IFileBufferListener) e.next();
 			SafeRunner.run(new SafeNotifier() {
+				@Override
 				public void run() {
 					l.stateChanging(buffer);
 				}
@@ -786,6 +765,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		while (e.hasNext()) {
 			final IFileBufferListener l= (IFileBufferListener) e.next();
 			SafeRunner.run(new SafeNotifier() {
+				@Override
 				public void run() {
 					l.stateChangeFailed(buffer);
 				}
@@ -798,6 +778,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		while (e.hasNext()) {
 			final IFileBufferListener l= (IFileBufferListener) e.next();
 			SafeRunner.run(new SafeNotifier() {
+				@Override
 				public void run() {
 					l.bufferCreated(buffer);
 				}
@@ -810,6 +791,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		while (e.hasNext()) {
 			final IFileBufferListener l= (IFileBufferListener) e.next();
 			SafeRunner.run(new SafeNotifier() {
+				@Override
 				public void run() {
 					l.bufferDisposed(buffer);
 				}
@@ -817,10 +799,7 @@ public class TextFileBufferManager implements ITextFileBufferManager {
 		}
 	}
 
-	/*
-	 * @see org.eclipse.core.filebuffers.IFileBufferManager#validateState(org.eclipse.core.filebuffers.IFileBuffer[], org.eclipse.core.runtime.IProgressMonitor, java.lang.Object)
-	 * @since 3.1
-	 */
+	@Override
 	public void validateState(final IFileBuffer[] fileBuffers, IProgressMonitor monitor, final Object computationContext) throws CoreException {
 	}