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

Put @Override instead where needed.

Change-Id: I3798bfbb5fd3c05c16531f7fac7885d2f6eb65b7
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java
index 7c5693b..437189e 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java
@@ -71,9 +71,6 @@
 		helpSystem.setHelp(fToolbarPrevious, ICompareContextIds.PREVIOUS_DIFF_ACTION);
 	}
 
-	/*
-	 * @see EditorActionBarContributor#contributeToToolBar(IToolBarManager)
-	 */
 	@Override
 	public void contributeToToolBar(IToolBarManager tbm) {
 		tbm.add(new Separator(FILTER_SEPARATOR));
@@ -83,9 +80,6 @@
 		tbm.appendToGroup(BUILTIN_SEPARATOR, fToolbarPrevious);
 	}
 
-	/*
-	 * @see EditorActionBarContributor#contributeToMenu(IMenuManager)
-	 */
 	@Override
 	public void contributeToMenu(IMenuManager menuManager) {
 		// empty implementation
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OverlayPreferenceStore.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OverlayPreferenceStore.java
index e6df3f0..3b1a25c 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OverlayPreferenceStore.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/OverlayPreferenceStore.java
@@ -50,9 +50,6 @@
 
 	private class PropertyListener implements IPropertyChangeListener {
 
-		/*
-		 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
-		 */
 		@Override
 		public void propertyChange(PropertyChangeEvent event) {
 			OverlayKey key= findOverlayKey(event.getProperty());
@@ -217,269 +214,173 @@
 		}
 	}
 
-	/*
-	 * @see IPreferenceStore#addPropertyChangeListener(IPropertyChangeListener)
-	 */
 	@Override
 	public void addPropertyChangeListener(IPropertyChangeListener listener) {
 		fStore.addPropertyChangeListener(listener);
 	}
 
-	/*
-	 * @see IPreferenceStore#removePropertyChangeListener(IPropertyChangeListener)
-	 */
 	@Override
 	public void removePropertyChangeListener(IPropertyChangeListener listener) {
 		fStore.removePropertyChangeListener(listener);
 	}
 
-	/*
-	 * @see IPreferenceStore#firePropertyChangeEvent(String, Object, Object)
-	 */
 	@Override
 	public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
 		fStore.firePropertyChangeEvent(name, oldValue, newValue);
 	}
 
-	/*
-	 * @see IPreferenceStore#contains(String)
-	 */
 	@Override
 	public boolean contains(String name) {
 		return fStore.contains(name);
 	}
 
-	/*
-	 * @see IPreferenceStore#getBoolean(String)
-	 */
 	@Override
 	public boolean getBoolean(String name) {
 		return fStore.getBoolean(name);
 	}
 
-	/*
-	 * @see IPreferenceStore#getDefaultBoolean(String)
-	 */
 	@Override
 	public boolean getDefaultBoolean(String name) {
 		return fStore.getDefaultBoolean(name);
 	}
 
-	/*
-	 * @see IPreferenceStore#getDefaultDouble(String)
-	 */
 	@Override
 	public double getDefaultDouble(String name) {
 		return fStore.getDefaultDouble(name);
 	}
 
-	/*
-	 * @see IPreferenceStore#getDefaultFloat(String)
-	 */
 	@Override
 	public float getDefaultFloat(String name) {
 		return fStore.getDefaultFloat(name);
 	}
 
-	/*
-	 * @see IPreferenceStore#getDefaultInt(String)
-	 */
 	@Override
 	public int getDefaultInt(String name) {
 		return fStore.getDefaultInt(name);
 	}
 
-	/*
-	 * @see IPreferenceStore#getDefaultLong(String)
-	 */
 	@Override
 	public long getDefaultLong(String name) {
 		return fStore.getDefaultLong(name);
 	}
 
-	/*
-	 * @see IPreferenceStore#getDefaultString(String)
-	 */
 	@Override
 	public String getDefaultString(String name) {
 		return fStore.getDefaultString(name);
 	}
 
-	/*
-	 * @see IPreferenceStore#getDouble(String)
-	 */
 	@Override
 	public double getDouble(String name) {
 		return fStore.getDouble(name);
 	}
 
-	/*
-	 * @see IPreferenceStore#getFloat(String)
-	 */
 	@Override
 	public float getFloat(String name) {
 		return fStore.getFloat(name);
 	}
 
-	/*
-	 * @see IPreferenceStore#getInt(String)
-	 */
 	@Override
 	public int getInt(String name) {
 		return fStore.getInt(name);
 	}
 
-	/*
-	 * @see IPreferenceStore#getLong(String)
-	 */
 	@Override
 	public long getLong(String name) {
 		return fStore.getLong(name);
 	}
 
-	/*
-	 * @see IPreferenceStore#getString(String)
-	 */
 	@Override
 	public String getString(String name) {
 		return fStore.getString(name);
 	}
 
-	/*
-	 * @see IPreferenceStore#isDefault(String)
-	 */
 	@Override
 	public boolean isDefault(String name) {
 		return fStore.isDefault(name);
 	}
 
-	/*
-	 * @see IPreferenceStore#needsSaving()
-	 */
 	@Override
 	public boolean needsSaving() {
 		return fStore.needsSaving();
 	}
 
-	/*
-	 * @see IPreferenceStore#putValue(String, String)
-	 */
 	@Override
 	public void putValue(String name, String value) {
 		if (covers(name))
 			fStore.putValue(name, value);
 	}
 
-	/*
-	 * @see IPreferenceStore#setDefault(String, double)
-	 */
 	@Override
 	public void setDefault(String name, double value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
 	}
 
-	/*
-	 * @see IPreferenceStore#setDefault(String, float)
-	 */
 	@Override
 	public void setDefault(String name, float value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
 	}
 
-	/*
-	 * @see IPreferenceStore#setDefault(String, int)
-	 */
 	@Override
 	public void setDefault(String name, int value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
 	}
 
-	/*
-	 * @see IPreferenceStore#setDefault(String, long)
-	 */
 	@Override
 	public void setDefault(String name, long value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
 	}
 
-	/*
-	 * @see IPreferenceStore#setDefault(String, String)
-	 */
 	@Override
 	public void setDefault(String name, String value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
 	}
 
-	/*
-	 * @see IPreferenceStore#setDefault(String, boolean)
-	 */
 	@Override
 	public void setDefault(String name, boolean value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
 	}
 
-	/*
-	 * @see IPreferenceStore#setToDefault(String)
-	 */
 	@Override
 	public void setToDefault(String name) {
 		fStore.setToDefault(name);
 	}
 
-	/*
-	 * @see IPreferenceStore#setValue(String, double)
-	 */
 	@Override
 	public void setValue(String name, double value) {
 		if (covers(name))
 			fStore.setValue(name, value);
 	}
 
-	/*
-	 * @see IPreferenceStore#setValue(String, float)
-	 */
 	@Override
 	public void setValue(String name, float value) {
 		if (covers(name))
 			fStore.setValue(name, value);
 	}
 
-	/*
-	 * @see IPreferenceStore#setValue(String, int)
-	 */
 	@Override
 	public void setValue(String name, int value) {
 		if (covers(name))
 			fStore.setValue(name, value);
 	}
 
-	/*
-	 * @see IPreferenceStore#setValue(String, long)
-	 */
 	@Override
 	public void setValue(String name, long value) {
 		if (covers(name))
 			fStore.setValue(name, value);
 	}
 
-	/*
-	 * @see IPreferenceStore#setValue(String, String)
-	 */
 	@Override
 	public void setValue(String name, String value) {
 		if (covers(name))
 			fStore.setValue(name, value);
 	}
 
-	/*
-	 * @see IPreferenceStore#setValue(String, boolean)
-	 */
 	@Override
 	public void setValue(String name, boolean value) {
 		if (covers(name))
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResizableDialog.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResizableDialog.java
index cfba4a8..d1e65e4 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResizableDialog.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResizableDialog.java
@@ -58,9 +58,6 @@
 		fContextId= contextId;
 	}
 
-	/*
-	 * @see org.eclipse.jface.window.Window#configureShell(Shell)
-	 */
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
diff --git a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/JSchUIPlugin.java b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/JSchUIPlugin.java
index 9c54a6e..8345362 100644
--- a/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/JSchUIPlugin.java
+++ b/bundles/org.eclipse.jsch.ui/src/org/eclipse/jsch/internal/ui/JSchUIPlugin.java
@@ -21,7 +21,6 @@
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jsch.core.IJSchService;
@@ -93,9 +92,6 @@
     createImageDescriptor(IUIConstants.IMG_KEY_LOCK);
   }
 
-  /**
-   * @see Plugin#start(BundleContext)
-   */
   @Override
 public void start(BundleContext context) throws Exception {
     super.start(context);
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 028908c..85f6dcd 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
@@ -14,10 +14,10 @@
  *******************************************************************************/
 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.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -25,7 +25,12 @@
 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;
 
 /**
@@ -91,9 +96,8 @@
         isPasswordAuth=true;
       }
   }
-  /**
-   * @see Window#configureShell
-   */
+
+	@Override
   protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
 		if (isPasswordAuth) {
@@ -106,9 +110,8 @@
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell,
 				IHelpContextIds.KEYBOARD_INTERACTIVE_DIALOG);
 	}
-  /**
-	 * @see Window#create
-	 */
+
+	@Override
   public void create() {
 		super.create();
 
@@ -121,10 +124,8 @@
 			texts[0].setFocus();
 		}
 	}
-  /**
-	 * @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;
@@ -200,6 +201,7 @@
 			data.horizontalSpan = 3;
 			allowCachingButton.setLayoutData(data);
 			allowCachingButton.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent e) {
 					allowCaching = allowCachingButton.getSelection();
 				}
@@ -277,7 +279,8 @@
    * 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();
@@ -292,7 +295,8 @@
    * and closes the dialog. Subclasses may override.
    * </p>
    */
-  protected void cancelPressed() {
+  @Override
+protected void cancelPressed() {
     result=null;
     super.cancelPressed();
   }
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 08578c2..1859876 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
@@ -18,7 +18,6 @@
 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;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -68,9 +67,6 @@
 		this.domain = location;
 		this.message = message;
 	}
-	/**
-	 * @see Window#configureShell
-	 */
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
@@ -78,9 +74,6 @@
 		// set F1 help
         PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IHelpContextIds.USER_VALIDATION_DIALOG);
 	}
-	/**
-	 * @see Window#create
-	 */
 	@Override
 	public void create() {
 		super.create();
@@ -97,9 +90,6 @@
 		}
 	}
 
-	/**
-	 * @see Dialog#createDialogArea
-	 */
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite top = new Composite(parent, SWT.NONE);
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 2a0a1f5..40a6d82 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
@@ -18,7 +18,6 @@
 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;
@@ -99,9 +98,6 @@
 
   }
 
-  /**
-   * @see Window#configureShell
-   */
   @Override
 protected void configureShell(Shell newShell){
     super.configureShell(newShell);
@@ -116,9 +112,6 @@
         IHelpContextIds.KEYBOARD_INTERACTIVE_DIALOG);
   }
 
-  /**
-   * @see Window#create
-   */
   @Override
 public void create(){
     super.create();
@@ -133,9 +126,6 @@
     }
   }
 
-  /**
-   * @see Dialog#createDialogArea
-   */
   @Override
 protected Control createDialogArea(Composite parent){
     Composite top=new Composite(parent, SWT.NONE);
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 e9aa300..ea035fb 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
@@ -14,9 +14,12 @@
  *******************************************************************************/
 package org.eclipse.jsch.internal.ui.authenticator;
 
-import org.eclipse.jface.dialogs.*;
 import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.window.Window;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TrayDialog;
+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;
@@ -24,13 +27,14 @@
 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 prompting for a user name and password
  * @since 1.1
@@ -77,9 +81,7 @@
     this.isAllowCaching=isAllowCaching;
   }
 
-  /**
-   * @see Window#configureShell
-   */
+	@Override
   protected void configureShell(Shell newShell){
     super.configureShell(newShell);
     newShell.setText(Messages.UserValidationDialog_required);
@@ -88,10 +90,9 @@
         IHelpContextIds.USER_VALIDATION_DIALOG);
   }
 
-  /**
-   * @see Window#create
-   */
-  public void create(){
+
+  @Override
+public void create(){
     super.create();
     // add some default values
     usernameField.setText(defaultUsername);
@@ -107,10 +108,8 @@
     }
   }
 
-  /**
-   * @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;
@@ -170,7 +169,8 @@
     data.horizontalSpan=3;
     allowCachingButton.setLayoutData(data);
     allowCachingButton.addSelectionListener(new SelectionAdapter(){
-      public void widgetSelected(SelectionEvent e){
+      @Override
+	public void widgetSelected(SelectionEvent e){
         allowCaching=allowCachingButton.getSelection();
       }
     });
@@ -249,7 +249,8 @@
    * may override.
    * </p>
    */
