Remove useless non-javadoc/@see comments.

Put @Override instead where needed.

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

100 files changed, 302 insertions, 833 deletions

diff --git a/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF
index 9f7897e5a..a87a0dbe2 100644
--- a/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.compare.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.compare.core
-Bundle-Version: 3.6.400.qualifier
+Bundle-Version: 3.6.500.qualifier
 Bundle-Activator: org.eclipse.compare.internal.core.ComparePlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)"
diff --git a/bundles/org.eclipse.compare.core/pom.xml b/bundles/org.eclipse.compare.core/pom.xml
index 96a74b795..beab0c5d9 100644
--- a/bundles/org.eclipse.compare.core/pom.xml
+++ b/bundles/org.eclipse.compare.core/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.compare</groupId>
   <artifactId>org.eclipse.compare.core</artifactId>
-  <version>3.6.400-SNAPSHOT</version>
+  <version>3.6.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java
index 61615a56f..ba0f856fb 100644
--- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java
+++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/rangedifferencer/RangeComparatorLCS.java
@@ -185,9 +185,6 @@ import org.eclipse.core.runtime.*;
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.internal.LCS#longestCommonSubsequence(org.eclipse.core.runtime.SubMonitor)
-	 */
 	@Override
 	public void longestCommonSubsequence(SubMonitor subMonitor) {
 		super.longestCommonSubsequence(subMonitor);
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/BufferedContent.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/BufferedContent.java
index 72e4b7a8d..05a7925d1 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/BufferedContent.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/BufferedContent.java
@@ -46,9 +46,6 @@ public abstract class BufferedContent implements IContentChangeNotifier, IStream
 		// empty implementation
 	}
 
-	/* (non-Javadoc)
-	 * see IStreamContentAccessor.getContents
-	 */
 	@Override
 	public InputStream getContents() throws CoreException {
 		if (fContent != null)
@@ -102,9 +99,6 @@ public abstract class BufferedContent implements IContentChangeNotifier, IStream
 		fContent= null;
 	}
 
-	/* (non-Javadoc)
-	 * see IContentChangeNotifier.addChangeListener
-	 */
 	@Override
 	public void addContentChangeListener(IContentChangeListener listener) {
 		if (fChangeNotifier == null)
@@ -112,9 +106,6 @@ public abstract class BufferedContent implements IContentChangeNotifier, IStream
 		fChangeNotifier.addContentChangeListener(listener);
 	}
 
