Remove useless non-javadoc/@see comments. (take 4)I20190417-1800

Put @Override instead where needed.

Change-Id: I3798bfbb5fd3c05c16531f7fac7885d2f6eb65b7
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

41 files changed, 155 insertions, 596 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java
index da35d05ca..49333af1d 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java
@@ -84,9 +84,7 @@ public class CVSCoreFileModificationValidator extends FileModificationValidator
         return uiValidator;
     }
     
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFileModificationValidator#validateMoveDelete(org.eclipse.core.resources.IFile[], org.eclipse.core.runtime.IProgressMonitor)
-	 */
+    @Override
 	public IStatus validateMoveDelete(IFile[] files, IProgressMonitor monitor) {
 		IFile[] readOnlyFiles = getManagedReadOnlyFiles(files);
 		if (readOnlyFiles.length == 0) return Status.OK_STATUS;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
index c5ac1306a..b84a4082e 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
@@ -285,9 +285,7 @@ public class CVSProviderPlugin extends Plugin {
 	    ConsoleListeners.getInstance().addListener(consoleListener);
 	}
 	
-	/**
-	 * @see Plugin#start(BundleContext)
-	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 
@@ -318,9 +316,7 @@ public class CVSProviderPlugin extends Plugin {
 	    tracker.open();
 	}
 	
-	/**
-	 * @see Plugin#stop(BundleContext)
-	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		try {
 			// unregister debug options listener
@@ -349,9 +345,7 @@ public class CVSProviderPlugin extends Plugin {
 		}
 	}
 		
-	/**
-	 * @see org.eclipse.core.runtime.Plugin#initializeDefaultPluginPreferences()
-	 */
+	@Override
 	protected void initializeDefaultPluginPreferences(){
 		Preferences store = getPluginPreferences();
 		store.setDefault(READ_ONLY, false);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java
index 5d31f7941..1e8306d93 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java
@@ -89,9 +89,7 @@ public class CVSStatus extends TeamStatus {
 		super(severity, CVSProviderPlugin.ID, CVSStatus.ERROR,  message, null, null);
 	}	
 	
-	/**
-	 * @see IStatus#getMessage()
-	 */
+	@Override
 	public String getMessage() {
 		String message = super.getMessage();
 		if (commandRoot != null) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRunnable.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRunnable.java
index 3c119c1d4..7e0bc8f46 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRunnable.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRunnable.java
@@ -24,7 +24,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
  * <p>
  * Clients may implement this interface.
  * </p>
- * @see 
  */
 public interface ICVSRunnable {
 	/**
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AddStructureVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AddStructureVisitor.java
index 2750eeaf9..a551bdc60 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AddStructureVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AddStructureVisitor.java
@@ -28,9 +28,7 @@ class AddStructureVisitor extends AbstractStructureVisitor {
 		super(session, localOptions, false, true);
 	}
 
-	/**
-	 * @see ICVSResourceVisitor#visitFile(IManagedFile)
-	 */
+	@Override
 	public void visitFile(ICVSFile mFile) throws CVSException {
 		
 		// Send the parent folder
@@ -43,9 +41,7 @@ class AddStructureVisitor extends AbstractStructureVisitor {
 		
 	}
 
-	/**
-	 * @see ICVSResourceVisitor#visitFolder(ICVSFolder)
-	 */
+	@Override
 	public void visitFolder(ICVSFolder mFolder) throws CVSException {
 		
 		Assert.isNotNull(mFolder);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java
index 236a1df91..4091eed84 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java
@@ -44,16 +44,12 @@ class FileStructureVisitor extends AbstractStructureVisitor {
 		this.sendEmptyFolders = sendEmptyFolders;
 	}
 
-	/**
-	 * @see ICVSResourceVisitor#visitFile(IManagedFile)
-	 */
+	@Override
 	public void visitFile(ICVSFile mFile) throws CVSException {
 		sendFile(mFile);
 	}
 
-	/**
-	 * @see ICVSResourceVisitor#visitFolder(ICVSFolder)
-	 */
+	@Override
 	public void visitFolder(ICVSFolder mFolder) throws CVSException {
 
 		if (sendEmptyFolders) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java
index 562ed9e7c..1e5ed8649 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java
@@ -101,9 +101,7 @@ class ImportStructureVisitor implements ICVSResourceVisitor {
 		return wrapMatcher;
 	}	
 	
-	/**
-	 * @see ICVSResourceVisitor#visitFile(IManagedFile)
-	 */
+	@Override
 	public void visitFile(ICVSFile mFile) throws CVSException {
 		if (ignoreMatcher != null && ignoreMatcher.match(mFile.getName())) {
 			return;
@@ -117,9 +115,7 @@ class ImportStructureVisitor implements ICVSResourceVisitor {
 		session.sendModified(mFile, binary, monitor);
 	}
 
-	/**
-	 * @see ICVSResourceVisitor#visitFolder(ICVSFolder)
-	 */
+	@Override
 	public void visitFolder(ICVSFolder mFolder) throws CVSException {
 		
 		if (ignoreMatcher != null && ignoreMatcher.match(mFolder.getName())) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModuleExpansionHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModuleExpansionHandler.java
index d1c9f25eb..4c39ba285 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModuleExpansionHandler.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModuleExpansionHandler.java
@@ -19,16 +19,12 @@ import org.eclipse.team.internal.ccvs.core.CVSException;
 
 public class ModuleExpansionHandler extends ResponseHandler {
 
-	/*
-	 * @see ResponseHandler#getResponseID()
-	 */
+	@Override
 	public String getResponseID() {
 		return "Module-expansion";//$NON-NLS-1$
 	}
 
-	/*
-	 * @see ResponseHandler#handle(Session, String, IProgressMonitor)
-	 */
+	@Override
 	public void handle(Session session, String expansion, IProgressMonitor monitor)
 		throws CVSException {
 			
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPVisitor.java
index c42f5a664..6790f23d9 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPVisitor.java
@@ -28,16 +28,12 @@ public class NOOPVisitor extends AbstractStructureVisitor {
 		super(session, localOptions, false, false);
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResourceVisitor#visitFile(ICVSFile)
-	 */
+	@Override
 	public void visitFile(ICVSFile file) throws CVSException {
 		sendPendingNotification(file);
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResourceVisitor#visitFolder(ICVSFolder)
-	 */
+	@Override
 	public void visitFolder(ICVSFolder folder) throws CVSException {
 		if (isRecurse() && folder.isCVSFolder()) {
 			folder.acceptChildren(this);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NewEntryHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NewEntryHandler.java
index 186ccd813..21f93ded8 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NewEntryHandler.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NewEntryHandler.java
@@ -21,16 +21,12 @@ import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
 
 public class NewEntryHandler extends ResponseHandler {
 
-	/*
-	 * @see ResponseHandler#getResponseID()
-	 */
+	@Override
 	public String getResponseID() {
 		return "New-entry"; //$NON-NLS-1$
 	}
 
-	/*
-	 * @see ResponseHandler#handle(Session, String, IProgressMonitor)
-	 */
+	@Override
 	public void handle(Session session, String localDir, IProgressMonitor monitor)
 		throws CVSException {
 			
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java
index 623de56de..6df20e6e4 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java
@@ -29,16 +29,12 @@ import org.eclipse.team.internal.ccvs.core.ICVSFolder;
  */
 public class NotifiedHandler extends ResponseHandler {
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.client.ResponseHandler#getResponseID()
-	 */
+	@Override
 	public String getResponseID() {
 		return "Notified"; //$NON-NLS-1$
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.client.ResponseHandler#handle(Session, String, IProgressMonitor)
-	 */
+	@Override
 	public void handle(
 		Session session,
 		String localDir,
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java
index 167a5aca8..a65ad5e92 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java
@@ -64,16 +64,13 @@ public class PruneFolderVisitor implements ICVSResourceVisitor {
 			pruneFolderAndParentsIfAppropriate(cvsFolder);
 		}
 	}
-	/**
-	 * @see ICVSResourceVisitor#visitFile(IManagedFile)
-	 */
+	
+	@Override
 	public void visitFile(ICVSFile file) throws CVSException {
 		// nothing to do here
 	}
 
-	/**
-	 * @see ICVSResourceVisitor#visitFolder(ICVSFolder)
-	 */
+	@Override
 	public void visitFolder(ICVSFolder folder) throws CVSException {
 		// First prune any empty children
 		folder.acceptChildren(this);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java
index 29a2d9477..7bc529dc1 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java
@@ -21,9 +21,7 @@ public class SyncUpdate extends Update {
 
 	public SyncUpdate() { };
 
-	/*
-	 * @see Command#sendFileStructure(ICVSResource,IProgressMonitor,boolean,boolean,boolean)
-	 */
+	@Override
     protected void sendFileStructure(Session session, ICVSResource[] resources,
             LocalOption[] localOptions, boolean emptyFolders, IProgressMonitor monitor) throws CVSException {
 			
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java
index 8d198ae9c..9c99a9a0f 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java
@@ -32,16 +32,12 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter;
  */
 public class TemplateHandler extends ResponseHandler {
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.client.ResponseHandler#getResponseID()
-	 */
+	@Override
 	public String getResponseID() {
 		return "Template"; //$NON-NLS-1$
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.client.ResponseHandler#handle(org.eclipse.team.internal.ccvs.core.client.Session, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public void handle(Session session, String localDir, IProgressMonitor monitor) throws CVSException {
 		session.readLine(); /* read the remote dir which is not needed */
         // Only read the template file if the container exists.
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java
index 918968259..973bd4cb9 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java
@@ -179,9 +179,7 @@ public class Update extends Command {
 		}
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.client.Command#doExecute(org.eclipse.team.internal.ccvs.core.client.Session, org.eclipse.team.internal.ccvs.core.client.Command.GlobalOption, org.eclipse.team.internal.ccvs.core.client.Command.LocalOption, java.lang.String, org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	protected IStatus doExecute(
 			Session session,
 			GlobalOption[] globalOptions,
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Version.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Version.java
index ca1e08b9a..388182224 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Version.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Version.java
@@ -37,9 +37,7 @@ public class Version extends RemoteCommand {
 	private static final String CVS_NT_PREFIX_1 = "Concurrent Versions System (CVS) NT "; //$NON-NLS-1$
 	private static final String CVS_NT_PREFIX_2 = "Concurrent Versions System (CVSNT) "; //$NON-NLS-1$
 	private static final String CVS_PREFIX = "Concurrent Versions System (CVS) "; //$NON-NLS-1$
-	/**
-	 * @see Request#getRequestId()
-	 */
+	@Override
 	protected String getRequestId() {
 		return "version"; //$NON-NLS-1$
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/EditorsListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/EditorsListener.java
index 8af43e8c3..73a6ebaa0 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/EditorsListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/EditorsListener.java
@@ -51,9 +51,7 @@ public class EditorsListener extends CommandOutputListener {
 	public EditorsListener() {
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener#messageLine(java.lang.String, org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation, org.eclipse.team.internal.ccvs.core.ICVSFolder, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public IStatus messageLine(
 		String line,
 		ICVSRepositoryLocation location,
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogEntry.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogEntry.java
index f01624345..6c88f1fcf 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogEntry.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogEntry.java
@@ -67,69 +67,51 @@ public class LogEntry extends PlatformObject implements ILogEntry {
 		this.revisions=revisions;
 	}
 
-	/**
-	 * @see ILogEntry#getRevision()
-	 */
+	@Override
 	public String getRevision() {
 		return file.getRevision();
 	}
 
-	/**
-	 * @see ILogEntry#getAuthor()
-	 */
+	@Override
 	public String getAuthor() {
 		return author;
 	}
 
-	/**
-	 * @see ILogEntry#getDate()
-	 */
+	@Override
 	public Date getDate() {
 		return date;
 	}
 
-	/**
-	 * @see ILogEntry#getComment()
-	 */
+	@Override
 	public String getComment() {
 		return comment;
 	}
 
-	/**
-	 * @see ILogEntry#getState()
-	 */
+	@Override
 	public String getState() {
 		return state;
 	}
 
-	/**
-	 * @see ILogEntry#getBranches()
-	 */
+	@Override
 	public CVSTag[] getBranches() {
 		CVSTag[] result = new CVSTag[branches.length];
 		System.arraycopy(branches, 0, result, 0, branches.length);
 		return result;
 	}
 
-	/**
-	 * @see ILogEntry#getTags()
-	 */
+	@Override
 	public CVSTag[] getTags() {
 		CVSTag[] result = new CVSTag[tags.length];
 		System.arraycopy(tags, 0, result, 0, tags.length);
 		return result;
 	}
 
-	/**
-	 * @see ILogEntry#getRemoteFile()
-	 */
+	@Override
 	public ICVSRemoteFile getRemoteFile() {
 		return file;
 	}
 	
-	/**
-	 * @see ILogEntry#isDeletion()
-	 */
+	@Override
 	public boolean isDeletion() {
 		return getState().equals("dead"); //$NON-NLS-1$
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ModuleDefinitionsListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ModuleDefinitionsListener.java
index 7a8d52030..1d7440a2a 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ModuleDefinitionsListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ModuleDefinitionsListener.java
@@ -38,9 +38,7 @@ public class ModuleDefinitionsListener extends CommandOutputListener {
 		reset();
 	}
 	
-	/*
-	 * @see ICommandOutputListener#messageLine(String, ICVSFolder, IProgressMonitor)
-	 */
+	@Override
 	public IStatus messageLine(
 		String line,
 		ICVSRepositoryLocation location,
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java
index ccd51c3cf..b4ac98897 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java
@@ -23,9 +23,7 @@ import org.eclipse.team.internal.ccvs.core.client.CommandOutputListener;
 
 public class TagListener extends CommandOutputListener {
 
-	/*
-	 * @see ICommandOutputListener#messageLine(String, ICVSFolder, IProgressMonitor)
-	 */
+	@Override
 	public IStatus messageLine(
 		String line,
 		ICVSRepositoryLocation location,
@@ -42,9 +40,7 @@ public class TagListener extends CommandOutputListener {
 		return OK;
 	}
 
-	/*
-	 * @see ICommandOutputListener#errorLine(String, ICVSFolder, IProgressMonitor)
-	 */
+	@Override
 	public IStatus errorLine(
 		String line,
 		ICVSRepositoryLocation location,
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
index 2277dfd6d..f484b4055 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
@@ -599,23 +599,17 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
 			root;
 	}
 	
-	/*
-	 * @see ICVSRepositoryLocation#getMethod()
-	 */
+	@Override
 	public IConnectionMethod getMethod() {
 		return method;
 	}
 
-	/*
-	 * @see ICVSRepositoryLocation#getPort()
-	 */
+	@Override
 	public int getPort() {
 		return port;
 	}
 	
-	/*
-	 * @see ICVSRepositoryLocation#getEncoding()
-	 */
+	@Override
 	public String getEncoding() {
 		if (hasPreferences()) {
 			return internalGetPreferences().get(PREF_SERVER_ENCODING, getDefaultEncoding());
@@ -624,9 +618,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
 		}
 	}
 
-	/*
-	 * @see ICVSRepositoryLocation#setEncoding()
-	 */
+	@Override
 	public void setEncoding(String encoding) {
 		if (encoding == null || encoding == getDefaultEncoding()) {
 			if (hasPreferences()) {
@@ -639,9 +631,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
 		}
 	}	
 
-	/*
-	 * @see ICVSRepositoryLocation#members(CVSTag, boolean, IProgressMonitor)
-	 */
+	@Override
 	public ICVSRemoteResource[] members(CVSTag tag, boolean modules, IProgressMonitor progress) throws CVSException {
 		try {
 			if (modules) {
@@ -668,16 +658,12 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
 		}
 	}
 	
-	/*
-	 * @see ICVSRepositoryLocation#getRemoteFolder(String, CVSTag)
-	 */
+	@Override
 	public ICVSRemoteFolder getRemoteFolder(String remotePath, CVSTag tag) {
 		return new RemoteFolder(null, this, remotePath, tag);		
 	}
 	
-	/*
-	 * @see ICVSRepositoryLocation#getRemoteFile(String, CVSTag)
-	 */
+	@Override
 	public ICVSRemoteFile getRemoteFile(String remotePath, CVSTag tag) {
 		IPath path = new Path(null, remotePath);
 		RemoteFolderTree remoteFolder = new RemoteFolderTree(null, this, path.removeLastSegments(1).toString(), tag);
@@ -686,9 +672,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
 		return remoteFile;
 	}
 	
-	/*
-	 * @see ICVSRepositoryLocation#getRootDirectory()
-	 */
+	@Override
 	public String getRootDirectory() {
 		return root;
 	}
@@ -703,17 +687,12 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
 		return CVSProviderPlugin.getPlugin().getTimeout();
 	}
 	
-	/*
-	 * @see ICVSRepositoryLocation#getUserInfo()
-	 */
+	@Override
 	public IUserInfo getUserInfo(boolean makeUsernameMutable) {
 		return new UserInfo(getUsername(), password, makeUsernameMutable ? true : isUsernameMutable());
 	}
 	
-	/*
-	 * @see ICVSRepositoryLocation#getUsername()
-	 * @see IUserInfo#getUsername()
-	 */
+	@Override
 	public String getUsername() {
 		// If the username is mutable, get it from the cache if it's there
 		if (user == null && isUsernameMutable()) {
@@ -722,9 +701,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
 		return user == null ? "" : user; //$NON-NLS-1$
 	}
 	
-	/*
-	 * @see IUserInfo#isUsernameMutable()
-	 */
+	@Override
 	public boolean isUsernameMutable() {
 		return !userFixed;
 	}
@@ -948,9 +925,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
 		}
 		return null;
 	}
-	/*
-	 * @see IUserInfo#setPassword(String)
-	 */
+	@Override
 	public void setPassword(String password) {
 		if (passwordFixed)
 			throw new UnsupportedOperationException();
@@ -962,9 +937,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
 		previousAuthenticationFailed = false;
 	}
 	
-	/*
-	 * @see IUserInfo#setUsername(String)
-	 */
+	@Override
 	public void setUsername(String user) {
 		if (userFixed)
 			throw new UnsupportedOperationException();
@@ -1082,9 +1055,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
 		}
 	}
 	
-	/**
-	 * @see ICVSRepositoryLocation#flushUserInfo()
-	 */
+	@Override
 	public void flushUserInfo() {
 		removeNode();
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnectionMethod.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnectionMethod.java
index cabfbaf34..cb0bf14cd 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnectionMethod.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnectionMethod.java
@@ -17,16 +17,12 @@ package org.eclipse.team.internal.ccvs.core.connection;
 import org.eclipse.team.internal.ccvs.core.*;
 
 public class ExtConnectionMethod implements IConnectionMethod {
-	/**
-	 * @see IConnectionMethod#getName
-	 */
+	@Override
 	public String getName() {
 		return "ext"; //$NON-NLS-1$
 	}
 	
-	/**
-	 * @see IConnectionMethod#createConnection
-	 */
+	@Override
 	public IServerConnection createConnection(ICVSRepositoryLocation repositoryRoot, String password) {
 		if(password==null){
 			password=""; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnection.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnection.java
index 700851a57..935069365 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnection.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnection.java
@@ -74,9 +74,7 @@ public class PServerConnection implements IServerConnection {
 	private InputStream inputStream;
 	private OutputStream outputStream;
 	
-	/**
-	 * @see Connection#doClose()
-	 */
+	@Override
 	public void close() throws IOException {
 		try {
 			if (inputStream != null) inputStream.close();
@@ -95,9 +93,7 @@ public class PServerConnection implements IServerConnection {
 		}
 	}
 
-	/**
-	 * @see Connection#doOpen()
-	 */
+	@Override
 	public void open(IProgressMonitor monitor) throws IOException, CVSAuthenticationException {
 		
 		monitor.subTask(CVSMessages.PServerConnection_authenticating);
@@ -154,15 +150,11 @@ public class PServerConnection implements IServerConnection {
         return proxy;
     }
 
-    /**
-	 * @see Connection#getInputStream()
-	 */
+	@Override
 	public InputStream getInputStream() {
 		return inputStream;
 	}
-	/**
-	 * @see Connection#getOutputStream()
-	 */
+	@Override
 	public OutputStream getOutputStream() {
 		return outputStream;
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnectionMethod.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnectionMethod.java
index 3db521346..73846f398 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnectionMethod.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnectionMethod.java
@@ -17,25 +17,19 @@ import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation;
 import org.eclipse.team.internal.ccvs.core.IConnectionMethod;
 import org.eclipse.team.internal.ccvs.core.IServerConnection;
 public class PServerConnectionMethod implements IConnectionMethod {
-	/**
-	 * @see IConnectionMethod#createConnection(ICVSRepositoryLocation, String)
-	 */
+	@Override
 	public IServerConnection createConnection(ICVSRepositoryLocation location, String password) {
 		if(password==null){
 			password=""; //$NON-NLS-1$
 		}
 		return new PServerConnection(location, password);
 	}
-	/**
-	 * @see IConnectionMethod#getName()
-	 */
+	@Override
 	public String getName() {
 		return "pserver";//$NON-NLS-1$
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.IConnectionMethod#disconnect(org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation)
-	 */
+	@Override
 	public void disconnect(ICVSRepositoryLocation location) {
 	}
 }
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/UserInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/UserInfo.java
index 0d072110f..2ba13c43e 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/UserInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/UserInfo.java
@@ -32,9 +32,7 @@ public class UserInfo implements IUserInfo {
 		this.isUsernameMutable = isUsernameMutable;
 	}
 	
-	/*
-	 * @see IUserInfo#getUsername()
-	 */
+	@Override
 	public String getUsername() {
 		return username;
 	}
@@ -43,23 +41,17 @@ public class UserInfo implements IUserInfo {
 		return password;
 	}
 	
-	/*
-	 * @see IUserInfo#isUsernameMutable()
-	 */
+	@Override
 	public boolean isUsernameMutable() {
 		return isUsernameMutable;
 	}
 
-	/*
-	 * @see IUserInfo#setPassword(String)
-	 */
+	@Override
 	public void setPassword(String password) {
 		this.password = password;
 	}
 
-	/*
-	 * @see IUserInfo#setUsername(String)
-	 */
+	@Override
 	public void setUsername(String username) {
 		this.username = username;
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
index 8bad06df9..61402eedd 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
@@ -45,9 +45,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 		super(file);
 	}
 
-	/*
-	 * @see ICVSResource#delete()
-	 */
+	@Override
 	public void delete() throws CVSException {
 		try {
 			((IFile)resource).delete(false /*force*/, true /*keepHistory*/, null);
@@ -68,9 +66,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
  		}
  	}
 	
-	/*
-	 * @see ICVSFile#getTimeStamp()
-	 */
+	@Override
 	public Date getTimeStamp() {
 		long timestamp = getIFile().getLocalTimeStamp();
 		if( timestamp == IResource.NULL_STAMP) {
@@ -80,9 +76,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 		return new Date((timestamp/1000)*1000);
 	}
  
-	/*
-	 * @see ICVSFile#setTimeStamp(Date)
-	 */
+	@Override
 	public void setTimeStamp(Date date) throws CVSException {
 		long time;
 		if (date == null) {
@@ -93,9 +87,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 		EclipseSynchronizer.getInstance().setTimeStamp(this, time);
 	}
 
-	/*
-	 * @see ICVSResource#isFolder()
-	 */
+	@Override
 	public boolean isFolder() {
 		return false;
 	}
@@ -129,16 +121,12 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 		return EclipseSynchronizer.getInstance().setModified(this, UNKNOWN);
 	}
 	
-	/*
-	 * @see ICVSResource#accept(ICVSResourceVisitor)
-	 */
+	@Override
 	public void accept(ICVSResourceVisitor visitor) throws CVSException {
 		visitor.visitFile(this);
 	}
 
-	/*
-	 * @see ICVSResource#accept(ICVSResourceVisitor, boolean)
-	 */
+	@Override
 	public void accept(ICVSResourceVisitor visitor, boolean recurse) throws CVSException {
 		visitor.visitFile(this);
 	}
@@ -161,16 +149,12 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 		}
 	}
 
-	/*
-	 * @see ICVSResource#getRemoteLocation()
-	 */
+	@Override
 	public String getRemoteLocation(ICVSFolder stopSearching) throws CVSException {
 		return getParent().getRemoteLocation(stopSearching) + SEPARATOR + getName();
 	}
 		
-	/*
-	 * @see ICVSFile#setReadOnly()
-	 */
+	@Override
 	public void setContents(InputStream stream, int responseType, boolean keepLocalHistory, IProgressMonitor monitor) throws CVSException {
 		try {
 			IFile file = getIFile();
@@ -214,9 +198,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 		}
 	}
 			
-	/*
-	 * @see ICVSFile#setReadOnly()
-	 */
+	@Override
 	public void setReadOnly(boolean readOnly) throws CVSException {
 		ResourceAttributes attributes = resource.getResourceAttributes();
 		if (attributes != null) {
@@ -229,16 +211,12 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 		}
 	}
 
-	/*
-	 * @see ICVSFile#isReadOnly()
-	 */
+	@Override
 	public boolean isReadOnly() throws CVSException {
 		return getIFile().isReadOnly();
 	}
 	
-	/*
-	 * @see ICVSFile#setExecutable()
-	 */
+	@Override
 	public void setExecutable(boolean executable) throws CVSException {
 		ResourceAttributes attributes = resource.getResourceAttributes();
 		if (attributes != null) {
@@ -251,9 +229,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 		}
 	}
 
-	/*
-	 * @see ICVSFile#isExectuable()
-	 */
+	@Override
 	public boolean isExecutable() throws CVSException {
 		ResourceAttributes attributes = resource.getResourceAttributes();
 		if (attributes != null) {
@@ -280,9 +256,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 		}
 		return null;
 	}
-	/**
-	 * @see ICVSFile#getLogEntries(IProgressMonitor)
-	 */
+	@Override
 	public ILogEntry[] getLogEntries(IProgressMonitor monitor)	throws TeamException {
 		
 		// try fetching log entries only when the file's project is accessible
@@ -343,9 +317,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 		return null;
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#checkout(int)
-	 */
+	@Override
 	public void edit(final int notifications, boolean notifyForWritable, IProgressMonitor monitor) throws CVSException {
 		if (!notifyForWritable && !isReadOnly()) return;
 		run(monitor1 -> {
@@ -393,9 +365,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 		
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#uncheckout()
-	 */
+	@Override
 	public void unedit(IProgressMonitor monitor) throws CVSException {
 		if (isReadOnly()) return;
 		run(monitor1 -> {
@@ -439,16 +409,12 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 		}, monitor);
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#notificationCompleted()
-	 */
+	@Override
 	public void notificationCompleted() throws CVSException {
 		EclipseSynchronizer.getInstance().deleteNotifyInfo(resource);
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#getPendingNotification()
-	 */
+	@Override
 	public NotifyInfo getPendingNotification() throws CVSException {
 		return getNotifyInfo();
 	}
@@ -536,9 +502,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
         }
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#unmanage(org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public void unmanage(IProgressMonitor monitor) throws CVSException {
 		run(monitor1 -> {
 			EclipseFile.super.unmanage(monitor1);
@@ -546,23 +510,17 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 		}, monitor);
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#isEdited()
-	 */
+	@Override
 	public boolean isEdited() throws CVSException {
 		return EclipseSynchronizer.getInstance().isEdited(getIFile());
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#setSyncInfo(org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo)
-	 */
+	@Override
 	public void setSyncInfo(ResourceSyncInfo info, int modificationState) throws CVSException {
 		setSyncBytes(info.getBytes(), info, modificationState);
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.EclipseResource#setSyncBytes(byte[], int)
-	 */
+	@Override
 	public void setSyncBytes(byte[] syncBytes, int modificationState) throws CVSException {
 		setSyncBytes(syncBytes, null, modificationState);
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java
index 1874d8c57..648eb7fb2 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java
@@ -39,9 +39,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
 		super(container);		
 	}
 	
-	/**
-	 * @see ICVSFolder#members(int)
-	 */
+	@Override
 	public ICVSResource[] members(int flags) throws CVSException {		
 		final List<ICVSResource> result = new ArrayList<>();
 		IResource[] resources = EclipseSynchronizer.getInstance().members((IContainer)resource);
@@ -85,9 +83,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
 		return (ICVSResource[]) result.toArray(new ICVSResource[result.size()]);
 	}
 
-	/**
-	 * @see ICVSFolder#createFolder(String)
-	 */
+	@Override
 	public ICVSFolder getFolder(String name) throws CVSException {
 		if ((CURRENT_LOCAL_FOLDER.equals(name)) || ((CURRENT_LOCAL_FOLDER + SEPARATOR).equals(name)))
 			return this;
@@ -99,16 +95,12 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
 		}
 	}
 
-	/**
-	 * @see ICVSFolder#createFile(String)
-	 */
+	@Override
 	public ICVSFile getFile(String name) throws CVSException {
 		return new EclipseFile(((IContainer)resource).getFile(new Path(null, name)));
 	}
 
-	/**
-	 * @see ICVSFolder#mkdir()
-	 */
+	@Override
 	public void mkdir() throws CVSException {
 		ISchedulingRule rule = null;
 		try {
@@ -132,16 +124,12 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
 		}
 	}
 		
-	/**
-	 * @see ICVSResource#isFolder()
-	 */
+	@Override
 	public boolean isFolder() {
 		return true;
 	}
 		
-	/**
-	 * @see ICVSFolder#acceptChildren(ICVSResourceVisitor)
-	 */
+	@Override
 	public void acceptChildren(ICVSResourceVisitor visitor) throws CVSException {
 		
 		// Visit files and then folders
@@ -155,16 +143,12 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
 		}
 	}
 
-	/**
-	 * @see ICVSResource#accept(ICVSResourceVisitor)
-	 */
+	@Override
 	public void accept(ICVSResourceVisitor visitor) throws CVSException {
 		visitor.visitFolder(this);
 	}
 	
-	/**
-	 * @see ICVSResource#accept(ICVSResourceVisitor, boolean)
-	 */
+	@Override
 	public void accept(ICVSResourceVisitor visitor, boolean recurse) throws CVSException {
 		visitor.visitFolder(this);
 		ICVSResource[] resources;
@@ -178,9 +162,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
 		}
 	}
 
-	/**
-	 * @see ICVSResource#getRemoteLocation(ICVSFolder)
-	 */
+	@Override
 	public String getRemoteLocation(ICVSFolder stopSearching) throws CVSException {
 				
 		if (getFolderSyncInfo() != null) {
@@ -198,9 +180,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
 		return null;
 	}
 
-	/*
-	 * @see ICVSFolder#getFolderInfo()
-	 */
+	@Override
 	public FolderSyncInfo getFolderSyncInfo() throws CVSException {
 		if (resource.getType() != IResource.ROOT && !resource.getProject().isAccessible()) {
 			return null;
@@ -208,9 +188,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
 		return EclipseSynchronizer.getInstance().getFolderSync((IContainer)resource);
 	}
 
-	/*
-	 * @see ICVSFolder#setFolderInfo(FolderSyncInfo)
-	 */
+	@Override
 	public void setFolderSyncInfo(final FolderSyncInfo folderInfo) throws CVSException {
 		// ignore folder sync on the root (i.e. CVSROOT/config/TopLevelAdmin=yes but we just ignore it)
 		if (resource.getType() == IResource.ROOT) return;
@@ -229,16 +207,12 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
 
 	}
 
-	/*
-	 * @see ICVSFolder#isCVSFolder()
-	 */
+	@Override
 	public boolean isCVSFolder() throws CVSException {
 		return EclipseSynchronizer.getInstance().getFolderSync((IContainer)resource) != null;
 	}
 
-	/*
-	 * @see ICVSResource#unmanage()
-	 */
+	@Override
 	public void unmanage(IProgressMonitor monitor) throws CVSException {
 		run((ICVSRunnable) monitor1 -> {
 			monitor1 = Policy.monitorFor(monitor1);
@@ -276,9 +250,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
 		}
 	}
 	
-	/*
-	 * @see ICVSResource#isIgnored()
-	 */
+	@Override
 	public boolean isIgnored() throws CVSException {
 		if(isCVSFolder()) {
 			return false;
@@ -286,9 +258,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
 		return super.isIgnored();
 	}
 	
-	/*
-	 * @see ICVSFolder#getChild(String)
-	 */
+	@Override
 	public ICVSResource getChild(String namedPath) throws CVSException {
 	    if (namedPath.equals(Session.CURRENT_LOCAL_FOLDER)) {
 	        return this;
@@ -308,15 +278,11 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
 		return null;
 	}
 	
-	/**
-	 * @see ICVSFolder#fetchChildren(IProgressMonitor)
-	 */
+	@Override
 	public ICVSResource[] fetchChildren(IProgressMonitor monitor) throws CVSException {
 		return members(FILE_MEMBERS | FOLDER_MEMBERS);
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#delete()
-	 */
+	@Override
 	public void delete() throws CVSException {
 		if (!exists()) return;
 		try {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java
index e2cd4e056..be79effb9 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java
@@ -70,9 +70,7 @@ abstract class EclipseResource implements ICVSResource, Comparable {
 		}
 	}
 
-	/*
-	 * @see ICVSResource#exists()
-	 */
+	@Override
 	public boolean exists() {
 		return resource.exists();
 	}
@@ -91,16 +89,12 @@ abstract class EclipseResource implements ICVSResource, Comparable {
 		return new EclipseFolder(parent);
 	}
 
-	/*
-	 * @see ICVSResource#getName()
-	 */
+	@Override
 	public String getName() {
 		return resource.getName();
 	}
 
-	/*
-	 * @see ICVSResource#isIgnored()
-	 */
+	@Override
 	public boolean isIgnored() throws CVSException {
 		// a managed resource is never ignored
 		if(isManaged() || resource.getType()==IResource.ROOT || resource.getType()==IResource.PROJECT) {
@@ -134,16 +128,12 @@ abstract class EclipseResource implements ICVSResource, Comparable {
 		return info.isVirtualDirectory();
 	}
 	
-	/*
-	 * @see ICVSResource#setIgnoredAs(String)
-	 */
+	@Override
 	public void setIgnoredAs(final String pattern) throws CVSException {
 		run(monitor -> EclipseSynchronizer.getInstance().addIgnored(resource.getParent(), pattern), null);
 	}
 
-	/*
-	 * @see ICVSResource#isManaged()
-	 */
+	@Override
 	public boolean isManaged() throws CVSException {
 		return isManaged(getSyncBytes());
 	}
@@ -175,9 +165,7 @@ abstract class EclipseResource implements ICVSResource, Comparable {
 		return resource.getFullPath().toString();
 	}	
 	
-	/*
-	 * @see ICVSResource#isFolder()
-	 */
+	@Override
 	public boolean isFolder() {
 		return false;
 	}
@@ -198,9 +186,7 @@ abstract class EclipseResource implements ICVSResource, Comparable {
 		}
 	}
 	
-	/*
-	 * @see ICVSResource#getSyncInfo()
-	 */
+	@Override
 	public ResourceSyncInfo getSyncInfo() throws CVSException {
 		return EclipseSynchronizer.getInstance().getResourceSync(resource);
 	}
@@ -219,24 +205,18 @@ abstract class EclipseResource implements ICVSResource, Comparable {
 		return getPath();
 	}
 	
-	/*
-	 * @see ICVSResource#unmanage()
-	 */
+	@Override
 	public void unmanage(IProgressMonitor monitor) throws CVSException {
 		EclipseSynchronizer.getInstance().deleteResourceSync(resource);
 	}
 	
-	/*
-	 * @see Comparable#compareTo(Object)
-	 */
+	@Override
 	public int compareTo(Object arg0) {
 		EclipseResource other = (EclipseResource)arg0;
 		return resource.getFullPath().toString().compareTo(other.resource.getFullPath().toString());
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#getIResource()
-	 */
+	@Override
 	public IResource getIResource() {
 		return resource;
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java
index d40958e5d..3a9b0e33f 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java
@@ -168,25 +168,16 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile  {
 		setWorkspaceSyncState(workspaceSyncState);
 	}
 
-	/**
-	 * @see ICVSResource#accept(ICVSResourceVisitor)
-	 */
 	@Override
 	public void accept(ICVSResourceVisitor visitor) throws CVSException {
 		visitor.visitFile(this);
 	}
 
-	/**
-	 * @see ICVSResource#accept(ICVSResourceVisitor, boolean)
-	 */
 	@Override
 	public void accept(ICVSResourceVisitor visitor, boolean recurse) throws CVSException {
 		visitor.visitFile(this);
 	}
 	
-	/**
-	 * @see ICVSRemoteFile#getContents()
-	 */
 	@Override
 	public InputStream getContents(IProgressMonitor monitor) throws CVSException {
 		try {
@@ -277,9 +268,6 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile  {
 		return entry;
 	}
 	
-	/**
-	 * @see ICVSRemoteFile#getLogEntries()
-	 */
 	@Override
 	public ILogEntry[] getLogEntries(IProgressMonitor monitor) throws CVSException {
 		monitor = Policy.monitorFor(monitor);
@@ -309,9 +297,6 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile  {
 		}
 	}
 	
-	/**
-	 * @see ICVSRemoteFile#getRevision()
-	 */
 	@Override
 	public String getRevision() {
 		try {
@@ -344,9 +329,6 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile  {
 		return file;
 	}
 
-	/**
-	 * @see ICVSFile#getSyncInfo()
-	 */
 	@Override
 	public ResourceSyncInfo getSyncInfo() {
 		try {
@@ -357,9 +339,6 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile  {
 		}
 	}
 	
-	/**
-	 * @see ICVSResource#getRemoteLocation(ICVSFolder)
-	 */
 	@Override
 	public String getRemoteLocation(ICVSFolder stopSearching) throws CVSException {
 		return parent.getRemoteLocation(stopSearching) + Session.SERVER_SEPARATOR + getName();
@@ -382,9 +361,6 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile  {
 		return parent.getRepository();
 	}
 	
-	/**
-	 * @see IManagedFile#setFileInfo(FileProperties)
-	 */
 	@Override
 	public void setSyncInfo(ResourceSyncInfo fileInfo, int modificationState) {
 		setSyncBytes(fileInfo.getBytes(),modificationState);
@@ -464,9 +440,6 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile  {
 		// RemoteFiles are not mutable so do not support timestamp changes
 	}
 
-	/**
-	 * @see ICVSFile#moveTo(String)
-	 */
 	@Override
 	public void copyTo(String mFile) {		
 		// Do nothing
@@ -522,49 +495,31 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile  {
 		return super.equals(target) && remote.getRevision().equals(getRevision());
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#checkout(int)
-	 */
 	@Override
 	public void edit(int notifications, boolean notifyForWritable, IProgressMonitor monitor) {
 		// do nothing
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#uncheckout()
-	 */
 	@Override
 	public void unedit(IProgressMonitor monitor) {
 		// do nothing
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#notificationCompleted()
-	 */
 	@Override
 	public void notificationCompleted() {
 		// do nothing
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#getPendingNotification()
-	 */
 	@Override
 	public NotifyInfo getPendingNotification() {
 		return null;
 	}
 
-	/**
-	 * @see RemoteResource#forTag(ICVSRemoteFolder, CVSTag)
-	 */
 	@Override
 	public ICVSRemoteResource forTag(ICVSRemoteFolder parent, CVSTag tag) {
 		return new RemoteFile((RemoteFolder)parent, getWorkspaceSyncState(), getName(), getRevision(), getKeywordMode(), tag);
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSRemoteResource#forTag(org.eclipse.team.internal.ccvs.core.CVSTag)
-	 */
 	@Override
 	public ICVSRemoteResource forTag(CVSTag tag) {
 		RemoteFolderTree remoteFolder = new RemoteFolderTree(null, getRepository(), 
@@ -574,30 +529,18 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile  {
 		remoteFolder.setChildren(new ICVSRemoteResource[] { remoteFile });
 		return remoteFile;
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#committed(org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo)
-	 */
 	@Override
 	public void checkedIn(String info, boolean commit) {
 		// do nothing
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#isEdited()
-	 */
 	@Override
 	public boolean isEdited() {
 		return false;
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#getSyncBytes()
-	 */
 	@Override
 	public byte[] getSyncBytes() {
 		return syncBytes;
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#setSyncBytes(byte[])
-	 */
 	@Override
 	public void setSyncBytes(byte[] syncBytes, int modificationState) {
 		if (fetching) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
index 180dfd2d0..2eb13c50e 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
@@ -80,16 +80,12 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 		this.repository = repository;	
 	}
 	
-	/**
-	 * @see ICVSResource#accept(ICVSResourceVisitor)
-	 */
+	@Override
 	public void accept(ICVSResourceVisitor visitor) throws CVSException {
 		visitor.visitFolder(this);
 	}
 
-	/**
-	 * @see ICVSResource#accept(ICVSResourceVisitor, boolean)
-	 */
+	@Override
 	public void accept(ICVSResourceVisitor visitor, boolean recurse) throws CVSException {
 		visitor.visitFolder(this);
 		ICVSResource[] resources;
@@ -103,9 +99,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 		}
 	}
 	
-	/*
-	 * @see ICVSRemoteResource#exists(IProgressMonitor)
-	 */
+	@Override
 	public boolean exists(IProgressMonitor monitor) throws TeamException {
 		try {
 			members(monitor);
@@ -223,9 +217,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 		return children;
 	}
 
-	/**
-	 * @see ICVSFolder#members(int)
-	 */
+	@Override
 	public ICVSResource[] members(int flags) throws CVSException {		
 		final List<ICVSResource> result = new ArrayList<>();
 		ICVSRemoteResource[] resources = getChildren();
@@ -257,9 +249,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 		return (ICVSResource[]) result.toArray(new ICVSResource[result.size()]);
 	}
 	
-	/**
-	 * @see ICVSFolder#getFolder(String)
-	 */
+	@Override
 	public ICVSFolder getFolder(String name) throws CVSException {
 		if (name.equals(Session.CURRENT_LOCAL_FOLDER) || name.equals(Session.CURRENT_LOCAL_FOLDER + Session.SERVER_SEPARATOR))
 			return this;
@@ -270,9 +260,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 		throw new CVSException(status); 
 	}
 
-	/**
-	 * @see ICVSFolder#getFile(String)
-	 */
+	@Override
 	public ICVSFile getFile(String name) throws CVSException {
 		ICVSResource child = getChild(name);
 		if (!child.isFolder())
@@ -290,9 +278,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 		return getFolderSyncInfo().getRepository();
 	}
 	
-	/**
-	 * @see ICVSResource#getRelativePath(ICVSFolder)
-	 */
+	@Override
 	public String getRelativePath(ICVSFolder ancestor) throws CVSException {
 		// Check to see if the receiver is the ancestor
 		if (ancestor == this) return Session.CURRENT_LOCAL_FOLDER;
@@ -308,16 +294,12 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 		return repository;
 	}
 	
-	/**
-	 * @see ICVSRemoteFolder#isExpandable()
-	 */
+	@Override
 	public boolean isExpandable() {
 		return true;
 	}
 	
-	/**
-	 * @see ICVSResource#isFolder()
-	 */
+	@Override
 	public boolean isFolder() {
 		return true;
 	}
@@ -367,9 +349,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 		throw new CVSException(status);
 	}
 
-	/**
-	 * @see ICVSFolder#mkdir()
-	 */
+	@Override
 	public void mkdir() throws CVSException {
 		IStatus status = new CVSStatus(IStatus.ERROR, CVSMessages.RemoteResource_invalidOperation);
 		throw new CVSException(status);
@@ -381,16 +361,12 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 	public void flush(boolean deep) {
 	}
 
-	/**
-	 * @see ICVSFolder#getFolderInfo()
-	 */
+	@Override
 	public FolderSyncInfo getFolderSyncInfo() {
 		return folderInfo;
 	}
 
-	/**
-	 * @see ICVSResource#getRemoteLocation(ICVSFolder)
-	 */
+	@Override
 	public String getRemoteLocation(ICVSFolder stopSearching) throws CVSException {
 		if (folderInfo == null) {
 			return Util.appendPath(parent.getRemoteLocation(stopSearching), getName());
@@ -398,31 +374,23 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 		return folderInfo.getRemoteLocation();
 	}
 	
-	/**
-	 * @see ICVSFolder#isCVSFolder()
-	 */
+	@Override
 	public boolean isCVSFolder() {
 		return folderInfo != null;
 	}
 
-	/**
-	 * @see ICVSFolder#acceptChildren(ICVSResourceVisitor)
-	 */
+	@Override
 	public void acceptChildren(ICVSResourceVisitor visitor) throws CVSException {
 		IStatus status = new CVSStatus(IStatus.ERROR, CVSMessages.RemoteResource_invalidOperation);
 		throw new CVSException(status);		
 	}
 	
-	/*
-	 * @see IRemoteResource#isContainer()
-	 */
+	@Override
 	public boolean isContainer() {
 		return true;
 	}
 	
-	/*
-	 * @see IRemoteResource#members(IProgressMonitor)
-	 */
+	@Override
 	public ICVSRemoteResource[] members(IProgressMonitor progress) throws TeamException {
 		return getMembers(progress);
 	}
@@ -449,30 +417,23 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
         setFolderSyncInfo(newInfo);
 	}
 
-	/*
-	 * @see ICVSRemoteFolder#getTag()
-	 */
+	@Override
 	public CVSTag getTag() {
 		if (folderInfo == null) return null;
 		return folderInfo.getTag();
 	}
-	/*
-	 * @see ICVSFolder#setFolderInfo(FolderSyncInfo)
-	 */
+	
+	@Override
 	public void setFolderSyncInfo(FolderSyncInfo folderInfo) {
 		this.folderInfo = folderInfo.asImmutable();
 	}
 	
-	/*
-	 * @see ICVSFolder#run(ICVSRunnable, IProgressMonitor)
-	 */
+	@Override
 	public void run(ICVSRunnable job, IProgressMonitor monitor) throws CVSException {
 		job.run(monitor);
 	}
 	
-	/*
-	 * @see ICVSFolder#tag(CVSTag, LocalOption[], IProgressMonitor)
-	 */
+	@Override
 	public IStatus tag(final CVSTag tag, final LocalOption[] localOptions, IProgressMonitor monitor) throws CVSException {
 		monitor = Policy.monitorFor(monitor);
 		monitor.beginTask(null, 100);
@@ -492,9 +453,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 		}
 	 }
 	 
-	/**
-	 * @see ICVSFolder#fetchChildren(IProgressMonitor)
-	 */
+	@Override
 	public ICVSResource[] fetchChildren(IProgressMonitor monitor) throws CVSException {
 		try {
 			return getMembers(monitor);
@@ -515,9 +474,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 		return tag1.equals(tag2);
 	}
 	
-	/**
-	 * @see java.lang.Object#hashCode()
-	 */
+	@Override
 	public int hashCode() {
 		CVSTag tag = getTag();
 		if (tag == null) tag = CVSTag.DEFAULT;
@@ -537,30 +494,22 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 		return getRelativePathFromRootRelativePath((ICVSFolder)root.getChild(path.segment(0)), path.removeFirstSegments(1));
 	}
 
-	/**
-	 * @see ICVSRemoteFolder#forTag(CVSTag)
-	 */
+	@Override
 	public ICVSRemoteResource forTag(ICVSRemoteFolder parent, CVSTag tagName) {
 		return new RemoteFolder((RemoteFolder)parent, getName(), repository, folderInfo.getRepository(), tagName, folderInfo.getIsStatic());
 	}
 	
-	/**
-	 * @see ICVSRemoteFolder#forTag(CVSTag)
-	 */
+	@Override
 	public ICVSRemoteResource forTag(CVSTag tagName) {
 		return (ICVSRemoteFolder)forTag(null, tagName);
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder#isDefinedModule()
-	 */
+	@Override
 	public boolean isDefinedModule() {
 		return false;
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.RemoteResource#getSyncInfo()
-	 */
+	@Override
 	public ResourceSyncInfo getSyncInfo() {
 		return new ResourceSyncInfo(getName());
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java
index 6633034b0..df979cff2 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java
@@ -64,9 +64,6 @@ public class RemoteFolderTree extends RemoteFolder  {
 		super.setChildren(children);
 	}
 	
-	/*
-	 * @see ICVSFolder#acceptChildren(ICVSResourceVisitor)
-	 */
 	public void acceptChildren(ICVSResourceVisitor visitor) throws CVSException {
 		ICVSRemoteResource[] children = getChildren();
 		if (children == null) return;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
index 629cbd9a8..470a79bee 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
@@ -301,9 +301,6 @@ public class RemoteModule extends RemoteFolder {
 		return Checkout.ALIAS.isElementOf(localOptions);
 	}
 	
-	/**
-	 * @see ICVSRemoteFolder#isExpandable()
-	 */
 	public boolean isExpandable() {
 		return expandable;
 	}
@@ -312,9 +309,6 @@ public class RemoteModule extends RemoteFolder {
 		this.expandable = expandable;
 	}
 	
-	/**
-	 * @see ICVSRemoteFolder#forTag(CVSTag)
-	 */
 	public ICVSRemoteResource forTag(ICVSRemoteFolder parent, CVSTag tagName) {
 		RemoteModule r = new RemoteModule(label, (RemoteFolder)parent, getRepository(), folderInfo.getRepository(), localOptions, tagName, folderInfo.getIsStatic());
 		r.setExpandable(expandable);
@@ -340,15 +334,9 @@ public class RemoteModule extends RemoteFolder {
 		return r;
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder#isDefinedModule()
-	 */
 	public boolean isDefinedModule() {
 		return true;
 	}
-	/**
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	public boolean equals(Object arg0) {
 		if (arg0 instanceof RemoteModule) {
 			RemoteModule module = (RemoteModule) arg0;
@@ -357,16 +345,10 @@ public class RemoteModule extends RemoteFolder {
 		return false;
 	}
 	
-	/**
-	 * @see java.lang.Object#hashCode()
-	 */
 	public int hashCode() {
 		return super.hashCode() | getName().hashCode();
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFolder#getChild(java.lang.String)
-	 */
 	public ICVSResource getChild(String path) throws CVSException {
 		if (path.equals(Session.CURRENT_LOCAL_FOLDER) || path.length() == 0)
 			return this;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java
index 4b2e977b0..33e526700 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java
@@ -46,23 +46,14 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC
 		this.name = name;
 	}
 
-	/*
-	 * @see ICVSRemoteResource#getName()
-	 */
 	public String getName() {
 		return name;
 	}
 
-	/*
-	 * @see ICVSResource#getRelativePath(ICVSFolder)
-	 */
 	public String getRelativePath(ICVSFolder ancestor) throws CVSException {
 		return Util.appendPath(parent.getRelativePath(ancestor), getName());
 	}
 	
-	/*
-	 * @see ICVSRemoteResource#getParent()
-	 */
 	public ICVSRemoteResource getRemoteParent() {
 		return parent;
 	}
@@ -79,9 +70,6 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC
  		this.workspaceSyncState = workspaceSyncState;
  	}
 	
-	/*
-	 * @see ICVSResource#delete()
-	 */
 	public void delete() {
 		// For now, do nothing but we could provide this in the future.
 	}
@@ -98,30 +86,18 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC
 		return true;
 	}
 	
-	/*
-	 * @see ICVSRemoteResource#exists(IProgressMonitor)
-	 */
 	public boolean exists(IProgressMonitor monitor) throws TeamException {
 		return parent.exists(this, monitor);
 	}
 
-	/*
-	 * @see ICVSResource#getParent()
-	 */
 	public ICVSFolder getParent() {
 		return parent;
  	}
 
-	/*
-	 * @see ICVSResource#isIgnored()
-	 */
 	public boolean isIgnored() {
 		return false;
 	}
 
-	/*
-	 * @see ICVSResource#isManaged()
-	 */
 	public boolean isManaged() {
 		return parent != null;
 	}
@@ -132,16 +108,10 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC
 		return true;
 	}
 	
-	/*
-	 * @see ICVSResource#unmanage()
-	 */
 	public void unmanage(IProgressMonitor monitor) throws CVSException {
 		// do nothing
 	}
 
-	/*
-	 * @see ICVSResource#getSyncInfo()
-	 */
 	public abstract ResourceSyncInfo getSyncInfo();
 	
 	public boolean equals(Object target) {
@@ -155,17 +125,11 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC
 		&& remote.getRepositoryRelativePath().equals(getRepositoryRelativePath());
 	}
 
-	/*
-	 * @see ICVSResource#setIgnoredAs(String)
-	 */
 	public void setIgnoredAs(String pattern) throws CVSException {
 		// ensure that clients are not trying to set sync info on remote handles.
 		Assert.isTrue(false);
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#getIResource()
-	 */
 	public IResource getIResource() {
 		return null;
 	}
@@ -180,9 +144,6 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC
 	 */
 	public abstract ICVSRemoteResource forTag(ICVSRemoteFolder parent, CVSTag tagName);
 
-	/**
-	 * @see java.lang.Object#hashCode()
-	 */
 	public int hashCode() {
 		return getRepositoryRelativePath().hashCode();
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java
index 201841f04..f76475112 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java
@@ -303,9 +303,6 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter;
 		return true;
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#getCachedSyncBytes(org.eclipse.core.resources.IResource, boolean)
-	 */
 	byte[] getCachedSyncBytes(IResource resource, boolean threadSafeAccess) throws CVSException {
 		byte[] bytes = (byte[])safeGetSessionProperty(resource, RESOURCE_SYNC_KEY);
 		// If we are not thread safe, just return whatever was found in the session property
@@ -361,9 +358,6 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter;
 			}
 		}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#setCachedSyncBytes(org.eclipse.core.resources.IResource, byte[])
-	 */
 	void setCachedSyncBytes(IResource resource, byte[] syncBytes, boolean canModifyWorkspace) throws CVSException {
 		// Ensure that the sync bytes do not indicate a deletion
 		if (syncBytes != null && ResourceSyncInfo.isDeletion(syncBytes)) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java
index 35940dd05..f8cd3e8c2 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java
@@ -118,9 +118,6 @@ import org.eclipse.team.internal.ccvs.core.util.Util;
 		}
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#getCachedSyncBytes(org.eclipse.core.resources.IResource, boolean)
-	 */
 	byte[] getCachedSyncBytes(IResource resource, boolean threadSafeAccess) throws CVSException {
 		try {
 			byte[] bytes = null;
@@ -146,9 +143,6 @@ import org.eclipse.team.internal.ccvs.core.util.Util;
 		}
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#setCachedSyncBytes(org.eclipse.core.resources.IResource, byte[])
-	 */
 	void setCachedSyncBytes(IResource resource, byte[] syncBytes, boolean canModifyWorkspace) throws CVSException {
 		byte[] oldBytes = getCachedSyncBytes(resource, true);
 		try {
@@ -235,23 +229,15 @@ import org.eclipse.team.internal.ccvs.core.util.Util;
 		return true;
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#isResourceSyncInfoCached(org.eclipse.core.resources.IContainer)
-	 */
 	boolean isResourceSyncInfoCached(IContainer container) throws CVSException {
 		// the sync info is always cahced when using the synchronizer
 		return true;
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#setResourceSyncInfoCached(org.eclipse.core.resources.IContainer)
-	 */
 	void setResourceSyncInfoCached(IContainer container) throws CVSException {
 		// do nothing
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#isFolderSyncInfoCached(org.eclipse.core.resources.IContainer)
-	 */
+	
 	boolean isFolderSyncInfoCached(IContainer container) throws CVSException {
 		return true;
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java
index 58e2c7f17..9cbc96c48 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java
@@ -235,9 +235,7 @@ public class FolderSyncInfo {
 			this.tag = new CVSEntryLineTag(tag);
 		}
 	}
-	/*
-	 * @see Object#toString()
-	 */
+	
 	public String toString() {
 		return getRoot() + "/" + getRepository() + "/" + getTag(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java
index d30cfcd0c..748539195 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java
@@ -129,9 +129,7 @@ public class MutableResourceSyncInfo extends ResourceSyncInfo {
 		}
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo#setEntryLine(java.lang.String)
-	 */
+	@Override
 	public void setEntryLine(String entryLine) throws CVSException {
 		super.setEntryLine(entryLine);
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
index 7c57f134d..587d490ff 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
@@ -316,9 +316,7 @@ public class ResourceSyncInfo {
 		return getName().hashCode();
 	}
 	
-	/*
-	 * @see Object#toString()
-	 */
+	@Override
 	public String toString() {
 		return getEntryLine(true, null /*no timestamp override*/);
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java
index 915200cf6..125df45d5 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java
@@ -45,9 +45,7 @@ public class BuildCleanupListener implements IResourceDeltaVisitor, IResourceCha
 		return destination;
 	}
 	
-	/**
-	 * @see IResourceDeltaVisitor#visit(IResourceDelta)
-	 */
+	@Override
 	public boolean visit(IResourceDelta delta) throws CoreException {
 		IResource resource = delta.getResource();
 		boolean movedFrom = (delta.getFlags() & IResourceDelta.MOVED_FROM) > 0;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java
index b4d856bb5..cae80c613 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java
@@ -30,9 +30,7 @@ import org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer;
  */
 public class MoveDeleteHook implements IMoveDeleteHook {
 	
-	/**
-	 * @see IMoveDeleteHook#deleteFile(IResourceTree, IFile, int, IProgressMonitor)
-	 */
+	@Override
 	public boolean deleteFile(
 		final IResourceTree tree,
 		final IFile file,
@@ -74,9 +72,7 @@ public class MoveDeleteHook implements IMoveDeleteHook {
 		return true;
 	}
 	
-	/**
-	 * @see IMoveDeleteHook#deleteFolder(IResourceTree, IFolder, int, IProgressMonitor)
-	 */
+	@Override
 	public boolean deleteFolder(
 		final IResourceTree tree,
 		final IFolder folder,
@@ -110,9 +106,7 @@ public class MoveDeleteHook implements IMoveDeleteHook {
 		return false;
 	}
 
-	/**
-	 * @see IMoveDeleteHook#deleteProject(IResourceTree, IProject, int, IProgressMonitor)
-	 */
+	@Override
 	public boolean deleteProject(
 		IResourceTree tree,
 		IProject project,
@@ -131,9 +125,7 @@ public class MoveDeleteHook implements IMoveDeleteHook {
 		return false;
 	}
 
-	/**
-	 * @see IMoveDeleteHook#moveFile(IResourceTree, IFile, IFile, int, IProgressMonitor)
-	 */
+	@Override
 	public boolean moveFile(
 			final IResourceTree tree,
 			final IFile source,
@@ -179,9 +171,7 @@ public class MoveDeleteHook implements IMoveDeleteHook {
 		return true;
 	}
 
-	/**
-	 * @see IMoveDeleteHook#moveFolder(IResourceTree, IFolder, IFolder, int, IProgressMonitor)
-	 */
+	@Override
 	public boolean moveFolder(
 		final IResourceTree tree,
 		final IFolder source,
@@ -233,9 +223,7 @@ public class MoveDeleteHook implements IMoveDeleteHook {
 		return false;
 	}
 
-	/**
-	 * @see IMoveDeleteHook#moveProject(IResourceTree, IProject, IProjectDescription, int, IProgressMonitor)
-	 */
+	@Override
 	public boolean moveProject(
 		IResourceTree tree,
 		IProject source,
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
index 44dafbb02..25a10777f 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
@@ -45,9 +45,7 @@ public class PrepareForReplaceVisitor implements ICVSResourceVisitor {
 		this.session = session;
 	}
 	
-	/**
-	 * @see ICVSResourceVisitor#visitFile(ICVSFile)
-	 */
+	@Override
 	public void visitFile(ICVSFile file) throws CVSException {
 		byte[] syncBytes = file.getSyncBytes();
 		if (syncBytes == null) {
@@ -136,9 +134,7 @@ public class PrepareForReplaceVisitor implements ICVSResourceVisitor {
 		return false;
 	}
 
-	/**
-	 * @see ICVSResourceVisitor#visitFolder(ICVSFolder)
-	 */
+	@Override
 	public void visitFolder(ICVSFolder folder) throws CVSException {
 		// Delete unmanaged folders if the user wants them deleted
 		if (!folder.isCVSFolder()) {