-  protected void okPressed(){
+  @Override
+protected void okPressed(){
     password=passwordField.getText();
     username=usernameField.getText();
 
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 111bef0..1276044 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
@@ -43,9 +43,6 @@
     super();
   }
 
-  /**
-   * @see IUserAuthenticator#promptForUserInfo(IJSchLocation, IUserInfo, String)
-   */
   @Override
 public void promptForUserInfo(final IJSchLocation location,
       final IUserInfo userinfo, final String message){
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 da35d05..49333af 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java
@@ -84,9 +84,7 @@
         return uiValidator;
     }
     
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFileModificationValidator#validateMoveDelete(org.eclipse.core.resources.IFile[], org.eclipse.core.runtime.IProgressMonitor)
-	 */
+    @Override
 	public IStatus validateMoveDelete(IFile[] files, IProgressMonitor monitor) {
 		IFile[] readOnlyFiles = getManagedReadOnlyFiles(files);
 		if (readOnlyFiles.length == 0) return Status.OK_STATUS;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
index c5ac130..b84a408 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java
@@ -285,9 +285,7 @@
 	    ConsoleListeners.getInstance().addListener(consoleListener);
 	}
 	
-	/**
-	 * @see Plugin#start(BundleContext)
-	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 
@@ -318,9 +316,7 @@
 	    tracker.open();
 	}
 	
-	/**
-	 * @see Plugin#stop(BundleContext)
-	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		try {
 			// unregister debug options listener
@@ -349,9 +345,7 @@
 		}
 	}
 		
-	/**
-	 * @see org.eclipse.core.runtime.Plugin#initializeDefaultPluginPreferences()
-	 */
+	@Override
 	protected void initializeDefaultPluginPreferences(){
 		Preferences store = getPluginPreferences();
 		store.setDefault(READ_ONLY, false);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java
index 5d31f79..1e8306d 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java
@@ -89,9 +89,7 @@
 		super(severity, CVSProviderPlugin.ID, CVSStatus.ERROR,  message, null, null);
 	}	
 	
-	/**
-	 * @see IStatus#getMessage()
-	 */
+	@Override
 	public String getMessage() {
 		String message = super.getMessage();
 		if (commandRoot != null) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRunnable.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRunnable.java
index 3c119c1..7e0bc8f 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRunnable.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRunnable.java
@@ -24,7 +24,6 @@
  * <p>
  * Clients may implement this interface.
  * </p>
- * @see 
  */
 public interface ICVSRunnable {
 	/**
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AddStructureVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AddStructureVisitor.java
index 2750eea..a551bdc 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AddStructureVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AddStructureVisitor.java
@@ -28,9 +28,7 @@
 		super(session, localOptions, false, true);
 	}
 
-	/**
-	 * @see ICVSResourceVisitor#visitFile(IManagedFile)
-	 */
+	@Override
 	public void visitFile(ICVSFile mFile) throws CVSException {
 		
 		// Send the parent folder
@@ -43,9 +41,7 @@
 		
 	}
 
-	/**
-	 * @see ICVSResourceVisitor#visitFolder(ICVSFolder)
-	 */
+	@Override
 	public void visitFolder(ICVSFolder mFolder) throws CVSException {
 		
 		Assert.isNotNull(mFolder);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java
index 236a1df..4091eed 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java
@@ -44,16 +44,12 @@
 		this.sendEmptyFolders = sendEmptyFolders;
 	}
 
-	/**
-	 * @see ICVSResourceVisitor#visitFile(IManagedFile)
-	 */
+	@Override
 	public void visitFile(ICVSFile mFile) throws CVSException {
 		sendFile(mFile);
 	}
 
-	/**
-	 * @see ICVSResourceVisitor#visitFolder(ICVSFolder)
-	 */
+	@Override
 	public void visitFolder(ICVSFolder mFolder) throws CVSException {
 
 		if (sendEmptyFolders) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java
index 562ed9e..1e5ed86 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java
@@ -101,9 +101,7 @@
 		return wrapMatcher;
 	}	
 	
-	/**
-	 * @see ICVSResourceVisitor#visitFile(IManagedFile)
-	 */
+	@Override
 	public void visitFile(ICVSFile mFile) throws CVSException {
 		if (ignoreMatcher != null && ignoreMatcher.match(mFile.getName())) {
 			return;
@@ -117,9 +115,7 @@
 		session.sendModified(mFile, binary, monitor);
 	}
 
-	/**
-	 * @see ICVSResourceVisitor#visitFolder(ICVSFolder)
-	 */
+	@Override
 	public void visitFolder(ICVSFolder mFolder) throws CVSException {
 		
 		if (ignoreMatcher != null && ignoreMatcher.match(mFolder.getName())) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModuleExpansionHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModuleExpansionHandler.java
index d1c9f25..4c39ba2 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModuleExpansionHandler.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModuleExpansionHandler.java
@@ -19,16 +19,12 @@
 
 public class ModuleExpansionHandler extends ResponseHandler {
 
-	/*
-	 * @see ResponseHandler#getResponseID()
-	 */
+	@Override
 	public String getResponseID() {
 		return "Module-expansion";//$NON-NLS-1$
 	}
 
-	/*
-	 * @see ResponseHandler#handle(Session, String, IProgressMonitor)
-	 */
+	@Override
 	public void handle(Session session, String expansion, IProgressMonitor monitor)
 		throws CVSException {
 			
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPVisitor.java
index c42f5a6..6790f23 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPVisitor.java
@@ -28,16 +28,12 @@
 		super(session, localOptions, false, false);
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResourceVisitor#visitFile(ICVSFile)
-	 */
+	@Override
 	public void visitFile(ICVSFile file) throws CVSException {
 		sendPendingNotification(file);
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResourceVisitor#visitFolder(ICVSFolder)
-	 */
+	@Override
 	public void visitFolder(ICVSFolder folder) throws CVSException {
 		if (isRecurse() && folder.isCVSFolder()) {
 			folder.acceptChildren(this);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NewEntryHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NewEntryHandler.java
index 186ccd8..21f93de 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NewEntryHandler.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NewEntryHandler.java
@@ -21,16 +21,12 @@
 
 public class NewEntryHandler extends ResponseHandler {
 
-	/*
-	 * @see ResponseHandler#getResponseID()
-	 */
+	@Override
 	public String getResponseID() {
 		return "New-entry"; //$NON-NLS-1$
 	}
 
-	/*
-	 * @see ResponseHandler#handle(Session, String, IProgressMonitor)
-	 */
+	@Override
 	public void handle(Session session, String localDir, IProgressMonitor monitor)
 		throws CVSException {
 			
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java
index 623de56..6df20e6 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java
@@ -29,16 +29,12 @@
  */
 public class NotifiedHandler extends ResponseHandler {
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.client.ResponseHandler#getResponseID()
-	 */
+	@Override
 	public String getResponseID() {
 		return "Notified"; //$NON-NLS-1$
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.client.ResponseHandler#handle(Session, String, IProgressMonitor)
-	 */
+	@Override
 	public void handle(
 		Session session,
 		String localDir,
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java
index 167a5ac..a65ad5e 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java
@@ -64,16 +64,13 @@
 			pruneFolderAndParentsIfAppropriate(cvsFolder);
 		}
 	}
-	/**
-	 * @see ICVSResourceVisitor#visitFile(IManagedFile)
-	 */
+	
+	@Override
 	public void visitFile(ICVSFile file) throws CVSException {
 		// nothing to do here
 	}
 
-	/**
-	 * @see ICVSResourceVisitor#visitFolder(ICVSFolder)
-	 */
+	@Override
 	public void visitFolder(ICVSFolder folder) throws CVSException {
 		// First prune any empty children
 		folder.acceptChildren(this);
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java
index 29a2d94..7bc529d 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java
@@ -21,9 +21,7 @@
 
 	public SyncUpdate() { };
 
-	/*
-	 * @see Command#sendFileStructure(ICVSResource,IProgressMonitor,boolean,boolean,boolean)
-	 */
+	@Override
     protected void sendFileStructure(Session session, ICVSResource[] resources,
             LocalOption[] localOptions, boolean emptyFolders, IProgressMonitor monitor) throws CVSException {
 			
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java
index 8d198ae..9c99a9a 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java
@@ -32,16 +32,12 @@
  */
 public class TemplateHandler extends ResponseHandler {
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.client.ResponseHandler#getResponseID()
-	 */
+	@Override
 	public String getResponseID() {
 		return "Template"; //$NON-NLS-1$
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.client.ResponseHandler#handle(org.eclipse.team.internal.ccvs.core.client.Session, java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public void handle(Session session, String localDir, IProgressMonitor monitor) throws CVSException {
 		session.readLine(); /* read the remote dir which is not needed */
         // Only read the template file if the container exists.
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java
index 9189682..973bd4c 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java
@@ -179,9 +179,7 @@
 		}
 	}
 
-	/**
-	 * @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 ca1e08b..3881822 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Version.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Version.java
@@ -37,9 +37,7 @@
 	private static final String CVS_NT_PREFIX_1 = "Concurrent Versions System (CVS) NT "; //$NON-NLS-1$
 	private static final String CVS_NT_PREFIX_2 = "Concurrent Versions System (CVSNT) "; //$NON-NLS-1$
 	private static final String CVS_PREFIX = "Concurrent Versions System (CVS) "; //$NON-NLS-1$
-	/**
-	 * @see Request#getRequestId()
-	 */
+	@Override
 	protected String getRequestId() {
 		return "version"; //$NON-NLS-1$
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/EditorsListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/EditorsListener.java
index 8af43e8..73a6eba 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/EditorsListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/EditorsListener.java
@@ -51,9 +51,7 @@
 	public EditorsListener() {
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener#messageLine(java.lang.String, org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation, org.eclipse.team.internal.ccvs.core.ICVSFolder, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public IStatus messageLine(
 		String line,
 		ICVSRepositoryLocation location,
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogEntry.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogEntry.java
index f016243..6c88f1f 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogEntry.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogEntry.java
@@ -67,69 +67,51 @@
 		this.revisions=revisions;
 	}
 
-	/**
-	 * @see ILogEntry#getRevision()
-	 */
+	@Override
 	public String getRevision() {
 		return file.getRevision();
 	}
 
-	/**
-	 * @see ILogEntry#getAuthor()
-	 */
+	@Override
 	public String getAuthor() {
 		return author;
 	}
 
-	/**
-	 * @see ILogEntry#getDate()
-	 */
+	@Override
 	public Date getDate() {
 		return date;
 	}
 
-	/**
-	 * @see ILogEntry#getComment()
-	 */
+	@Override
 	public String getComment() {
 		return comment;
 	}
 
-	/**
-	 * @see ILogEntry#getState()
-	 */
+	@Override
 	public String getState() {
 		return state;
 	}
 
-	/**
-	 * @see ILogEntry#getBranches()
-	 */
+	@Override
 	public CVSTag[] getBranches() {
 		CVSTag[] result = new CVSTag[branches.length];
 		System.arraycopy(branches, 0, result, 0, branches.length);
 		return result;
 	}
 
-	/**
-	 * @see ILogEntry#getTags()
-	 */
+	@Override
 	public CVSTag[] getTags() {
 		CVSTag[] result = new CVSTag[tags.length];
 		System.arraycopy(tags, 0, result, 0, tags.length);
 		return result;
 	}
 
-	/**
-	 * @see ILogEntry#getRemoteFile()
-	 */
+	@Override
 	public ICVSRemoteFile getRemoteFile() {
 		return file;
 	}
 	
-	/**
-	 * @see ILogEntry#isDeletion()
-	 */
+	@Override
 	public boolean isDeletion() {
 		return getState().equals("dead"); //$NON-NLS-1$
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ModuleDefinitionsListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ModuleDefinitionsListener.java
index 7a8d520..1d7440a 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ModuleDefinitionsListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ModuleDefinitionsListener.java
@@ -38,9 +38,7 @@
 		reset();
 	}
 	
-	/*
-	 * @see ICommandOutputListener#messageLine(String, ICVSFolder, IProgressMonitor)
-	 */
+	@Override
 	public IStatus messageLine(
 		String line,
 		ICVSRepositoryLocation location,
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java
index ccd51c3..b4ac988 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java
@@ -23,9 +23,7 @@
 
 public class TagListener extends CommandOutputListener {
 
-	/*
-	 * @see ICommandOutputListener#messageLine(String, ICVSFolder, IProgressMonitor)
-	 */
+	@Override
 	public IStatus messageLine(
 		String line,
 		ICVSRepositoryLocation location,
@@ -42,9 +40,7 @@
 		return OK;
 	}
 
-	/*
-	 * @see ICommandOutputListener#errorLine(String, ICVSFolder, IProgressMonitor)
-	 */
+	@Override
 	public IStatus errorLine(
 		String line,
 		ICVSRepositoryLocation location,
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
index 2277dfd..f484b40 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
@@ -599,23 +599,17 @@
 			root;
 	}
 	
-	/*
-	 * @see ICVSRepositoryLocation#getMethod()
-	 */
+	@Override
 	public IConnectionMethod getMethod() {
 		return method;
 	}
 
-	/*
-	 * @see ICVSRepositoryLocation#getPort()
-	 */
+	@Override
 	public int getPort() {
 		return port;
 	}
 	
-	/*
-	 * @see ICVSRepositoryLocation#getEncoding()
-	 */
+	@Override
 	public String getEncoding() {
 		if (hasPreferences()) {
 			return internalGetPreferences().get(PREF_SERVER_ENCODING, getDefaultEncoding());
@@ -624,9 +618,7 @@
 		}
 	}
 
-	/*
-	 * @see ICVSRepositoryLocation#setEncoding()
-	 */
+	@Override
 	public void setEncoding(String encoding) {
 		if (encoding == null || encoding == getDefaultEncoding()) {
 			if (hasPreferences()) {
@@ -639,9 +631,7 @@
 		}
 	}	
 
-	/*
-	 * @see ICVSRepositoryLocation#members(CVSTag, boolean, IProgressMonitor)
-	 */
+	@Override
 	public ICVSRemoteResource[] members(CVSTag tag, boolean modules, IProgressMonitor progress) throws CVSException {
 		try {
 			if (modules) {
@@ -668,16 +658,12 @@
 		}
 	}
 	
-	/*
-	 * @see ICVSRepositoryLocation#getRemoteFolder(String, CVSTag)
-	 */
+	@Override
 	public ICVSRemoteFolder getRemoteFolder(String remotePath, CVSTag tag) {
 		return new RemoteFolder(null, this, remotePath, tag);		
 	}
 	
-	/*
-	 * @see ICVSRepositoryLocation#getRemoteFile(String, CVSTag)
-	 */
+	@Override
 	public ICVSRemoteFile getRemoteFile(String remotePath, CVSTag tag) {
 		IPath path = new Path(null, remotePath);
 		RemoteFolderTree remoteFolder = new RemoteFolderTree(null, this, path.removeLastSegments(1).toString(), tag);
@@ -686,9 +672,7 @@
 		return remoteFile;
 	}
 	
-	/*
-	 * @see ICVSRepositoryLocation#getRootDirectory()
-	 */
+	@Override
 	public String getRootDirectory() {
 		return root;
 	}
@@ -703,17 +687,12 @@
 		return CVSProviderPlugin.getPlugin().getTimeout();
 	}
 	
-	/*
-	 * @see ICVSRepositoryLocation#getUserInfo()
-	 */
+	@Override
 	public IUserInfo getUserInfo(boolean makeUsernameMutable) {
 		return new UserInfo(getUsername(), password, makeUsernameMutable ? true : isUsernameMutable());
 	}
 	
-	/*
-	 * @see ICVSRepositoryLocation#getUsername()
-	 * @see IUserInfo#getUsername()
-	 */
+	@Override
 	public String getUsername() {
 		// If the username is mutable, get it from the cache if it's there
 		if (user == null && isUsernameMutable()) {
@@ -722,9 +701,7 @@
 		return user == null ? "" : user; //$NON-NLS-1$
 	}
 	
-	/*
-	 * @see IUserInfo#isUsernameMutable()
-	 */
+	@Override
 	public boolean isUsernameMutable() {
 		return !userFixed;
 	}
@@ -948,9 +925,7 @@
 		}
 		return null;
 	}
-	/*
-	 * @see IUserInfo#setPassword(String)
-	 */
+	@Override
 	public void setPassword(String password) {
 		if (passwordFixed)
 			throw new UnsupportedOperationException();
@@ -962,9 +937,7 @@
 		previousAuthenticationFailed = false;
 	}
 	
-	/*
-	 * @see IUserInfo#setUsername(String)
-	 */
+	@Override
 	public void setUsername(String user) {
 		if (userFixed)
 			throw new UnsupportedOperationException();
@@ -1082,9 +1055,7 @@
 		}
 	}
 	
-	/**
-	 * @see ICVSRepositoryLocation#flushUserInfo()
-	 */
+	@Override
 	public void flushUserInfo() {
 		removeNode();
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnectionMethod.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnectionMethod.java
index cabfbaf..cb0bf14 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnectionMethod.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnectionMethod.java
@@ -17,16 +17,12 @@
 import org.eclipse.team.internal.ccvs.core.*;
 
 public class ExtConnectionMethod implements IConnectionMethod {
-	/**
-	 * @see IConnectionMethod#getName
-	 */
+	@Override
 	public String getName() {
 		return "ext"; //$NON-NLS-1$
 	}
 	
-	/**
-	 * @see IConnectionMethod#createConnection
-	 */
+	@Override
 	public IServerConnection createConnection(ICVSRepositoryLocation repositoryRoot, String password) {
 		if(password==null){
 			password=""; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnection.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnection.java
index 700851a..9350693 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnection.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnection.java
@@ -74,9 +74,7 @@
 	private InputStream inputStream;
 	private OutputStream outputStream;
 	
-	/**
-	 * @see Connection#doClose()
-	 */
+	@Override
 	public void close() throws IOException {
 		try {
 			if (inputStream != null) inputStream.close();
@@ -95,9 +93,7 @@
 		}
 	}
 
-	/**
-	 * @see Connection#doOpen()
-	 */
+	@Override
 	public void open(IProgressMonitor monitor) throws IOException, CVSAuthenticationException {
 		
 		monitor.subTask(CVSMessages.PServerConnection_authenticating);
@@ -154,15 +150,11 @@
         return proxy;
     }
 
-    /**
-	 * @see Connection#getInputStream()
-	 */
+	@Override
 	public InputStream getInputStream() {
 		return inputStream;
 	}
-	/**
-	 * @see Connection#getOutputStream()
-	 */
+	@Override
 	public OutputStream getOutputStream() {
 		return outputStream;
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnectionMethod.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnectionMethod.java
index 3db5213..73846f3 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnectionMethod.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnectionMethod.java
@@ -17,25 +17,19 @@
 import org.eclipse.team.internal.ccvs.core.IConnectionMethod;
 import org.eclipse.team.internal.ccvs.core.IServerConnection;
 public class PServerConnectionMethod implements IConnectionMethod {
-	/**
-	 * @see IConnectionMethod#createConnection(ICVSRepositoryLocation, String)
-	 */
+	@Override
 	public IServerConnection createConnection(ICVSRepositoryLocation location, String password) {
 		if(password==null){
 			password=""; //$NON-NLS-1$
 		}
 		return new PServerConnection(location, password);
 	}
-	/**
-	 * @see IConnectionMethod#getName()
-	 */
+	@Override
 	public String getName() {
 		return "pserver";//$NON-NLS-1$
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.IConnectionMethod#disconnect(org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation)
-	 */
+	@Override
 	public void disconnect(ICVSRepositoryLocation location) {
 	}
 }
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/UserInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/UserInfo.java
index 0d07211..2ba13c4 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/UserInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/UserInfo.java
@@ -32,9 +32,7 @@
 		this.isUsernameMutable = isUsernameMutable;
 	}
 	
-	/*
-	 * @see IUserInfo#getUsername()
-	 */
+	@Override
 	public String getUsername() {
 		return username;
 	}
@@ -43,23 +41,17 @@
 		return password;
 	}
 	
-	/*
-	 * @see IUserInfo#isUsernameMutable()
-	 */
+	@Override
 	public boolean isUsernameMutable() {
 		return isUsernameMutable;
 	}
 
-	/*
-	 * @see IUserInfo#setPassword(String)
-	 */
+	@Override
 	public void setPassword(String password) {
 		this.password = password;
 	}
 
-	/*
-	 * @see IUserInfo#setUsername(String)
-	 */
+	@Override
 	public void setUsername(String username) {
 		this.username = username;
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
index 8bad06d..61402ee 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java
@@ -45,9 +45,7 @@
 		super(file);
 	}
 
-	/*
-	 * @see ICVSResource#delete()
-	 */
+	@Override
 	public void delete() throws CVSException {
 		try {
 			((IFile)resource).delete(false /*force*/, true /*keepHistory*/, null);
@@ -68,9 +66,7 @@
  		}
  	}
 	
-	/*
-	 * @see ICVSFile#getTimeStamp()
-	 */
+	@Override
 	public Date getTimeStamp() {
 		long timestamp = getIFile().getLocalTimeStamp();
 		if( timestamp == IResource.NULL_STAMP) {
@@ -80,9 +76,7 @@
 		return new Date((timestamp/1000)*1000);
 	}
  
-	/*
-	 * @see ICVSFile#setTimeStamp(Date)
-	 */
+	@Override
 	public void setTimeStamp(Date date) throws CVSException {
 		long time;
 		if (date == null) {
@@ -93,9 +87,7 @@
 		EclipseSynchronizer.getInstance().setTimeStamp(this, time);
 	}
 
-	/*
-	 * @see ICVSResource#isFolder()
-	 */
+	@Override
 	public boolean isFolder() {
 		return false;
 	}
@@ -129,16 +121,12 @@
 		return EclipseSynchronizer.getInstance().setModified(this, UNKNOWN);
 	}
 	
-	/*
-	 * @see ICVSResource#accept(ICVSResourceVisitor)
-	 */
+	@Override
 	public void accept(ICVSResourceVisitor visitor) throws CVSException {
 		visitor.visitFile(this);
 	}
 
-	/*
-	 * @see ICVSResource#accept(ICVSResourceVisitor, boolean)
-	 */
+	@Override
 	public void accept(ICVSResourceVisitor visitor, boolean recurse) throws CVSException {
 		visitor.visitFile(this);
 	}
@@ -161,16 +149,12 @@
 		}
 	}
 
-	/*
-	 * @see ICVSResource#getRemoteLocation()
-	 */
+	@Override
 	public String getRemoteLocation(ICVSFolder stopSearching) throws CVSException {
 		return getParent().getRemoteLocation(stopSearching) + SEPARATOR + getName();
 	}
 		
-	/*
-	 * @see ICVSFile#setReadOnly()
-	 */
+	@Override
 	public void setContents(InputStream stream, int responseType, boolean keepLocalHistory, IProgressMonitor monitor) throws CVSException {
 		try {
 			IFile file = getIFile();
@@ -214,9 +198,7 @@
 		}
 	}
 			
-	/*
-	 * @see ICVSFile#setReadOnly()
-	 */
+	@Override
 	public void setReadOnly(boolean readOnly) throws CVSException {
 		ResourceAttributes attributes = resource.getResourceAttributes();
 		if (attributes != null) {
@@ -229,16 +211,12 @@
 		}
 	}
 
-	/*
-	 * @see ICVSFile#isReadOnly()
-	 */
+	@Override
 	public boolean isReadOnly() throws CVSException {
 		return getIFile().isReadOnly();
 	}
 	
-	/*
-	 * @see ICVSFile#setExecutable()
-	 */
+	@Override
 	public void setExecutable(boolean executable) throws CVSException {
 		ResourceAttributes attributes = resource.getResourceAttributes();
 		if (attributes != null) {
@@ -251,9 +229,7 @@
 		}
 	}
 
-	/*
-	 * @see ICVSFile#isExectuable()
-	 */
+	@Override
 	public boolean isExecutable() throws CVSException {
 		ResourceAttributes attributes = resource.getResourceAttributes();
 		if (attributes != null) {
@@ -280,9 +256,7 @@
 		}
 		return null;
 	}
-	/**
-	 * @see ICVSFile#getLogEntries(IProgressMonitor)
-	 */
+	@Override
 	public ILogEntry[] getLogEntries(IProgressMonitor monitor)	throws TeamException {
 		
 		// try fetching log entries only when the file's project is accessible
@@ -343,9 +317,7 @@
 		return null;
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#checkout(int)
-	 */
+	@Override
 	public void edit(final int notifications, boolean notifyForWritable, IProgressMonitor monitor) throws CVSException {
 		if (!notifyForWritable && !isReadOnly()) return;
 		run(monitor1 -> {
@@ -393,9 +365,7 @@
 		
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#uncheckout()
-	 */
+	@Override
 	public void unedit(IProgressMonitor monitor) throws CVSException {
 		if (isReadOnly()) return;
 		run(monitor1 -> {
@@ -439,16 +409,12 @@
 		}, monitor);
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#notificationCompleted()
-	 */
+	@Override
 	public void notificationCompleted() throws CVSException {
 		EclipseSynchronizer.getInstance().deleteNotifyInfo(resource);
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#getPendingNotification()
-	 */
+	@Override
 	public NotifyInfo getPendingNotification() throws CVSException {
 		return getNotifyInfo();
 	}
@@ -536,9 +502,7 @@
         }
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#unmanage(org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public void unmanage(IProgressMonitor monitor) throws CVSException {
 		run(monitor1 -> {
 			EclipseFile.super.unmanage(monitor1);
@@ -546,23 +510,17 @@
 		}, monitor);
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#isEdited()
-	 */
+	@Override
 	public boolean isEdited() throws CVSException {
 		return EclipseSynchronizer.getInstance().isEdited(getIFile());
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#setSyncInfo(org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo)
-	 */
+	@Override
 	public void setSyncInfo(ResourceSyncInfo info, int modificationState) throws CVSException {
 		setSyncBytes(info.getBytes(), info, modificationState);
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.EclipseResource#setSyncBytes(byte[], int)
-	 */
+	@Override
 	public void setSyncBytes(byte[] syncBytes, int modificationState) throws CVSException {
 		setSyncBytes(syncBytes, null, modificationState);
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java
index 1874d8c..648eb7f 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java
@@ -39,9 +39,7 @@
 		super(container);		
 	}
 	
-	/**
-	 * @see ICVSFolder#members(int)
-	 */
+	@Override
 	public ICVSResource[] members(int flags) throws CVSException {		
 		final List<ICVSResource> result = new ArrayList<>();
 		IResource[] resources = EclipseSynchronizer.getInstance().members((IContainer)resource);
@@ -85,9 +83,7 @@
 		return (ICVSResource[]) result.toArray(new ICVSResource[result.size()]);
 	}
 
-	/**
-	 * @see ICVSFolder#createFolder(String)
-	 */
+	@Override
 	public ICVSFolder getFolder(String name) throws CVSException {
 		if ((CURRENT_LOCAL_FOLDER.equals(name)) || ((CURRENT_LOCAL_FOLDER + SEPARATOR).equals(name)))
 			return this;
@@ -99,16 +95,12 @@
 		}
 	}
 
-	/**
-	 * @see ICVSFolder#createFile(String)
-	 */
+	@Override
 	public ICVSFile getFile(String name) throws CVSException {
 		return new EclipseFile(((IContainer)resource).getFile(new Path(null, name)));
 	}
 
-	/**
-	 * @see ICVSFolder#mkdir()
-	 */
+	@Override
 	public void mkdir() throws CVSException {
 		ISchedulingRule rule = null;
 		try {
@@ -132,16 +124,12 @@
 		}
 	}
 		
-	/**
-	 * @see ICVSResource#isFolder()
-	 */
+	@Override
 	public boolean isFolder() {
 		return true;
 	}
 		
-	/**
-	 * @see ICVSFolder#acceptChildren(ICVSResourceVisitor)
-	 */
+	@Override
 	public void acceptChildren(ICVSResourceVisitor visitor) throws CVSException {
 		
 		// Visit files and then folders
@@ -155,16 +143,12 @@
 		}
 	}
 
-	/**
-	 * @see ICVSResource#accept(ICVSResourceVisitor)
-	 */
+	@Override
 	public void accept(ICVSResourceVisitor visitor) throws CVSException {
 		visitor.visitFolder(this);
 	}
 	
-	/**
-	 * @see ICVSResource#accept(ICVSResourceVisitor, boolean)
-	 */
+	@Override
 	public void accept(ICVSResourceVisitor visitor, boolean recurse) throws CVSException {
 		visitor.visitFolder(this);
 		ICVSResource[] resources;
@@ -178,9 +162,7 @@
 		}
 	}
 
-	/**
-	 * @see ICVSResource#getRemoteLocation(ICVSFolder)
-	 */
+	@Override
 	public String getRemoteLocation(ICVSFolder stopSearching) throws CVSException {
 				
 		if (getFolderSyncInfo() != null) {
@@ -198,9 +180,7 @@
 		return null;
 	}
 
-	/*
-	 * @see ICVSFolder#getFolderInfo()
-	 */
+	@Override
 	public FolderSyncInfo getFolderSyncInfo() throws CVSException {
 		if (resource.getType() != IResource.ROOT && !resource.getProject().isAccessible()) {
 			return null;
@@ -208,9 +188,7 @@
 		return EclipseSynchronizer.getInstance().getFolderSync((IContainer)resource);
 	}
 
-	/*
-	 * @see ICVSFolder#setFolderInfo(FolderSyncInfo)
-	 */
+	@Override
 	public void setFolderSyncInfo(final FolderSyncInfo folderInfo) throws CVSException {
 		// ignore folder sync on the root (i.e. CVSROOT/config/TopLevelAdmin=yes but we just ignore it)
 		if (resource.getType() == IResource.ROOT) return;
@@ -229,16 +207,12 @@
 
 	}
 
-	/*
-	 * @see ICVSFolder#isCVSFolder()
-	 */
+	@Override
 	public boolean isCVSFolder() throws CVSException {
 		return EclipseSynchronizer.getInstance().getFolderSync((IContainer)resource) != null;
 	}
 
-	/*
-	 * @see ICVSResource#unmanage()
-	 */
+	@Override
 	public void unmanage(IProgressMonitor monitor) throws CVSException {
 		run((ICVSRunnable) monitor1 -> {
 			monitor1 = Policy.monitorFor(monitor1);
@@ -276,9 +250,7 @@
 		}
 	}
 	
-	/*
-	 * @see ICVSResource#isIgnored()
-	 */
+	@Override
 	public boolean isIgnored() throws CVSException {
 		if(isCVSFolder()) {
 			return false;
@@ -286,9 +258,7 @@
 		return super.isIgnored();
 	}
 	
-	/*
-	 * @see ICVSFolder#getChild(String)
-	 */
+	@Override
 	public ICVSResource getChild(String namedPath) throws CVSException {
 	    if (namedPath.equals(Session.CURRENT_LOCAL_FOLDER)) {
 	        return this;
@@ -308,15 +278,11 @@
 		return null;
 	}
 	
-	/**
-	 * @see ICVSFolder#fetchChildren(IProgressMonitor)
-	 */
+	@Override
 	public ICVSResource[] fetchChildren(IProgressMonitor monitor) throws CVSException {
 		return members(FILE_MEMBERS | FOLDER_MEMBERS);
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#delete()
-	 */
+	@Override
 	public void delete() throws CVSException {
 		if (!exists()) return;
 		try {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java
index e2cd4e0..be79eff 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java
@@ -70,9 +70,7 @@
 		}
 	}
 
-	/*
-	 * @see ICVSResource#exists()
-	 */
+	@Override
 	public boolean exists() {
 		return resource.exists();
 	}
@@ -91,16 +89,12 @@
 		return new EclipseFolder(parent);
 	}
 
-	/*
-	 * @see ICVSResource#getName()
-	 */
+	@Override
 	public String getName() {
 		return resource.getName();
 	}
 
-	/*
-	 * @see ICVSResource#isIgnored()
-	 */
+	@Override
 	public boolean isIgnored() throws CVSException {
 		// a managed resource is never ignored
 		if(isManaged() || resource.getType()==IResource.ROOT || resource.getType()==IResource.PROJECT) {
@@ -134,16 +128,12 @@
 		return info.isVirtualDirectory();
 	}
 	
-	/*
-	 * @see ICVSResource#setIgnoredAs(String)
-	 */
+	@Override
 	public void setIgnoredAs(final String pattern) throws CVSException {
 		run(monitor -> EclipseSynchronizer.getInstance().addIgnored(resource.getParent(), pattern), null);
 	}
 
-	/*
-	 * @see ICVSResource#isManaged()
-	 */
+	@Override
 	public boolean isManaged() throws CVSException {
 		return isManaged(getSyncBytes());
 	}
@@ -175,9 +165,7 @@
 		return resource.getFullPath().toString();
 	}	
 	
-	/*
-	 * @see ICVSResource#isFolder()
-	 */
+	@Override
 	public boolean isFolder() {
 		return false;
 	}
@@ -198,9 +186,7 @@
 		}
 	}
 	
-	/*
-	 * @see ICVSResource#getSyncInfo()
-	 */
+	@Override
 	public ResourceSyncInfo getSyncInfo() throws CVSException {
 		return EclipseSynchronizer.getInstance().getResourceSync(resource);
 	}
@@ -219,24 +205,18 @@
 		return getPath();
 	}
 	
-	/*
-	 * @see ICVSResource#unmanage()
-	 */
+	@Override
 	public void unmanage(IProgressMonitor monitor) throws CVSException {
 		EclipseSynchronizer.getInstance().deleteResourceSync(resource);
 	}
 	
-	/*
-	 * @see Comparable#compareTo(Object)
-	 */
+	@Override
 	public int compareTo(Object arg0) {
 		EclipseResource other = (EclipseResource)arg0;
 		return resource.getFullPath().toString().compareTo(other.resource.getFullPath().toString());
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#getIResource()
-	 */
+	@Override
 	public IResource getIResource() {
 		return resource;
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java
index d40958e..3a9b0e3 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java
@@ -168,25 +168,16 @@
 		setWorkspaceSyncState(workspaceSyncState);
 	}
 
-	/**
-	 * @see ICVSResource#accept(ICVSResourceVisitor)
-	 */
 	@Override
 	public void accept(ICVSResourceVisitor visitor) throws CVSException {
 		visitor.visitFile(this);
 	}
 
-	/**
-	 * @see ICVSResource#accept(ICVSResourceVisitor, boolean)
-	 */
 	@Override
 	public void accept(ICVSResourceVisitor visitor, boolean recurse) throws CVSException {
 		visitor.visitFile(this);
 	}
 	
-	/**
-	 * @see ICVSRemoteFile#getContents()
-	 */
 	@Override
 	public InputStream getContents(IProgressMonitor monitor) throws CVSException {
 		try {
@@ -277,9 +268,6 @@
 		return entry;
 	}
 	
-	/**
-	 * @see ICVSRemoteFile#getLogEntries()
-	 */
 	@Override
 	public ILogEntry[] getLogEntries(IProgressMonitor monitor) throws CVSException {
 		monitor = Policy.monitorFor(monitor);
@@ -309,9 +297,6 @@
 		}
 	}
 	
-	/**
-	 * @see ICVSRemoteFile#getRevision()
-	 */
 	@Override
 	public String getRevision() {
 		try {
@@ -344,9 +329,6 @@
 		return file;
 	}
 
-	/**
-	 * @see ICVSFile#getSyncInfo()
-	 */
 	@Override
 	public ResourceSyncInfo getSyncInfo() {
 		try {
@@ -357,9 +339,6 @@
 		}
 	}
 	
-	/**
-	 * @see ICVSResource#getRemoteLocation(ICVSFolder)
-	 */
 	@Override
 	public String getRemoteLocation(ICVSFolder stopSearching) throws CVSException {
 		return parent.getRemoteLocation(stopSearching) + Session.SERVER_SEPARATOR + getName();
@@ -382,9 +361,6 @@
 		return parent.getRepository();
 	}
 	
-	/**
-	 * @see IManagedFile#setFileInfo(FileProperties)
-	 */
 	@Override
 	public void setSyncInfo(ResourceSyncInfo fileInfo, int modificationState) {
 		setSyncBytes(fileInfo.getBytes(),modificationState);
@@ -464,9 +440,6 @@
 		// RemoteFiles are not mutable so do not support timestamp changes
 	}
 
-	/**
-	 * @see ICVSFile#moveTo(String)
-	 */
 	@Override
 	public void copyTo(String mFile) {		
 		// Do nothing
@@ -522,49 +495,31 @@
 		return super.equals(target) && remote.getRevision().equals(getRevision());
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#checkout(int)
-	 */
 	@Override
 	public void edit(int notifications, boolean notifyForWritable, IProgressMonitor monitor) {
 		// do nothing
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#uncheckout()
-	 */
 	@Override
 	public void unedit(IProgressMonitor monitor) {
 		// do nothing
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#notificationCompleted()
-	 */
 	@Override
 	public void notificationCompleted() {
 		// do nothing
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#getPendingNotification()
-	 */
 	@Override
 	public NotifyInfo getPendingNotification() {
 		return null;
 	}
 
-	/**
-	 * @see RemoteResource#forTag(ICVSRemoteFolder, CVSTag)
-	 */
 	@Override
 	public ICVSRemoteResource forTag(ICVSRemoteFolder parent, CVSTag tag) {
 		return new RemoteFile((RemoteFolder)parent, getWorkspaceSyncState(), getName(), getRevision(), getKeywordMode(), tag);
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSRemoteResource#forTag(org.eclipse.team.internal.ccvs.core.CVSTag)
-	 */
 	@Override
 	public ICVSRemoteResource forTag(CVSTag tag) {
 		RemoteFolderTree remoteFolder = new RemoteFolderTree(null, getRepository(), 
@@ -574,30 +529,18 @@
 		remoteFolder.setChildren(new ICVSRemoteResource[] { remoteFile });
 		return remoteFile;
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#committed(org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo)
-	 */
 	@Override
 	public void checkedIn(String info, boolean commit) {
 		// do nothing
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#isEdited()
-	 */
 	@Override
 	public boolean isEdited() {
 		return false;
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#getSyncBytes()
-	 */
 	@Override
 	public byte[] getSyncBytes() {
 		return syncBytes;
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFile#setSyncBytes(byte[])
-	 */
 	@Override
 	public void setSyncBytes(byte[] syncBytes, int modificationState) {
 		if (fetching) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
index 180dfd2..2eb13c5 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java
@@ -80,16 +80,12 @@
 		this.repository = repository;	
 	}
 	
-	/**
-	 * @see ICVSResource#accept(ICVSResourceVisitor)
-	 */
+	@Override
 	public void accept(ICVSResourceVisitor visitor) throws CVSException {
 		visitor.visitFolder(this);
 	}
 
-	/**
-	 * @see ICVSResource#accept(ICVSResourceVisitor, boolean)
-	 */
+	@Override
 	public void accept(ICVSResourceVisitor visitor, boolean recurse) throws CVSException {
 		visitor.visitFolder(this);
 		ICVSResource[] resources;
@@ -103,9 +99,7 @@
 		}
 	}
 	
-	/*
-	 * @see ICVSRemoteResource#exists(IProgressMonitor)
-	 */
+	@Override
 	public boolean exists(IProgressMonitor monitor) throws TeamException {
 		try {
 			members(monitor);
@@ -223,9 +217,7 @@
 		return children;
 	}
 
-	/**
-	 * @see ICVSFolder#members(int)
-	 */
+	@Override
 	public ICVSResource[] members(int flags) throws CVSException {		
 		final List<ICVSResource> result = new ArrayList<>();
 		ICVSRemoteResource[] resources = getChildren();
@@ -257,9 +249,7 @@
 		return (ICVSResource[]) result.toArray(new ICVSResource[result.size()]);
 	}
 	
-	/**
-	 * @see ICVSFolder#getFolder(String)
-	 */
+	@Override
 	public ICVSFolder getFolder(String name) throws CVSException {
 		if (name.equals(Session.CURRENT_LOCAL_FOLDER) || name.equals(Session.CURRENT_LOCAL_FOLDER + Session.SERVER_SEPARATOR))
 			return this;
@@ -270,9 +260,7 @@
 		throw new CVSException(status); 
 	}
 
-	/**
-	 * @see ICVSFolder#getFile(String)
-	 */
+	@Override
 	public ICVSFile getFile(String name) throws CVSException {
 		ICVSResource child = getChild(name);
 		if (!child.isFolder())
@@ -290,9 +278,7 @@
 		return getFolderSyncInfo().getRepository();
 	}
 	
-	/**
-	 * @see ICVSResource#getRelativePath(ICVSFolder)
-	 */
+	@Override
 	public String getRelativePath(ICVSFolder ancestor) throws CVSException {
 		// Check to see if the receiver is the ancestor
 		if (ancestor == this) return Session.CURRENT_LOCAL_FOLDER;
@@ -308,16 +294,12 @@
 		return repository;
 	}
 	
-	/**
-	 * @see ICVSRemoteFolder#isExpandable()
-	 */
+	@Override
 	public boolean isExpandable() {
 		return true;
 	}
 	
-	/**
-	 * @see ICVSResource#isFolder()
-	 */
+	@Override
 	public boolean isFolder() {
 		return true;
 	}
@@ -367,9 +349,7 @@
 		throw new CVSException(status);
 	}
 
-	/**
-	 * @see ICVSFolder#mkdir()
-	 */
+	@Override
 	public void mkdir() throws CVSException {
 		IStatus status = new CVSStatus(IStatus.ERROR, CVSMessages.RemoteResource_invalidOperation);
 		throw new CVSException(status);
@@ -381,16 +361,12 @@
 	public void flush(boolean deep) {
 	}
 
-	/**
-	 * @see ICVSFolder#getFolderInfo()
-	 */
+	@Override
 	public FolderSyncInfo getFolderSyncInfo() {
 		return folderInfo;
 	}
 
-	/**
-	 * @see ICVSResource#getRemoteLocation(ICVSFolder)
-	 */
+	@Override
 	public String getRemoteLocation(ICVSFolder stopSearching) throws CVSException {
 		if (folderInfo == null) {
 			return Util.appendPath(parent.getRemoteLocation(stopSearching), getName());
@@ -398,31 +374,23 @@
 		return folderInfo.getRemoteLocation();
 	}
 	
-	/**
-	 * @see ICVSFolder#isCVSFolder()
-	 */
+	@Override
 	public boolean isCVSFolder() {
 		return folderInfo != null;
 	}
 
-	/**
-	 * @see ICVSFolder#acceptChildren(ICVSResourceVisitor)
-	 */
+	@Override
 	public void acceptChildren(ICVSResourceVisitor visitor) throws CVSException {
 		IStatus status = new CVSStatus(IStatus.ERROR, CVSMessages.RemoteResource_invalidOperation);
 		throw new CVSException(status);		
 	}
 	
-	/*
-	 * @see IRemoteResource#isContainer()
-	 */
+	@Override
 	public boolean isContainer() {
 		return true;
 	}
 	
-	/*
-	 * @see IRemoteResource#members(IProgressMonitor)
-	 */
+	@Override
 	public ICVSRemoteResource[] members(IProgressMonitor progress) throws TeamException {
 		return getMembers(progress);
 	}
@@ -449,30 +417,23 @@
         setFolderSyncInfo(newInfo);
 	}
 
-	/*
-	 * @see ICVSRemoteFolder#getTag()
-	 */
+	@Override
 	public CVSTag getTag() {
 		if (folderInfo == null) return null;
 		return folderInfo.getTag();
 	}
-	/*
-	 * @see ICVSFolder#setFolderInfo(FolderSyncInfo)
-	 */
+	
+	@Override
 	public void setFolderSyncInfo(FolderSyncInfo folderInfo) {
 		this.folderInfo = folderInfo.asImmutable();
 	}
 	
-	/*
-	 * @see ICVSFolder#run(ICVSRunnable, IProgressMonitor)
-	 */
+	@Override
 	public void run(ICVSRunnable job, IProgressMonitor monitor) throws CVSException {
 		job.run(monitor);
 	}
 	
-	/*
-	 * @see ICVSFolder#tag(CVSTag, LocalOption[], IProgressMonitor)
-	 */
+	@Override
 	public IStatus tag(final CVSTag tag, final LocalOption[] localOptions, IProgressMonitor monitor) throws CVSException {
 		monitor = Policy.monitorFor(monitor);
 		monitor.beginTask(null, 100);
@@ -492,9 +453,7 @@
 		}
 	 }
 	 
-	/**
-	 * @see ICVSFolder#fetchChildren(IProgressMonitor)
-	 */
+	@Override
 	public ICVSResource[] fetchChildren(IProgressMonitor monitor) throws CVSException {
 		try {
 			return getMembers(monitor);
@@ -515,9 +474,7 @@
 		return tag1.equals(tag2);
 	}
 	
-	/**
-	 * @see java.lang.Object#hashCode()
-	 */
+	@Override
 	public int hashCode() {
 		CVSTag tag = getTag();
 		if (tag == null) tag = CVSTag.DEFAULT;
@@ -537,30 +494,22 @@
 		return getRelativePathFromRootRelativePath((ICVSFolder)root.getChild(path.segment(0)), path.removeFirstSegments(1));
 	}
 
-	/**
-	 * @see ICVSRemoteFolder#forTag(CVSTag)
-	 */
+	@Override
 	public ICVSRemoteResource forTag(ICVSRemoteFolder parent, CVSTag tagName) {
 		return new RemoteFolder((RemoteFolder)parent, getName(), repository, folderInfo.getRepository(), tagName, folderInfo.getIsStatic());
 	}
 	
-	/**
-	 * @see ICVSRemoteFolder#forTag(CVSTag)
-	 */
+	@Override
 	public ICVSRemoteResource forTag(CVSTag tagName) {
 		return (ICVSRemoteFolder)forTag(null, tagName);
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder#isDefinedModule()
-	 */
+	@Override
 	public boolean isDefinedModule() {
 		return false;
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.RemoteResource#getSyncInfo()
-	 */
+	@Override
 	public ResourceSyncInfo getSyncInfo() {
 		return new ResourceSyncInfo(getName());
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java
index 6633034..df979cf 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java
@@ -64,9 +64,6 @@
 		super.setChildren(children);
 	}
 	
-	/*
-	 * @see ICVSFolder#acceptChildren(ICVSResourceVisitor)
-	 */
 	public void acceptChildren(ICVSResourceVisitor visitor) throws CVSException {
 		ICVSRemoteResource[] children = getChildren();
 		if (children == null) return;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
index 629cbd9..470a79b 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java
@@ -301,9 +301,6 @@
 		return Checkout.ALIAS.isElementOf(localOptions);
 	}
 	
-	/**
-	 * @see ICVSRemoteFolder#isExpandable()
-	 */
 	public boolean isExpandable() {
 		return expandable;
 	}
@@ -312,9 +309,6 @@
 		this.expandable = expandable;
 	}
 	
-	/**
-	 * @see ICVSRemoteFolder#forTag(CVSTag)
-	 */
 	public ICVSRemoteResource forTag(ICVSRemoteFolder parent, CVSTag tagName) {
 		RemoteModule r = new RemoteModule(label, (RemoteFolder)parent, getRepository(), folderInfo.getRepository(), localOptions, tagName, folderInfo.getIsStatic());
 		r.setExpandable(expandable);
@@ -340,15 +334,9 @@
 		return r;
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder#isDefinedModule()
-	 */
 	public boolean isDefinedModule() {
 		return true;
 	}
-	/**
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	public boolean equals(Object arg0) {
 		if (arg0 instanceof RemoteModule) {
 			RemoteModule module = (RemoteModule) arg0;
@@ -357,16 +345,10 @@
 		return false;
 	}
 	
-	/**
-	 * @see java.lang.Object#hashCode()
-	 */
 	public int hashCode() {
 		return super.hashCode() | getName().hashCode();
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSFolder#getChild(java.lang.String)
-	 */
 	public ICVSResource getChild(String path) throws CVSException {
 		if (path.equals(Session.CURRENT_LOCAL_FOLDER) || path.length() == 0)
 			return this;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java
index 4b2e977..33e5267 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java
@@ -46,23 +46,14 @@
 		this.name = name;
 	}
 
-	/*
-	 * @see ICVSRemoteResource#getName()
-	 */
 	public String getName() {
 		return name;
 	}
 
-	/*
-	 * @see ICVSResource#getRelativePath(ICVSFolder)
-	 */
 	public String getRelativePath(ICVSFolder ancestor) throws CVSException {
 		return Util.appendPath(parent.getRelativePath(ancestor), getName());
 	}
 	
-	/*
-	 * @see ICVSRemoteResource#getParent()
-	 */
 	public ICVSRemoteResource getRemoteParent() {
 		return parent;
 	}
@@ -79,9 +70,6 @@
  		this.workspaceSyncState = workspaceSyncState;
  	}
 	
-	/*
-	 * @see ICVSResource#delete()
-	 */
 	public void delete() {
 		// For now, do nothing but we could provide this in the future.
 	}
@@ -98,30 +86,18 @@
 		return true;
 	}
 	
-	/*
-	 * @see ICVSRemoteResource#exists(IProgressMonitor)
-	 */
 	public boolean exists(IProgressMonitor monitor) throws TeamException {
 		return parent.exists(this, monitor);
 	}
 
-	/*
-	 * @see ICVSResource#getParent()
-	 */
 	public ICVSFolder getParent() {
 		return parent;
  	}
 
-	/*
-	 * @see ICVSResource#isIgnored()
-	 */
 	public boolean isIgnored() {
 		return false;
 	}
 
-	/*
-	 * @see ICVSResource#isManaged()
-	 */
 	public boolean isManaged() {
 		return parent != null;
 	}
@@ -132,16 +108,10 @@
 		return true;
 	}
 	
-	/*
-	 * @see ICVSResource#unmanage()
-	 */
 	public void unmanage(IProgressMonitor monitor) throws CVSException {
 		// do nothing
 	}
 
-	/*
-	 * @see ICVSResource#getSyncInfo()
-	 */
 	public abstract ResourceSyncInfo getSyncInfo();
 	
 	public boolean equals(Object target) {
@@ -155,17 +125,11 @@
 		&& remote.getRepositoryRelativePath().equals(getRepositoryRelativePath());
 	}
 
-	/*
-	 * @see ICVSResource#setIgnoredAs(String)
-	 */
 	public void setIgnoredAs(String pattern) throws CVSException {
 		// ensure that clients are not trying to set sync info on remote handles.
 		Assert.isTrue(false);
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.ICVSResource#getIResource()
-	 */
 	public IResource getIResource() {
 		return null;
 	}
@@ -180,9 +144,6 @@
 	 */
 	public abstract ICVSRemoteResource forTag(ICVSRemoteFolder parent, CVSTag tagName);
 
-	/**
-	 * @see java.lang.Object#hashCode()
-	 */
 	public int hashCode() {
 		return getRepositoryRelativePath().hashCode();
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java
index 201841f..f764751 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java
@@ -303,9 +303,6 @@
 		return true;
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#getCachedSyncBytes(org.eclipse.core.resources.IResource, boolean)
-	 */
 	byte[] getCachedSyncBytes(IResource resource, boolean threadSafeAccess) throws CVSException {
 		byte[] bytes = (byte[])safeGetSessionProperty(resource, RESOURCE_SYNC_KEY);
 		// If we are not thread safe, just return whatever was found in the session property
@@ -361,9 +358,6 @@
 			}
 		}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#setCachedSyncBytes(org.eclipse.core.resources.IResource, byte[])
-	 */
 	void setCachedSyncBytes(IResource resource, byte[] syncBytes, boolean canModifyWorkspace) throws CVSException {
 		// Ensure that the sync bytes do not indicate a deletion
 		if (syncBytes != null && ResourceSyncInfo.isDeletion(syncBytes)) {
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java
index 35940dd..f8cd3e8 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java
@@ -118,9 +118,6 @@
 		}
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#getCachedSyncBytes(org.eclipse.core.resources.IResource, boolean)
-	 */
 	byte[] getCachedSyncBytes(IResource resource, boolean threadSafeAccess) throws CVSException {
 		try {
 			byte[] bytes = null;
@@ -146,9 +143,6 @@
 		}
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#setCachedSyncBytes(org.eclipse.core.resources.IResource, byte[])
-	 */
 	void setCachedSyncBytes(IResource resource, byte[] syncBytes, boolean canModifyWorkspace) throws CVSException {
 		byte[] oldBytes = getCachedSyncBytes(resource, true);
 		try {
@@ -235,23 +229,15 @@
 		return true;
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#isResourceSyncInfoCached(org.eclipse.core.resources.IContainer)
-	 */
 	boolean isResourceSyncInfoCached(IContainer container) throws CVSException {
 		// the sync info is always cahced when using the synchronizer
 		return true;
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#setResourceSyncInfoCached(org.eclipse.core.resources.IContainer)
-	 */
 	void setResourceSyncInfoCached(IContainer container) throws CVSException {
 		// do nothing
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#isFolderSyncInfoCached(org.eclipse.core.resources.IContainer)
-	 */
+	
 	boolean isFolderSyncInfoCached(IContainer container) throws CVSException {
 		return true;
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java
index 58e2c7f..9cbc96c 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java
@@ -235,9 +235,7 @@
 			this.tag = new CVSEntryLineTag(tag);
 		}
 	}
-	/*
-	 * @see Object#toString()
-	 */
+	
 	public String toString() {
 		return getRoot() + "/" + getRepository() + "/" + getTag(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java
index d30cfcd..7485391 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java
@@ -129,9 +129,7 @@
 		}
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo#setEntryLine(java.lang.String)
-	 */
+	@Override
 	public void setEntryLine(String entryLine) throws CVSException {
 		super.setEntryLine(entryLine);
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
index 7c57f13..587d490 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java
@@ -316,9 +316,7 @@
 		return getName().hashCode();
 	}
 	
-	/*
-	 * @see Object#toString()
-	 */
+	@Override
 	public String toString() {
 		return getEntryLine(true, null /*no timestamp override*/);
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java
index 915200c..125df45 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java
@@ -45,9 +45,7 @@
 		return destination;
 	}
 	
-	/**
-	 * @see IResourceDeltaVisitor#visit(IResourceDelta)
-	 */
+	@Override
 	public boolean visit(IResourceDelta delta) throws CoreException {
 		IResource resource = delta.getResource();
 		boolean movedFrom = (delta.getFlags() & IResourceDelta.MOVED_FROM) > 0;
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java
index b4d856b..cae80c6 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java
@@ -30,9 +30,7 @@
  */
 public class MoveDeleteHook implements IMoveDeleteHook {
 	
-	/**
-	 * @see IMoveDeleteHook#deleteFile(IResourceTree, IFile, int, IProgressMonitor)
-	 */
+	@Override
 	public boolean deleteFile(
 		final IResourceTree tree,
 		final IFile file,
@@ -74,9 +72,7 @@
 		return true;
 	}
 	
-	/**
-	 * @see IMoveDeleteHook#deleteFolder(IResourceTree, IFolder, int, IProgressMonitor)
-	 */
+	@Override
 	public boolean deleteFolder(
 		final IResourceTree tree,
 		final IFolder folder,
@@ -110,9 +106,7 @@
 		return false;
 	}
 
-	/**
-	 * @see IMoveDeleteHook#deleteProject(IResourceTree, IProject, int, IProgressMonitor)
-	 */
+	@Override
 	public boolean deleteProject(
 		IResourceTree tree,
 		IProject project,
@@ -131,9 +125,7 @@
 		return false;
 	}
 
-	/**
-	 * @see IMoveDeleteHook#moveFile(IResourceTree, IFile, IFile, int, IProgressMonitor)
-	 */
+	@Override
 	public boolean moveFile(
 			final IResourceTree tree,
 			final IFile source,
@@ -179,9 +171,7 @@
 		return true;
 	}
 
-	/**
-	 * @see IMoveDeleteHook#moveFolder(IResourceTree, IFolder, IFolder, int, IProgressMonitor)
-	 */
+	@Override
 	public boolean moveFolder(
 		final IResourceTree tree,
 		final IFolder source,
@@ -233,9 +223,7 @@
 		return false;
 	}
 
-	/**
-	 * @see IMoveDeleteHook#moveProject(IResourceTree, IProject, IProjectDescription, int, IProgressMonitor)
-	 */
+	@Override
 	public boolean moveProject(
 		IResourceTree tree,
 		IProject source,
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
index 44dafbb..25a1077 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
@@ -45,9 +45,7 @@
 		this.session = session;
 	}
 	
-	/**
-	 * @see ICVSResourceVisitor#visitFile(ICVSFile)
-	 */
+	@Override
 	public void visitFile(ICVSFile file) throws CVSException {
 		byte[] syncBytes = file.getSyncBytes();
 		if (syncBytes == null) {
@@ -136,9 +134,7 @@
 		return false;
 	}
 
-	/**
-	 * @see ICVSResourceVisitor#visitFolder(ICVSFolder)
-	 */
+	@Override
 	public void visitFolder(ICVSFolder folder) throws CVSException {
 		// Delete unmanaged folders if the user wants them deleted
 		if (!folder.isCVSFolder()) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java
index eae3e75..1daca5d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AdaptableHierarchicalResourceList.java
@@ -16,9 +16,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.*;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -40,9 +38,7 @@
 		this.root = root;
 	}
 
-	/**
-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object)
-	 */
+	@Override
 	public Object[] getChildren(Object o) {
 		return getChildenFor(root);
 	}
@@ -73,6 +69,7 @@
 	 */
 	public ITreeContentProvider getTreeContentProvider() {
 		return new WorkbenchContentProvider() {
+			@Override
 			public Object[] getChildren(Object o) {
 				if (o instanceof IContainer) {
 					return getChildenFor((IContainer) o);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java
index b056f7c..3e54990 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java
@@ -52,9 +52,6 @@
 		this.unaddedResources = unaddedResources;
 	}
 
-	/**
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	protected void createMainDialogArea(Composite parent) {
 		Composite composite = new Composite(parent, SWT.NULL);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java
index fe60e93..15c6caa 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java
@@ -104,19 +104,24 @@
 			return fText.getText();
 		}
 		
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 		
 			final ILabelProvider labelProvider = new LabelProvider() {
+				@Override
 				public String getText(Object element) {
 					return ((Map.Entry)element).getKey() + " - " + ((Map.Entry)element).getValue(); //$NON-NLS-1$
 				}
 			};
 			
 			final IStructuredContentProvider contentsProvider = new IStructuredContentProvider() {
+				@Override
 				public Object[] getElements(Object inputElement) {
 					return ((Collection)inputElement).toArray();
 				}
+				@Override
 				public void dispose() {}
+				@Override
 				public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
 			};
 			
@@ -187,11 +192,13 @@
 			item.setControl(composite);	
 		}
 		
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			setChanged();
 			notifyObservers();
 		}
 		
+		@Override
 		public void initializeValues(IPreferenceStore store) {
 			fDirty.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION));
 			fAdded.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION));
@@ -199,6 +206,7 @@
 			fNewResource.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION));
 		}
 		
+		@Override
 		public void performOk(IPreferenceStore store) {
 			store.setValue(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION, fDirty.getSelection());
 			store.setValue(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION, fAdded.getSelection());
@@ -206,6 +214,7 @@
 			store.setValue(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION, fNewResource.getSelection());
 		}
 		
+		@Override
 		public void performDefaults(IPreferenceStore store) {
 			fDirty.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION));
 			fAdded.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION));
@@ -213,6 +222,7 @@
 			fNewResource.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION));
 		}
 		
+		@Override
 		public void setPreferences(Preferences prefs) {
 			prefs.setDefault(ICVSUIConstants.PREF_SHOW_DIRTY_DECORATION, fDirty.getSelection());
 			prefs.setDefault(ICVSUIConstants.PREF_SHOW_ADDED_DECORATION, fAdded.getSelection());
@@ -220,6 +230,7 @@
 			prefs.setDefault(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION, fNewResource.getSelection());
 		}
 
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
 		}
 	}	
@@ -271,6 +282,7 @@
 			item.setControl(composite);	
 		}
 		
+		@Override
 		public void initializeValues(IPreferenceStore store) {
 			fFileDecoration.initializeValue(store);
 			fFolderDecoration.initializeValue(store);
@@ -279,6 +291,7 @@
 			dirtyFlag.setText(store.getString(ICVSUIConstants.PREF_DIRTY_FLAG));
 		}
 		
+		@Override
 		public void performOk(IPreferenceStore store) {
 			fFileDecoration.performOk(store);
 			fFolderDecoration.performOk(store);
@@ -287,6 +300,7 @@
 			store.setValue(ICVSUIConstants.PREF_DIRTY_FLAG, dirtyFlag.getText());
 		}
 		
+		@Override
 		public void performDefaults(IPreferenceStore store) {
 			fFileDecoration.performDefaults(store);
 			fFolderDecoration.performDefaults(store);
@@ -308,11 +322,13 @@
 			return fProjectDecoration.getText();
 		}
 
+		@Override
 		public void modifyText(ModifyEvent e) {
 			setChanged();
 			notifyObservers();
 		}
 
+		@Override
 		public void setPreferences(Preferences prefs) {
 			prefs.setDefault(ICVSUIConstants.PREF_CALCULATE_DIRTY, true);
 			prefs.setDefault(ICVSUIConstants.PREF_DIRTY_FLAG, dirtyFlag.getText());
@@ -345,29 +361,35 @@
 			item.setControl(composite);	
 		}
 
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			setChanged();
 			notifyObservers();
 		}
 		
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
 		}
 
+		@Override
 		public void initializeValues(IPreferenceStore store) {
 			fShowDirty.setSelection(store.getBoolean(ICVSUIConstants.PREF_CALCULATE_DIRTY));
 			fUseFontDecorations.setSelection(store.getBoolean(ICVSUIConstants.PREF_USE_FONT_DECORATORS));
 		}
 
+		@Override
 		public void performDefaults(IPreferenceStore store) {
 			fShowDirty.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_CALCULATE_DIRTY));
 			fUseFontDecorations.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_USE_FONT_DECORATORS));
 		}
 		
+		@Override
 		public void performOk(IPreferenceStore store) {
 			store.setValue(ICVSUIConstants.PREF_CALCULATE_DIRTY, fShowDirty.getSelection());
 			store.setValue(ICVSUIConstants.PREF_USE_FONT_DECORATORS, fUseFontDecorations.getSelection());
 		}
 		
+		@Override
 		public void setPreferences(Preferences preferences) {
 			preferences.setValue(ICVSUIConstants.PREF_CALCULATE_DIRTY, fShowDirty.getSelection());
 			preferences.setValue(ICVSUIConstants.PREF_USE_FONT_DECORATORS, fUseFontDecorations.getSelection());
@@ -423,30 +445,37 @@
 			}
 		}
 		
+		@Override
 		public void update(Observable o, Object arg) {
 			refresh();
 		}
 		
+		@Override
 		public Object[] getChildren(Object parentElement) {
 			return ((PreviewFile)parentElement).children.toArray();
 		}
 
+		@Override
 		public Object getParent(Object element) {
 			return null;
 		}
 
+		@Override
 		public boolean hasChildren(Object element) {
 			return !((PreviewFile)element).children.isEmpty();
 		}
 
+		@Override
 		public Object[] getElements(Object inputElement) {
 			return ((Collection)inputElement).toArray();
 		}
 
+		@Override
 		public void dispose() {
             fImageCache.dispose();
 		}
 
+		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 		}
 
@@ -462,6 +491,7 @@
 			return getDecoration(element).getFont();
 		}
 		
+		@Override
 		public String getText(Object element) {
 			final CVSDecoration decoration = getDecoration(element);
 			final StringBuffer buffer = new StringBuffer();
@@ -482,6 +512,7 @@
 			return decoration;
 		}
 		
+		@Override
 		public Image getImage(Object element) {
 			final String s;
 			switch (((PreviewFile)element).type) {
@@ -512,6 +543,7 @@
 		ThemeListener(Preview preview) {
 			fPreview= preview;
 		}
+		@Override
 		public void propertyChange(PropertyChangeEvent event) {
 			fPreview.refresh();
 		}
@@ -562,6 +594,7 @@
 	private Preview fPreview;
 	private ThemeListener fThemeListener;
 	
+	@Override
 	protected Control createContents(Composite parent) {
 		
 		final Composite composite= SWTUtils.createHVFillComposite(parent, SWTUtils.MARGINS_NONE);
@@ -592,6 +625,7 @@
 		return tabFolder;
 	}
 	
+	@Override
 	public void dispose() {
 		if (fThemeListener != null)
 			PlatformUI.getWorkbench().getThemeManager().removePropertyChangeListener(fThemeListener);
@@ -611,9 +645,7 @@
 		setValid(true);
 	}
 
-	/**
-	* @see IWorkbenchPreferencePage#init(IWorkbench)
-	*/
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 
@@ -622,6 +654,7 @@
 	 *
 	 * @return whether it is okay to close the preference page
 	 */
+	@Override
 	public boolean performOk() {
 		final IPreferenceStore store = getPreferenceStore();
 		fTextTab.performOk(store);
@@ -638,6 +671,7 @@
 	 * Defaults was clicked. Restore the CVS preferences to
 	 * their default values
 	 */
+	@Override
 	protected void performDefaults() {
 		final IPreferenceStore store = getPreferenceStore();
 		
@@ -655,6 +689,7 @@
 	*
 	* @return the preference store for this plugin
 	*/
+	@Override
 	protected IPreferenceStore doGetPreferenceStore() {
 		return CVSUIPlugin.getPlugin().getPreferenceStore();
 	}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFieldEditorPreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFieldEditorPreferencePage.java
index 3f3a51b..a9b1060 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFieldEditorPreferencePage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFieldEditorPreferencePage.java
@@ -41,9 +41,7 @@
 			setDescription(description);
 	}
 
-	/**
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
+	@Override
 	protected Control createContents(Composite parent) {
 		Control control = super.createContents(parent);
 		String id = getPageHelpContextId();
@@ -53,9 +51,7 @@
 		return control;
 	}
 
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 
@@ -74,9 +70,7 @@
 	 */
 	protected abstract String getPageDescription();
 
-	/**
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
+	@Override
 	public boolean performOk() {
 		if (!super.performOk()) return false;
 		pushPreferences();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java
index a4f9195..1c14839 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFilePropertiesPage.java
@@ -36,9 +36,7 @@
 public class CVSFilePropertiesPage extends CVSPropertiesPage {
 	IFile file;
 
-	/*
-	 * @see PreferencesPage#createContents
-	 */
+	@Override
 	protected Control createContents(Composite parent) {
 		initialize();
 		noDefaultAndApplyButton();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java
index bd7b0d6..20de8a4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSFolderPropertiesPage.java
@@ -20,7 +20,6 @@
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -40,9 +39,6 @@
 
 	private Text repository;
 	
-	/**
-	 * @see PreferencePage#createContents(Composite)
-	 */
 	@Override
 	protected Control createContents(Composite parent) {
 		initialize();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilter.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilter.java
index 6867694..7923597 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilter.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilter.java
@@ -40,9 +40,7 @@
 		this.matchCounter = 0;
 	}
 
-	/**
-	 * @see ViewerFilter#select(Viewer, Object, Object)
-	 */
+	@Override
 	public boolean select(Viewer aviewer, Object parentElement, Object element) {
 		if (element instanceof AbstractHistoryCategory)
 			return true;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilterAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilterAction.java
index c093f37..bb62931 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilterAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryFilterAction.java
@@ -18,7 +18,6 @@
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.window.Window;
-import org.eclipse.ui.*;
 
 public class CVSHistoryFilterAction extends Action {
 	private TreeViewer viewer;
@@ -29,16 +28,11 @@
 		this.page = page;
 	}
 
-	/**
-	 * @see IViewActionDelegate#init(IViewPart)
-	 */
 	public void init(TreeViewer viewer) {
 		this.viewer = viewer;
 	}
 
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
+	@Override
 	public void run() {
 		CVSHistoryFilterDialog historyDialog = new CVSHistoryFilterDialog(viewer.getControl().getShell());
 		if (filter != null) {
@@ -52,9 +46,6 @@
 		page.showFilter(filter);
 	}
 
-	/**
-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
 	public void selectionChanged(IAction action, ISelection selection) {
 	}
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java
index af12c09..5216362 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryPage.java
@@ -1740,9 +1740,6 @@
 	}
 
 	private class HistoryResourceListener implements IResourceChangeListener {
-		/**
-		 * @see IResourceChangeListener#resourceChanged(IResourceChangeEvent)
-		 */
 		@Override
 		public void resourceChanged(IResourceChangeEvent event) {
 			IResourceDelta root = event.getDelta();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistorySearchFilter.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistorySearchFilter.java
index d926a07..424fb69 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistorySearchFilter.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistorySearchFilter.java
@@ -17,7 +17,6 @@
 import java.util.*;
 
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.team.core.history.ITag;
 import org.eclipse.team.internal.ccvs.core.filehistory.CVSFileRevision;
 import org.eclipse.team.internal.ui.history.AbstractHistoryCategory;
@@ -32,9 +31,7 @@
 		this.searchString = searchStrings;
 	}
 
-	/**
-	 * @see ViewerFilter#select(Viewer, Object, Object)
-	 */
+	@Override
 	public boolean select(Viewer aviewer, Object parentElement, Object element) {
 		if (element instanceof AbstractHistoryCategory)
 			return true;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java
index f5a81d2..d942b74 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectPropertiesPage.java
@@ -342,9 +342,6 @@
 			handle(e);
 		}
 	}
-	/*
-	 * @see PreferencesPage#performOk
-	 */
 	@Override
 	public boolean performOk() {
 		final boolean[] changeReadOnly = { false };
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java
index 90b5be9..65d3f6f 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSProjectSetSerializer.java
@@ -36,11 +36,6 @@
 
 public class CVSProjectSetSerializer implements IProjectSetSerializer {
 
-	/**
-	 * @see IProjectSetSerializer#asReference(IProject[])
-	 * 
-	 * "1.0,repoLocation,module,projectName[,tag]"
-	 */
 	@Override
 	public String[] asReference(IProject[] providerProjects, Object context, IProgressMonitor monitor) throws TeamException {
 		String[] result = new String[providerProjects.length];
@@ -78,9 +73,6 @@
 		return result;
 	}
 
-	/**
-	 * @see IProjectSetSerializer#addToWorkspace(String[])
-	 */
 	@Override
 	public IProject[] addToWorkspace(String[] referenceStrings, String filename, Object context, IProgressMonitor monitor) throws TeamException {
 		final int size = referenceStrings.length;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
index b4ff98f..ab74ecc 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
@@ -676,9 +676,6 @@
         }
 	}
 	
-	/**
-	 * @see Plugin#start(BundleContext)
-	 */
 	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
@@ -717,9 +714,6 @@
 
 	}
 	
-	/**
-	 * @see Plugin#stop(BundleContext)
-	 */
 	@Override
 	public void stop(BundleContext context) throws Exception {
 		try {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
index cc8ef72..f8bc0d4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
@@ -445,9 +445,6 @@
     private String fProposedComment;
     private Composite fComposite;
     
-    /**
-     * @see org.eclipse.team.internal.ccvs.ui.DialogArea#createArea(org.eclipse.swt.widgets.Composite)
-     */
     @Override
 	public void createArea(Composite parent) {
         Dialog.applyDialogFont(parent);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ConfigureRepositoryLocationsDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ConfigureRepositoryLocationsDialog.java
index 23a934f..6d54ac1 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ConfigureRepositoryLocationsDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ConfigureRepositoryLocationsDialog.java
@@ -183,10 +183,6 @@
 		return section;
 	}
 
-	/*
-	 * @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsStrategy()
-	 * @since 3.2
-	 */
 	@Override
 	protected int getDialogBoundsStrategy() {
 		return DIALOG_PERSISTLOCATION | DIALOG_PERSISTSIZE;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java
index fc7dbb8..158a893 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/EditorsView.java
@@ -45,16 +45,12 @@
 	private TableViewer tableViewer;
 
 	class EditorsLabelProvider implements ITableLabelProvider {
-		/**
-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
-		 */
+		@Override
 		public Image getColumnImage(Object element, int columnIndex) {
 			return null;
 		}
 
-		/**
-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
-		 */
+		@Override
 		public String getColumnText(Object element, int columnIndex) {
 			if (element == null)
 				return ""; //$NON-NLS-1$
@@ -81,28 +77,20 @@
 
 		}
 
-		/**
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-		 */
+		@Override
 		public void addListener(ILabelProviderListener listener) {
 		}
 
-		/**
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-		 */
+		@Override
 		public void dispose() {
 		}
 
-		/**
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
-		 */
+		@Override
 		public boolean isLabelProperty(Object element, String property) {
 			return false;
 		}
 
-		/**
-		 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-		 */
+		@Override
 		public void removeListener(ILabelProviderListener listener) {
 		}
 
@@ -135,6 +123,7 @@
 			this.reversed = reversed;
 		}
 		
+		@Override
 		public int compare(Viewer compareViewer, Object o1, Object o2) {
 			int result = 0;
 			if ((o1 instanceof EditorsInfo) && (o2 instanceof EditorsInfo)) {
@@ -200,9 +189,7 @@
 		}
 	}	
 	
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
+	@Override
 	public void createPartControl(Composite parent) {
 		table =	new Table(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
 		table.setHeaderVisible(true);
@@ -268,6 +255,7 @@
 
 	private SelectionListener getColumnListener(final TableViewer tableViewer) {
 		return new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				// column selected - need to sort
 				TableColumn tableColumn = (TableColumn) e.widget;
@@ -288,17 +276,12 @@
 		};
 	}
 	
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-	 */
+	@Override
 	public void setFocus() {
 		if (table != null)
 			table.setFocus();
 	}
 	
-	/**
-	 * Method getTable.
-	 */
 	public Table getTable() {
 		return table;
 	}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java
index 3ceba83..5c1a2af 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ExtMethodPreferencePage.java
@@ -40,9 +40,6 @@
 	private Combo methodType;
 	private Control internal, external;
 
-	/*
-	 * @see PreferencePage#createContents(Composite)
-	 */
 	@Override
 	protected Control createContents(Composite parent) {
 		Composite composite = new Composite(parent, SWT.NULL);
@@ -217,16 +214,10 @@
 	 	cvsRsh.setText(s);
 	 }
 	
-	/*
-	 * @see IWorkbenchPreferencePage#init(IWorkbench)
-	 */
 	@Override
 	public void init(IWorkbench workbench) {
 	}
 	
-	/*
-	 * @see IPreferencePage#performOk()
-	 */
 	@Override
 	public boolean performOk() {
 		IPreferenceStore store = getPreferenceStore();
@@ -248,9 +239,6 @@
 		return super.performOk();
 	}
     
-	/* 
-     * @see PreferencePage#performDefaults()
-     */
     @Override
 	protected void performDefaults() {
         IPreferenceStore store = getPreferenceStore();
@@ -283,9 +271,6 @@
 		updateEnablements();
     }
     
-	/*
-	 * @see PreferencePage#doGetPreferenceStore()
-	 */
 	@Override
 	protected IPreferenceStore doGetPreferenceStore() {
 		return CVSUIPlugin.getPlugin().getPreferenceStore();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/KeyboardInteractiveDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/KeyboardInteractiveDialog.java
index 33442e6..ecd1ecc 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/KeyboardInteractiveDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/KeyboardInteractiveDialog.java
@@ -17,7 +17,6 @@
 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.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -91,9 +90,7 @@
         isPasswordAuth=true;
       }
   }
-  /**
-   * @see Window#configureShell
-   */
+
   @Override
 protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
@@ -107,9 +104,7 @@
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell,
 				IHelpContextIds.KEYBOARD_INTERACTIVE_DIALOG);
 	}
-  /**
-	 * @see Window#create
-	 */
+
   @Override
 public void create() {
 		super.create();
@@ -123,9 +118,7 @@
 			texts[0].setFocus();
 		}
 	}
-  /**
-	 * @see Dialog#createDialogArea
-	 */
+
   @Override
 protected Control createDialogArea(Composite parent) {
 		Composite top = new Composite(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java
index 61c25f2..78b7e90 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ListSelectionArea.java
@@ -13,20 +13,12 @@
  *******************************************************************************/
 package org.eclipse.team.internal.ccvs.ui;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.*;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.events.*;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -68,9 +60,7 @@
 		this.initialSelections = new ArrayList();
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.DialogArea#createArea(org.eclipse.swt.widgets.Composite)
-	 */
+	@Override
 	public void createArea(Composite parent) {
 
 	    Dialog.applyDialogFont(parent);
@@ -92,6 +82,7 @@
 		listViewer.setContentProvider(contentProvider);
 		
 		listViewer.addCheckStateListener(new ICheckStateListener() {
+			@Override
 			public void checkStateChanged(CheckStateChangedEvent event) {
 				Object[] checkedElements = getViewer().getCheckedElements();
 				firePropertyChangeChange(LIST_SELECTION, previousCheckedElements, checkedElements);
@@ -138,6 +129,7 @@
 		Button selectButton = createButton(buttonComposite, CVSUIMessages.ListSelectionArea_selectAll, GridData.HORIZONTAL_ALIGN_FILL); 
 
 		SelectionListener listener = new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				listViewer.setAllChecked(true);
 			}
@@ -148,6 +140,7 @@
 		Button deselectButton = createButton(buttonComposite, CVSUIMessages.ListSelectionArea_deselectAll, GridData.HORIZONTAL_ALIGN_FILL); 
 
 		listener = new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				listViewer.setAllChecked(false);
 
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java
index 8aff989..941fe10 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java
@@ -131,9 +131,6 @@
 		}
 	};
 
-	/*
-	 * @see org.eclipse.test.quickdiff.DocumentLineDiffer.IQuickDiffReferenceProvider#getReference()
-	 */
 	@Override
 	public IDocument getReference(IProgressMonitor monitor) throws CoreException {
 		if(! fReferenceInitialized) return null;
@@ -168,9 +165,6 @@
 		}
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.diff.DocumentLineDiffer.IQuickDiffReferenceProvider#dispose()
-	 */
 	@Override
 	public void dispose() {
 		fReferenceInitialized = false;
@@ -186,17 +180,11 @@
 		CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber().removeListener(teamChangeListener);				
 	}
 
-	/*
-	 * @see org.eclipse.quickdiff.QuickDiffTestPlugin.IQuickDiffProviderImplementation#setId(java.lang.String)
-	 */
 	@Override
 	public void setId(String id) {
 		fId= id;
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.source.diff.DocumentLineDiffer.IQuickDiffReferenceProvider#getId()
-	 */
 	@Override
 	public String getId() {
 		return fId;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java
index a1e7149..29fa1b7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java
@@ -96,9 +96,6 @@
 		return children;
 	}
 
-	/**
-	 * @see IStreamContentAccessor#getContents()
-	 */
 	@Override
 	public InputStream getContents() throws CoreException {
 		IStorage storage = getStorage();
@@ -141,9 +138,6 @@
 		return name.length() == 0 ? UNKNOWN_TYPE : name;
 	}
 	
-	/**
-	 * @see IComparator#equals
-	 */
 	@Override
 	public int hashCode() {
 		return getName().hashCode();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java
index 98acc2b..f1cf28e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourcePropertiesPage.java
@@ -20,9 +20,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.*;
 import org.eclipse.team.core.TeamException;
 import org.eclipse.team.internal.ccvs.core.ICVSFolder;
 import org.eclipse.team.internal.ccvs.core.ICVSResource;
@@ -38,9 +36,7 @@
 	// The resource to show properties for
 	IResource resource;
 
-	/*
-	 * @see PreferencePage#createContents(Composite)
-	 */
+	@Override
 	protected Control createContents(Composite parent) {
 		Composite composite = new Composite(parent, SWT.NONE);
 		GridLayout layout = new GridLayout();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SimpleContentProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SimpleContentProvider.java
index 495c4f8..ee3f9c7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SimpleContentProvider.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/SimpleContentProvider.java
@@ -14,7 +14,8 @@
 package org.eclipse.team.internal.ccvs.ui;
 
  
-import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
 
 /**
  * A default content provider to prevent subclasses from
@@ -29,22 +30,16 @@
 		super();
 	}
 	
-	/*
-	 * @see SimpleContentProvider#dispose()
-	 */
+	@Override
 	public void dispose() {
 	}
 	
-	/*
-	 * @see SimpleContentProvider#getElements()
-	 */
+	@Override
 	public Object[] getElements(Object element) {
 		return new Object[0];
 	}
 	
-	/*
-	 * @see SimpleContentProvider#inputChanged()
-	 */
+	@Override
 	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 	}
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java
index fa018b6..b7696be 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java
@@ -17,7 +17,6 @@
 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.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -81,9 +80,6 @@
 		this.cachingCheckbox=cachingCheckbox;
 	}
 	
-	/**
-	 * @see Window#configureShell
-	 */
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
@@ -91,9 +87,7 @@
 		// set F1 help
         PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IHelpContextIds.USER_VALIDATION_DIALOG);	
 	}
-	/**
-	 * @see Window#create
-	 */
+
 	@Override
 	public void create() {
 		super.create();
@@ -110,9 +104,6 @@
 		}
 	}
 	
-	/**
-	 * @see Dialog#createDialogArea
-	 */
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite top = new Composite(parent, SWT.NONE);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java
index ad72049..03dc364 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java
@@ -56,9 +56,6 @@
 		}
 		USE_ALTERNATE_PROMPTER = false;
 	}
-	/**
-	 * @see IUserAuthenticator#authenticateUser
-	 */
 	@Override
 	public void promptForUserInfo(final ICVSRepositoryLocation location, final IUserInfo userinfo, final String message) throws CVSException {
 		if (!userinfo.isUsernameMutable() && USE_ALTERNATE_PROMPTER) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java
index fa0e37b..680c2ef 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkingSetSelectionArea.java
@@ -55,6 +55,7 @@
 	 * renamed in the working set selection dialog.
 	 */
 	private IPropertyChangeListener workingSetChangeListener = new IPropertyChangeListener() {
+		@Override
 		public void propertyChange(PropertyChangeEvent event) {
 			String property = event.getProperty();
 			Object newValue = event.getNewValue();
@@ -90,11 +91,7 @@
         this.settings = settings;
 	}
 	
-	/**
-	 * Overrides method in Dialog
-	 *
-	 * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(Composite)
-	 */
+	@Override
 	public void createArea(Composite parent) {
         Dialog.applyDialogFont(parent);
 		final Composite composite = createComposite(parent, 2, false);
@@ -109,6 +106,7 @@
 		noWorkingSetButton = createRadioButton(composite, noWorkingSetText, 2);
 		workingSetButton = createRadioButton(composite, workingSetText, 2);
 		workingSetButton.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				handleWorkingSetButtonSelection();
 			}
@@ -129,6 +127,7 @@
 
 		selectButton = createButton(composite, CVSUIMessages.WorkingSetSelectionArea_workingSetOther, GridData.HORIZONTAL_ALIGN_FILL); 
 		selectButton.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent event) {
 				handleWorkingSetSelection();
 			}
@@ -138,6 +137,7 @@
 		initializeWorkingSet();
 		
 		mruList.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				handleMruSelection();
 			}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
index 2e830dd..525167a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
@@ -580,9 +580,7 @@
 		} 
 		return okToContinue[0];
 	}
-	/**
-	 * @see org.eclipse.team.internal.ui.actions.TeamAction#handle(java.lang.Exception, java.lang.String, java.lang.String)
-	 */
+
 	@Override
 	protected void handle(Exception exception, String title, String message) {
 		CVSUIPlugin.openError(getShell(), title, message, exception, CVSUIPlugin.LOG_NONTEAM_EXCEPTIONS);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java
index 1effe0a..b406dc5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteResourcesAction.java
@@ -29,6 +29,7 @@
  */
 public class CompareRemoteResourcesAction extends CVSAction {
 
+	@Override
 	public void execute(IAction action) throws InvocationTargetException, InterruptedException {
 		ICVSRemoteResource[] editions = getSelectedRemoteResources();
 		if (editions == null || editions.length != 2) {
@@ -52,9 +53,7 @@
 				&& editions[0].getRepositoryRelativePath().equals(editions[1].getRepositoryRelativePath());
 	}
 	
-	/*
-	 * @see TeamAction#isEnabled()
-	 */
+	@Override
 	public boolean isEnabled() {
 		ICVSRemoteResource[] resources = getSelectedRemoteResources();
 		if (resources.length != 2) return false;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java
index 0a160d5..ba93042 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareRemoteWithTagAction.java
@@ -27,9 +27,6 @@
  */
 public class CompareRemoteWithTagAction extends CVSAction {
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
 		
@@ -55,9 +52,6 @@
 		}
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
-	 */
 	@Override
 	public boolean isEnabled() {
 		ICVSRemoteResource[] resources = getSelectedRemoteResources();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java
index bbe2c9b..2d821f7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ConfigureTagsFromRepoViewOnFolder.java
@@ -60,9 +60,6 @@
 		return new ICVSRemoteFolder[0];
 	}
 
-	/*
-	 * @see CVSAction@execute(IAction)
-	 */
 	@Override
 	public void execute(IAction action) throws InvocationTargetException, InterruptedException {
 		run((IRunnableWithProgress) monitor -> {
@@ -79,16 +76,11 @@
 		}, false /* cancelable */, PROGRESS_BUSYCURSOR);
 	}
 
-	/*
-	 * @see TeamAction#isEnabled()
-	 */
 	@Override
 	public boolean isEnabled() {
 		return true;
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle()
-	 */
+
 	@Override
 	protected String getErrorTitle() {
 		return CVSUIMessages.ConfigureTagsFromRepoViewConfigure_Tag_Error_1; 
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditAction.java
index f697745..7ab13e6 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditAction.java
@@ -23,9 +23,6 @@
 
 public class EditAction extends WorkspaceAction {
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
 		// Get the editors
@@ -47,16 +44,11 @@
 		});
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources()
-	 */
 	@Override
 	protected boolean isEnabledForAddedResources() {
 		return false;
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource)
-	 */
+
 	@Override
 	protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException {
 		if (cvsResource.isFolder()) return false;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditorsAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditorsAction.java
index 68fafc1..02db4f1 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditorsAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/EditorsAction.java
@@ -49,9 +49,8 @@
 		f_provider = provider;
 		f_resources = resources;
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction.IProviderAction#execute(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+
+	@Override
 	public IStatus execute(CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws CVSException {
 		f_editorsInfo = provider.editors(resources, monitor);
 		return Team.OK_STATUS;
@@ -63,6 +62,7 @@
 			// Open the dialog using a sync exec (there are no guarentees that we
 			// were called from the UI thread
 			CVSUIPlugin.openDialog(shell, new CVSUIPlugin.IOpenableInShell() {
+				@Override
 				public void open(Shell shell) {
 					view.open();
 				}
@@ -77,6 +77,7 @@
 	 * 
 	 * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
 		if (f_provider == null || f_resources == null) {
 			throw new InvocationTargetException(new RuntimeException(NLS.bind(CVSUIMessages.EditorsAction_classNotInitialized, new String[] { this.getClass().getName() }))); 
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java
index 6adb094..c05eec7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java
@@ -94,25 +94,17 @@
 			// if (action != null) action.setEnabled(isEnabled());
 		}, false /* cancelable */, PROGRESS_BUSYCURSOR);
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle()
-	 */
+
 	@Override
 	protected String getErrorTitle() {
 		return CVSUIMessages.IgnoreAction_ignore; 
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForManagedResources()
-	 */
 	@Override
 	protected boolean isEnabledForManagedResources() {
 		return false;
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForUnmanagedResources()
-	 */
 	@Override
 	protected boolean isEnabledForUnmanagedResources() {
 		return true;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MoveRemoteTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MoveRemoteTagAction.java
index 7975b0b..6e598a1 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MoveRemoteTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MoveRemoteTagAction.java
@@ -14,7 +14,8 @@
 package org.eclipse.team.internal.ccvs.ui.actions;
 
 import org.eclipse.jface.window.Window;
-import org.eclipse.team.internal.ccvs.core.*;
+import org.eclipse.team.internal.ccvs.core.CVSTag;
+import org.eclipse.team.internal.ccvs.core.ICVSResource;
 import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
 import org.eclipse.team.internal.ccvs.ui.IHelpContextIds;
 import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation;
@@ -22,9 +23,7 @@
 
 public class MoveRemoteTagAction extends TagInRepositoryAction {
 
-	/**
-	 * @see TagRemoteAction#promptForTag(ICVSFolder[])
-	 */
+	@Override
 	protected ITagOperation configureOperation() {
 		// Allow the user to select a tag
 		ITagOperation operation = createTagOperation();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/NewRepositoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/NewRepositoryAction.java
index 75c078d..9ce9592 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/NewRepositoryAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/NewRepositoryAction.java
@@ -19,32 +19,25 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.team.internal.ccvs.ui.wizards.NewLocationWizard;
 import org.eclipse.ui.*;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 
 public class NewRepositoryAction implements IWorkbenchWindowActionDelegate, IViewActionDelegate {
 	Shell shell;
 	
-	/**
-	 * @see IWorkbenchWindowActionDelegate#dispose()
-	 */
+	@Override
 	public void dispose() {
 	}
 
-	/**
-	 * @see IWorkbenchWindowActionDelegate#init(IWorkbenchWindow)
-	 */
+	@Override
 	public void init(IWorkbenchWindow window) {
 		this.shell = window.getShell();
 	}
 	
+	@Override
 	public void init(IViewPart view) {
 		shell = view.getSite().getShell();
 	}
 
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
+	@Override
 	public void run(IAction action) {
 		NewLocationWizard wizard = new NewLocationWizard();
 		wizard.setSwitchPerspectives(false);
@@ -52,9 +45,7 @@
 		dialog.open();
 	}
 
-	/**
-	 * @see IActionDelegate#selectionChanged(IAction, ISelection)
-	 */
+	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 	}
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenLogEntryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenLogEntryAction.java
index c46467d..8845dc4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenLogEntryAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenLogEntryAction.java
@@ -60,9 +60,7 @@
 		}
 		return new ILogEntry[0];
 	}
-	/*
-	 * @see CVSAction#execute(IAction)
-	 */
+
 	@Override
 	public void execute(IAction action) throws InterruptedException, InvocationTargetException {
 		run((IRunnableWithProgress) monitor -> {
@@ -78,9 +76,7 @@
 			}
 		}, false, PROGRESS_BUSYCURSOR); 
 	}
-	/*
-	 * @see TeamAction#isEnabled()
-	 */
+
 	@Override
 	public boolean isEnabled() {
 		ILogEntry[] entries = getSelectedLogEntries();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenRemoteFileAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenRemoteFileAction.java
index 1b42777..76070f5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenRemoteFileAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OpenRemoteFileAction.java
@@ -62,9 +62,6 @@
 		}
 		return new ICVSRemoteFile[0];
 	}
-	/*
-	 * @see CVSAction#execute(IAction)
-	 */
 	@Override
 	public void execute(IAction action) throws InterruptedException, InvocationTargetException {
 		run((IRunnableWithProgress) monitor -> {
@@ -75,9 +72,7 @@
 			}
 		}, false, PROGRESS_BUSYCURSOR); 
 	}
-	/*
-	 * @see TeamAction#isEnabled()
-	 */
+
 	@Override
 	public boolean isEnabled() {
 		ICVSRemoteFile[] resources = getSelectedRemoteFiles();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RestoreFromRepositoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RestoreFromRepositoryAction.java
index 994ca7e..0186e76 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RestoreFromRepositoryAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/RestoreFromRepositoryAction.java
@@ -146,9 +146,6 @@
 		}
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
 		IContainer resource = (IContainer)getSelectedResources()[0];
@@ -164,9 +161,6 @@
 		dialog.open();
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
-	 */
 	@Override
 	public boolean isEnabled() {
 		IResource[] resources = getSelectedResources();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SetKeywordSubstitutionAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SetKeywordSubstitutionAction.java
index 70ea148..2ec2dbf 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SetKeywordSubstitutionAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SetKeywordSubstitutionAction.java
@@ -22,13 +22,12 @@
  */
 public class SetKeywordSubstitutionAction extends WorkspaceTraversalAction {
 
-	/*
-	 * @see IActionDelegate#run(IAction)
-	 */
+	@Override
 	public void execute(IAction action) {
 	    ModeWizard.run(getShell(), getSelectedResources());
 	}
 	
+	@Override
 	public String getId() {
 		return ICVSUIConstants.CMD_SETFILETYPE;
 	}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowHistoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowHistoryAction.java
index 3e68bd2..a365879 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowHistoryAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowHistoryAction.java
@@ -58,9 +58,7 @@
 		}
 		return new ICVSRemoteFile[0];
 	}
-	/*
-	 * @see CVSAction#executeIAction)
-	 */
+
 	@Override
 	public void execute(IAction action) throws InterruptedException, InvocationTargetException {
 		run((IRunnableWithProgress) monitor -> {
@@ -68,17 +66,13 @@
 			TeamUI.showHistoryFor(getTargetPage(), files[0], null);
 		}, false /* cancelable */, PROGRESS_BUSYCURSOR);
 	}
-	/*
-	 * @see TeamAction#isEnabled()
-	 */
+
 	@Override
 	public boolean isEnabled() {
 		ICVSRemoteFile[] resources = getSelectedRemoteFiles();
 		return resources.length == 1;
 	}
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle()
-	 */
+
 	@Override
 	protected String getErrorTitle() {
 		return CVSUIMessages.ShowHistoryAction_showHistory; 
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java
index a1d3bcb..7987a39 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java
@@ -26,9 +26,7 @@
 import org.eclipse.team.ui.TeamUI;
 
 public class ShowResourceInHistoryAction extends WorkspaceAction {
-	/*
-	 * @see IActionDelegate#run(IAction)
-	 */
+
 	@Override
 	public void execute(IAction action) throws InterruptedException, InvocationTargetException {
 		run((IRunnableWithProgress) monitor -> {
@@ -39,25 +37,16 @@
 		}, false /* cancelable */, PROGRESS_BUSYCURSOR);
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle()
-	 */
 	@Override
 	protected String getErrorTitle() {
 		return CVSUIMessages.ShowHistoryAction_showHistory; 
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForMultipleResources()
-	 */
 	@Override
 	protected boolean isEnabledForMultipleResources() {
 		return false;
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources()
-	 */
 	@Override
 	protected boolean isEnabledForAddedResources() {
 		return true;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java
index 4ac4955..22bf5c4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagAction.java
@@ -38,9 +38,6 @@
 	// remember if the execute action was cancelled
 	private boolean wasCancelled = false;
 
-	/**
-	 * @see CVSAction#execute(IAction)
-	 */
 	@Override
 	public void execute(IAction action) throws InvocationTargetException, InterruptedException {
 		setWasCancelled(false);
@@ -118,9 +115,6 @@
 		return CVSUIMessages.TagAction_tagWarningTitle; 
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources()
-	 */
 	@Override
 	protected boolean isEnabledForAddedResources() {
 		return false;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java
index 7b8d275..099bfac 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagInRepositoryAction.java
@@ -17,13 +17,10 @@
 import org.eclipse.team.internal.ccvs.core.ICVSResource;
 import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation;
 import org.eclipse.team.internal.ccvs.ui.operations.TagInRepositoryOperation;
-import org.eclipse.team.internal.ui.actions.TeamAction;
 
 public class TagInRepositoryAction extends TagAction {
 
-	/**
-	 * @see TeamAction#isEnabled()
-	 */
+	@Override
 	public boolean isEnabled() {
 		ICVSResource[] resources = getSelectedCVSResources();
 		if (resources.length == 0) return false;
@@ -33,20 +30,17 @@
 		return true;
 	}
 	
-	/**
-	 * @see CVSAction#needsToSaveDirtyEditors()
-	 */
+	@Override
 	protected boolean needsToSaveDirtyEditors() {
 		return false;
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#requiresLocalSyncInfo()
-	 */
+	@Override
 	protected boolean requiresLocalSyncInfo() {
 		return false;
 	}
 
+	@Override
 	protected ITagOperation createTagOperation() {
 		return new TagInRepositoryOperation(getTargetPart(), getSelectedRemoteResources());
 	}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UnmanageAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UnmanageAction.java
index ee384f6..5798096 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UnmanageAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UnmanageAction.java
@@ -113,9 +113,6 @@
 	
 	private boolean deleteContent = false;
 	
-	/*
-	 * @see IActionDelegate#run(IAction)
-	 */
 	@Override
 	public void execute(IAction action) throws InterruptedException, InvocationTargetException {
 		if(confirmDeleteProjects()) {
@@ -133,17 +130,11 @@
 		return result[0] == 0;  // YES
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle()
-	 */
 	@Override
 	protected String getErrorTitle() {
 		return CVSUIMessages.Unmanage_unmanagingError;
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource)
-	 */
 	@Override
 	protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException {
 		IResource resource = cvsResource.getIResource();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateAction.java
index c7a10ee..5634092 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateAction.java
@@ -27,13 +27,12 @@
  * when a functional synchronize view has been implemented.
  */
 public class UpdateAction extends UpdateSilentAction {
-	/*
-	 * @see IActionDelegate#run(IAction)
-	 */
+	@Override
 	public void execute(IAction action) throws InterruptedException, InvocationTargetException {
 		UpdateWizard.run(getTargetPart(), getCVSResourceMappings());
 	}
 	
+	@Override
 	public String getId() {
 		return ICVSUIConstants.CMD_UPDATESWITCH;
 	}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java
index 0e30db9..7da395b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceAction.java
@@ -49,9 +49,6 @@
 		public IStatus execute(CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws CVSException;
 	}
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#beginExecution(IAction)
-	 */
 	@Override
 	protected boolean beginExecution(IAction action) throws TeamException {
 		if (super.beginExecution(action)) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFilePropertySource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFilePropertySource.java
index a63d91f..342d709 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFilePropertySource.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFilePropertySource.java
@@ -83,9 +83,6 @@
 		return propertyDescriptors;
 	}
 
-	/*
-	 * @see IPropertySource#getPropertyValue(Object)
-	 */
 	@Override
 	public Object getPropertyValue(Object id) {
 		if (!initialized) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFolderPropertySource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFolderPropertySource.java
index 1b8d783..ec663e4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFolderPropertySource.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRemoteFolderPropertySource.java
@@ -18,9 +18,7 @@
 import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder;
 import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
 import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
+import org.eclipse.ui.views.properties.*;
 
 public class CVSRemoteFolderPropertySource implements IPropertySource {
 	ICVSRemoteFolder folder;
@@ -53,6 +51,7 @@
 	/**
 	 * Do nothing because properties are read only.
 	 */
+	@Override
 	public Object getEditableValue() {
 		return this;
 	}
@@ -60,13 +59,12 @@
 	/**
 	 * Return the Property Descriptors for the receiver.
 	 */
+	@Override
 	public IPropertyDescriptor[] getPropertyDescriptors() {
 		return propertyDescriptors;
 	}
 
-	/*
-	 * @see IPropertySource#getPropertyValue(Object)
-	 */
+	@Override
 	public Object getPropertyValue(Object id) {
 		if (id.equals(ICVSUIConstants.PROP_NAME)) {
 			return folder.getName();
@@ -85,6 +83,7 @@
 	 * Answer true if the value of the specified property 
 	 * for this object has been changed from the default.
 	 */
+	@Override
 	public boolean isPropertySet(Object property) {
 		return false;
 	}
@@ -94,11 +93,13 @@
 	 * 
 	 * @param   property    The property to reset.
 	 */
+	@Override
 	public void resetPropertyValue(Object property) {
 	}
 	/**
 	 * Do nothing because properties are read only.
 	 */
+	@Override
 	public void setPropertyValue(Object name, Object value) {
 	}
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryLocationPropertySource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryLocationPropertySource.java
index bba0ca3..32b00c8 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryLocationPropertySource.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/CVSRepositoryLocationPropertySource.java
@@ -17,9 +17,7 @@
 import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation;
 import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
 import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
+import org.eclipse.ui.views.properties.*;
 
 public class CVSRepositoryLocationPropertySource implements IPropertySource {
 	ICVSRepositoryLocation location;
@@ -67,6 +65,7 @@
 	/**
 	 * Do nothing because properties are read only.
 	 */
+	@Override
 	public Object getEditableValue() {
 		return this;
 	}
@@ -74,13 +73,12 @@
 	/**
 	 * Return the Property Descriptors for the receiver.
 	 */
+	@Override
 	public IPropertyDescriptor[] getPropertyDescriptors() {
 		return propertyDescriptors;
 	}
 
-	/*
-	 * @see IPropertySource#getPropertyValue(Object)
-	 */
+	@Override
 	public Object getPropertyValue(Object id) {
 		if (id.equals(ICVSUIConstants.PROP_HOST)) {
 			return location.getHost();
@@ -108,6 +106,7 @@
 	 * Answer true if the value of the specified property 
 	 * for this object has been changed from the default.
 	 */
+	@Override
 	public boolean isPropertySet(Object property) {
 		return false;
 	}
@@ -117,11 +116,13 @@
 	 * 
 	 * @param   property    The property to reset.
 	 */
+	@Override
 	public void resetPropertyValue(Object property) {
 	}
 	/**
 	 * Do nothing because properties are read only.
 	 */
+	@Override
 	public void setPropertyValue(Object name, Object value) {
 	}
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteProjectsElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteProjectsElement.java
index f188851..45ab846 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteProjectsElement.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteProjectsElement.java
@@ -46,9 +46,8 @@
 	public void setTag(CVSTag tag) {
 		this.tag = tag;
 	}
-	/**
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
+
+	@Override
 	public boolean equals(Object o) {
 		if (!(o instanceof RemoteProjectsElement)) return false;
 		RemoteProjectsElement element = (RemoteProjectsElement)o;
@@ -58,24 +57,18 @@
 		return super.equals(o);
 	}
 
-	/**
-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
-	 */
+	@Override
 	public Object getParent(Object o) {
 		return null;
 	}
 
-	/**
-	 * @see java.lang.Object#hashCode()
-	 */
+	@Override
 	public int hashCode() {
 		if (root == null) return tag.hashCode();
 		return super.hashCode();
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.model.CVSModelElement#internalGetChildren(java.lang.Object, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public Object[] fetchChildren(Object o, IProgressMonitor monitor) throws TeamException {
 		if (root == null) return new Object[0];
 		return super.fetchChildren(o, monitor);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java
index 9fac87a..fa8e053 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/AddToBranchAction.java
@@ -40,9 +40,6 @@
 		return status.getMessage();
 	};
 	
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
-	 */
 	@Override
 	protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
 		run((IRunnableWithProgress) monitor -> {
@@ -68,9 +65,6 @@
 		}, false, PROGRESS_BUSYCURSOR); 
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
-	 */
 	@Override
 	public boolean isEnabled() {
 		return getSelectedRootFolder() != null;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java
index f8d68bf..ff5318b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java
@@ -74,9 +74,6 @@
 	private Button useCustomLabel;
 	private Text labelText;
 			
-	/*
-	 * @see PreferencesPage#createContents
-	 */
 	@Override
 	protected Control createContents(Composite parent) {
 		initialize();
@@ -434,9 +431,7 @@
 	private void performNonConnectionInfoChanges() {
 		recordNewLabel((CVSRepositoryLocation)location);
 	}
-	/*
-	 * @see PreferencesPage#performOk
-	 */
+
 	@Override
 	public boolean performOk() {
 		if (performConnectionInfoChanges()) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentHistoryContentHandler.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentHistoryContentHandler.java
index 4b041d8..2c90aef 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentHistoryContentHandler.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentHistoryContentHandler.java
@@ -17,9 +17,9 @@
 
 import java.util.Vector;
 
+import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.Attributes;
 
 class CommentHistoryContentHandler extends DefaultHandler {
 
@@ -28,17 +28,13 @@
 	public CommentHistoryContentHandler() {
 	}
 
-	/**
-	 * @see ContentHandler#characters(char[], int, int)
-	 */
+	@Override
 	public void characters(char[] chars, int startIndex, int length) throws SAXException {
 		if (buffer == null) return;
 		buffer.append(chars, startIndex, length);
 	}
 
-	/**
-	 * @see ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
-	 */
+	@Override
 	public void startElement(
 			String namespaceURI,
 			String localName,
@@ -57,9 +53,7 @@
 		}
 	}
 	
-	/**
-	 * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
-	 */
+	@Override
 	public void endElement(String namespaceURI, String localName, String qName) {
 		String elementName = getElementName(namespaceURI, localName, qName);
 		if (elementName.equals(RepositoryManager.ELEMENT_COMMIT_COMMENT)) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentTemplatesContentHandler.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentTemplatesContentHandler.java
index 8189194..8a4b173 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentTemplatesContentHandler.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CommentTemplatesContentHandler.java
@@ -26,17 +26,13 @@
 	public CommentTemplatesContentHandler() {
 	}
 
-	/**
-	 * @see ContentHandler#characters(char[], int, int)
-	 */
+	@Override
 	public void characters(char[] chars, int startIndex, int length) {
 		if (buffer == null) return;
 		buffer.append(chars, startIndex, length);
 	}
 
-	/**
-	 * @see ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
-	 */
+	@Override
 	public void startElement(
 			String namespaceURI,
 			String localName,
@@ -54,9 +50,7 @@
 		}
 	}
 	
-	/**
-	 * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
-	 */
+	@Override
 	public void endElement(String namespaceURI, String localName, String qName) {
 		String elementName = getElementName(localName, qName);
 		if (elementName.equals(RepositoryManager.ELEMENT_COMMIT_COMMENT)) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java
index 21b59b8..57015f8 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectSelectionPage.java
@@ -93,9 +93,6 @@
 		this.rootFolders = rootFolders;
 	}
 
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	public void createControl(Composite parent) {
 		
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectWizard.java
index 50c3d52..5677462 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshRemoteProjectWizard.java
@@ -84,9 +84,6 @@
 		setWindowTitle(CVSUIMessages.RefreshRemoteProjectWizard_title); 
 	}
 	
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#addPages()
-	 */
 	@Override
 	public void addPages() {
 		setNeedsProgressMonitor(true);
@@ -100,9 +97,6 @@
 		addPage(projectSelectionPage);
 	}
 	
-	/**
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
 	@Override
 	public boolean performFinish() {
 		final ICVSRemoteResource[] selectedFolders = projectSelectionPage.getSelectedRemoteProject();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshTagsAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshTagsAction.java
index dcf6ea9..c275235 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshTagsAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RefreshTagsAction.java
@@ -21,17 +21,13 @@
  */
 public class RefreshTagsAction extends CVSRepoViewAction {
 
-	/**
-	 * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
-	 */
+	@Override
 	protected void execute(IAction action) {
 		ICVSRepositoryLocation[] locations = getSelectedRepositoryLocations();
 		RefreshRemoteProjectWizard.execute(getShell(), locations[0]);
 	}
 
-	/**
-	 * @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
-	 */
+	@Override
 	public boolean isEnabled() {
 		ICVSRepositoryLocation[] locations = getSelectedRepositoryLocations();
 		if (locations.length != 1) return false;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteViewPart.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteViewPart.java
index ee3f657..204e493 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteViewPart.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoteViewPart.java
@@ -31,7 +31,8 @@
 import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.actions.WorkingSetFilterActionGroup;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.part.*;
+import org.eclipse.ui.part.DrillDownAdapter;
+import org.eclipse.ui.part.ViewPart;
 
 /**
  * This class acts as a superclass to all remote CVS tree views.
@@ -76,9 +77,6 @@
 		setWorkingSet(set, false);
 	}
 	
-	/**
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	public void createPartControl(Composite parent) {
 		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
@@ -101,9 +99,6 @@
             PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), helpID);
 	}
 	
-	/**
-	 * @see WorkbenchPart#setFocus
-	 */
 	@Override
 	public void setFocus() {
 		viewer.getControl().setFocus();
@@ -332,16 +327,10 @@
 		return viewer;
 	}
 
-	/**
-	 * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-	 */
 	@Override
 	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
 	}
 
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
 	@Override
 	public void dispose() {
 		getSite().getWorkbenchWindow().getSelectionService().removePostSelectionListener(this);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesFilterAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesFilterAction.java
index 1a6c3c8..7072f00 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesFilterAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesFilterAction.java
@@ -40,9 +40,7 @@
 		this.filter = filter;
 	}
 	
-	/**
-	 * @see IActionDelegate#run(IAction)
-	 */
+	@Override
 	public void run() {
 		RepositoriesFilterDialog historyDialog = new RepositoriesFilterDialog(viewer.getControl().getShell());
 		if (filter != null) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java
index 0ea3d00..063302a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesViewContentHandler.java
@@ -13,17 +13,15 @@
  *******************************************************************************/
 package org.eclipse.team.internal.ccvs.ui.repo;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Stack;
+import java.util.*;
 
 import org.eclipse.core.runtime.Path;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.team.internal.ccvs.core.*;
 import org.eclipse.team.internal.ccvs.core.util.KnownRepositories;
 import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
-import org.xml.sax.*;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
 public class RepositoriesViewContentHandler extends DefaultHandler {
@@ -68,16 +66,12 @@
 		this.manager = manager;
 	}
 	
-	/**
-	 * @see ContentHandler#characters(char[], int, int)
-	 */
+	@Override
 	public void characters(char[] chars, int startIndex, int length) throws SAXException {
 		buffer.append(chars, startIndex, length);
 	}
 
-	/**
-	 * @see ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
-	 */
+	@Override
 	public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
 		
 		String elementName = getElementName(namespaceURI, localName, qName);
@@ -119,9 +113,7 @@
 		tagStack.pop();
 	}
 		
-	/**
-	 * @see ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
-	 */
+	@Override
 	public void startElement(
 			String namespaceURI,
 			String localName,
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java
index 0636942..3ba1123 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java
@@ -56,9 +56,6 @@
 		this.versionName = versionName;
 	}	
 
-	/**
-	 * @see DetailsDialog#createMainDialogArea(Composite)
-	 */
 	@Override
 	protected void createMainDialogArea(Composite composite) {
 		
@@ -130,9 +127,6 @@
 		}
 	}
 	
-	/**
-	 * @see DetailsDialog#createDropDownDialogArea(Composite)
-	 */
 	@Override
 	protected Composite createDropDownDialogArea(Composite parent) {
 		
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/CVSFileElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/CVSFileElement.java
index 814c256..b6a5c8f 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/CVSFileElement.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/CVSFileElement.java
@@ -34,18 +34,21 @@
 	/**
 	 * Initial implementation: return null;
 	 */
+	@Override
 	public Object[] fetchChildren(Object o, IProgressMonitor monitor) {
 		return new Object[0];
 	}
 	/**
 	 * Initial implementation: return null.
 	 */
+	@Override
 	public ImageDescriptor getImageDescriptor(Object object) {
 		return PlatformUI.getWorkbench().getEditorRegistry().getImageDescriptor(file.getName());
 	}
 	/**
 	 * Initial implementation: return the file's name and version
 	 */
+	@Override
 	public String getLabel(Object o) {
 		try {
 			ResourceSyncInfo info = file.getSyncInfo();
@@ -59,9 +62,8 @@
 			return null;
 		}
 	}
-	/**
-	 * @see IWorkbenchAdapter#getParent(Object)
-	 */
+
+	@Override
 	public Object getParent(Object o) {
 		return null;
 	}
@@ -69,9 +71,8 @@
 	public ICVSFile getCVSFile() {
 		return file;
 	}
-	/**
-	 * @see CVSResourceElement#getCVSResource()
-	 */
+
+	@Override
 	public ICVSResource getCVSResource() {
 		return file;
 	}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/CVSFolderElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/CVSFolderElement.java
index 71e94dd..26e7664 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/CVSFolderElement.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/CVSFolderElement.java
@@ -35,6 +35,7 @@
 	/**
 	 * Returns CVSResourceElement instances
 	 */
+	@Override
 	public Object[] fetchChildren(Object o, IProgressMonitor monitor) throws TeamException {
 		ICVSResource[] children = folder.fetchChildren(monitor);
 		CVSResourceElement[] elements = new CVSResourceElement[children.length];
@@ -60,24 +61,22 @@
 	 * Overridden to append the version name to remote folders which
 	 * have version tags and are top-level folders.
 	 */
+	@Override
 	public String getLabel(Object o) {
 		return folder.getName();
 	}
 
+	@Override
 	public ImageDescriptor getImageDescriptor(Object object) {
 		return PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_OBJ_FOLDER);
 	}	
 	
-	/**
-	 * @see IWorkbenchAdapter#getParent(Object)
-	 */
+	@Override
 	public Object getParent(Object o) {
 		return new CVSFolderElement(folder.getParent(), includeUnmanaged);
 	}
 	
-	/**
-	 * @see CVSResourceElement#getCVSResource()
-	 */
+	@Override
 	public ICVSResource getCVSResource() {
 		return folder ;
 	}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagAsVersionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagAsVersionDialog.java
index 2bda097..3b46a45 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagAsVersionDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagAsVersionDialog.java
@@ -61,9 +61,6 @@
 		this.operation = operation;
 	}
 	
-	/**
-	 * @see DetailsDialog#createMainDialogArea(Composite)
-	 */
 	@Override
 	protected void createMainDialogArea(Composite parent) {
 		
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java
index f13bdc6..a3de224 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsProjectSelectionPage.java
@@ -82,9 +82,6 @@
 		return remoteFolders[0].getFolderSyncInfo().getRoot();
 	}
 	
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	public void createControl(Composite parent) {
 		Composite composite= createComposite(parent, 2, false);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java
index 7083fcd..0494a1d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java
@@ -48,9 +48,7 @@
 
 	class NewProjectListener implements IResourceChangeListener {
 		private IProject newProject = null;
-		/**
-		 * @see IResourceChangeListener#resourceChanged(IResourceChangeEvent)
-		 */
+
 		@Override
 		public void resourceChanged(IResourceChangeEvent event) {
 			IResourceDelta root = event.getDelta();
@@ -92,9 +90,6 @@
 		this.allowProjectConfiguration = allowProjectConfiguration;
 	}
 	
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#addPages()
-	 */
 	@Override
 	public void addPages() {
 		setNeedsProgressMonitor(true);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java
index 129b76e..013ee87 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ConfigurationWizardAutoconnectPage.java
@@ -44,9 +44,6 @@
 		super(pageName, title, titleImage);
 	}
 
-	/*
-	 * @see IDialogPage#createControl(Composite)
-	 */
 	@Override
 	public void createControl(Composite parent) {
 		Composite composite = createComposite(parent, 2, false);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
index bd056e8..b441099 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
@@ -1086,9 +1086,6 @@
 			this.store = store;
 		}
 
-		/*
-		 * @see IDialogPage#createControl(Composite)
-		 */
 		@Override
 		public void createControl(Composite parent) {
 			Composite composite= new Composite(parent, SWT.NULL);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java
index d16e996..f0afb98 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java
@@ -81,9 +81,6 @@
 		return new ConfigurationWizardMainPage("repositoryPage1", CVSUIMessages.NewLocationWizard_heading, CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_NEW_LOCATION)); //$NON-NLS-1$ 
 	}
 	
-	/*
-	 * @see IWizard#performFinish
-	 */
 	@Override
 	public boolean performFinish() {
 		final ICVSRepositoryLocation[] location = new ICVSRepositoryLocation[] { null };
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java
index a4d172f..1e00d3b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryFileSelectionPage.java
@@ -121,9 +121,6 @@
 		super(pageName, title, titleImage, description);
 	}
 
-	/**
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
 	@Override
 	public void createControl(Composite parent) {
 		Composite composite= createComposite(parent, 1, false);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryWizard.java
index 3406030..964a9a4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/RestoreFromRepositoryWizard.java
@@ -18,8 +18,6 @@
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.team.internal.ccvs.core.ICVSFile;
 import org.eclipse.team.internal.ccvs.ui.*;
-import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
-import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
 
 /**
  * This wizard allows the user to show deleted resources in the history view
@@ -39,16 +37,12 @@
 		setWindowTitle(CVSUIMessages.RestoreFromRepositoryWizard_fileSelectionPageTitle); 
 	}
 
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#performFinish()
-	 */
+	@Override
 	public boolean performFinish() {
 		return fileSelectionPage.restoreSelectedFiles();
 	}
 	
-	/**
-	 * @see org.eclipse.jface.wizard.IWizard#addPages()
-	 */
+	@Override
 	public void addPages() {
 		setNeedsProgressMonitor(true);
 		ImageDescriptor substImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_CHECKOUT);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
index 91ea803..d455655 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
@@ -227,9 +227,6 @@
 		return null;
 	}
 
-	/*
-	 * @see IWizard#performFinish
-	 */
 	@Override
 	public boolean performFinish() {
 		final boolean[] result = new boolean[] { true };
@@ -371,9 +368,6 @@
 		return location;
 	}
 	
-	/*
-	 * @see IConfigurationWizard#init(IWorkbench, IProject)
-	 */
 	@Override
 	public void init(IWorkbench workbench, IProject project) {
 		this.project = project;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java
index 3820632..8bc3526 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/UpdateWizard.java
@@ -48,6 +48,7 @@
         open(part.getSite().getShell(), wizard);
     }
     
+	@Override
 	public void addPages() {
 		ImageDescriptor substImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_CHECKOUT);
         tagSelectionPage = new TagSelectionWizardPage("tagPage", CVSUIMessages.UpdateWizard_0, substImage, CVSUIMessages.UpdateWizard_1, TagSource.create(mappers), TagSourceWorkbenchAdapter.INCLUDE_ALL_TAGS); //$NON-NLS-1$  
@@ -83,9 +84,7 @@
         return null;
     }
 
-	/*
-	 * @see IWizard#performFinish()
-	 */
+	@Override
 	public boolean performFinish() {
 		try {
 			new UpdateOperation(part, mappers, Command.NO_LOCAL_OPTIONS, tagSelectionPage.getSelectedTag()).run();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java
index 38b8f95..8ac7d62 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/PropertyChangeHandler.java
@@ -34,17 +34,11 @@
 		private IPropertyChangeListener fListener;
 		private PropertyChangeEvent fEvent;
 
-		/**
-		 * @see org.eclipse.core.runtime.ISafeRunnable#handleException(java.lang.Throwable)
-		 */
 		@Override
 		public void handleException(Throwable exception) {
 			TeamUIPlugin.log(IStatus.ERROR, TeamUIMessages.AbstractSynchronizeParticipant_5, exception);
 		}
 
-		/**
-		 * @see org.eclipse.core.runtime.ISafeRunnable#run()
-		 */
 		@Override
 		public void run() throws Exception {
 			fListener.propertyChange(fEvent);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
index 853b396..c5f6169 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java
@@ -29,7 +29,6 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.jface.dialogs.MessageDialogWithToggle;
@@ -230,9 +229,6 @@
 		log(new Status(severity, ID, 0, message, e));
 	}
 
-	/**
-	 * @see Plugin#start(BundleContext)
-	 */
 	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java
index 0ed1e78..3dd6596 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/PreferencePageContainerDialog.java
@@ -108,9 +108,6 @@
 		this.pages = pages;
 	}
 
-	/**
-	 * @see Dialog#okPressed()
-	 */
 	@Override
 	protected void okPressed() {
 		for (int i = 0; i < pages.length; i++) {
@@ -134,9 +131,6 @@
 		}
 	}
 
-	/**
-	 * @see Dialog#createDialogArea(Composite)
-	 */
 	@Override
 	protected Control createDialogArea(Composite parent) {
 		Composite composite = (Composite)super.createDialogArea(parent);
@@ -375,9 +369,6 @@
 		}
 	}
 
-	/**
-	 * @see IPreferencePageContainer#updateMessage()
-	 */
 	@Override
 	public void updateMessage() {
 	    if (currentPage != null) {
@@ -407,17 +398,11 @@
 	    }
 	}
 
-	/**
-	 * @see IPreferencePageContainer#getPreferenceStore()
-	 */
 	@Override
 	public IPreferenceStore getPreferenceStore() {
 		return null;
 	}
 
-	/**
-	 * @see IPreferencePageContainer#updateButtons()
-	 */
 	@Override
 	public void updateButtons() {
 		if (fOkButton != null) {
@@ -433,17 +418,11 @@
 		}
 	}
 
-	/**
-	 * @see IPreferencePageContainer#updateTitle()
-	 */
 	@Override
 	public void updateTitle() {
 		updateMessage();
 	}
 
-	/**
-	 * @see Dialog#createButtonsForButtonBar(Composite)
-	 */
 	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
 		fOkButton= createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java
index 95119f0..25d37b8 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java
@@ -317,9 +317,6 @@
 		return input.hashCode();
 	}
 
-	/*
-	 * @see org.eclipse.ui.Saveable#equals(java.lang.Object)
-	 */
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java
index e896103..e60e615 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java
@@ -96,9 +96,6 @@
 
 	}
 
-	/*
-	 * @see IDialogPage#createControl(Composite)
-	 */
 	@Override
 	public void createControl(Composite parent) {
 		Composite composite = createComposite(parent, 1);
diff --git a/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF b/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
index 98e0873..193f32e 100644
--- a/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.compare.examples.xml; singleton:=true
-Bundle-Version: 3.4.500.qualifier
+Bundle-Version: 3.4.600.qualifier
 Bundle-Activator: org.eclipse.compare.examples.xml.XMLPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/examples/org.eclipse.compare.examples.xml/pom.xml b/examples/org.eclipse.compare.examples.xml/pom.xml
index 7eba00b..8c1e678 100644
--- a/examples/org.eclipse.compare.examples.xml/pom.xml
+++ b/examples/org.eclipse.compare.examples.xml/pom.xml
@@ -19,6 +19,6 @@
   </parent>
   <groupId>org.eclipse.compare</groupId>
   <artifactId>org.eclipse.compare.examples.xml</artifactId>
-  <version>3.4.500-SNAPSHOT</version>
+  <version>3.4.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/AbstractMatching.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/AbstractMatching.java
index 0962fe2..30fdfb5 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/AbstractMatching.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/AbstractMatching.java
@@ -106,17 +106,11 @@
 			fXML_elements= xml_elements;
 		}
 	
-		/*
-		 * @see IRangeComparator#getRangeCount()
-		 */
 		@Override
 		public int getRangeCount() {
 			return fXML_elements.length;
 		}
 	
-		/*
-		 * @see IRangeComparator#rangesEqual(int, IRangeComparator, int)
-		 */
 		@Override
 		public boolean rangesEqual(
 			int thisIndex,
@@ -148,9 +142,6 @@
 			return false;
 		}
 	
-		/*
-		 * @see IRangeComparator#skipRangeComparison(int, int, IRangeComparator)
-		 */
 		@Override
 		public boolean skipRangeComparison(
 			int length,
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/IdMap.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/IdMap.java
index 4fdc8ae..71872bb 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/IdMap.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/IdMap.java
@@ -80,9 +80,6 @@
 		fOrdered= ordered;
 	}
 	
-	/*
-	 * @see Object#equals(Object)
-	 */
 	@Override
 	public boolean equals(Object object) {
 		if (!(object instanceof IdMap))
@@ -98,9 +95,6 @@
 			idmap.getMappings().equals(fMappings);
 	}
 	
-	/*
-	 * @see Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return fName.hashCode() ^ fMappings.hashCode();
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/Mapping.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/Mapping.java
index 21c5e64..9ad4c81 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/Mapping.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/Mapping.java
@@ -36,9 +36,6 @@
 		fIdAttribute = idattribute;
 	}
 	
-	/*
-	 * @see Object#equals(Object)
-	 */
 	@Override
 	public boolean equals(Object object) {
 		if (!(object instanceof Mapping))
@@ -55,9 +52,6 @@
 			mapping.fIdAttribute.equals(fIdAttribute);
 	}
 	
-	/*
-	 * @see Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return fElement.hashCode() ^ fSignature.hashCode();
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/SWTUtil.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/SWTUtil.java
index 4266bb1..e4120dd 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/SWTUtil.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/SWTUtil.java
@@ -89,30 +89,18 @@
 		}
 	}	
 	
-	/*
-	 * @see DialogPage#convertHeightInCharsToPixels
-	 */
 	public static int convertHeightInCharsToPixels(int chars, Control control) {
 		return convertVerticalDLUsToPixels(chars * 8, control);
 	}
 
-	/*
-	 * @see DialogPage#convertHorizontalDLUsToPixels
-	 */
 	public static int convertHorizontalDLUsToPixels(int dlus, Control control) {
 		return (int)Math.round(dlus * getHorizontalDialogUnitSize(control));
 	}
 
-	/*
-	 * @see DialogPage#convertVerticalDLUsToPixels
-	 */
 	public static int convertVerticalDLUsToPixels(int dlus, Control control) {
 		return (int)Math.round(dlus * getVerticalDialogUnitSize(control));
 	}
 	
-	/*
-	 * @see DialogPage#convertWidthInCharsToPixels
-	 */
 	public static int convertWidthInCharsToPixels(int chars, Control control) {
 		return convertHorizontalDLUsToPixels(chars * 4, control);
 	}
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLComparePreferencePage.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLComparePreferencePage.java
index 9084f05..33d63ae 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLComparePreferencePage.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLComparePreferencePage.java
@@ -100,9 +100,6 @@
 		fOrderedElementsInternal= plugin.getOrderedElementsInternal();
 	}
 
-	/**
-	 * @see PreferencePage#createContents(Composite)
-	 */
 	@Override
 	protected Control createContents(Composite ancestor) {
 		Composite parent= new Composite(ancestor, SWT.NULL);
@@ -772,9 +769,6 @@
 		idmap.setOrdered(Ordered);
 	}
 
-	/*
-	 * @see IWorkbenchPreferencePage#performDefaults
-	 */	
 	@Override
 	public boolean performOk() {
 		XMLPlugin plugin= XMLPlugin.getDefault();
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLNode.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLNode.java
index 04a8b0e..1b31f8e 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLNode.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLNode.java
@@ -56,9 +56,6 @@
 		return fValue;
 	}
 
-	/*
-	 * @see ITypedElement#getName
-	 */
 	@Override
 	public String getName() {
 		if (fName != null)
@@ -83,9 +80,6 @@
 		fOrderedChild= isOrderedChild;
 	}
 	
-	/*
-	 * @see ITypedElement#getImage
-	 */
 	@Override
 	public Image getImage() {
 		if (fOrderedChild)
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/StatusDialog.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/StatusDialog.java
index 30f5cf8..2c61f43 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/StatusDialog.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/StatusDialog.java
@@ -88,9 +88,6 @@
 			fOkButton.setEnabled(!status.matches(IStatus.ERROR));
 	}
 	
-	/* 
-	 * @see Window#create(Shell)
-	 */
 	@Override
 	protected void configureShell(Shell shell) {
 		super.configureShell(shell);
@@ -98,9 +95,6 @@
 			shell.setText(fTitle);
 	}
 
-	/*
-	 * @see Window#create()
-	 */	
 	@Override
 	public void create() {
 		super.create();
@@ -115,18 +109,12 @@
 		}
 	}
 
-	/*
-	 * @see Dialog#createButtonsForButtonBar(Composite)
-	 */
 	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
 		fOkButton= createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
 		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
 	}
 	
-	/*
-	 * @see Dialog#createButtonBar(Composite)
-	 */				
 	@Override
 	protected Control createButtonBar(Composite parent) {
 		Composite composite= new Composite(parent, SWT.NULL);
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/StatusInfo.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/StatusInfo.java
index 22a48e1..9f46d86 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/StatusInfo.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/ui/StatusInfo.java
@@ -73,9 +73,6 @@
 		return fSeverity == IStatus.ERROR;
 	}
 	
-	/*
-	 * @see IStatus#getMessage
-	 */
 	@Override
 	public String getMessage() {
 		return fStatusMessage;
@@ -119,9 +116,6 @@
 		fSeverity= IStatus.OK;
 	}
 	
-	/*
-	 * @see IStatus#matches(int)
-	 */
 	@Override
 	public boolean matches(int severityMask) {
 		return (fSeverity & severityMask) != 0;
@@ -136,17 +130,11 @@
 		return false;
 	}
 
-	/*
-	 * @see IStatus#getSeverity()
-	 */
 	@Override
 	public int getSeverity() {
 		return fSeverity;
 	}
 
-	/*
-	 * @see IStatus#getPlugin()
-	 */
 	@Override
 	public String getPlugin() {
 		return "XMLPlugIn"; //$NON-NLS-1$
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/DisconnectAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/DisconnectAction.java
index 76b52e8..b945dc3 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/DisconnectAction.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/DisconnectAction.java
@@ -26,20 +26,19 @@
  */
 public class DisconnectAction extends TeamAction {
 	
+	@Override
 	protected void execute(IAction action) {
 		IProject projects[] = getSelectedProjects();
 		try {
-			for (int i = 0; i < projects.length; i++) {
-				RepositoryProvider.unmap(projects[i]);
+			for (IProject project : projects) {
+				RepositoryProvider.unmap(project);
 			}
 		} catch (TeamException e) {
 			ErrorDialog.openError(getShell(), Policy.bind("DisconnectAction.errorTitle"), null, e.getStatus()); //$NON-NLS-1$
 		} 
 	}
 	
-	/**
-	 * @see TeamAction#isEnabled()
-	 */
+	@Override
 	public boolean isEnabled() {
 		return true;
 	}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemPropertiesPage.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemPropertiesPage.java
index ba912f4..b837bc7 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemPropertiesPage.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemPropertiesPage.java
@@ -18,7 +18,9 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.dialogs.PropertyPage;
 /*
  * A property page which displays the  file system specific properties 
@@ -64,9 +66,7 @@
 		return resource;
 	}
 	
-	/*
-	 * @see PreferencePage#createContents(Composite)
-	 */
+	@Override
 	protected Control createContents(Composite parent) {
 		Composite composite = new Composite(parent, SWT.NONE);
 		GridLayout layout = new GridLayout();
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelResource.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelResource.java
index 2a4dceb..47f12a6 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelResource.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelResource.java
@@ -46,21 +46,22 @@
 		return resource;
 	}
 	
+	@Override
 	public String getName() {
 		return getResource().getName();
 	}
 	
+	@Override
 	public String getPath() {
 		return getResource().getFullPath().makeRelative().toString();
 	}
 	
+	@Override
 	public ModelObject getParent() {
 		return ModelObject.create(getResource().getParent());
 	}
 	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
+	@Override
 	public boolean equals(Object obj) {
 		if (obj instanceof ModelResource) {
 			ModelResource mr = (ModelResource) obj;
@@ -69,23 +70,17 @@
 		return super.equals(obj);
 	}
 	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
+	@Override
 	public int hashCode() {
 		return getResource().hashCode();
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.examples.model.ModelObject#delete()
-	 */
+	@Override
 	public void delete() throws CoreException {
 		getResource().delete(false, null);
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.examples.model.ModelObject#getProject()
-	 */
+	@Override
 	public ModelProject getProject() {
 		return (ModelProject)ModelObject.create(getResource().getProject());
 	}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java
index cb01bf4..07c5ee3 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticFilesystemProvider.java
@@ -322,9 +322,6 @@
 		return new ByteArrayInputStream(byteOut.toByteArray());
 	}
 
-	/*
-	 * @see IProjectNature#setProject(IProject)
-	 */
 	@Override
 	public void setProject(IProject project) {
 		if (PessimisticFilesystemProviderPlugin.getInstance().isDebugging()) {
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticModificationValidator.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticModificationValidator.java
index ee77e88..1fb183f 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticModificationValidator.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/PessimisticModificationValidator.java
@@ -57,9 +57,6 @@
 		fProvider= provider;
 	}
 
-	/**
-	 * @see IFileModificationValidator#validateEdit(IFile[], Object)
-	 */
 	@Override
 	public IStatus validateEdit(IFile[] files, FileModificationValidationContext context) {
 		if (files.length == 0) {
@@ -146,9 +143,6 @@
 		return new MultiStatus( getUid(), IStatus.OK, children, "Some files were not successfully checked out", null);
 	}
 
-	/**
-	 * @see IFileModificationValidator#validateSave(IFile)
-	 */
 	@Override
 	public IStatus validateSave(IFile file) {
 		int checkedInFilesSaved = getPreferences().getInt(IPessimisticFilesystemConstants.PREF_CHECKED_IN_FILES_SAVED);
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ResourceChangeListener.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ResourceChangeListener.java
index 4c35307..3ee5c2b 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ResourceChangeListener.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ResourceChangeListener.java
@@ -120,9 +120,6 @@
 		return resources;
 	}
 
-	/**
-	 * @see IResourceChangeListener#resourceChanged(IResourceChangeEvent)
-	 */
 	@Override
 	public void resourceChanged (IResourceChangeEvent event) {
 		try {
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/CheckInAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/CheckInAction.java
index f19c5ab..0168b99 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/CheckInAction.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/CheckInAction.java
@@ -29,6 +29,7 @@
 	 * 
 	 * @see PessimisticProviderAction#shouldEnableFor(IResource)
 	 */
+	@Override
 	protected boolean shouldEnableFor(IResource resource) {
 		if (resource == null)
 			return false;
@@ -42,9 +43,7 @@
 		return provider.isCheckedout(resource);
 	}
 
-	/*
-	 * @see SourceControlAction#manageResources(PessimisticFilesystemProvider, IResource[], IProgressMonitor)
-	 */
+	@Override
 	protected void manageResources(PessimisticFilesystemProvider provider, IResource[] resources, IProgressMonitor monitor) {
 		provider.checkin(resources, monitor);
 	}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/CheckOutAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/CheckOutAction.java
index f3ea2df..38ca10a 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/CheckOutAction.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/CheckOutAction.java
@@ -28,6 +28,7 @@
 	 * 
 	 * @see PessimisticProviderAction#shouldEnableFor(IResource)
 	 */
+	@Override
 	protected boolean shouldEnableFor(IResource resource) {
 		if (resource == null)
 			return false;
@@ -41,9 +42,7 @@
 		return !provider.isCheckedout(resource);
 	}
 	
-	/*
-	 * @see SourceControlAction#manageResources(PessimisticFilesystemProvider, IResource[], IProgressMonitor)
-	 */
+	@Override
 	protected void manageResources(PessimisticFilesystemProvider provider, IResource[] resources, IProgressMonitor monitor) {
 		provider.checkout(resources, monitor);
 	}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/ConfigurationWizard.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/ConfigurationWizard.java
index c713ec4..14c058d 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/ConfigurationWizard.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/ConfigurationWizard.java
@@ -31,17 +31,13 @@
 	 */
 	private IProject project;
 	
-	/*
-	 * @see Wizard#addPages()
-	 */
+	@Override
 	public void addPages() {
 		// workaround the wizard problem
 		addPage(new BlankPage());
 	}
 
-	/*
-	 * @see Wizard#performFinish()
-	 */
+	@Override
 	public boolean performFinish() {
 		try {
 			RepositoryProvider.map(project, PessimisticFilesystemProviderPlugin.NATURE_ID);
@@ -52,9 +48,7 @@
 		return true;
 	}
 
-	/*
-	 * @see IConfigurationWizard#init(IWorkbench, IProject)
-	 */	
+	@Override
 	public void init(IWorkbench workbench, IProject project) {
 		this.project = project;
 	}
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticPreferencesPage.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticPreferencesPage.java
index 158e4a9..322a137 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticPreferencesPage.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/PessimisticPreferencesPage.java
@@ -18,7 +18,11 @@
 import org.eclipse.swt.SWT;
 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.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.team.examples.pessimistic.IPessimisticFilesystemConstants;
 import org.eclipse.team.examples.pessimistic.PessimisticFilesystemProviderPlugin;
 import org.eclipse.ui.IWorkbench;
@@ -114,9 +118,7 @@
 			IPessimisticFilesystemConstants.OPTION_DO_NOTHING, };		
 	
 
-	/*
-	 * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore()
-	 */
+	@Override
 	protected IPreferenceStore doGetPreferenceStore() {
 		return PessimisticFilesystemProviderPlugin.getInstance().getPreferenceStore();
 	}
@@ -139,9 +141,7 @@
 		group.setLayoutData(data);
 	}
 
-	/*
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(Composite)
-	 */
+	@Override
 	protected Control createContents(Composite parent) {
 		Composite composite = new Composite(parent, SWT.NULL);
 		setDefaultLayout(composite, 1);
@@ -237,16 +237,12 @@
 		return composite;
 	}
 
-	/*
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(IWorkbench)
-	 */
+	@Override
 	public void init(IWorkbench workbench) {
 		// do nothing
 	}
 
-	/*
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
+	@Override
 	protected void performDefaults() {
 		IPreferenceStore store = getPreferenceStore();
 
@@ -265,9 +261,7 @@
 		super.performDefaults();
 	}
 
-	/*
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
+	@Override
 	public boolean performOk() {
 		IPreferenceStore store = getPreferenceStore();
 
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/UncheckOutAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/UncheckOutAction.java
index 7055dbc..a06bf46 100644
--- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/UncheckOutAction.java
+++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/pessimistic/ui/UncheckOutAction.java
@@ -22,9 +22,7 @@
  * selected all of its children are recursively unchecked out.
  */
 public class UncheckOutAction extends CheckInAction {
-	/**
-	 * @see org.eclipse.team.examples.pessimistic.ui.SourceManagementAction#manageResources(PessimisticFilesystemProvider, IResource[], IProgressMonitor)
-	 */
+	@Override
 	protected void manageResources(PessimisticFilesystemProvider provider, IResource[] resources, IProgressMonitor monitor) {
 		provider.uncheckout(resources, monitor);
 	}
diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderBic.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderBic.java
index 7f17558..d1efd47 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderBic.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderBic.java
@@ -25,34 +25,19 @@
 	private IMoveDeleteHook mdh;
 	private IFileModificationValidator mv;
 
-	/*
-	 * @see RepositoryProvider#configureProject()
-	 */
 	public void configureProject() throws CoreException {
 	}
 
-	/*
-	 * @see RepositoryProvider#getID()
-	 */
 	public String getID() {
 		return NATURE_ID;
 	}
-	/*
-	 * @see IProjectNature#deconfigure()
-	 */
 	public void deconfigure() throws CoreException {
 	}
 
-	/*
-	 * @see RepositoryProvider#getFileModificationValidator()
-	 */
 	public IFileModificationValidator getFileModificationValidator() {
 		return mv;
 	}
 
-	/*
-	 * @see RepositoryProvider#getMoveDeleteHook()
-	 */
 	public IMoveDeleteHook getMoveDeleteHook() {
 		return mdh;
 	}
diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderNaish.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderNaish.java
index 4440552..baf35a5 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderNaish.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderNaish.java
@@ -23,21 +23,12 @@
 	final public static String NATURE_ID = "org.eclipse.team.tests.core.naish-provider";
 	private IMoveDeleteHook mdh;
 	private IFileModificationValidator mv;
-	/*
-	 * @see RepositoryProvider#configureProject()
-	 */
 	public void configureProject() throws CoreException {
 	}
 
-	/*
-	 * @see RepositoryProvider#getID()
-	 */
 	public String getID() {
 		return NATURE_ID;
 	}
-	/*
-	 * @see IProjectNature#deconfigure()
-	 */
 	public void deconfigure() throws CoreException {
 	}
 
@@ -48,16 +39,10 @@
 	public void setMoveDeleteHook(IMoveDeleteHook mdh) {
 		this.mdh = mdh;
 	}
-	/*
-	 * @see RepositoryProvider#getFileModificationValidator()
-	 */
 	public IFileModificationValidator getFileModificationValidator() {
 		return mv;
 	}
 
-	/*
-	 * @see RepositoryProvider#getMoveDeleteHook()
-	 */
 	public IMoveDeleteHook getMoveDeleteHook() {
 		return mdh;
 	}
diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderOtherSport.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderOtherSport.java
index a549e1b..d0b0b1d 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderOtherSport.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderOtherSport.java
@@ -20,21 +20,13 @@
 
 	final public static String NATURE_ID = "org.eclipse.team.tests.core.other";
 
-	/*
-	 * @see RepositoryProvider#configureProject()
-	 */
 	public void configureProject() throws CoreException {
 	}
 
-	/*
-	 * @see RepositoryProvider#getID()
-	 */
 	public String getID() {
 		return NATURE_ID;
 	}
-	/*
-	 * @see IProjectNature#deconfigure()
-	 */
+
 	public void deconfigure() throws CoreException {
 	}
 }
diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTypeBic.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTypeBic.java
index dd8fa7a..27475f4 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTypeBic.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTypeBic.java
@@ -21,9 +21,7 @@
 
 public class RepositoryProviderTypeBic extends RepositoryProviderType {
 	File createdFile;
-	/**
-	 * @see org.eclipse.team.core.RepositoryProviderType#getProjectSetCapability()
-	 */
+
 	public ProjectSetCapability getProjectSetCapability() {
 		return new ProjectSetCapability() {
 			public IProject[] addToWorkspace(String[] referenceStrings,
@@ -40,9 +38,6 @@
 		};
 	}
 
-	/**
-	 * @return File
-	 */
 	public File getCreatedFile() {
 		return createdFile;
 	}
diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/PessimisticRepositoryProvider.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/PessimisticRepositoryProvider.java
index cf1f8bf..c2ebc16 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/PessimisticRepositoryProvider.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/PessimisticRepositoryProvider.java
@@ -49,9 +49,6 @@
 	public boolean canHandleLinkedResourceURI() {
 		return true;
 	}
-	/*
-	 * @see IRepositoryProvider#getFileModificationValidator()
-	 */
 	public IFileModificationValidator getFileModificationValidator() {
 		return soleInstance;
 	}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java
index 799187e..1f76bd5 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/IsModifiedTests.java
@@ -145,9 +145,6 @@
 		}
 	}
 
-	/**
-	 * @see junit.framework.TestCase#setUp()
-	 */
 	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
@@ -156,9 +153,6 @@
 		ResourceStateChangeListeners.getListener().addResourceStateChangeListener(listener);
 	}
 
-	/**
-	 * @see junit.framework.TestCase#tearDown()
-	 */
 	@Override
 	protected void tearDown() throws Exception {
 		previouslyModified.clear();
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/WatchEditTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/WatchEditTest.java
index 7e448d3..342597b 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/WatchEditTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/WatchEditTest.java
@@ -15,10 +15,9 @@
 
 import java.io.IOException;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-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.team.core.TeamException;
 import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin;
@@ -26,6 +25,9 @@
 import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
 import org.eclipse.team.tests.ccvs.core.EclipseTest;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 /**
  * Test the cvs watch/edit functionality
  */
@@ -51,6 +53,7 @@
 		//return new CVSTestSetup(new WatchEditTest("testReadOnly"));
 	}
 	
+	@Override
 	protected boolean isFailOnSyncInfoMismatch() {
 		// See  bug 198382
 		return CVSTestSetup.FAIL_ON_BAD_DIFF ;
@@ -116,17 +119,13 @@
 		assertEquals(project, copy);
 	}
 	
-	/**
-	 * @see junit.framework.TestCase#setUp()
-	 */
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		setReadOnly(true);
 	}
 
-	/**
-	 * @see junit.framework.TestCase#tearDown()
-	 */
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		setReadOnly(false);
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 a526c63..bd0c14a 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
@@ -1194,7 +1194,7 @@
 	}
 	
 	/*
-	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=40221
+	 * Test https://bugs.eclipse.org/bugs/show_bug.cgi?id=40221
 	 */
 	public void testConflictingFolderDeletion() throws CoreException {
 		// Create a test project (which commits it as well)