-	/* (non-Javadoc)
-	 * see IContentChangeNotifier.removeChangeListener
-	 */
 	@Override
 	public void removeContentChangeListener(IContentChangeListener listener) {
 		if (fChangeNotifier != null) {
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
index 2dffe8a49..c799c3bac 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java
@@ -51,49 +51,31 @@ public class HistoryItem implements IEncodedStreamContentAccessor, ITypedElement
 		fFileState= fileState;
 	}
 
-	/* (non-Javadoc)
-	 * see ITypedElement.getName
-	 */
 	@Override
 	public String getName() {
 		return fBase.getName();
 	}
 
-	/* (non-Javadoc)
-	 * see ITypedElement.getImage
-	 */
 	@Override
 	public Image getImage() {
 		return fBase.getImage();
 	}
 
-	/* (non-Javadoc)
-	 * see ITypedElement.getType
-	 */
 	@Override
 	public String getType() {
 		return fBase.getType();
 	}
 
-	/* (non-Javadoc)
-	 * see IModificationDate.getModificationDate
-	 */
 	@Override
 	public long getModificationDate() {
 		return fFileState.getModificationTime();
 	}
 
-	/* (non-Javadoc)
-	 * see IStreamContentAccessor.getContents
-	 */
 	@Override
 	public InputStream getContents() throws CoreException {
 		return new BufferedInputStream(fFileState.getContents());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.IEncodedStreamContentAccessor#getCharset()
-	 */
 	@Override
 	public String getCharset() throws CoreException {
 	    String charset= fFileState.getCharset();
@@ -105,9 +87,6 @@ public class HistoryItem implements IEncodedStreamContentAccessor, ITypedElement
 		return charset;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.internal.IResourceProvider#getResource()
-	 */
 	@Override
 	public IResource getResource() {
 	    IPath fullPath= fFileState.getFullPath();
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/Splitter.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/Splitter.java
index 3785dadc0..044a8bce0 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/Splitter.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/Splitter.java
@@ -91,9 +91,9 @@ public class Splitter extends SashForm {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * Recursively calls setMaximizedControl for all direct parents that are
-	 * itself Splitters.
+	/*
+	 * Recursively calls setMaximizedControl for all direct parents that are itself
+	 * Splitters.
 	 */
 	@Override
 	public void setMaximizedControl(Control control) {
@@ -106,11 +106,11 @@ public class Splitter extends SashForm {
 		Composite parent= getParent();
 		if (parent instanceof Splitter)
 			((Splitter) parent).setMaximizedControl(this);
-		
+
 		layout(true);
 	}
 
-	/* (non-Javadoc)
+	/*
 	 * Returns true if Splitter has no children or if all children are invisible.
 	 */
 	private boolean isEmpty() {
@@ -121,9 +121,9 @@ public class Splitter extends SashForm {
 		return true;
 	}
 
-	/* (non-Javadoc)
-	 * Returns the visibility state of the given child control. If the
-	 * control is a Sash, this method always returns false.
+	/*
+	 * Returns the visibility state of the given child control. If the control is a
+	 * Sash, this method always returns false.
 	 */
 	private boolean isVisible(Control child) {
 		if (child instanceof Sash)
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TokenComparator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TokenComparator.java
index a6f5b8821..86605af85 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TokenComparator.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TokenComparator.java
@@ -71,17 +71,11 @@ public class TokenComparator implements ITokenComparator {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.rangedifferencer.IRangeComparator#getRangeCount()
-	 */
 	@Override
 	public int getRangeCount() {
 		return fCount;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.contentmergeviewer.ITokenComparator#getTokenStart(int)
-	 */
 	@Override
 	public int getTokenStart(int index) {
 		if (index < fCount)
@@ -89,9 +83,6 @@ public class TokenComparator implements ITokenComparator {
 		return fText.length();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.contentmergeviewer.ITokenComparator#getTokenLength(int)
-	 */
 	@Override
 	public int getTokenLength(int index) {
 		if (index < fCount)
@@ -99,9 +90,6 @@ public class TokenComparator implements ITokenComparator {
 		return 0;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.rangedifferencer.IRangeComparator#rangesEqual(int, org.eclipse.compare.rangedifferencer.IRangeComparator, int)
-	 */
 	@Override
 	public boolean rangesEqual(int thisIndex, IRangeComparator other, int otherIndex) {
 		if (other != null && getClass() == other.getClass()) {
@@ -114,9 +102,6 @@ public class TokenComparator implements ITokenComparator {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.rangedifferencer.IRangeComparator#skipRangeComparison(int, int, org.eclipse.compare.rangedifferencer.IRangeComparator)
-	 */
 	@Override
 	public boolean skipRangeComparison(int length, int max, IRangeComparator other) {
 
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
index 46c9a33a1..ffeedc5c1 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java
@@ -455,9 +455,6 @@ public class AddFromHistoryDialog extends ResizableDialog {
 		return MessageFormat.format(format, date);
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on Dialog.
-	 */
 	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
 		String buttonLabel= Utilities.getString(fBundle, "buttonLabel", IDialogConstants.OK_LABEL); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BaseCompareAction.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BaseCompareAction.java
index edd55456e..84e9d78df 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BaseCompareAction.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BaseCompareAction.java
@@ -22,17 +22,11 @@ public abstract class BaseCompareAction implements IActionDelegate {
 
 	private ISelection fSelection;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	final public void run(IAction action) {
 		run(fSelection);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	final public void selectionChanged(IAction action, ISelection selection) {
 		fSelection= selection;
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContainer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContainer.java
index 07b007584..31d5f28d4 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContainer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareContainer.java
@@ -31,60 +31,39 @@ public class CompareContainer implements ICompareContainer {
 
 	private WorkerJob worker;
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.ICompareContainer#setStatusMessage(java.lang.String)
-	 */
 	@Override
 	public void setStatusMessage(String message) {
 		// Do nothing, by default
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.ICompareContainer#addCompareInputChangeListener(org.eclipse.compare.structuremergeviewer.ICompareInput, org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener)
-	 */
 	@Override
 	public void addCompareInputChangeListener(ICompareInput input,
 			ICompareInputChangeListener listener) {
 		input.addCompareInputChangeListener(listener);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.ICompareContainer#removeCompareInputChangeListener(org.eclipse.compare.structuremergeviewer.ICompareInput, org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener)
-	 */
 	@Override
 	public void removeCompareInputChangeListener(ICompareInput input,
 			ICompareInputChangeListener listener) {
 		input.removeCompareInputChangeListener(listener);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.ICompareContainer#registerContextMenu(org.eclipse.jface.action.MenuManager, org.eclipse.jface.viewers.ISelectionProvider)
-	 */
 	@Override
 	public void registerContextMenu(MenuManager menu,
 			ISelectionProvider selectionProvider) {
 		// Nothing to do
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.ICompareContainer#getServiceLocator()
-	 */
 	@Override
 	public IServiceLocator getServiceLocator() {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.ICompareContainer#getActionBars()
-	 */
 	@Override
 	public IActionBars getActionBars() {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.operation.IRunnableContext#run(boolean, boolean, org.eclipse.jface.operation.IRunnableWithProgress)
-	 */
 	@Override
 	public void run(boolean fork, boolean cancelable,
 			IRunnableWithProgress runnable)
@@ -92,17 +71,11 @@ public class CompareContainer implements ICompareContainer {
 		PlatformUI.getWorkbench().getProgressService().run(fork, cancelable, runnable);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.ICompareContainer#getNavigator()
-	 */
 	@Override
 	public ICompareNavigator getNavigator() {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.ICompareContainer#runAsynchronously(org.eclipse.jface.operation.IRunnableWithProgress)
-	 */
 	@Override
 	public synchronized void runAsynchronously(IRunnableWithProgress runnable) {
 		if (worker == null)
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
index 386ad1507..07af66f1c 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditor.java
@@ -499,10 +499,6 @@ public class CompareEditor extends EditorPart
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * Always throws an AssertionFailedException.
-	 * @see org.eclipse.ui.part.EditorPart#doSaveAs()
-	 */
 	@Override
 	public void doSaveAs() {
 		Assert.isTrue(false); // Save As not supported for CompareEditor
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImageDescriptor.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImageDescriptor.java
index c5fd249d6..fabcc9c81 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImageDescriptor.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/DiffImageDescriptor.java
@@ -69,17 +69,11 @@ public class DiffImageDescriptor extends CompositeImageDescriptor {
 		return hash;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.resource.CompositeImageDescriptor#getSize()
-	 */
 	@Override
 	protected Point getSize() {
 		return new Point(fWidth, HEIGHT);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.resource.CompositeImageDescriptor#drawCompositeImage(int, int)
-	 */
 	@Override
 	protected void drawCompositeImage(int width, int height) {
 		if (fLeft) {
@@ -107,17 +101,11 @@ public class DiffImageDescriptor extends CompositeImageDescriptor {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return hashCode;
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object obj) {
 		if (obj == this)
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ShowWhitespaceAction.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ShowWhitespaceAction.java
index 45424ec03..998d4d18a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ShowWhitespaceAction.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ShowWhitespaceAction.java
@@ -62,10 +62,6 @@ public class ShowWhitespaceAction extends TextEditorPropertyAction {
 		synchronizeWithPreference();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.compare.internal.TextEditorPropertyAction#synchronizeWithPreference()
-	 */
 	@Override
 	protected void synchronizeWithPreference() {
 		boolean checked = false;
@@ -93,10 +89,6 @@ public class ShowWhitespaceAction extends TextEditorPropertyAction {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.compare.internal.TextEditorPropertyAction#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-	 */
 	@Override
 	public void propertyChange(PropertyChangeEvent event) {
 		String property = event.getProperty();
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java
index 9360a303c..f9a0d9b7f 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java
@@ -31,15 +31,6 @@ import org.eclipse.core.runtime.Status;
  */
 public class TextStreamMerger implements IStreamMerger {
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.compare.internal.merge.IAutoMerger#automerge(java.io.OutputStream,
-	 *      org.eclipse.core.resources.IEncodedStorage,
-	 *      org.eclipse.core.resources.IEncodedStorage,
-	 *      org.eclipse.core.resources.IEncodedStorage,
-	 *      org.eclipse.core.runtime.IProgressMonitor)
-	 */
 	@Override
 	public IStatus merge(OutputStream output, String outputEncoding, InputStream ancestor, String ancestorEncoding, InputStream target, String targetEncoding, InputStream other, String otherEncoding, IProgressMonitor monitor) {
 
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DecoratorOverlayIcon.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DecoratorOverlayIcon.java
index 9460d2469..37c9b6a42 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DecoratorOverlayIcon.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/DecoratorOverlayIcon.java
@@ -122,9 +122,6 @@ class DecoratorOverlayIcon extends CompositeImageDescriptor {
         return size;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.resource.CompositeImageDescriptor#getTransparentPixel()
-     */
     @Override
 	protected int getTransparentPixel() {
     	return base.getImageData().transparentPixel;
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/FilePatch.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/FilePatch.java
index 97ce06310..59485a103 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/FilePatch.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/FilePatch.java
@@ -28,14 +28,6 @@ public class FilePatch extends FilePatch2 implements IFilePatch {
 		super(oldPath, oldDate, newPath, newDate);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.eclipse.compare.patch.IFilePatch#apply(org.eclipse.core.resources
-	 * .IStorage, org.eclipse.compare.patch.PatchConfiguration,
-	 * org.eclipse.core.runtime.IProgressMonitor)
-	 */
 	@Override
 	public IFilePatchResult apply(IStorage content,
 			PatchConfiguration configuration, IProgressMonitor monitor) {
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
index d902e2806..1a6a6f53e 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
@@ -332,9 +332,6 @@ public class InputPatchPage extends WizardPage {
 		}
 	}
 
-	/* (non-JavaDoc)
-	 * Method declared in IWizardPage.
-	 */
 	@Override
 	public boolean canFlipToNextPage() {
 		// we can't call getNextPage to determine if flipping is allowed since computing
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchFileDiffNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchFileDiffNode.java
index 2d827e397..27c513a2f 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchFileDiffNode.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchFileDiffNode.java
@@ -87,9 +87,6 @@ public class PatchFileDiffNode extends PatchDiffNode implements IContentChangeLi
 		return result.getConfiguration();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.structuremergeviewer.DiffContainer#add(org.eclipse.compare.structuremergeviewer.IDiffElement)
-	 */
 	@Override
 	public void add(IDiffElement diff) {
 		super.add(diff);
@@ -104,9 +101,6 @@ public class PatchFileDiffNode extends PatchDiffNode implements IContentChangeLi
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.IContentChangeListener#contentChanged(org.eclipse.compare.IContentChangeNotifier)
-	 */
 	@Override
 	public void contentChanged(IContentChangeNotifier source) {
 		fireChange();
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchProjectDiffNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchProjectDiffNode.java
index 0beb5cb09..d7cbafb9b 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchProjectDiffNode.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchProjectDiffNode.java
@@ -36,17 +36,11 @@ public class PatchProjectDiffNode extends PatchDiffNode {
 		this.configuration = configuration;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.structuremergeviewer.DiffNode#getName()
-	 */
 	@Override
 	public String getName() {
 		return project.getName();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.structuremergeviewer.DiffNode#getImage()
-	 */
 	@Override
 	public Image getImage() {
 		Image image = CompareUI.getImage(Utilities.getProject(project));
@@ -70,9 +64,6 @@ public class PatchProjectDiffNode extends PatchDiffNode {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.structuremergeviewer.DiffNode#getType()
-	 */
 	@Override
 	public String getType() {
 		return ITypedElement.FOLDER_TYPE;
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java
index 13e641743..e762bf5f3 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchTargetPage.java
@@ -121,9 +121,6 @@ public class PatchTargetPage extends WizardPage {
 		return button;
 	}
 
-	/* (non-JavaDoc)
-	 * Method declared in IWizardPage.
-	 */
 	@Override
 	public IWizardPage getNextPage() {
 
@@ -154,9 +151,6 @@ public class PatchTargetPage extends WizardPage {
 		return super.getNextPage();
 	}
 
-	/* (non-JavaDoc)
-	 * Method declared in IWizardPage.
-	 */
 	@Override
 	public boolean canFlipToNextPage() {
 		// we can't call getNextPage to determine if flipping is allowed since computing
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java
index d7830cae7..cf95f10eb 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/PatchWizard.java
@@ -101,9 +101,6 @@ public class PatchWizard extends Wizard {
 		return fPatcher.getTarget();
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on IWizard.
-	 */
 	@Override
 	public void addPages() {
 		if (patch == null)
@@ -116,9 +113,6 @@ public class PatchWizard extends Wizard {
 		addPage(fPreviewPage2);
 	}
 
-	/* (non-Javadoc)
-	 * Method declared on IWizard.
-	 */
 	@Override
 	public boolean performFinish() {
 
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/ApplyPatchOperation.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/ApplyPatchOperation.java
index 5592ab10a..212fddfdc 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/ApplyPatchOperation.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/patch/ApplyPatchOperation.java
@@ -195,9 +195,6 @@ public class ApplyPatchOperation implements Runnable {
 		this.patchWizardImage = descriptor;
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Runnable#run()
-	 */
 	@Override
 	public void run() {
 		openWizard();
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
index 4977ebdce..e534f7cd6 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
@@ -264,10 +264,10 @@ public class StructureDiffViewer extends DiffTreeViewer {
 	}
 
     /*
-     * (non-Javadoc) Method declared on StructuredViewer.
-     * Overridden to create the comparable structures from the input object
-	 * and to feed them through the differencing engine. Note: for this viewer
-	 * the value from <code>getInput</code> is not identical to <code>getRoot</code>.
+	 * Method declared on StructuredViewer. Overridden to create the comparable
+	 * structures from the input object and to feed them through the differencing
+	 * engine. Note: for this viewer the value from <code>getInput</code> is not
+	 * identical to <code>getRoot</code>.
 	 */
 	@Override
 	protected void inputChanged(Object input, Object oldInput) {
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureRootNode.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureRootNode.java
index acce39e3c..a9ba54506 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureRootNode.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureRootNode.java
@@ -71,9 +71,6 @@ public class StructureRootNode extends DocumentRangeNode implements IDisposable,
 		fAdapter = adapter;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.services.IDisposable#dispose()
-	 */
 	@Override
 	public void dispose() {
 		if (fAdapter != null) {
@@ -116,33 +113,21 @@ public class StructureRootNode extends DocumentRangeNode implements IDisposable,
 		return child;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.ITypedElement#getImage()
-	 */
 	@Override
 	public Image getImage() {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.ITypedElement#getName()
-	 */
 	@Override
 	public String getName() {
 		return getId();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.ITypedElement#getType()
-	 */
 	@Override
 	public String getType() {
 		return FOLDER_TYPE;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.structuremergeviewer.DocumentRangeNode#isReadOnly()
-	 */
 	@Override
 	public boolean isReadOnly() {
 		if (fInput instanceof IEditableContentExtension) {
@@ -152,9 +137,6 @@ public class StructureRootNode extends DocumentRangeNode implements IDisposable,
 		return super.isReadOnly();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.compare.structuremergeviewer.DocumentRangeNode#validateEdit(org.eclipse.swt.widgets.Shell)
-	 */
 	@Override
 	public IStatus validateEdit(Shell shell) {
 		if (fInput instanceof IEditableContentExtension) {
diff --git a/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF
index f3ccbf55f..cfd5fb625 100644
--- a/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jsch.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jsch.ui;singleton:=true
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 1.3.500.qualifier
 Bundle-Activator: org.eclipse.jsch.internal.ui.JSchUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.jsch.ui/pom.xml b/bundles/org.eclipse.jsch.ui/pom.xml
index a6f4be7b4..f68854455 100644
--- a/bundles/org.eclipse.jsch.ui/pom.xml
+++ b/bundles/org.eclipse.jsch.ui/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.jsch</groupId>
   <artifactId>org.eclipse.jsch.ui</artifactId>
-  <version>1.3.400-SNAPSHOT</version>
+  <version>1.3.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/KeyboardInteractiveDialog.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/KeyboardInteractiveDialog.java
index 49f0a8a86..028908ce3 100644
--- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/KeyboardInteractiveDialog.java
+++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/KeyboardInteractiveDialog.java
@@ -297,9 +297,7 @@ public class KeyboardInteractiveDialog extends TrayDialog {
     super.cancelPressed();
   }
 
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.dialogs.Dialog#close()
-   */
+  @Override
   public boolean close(){
     if(keyLockImage!=null){
       keyLockImage.dispose();
diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/UserValidationDialog.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/UserValidationDialog.java
index c9e4efa9c..08578c2b3 100644
--- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/UserValidationDialog.java
+++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/UserValidationDialog.java
@@ -14,8 +14,9 @@
 package org.eclipse.jsch.internal.ui;
 
 
-import org.eclipse.jface.dialogs.*;
 import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TrayDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
@@ -24,7 +25,12 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.PlatformUI;
 
 /**
@@ -65,6 +71,7 @@ public class UserValidationDialog extends TrayDialog {
 	/**
 	 * @see Window#configureShell
 	 */
+	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
 		newShell.setText(Messages.UserValidationDialog_0);
@@ -74,6 +81,7 @@ public class UserValidationDialog extends TrayDialog {
 	/**
 	 * @see Window#create
 	 */
+	@Override
 	public void create() {
 		super.create();
 		// add some default values
@@ -92,6 +100,7 @@ public class UserValidationDialog extends TrayDialog {
 	/**
 	 * @see Dialog#createDialogArea
 	 */
+	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite top = new Composite(parent, SWT.NONE);
 		GridLayout layout = new GridLayout();
@@ -147,6 +156,7 @@ public class UserValidationDialog extends TrayDialog {
 			data.horizontalSpan = 3;
 			allowCachingButton.setLayoutData(data);
 			allowCachingButton.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent e) {
 					allowCaching = allowCachingButton.getSelection();
 				}
@@ -224,6 +234,7 @@ public class UserValidationDialog extends TrayDialog {
 	 * and closes the dialog. Subclasses may override.
 	 * </p>
 	 */
+	@Override
 	protected void okPressed() {
 		password = passwordField.getText();
 		username = usernameField.getText();
@@ -231,6 +242,7 @@ public class UserValidationDialog extends TrayDialog {
 		super.okPressed();
 	}
 
+	@Override
 	protected void cancelPressed(){
 	  password = null;
 	  username = null;
@@ -248,9 +260,7 @@ public class UserValidationDialog extends TrayDialog {
 		isUsernameMutable = value;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.Dialog#close()
-	 */
+	@Override
 	public boolean close() {
 		if(keyLockImage != null) {
 			keyLockImage.dispose();
diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/KeyboardInteractiveDialog.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/KeyboardInteractiveDialog.java
index 962f14068..2a0a1f5aa 100644
--- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/KeyboardInteractiveDialog.java
+++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/KeyboardInteractiveDialog.java
@@ -15,9 +15,13 @@
  *******************************************************************************/
 package org.eclipse.jsch.internal.ui.authenticator;
 
-import org.eclipse.jface.dialogs.*;
 import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TrayDialog;
 import org.eclipse.jface.window.Window;
+import org.eclipse.jsch.internal.ui.IUIConstants;
+import org.eclipse.jsch.internal.ui.JSchUIPlugin;
+import org.eclipse.jsch.internal.ui.Messages;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -25,13 +29,14 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.PlatformUI;
 
-import org.eclipse.jsch.internal.ui.IUIConstants;
-import org.eclipse.jsch.internal.ui.JSchUIPlugin;
-import org.eclipse.jsch.internal.ui.Messages;
-
 /**
  * A dialog for keyboard-interactive authentication for the ssh2 connection.
  * @since 1.1
@@ -97,7 +102,8 @@ public class KeyboardInteractiveDialog extends TrayDialog{
   /**
    * @see Window#configureShell
    */
-  protected void configureShell(Shell newShell){
+  @Override
+protected void configureShell(Shell newShell){
     super.configureShell(newShell);
     if(isPasswordAuth){
       newShell.setText(Messages.UserValidationDialog_required);
@@ -113,7 +119,8 @@ public class KeyboardInteractiveDialog extends TrayDialog{
   /**
    * @see Window#create
    */
-  public void create(){
+  @Override
+public void create(){
     super.create();
 
     if(isPasswordAuth&&usernameField!=null){
@@ -129,7 +136,8 @@ public class KeyboardInteractiveDialog extends TrayDialog{
   /**
    * @see Dialog#createDialogArea
    */
-  protected Control createDialogArea(Composite parent){
+  @Override
+protected Control createDialogArea(Composite parent){
     Composite top=new Composite(parent, SWT.NONE);
     GridLayout layout=new GridLayout();
     layout.numColumns=2;
@@ -201,7 +209,8 @@ public class KeyboardInteractiveDialog extends TrayDialog{
     data.horizontalSpan=3;
     allowCachingButton.setLayoutData(data);
     allowCachingButton.addSelectionListener(new SelectionAdapter(){
-      public void widgetSelected(SelectionEvent e){
+      @Override
+	public void widgetSelected(SelectionEvent e){
         allowCaching=allowCachingButton.getSelection();
       }
     });
@@ -279,7 +288,8 @@ public class KeyboardInteractiveDialog extends TrayDialog{
    * and closes the dialog. Subclasses may override.
    * </p>
    */
-  protected void okPressed(){
+  @Override
+protected void okPressed(){
     result=new String[prompt.length];
     for(int i=0; i<texts.length; i++){
       result[i]=texts[i].getText();
@@ -306,14 +316,13 @@ public class KeyboardInteractiveDialog extends TrayDialog{
    * and closes the dialog. Subclasses may override.
    * </p>
    */
+  @Override
   protected void cancelPressed(){
     result=null;
     super.cancelPressed();
   }
 
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.dialogs.Dialog#close()
-   */
+  @Override
   public boolean close(){
     if(keyLockImage!=null){
       keyLockImage.dispose();
diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/UserValidationDialog.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/UserValidationDialog.java
index 3266bd767..e9aa300b6 100644
--- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/UserValidationDialog.java
+++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/UserValidationDialog.java
@@ -267,11 +267,7 @@ public class UserValidationDialog extends TrayDialog{
     isUsernameMutable=value;
   }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see org.eclipse.jface.dialogs.Dialog#close()
-   */
+  @Override
   public boolean close(){
     if(keyLockImage!=null){
       keyLockImage.dispose();
diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/WorkbenchUserAuthenticator.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/WorkbenchUserAuthenticator.java
index 789ef71e9..111bef09b 100644
--- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/WorkbenchUserAuthenticator.java
+++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/authenticator/WorkbenchUserAuthenticator.java
@@ -172,9 +172,6 @@ public String[] promptForKeyboradInteractive(
   }
 
 
-  /* (non-Javadoc)
-   * @see org.eclipse.team.internal.ccvs.core.IUserAuthenticator#prompt(org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation, int, java.lang.String, java.lang.String, int[], int)
-   */
   @Override
 public int prompt(IJSchLocation location, final int promptType,
       final String title, final String message, final int[] promptResponses,
diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/ui/UserInfoPrompter.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/ui/UserInfoPrompter.java
index 4504fb848..85791a697 100644
--- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/ui/UserInfoPrompter.java
+++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/ui/UserInfoPrompter.java
@@ -67,21 +67,11 @@ public class UserInfoPrompter implements UserInfo, UIKeyboardInteractive{
     return session;
   }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see com.jcraft.jsch.UserInfo#getPassphrase()
-   */
   @Override
 public String getPassphrase(){
     return passphrase;
   }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see com.jcraft.jsch.UserInfo#getPassword()
-   */
   @Override
 public String getPassword(){
     return password;
@@ -111,11 +101,6 @@ public String getPassword(){
     this.password=password;
   }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see com.jcraft.jsch.UserInfo#promptPassphrase(java.lang.String)
-   */
   @Override
 public boolean promptPassphrase(String message){
     String _passphrase=promptSecret(message);
@@ -125,11 +110,6 @@ public boolean promptPassphrase(String message){
     return _passphrase!=null;
   }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see com.jcraft.jsch.UserInfo#promptPassword(java.lang.String)
-   */
   @Override
 public boolean promptPassword(String message){
     String _password=promptSecret(message);
@@ -166,12 +146,6 @@ public boolean promptPassword(String message){
     return dialog.getPassword();
   }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see com.jcraft.jsch.UIKeyboardInteractive#promptKeyboardInteractive(java.lang.String,
-   *      java.lang.String, java.lang.String, java.lang.String[], boolean[])
-   */
   @Override
 public String[] promptKeyboardInteractive(String destination, String name,
       String instruction, String[] prompt, boolean[] echo){
@@ -231,11 +205,6 @@ public String[] promptKeyboardInteractive(String destination, String name,
     return _result;
   }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see com.jcraft.jsch.UserInfo#promptYesNo(java.lang.String)
-   */
   @Override
 public boolean promptYesNo(String question){
     int prompt=prompt(MessageDialog.QUESTION, Messages.UserInfoPrompter_0,
@@ -247,11 +216,6 @@ public boolean promptYesNo(String question){
     return prompt==0;
   }
 
-  /*
-   * (non-Javadoc)
-   *
-   * @see com.jcraft.jsch.UserInfo#showMessage(java.lang.String)
-   */
   @Override
 public void showMessage(String message){
     prompt(MessageDialog.INFORMATION, Messages.UserInfoPrompter_1, message,
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/CachedResourceVariant.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/CachedResourceVariant.java
index 67ade9643..fb17d43e3 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/CachedResourceVariant.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/CachedResourceVariant.java
@@ -114,9 +114,6 @@ public abstract class CachedResourceVariant extends PlatformObject implements IR
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.variants.IResourceVariant#getStorage(org.eclipse.core.runtime.IProgressMonitor)
-	 */
 	@Override
 	public IStorage getStorage(IProgressMonitor monitor) throws TeamException {
 		if (isContainer()) return null;
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCacheEntry.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCacheEntry.java
index 3c7c6acab..ad4139615 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCacheEntry.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/ResourceVariantCacheEntry.java
@@ -57,9 +57,6 @@ public class ResourceVariantCacheEntry {
 		registerHit();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.sync.ICacheEntry#getContents()
-	 */
 	public InputStream getContents() throws TeamException {
 		if (state != READY) return null;
 		registerHit();
@@ -168,14 +165,14 @@ public class ResourceVariantCacheEntry {
 
 	}
 
-	/* (non-Javadoc)
+	/*
 	 * @see org.eclipse.team.core.sync.ICacheEntry#getState()
 	 */
 	public int getState() {
 		return state;
 	}
 
-	/* (non-Javadoc)
+	/*
 	 * @see org.eclipse.team.core.sync.ICacheEntry#getSize()
 	 */
 	public long getSize() {
@@ -187,7 +184,7 @@ public class ResourceVariantCacheEntry {
 		return 0;
 	}
 
-	/* (non-Javadoc)
+	/*
 	 * @see org.eclipse.team.core.sync.ICacheEntry#getLastAccessTimeStamp()
 	 */
 	public long getLastAccessTimeStamp() {
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/history/LocalFileRevision.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/history/LocalFileRevision.java
index 2868f6524..dd212e8ea 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/history/LocalFileRevision.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/history/LocalFileRevision.java
@@ -117,10 +117,9 @@ public class LocalFileRevision extends FileRevision {
 		return state.getModificationTime();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.history.provider.FileRevision#exists()
-	 * A LocalFileRevision generally should exist, but if it doesn't, this
-	 * method should tell the truth.
+	/*
+	 * A LocalFileRevision generally should exist, but if it doesn't, this method
+	 * should tell the truth.
 	 */
 	@Override
 	public boolean exists() {
diff --git a/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF
index 946317d5f..570d72a87 100644
--- a/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.team.cvs.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.team.cvs.core; singleton:=true
-Bundle-Version: 3.4.500.qualifier
+Bundle-Version: 3.4.600.qualifier
 Bundle-Activator: org.eclipse.team.internal.ccvs.core.CVSProviderPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.team.cvs.core/pom.xml b/bundles/org.eclipse.team.cvs.core/pom.xml
index cbb89a821..32ab4f121 100644
--- a/bundles/org.eclipse.team.cvs.core/pom.xml
+++ b/bundles/org.eclipse.team.cvs.core/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.team</groupId>
   <artifactId>org.eclipse.team.cvs.core</artifactId>
-  <version>3.4.500-SNAPSHOT</version>
+  <version>3.4.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCompareSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCompareSubscriber.java
index 6aff48c8c..c5b76c497 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCompareSubscriber.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCompareSubscriber.java
@@ -94,38 +94,28 @@ public class CVSCompareSubscriber extends CVSSyncTreeSubscriber implements ISubs
 		return new QualifiedName(QUALIFIED_NAME, UNIQUE_ID_PREFIX + uniqueId); 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.CVSSyncTreeSubscriber#getBaseSynchronizationCache()
-	 */
+	@Override
 	protected IResourceVariantTree getBaseTree() {
 		// No base cache needed since it's a two way compare
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.CVSSyncTreeSubscriber#getRemoteSynchronizationCache()
-	 */
+	@Override
 	protected IResourceVariantTree getRemoteTree() {
 		return tree;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.TeamSubscriber#isThreeWay()
-	 */
+	@Override
 	public boolean isThreeWay() {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.TeamSubscriber#roots()
-	 */
+	@Override
 	public IResource[] roots() {
 		return resources;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.ITeamResourceChangeListener#teamResourceChanged(org.eclipse.team.core.subscribers.TeamDelta[])
-	 */
+	@Override
 	public void subscriberResourceChanged(ISubscriberChangeEvent[] deltas) {
 		List outgoingDeltas = new ArrayList(deltas.length);
 		for (int i = 0; i < deltas.length; i++) {
@@ -182,9 +172,7 @@ public class CVSCompareSubscriber extends CVSSyncTreeSubscriber implements ISubs
 		return deltas;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.TeamSubscriber#isSupervised(org.eclipse.core.resources.IResource)
-	 */
+	@Override
 	public boolean isSupervised(IResource resource) throws TeamException {
 		if (super.isSupervised(resource)) {
 			if (!resource.exists() && !getRemoteTree().hasResourceVariant(resource)) {
@@ -203,9 +191,7 @@ public class CVSCompareSubscriber extends CVSSyncTreeSubscriber implements ISubs
 		return false;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.CVSSyncTreeSubscriber#getCacheFileContentsHint()
-	 */
+	@Override
 	protected boolean getCacheFileContentsHint() {
 		return true;
 	}
@@ -214,9 +200,7 @@ public class CVSCompareSubscriber extends CVSSyncTreeSubscriber implements ISubs
 		return tree.getTag(ResourcesPlugin.getWorkspace().getRoot());
 	}
 		
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
+	@Override
 	public boolean equals(Object other) {
 		if(this == other) return true;
 		if(! (other instanceof CVSCompareSubscriber)) return false;
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 296697823..da35d05ca 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
@@ -31,9 +31,7 @@ public class CVSCoreFileModificationValidator extends FileModificationValidator
     
     FileModificationValidator uiValidator;
 
-    /* (non-Javadoc)
-     * @see org.eclipse.core.resources.team.FileModificationValidator#validateEdit(org.eclipse.core.resources.IFile[], org.eclipse.core.resources.team.FileModificationValidationContext)
-     */
+    @Override
     public IStatus validateEdit(IFile[] files, FileModificationValidationContext context) {
 	    IFile[] unmanagedReadOnlyFiles = getUnmanagedReadOnlyFiles(files);
 	    if (unmanagedReadOnlyFiles.length > 0) {
@@ -47,9 +45,7 @@ public class CVSCoreFileModificationValidator extends FileModificationValidator
 		return edit(readOnlyFiles, context);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.core.resources.IFileModificationValidator#validateSave(org.eclipse.core.resources.IFile)
-     */
+    @Override
     public IStatus validateSave(IFile file) {
 		if (!needsCheckout(file)) {
 		    if (file.isReadOnly()) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
index c91bbef74..f12d2896b 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
@@ -103,9 +103,7 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour
 			return Util.equals(mergedBytes, remoteBytes);
 		}
 		
-		/* (non-Javadoc)
-		 * @see org.eclipse.team.internal.ccvs.core.syncinfo.CVSResourceVariantTree#dispose()
-		 */
+		@Override
 		public void dispose() {
 			mergedSynchronizer.dispose();
 			super.dispose();
@@ -140,7 +138,7 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour
 		initialize();
 	}
 
-	/* (non-Javadoc)
+	/*
 	 * @see org.eclipse.team.internal.ccvs.core.CVSWorkspaceSubscriber#initialize()
 	 */
 	private void initialize() {			
@@ -186,7 +184,7 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour
 		baseTree.merged(resource, remoteBytes);
 	}
 
-	/* (non-Javadoc)
+	/*
 	 * @see org.eclipse.team.core.sync.TeamSubscriber#cancel()
 	 */
 	public void cancel() {	
@@ -195,16 +193,12 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour
 		baseTree.dispose();	
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.sync.TeamSubscriber#roots()
-	 */
+	@Override
 	public IResource[] roots() {
 		return (IResource[]) roots.toArray(new IResource[roots.size()]);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.sync.TeamSubscriber#isSupervised(org.eclipse.core.resources.IResource)
-	 */
+	@Override
 	public boolean isSupervised(IResource resource) throws TeamException {
 		return getBaseTree().hasResourceVariant(resource) || getRemoteTree().hasResourceVariant(resource); 
 	}
@@ -281,7 +275,7 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour
 	/* 
 	 * Currently only the workspace subscriber knows when a project has been deconfigured. We will listen for these events
 	 * and remove the root then forward to merge subscriber listeners.
-	 * (non-Javadoc)
+	 * 
 	 * @see org.eclipse.team.core.subscribers.ITeamResourceChangeListener#teamResourceChanged(org.eclipse.team.core.subscribers.TeamDelta[])
 	 */
 	public void subscriberResourceChanged(ISubscriberChangeEvent[] deltas) {		
@@ -300,16 +294,12 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.CVSSyncTreeSubscriber#getBaseSynchronizationCache()
-	 */
+	@Override
 	protected IResourceVariantTree getBaseTree() {
 		return baseTree;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.CVSSyncTreeSubscriber#getRemoteSynchronizationCache()
-	 */
+	@Override
 	protected IResourceVariantTree getRemoteTree() {
 		return remoteTree;
 	}
@@ -351,9 +341,7 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour
 		return (PersistantResourceVariantByteStore)((CVSResourceVariantTree)getRemoteTree()).getByteStore();
 	}
 	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
+	@Override
 	public boolean equals(Object other) {
 		if(this == other) return true;
 		if(! (other instanceof CVSMergeSubscriber)) return false;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java
index ef0d70aad..cde7eb4eb 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java
@@ -26,9 +26,7 @@ public class CVSMergeSyncInfo extends CVSSyncInfo {
 		super(local, base, remote, subscriber);
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.CVSSyncInfo#handleDeletionConflicts(int)
-	 */
+	@Override
 	protected int handleDeletionConflicts(int kind) {
 		// (see bug 40053).
 		if(kind == (SyncInfo.CONFLICTING | SyncInfo.DELETION | SyncInfo.PSEUDO_CONFLICT)) {
@@ -53,9 +51,7 @@ public class CVSMergeSyncInfo extends CVSSyncInfo {
 		return kind;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.CVSSyncInfo#makeOutgoing(org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public IStatus makeOutgoing(IProgressMonitor monitor) throws TeamException {
 		// Make the resource outgoing by marking it as merged with the subscriber
 		CVSMergeSubscriber subscriber = (CVSMergeSubscriber)getSubscriber();
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProjectSetCapability.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProjectSetCapability.java
index 67fe69b65..8579ccfaf 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProjectSetCapability.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProjectSetCapability.java
@@ -646,9 +646,7 @@ public class CVSProjectSetCapability extends ProjectSetCapability {
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.ProjectSetCapability#asReference(java.net.URI, java.lang.String)
-	 */
+	@Override
 	public String asReference(URI uri, String projectName) {
 		try {
 			CVSURI cvsURI = CVSURI.fromUri(uri);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSRevisionNumberCompareCriteria.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSRevisionNumberCompareCriteria.java
index 2faaa7a57..3f3164600 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSRevisionNumberCompareCriteria.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSRevisionNumberCompareCriteria.java
@@ -72,23 +72,17 @@ import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.IComparisonCriteria#compare(org.eclipse.core.resources.IResource, org.eclipse.team.core.subscribers.ISubscriberResource)
-	 */
+	@Override
 	public boolean compare(IResource local, IResourceVariant remote) {
 		return compare(local, (ICVSRemoteResource)remote);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.IComparisonCriteria#compare(org.eclipse.team.core.subscribers.ISubscriberResource, org.eclipse.team.core.subscribers.ISubscriberResource)
-	 */
+	@Override
 	public boolean compare(IResourceVariant base, IResourceVariant remote) {
 		return compare((ICVSRemoteResource)base, (ICVSRemoteResource)remote);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.ISubscriberResourceComparator#isThreeWay()
-	 */
+	@Override
 	public boolean isThreeWay() {
 		return isThreeWay;
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java
index 09a10d89c..7c14f4080 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncInfo.java
@@ -51,9 +51,7 @@ public class CVSSyncInfo extends SyncInfo {
 		return subscriber;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.sync.SyncInfo#computeSyncKind(org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	protected int calculateKind() throws TeamException {
 		// special handling for folders, the generic sync algorithm doesn't work well
 		// with CVS because folders are not in namespaces (e.g. they exist in all versions
@@ -353,10 +351,7 @@ public class CVSSyncInfo extends SyncInfo {
 		return info != null ? info.getRevision() : null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.synchronize.SyncInfo#getLocalAuthor(org.eclipse.core.runtime.IProgressMonitor)
-	 * @since 3.6
-	 */
+	@Override
 	public String getLocalAuthor(IProgressMonitor monitor) {
 		final ICVSFile cvsFile= getCVSFile();
 		if (cvsFile == null)
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java
index 5c28a5623..0aaea5ecb 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java
@@ -57,23 +57,19 @@ public abstract class CVSSyncTreeSubscriber extends ResourceVariantTreeSubscribe
 		this.comparisonCriteria = new CVSRevisionNumberCompareCriteria(isThreeWay());
 	}
 
-	/* (non-Javadoc)
+	/*
 	 * @see org.eclipse.team.core.sync.ISyncTreeSubscriber#getId()
 	 */
 	public QualifiedName getId() {
 		return id;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.sync.ISyncTreeSubscriber#getName()
-	 */
+	@Override
 	public String getName() {
 		return name;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.sync.ISyncTreeSubscriber#getSyncInfo(org.eclipse.core.resources.IResource)
-	 */
+	@Override
 	public SyncInfo getSyncInfo(IResource resource) throws TeamException {
 		if (!isSupervised(resource)) return null;
 		if(resource.getType() == IResource.FILE || !isThreeWay()) {
@@ -85,9 +81,7 @@ public abstract class CVSSyncTreeSubscriber extends ResourceVariantTreeSubscribe
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.sync.ISyncTreeSubscriber#isSupervised(org.eclipse.core.resources.IResource)
-	 */
+	@Override
 	public boolean isSupervised(IResource resource) throws TeamException {
 		try {
 			RepositoryProvider provider = RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId());
@@ -110,16 +104,12 @@ public abstract class CVSSyncTreeSubscriber extends ResourceVariantTreeSubscribe
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.TeamSubscriber#getDefaultComparisonCriteria()
-	 */
+	@Override
 	public IResourceVariantComparator getResourceComparator() {
 		return comparisonCriteria;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.core.subscribers.caches.ResourceVariantTreeSubscriber#getSyncInfo(org.eclipse.core.resources.IResource, org.eclipse.team.core.synchronize.IResourceVariant, org.eclipse.team.core.synchronize.IResourceVariant)
-	 */
+	@Override
 	protected SyncInfo getSyncInfo(IResource local, IResourceVariant base, IResourceVariant remote) throws TeamException {
 		CVSSyncInfo info = new CVSSyncInfo(local, base, remote, this);
 		info.init();
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
index 02e7a32af..0b0a8bf36 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
@@ -126,15 +126,11 @@ public class CVSTeamProvider extends RepositoryProvider {
 	public CVSTeamProvider() {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IProjectNature#deconfigure()
-	 */
+	@Override
 	public void deconfigure() {
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.RepositoryProvider#deconfigured()
-	 */
+	@Override
 	public void deconfigured() {
 		// when a nature is removed from the project, notify the synchronizer that
 		// we no longer need the sync info cached. This does not affect the actual CVS
@@ -149,16 +145,12 @@ public class CVSTeamProvider extends RepositoryProvider {
 		}
 		ResourceStateChangeListeners.getListener().projectDeconfigured(getProject());
 	}
-	/**
-	 * @see IProjectNature#getProject()
-	 */
+	@Override
 	public IProject getProject() {
 		return project;
 	}
 
-	/**
-	 * @see IProjectNature#setProject(IProject)
-	 */
+	@Override
 	public void setProject(IProject project) {
 		this.project = project;
 		this.workspaceRoot = new CVSWorkspaceRoot(project);
@@ -459,30 +451,22 @@ public class CVSTeamProvider extends RepositoryProvider {
 		}
 	}
 	
-	/*
-	 * @see RepositoryProvider#getID()
-	 */
+	@Override
 	public String getID() {
 		return CVSProviderPlugin.getTypeId();
 	}
 	
-	/*
-	 * @see RepositoryProvider#getMoveDeleteHook()
-	 */
+	@Override
 	public IMoveDeleteHook getMoveDeleteHook() {
 		return moveDeleteHook;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.RepositoryProvider#getFileModificationValidator()
-	 */
+	@Override
 	public IFileModificationValidator getFileModificationValidator() {
 		return getFileModificationValidator2();
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.RepositoryProvider#getFileModificationValidator2()
-	 */
+	@Override
 	public FileModificationValidator getFileModificationValidator2() {
 		return internalGetFileModificationValidator();
 	}
@@ -660,23 +644,17 @@ public class CVSTeamProvider extends RepositoryProvider {
 		}
 	}
 	
-	/**
-	 * @see org.eclipse.team.core.RepositoryProvider#canHandleLinkedResources()
-	 */
+	@Override
 	public boolean canHandleLinkedResources() {
 		return true;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.RepositoryProvider#canHandleLinkedResourceURI()
-	 */
+	@Override
 	public boolean canHandleLinkedResourceURI() {
 		return true;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.RepositoryProvider#validateCreateLink(org.eclipse.core.resources.IResource, int, org.eclipse.core.runtime.IPath)
-	 */
+	@Override
 	public IStatus validateCreateLink(IResource resource, int updateFlags, IPath location) {
 		return internalValidateCreateLink(resource);
 	}
@@ -701,9 +679,7 @@ public class CVSTeamProvider extends RepositoryProvider {
 		return Status.OK_STATUS;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.RepositoryProvider#validateCreateLink(org.eclipse.core.resources.IResource, int, java.net.URI)
-	 */
+	@Override
 	public IStatus validateCreateLink(IResource resource, int updateFlags, URI location) {
 		return internalValidateCreateLink(resource);
 	}
@@ -850,16 +826,12 @@ public class CVSTeamProvider extends RepositoryProvider {
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.RepositoryProvider#getRuleFactory()
-	 */
+	@Override
 	public IResourceRuleFactory getRuleFactory() {
 		return RESOURCE_RULE_FACTORY;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.RepositoryProvider#getFileHistoryProvider()
-	 */
+	@Override
 	public IFileHistoryProvider getFileHistoryProvider() {
 		   if (CVSTeamProvider.fileHistoryProvider == null) {
 	            CVSTeamProvider.fileHistoryProvider = new CVSFileHistoryProvider();
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProviderType.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProviderType.java
index f12ff6249..c448cf678 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProviderType.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProviderType.java
@@ -50,16 +50,12 @@ public class CVSTeamProviderType extends RepositoryProviderType implements IAdap
 			return projectsToShare.isEmpty();
 		}
 
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.jobs.Job#shouldSchedule()
-		 */
+		@Override
 		public boolean shouldSchedule() {
 			return !isQueueEmpty();
 		}
 		
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.jobs.Job#shouldRun()
-		 */
+		@Override
 		public boolean shouldRun() {
 			synchronized (projectsToShare) {
 				for (Iterator iter = projectsToShare.iterator(); iter.hasNext();) {
@@ -83,9 +79,7 @@ public class CVSTeamProviderType extends RepositoryProviderType implements IAdap
 			}
 		}
 		
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
-		 */
+		@Override
 		protected IStatus run(IProgressMonitor monitor) {
 			IProject next = null;
 			next = getNextProject();
@@ -152,16 +146,12 @@ public class CVSTeamProviderType extends RepositoryProviderType implements IAdap
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.RepositoryProviderType#getProjectSetCapability()
-	 */
+	@Override
 	public ProjectSetCapability getProjectSetCapability() {
 		return new CVSProjectSetCapability();
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.RepositoryProviderType#metaFilesDetected(org.eclipse.core.resources.IProject, org.eclipse.core.resources.IContainer[])
-	 */
+	@Override
 	public void metaFilesDetected(IProject project, IContainer[] containers) {
 		for (int i = 0; i < containers.length; i++) {
 			IContainer container = containers[i];
@@ -185,16 +175,12 @@ public class CVSTeamProviderType extends RepositoryProviderType implements IAdap
             getAutoShareJob().share(project);
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.RepositoryProviderType#getSubscriber()
-	 */
+	@Override
 	public Subscriber getSubscriber() {
 		return CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
+	@Override
 	public <T> T getAdapter(Class<T> adapter) {
 		if (adapter == ActiveChangeSetManager.class || adapter == IChangeGroupingRequestor.class)
 			return adapter.cast(CVSProviderPlugin.getPlugin().getChangeSetManager());
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java
index 0664fbdef..004ccb559 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java
@@ -79,7 +79,7 @@ public class CVSWorkspaceSubscriber extends CVSSyncTreeSubscriber implements IRe
 	 * 
 	 * [Issue : this will have to change when folders can be shared with
 	 * a team provider instead of the current project restriction]
-	 * (non-Javadoc)
+	 *
 	 * @see org.eclipse.team.core.sync.ISyncTreeSubscriber#roots()
 	 */
 	public IResource[] roots() {
@@ -97,9 +97,7 @@ public class CVSWorkspaceSubscriber extends CVSSyncTreeSubscriber implements IRe
 		return (IProject[]) result.toArray(new IProject[result.size()]);
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#resourceSyncInfoChanged(org.eclipse.core.resources.IResource[])
-	 */
+	@Override
 	public void resourceSyncInfoChanged(IResource[] changedResources) {
 		internalResourceSyncInfoChanged(changedResources, true); 
 	}
@@ -109,16 +107,12 @@ public class CVSWorkspaceSubscriber extends CVSSyncTreeSubscriber implements IRe
 		fireTeamResourceChange(SubscriberChangeEvent.asSyncChangedDeltas(this, changedResources));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#externalSyncInfoChange(org.eclipse.core.resources.IResource[])
-	 */
+	@Override
 	public void externalSyncInfoChange(IResource[] changedResources) {
 		internalResourceSyncInfoChanged(changedResources, false);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#resourceModified(org.eclipse.core.resources.IResource[])
-	 */
+	@Override
 	public void resourceModified(IResource[] changedResources) {
 		// This is only ever called from a delta POST_CHANGE
 		// which causes problems since the workspace tree is closed
@@ -128,17 +122,13 @@ public class CVSWorkspaceSubscriber extends CVSSyncTreeSubscriber implements IRe
 		// we don't need to propogate this.
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#projectConfigured(org.eclipse.core.resources.IProject)
-	 */
+	@Override
 	public void projectConfigured(IProject project) {
 		SubscriberChangeEvent delta = new SubscriberChangeEvent(this, ISubscriberChangeEvent.ROOT_ADDED, project);
 		fireTeamResourceChange(new SubscriberChangeEvent[] {delta});
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#projectDeconfigured(org.eclipse.core.resources.IProject)
-	 */
+	@Override
 	public void projectDeconfigured(IProject project) {
 		try {
 			getRemoteTree().flushVariants(project, IResource.DEPTH_INFINITE);
@@ -158,23 +148,17 @@ public class CVSWorkspaceSubscriber extends CVSSyncTreeSubscriber implements IRe
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.CVSSyncTreeSubscriber#getBaseSynchronizationCache()
-	 */
+	@Override
 	protected IResourceVariantTree getBaseTree() {
 		return baseTree;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.CVSSyncTreeSubscriber#getRemoteSynchronizationCache()
-	 */
+	@Override
 	protected IResourceVariantTree getRemoteTree() {
 		return remoteTree;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.Subscriber#collectOutOfSync(org.eclipse.core.resources.IResource[], int, org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public void collectOutOfSync(IResource[] resources, int depth, final SyncInfoSet set, final IProgressMonitor monitor) {
 		monitor.beginTask(null, IProgressMonitor.UNKNOWN);
 		for (int i = 0; i < resources.length; i++) {
@@ -304,9 +288,7 @@ public class CVSWorkspaceSubscriber extends CVSSyncTreeSubscriber implements IRe
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.Subscriber#getState(org.eclipse.core.resources.mapping.ResourceMapping, int, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public int getState(ResourceMapping mapping, int stateMask, IProgressMonitor monitor) throws CoreException {
 		if ((stateMask & IThreeWayDiff.INCOMING) == 0) {
 			// If we're only interested in outgoing changes, used the cached modified state
@@ -342,7 +324,7 @@ public class CVSWorkspaceSubscriber extends CVSSyncTreeSubscriber implements IRe
 		return kind;
 	}
 
-	/* (non-Javadoc)
+	/*
 	 * @see org.eclipse.team.core.subscribers.Subscriber#hasLocalChanges(org.eclipse.core.resources.mapping.ResourceTraversal[], org.eclipse.core.runtime.IProgressMonitor)
 	 */
 	public boolean hasLocalChanges(ResourceTraversal[] traversals, IProgressMonitor monitor) throws CoreException {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java
index 34391db65..91648de5b 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Add.java
@@ -76,9 +76,7 @@ public class Add extends Command {
 		return status;
 	}
 	
-	/* (non-Javadoc)
-     * @see org.eclipse.team.internal.ccvs.core.client.Command#getDefaultCommandOutputListener()
-     */
+	@Override
     protected ICommandOutputListener getDefaultCommandOutputListener() {
         return new CommandOutputListener() {
             public IStatus errorLine(String line,
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CheckoutWithOverwrite.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CheckoutWithOverwrite.java
index ffeed8d5a..31bb9953c 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CheckoutWithOverwrite.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/CheckoutWithOverwrite.java
@@ -36,9 +36,7 @@ public class CheckoutWithOverwrite extends Checkout {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @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/ConsoleListeners.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ConsoleListeners.java
index e4817a892..7f552dfe4 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ConsoleListeners.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ConsoleListeners.java
@@ -56,9 +56,7 @@ public class ConsoleListeners implements IConsoleListener {
         }
     }
     
-    /* (non-Javadoc)
-     * @see org.eclipse.team.internal.ccvs.core.client.listeners.IConsoleListener#commandInvoked(java.lang.String)
-     */
+    @Override
     public void commandInvoked(final Session session, final String line) {
         if (listeners.isEmpty()) return;
         IConsoleListener[] listeners = getListeners();
@@ -75,9 +73,7 @@ public class ConsoleListeners implements IConsoleListener {
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.team.internal.ccvs.core.client.listeners.IConsoleListener#messageLineReceived(java.lang.String)
-     */
+    @Override
     public void messageLineReceived(final Session session, final String line, final IStatus status) {
         if (listeners.isEmpty()) return;
         IConsoleListener[] listeners = getListeners();
@@ -94,9 +90,7 @@ public class ConsoleListeners implements IConsoleListener {
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.team.internal.ccvs.core.client.listeners.IConsoleListener#errorLineReceived(java.lang.String)
-     */
+    @Override
     public void errorLineReceived(final Session session, final String line, final IStatus status) {
         if (listeners.isEmpty()) return;
         IConsoleListener[] listeners = getListeners();
@@ -113,9 +107,7 @@ public class ConsoleListeners implements IConsoleListener {
         }
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.team.internal.ccvs.core.client.listeners.IConsoleListener#commandCompleted(org.eclipse.core.runtime.IStatus, java.lang.Exception)
-     */
+    @Override
     public void commandCompleted(final Session session, final IStatus status, final Exception exception) {
         if (listeners.isEmpty()) return;
         IConsoleListener[] listeners = getListeners();
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Editors.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Editors.java
index 405f945fb..1e1ecdbc4 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Editors.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Editors.java
@@ -23,16 +23,12 @@ package org.eclipse.team.internal.ccvs.core.client;
  */
 public class Editors extends AbstractMessageCommand {
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.client.Request#getRequestId()
-	 */
+	@Override
 	protected String getRequestId() {
 		return "editors"; //$NON-NLS-1$
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.client.Command#isWorkspaceModification()
-	 */
+	@Override
 	protected boolean isWorkspaceModification() {
 		return false;
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/MTHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/MTHandler.java
index dd65a9b28..9e7313eb6 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/MTHandler.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/MTHandler.java
@@ -21,23 +21,17 @@ public class MTHandler extends ResponseHandler {
 	private String nextLine;
 	private boolean isLineAvailable;
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.client.ResponseHandler#getInstance()
-	 */
+	@Override
 	ResponseHandler getInstance() {
 		return new MTHandler();
 	}
 
-	/**
-	 * @see ResponseHandler#getResponseID()
-	 */
+	@Override
 	public String getResponseID() {
 		return "MT"; //$NON-NLS-1$
 	}
 
-	/**
-	 * @see ResponseHandler#handle(Session, String, IProgressMonitor)
-	 */
+	@Override
 	public void handle(Session session, String argument, IProgressMonitor monitor)
 		throws CVSException {
 		
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPCommand.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPCommand.java
index 9d504d92b..1bc094b8b 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPCommand.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPCommand.java
@@ -22,9 +22,7 @@ import org.eclipse.team.internal.ccvs.core.ICVSResource;
  */
 public class NOOPCommand extends Command {
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.client.Command#sendLocalResourceState(Session, GlobalOption[], LocalOption[], ICVSResource[], IProgressMonitor)
-	 */
+	@Override
 	protected ICVSResource[] sendLocalResourceState(
 		Session session,
 		GlobalOption[] globalOptions,
@@ -38,23 +36,17 @@ public class NOOPCommand extends Command {
 		return resources;
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.client.Request#getRequestId()
-	 */
+	@Override
 	protected String getRequestId() {
 		return "noop"; //$NON-NLS-1$
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.client.Command#sendArguments(Session, String[])
-	 */
+	@Override
 	protected void sendArguments(Session session, String[] arguments)throws CVSException {
 		// don't send any arguments
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.client.Command#isWorkspaceModification()
-	 */
+	@Override
 	protected boolean isWorkspaceModification() {
 		return false;
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RDiff.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RDiff.java
index 6cb054581..0473990ac 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RDiff.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RDiff.java
@@ -20,9 +20,7 @@ public class RDiff extends RemoteCommand {
 	/*** Local options: specific to rdiff ***/
 	public static final LocalOption SUMMARY = new LocalOption("-s", null); //$NON-NLS-1$
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.client.Request#getRequestId()
-	 */
+	@Override
 	protected String getRequestId() {
 		return "rdiff"; //$NON-NLS-1$
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RLog.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RLog.java
index 22b737954..2338d2eb1 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RLog.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RLog.java
@@ -121,9 +121,7 @@ public class RLog extends RemoteCommand {
 		
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.client.Request#getRequestId()
-	 */
+	@Override
 	protected String getRequestId() {
 		return "rlog"; //$NON-NLS-1$
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RemoteCommand.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RemoteCommand.java
index 811daee3b..eff261de8 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RemoteCommand.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/RemoteCommand.java
@@ -45,9 +45,7 @@ public abstract class RemoteCommand extends Command {
 		// do nothing
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.client.Command#convertArgumentsForOpenSession(org.eclipse.team.internal.ccvs.core.ICVSResource[], org.eclipse.team.internal.ccvs.core.client.Session)
-	 */
+	@Override
 	protected String[] convertArgumentsForOpenSession(
 		ICVSResource[] arguments,
 		Session openSession)
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Replace.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Replace.java
index 8e02594bc..36340e17c 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Replace.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Replace.java
@@ -58,9 +58,7 @@ public class Replace extends Update {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @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/SyncUpdate.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java
index 217b7510c..29a2d9477 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
@@ -31,17 +31,13 @@ public class SyncUpdate extends Update {
 		new FileStructureVisitor(session, localOptions, emptyFolders, true, false).visit(session, resources, monitor);
 	}
 	
-	/* (non-Javadoc)
-     * @see org.eclipse.team.internal.ccvs.core.client.Command#isWorkspaceModification()
-     */
+    @Override
     protected boolean isWorkspaceModification() {
         // The sync-update will not modify the workspace
         return false;
     }
     
-    /* (non-Javadoc)
-     * @see org.eclipse.team.internal.ccvs.core.client.Command#filterGlobalOptions(org.eclipse.team.internal.ccvs.core.client.Session, org.eclipse.team.internal.ccvs.core.client.Command.GlobalOption[])
-     */
+    @Override
     protected GlobalOption[] filterGlobalOptions(Session session, GlobalOption[] globalOptions) {
         // Ensure that the DO_NOT_CHANGE (-n) global option is present
 		if (! Command.DO_NOT_CHANGE.isElementOf(globalOptions)) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/UpdateMergableOnly.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/UpdateMergableOnly.java
index 3d71135a5..f5d88c779 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/UpdateMergableOnly.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/UpdateMergableOnly.java
@@ -57,9 +57,7 @@ public class UpdateMergableOnly extends Update {
 			super(UpdatedHandler.HANDLE_MERGED);
 		}
 		
-		/* (non-Javadoc)
-		 * @see org.eclipse.team.internal.ccvs.core.client.UpdatedHandler#getTargetFile(org.eclipse.team.internal.ccvs.core.ICVSFolder, java.lang.String, byte[])
-		 */
+		@Override
 		protected ICVSFile getTargetFile(ICVSFolder mParent, String fileName, byte[] entryBytes) throws CVSException {
 			String adjustedFileName = fileName;
 			if (ResourceSyncInfo.isMergedWithConflicts(entryBytes)) {
@@ -70,9 +68,7 @@ public class UpdateMergableOnly extends Update {
 			return super.getTargetFile(mParent, adjustedFileName, entryBytes);
 		}
 		
-		/* (non-Javadoc)
-		 * @see org.eclipse.team.internal.ccvs.core.client.UpdatedHandler#receiveTargetFile(org.eclipse.team.internal.ccvs.core.client.Session, org.eclipse.team.internal.ccvs.core.ICVSFile, java.lang.String, java.util.Date, boolean, boolean, org.eclipse.core.runtime.IProgressMonitor)
-		 */
+		@Override
 		protected void receiveTargetFile(
 			Session session,
 			ICVSFile mFile,
@@ -129,9 +125,7 @@ public class UpdateMergableOnly extends Update {
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @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 95c57712e..ca1e08b9a 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
@@ -92,9 +92,7 @@ public class Version extends RemoteCommand {
 		return execute(session, NO_GLOBAL_OPTIONS, NO_LOCAL_OPTIONS, new String[] {}, listener, monitor);
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.client.Command#isWorkspaceModification()
-	 */
+	@Override
 	protected boolean isWorkspaceModification() {
 		return false;
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/AnnotateListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/AnnotateListener.java
index c4ed6c6a8..dc277e4e7 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/AnnotateListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/AnnotateListener.java
@@ -81,9 +81,7 @@ public class AnnotateListener extends CommandOutputListener {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener#errorLine(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 errorLine(String line, ICVSRepositoryLocation location, ICVSFolder commandRoot, IProgressMonitor monitor) {
 		if(line.startsWith(CVSMessages.AnnotateListener_3)) { 
 			String error = CVSMessages.AnnotateListener_4; 
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/RDiffSummaryListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/RDiffSummaryListener.java
index 2ec074965..7c6c359dd 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/RDiffSummaryListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/RDiffSummaryListener.java
@@ -80,9 +80,7 @@ public class RDiffSummaryListener extends CommandOutputListener {
 		this.listener = listener;
 	}
 	
-	/* (non-Javadoc)
-	 * @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,
@@ -125,9 +123,7 @@ public class RDiffSummaryListener extends CommandOutputListener {
 		return super.messageLine(line, location, commandRoot, monitor);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener#errorLine(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 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 3fbf7267b..2277dfd6d 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
@@ -1190,16 +1190,12 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation#getUserAuthenticator()
-	 */
+	@Override
 	public IUserAuthenticator getUserAuthenticator() {
 		return getAuthenticator();
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation#setUserAuthenticator()
-	 */
+	@Override
 	public void setUserAuthenticator(IUserAuthenticator authenticator) {
 		CVSRepositoryLocation.authenticator = authenticator;
 	}
@@ -1258,9 +1254,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation#getUserInfoCached()
-	 */
+	@Override
 	public boolean getUserInfoCached() {
 		ISecurePreferences node = getCVSNode();
 		if (node == null)
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/LogEntryCache.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/LogEntryCache.java
index de4be8479..0af48d684 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/LogEntryCache.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/LogEntryCache.java
@@ -196,9 +196,7 @@ class LogEntryCache implements ILogEntryListener {
 		entries.remove(remotePath);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.client.listeners.ILogEntryListener#addEntry(org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry)
-	 */
+	@Override
 	public void handleLogEntryReceived(ILogEntry entry) {
 		ICVSRemoteFile file = entry.getRemoteFile();
 		String fullPath = getFullPath(file);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/RLogTreeBuilder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/RLogTreeBuilder.java
index 575d50d9c..ae2ee5be4 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/RLogTreeBuilder.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filesystem/RLogTreeBuilder.java
@@ -59,7 +59,7 @@ class RLogTreeBuilder {
 		tree.setChildren(new ICVSRemoteResource[0]);
 	}
 
-	/* (non-Javadoc)
+	/*
 	 * @see org.eclipse.team.internal.ccvs.core.client.listeners.RDiffSummaryListener.IFileDiffListener#newFile(java.lang.String, java.lang.String)
 	 */
 	public void newFile(IPath remoteFilePath, ICVSRemoteFile remoteFile) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/mapping/CVSActiveChangeSetCollector.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/mapping/CVSActiveChangeSetCollector.java
index 4453ff273..cd774e0b3 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/mapping/CVSActiveChangeSetCollector.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/mapping/CVSActiveChangeSetCollector.java
@@ -26,9 +26,7 @@ public class CVSActiveChangeSetCollector extends SubscriberChangeSetManager {
 		super(subscriber);
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.core.subscribers.ActiveChangeSetManager#doCreateSet(java.lang.String)
-	 */
+	@Override
 	protected ActiveChangeSet doCreateSet(String name) {
 		return new CVSActiveChangeSet(this, name);
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSEntryLineTag.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSEntryLineTag.java
index 4c08bcdb4..3f9315fdc 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSEntryLineTag.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSEntryLineTag.java
@@ -123,9 +123,7 @@ public class CVSEntryLineTag extends CVSTag {
 		return toEntryLineFormat(false);
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.CVSTag#asDate()
-	 */
+	@Override
 	public Date asDate() {
 		return entryLineToDate(name);
 	}
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 56d3f4bdc..8bad06df9 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
@@ -453,9 +453,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 		return getNotifyInfo();
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#checkedIn(java.lang.String)
-	 */
+	@Override
 	public void checkedIn(String entryLine, boolean commit) throws CVSException {
 		ResourceSyncInfo oldInfo = getSyncInfo();
 		ResourceSyncInfo newInfo = null;
@@ -595,9 +593,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile {
 		EclipseSynchronizer.getInstance().setModified(this, UNKNOWN);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#getRepositoryRelativePath()
-	 */
+	@Override
 	public String getRepositoryRelativePath() throws CVSException {
 		if (!isManaged()) return null;
 		String parentPath = getParent().getRepositoryRelativePath();
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 6a94fb5bb..1874d8c57 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
@@ -401,9 +401,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#getRepositoryRelativePath()
-	 */
+	@Override
 	public String getRepositoryRelativePath() throws CVSException {
 		FolderSyncInfo info = getFolderSyncInfo();
 		if (info == null) return null;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java
index 13bc02680..925f57f7d 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java
@@ -505,13 +505,13 @@ public class EclipseSynchronizer implements IFlushOperation {
         }
 	}
 	
-	/* (non-Javadoc)
-	 * 
+	/* 
 	 * Callback which is invoked when the batching resource lock is released 
 	 * or when a flush is requested (see beginBatching(IResource)).
 	 * 
 	 * @see org.eclipse.team.internal.ccvs.core.syncinfo.ReentrantLock.IRunnableOnExit#run(org.eclipse.team.internal.ccvs.core.syncinfo.ReentrantLock.ThreadInfo, org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	public void flush(final ThreadInfo info, IProgressMonitor monitor) throws CVSException {
 		if (info != null && !info.isEmpty()) {
 			try {
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 241de7053..180dfd2d0 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
@@ -565,9 +565,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 		return new ResourceSyncInfo(getName());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.resources.RemoteResource#getSyncBytes()
-	 */
+	@Override
 	public byte[] getSyncBytes() {
 		try {
 			return folderInfo.getBytes();
@@ -577,23 +575,17 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.sync.IRemoteResource#getContentIdentifier()
-	 */
+	@Override
 	public String getContentIdentifier() {
 		return getTag().getName();
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#isManaged()
-	 */
+	@Override
 	public boolean isManaged() {
 		return super.isManaged() && isCVSFolder();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.synchronize.ResourceVariant#fetchContents(org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	protected void fetchContents(IProgressMonitor monitor) throws TeamException {
 		// This should not get called for folders
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java
index 75e9ede66..1c0ee061b 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java
@@ -170,9 +170,7 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.client.listeners.IUpdateMessageListener#directoryInformation(org.eclipse.team.internal.ccvs.core.ICVSFolder, java.lang.String, boolean)
-	 */
+	@Override
 	public void directoryInformation(ICVSFolder commandRoot, String stringPath, boolean newDirectory) {
 		try {
 			IPath path = this.parentFolder.getRelativePathFromRootRelativePath(commandRoot, new Path(null, stringPath));
@@ -187,9 +185,7 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.client.listeners.IUpdateMessageListener#directoryDoesNotExist(org.eclipse.team.internal.ccvs.core.ICVSFolder, java.lang.String)
-	 */
+	@Override
 	public void directoryDoesNotExist(ICVSFolder parent, String stringPath) {
 		try {
 			IPath path = this.parentFolder.getRelativePathFromRootRelativePath(parent, new Path(null, stringPath));
@@ -201,9 +197,7 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.client.listeners.IUpdateMessageListener#fileInformation(int, org.eclipse.team.internal.ccvs.core.ICVSFolder, java.lang.String)
-	 */
+	@Override
 	public void fileInformation(int type, ICVSFolder parent, String filename) {
 		try {
 			IPath filePath = new Path(null, filename);
@@ -217,15 +211,11 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.client.listeners.IUpdateMessageListener#fileDoesNotExist(org.eclipse.team.internal.ccvs.core.ICVSFolder, java.lang.String)
-	 */
+	@Override
 	public void fileDoesNotExist(ICVSFolder parent, String filename) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.client.listeners.IStatusListener#fileStatus(org.eclipse.team.internal.ccvs.core.ICVSFolder, java.lang.String, java.lang.String)
-	 */
+	@Override
 	public void fileStatus(ICVSFolder commandRoot, String path, String remoteRevision) {
 		if (remoteRevision == IStatusListener.FOLDER_REVISION)
 			// Ignore any folders
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java
index abe7a19b1..38d3a277d 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java
@@ -39,9 +39,7 @@ public class RemoteFolderSandbox extends RemoteFolder {
 		setChildren(new ICVSRemoteResource[0]);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFolder#getFile(java.lang.String)
-	 */
+	@Override
 	public ICVSFile getFile(String name) throws CVSException {
 		try {
 			return super.getFile(name);
@@ -78,9 +76,7 @@ public class RemoteFolderSandbox extends RemoteFolder {
 		return parent;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFolder#getFolder(java.lang.String)
-	 */
+	@Override
 	public ICVSFolder getFolder(String name) throws CVSException {
 		try {
 			return super.getFolder(name);
@@ -97,16 +93,12 @@ public class RemoteFolderSandbox extends RemoteFolder {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.resources.RemoteFolder#getMembers(org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public ICVSRemoteResource[] getMembers(IProgressMonitor monitor) throws TeamException {
 		return getChildren();
 	}
 
-	/*
-	 * @see ICVSFolder#acceptChildren(ICVSResourceVisitor)
-	 */
+	@Override
 	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/RemoteResource.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java
index 5cfae58e8..4b2e977b0 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
@@ -204,9 +204,7 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC
 		return "Remote " + (isContainer() ? "Folder: " : "File: ") + getName(); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.synchronize.ResourceVariant#getUniquePath()
-	 */
+	@Override
 	public String getCachePath() {
 		ICVSRepositoryLocation location = getRepository();
 		IPath path = new Path(null, location.getHost());
@@ -216,16 +214,12 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC
 		return path.toString();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.synchronize.ResourceVariant#getCacheId()
-	 */
+	@Override
 	protected String getCacheId() {
 		return CVSProviderPlugin.ID;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.variants.IResourceVariant#asBytes()
-	 */
+	@Override
 	public byte[] asBytes() {
 		return getSyncBytes();
 	}
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 36246155e..201841f04 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
@@ -377,21 +377,15 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter;
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.ISaveParticipant#doneSaving(org.eclipse.core.resources.ISaveContext)
-	 */
+	@Override
 	public void doneSaving(ISaveContext context) {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.ISaveParticipant#prepareToSave(org.eclipse.core.resources.ISaveContext)
-	 */
+	@Override
 	public void prepareToSave(ISaveContext context) throws CoreException {
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.ISaveParticipant#rollback(org.eclipse.core.resources.ISaveContext)
-	 */
+	@Override
 	public void rollback(ISaveContext context) {			
 	}
 
@@ -483,9 +477,7 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter;
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#cachesDirtyState()
-	 */
+	@Override
 	public boolean cachesDirtyState() {
 		return true;
 	}
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 a9f0268a6..35940dd05 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
@@ -202,9 +202,7 @@ import org.eclipse.team.internal.ccvs.core.util.Util;
 		return Util.equals(syncBytes, oldBytes);
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#getDirtyIndicator(org.eclipse.core.resources.IResource)
-	 */
+	@Override
 	String getDirtyIndicator(IResource resource, boolean threadSafeAccess) throws CVSException {		
 		if (resource.getType() == IResource.FILE) {
 			// a phantom file is dirty if it was managed before it was deleted			 
@@ -216,17 +214,13 @@ import org.eclipse.team.internal.ccvs.core.util.Util;
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#setDirtyIndicator(org.eclipse.core.resources.IResource, java.lang.String)
-	 */
+	@Override
 	void setDirtyIndicator(IResource resource, String indicator) throws CVSException {
 		// We don't cache the dirty count for folders because it would cause
 		// resource delta's in the decorator thread and possible deadlock.
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#cachesDirtyState()
-	 */
+	@Override
 	public boolean cachesDirtyState() {
 		// We don't cache the dirty count for folders because it would cause
 		// resource delta's in the decorator thread and possible deadlock.
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java
index 854884c05..1ea7f0372 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java
@@ -45,24 +45,18 @@ public class UpdateContentCachingService implements IUpdateMessageListener {
 
 	public class SandboxUpdate extends Update {
 		
-		/* (non-Javadoc)
-		 * @see org.eclipse.team.internal.ccvs.core.client.Update#shouldRetrieveAbsentDirectories(org.eclipse.team.internal.ccvs.core.client.Session)
-		 */
+		@Override
 		protected boolean shouldRetrieveAbsentDirectories(Session session) {
 			return fetchAbsentDirectories;
 		}
 		
-		/* (non-Javadoc)
-		 * @see org.eclipse.team.internal.ccvs.core.client.Command#commandFinished(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[], org.eclipse.team.internal.ccvs.core.ICVSResource[], org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IStatus)
-		 */
+		@Override
 		protected IStatus commandFinished(Session session, GlobalOption[] globalOptions, LocalOption[] localOptions, ICVSResource[] resources, IProgressMonitor monitor, IStatus status) throws CVSException {
 			// Don't do anything (i.e. don't prune)
 			return status;
 		}
 
-		/* (non-Javadoc)
-		 * @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, LocalOption[] localOptions, String[] arguments, ICommandOutputListener listener, IProgressMonitor monitor) throws CVSException {
 			session.registerResponseHandler(new SandboxUpdatedHandler(UpdatedHandler.HANDLE_CREATED));
 			session.registerResponseHandler(new SandboxUpdatedHandler(UpdatedHandler.HANDLE_MERGED));
@@ -80,9 +74,7 @@ public class UpdateContentCachingService implements IUpdateMessageListener {
 		public SandboxUpdatedHandler(int type) {
 			super(type);
 		}
-		/* (non-Javadoc)
-		 * @see org.eclipse.team.internal.ccvs.core.client.UpdatedHandler#receiveTargetFile(org.eclipse.team.internal.ccvs.core.client.Session, org.eclipse.team.internal.ccvs.core.ICVSFile, java.lang.String, java.util.Date, boolean, boolean, org.eclipse.core.runtime.IProgressMonitor)
-		 */
+		@Override
 		protected void receiveTargetFile(
 			Session session,
 			ICVSFile mFile,
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSBaseResourceVariantTree.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSBaseResourceVariantTree.java
index a6dd5021e..c631221c1 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSBaseResourceVariantTree.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSBaseResourceVariantTree.java
@@ -57,9 +57,7 @@ public class CVSBaseResourceVariantTree extends ResourceVariantByteStore {
 		throw new UnsupportedOperationException();
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.utils.SynchronizationCache#members(org.eclipse.core.resources.IResource)
-	 */
+	@Override
 	public IResource[] members(IResource resource) throws TeamException {
 		if(resource.getType() == IResource.FILE) {
 			return new IResource[0];
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSDescendantResourceVariantByteStore.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSDescendantResourceVariantByteStore.java
index 5f7c3dc10..13e0bea0b 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSDescendantResourceVariantByteStore.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSDescendantResourceVariantByteStore.java
@@ -37,9 +37,7 @@ public class CVSDescendantResourceVariantByteStore extends DescendantResourceVar
 		super(baseCache, remoteCache);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.DescendantSynchronizationCache#isDescendant(org.eclipse.core.resources.IResource, byte[], byte[])
-	 */
+	@Override
 	protected boolean isDescendant(IResource resource, byte[] baseBytes, byte[] remoteBytes) throws TeamException {
 		if (resource.getType() != IResource.FILE) return true;
 		try {
@@ -49,9 +47,7 @@ public class CVSDescendantResourceVariantByteStore extends DescendantResourceVar
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.helpers.SynchronizationCache#setSyncBytes(org.eclipse.core.resources.IResource, byte[])
-	 */
+	@Override
 	public boolean setBytes(IResource resource, byte[] bytes) throws TeamException {
 		boolean changed = super.setBytes(resource, bytes);
 		if (resource.getType() == IResource.FILE && getBytes(resource) != null && !parentHasSyncBytes(resource)) {
@@ -72,9 +68,7 @@ public class CVSDescendantResourceVariantByteStore extends DescendantResourceVar
 		return (getBytes(resource.getParent()) != null);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.core.subscribers.caches.ResourceVariantByteStore#isVariantKnown(org.eclipse.core.resources.IResource)
-	 */
+	@Override
 	public boolean isVariantKnown(IResource resource) throws TeamException {
 		return ((PersistantResourceVariantByteStore)getRemoteStore()).isVariantKnown(resource);
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSResourceVariantTree.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSResourceVariantTree.java
index 8c9052310..6b8ad8fec 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSResourceVariantTree.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/CVSResourceVariantTree.java
@@ -40,16 +40,12 @@ public class CVSResourceVariantTree extends ResourceVariantTree {
 		this.cacheFileContentsHint = cacheFileContentsHint;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.RefreshOperation#getSynchronizationCache()
-	 */
+	@Override
 	public ResourceVariantByteStore getByteStore() {
 		return super.getByteStore();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.RefreshOperation#getRemoteSyncBytes(org.eclipse.core.resources.IResource, org.eclipse.team.core.subscribers.ISubscriberResource)
-	 */
+	@Override
 	protected byte[] getBytes(IResource local, IResourceVariant remote) throws TeamException {
 		if (remote != null) {
 			return super.getBytes(local, remote);
@@ -62,9 +58,7 @@ public class CVSResourceVariantTree extends ResourceVariantTree {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.RefreshOperation#getRemoteChildren(org.eclipse.team.core.subscribers.ISubscriberResource, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	protected IResourceVariant[] fetchMembers(IResourceVariant remote, IProgressMonitor progress) throws TeamException {
 		ICVSRemoteResource[] children = remote != null ? (ICVSRemoteResource[])((RemoteResource)remote).members(progress) : new ICVSRemoteResource[0];
 		IResourceVariant[] result = new IResourceVariant[children.length];
@@ -74,16 +68,12 @@ public class CVSResourceVariantTree extends ResourceVariantTree {
 		return result;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.RefreshOperation#buildRemoteTree(org.eclipse.core.resources.IResource, int, boolean, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	protected IResourceVariant fetchVariant(IResource resource, int depth, IProgressMonitor monitor) throws TeamException {
 		return (IResourceVariant)CVSWorkspaceRoot.getRemoteTree(resource, getTag(resource), isCacheFileContentsHint(), depth, monitor);
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.core.subscribers.caches.ResourceVariantTreeRefreshOperation#collectChanges(org.eclipse.core.resources.IResource, org.eclipse.team.core.synchronize.IResourceVariant, int, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public IResource[] collectChanges(IResource local,
 			IResourceVariant remote, int depth, IProgressMonitor monitor)
 			throws TeamException {
@@ -114,16 +104,12 @@ public class CVSResourceVariantTree extends ResourceVariantTree {
 		return (IResource[]) members.toArray(new IResource[members.size()]);
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.core.subscribers.caches.IResourceVariantTree#roots()
-	 */
+	@Override
 	public IResource[] roots() {
 		return subscriber.roots();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.core.subscribers.caches.IResourceVariantTree#getResourceVariant(org.eclipse.core.resources.IResource)
-	 */
+	@Override
 	public IResourceVariant getResourceVariant(IResource resource) throws TeamException {
 		byte[] remoteBytes = getByteStore().getBytes(resource);
 		if (remoteBytes == null) {
@@ -203,9 +189,7 @@ public class CVSResourceVariantTree extends ResourceVariantTree {
 		getByteStore().dispose();
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.core.subscribers.caches.ResourceVariantTree#setVariant(org.eclipse.core.resources.IResource, org.eclipse.team.core.synchronize.IResourceVariant)
-	 */
+	@Override
 	protected boolean setVariant(IResource local, IResourceVariant remote) throws TeamException {
 		if (local.getType() == IResource.FOLDER && remote != null 
 				&& !hasLocalSyncInfo((IFolder)local)
@@ -257,9 +241,7 @@ public class CVSResourceVariantTree extends ResourceVariantTree {
 		return getParentBytes(resource) != null;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.core.subscribers.caches.AbstractResourceVariantTree#collectedMembers(org.eclipse.core.resources.IResource, org.eclipse.core.resources.IResource[])
-	 */
+    @Override
 	protected IResource[] collectedMembers(IResource local, IResource[] members) throws TeamException {
 		// Look for resources that have sync bytes but are not in the resources we care about
 		IResource[] resources = getStoredMembers(local);
@@ -306,9 +288,7 @@ public class CVSResourceVariantTree extends ResourceVariantTree {
 		return new IResource[0];
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.variants.AbstractResourceVariantTree#refresh(org.eclipse.core.resources.IResource, int, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	protected IResource[] refresh(IResource resource, int depth, IProgressMonitor monitor) throws TeamException {
 		IResource[] changedResources = null;
 		monitor.beginTask(null, 100);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/DeferredResourceChangeHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/DeferredResourceChangeHandler.java
index 8cdcf49c9..f0fe8866d 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/DeferredResourceChangeHandler.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/DeferredResourceChangeHandler.java
@@ -41,9 +41,7 @@ public class DeferredResourceChangeHandler extends BackgroundEventHandler {
 	private Set recreatedResources = new HashSet();
 	private Set conflictingDeletion = new HashSet();
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.BackgroundEventHandler#processEvent(org.eclipse.team.core.subscribers.BackgroundEventHandler.Event, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	protected void processEvent(Event event, IProgressMonitor monitor) throws TeamException {
 		int type = event.getType();
 		switch (type) {
@@ -84,9 +82,7 @@ public class DeferredResourceChangeHandler extends BackgroundEventHandler {
 			queueEvent(new ResourceEvent(resource, RECREATED_CVS_RESOURCE, IResource.DEPTH_ZERO), false);
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.BackgroundEventHandler#dispatchEvents()
-	 */
+	@Override
 	protected boolean doDispatchEvents(IProgressMonitor monitor) {
 		// Handle ignore file changes
 		boolean workDone = !changedIgnoreFiles.isEmpty() || !recreatedResources.isEmpty();
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MultiTagResourceVariantTree.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MultiTagResourceVariantTree.java
index 2ecbccd2a..f6d4eafec 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MultiTagResourceVariantTree.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MultiTagResourceVariantTree.java
@@ -38,9 +38,7 @@ public class MultiTagResourceVariantTree extends CVSResourceVariantTree {
 		resources.put(resource, tag);
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.core.syncinfo.CVSResourceVariantTree#getTag(org.eclipse.core.resources.IResource)
-	 */
+	@Override
 	public CVSTag getTag(IResource resource) {
 		return (CVSTag)resources.get(resource);
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ReentrantLock.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ReentrantLock.java
index 1160ebdc7..1cf5b283e 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ReentrantLock.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ReentrantLock.java
@@ -62,9 +62,7 @@ public class ReentrantLock extends BatchingLock {
 		}
 	}
 	
-	/* (non-Javadoc)
-     * @see org.eclipse.team.internal.core.subscribers.BatchingLock#createThreadInfo(org.eclipse.team.internal.core.subscribers.BatchingLock.IFlushOperation)
-     */
+	@Override
     protected ThreadInfo createThreadInfo(IFlushOperation operation) {
         return new CVSThreadInfo(operation);
     }
diff --git a/tests/org.eclipse.jsch.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jsch.tests/META-INF/MANIFEST.MF
index 8c7da7c62..ec1e9a324 100644
--- a/tests/org.eclipse.jsch.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.jsch.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JSch Tests Plug-in
 Bundle-SymbolicName: org.eclipse.jsch.tests
-Bundle-Version: 1.1.200.qualifier
+Bundle-Version: 1.1.300.qualifier
 Eclipse-BundleShape: dir
 Bundle-Activator: org.eclipse.jsch.tests.Activator
 Bundle-Vendor: Eclipse.org
diff --git a/tests/org.eclipse.jsch.tests/pom.xml b/tests/org.eclipse.jsch.tests/pom.xml
index 421c6935b..e46267f2b 100644
--- a/tests/org.eclipse.jsch.tests/pom.xml
+++ b/tests/org.eclipse.jsch.tests/pom.xml
@@ -18,6 +18,6 @@
   </parent>
   <groupId>org.eclipse.jsch</groupId>
   <artifactId>org.eclipse.jsch.tests</artifactId>
-  <version>1.1.200-SNAPSHOT</version>
+  <version>1.1.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/tests/org.eclipse.jsch.tests/src/org/eclipse/jsch/tests/Activator.java b/tests/org.eclipse.jsch.tests/src/org/eclipse/jsch/tests/Activator.java
index 12d72c8dc..d0a23cf06 100644
--- a/tests/org.eclipse.jsch.tests/src/org/eclipse/jsch/tests/Activator.java
+++ b/tests/org.eclipse.jsch.tests/src/org/eclipse/jsch/tests/Activator.java
@@ -33,19 +33,13 @@ public class Activator extends Plugin {
 	public Activator() {
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
diff --git a/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF b/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF
index f652691e9..1efcba124 100644
--- a/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.team.tests.core; singleton:=true
-Bundle-Version: 3.8.400.qualifier
+Bundle-Version: 3.8.500.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.team.tests.core,
diff --git a/tests/org.eclipse.team.tests.core/pom.xml b/tests/org.eclipse.team.tests.core/pom.xml
index 57240066c..a95017023 100644
--- a/tests/org.eclipse.team.tests.core/pom.xml
+++ b/tests/org.eclipse.team.tests.core/pom.xml
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.team</groupId>
   <artifactId>org.eclipse.team.tests.core</artifactId>
-  <version>3.8.400-SNAPSHOT</version>
+  <version>3.8.500-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>
diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderWithLinking.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderWithLinking.java
index 54259c36a..905413463 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderWithLinking.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderWithLinking.java
@@ -27,20 +27,14 @@ public class RepositoryProviderWithLinking extends RepositoryProvider {
 
 	private static boolean canHandleLinkedURI;
 
-	/**
-	 * @see org.eclipse.team.core.RepositoryProvider#configureProject()
-	 */
+	@Override
 	public void configureProject() throws CoreException {
 	}
-	/**
-	 * @see org.eclipse.team.core.RepositoryProvider#getID()
-	 */
+	@Override
 	public String getID() {
 		return TYPE_ID;
 	}
-	/**
-	 * @see org.eclipse.core.resources.IProjectNature#deconfigure()
-	 */
+	@Override
 	public void deconfigure() throws CoreException {
 	}
 
@@ -48,9 +42,7 @@ public class RepositoryProviderWithLinking extends RepositoryProvider {
 		RepositoryProviderWithLinking.canHandleLinking = canHandleLinking;
 	}
 
-	/**
-	 * @see org.eclipse.team.core.RepositoryProvider#canHandleLinkedResources()
-	 */
+	@Override
 	public boolean canHandleLinkedResources() {
 		return canHandleLinking;
 	}
@@ -59,9 +51,7 @@ public class RepositoryProviderWithLinking extends RepositoryProvider {
 		RepositoryProviderWithLinking.canHandleLinkedURI = canHandleLinkedURI;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.RepositoryProvider#canHandleLinkedResourceURI()
-	 */
+	@Override
 	public boolean canHandleLinkedResourceURI() {
 		return RepositoryProviderWithLinking.canHandleLinkedURI;
 	}
diff --git a/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF b/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF
index 0d72ae6ef..b85b4f080 100644
--- a/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.team.tests.cvs.core; singleton:=true
-Bundle-Version: 3.4.500.qualifier
+Bundle-Version: 3.4.600.qualifier
 Bundle-Activator: org.eclipse.team.tests.ccvs.core.TeamCVSTestPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/tests/org.eclipse.team.tests.cvs.core/pom.xml b/tests/org.eclipse.team.tests.cvs.core/pom.xml
index 050a2a345..dbe551552 100644
--- a/tests/org.eclipse.team.tests.cvs.core/pom.xml
+++ b/tests/org.eclipse.team.tests.cvs.core/pom.xml
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.team</groupId>
   <artifactId>org.eclipse.team.tests.cvs.core</artifactId>
-  <version>3.4.500-SNAPSHOT</version>
+  <version>3.4.600-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSCompareSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSCompareSubscriberTest.java
index 5478d4e32..f90fe7f8b 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSCompareSubscriberTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSCompareSubscriberTest.java
@@ -16,19 +16,21 @@ package org.eclipse.team.tests.ccvs.core.subscriber;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.team.core.TeamException;
 import org.eclipse.team.core.synchronize.SyncInfo;
-import org.eclipse.team.internal.ccvs.core.*;
+import org.eclipse.team.internal.ccvs.core.CVSCompareSubscriber;
+import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin;
+import org.eclipse.team.internal.ccvs.core.CVSTag;
 import org.eclipse.team.internal.ccvs.core.client.Command;
 import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption;
 import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 /**
  * Tests the CVSMergeSubscriber
  */
@@ -102,9 +104,7 @@ public class CVSCompareSubscriberTest extends CVSSyncSubscriberTest {
 				SyncInfo.ADDITION});
 	}
 
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#tearDown()
-	 */
+	@Override
 	protected void tearDown() throws Exception {
 		getSyncInfoSource().tearDown();
 		super.tearDown();
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java
index c00d45005..21c3ba380 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java
@@ -16,9 +16,6 @@ package org.eclipse.team.tests.ccvs.core.subscriber;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -37,6 +34,9 @@ import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
 import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
 import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 
 /**
  * Tests the CVSMergeSubscriber
@@ -355,8 +355,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
 		
 		// scrub the project contents
 		IResource[] members = project.members();
-		for (int i = 0; i < members.length; i++) {
-			IResource resource = members[i];
+		for (IResource resource : members) {
 			if (resource.getName().equals(".project"))
 				continue;
 			delete(resource, IResource.FORCE, DEFAULT_MONITOR);
@@ -548,9 +547,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
 							  		SyncInfo.IN_SYNC});				
 	} 
 	
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#tearDown()
-	 */
+	@Override
 	protected void tearDown() throws Exception {
 		getSyncInfoSource().tearDown();
 		super.tearDown();
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java
index 7b6707aec..a526c63ea 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java
@@ -97,10 +97,12 @@ public class CVSWorkspaceSubscriberTest extends CVSSyncSubscriberTest {
 		return (CVSSyncTreeSubscriber)getWorkspaceSubscriber();
 	}
 	
-	/* (non-Javadoc)
-	 * 
+	/*
 	 * The shareProject method is invoked when creating new projects.
-	 * @see org.eclipse.team.tests.ccvs.core.EclipseTest#shareProject(org.eclipse.core.resources.IProject)
+	 * 
+	 * @see
+	 * org.eclipse.team.tests.ccvs.core.EclipseTest#shareProject(org.eclipse.core.
+	 * resources.IProject)
 	 */
 	@Override
 	protected void shareProject(final IProject project) throws TeamException, CoreException {
@@ -196,9 +198,6 @@ public class CVSWorkspaceSubscriberTest extends CVSSyncSubscriberTest {
 		registerSubscriberListener(getSubscriber());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.tests.ccvs.core.EclipseTest#deleteResources(org.eclipse.core.resources.IResource[])
-	 */
 	@Override
 	protected void deleteResources(IResource[] resources) throws TeamException, CoreException {
 		IResource[] affected = collect(resources, new ResourceCondition(), IResource.DEPTH_INFINITE);
@@ -220,9 +219,6 @@ public class CVSWorkspaceSubscriberTest extends CVSSyncSubscriberTest {
 		return deregisterSubscriberListener(getSubscriber());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.tests.ccvs.core.EclipseTest#commitResources(org.eclipse.core.resources.IResource[])
-	 */
 	@Override
 	protected void commitResources(IResource[] resources, int depth) throws TeamException, CVSException, CoreException {
 		IResource[] affected = collect(resources, new ResourceCondition() {
@@ -242,9 +238,6 @@ public class CVSWorkspaceSubscriberTest extends CVSSyncSubscriberTest {
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.tests.ccvs.core.EclipseTest#unmanageResources(org.eclipse.core.resources.IResource[])
-	 */
 	@Override
 	protected void unmanageResources(IResource[] resources) throws CoreException, TeamException {
 		IResource[] affected = collect(resources, new ResourceCondition() {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestCommitOperation.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestCommitOperation.java
index 85217b8d6..cb322be6f 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestCommitOperation.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestCommitOperation.java
@@ -27,38 +27,28 @@ class TestCommitOperation extends WorkspaceCommitOperation {
 		super(null, elements, override);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ui.actions.TeamOperation#canRunAsJob()
-	 */
+	@Override
 	protected boolean canRunAsJob() {
 		return false;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberCommitOperation#promptForComment(org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager, org.eclipse.core.resources.IResource[])
-	 */
+	@Override
 	protected String promptForComment(RepositoryManager manager, IResource[] resourcesToCommit) {
 		return "dummy comment";
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberCommitOperation#promptForConflicts(org.eclipse.team.core.synchronize.SyncInfoSet)
-	 */
+	@Override
 	protected int promptForConflicts(SyncInfoSet syncSet) {
 		this.prompted = true;
 		return 0; // ok to commit all conflicts
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberCommitOperation#promptForResourcesToBeAdded(org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager, org.eclipse.core.resources.IResource[])
-	 */
+	@Override
 	protected IResource[] promptForResourcesToBeAdded(RepositoryManager manager, IResource[] unadded) {
 		return unadded;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberCommitOperation#promptForConflictHandling(org.eclipse.team.core.synchronize.SyncInfoSet)
-	 */
+	@Override
 	protected boolean promptForConflictHandling(SyncInfoSet syncSet) {
 		return true;
 	}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndUpdateOperation.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndUpdateOperation.java
index 8bd8cc0d4..2b991f863 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndUpdateOperation.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndUpdateOperation.java
@@ -25,16 +25,12 @@ public class TestOverrideAndUpdateOperation extends OverrideAndUpdateSubscriberO
 		super(null, elements);
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ui.actions.TeamOperation#canRunAsJob()
-	 */
+	@Override
 	protected boolean canRunAsJob() {
 		return false;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberOperation#promptForOverwrite(org.eclipse.team.core.synchronize.SyncInfoSet)
-	 */
+	@Override
 	protected boolean promptForOverwrite(SyncInfoSet syncSet) {
 		TestOverrideAndUpdateOperation.this.prompted = true;
 		return true;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestUpdateOperation.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestUpdateOperation.java
index 1963cc9ff..f9df87569 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestUpdateOperation.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestUpdateOperation.java
@@ -37,36 +37,33 @@ class TestUpdateOperation extends WorkspaceUpdateOperation {
 		super(null, elements, false);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ui.actions.TeamOperation#canRunAsJob()
-	 */
+	@Override
 	protected boolean canRunAsJob() {
 		return false;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#warnAboutFailedResources(org.eclipse.team.core.synchronize.SyncInfoSet)
-	 */
+	@Override
 	protected void warnAboutFailedResources(SyncInfoSet syncSet) {
 		return;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberOperation#promptForOverwrite(org.eclipse.team.core.synchronize.SyncInfoSet)
-	 */
+	@Override
 	protected boolean promptForOverwrite(SyncInfoSet syncSet) {
 		EclipseTest.fail("Should never prompt on update, simply update nodes that are valid.");
 		return false;
 	}
 	
+	@Override
 	protected void safeUpdate(IProject project, IResource[] resources, LocalOption[] localOptions, IProgressMonitor monitor) throws TeamException {
 		try {
 			UpdateOnlyMergableOperation operation = new UpdateOnlyMergableOperation(getPart(), project, resources, localOptions) {
+				@Override
 				public ISynchronizationScope buildScope(IProgressMonitor monitor) throws InterruptedException, CVSException {
 			    	if (getScopeManager() == null) {
 			    		// manager = createScopeManager(consultModelsWhenBuildingScope && consultModelsForMappings());
 			    		ReflectionUtils.setField(this, "manager", createScopeManager(consultModelsWhenBuildingScope && consultModelsForMappings()));
 			    		BuildScopeOperation op = new BuildScopeOperation(getPart(), getScopeManager()) {
+							@Override
 							protected boolean promptForInputChange(String requestPreviewMessage, IProgressMonitor monitor) {
 								return false; // do not prompt
 							}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CommitSetTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CommitSetTests.java
index 81a9145b3..2e98c7369 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CommitSetTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CommitSetTests.java
@@ -17,18 +17,23 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Test;
-
-import org.eclipse.core.resources.*;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.team.core.TeamException;
 import org.eclipse.team.internal.ccvs.core.CVSException;
 import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
-import org.eclipse.team.internal.core.subscribers.*;
+import org.eclipse.team.internal.core.subscribers.ActiveChangeSet;
+import org.eclipse.team.internal.core.subscribers.ActiveChangeSetManager;
+import org.eclipse.team.internal.core.subscribers.ChangeSet;
+import org.eclipse.team.internal.core.subscribers.IChangeSetChangeListener;
 import org.eclipse.team.tests.ccvs.core.EclipseTest;
 
+import junit.framework.Test;
+
 /**
  * Tests for CVS commit sets
  */
@@ -37,21 +42,26 @@ public class CommitSetTests extends EclipseTest {
 	private List<ChangeSet> addedSets = new ArrayList<>();
 	private List<ChangeSet> removedSets = new ArrayList<>();
 	private IChangeSetChangeListener listener = new IChangeSetChangeListener() {
-        public void setAdded(ChangeSet set) {
+        @Override
+		public void setAdded(ChangeSet set) {
             addedSets.add(set);
         }
-        public void setRemoved(ChangeSet set) {
+        @Override
+		public void setRemoved(ChangeSet set) {
             removedSets.add(set);
         }
-        public void nameChanged(ChangeSet set) {
+        @Override
+		public void nameChanged(ChangeSet set) {
             // TODO Auto-generated method stub
 
         }
-        public void defaultSetChanged(ChangeSet oldDefault, ChangeSet set) {
+        @Override
+		public void defaultSetChanged(ChangeSet oldDefault, ChangeSet set) {
             // TODO Auto-generated method stub
             
         }
-        public void resourcesChanged(ChangeSet set, IPath[] paths) {
+        @Override
+		public void resourcesChanged(ChangeSet set, IPath[] paths) {
             // TODO Auto-generated method stub
             
         }
@@ -143,17 +153,13 @@ public class CommitSetTests extends EclipseTest {
         fail("Did not receive expected set removed event");
     }
     
-    /* (non-Javadoc)
-     * @see org.eclipse.core.tests.harness.EclipseWorkspaceTest#setUp()
-     */
+	@Override
     protected void setUp() throws Exception {
         super.setUp();
         CVSUIPlugin.getPlugin().getChangeSetManager().addListener(listener);
     }
     
-    /* (non-Javadoc)
-     * @see org.eclipse.team.tests.ccvs.core.EclipseTest#tearDown()
-     */
+	@Override
     protected void tearDown() throws Exception {
         super.tearDown();
         CVSUIPlugin.getPlugin().getChangeSetManager().removeListener(listener);
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SubscriberParticipantSyncInfoSource.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SubscriberParticipantSyncInfoSource.java
index 64bb7dbf1..a7e1eec16 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SubscriberParticipantSyncInfoSource.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SubscriberParticipantSyncInfoSource.java
@@ -13,8 +13,6 @@
  *******************************************************************************/
 package org.eclipse.team.tests.ccvs.ui;
 
-import junit.framework.AssertionFailedError;
-
 import org.eclipse.compare.structuremergeviewer.IDiffContainer;
 import org.eclipse.compare.structuremergeviewer.IDiffElement;
 import org.eclipse.core.resources.IProject;
@@ -59,6 +57,8 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.IPage;
 
+import junit.framework.AssertionFailedError;
+
 /**
  * SyncInfoSource that obtains SyncInfo from the SynchronizeView's SyncSet.
  */
@@ -68,6 +68,7 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour
 		super();
 	}
 	
+	@Override
 	public SyncInfo getSyncInfo(Subscriber subscriber, IResource resource) throws TeamException {
 		// Wait for the collector
 		getCollector(subscriber);
@@ -100,9 +101,7 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour
 		return info;
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource#getDiff(org.eclipse.team.core.subscribers.Subscriber, org.eclipse.core.resources.IResource)
-	 */
+	@Override
 	public IDiff getDiff(Subscriber subscriber, IResource resource) throws CoreException {
 		SyncInfo info = getSyncInfo(subscriber, resource);
 		if (info == null || info.getKind() == SyncInfo.IN_SYNC) {
@@ -114,10 +113,10 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour
 	public static SubscriberParticipant getParticipant(Subscriber subscriber) {
 		// show the sync view
 		ISynchronizeParticipantReference[] participants = TeamUI.getSynchronizeManager().getSynchronizeParticipants();
-		for (int i = 0; i < participants.length; i++) {
+		for (ISynchronizeParticipantReference participant2 : participants) {
 			ISynchronizeParticipant participant;
 			try {
-				participant = participants[i].getParticipant();
+				participant = participant2.getParticipant();
 			} catch (TeamException e) {
 				return null;
 			}
@@ -139,21 +138,29 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour
         SynchronizeModelManager manager = (SynchronizeModelManager)page.getConfiguration().getProperty(SynchronizePageConfiguration.P_MODEL_MANAGER);
         AbstractSynchronizeModelProvider provider = (AbstractSynchronizeModelProvider)manager.getActiveModelProvider();
         provider.waitUntilDone(new IProgressMonitor() {
+			@Override
 			public void beginTask(String name, int totalWork) {
 			}
+			@Override
 			public void done() {
 			}
+			@Override
 			public void internalWorked(double work) {
 			}
+			@Override
 			public boolean isCanceled() {
 				return false;
 			}
+			@Override
 			public void setCanceled(boolean value) {
 			}
+			@Override
 			public void setTaskName(String name) {
 			}
+			@Override
 			public void subTask(String name) {
 			}
+			@Override
 			public void worked(int work) {
 				while (Display.getCurrent().readAndDispatch()) {}
 			}
@@ -161,9 +168,7 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour
 		return syncInfoCollector;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource#assertProjectRemoved(org.eclipse.team.core.subscribers.TeamSubscriber, org.eclipse.core.resources.IProject)
-	 */
+	@Override
 	protected void assertProjectRemoved(Subscriber subscriber, IProject project) {		
 		super.assertProjectRemoved(subscriber, project);
 		SyncInfoTree set = getCollector(subscriber).getSyncInfoSet();
@@ -172,9 +177,7 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource#createMergeSubscriber(org.eclipse.core.resources.IProject, org.eclipse.team.internal.ccvs.core.CVSTag, org.eclipse.team.internal.ccvs.core.CVSTag)
-	 */
+	@Override
 	public CVSMergeSubscriber createMergeSubscriber(IProject project, CVSTag root, CVSTag branch, boolean isModelSync) {
 		CVSMergeSubscriber mergeSubscriber = super.createMergeSubscriber(project, root, branch, isModelSync);
 		SubscriberParticipant participant = new MergeSynchronizeParticipant(mergeSubscriber);
@@ -182,6 +185,7 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour
 		return mergeSubscriber;
 	}
 	
+	@Override
 	public Subscriber createWorkspaceSubscriber() throws TeamException {
 		ISynchronizeManager synchronizeManager = TeamUI.getSynchronizeManager();
 		ISynchronizeParticipantReference[] participants = synchronizeManager.get(WorkspaceSynchronizeParticipant.ID);
@@ -194,9 +198,7 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour
 	}
 	
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource#createCompareSubscriber(org.eclipse.core.resources.IProject, org.eclipse.team.internal.ccvs.core.CVSTag)
-	 */
+	@Override
 	public CVSCompareSubscriber createCompareSubscriber(IResource resource, CVSTag tag) {
 		CVSCompareSubscriber s = super.createCompareSubscriber(resource, tag);
 		SubscriberParticipant participant = new CompareParticipant(s);
@@ -217,8 +219,8 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour
             }
         }
         IDiffElement[] children = node.getChildren();
-        for (int i = 0; i < children.length; i++) {
-            ISynchronizeModelElement child = (ISynchronizeModelElement)children[i];
+        for (IDiffElement element : children) {
+            ISynchronizeModelElement child = (ISynchronizeModelElement)element;
             SyncInfo info = findSyncInfo(child, resource);
             if (info != null)
                 return info;
@@ -226,7 +228,8 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour
         return null;
     }
     
-    public void assertViewMatchesModel(Subscriber subscriber) {
+    @Override
+	public void assertViewMatchesModel(Subscriber subscriber) {
     	// Getting the collector waits for the subscriber input handlers
     	getCollector(subscriber);
 		ISynchronizeModelElement root = getModelRoot(subscriber);
@@ -279,11 +282,9 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour
                     (children == null ? 0: children.length) + " but the view has " + 
                     (items == null ? 0 : items.length));
         }
-        for (int i = 0; i < children.length; i++) {
-            IDiffElement element = children[i];
+        for (IDiffElement element : children) {
             TreeItem foundItem = null;
-            for (int j = 0; j < items.length; j++) {
-                TreeItem item = items[j];
+            for (TreeItem item : items) {
                 if (item.getData() == element) {
                     foundItem = item;
                     break;