diff options
| author | Alexander Kurtakov | 2019-04-17 10:55:16 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2019-04-17 11:24:36 +0000 |
| commit | ca7a24d40322f481ddee4bef4a5bdf5bdc317730 (patch) | |
| tree | 913c0d3d664494f904325ac4e9e01ffb718a6f87 | |
| parent | 13e262c90c87ff0d0261ab9706b151e915cb0b11 (diff) | |
| download | eclipse.platform.team-ca7a24d40322f481ddee4bef4a5bdf5bdc317730.tar.gz eclipse.platform.team-ca7a24d40322f481ddee4bef4a5bdf5bdc317730.tar.xz eclipse.platform.team-ca7a24d40322f481ddee4bef4a5bdf5bdc317730.zip | |
Remove useless non-javadoc/@see comments. (take 4)I20190417-1800
Put @Override instead where needed.
Change-Id: I3798bfbb5fd3c05c16531f7fac7885d2f6eb65b7
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
157 files changed, 411 insertions, 1491 deletions
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 7c5693bc8..437189e75 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 @@ public class CompareEditorContributor extends EditorActionBarContributor { 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 @@ public class CompareEditorContributor extends EditorActionBarContributor { 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 e6df3f015..3b1a25c09 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 @@ public class OverlayPreferenceStore implements IPreferenceStore { private class PropertyListener implements IPropertyChangeListener { - /* - * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent) - */ @Override public void propertyChange(PropertyChangeEvent event) { OverlayKey key= findOverlayKey(event.getProperty()); @@ -217,269 +214,173 @@ public class OverlayPreferenceStore implements IPreferenceStore { } } - /* - * @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 cfba4a8b4..d1e65e45a 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 @@ public abstract class ResizableDialog extends Dialog { 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 9c54a6e36..8345362fb 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.FileLocator; 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 @@ public class JSchUIPlugin extends AbstractUIPlugin{ 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 028908ce3..85f6dcd07 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.events.SelectionEvent; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.*; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; /** @@ -91,9 +96,8 @@ public class KeyboardInteractiveDialog extends TrayDialog { isPasswordAuth=true; } } - /** - * @see Window#configureShell - */ + + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); if (isPasswordAuth) { @@ -106,9 +110,8 @@ public class KeyboardInteractiveDialog extends TrayDialog { PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IHelpContextIds.KEYBOARD_INTERACTIVE_DIALOG); } - /** - * @see Window#create - */ + + @Override public void create() { super.create(); @@ -121,10 +124,8 @@ public class KeyboardInteractiveDialog extends TrayDialog { 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 @@ public class KeyboardInteractiveDialog extends TrayDialog { data.horizontalSpan = 3; allowCachingButton.setLayoutData(data); allowCachingButton.addSelectionListener(new SelectionAdapter() { + @Override public void widgetSelected(SelectionEvent e) { allowCaching = allowCachingButton.getSelection(); } @@ -277,7 +279,8 @@ public class KeyboardInteractiveDialog extends TrayDialog { * and closes the dialog. Subclasses may override. * </p> */ - protected void okPressed() { + @Override +protected void okPressed() { result=new String[prompt.length]; for(int i=0; i<texts.length; i++){ result[i]=texts[i].getText(); @@ -292,7 +295,8 @@ public class KeyboardInteractiveDialog extends TrayDialog { * 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 08578c2b3..1859876b3 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.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TrayDialog; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -68,9 +67,6 @@ public class UserValidationDialog extends TrayDialog { this.domain = location; this.message = message; } - /** - * @see Window#configureShell - */ @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); @@ -78,9 +74,6 @@ public class UserValidationDialog extends TrayDialog { // 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 @@ public class UserValidationDialog extends TrayDialog { } } - /** - * @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 2a0a1f5aa..40a6d82cc 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 @@ package org.eclipse.jsch.internal.ui.authenticator; 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 @@ public class KeyboardInteractiveDialog extends TrayDialog{ } - /** - * @see Window#configureShell - */ @Override protected void configureShell(Shell newShell){ super.configureShell(newShell); @@ -116,9 +112,6 @@ protected void configureShell(Shell newShell){ IHelpContextIds.KEYBOARD_INTERACTIVE_DIALOG); } - /** - * @see Window#create - */ @Override public void create(){ super.create(); @@ -133,9 +126,6 @@ public void create(){ } } - /** - * @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 e9aa300b6..ea035fb83 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.events.SelectionEvent; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.*; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; -import org.eclipse.jsch.internal.ui.IUIConstants; -import org.eclipse.jsch.internal.ui.JSchUIPlugin; -import org.eclipse.jsch.internal.ui.Messages; - /** * A dialog for prompting for a user name and password * @since 1.1 @@ -77,9 +81,7 @@ public class UserValidationDialog extends TrayDialog{ this.isAllowCaching=isAllowCaching; } - /** - * @see Window#configureShell - */ + @Override protected void configureShell(Shell newShell){ super.configureShell(newShell); newShell.setText(Messages.UserValidationDialog_required); @@ -88,10 +90,9 @@ public class UserValidationDialog extends TrayDialog{ 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 @@ public class UserValidationDialog extends TrayDialog{ } } - /** - * @see Dialog#createDialogArea - */ - protected Control createDialogArea(Composite parent){ + @Override +protected Control createDialogArea(Composite parent){ Composite top=new Composite(parent, SWT.NONE); GridLayout layout=new GridLayout(); layout.numColumns=2; @@ -170,7 +169,8 @@ public class UserValidationDialog extends TrayDialog{ data.horizontalSpan=3; allowCachingButton.setLayoutData(data); allowCachingButton.addSelectionListener(new SelectionAdapter(){ - public void widgetSelected(SelectionEvent e){ + @Override + public void widgetSelected(SelectionEvent e){ allowCaching=allowCachingButton.getSelection(); } }); @@ -249,7 +249,8 @@ public class UserValidationDialog extends TrayDialog{ * 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 111bef09b..1276044b2 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 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator{ 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 da35d05ca..49333af1d 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSCoreFileModificationValidator.java @@ -84,9 +84,7 @@ public class CVSCoreFileModificationValidator extends FileModificationValidator return uiValidator; } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFileModificationValidator#validateMoveDelete(org.eclipse.core.resources.IFile[], org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public IStatus validateMoveDelete(IFile[] files, IProgressMonitor monitor) { IFile[] readOnlyFiles = getManagedReadOnlyFiles(files); if (readOnlyFiles.length == 0) return Status.OK_STATUS; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java index c5ac1306a..b84a4082e 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSProviderPlugin.java @@ -285,9 +285,7 @@ public class CVSProviderPlugin extends Plugin { ConsoleListeners.getInstance().addListener(consoleListener); } - /** - * @see Plugin#start(BundleContext) - */ + @Override public void start(BundleContext context) throws Exception { super.start(context); @@ -318,9 +316,7 @@ public class CVSProviderPlugin extends Plugin { tracker.open(); } - /** - * @see Plugin#stop(BundleContext) - */ + @Override public void stop(BundleContext context) throws Exception { try { // unregister debug options listener @@ -349,9 +345,7 @@ public class CVSProviderPlugin extends Plugin { } } - /** - * @see org.eclipse.core.runtime.Plugin#initializeDefaultPluginPreferences() - */ + @Override protected void initializeDefaultPluginPreferences(){ Preferences store = getPluginPreferences(); store.setDefault(READ_ONLY, false); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java index 5d31f7941..1e8306d93 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java @@ -89,9 +89,7 @@ public class CVSStatus extends TeamStatus { super(severity, CVSProviderPlugin.ID, CVSStatus.ERROR, message, null, null); } - /** - * @see IStatus#getMessage() - */ + @Override public String getMessage() { String message = super.getMessage(); if (commandRoot != null) { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRunnable.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRunnable.java index 3c119c1d4..7e0bc8f46 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRunnable.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRunnable.java @@ -24,7 +24,6 @@ import org.eclipse.core.runtime.IProgressMonitor; * <p> * Clients may implement this interface. * </p> - * @see */ public interface ICVSRunnable { /** diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AddStructureVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AddStructureVisitor.java index 2750eeaf9..a551bdc60 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AddStructureVisitor.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/AddStructureVisitor.java @@ -28,9 +28,7 @@ class AddStructureVisitor extends AbstractStructureVisitor { super(session, localOptions, false, true); } - /** - * @see ICVSResourceVisitor#visitFile(IManagedFile) - */ + @Override public void visitFile(ICVSFile mFile) throws CVSException { // Send the parent folder @@ -43,9 +41,7 @@ class AddStructureVisitor extends AbstractStructureVisitor { } - /** - * @see ICVSResourceVisitor#visitFolder(ICVSFolder) - */ + @Override public void visitFolder(ICVSFolder mFolder) throws CVSException { Assert.isNotNull(mFolder); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java index 236a1df91..4091eed84 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/FileStructureVisitor.java @@ -44,16 +44,12 @@ class FileStructureVisitor extends AbstractStructureVisitor { this.sendEmptyFolders = sendEmptyFolders; } - /** - * @see ICVSResourceVisitor#visitFile(IManagedFile) - */ + @Override public void visitFile(ICVSFile mFile) throws CVSException { sendFile(mFile); } - /** - * @see ICVSResourceVisitor#visitFolder(ICVSFolder) - */ + @Override public void visitFolder(ICVSFolder mFolder) throws CVSException { if (sendEmptyFolders) { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java index 562ed9e7c..1e5ed8649 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ImportStructureVisitor.java @@ -101,9 +101,7 @@ class ImportStructureVisitor implements ICVSResourceVisitor { return wrapMatcher; } - /** - * @see ICVSResourceVisitor#visitFile(IManagedFile) - */ + @Override public void visitFile(ICVSFile mFile) throws CVSException { if (ignoreMatcher != null && ignoreMatcher.match(mFile.getName())) { return; @@ -117,9 +115,7 @@ class ImportStructureVisitor implements ICVSResourceVisitor { session.sendModified(mFile, binary, monitor); } - /** - * @see ICVSResourceVisitor#visitFolder(ICVSFolder) - */ + @Override public void visitFolder(ICVSFolder mFolder) throws CVSException { if (ignoreMatcher != null && ignoreMatcher.match(mFolder.getName())) { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModuleExpansionHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModuleExpansionHandler.java index d1c9f25eb..4c39ba285 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModuleExpansionHandler.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/ModuleExpansionHandler.java @@ -19,16 +19,12 @@ import org.eclipse.team.internal.ccvs.core.CVSException; public class ModuleExpansionHandler extends ResponseHandler { - /* - * @see ResponseHandler#getResponseID() - */ + @Override public String getResponseID() { return "Module-expansion";//$NON-NLS-1$ } - /* - * @see ResponseHandler#handle(Session, String, IProgressMonitor) - */ + @Override public void handle(Session session, String expansion, IProgressMonitor monitor) throws CVSException { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPVisitor.java index c42f5a664..6790f23d9 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPVisitor.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NOOPVisitor.java @@ -28,16 +28,12 @@ public class NOOPVisitor extends AbstractStructureVisitor { super(session, localOptions, false, false); } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSResourceVisitor#visitFile(ICVSFile) - */ + @Override public void visitFile(ICVSFile file) throws CVSException { sendPendingNotification(file); } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSResourceVisitor#visitFolder(ICVSFolder) - */ + @Override public void visitFolder(ICVSFolder folder) throws CVSException { if (isRecurse() && folder.isCVSFolder()) { folder.acceptChildren(this); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NewEntryHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NewEntryHandler.java index 186ccd813..21f93ded8 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NewEntryHandler.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NewEntryHandler.java @@ -21,16 +21,12 @@ import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo; public class NewEntryHandler extends ResponseHandler { - /* - * @see ResponseHandler#getResponseID() - */ + @Override public String getResponseID() { return "New-entry"; //$NON-NLS-1$ } - /* - * @see ResponseHandler#handle(Session, String, IProgressMonitor) - */ + @Override public void handle(Session session, String localDir, IProgressMonitor monitor) throws CVSException { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java index 623de56de..6df20e6e4 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NotifiedHandler.java @@ -29,16 +29,12 @@ import org.eclipse.team.internal.ccvs.core.ICVSFolder; */ public class NotifiedHandler extends ResponseHandler { - /** - * @see org.eclipse.team.internal.ccvs.core.client.ResponseHandler#getResponseID() - */ + @Override public String getResponseID() { return "Notified"; //$NON-NLS-1$ } - /** - * @see org.eclipse.team.internal.ccvs.core.client.ResponseHandler#handle(Session, String, IProgressMonitor) - */ + @Override public void handle( Session session, String localDir, diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java index 167a5aca8..a65ad5e92 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/PruneFolderVisitor.java @@ -64,16 +64,13 @@ public class PruneFolderVisitor implements ICVSResourceVisitor { pruneFolderAndParentsIfAppropriate(cvsFolder); } } - /** - * @see ICVSResourceVisitor#visitFile(IManagedFile) - */ + + @Override public void visitFile(ICVSFile file) throws CVSException { // nothing to do here } - /** - * @see ICVSResourceVisitor#visitFolder(ICVSFolder) - */ + @Override public void visitFolder(ICVSFolder folder) throws CVSException { // First prune any empty children folder.acceptChildren(this); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java index 29a2d9477..7bc529dc1 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/SyncUpdate.java @@ -21,9 +21,7 @@ public class SyncUpdate extends Update { public SyncUpdate() { }; - /* - * @see Command#sendFileStructure(ICVSResource,IProgressMonitor,boolean,boolean,boolean) - */ + @Override protected void sendFileStructure(Session session, ICVSResource[] resources, LocalOption[] localOptions, boolean emptyFolders, IProgressMonitor monitor) throws CVSException { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java index 8d198ae9c..9c99a9a0f 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/TemplateHandler.java @@ -32,16 +32,12 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter; */ public class TemplateHandler extends ResponseHandler { - /** - * @see org.eclipse.team.internal.ccvs.core.client.ResponseHandler#getResponseID() - */ + @Override public String getResponseID() { return "Template"; //$NON-NLS-1$ } - /** - * @see org.eclipse.team.internal.ccvs.core.client.ResponseHandler#handle(org.eclipse.team.internal.ccvs.core.client.Session, java.lang.String, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void handle(Session session, String localDir, IProgressMonitor monitor) throws CVSException { session.readLine(); /* read the remote dir which is not needed */ // Only read the template file if the container exists. diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java index 918968259..973bd4cb9 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java @@ -179,9 +179,7 @@ public class Update extends Command { } } - /** - * @see org.eclipse.team.internal.ccvs.core.client.Command#doExecute(org.eclipse.team.internal.ccvs.core.client.Session, org.eclipse.team.internal.ccvs.core.client.Command.GlobalOption, org.eclipse.team.internal.ccvs.core.client.Command.LocalOption, java.lang.String, org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected IStatus doExecute( Session session, GlobalOption[] globalOptions, diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Version.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Version.java index ca1e08b9a..388182224 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Version.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Version.java @@ -37,9 +37,7 @@ public class Version extends RemoteCommand { private static final String CVS_NT_PREFIX_1 = "Concurrent Versions System (CVS) NT "; //$NON-NLS-1$ private static final String CVS_NT_PREFIX_2 = "Concurrent Versions System (CVSNT) "; //$NON-NLS-1$ private static final String CVS_PREFIX = "Concurrent Versions System (CVS) "; //$NON-NLS-1$ - /** - * @see Request#getRequestId() - */ + @Override protected String getRequestId() { return "version"; //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/EditorsListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/EditorsListener.java index 8af43e8c3..73a6ebaa0 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/EditorsListener.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/EditorsListener.java @@ -51,9 +51,7 @@ public class EditorsListener extends CommandOutputListener { public EditorsListener() { } - /** - * @see org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener#messageLine(java.lang.String, org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation, org.eclipse.team.internal.ccvs.core.ICVSFolder, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public IStatus messageLine( String line, ICVSRepositoryLocation location, diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogEntry.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogEntry.java index f01624345..6c88f1fcf 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogEntry.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/LogEntry.java @@ -67,69 +67,51 @@ public class LogEntry extends PlatformObject implements ILogEntry { this.revisions=revisions; } - /** - * @see ILogEntry#getRevision() - */ + @Override public String getRevision() { return file.getRevision(); } - /** - * @see ILogEntry#getAuthor() - */ + @Override public String getAuthor() { return author; } - /** - * @see ILogEntry#getDate() - */ + @Override public Date getDate() { return date; } - /** - * @see ILogEntry#getComment() - */ + @Override public String getComment() { return comment; } - /** - * @see ILogEntry#getState() - */ + @Override public String getState() { return state; } - /** - * @see ILogEntry#getBranches() - */ + @Override public CVSTag[] getBranches() { CVSTag[] result = new CVSTag[branches.length]; System.arraycopy(branches, 0, result, 0, branches.length); return result; } - /** - * @see ILogEntry#getTags() - */ + @Override public CVSTag[] getTags() { CVSTag[] result = new CVSTag[tags.length]; System.arraycopy(tags, 0, result, 0, tags.length); return result; } - /** - * @see ILogEntry#getRemoteFile() - */ + @Override public ICVSRemoteFile getRemoteFile() { return file; } - /** - * @see ILogEntry#isDeletion() - */ + @Override public boolean isDeletion() { return getState().equals("dead"); //$NON-NLS-1$ } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ModuleDefinitionsListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ModuleDefinitionsListener.java index 7a8d52030..1d7440a2a 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ModuleDefinitionsListener.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/ModuleDefinitionsListener.java @@ -38,9 +38,7 @@ public class ModuleDefinitionsListener extends CommandOutputListener { reset(); } - /* - * @see ICommandOutputListener#messageLine(String, ICVSFolder, IProgressMonitor) - */ + @Override public IStatus messageLine( String line, ICVSRepositoryLocation location, diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java index ccd51c3cf..b4ac98897 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/listeners/TagListener.java @@ -23,9 +23,7 @@ import org.eclipse.team.internal.ccvs.core.client.CommandOutputListener; public class TagListener extends CommandOutputListener { - /* - * @see ICommandOutputListener#messageLine(String, ICVSFolder, IProgressMonitor) - */ + @Override public IStatus messageLine( String line, ICVSRepositoryLocation location, @@ -42,9 +40,7 @@ public class TagListener extends CommandOutputListener { return OK; } - /* - * @see ICommandOutputListener#errorLine(String, ICVSFolder, IProgressMonitor) - */ + @Override public IStatus errorLine( String line, ICVSRepositoryLocation location, diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java index 2277dfd6d..f484b4055 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java @@ -599,23 +599,17 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit root; } - /* - * @see ICVSRepositoryLocation#getMethod() - */ + @Override public IConnectionMethod getMethod() { return method; } - /* - * @see ICVSRepositoryLocation#getPort() - */ + @Override public int getPort() { return port; } - /* - * @see ICVSRepositoryLocation#getEncoding() - */ + @Override public String getEncoding() { if (hasPreferences()) { return internalGetPreferences().get(PREF_SERVER_ENCODING, getDefaultEncoding()); @@ -624,9 +618,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit } } - /* - * @see ICVSRepositoryLocation#setEncoding() - */ + @Override public void setEncoding(String encoding) { if (encoding == null || encoding == getDefaultEncoding()) { if (hasPreferences()) { @@ -639,9 +631,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit } } - /* - * @see ICVSRepositoryLocation#members(CVSTag, boolean, IProgressMonitor) - */ + @Override public ICVSRemoteResource[] members(CVSTag tag, boolean modules, IProgressMonitor progress) throws CVSException { try { if (modules) { @@ -668,16 +658,12 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit } } - /* - * @see ICVSRepositoryLocation#getRemoteFolder(String, CVSTag) - */ + @Override public ICVSRemoteFolder getRemoteFolder(String remotePath, CVSTag tag) { return new RemoteFolder(null, this, remotePath, tag); } - /* - * @see ICVSRepositoryLocation#getRemoteFile(String, CVSTag) - */ + @Override public ICVSRemoteFile getRemoteFile(String remotePath, CVSTag tag) { IPath path = new Path(null, remotePath); RemoteFolderTree remoteFolder = new RemoteFolderTree(null, this, path.removeLastSegments(1).toString(), tag); @@ -686,9 +672,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit return remoteFile; } - /* - * @see ICVSRepositoryLocation#getRootDirectory() - */ + @Override public String getRootDirectory() { return root; } @@ -703,17 +687,12 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit return CVSProviderPlugin.getPlugin().getTimeout(); } - /* - * @see ICVSRepositoryLocation#getUserInfo() - */ + @Override public IUserInfo getUserInfo(boolean makeUsernameMutable) { return new UserInfo(getUsername(), password, makeUsernameMutable ? true : isUsernameMutable()); } - /* - * @see ICVSRepositoryLocation#getUsername() - * @see IUserInfo#getUsername() - */ + @Override public String getUsername() { // If the username is mutable, get it from the cache if it's there if (user == null && isUsernameMutable()) { @@ -722,9 +701,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit return user == null ? "" : user; //$NON-NLS-1$ } - /* - * @see IUserInfo#isUsernameMutable() - */ + @Override public boolean isUsernameMutable() { return !userFixed; } @@ -948,9 +925,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit } return null; } - /* - * @see IUserInfo#setPassword(String) - */ + @Override public void setPassword(String password) { if (passwordFixed) throw new UnsupportedOperationException(); @@ -962,9 +937,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit previousAuthenticationFailed = false; } - /* - * @see IUserInfo#setUsername(String) - */ + @Override public void setUsername(String user) { if (userFixed) throw new UnsupportedOperationException(); @@ -1082,9 +1055,7 @@ public class CVSRepositoryLocation extends PlatformObject implements ICVSReposit } } - /** - * @see ICVSRepositoryLocation#flushUserInfo() - */ + @Override public void flushUserInfo() { removeNode(); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnectionMethod.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnectionMethod.java index cabfbaf34..cb0bf14cd 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnectionMethod.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/ExtConnectionMethod.java @@ -17,16 +17,12 @@ package org.eclipse.team.internal.ccvs.core.connection; import org.eclipse.team.internal.ccvs.core.*; public class ExtConnectionMethod implements IConnectionMethod { - /** - * @see IConnectionMethod#getName - */ + @Override public String getName() { return "ext"; //$NON-NLS-1$ } - /** - * @see IConnectionMethod#createConnection - */ + @Override public IServerConnection createConnection(ICVSRepositoryLocation repositoryRoot, String password) { if(password==null){ password=""; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnection.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnection.java index 700851a57..935069365 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnection.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnection.java @@ -74,9 +74,7 @@ public class PServerConnection implements IServerConnection { private InputStream inputStream; private OutputStream outputStream; - /** - * @see Connection#doClose() - */ + @Override public void close() throws IOException { try { if (inputStream != null) inputStream.close(); @@ -95,9 +93,7 @@ public class PServerConnection implements IServerConnection { } } - /** - * @see Connection#doOpen() - */ + @Override public void open(IProgressMonitor monitor) throws IOException, CVSAuthenticationException { monitor.subTask(CVSMessages.PServerConnection_authenticating); @@ -154,15 +150,11 @@ public class PServerConnection implements IServerConnection { return proxy; } - /** - * @see Connection#getInputStream() - */ + @Override public InputStream getInputStream() { return inputStream; } - /** - * @see Connection#getOutputStream() - */ + @Override public OutputStream getOutputStream() { return outputStream; } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnectionMethod.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnectionMethod.java index 3db521346..73846f398 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnectionMethod.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/PServerConnectionMethod.java @@ -17,25 +17,19 @@ import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; import org.eclipse.team.internal.ccvs.core.IConnectionMethod; import org.eclipse.team.internal.ccvs.core.IServerConnection; public class PServerConnectionMethod implements IConnectionMethod { - /** - * @see IConnectionMethod#createConnection(ICVSRepositoryLocation, String) - */ + @Override public IServerConnection createConnection(ICVSRepositoryLocation location, String password) { if(password==null){ password=""; //$NON-NLS-1$ } return new PServerConnection(location, password); } - /** - * @see IConnectionMethod#getName() - */ + @Override public String getName() { return "pserver";//$NON-NLS-1$ } - /** - * @see org.eclipse.team.internal.ccvs.core.IConnectionMethod#disconnect(org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation) - */ + @Override public void disconnect(ICVSRepositoryLocation location) { } } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/UserInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/UserInfo.java index 0d072110f..2ba13c43e 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/UserInfo.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/UserInfo.java @@ -32,9 +32,7 @@ public class UserInfo implements IUserInfo { this.isUsernameMutable = isUsernameMutable; } - /* - * @see IUserInfo#getUsername() - */ + @Override public String getUsername() { return username; } @@ -43,23 +41,17 @@ public class UserInfo implements IUserInfo { return password; } - /* - * @see IUserInfo#isUsernameMutable() - */ + @Override public boolean isUsernameMutable() { return isUsernameMutable; } - /* - * @see IUserInfo#setPassword(String) - */ + @Override public void setPassword(String password) { this.password = password; } - /* - * @see IUserInfo#setUsername(String) - */ + @Override public void setUsername(String username) { this.username = username; } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java index 8bad06df9..61402eedd 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java @@ -45,9 +45,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile { super(file); } - /* - * @see ICVSResource#delete() - */ + @Override public void delete() throws CVSException { try { ((IFile)resource).delete(false /*force*/, true /*keepHistory*/, null); @@ -68,9 +66,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile { } } - /* - * @see ICVSFile#getTimeStamp() - */ + @Override public Date getTimeStamp() { long timestamp = getIFile().getLocalTimeStamp(); if( timestamp == IResource.NULL_STAMP) { @@ -80,9 +76,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile { return new Date((timestamp/1000)*1000); } - /* - * @see ICVSFile#setTimeStamp(Date) - */ + @Override public void setTimeStamp(Date date) throws CVSException { long time; if (date == null) { @@ -93,9 +87,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile { EclipseSynchronizer.getInstance().setTimeStamp(this, time); } - /* - * @see ICVSResource#isFolder() - */ + @Override public boolean isFolder() { return false; } @@ -129,16 +121,12 @@ public class EclipseFile extends EclipseResource implements ICVSFile { return EclipseSynchronizer.getInstance().setModified(this, UNKNOWN); } - /* - * @see ICVSResource#accept(ICVSResourceVisitor) - */ + @Override public void accept(ICVSResourceVisitor visitor) throws CVSException { visitor.visitFile(this); } - /* - * @see ICVSResource#accept(ICVSResourceVisitor, boolean) - */ + @Override public void accept(ICVSResourceVisitor visitor, boolean recurse) throws CVSException { visitor.visitFile(this); } @@ -161,16 +149,12 @@ public class EclipseFile extends EclipseResource implements ICVSFile { } } - /* - * @see ICVSResource#getRemoteLocation() - */ + @Override public String getRemoteLocation(ICVSFolder stopSearching) throws CVSException { return getParent().getRemoteLocation(stopSearching) + SEPARATOR + getName(); } - /* - * @see ICVSFile#setReadOnly() - */ + @Override public void setContents(InputStream stream, int responseType, boolean keepLocalHistory, IProgressMonitor monitor) throws CVSException { try { IFile file = getIFile(); @@ -214,9 +198,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile { } } - /* - * @see ICVSFile#setReadOnly() - */ + @Override public void setReadOnly(boolean readOnly) throws CVSException { ResourceAttributes attributes = resource.getResourceAttributes(); if (attributes != null) { @@ -229,16 +211,12 @@ public class EclipseFile extends EclipseResource implements ICVSFile { } } - /* - * @see ICVSFile#isReadOnly() - */ + @Override public boolean isReadOnly() throws CVSException { return getIFile().isReadOnly(); } - /* - * @see ICVSFile#setExecutable() - */ + @Override public void setExecutable(boolean executable) throws CVSException { ResourceAttributes attributes = resource.getResourceAttributes(); if (attributes != null) { @@ -251,9 +229,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile { } } - /* - * @see ICVSFile#isExectuable() - */ + @Override public boolean isExecutable() throws CVSException { ResourceAttributes attributes = resource.getResourceAttributes(); if (attributes != null) { @@ -280,9 +256,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile { } return null; } - /** - * @see ICVSFile#getLogEntries(IProgressMonitor) - */ + @Override public ILogEntry[] getLogEntries(IProgressMonitor monitor) throws TeamException { // try fetching log entries only when the file's project is accessible @@ -343,9 +317,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile { return null; } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFile#checkout(int) - */ + @Override public void edit(final int notifications, boolean notifyForWritable, IProgressMonitor monitor) throws CVSException { if (!notifyForWritable && !isReadOnly()) return; run(monitor1 -> { @@ -393,9 +365,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile { } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFile#uncheckout() - */ + @Override public void unedit(IProgressMonitor monitor) throws CVSException { if (isReadOnly()) return; run(monitor1 -> { @@ -439,16 +409,12 @@ public class EclipseFile extends EclipseResource implements ICVSFile { }, monitor); } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFile#notificationCompleted() - */ + @Override public void notificationCompleted() throws CVSException { EclipseSynchronizer.getInstance().deleteNotifyInfo(resource); } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFile#getPendingNotification() - */ + @Override public NotifyInfo getPendingNotification() throws CVSException { return getNotifyInfo(); } @@ -536,9 +502,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile { } } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSResource#unmanage(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void unmanage(IProgressMonitor monitor) throws CVSException { run(monitor1 -> { EclipseFile.super.unmanage(monitor1); @@ -546,23 +510,17 @@ public class EclipseFile extends EclipseResource implements ICVSFile { }, monitor); } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFile#isEdited() - */ + @Override public boolean isEdited() throws CVSException { return EclipseSynchronizer.getInstance().isEdited(getIFile()); } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSResource#setSyncInfo(org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo) - */ + @Override public void setSyncInfo(ResourceSyncInfo info, int modificationState) throws CVSException { setSyncBytes(info.getBytes(), info, modificationState); } - /** - * @see org.eclipse.team.internal.ccvs.core.resources.EclipseResource#setSyncBytes(byte[], int) - */ + @Override public void setSyncBytes(byte[] syncBytes, int modificationState) throws CVSException { setSyncBytes(syncBytes, null, modificationState); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java index 1874d8c57..648eb7fb2 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java @@ -39,9 +39,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { super(container); } - /** - * @see ICVSFolder#members(int) - */ + @Override public ICVSResource[] members(int flags) throws CVSException { final List<ICVSResource> result = new ArrayList<>(); IResource[] resources = EclipseSynchronizer.getInstance().members((IContainer)resource); @@ -85,9 +83,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { return (ICVSResource[]) result.toArray(new ICVSResource[result.size()]); } - /** - * @see ICVSFolder#createFolder(String) - */ + @Override public ICVSFolder getFolder(String name) throws CVSException { if ((CURRENT_LOCAL_FOLDER.equals(name)) || ((CURRENT_LOCAL_FOLDER + SEPARATOR).equals(name))) return this; @@ -99,16 +95,12 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { } } - /** - * @see ICVSFolder#createFile(String) - */ + @Override public ICVSFile getFile(String name) throws CVSException { return new EclipseFile(((IContainer)resource).getFile(new Path(null, name))); } - /** - * @see ICVSFolder#mkdir() - */ + @Override public void mkdir() throws CVSException { ISchedulingRule rule = null; try { @@ -132,16 +124,12 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { } } - /** - * @see ICVSResource#isFolder() - */ + @Override public boolean isFolder() { return true; } - /** - * @see ICVSFolder#acceptChildren(ICVSResourceVisitor) - */ + @Override public void acceptChildren(ICVSResourceVisitor visitor) throws CVSException { // Visit files and then folders @@ -155,16 +143,12 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { } } - /** - * @see ICVSResource#accept(ICVSResourceVisitor) - */ + @Override public void accept(ICVSResourceVisitor visitor) throws CVSException { visitor.visitFolder(this); } - /** - * @see ICVSResource#accept(ICVSResourceVisitor, boolean) - */ + @Override public void accept(ICVSResourceVisitor visitor, boolean recurse) throws CVSException { visitor.visitFolder(this); ICVSResource[] resources; @@ -178,9 +162,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { } } - /** - * @see ICVSResource#getRemoteLocation(ICVSFolder) - */ + @Override public String getRemoteLocation(ICVSFolder stopSearching) throws CVSException { if (getFolderSyncInfo() != null) { @@ -198,9 +180,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { return null; } - /* - * @see ICVSFolder#getFolderInfo() - */ + @Override public FolderSyncInfo getFolderSyncInfo() throws CVSException { if (resource.getType() != IResource.ROOT && !resource.getProject().isAccessible()) { return null; @@ -208,9 +188,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { return EclipseSynchronizer.getInstance().getFolderSync((IContainer)resource); } - /* - * @see ICVSFolder#setFolderInfo(FolderSyncInfo) - */ + @Override public void setFolderSyncInfo(final FolderSyncInfo folderInfo) throws CVSException { // ignore folder sync on the root (i.e. CVSROOT/config/TopLevelAdmin=yes but we just ignore it) if (resource.getType() == IResource.ROOT) return; @@ -229,16 +207,12 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { } - /* - * @see ICVSFolder#isCVSFolder() - */ + @Override public boolean isCVSFolder() throws CVSException { return EclipseSynchronizer.getInstance().getFolderSync((IContainer)resource) != null; } - /* - * @see ICVSResource#unmanage() - */ + @Override public void unmanage(IProgressMonitor monitor) throws CVSException { run((ICVSRunnable) monitor1 -> { monitor1 = Policy.monitorFor(monitor1); @@ -276,9 +250,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { } } - /* - * @see ICVSResource#isIgnored() - */ + @Override public boolean isIgnored() throws CVSException { if(isCVSFolder()) { return false; @@ -286,9 +258,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { return super.isIgnored(); } - /* - * @see ICVSFolder#getChild(String) - */ + @Override public ICVSResource getChild(String namedPath) throws CVSException { if (namedPath.equals(Session.CURRENT_LOCAL_FOLDER)) { return this; @@ -308,15 +278,11 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { return null; } - /** - * @see ICVSFolder#fetchChildren(IProgressMonitor) - */ + @Override public ICVSResource[] fetchChildren(IProgressMonitor monitor) throws CVSException { return members(FILE_MEMBERS | FOLDER_MEMBERS); } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSResource#delete() - */ + @Override public void delete() throws CVSException { if (!exists()) return; try { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java index e2cd4e056..be79effb9 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseResource.java @@ -70,9 +70,7 @@ abstract class EclipseResource implements ICVSResource, Comparable { } } - /* - * @see ICVSResource#exists() - */ + @Override public boolean exists() { return resource.exists(); } @@ -91,16 +89,12 @@ abstract class EclipseResource implements ICVSResource, Comparable { return new EclipseFolder(parent); } - /* - * @see ICVSResource#getName() - */ + @Override public String getName() { return resource.getName(); } - /* - * @see ICVSResource#isIgnored() - */ + @Override public boolean isIgnored() throws CVSException { // a managed resource is never ignored if(isManaged() || resource.getType()==IResource.ROOT || resource.getType()==IResource.PROJECT) { @@ -134,16 +128,12 @@ abstract class EclipseResource implements ICVSResource, Comparable { return info.isVirtualDirectory(); } - /* - * @see ICVSResource#setIgnoredAs(String) - */ + @Override public void setIgnoredAs(final String pattern) throws CVSException { run(monitor -> EclipseSynchronizer.getInstance().addIgnored(resource.getParent(), pattern), null); } - /* - * @see ICVSResource#isManaged() - */ + @Override public boolean isManaged() throws CVSException { return isManaged(getSyncBytes()); } @@ -175,9 +165,7 @@ abstract class EclipseResource implements ICVSResource, Comparable { return resource.getFullPath().toString(); } - /* - * @see ICVSResource#isFolder() - */ + @Override public boolean isFolder() { return false; } @@ -198,9 +186,7 @@ abstract class EclipseResource implements ICVSResource, Comparable { } } - /* - * @see ICVSResource#getSyncInfo() - */ + @Override public ResourceSyncInfo getSyncInfo() throws CVSException { return EclipseSynchronizer.getInstance().getResourceSync(resource); } @@ -219,24 +205,18 @@ abstract class EclipseResource implements ICVSResource, Comparable { return getPath(); } - /* - * @see ICVSResource#unmanage() - */ + @Override public void unmanage(IProgressMonitor monitor) throws CVSException { EclipseSynchronizer.getInstance().deleteResourceSync(resource); } - /* - * @see Comparable#compareTo(Object) - */ + @Override public int compareTo(Object arg0) { EclipseResource other = (EclipseResource)arg0; return resource.getFullPath().toString().compareTo(other.resource.getFullPath().toString()); } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSResource#getIResource() - */ + @Override public IResource getIResource() { return resource; } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java index d40958e5d..3a9b0e33f 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java @@ -168,25 +168,16 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { setWorkspaceSyncState(workspaceSyncState); } - /** - * @see ICVSResource#accept(ICVSResourceVisitor) - */ @Override public void accept(ICVSResourceVisitor visitor) throws CVSException { visitor.visitFile(this); } - /** - * @see ICVSResource#accept(ICVSResourceVisitor, boolean) - */ @Override public void accept(ICVSResourceVisitor visitor, boolean recurse) throws CVSException { visitor.visitFile(this); } - /** - * @see ICVSRemoteFile#getContents() - */ @Override public InputStream getContents(IProgressMonitor monitor) throws CVSException { try { @@ -277,9 +268,6 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { return entry; } - /** - * @see ICVSRemoteFile#getLogEntries() - */ @Override public ILogEntry[] getLogEntries(IProgressMonitor monitor) throws CVSException { monitor = Policy.monitorFor(monitor); @@ -309,9 +297,6 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { } } - /** - * @see ICVSRemoteFile#getRevision() - */ @Override public String getRevision() { try { @@ -344,9 +329,6 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { return file; } - /** - * @see ICVSFile#getSyncInfo() - */ @Override public ResourceSyncInfo getSyncInfo() { try { @@ -357,9 +339,6 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { } } - /** - * @see ICVSResource#getRemoteLocation(ICVSFolder) - */ @Override public String getRemoteLocation(ICVSFolder stopSearching) throws CVSException { return parent.getRemoteLocation(stopSearching) + Session.SERVER_SEPARATOR + getName(); @@ -382,9 +361,6 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { return parent.getRepository(); } - /** - * @see IManagedFile#setFileInfo(FileProperties) - */ @Override public void setSyncInfo(ResourceSyncInfo fileInfo, int modificationState) { setSyncBytes(fileInfo.getBytes(),modificationState); @@ -464,9 +440,6 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { // RemoteFiles are not mutable so do not support timestamp changes } - /** - * @see ICVSFile#moveTo(String) - */ @Override public void copyTo(String mFile) { // Do nothing @@ -522,49 +495,31 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { return super.equals(target) && remote.getRevision().equals(getRevision()); } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFile#checkout(int) - */ @Override public void edit(int notifications, boolean notifyForWritable, IProgressMonitor monitor) { // do nothing } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFile#uncheckout() - */ @Override public void unedit(IProgressMonitor monitor) { // do nothing } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFile#notificationCompleted() - */ @Override public void notificationCompleted() { // do nothing } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFile#getPendingNotification() - */ @Override public NotifyInfo getPendingNotification() { return null; } - /** - * @see RemoteResource#forTag(ICVSRemoteFolder, CVSTag) - */ @Override public ICVSRemoteResource forTag(ICVSRemoteFolder parent, CVSTag tag) { return new RemoteFile((RemoteFolder)parent, getWorkspaceSyncState(), getName(), getRevision(), getKeywordMode(), tag); } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSRemoteResource#forTag(org.eclipse.team.internal.ccvs.core.CVSTag) - */ @Override public ICVSRemoteResource forTag(CVSTag tag) { RemoteFolderTree remoteFolder = new RemoteFolderTree(null, getRepository(), @@ -574,30 +529,18 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile { remoteFolder.setChildren(new ICVSRemoteResource[] { remoteFile }); return remoteFile; } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFile#committed(org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo) - */ @Override public void checkedIn(String info, boolean commit) { // do nothing } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFile#isEdited() - */ @Override public boolean isEdited() { return false; } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFile#getSyncBytes() - */ @Override public byte[] getSyncBytes() { return syncBytes; } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFile#setSyncBytes(byte[]) - */ @Override public void setSyncBytes(byte[] syncBytes, int modificationState) { if (fetching) { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java index 180dfd2d0..2eb13c50e 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java @@ -80,16 +80,12 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC this.repository = repository; } - /** - * @see ICVSResource#accept(ICVSResourceVisitor) - */ + @Override public void accept(ICVSResourceVisitor visitor) throws CVSException { visitor.visitFolder(this); } - /** - * @see ICVSResource#accept(ICVSResourceVisitor, boolean) - */ + @Override public void accept(ICVSResourceVisitor visitor, boolean recurse) throws CVSException { visitor.visitFolder(this); ICVSResource[] resources; @@ -103,9 +99,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC } } - /* - * @see ICVSRemoteResource#exists(IProgressMonitor) - */ + @Override public boolean exists(IProgressMonitor monitor) throws TeamException { try { members(monitor); @@ -223,9 +217,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC return children; } - /** - * @see ICVSFolder#members(int) - */ + @Override public ICVSResource[] members(int flags) throws CVSException { final List<ICVSResource> result = new ArrayList<>(); ICVSRemoteResource[] resources = getChildren(); @@ -257,9 +249,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC return (ICVSResource[]) result.toArray(new ICVSResource[result.size()]); } - /** - * @see ICVSFolder#getFolder(String) - */ + @Override public ICVSFolder getFolder(String name) throws CVSException { if (name.equals(Session.CURRENT_LOCAL_FOLDER) || name.equals(Session.CURRENT_LOCAL_FOLDER + Session.SERVER_SEPARATOR)) return this; @@ -270,9 +260,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC throw new CVSException(status); } - /** - * @see ICVSFolder#getFile(String) - */ + @Override public ICVSFile getFile(String name) throws CVSException { ICVSResource child = getChild(name); if (!child.isFolder()) @@ -290,9 +278,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC return getFolderSyncInfo().getRepository(); } - /** - * @see ICVSResource#getRelativePath(ICVSFolder) - */ + @Override public String getRelativePath(ICVSFolder ancestor) throws CVSException { // Check to see if the receiver is the ancestor if (ancestor == this) return Session.CURRENT_LOCAL_FOLDER; @@ -308,16 +294,12 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC return repository; } - /** - * @see ICVSRemoteFolder#isExpandable() - */ + @Override public boolean isExpandable() { return true; } - /** - * @see ICVSResource#isFolder() - */ + @Override public boolean isFolder() { return true; } @@ -367,9 +349,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC throw new CVSException(status); } - /** - * @see ICVSFolder#mkdir() - */ + @Override public void mkdir() throws CVSException { IStatus status = new CVSStatus(IStatus.ERROR, CVSMessages.RemoteResource_invalidOperation); throw new CVSException(status); @@ -381,16 +361,12 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC public void flush(boolean deep) { } - /** - * @see ICVSFolder#getFolderInfo() - */ + @Override public FolderSyncInfo getFolderSyncInfo() { return folderInfo; } - /** - * @see ICVSResource#getRemoteLocation(ICVSFolder) - */ + @Override public String getRemoteLocation(ICVSFolder stopSearching) throws CVSException { if (folderInfo == null) { return Util.appendPath(parent.getRemoteLocation(stopSearching), getName()); @@ -398,31 +374,23 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC return folderInfo.getRemoteLocation(); } - /** - * @see ICVSFolder#isCVSFolder() - */ + @Override public boolean isCVSFolder() { return folderInfo != null; } - /** - * @see ICVSFolder#acceptChildren(ICVSResourceVisitor) - */ + @Override public void acceptChildren(ICVSResourceVisitor visitor) throws CVSException { IStatus status = new CVSStatus(IStatus.ERROR, CVSMessages.RemoteResource_invalidOperation); throw new CVSException(status); } - /* - * @see IRemoteResource#isContainer() - */ + @Override public boolean isContainer() { return true; } - /* - * @see IRemoteResource#members(IProgressMonitor) - */ + @Override public ICVSRemoteResource[] members(IProgressMonitor progress) throws TeamException { return getMembers(progress); } @@ -449,30 +417,23 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC setFolderSyncInfo(newInfo); } - /* - * @see ICVSRemoteFolder#getTag() - */ + @Override public CVSTag getTag() { if (folderInfo == null) return null; return folderInfo.getTag(); } - /* - * @see ICVSFolder#setFolderInfo(FolderSyncInfo) - */ + + @Override public void setFolderSyncInfo(FolderSyncInfo folderInfo) { this.folderInfo = folderInfo.asImmutable(); } - /* - * @see ICVSFolder#run(ICVSRunnable, IProgressMonitor) - */ + @Override public void run(ICVSRunnable job, IProgressMonitor monitor) throws CVSException { job.run(monitor); } - /* - * @see ICVSFolder#tag(CVSTag, LocalOption[], IProgressMonitor) - */ + @Override public IStatus tag(final CVSTag tag, final LocalOption[] localOptions, IProgressMonitor monitor) throws CVSException { monitor = Policy.monitorFor(monitor); monitor.beginTask(null, 100); @@ -492,9 +453,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC } } - /** - * @see ICVSFolder#fetchChildren(IProgressMonitor) - */ + @Override public ICVSResource[] fetchChildren(IProgressMonitor monitor) throws CVSException { try { return getMembers(monitor); @@ -515,9 +474,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC return tag1.equals(tag2); } - /** - * @see java.lang.Object#hashCode() - */ + @Override public int hashCode() { CVSTag tag = getTag(); if (tag == null) tag = CVSTag.DEFAULT; @@ -537,30 +494,22 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC return getRelativePathFromRootRelativePath((ICVSFolder)root.getChild(path.segment(0)), path.removeFirstSegments(1)); } - /** - * @see ICVSRemoteFolder#forTag(CVSTag) - */ + @Override public ICVSRemoteResource forTag(ICVSRemoteFolder parent, CVSTag tagName) { return new RemoteFolder((RemoteFolder)parent, getName(), repository, folderInfo.getRepository(), tagName, folderInfo.getIsStatic()); } - /** - * @see ICVSRemoteFolder#forTag(CVSTag) - */ + @Override public ICVSRemoteResource forTag(CVSTag tagName) { return (ICVSRemoteFolder)forTag(null, tagName); } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder#isDefinedModule() - */ + @Override public boolean isDefinedModule() { return false; } - /** - * @see org.eclipse.team.internal.ccvs.core.resources.RemoteResource#getSyncInfo() - */ + @Override public ResourceSyncInfo getSyncInfo() { return new ResourceSyncInfo(getName()); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java index 6633034b0..df979cff2 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTree.java @@ -64,9 +64,6 @@ public class RemoteFolderTree extends RemoteFolder { super.setChildren(children); } - /* - * @see ICVSFolder#acceptChildren(ICVSResourceVisitor) - */ public void acceptChildren(ICVSResourceVisitor visitor) throws CVSException { ICVSRemoteResource[] children = getChildren(); if (children == null) return; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java index 629cbd9a8..470a79bee 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java @@ -301,9 +301,6 @@ public class RemoteModule extends RemoteFolder { return Checkout.ALIAS.isElementOf(localOptions); } - /** - * @see ICVSRemoteFolder#isExpandable() - */ public boolean isExpandable() { return expandable; } @@ -312,9 +309,6 @@ public class RemoteModule extends RemoteFolder { this.expandable = expandable; } - /** - * @see ICVSRemoteFolder#forTag(CVSTag) - */ public ICVSRemoteResource forTag(ICVSRemoteFolder parent, CVSTag tagName) { RemoteModule r = new RemoteModule(label, (RemoteFolder)parent, getRepository(), folderInfo.getRepository(), localOptions, tagName, folderInfo.getIsStatic()); r.setExpandable(expandable); @@ -340,15 +334,9 @@ public class RemoteModule extends RemoteFolder { return r; } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder#isDefinedModule() - */ public boolean isDefinedModule() { return true; } - /** - * @see java.lang.Object#equals(java.lang.Object) - */ public boolean equals(Object arg0) { if (arg0 instanceof RemoteModule) { RemoteModule module = (RemoteModule) arg0; @@ -357,16 +345,10 @@ public class RemoteModule extends RemoteFolder { return false; } - /** - * @see java.lang.Object#hashCode() - */ public int hashCode() { return super.hashCode() | getName().hashCode(); } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSFolder#getChild(java.lang.String) - */ public ICVSResource getChild(String path) throws CVSException { if (path.equals(Session.CURRENT_LOCAL_FOLDER) || path.length() == 0) return this; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java index 4b2e977b0..33e526700 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteResource.java @@ -46,23 +46,14 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC this.name = name; } - /* - * @see ICVSRemoteResource#getName() - */ public String getName() { return name; } - /* - * @see ICVSResource#getRelativePath(ICVSFolder) - */ public String getRelativePath(ICVSFolder ancestor) throws CVSException { return Util.appendPath(parent.getRelativePath(ancestor), getName()); } - /* - * @see ICVSRemoteResource#getParent() - */ public ICVSRemoteResource getRemoteParent() { return parent; } @@ -79,9 +70,6 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC this.workspaceSyncState = workspaceSyncState; } - /* - * @see ICVSResource#delete() - */ public void delete() { // For now, do nothing but we could provide this in the future. } @@ -98,30 +86,18 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC return true; } - /* - * @see ICVSRemoteResource#exists(IProgressMonitor) - */ public boolean exists(IProgressMonitor monitor) throws TeamException { return parent.exists(this, monitor); } - /* - * @see ICVSResource#getParent() - */ public ICVSFolder getParent() { return parent; } - /* - * @see ICVSResource#isIgnored() - */ public boolean isIgnored() { return false; } - /* - * @see ICVSResource#isManaged() - */ public boolean isManaged() { return parent != null; } @@ -132,16 +108,10 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC return true; } - /* - * @see ICVSResource#unmanage() - */ public void unmanage(IProgressMonitor monitor) throws CVSException { // do nothing } - /* - * @see ICVSResource#getSyncInfo() - */ public abstract ResourceSyncInfo getSyncInfo(); public boolean equals(Object target) { @@ -155,17 +125,11 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC && remote.getRepositoryRelativePath().equals(getRepositoryRelativePath()); } - /* - * @see ICVSResource#setIgnoredAs(String) - */ public void setIgnoredAs(String pattern) throws CVSException { // ensure that clients are not trying to set sync info on remote handles. Assert.isTrue(false); } - /** - * @see org.eclipse.team.internal.ccvs.core.ICVSResource#getIResource() - */ public IResource getIResource() { return null; } @@ -180,9 +144,6 @@ public abstract class RemoteResource extends CachedResourceVariant implements IC */ public abstract ICVSRemoteResource forTag(ICVSRemoteFolder parent, CVSTag tagName); - /** - * @see java.lang.Object#hashCode() - */ public int hashCode() { return getRepositoryRelativePath().hashCode(); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java index 201841f04..f76475112 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java @@ -303,9 +303,6 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter; return true; } - /** - * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#getCachedSyncBytes(org.eclipse.core.resources.IResource, boolean) - */ byte[] getCachedSyncBytes(IResource resource, boolean threadSafeAccess) throws CVSException { byte[] bytes = (byte[])safeGetSessionProperty(resource, RESOURCE_SYNC_KEY); // If we are not thread safe, just return whatever was found in the session property @@ -361,9 +358,6 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter; } } - /** - * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#setCachedSyncBytes(org.eclipse.core.resources.IResource, byte[]) - */ void setCachedSyncBytes(IResource resource, byte[] syncBytes, boolean canModifyWorkspace) throws CVSException { // Ensure that the sync bytes do not indicate a deletion if (syncBytes != null && ResourceSyncInfo.isDeletion(syncBytes)) { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java index 35940dd05..f8cd3e8c2 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java @@ -118,9 +118,6 @@ import org.eclipse.team.internal.ccvs.core.util.Util; } } - /** - * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#getCachedSyncBytes(org.eclipse.core.resources.IResource, boolean) - */ byte[] getCachedSyncBytes(IResource resource, boolean threadSafeAccess) throws CVSException { try { byte[] bytes = null; @@ -146,9 +143,6 @@ import org.eclipse.team.internal.ccvs.core.util.Util; } } - /** - * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#setCachedSyncBytes(org.eclipse.core.resources.IResource, byte[]) - */ void setCachedSyncBytes(IResource resource, byte[] syncBytes, boolean canModifyWorkspace) throws CVSException { byte[] oldBytes = getCachedSyncBytes(resource, true); try { @@ -235,23 +229,15 @@ import org.eclipse.team.internal.ccvs.core.util.Util; return true; } - /** - * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#isResourceSyncInfoCached(org.eclipse.core.resources.IContainer) - */ boolean isResourceSyncInfoCached(IContainer container) throws CVSException { // the sync info is always cahced when using the synchronizer return true; } - /** - * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#setResourceSyncInfoCached(org.eclipse.core.resources.IContainer) - */ void setResourceSyncInfoCached(IContainer container) throws CVSException { // do nothing } - /** - * @see org.eclipse.team.internal.ccvs.core.resources.SyncInfoCache#isFolderSyncInfoCached(org.eclipse.core.resources.IContainer) - */ + boolean isFolderSyncInfoCached(IContainer container) throws CVSException { return true; } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java index 58e2c7f17..9cbc96c48 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/FolderSyncInfo.java @@ -235,9 +235,7 @@ public class FolderSyncInfo { this.tag = new CVSEntryLineTag(tag); } } - /* - * @see Object#toString() - */ + public String toString() { return getRoot() + "/" + getRepository() + "/" + getTag(); //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java index d30cfcd0c..748539195 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/MutableResourceSyncInfo.java @@ -129,9 +129,7 @@ public class MutableResourceSyncInfo extends ResourceSyncInfo { } } - /** - * @see org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo#setEntryLine(java.lang.String) - */ + @Override public void setEntryLine(String entryLine) throws CVSException { super.setEntryLine(entryLine); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java index 7c57f134d..587d490ff 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/ResourceSyncInfo.java @@ -316,9 +316,7 @@ public class ResourceSyncInfo { return getName().hashCode(); } - /* - * @see Object#toString() - */ + @Override public String toString() { return getEntryLine(true, null /*no timestamp override*/); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java index 915200cf6..125df45d5 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/BuildCleanupListener.java @@ -45,9 +45,7 @@ public class BuildCleanupListener implements IResourceDeltaVisitor, IResourceCha return destination; } - /** - * @see IResourceDeltaVisitor#visit(IResourceDelta) - */ + @Override public boolean visit(IResourceDelta delta) throws CoreException { IResource resource = delta.getResource(); boolean movedFrom = (delta.getFlags() & IResourceDelta.MOVED_FROM) > 0; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java index b4d856bb5..cae80c613 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/MoveDeleteHook.java @@ -30,9 +30,7 @@ import org.eclipse.team.internal.ccvs.core.resources.EclipseSynchronizer; */ public class MoveDeleteHook implements IMoveDeleteHook { - /** - * @see IMoveDeleteHook#deleteFile(IResourceTree, IFile, int, IProgressMonitor) - */ + @Override public boolean deleteFile( final IResourceTree tree, final IFile file, @@ -74,9 +72,7 @@ public class MoveDeleteHook implements IMoveDeleteHook { return true; } - /** - * @see IMoveDeleteHook#deleteFolder(IResourceTree, IFolder, int, IProgressMonitor) - */ + @Override public boolean deleteFolder( final IResourceTree tree, final IFolder folder, @@ -110,9 +106,7 @@ public class MoveDeleteHook implements IMoveDeleteHook { return false; } - /** - * @see IMoveDeleteHook#deleteProject(IResourceTree, IProject, int, IProgressMonitor) - */ + @Override public boolean deleteProject( IResourceTree tree, IProject project, @@ -131,9 +125,7 @@ public class MoveDeleteHook implements IMoveDeleteHook { return false; } - /** - * @see IMoveDeleteHook#moveFile(IResourceTree, IFile, IFile, int, IProgressMonitor) - */ + @Override public boolean moveFile( final IResourceTree tree, final IFile source, @@ -179,9 +171,7 @@ public class MoveDeleteHook implements IMoveDeleteHook { return true; } - /** - * @see IMoveDeleteHook#moveFolder(IResourceTree, IFolder, IFolder, int, IProgressMonitor) - */ + @Override public boolean moveFolder( final IResourceTree tree, final IFolder source, @@ -233,9 +223,7 @@ public class MoveDeleteHook implements IMoveDeleteHook { return false; } - /** - * @see IMoveDeleteHook#moveProject(IResourceTree, IProject, IProjectDescription, int, IProgressMonitor) - */ + @Override public boolean moveProject( IResourceTree tree, IProject source, diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java index 44dafbb02..25a10777f 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java @@ -45,9 +45,7 @@ public class PrepareForReplaceVisitor implements ICVSResourceVisitor { this.session = session; } - /** - * @see ICVSResourceVisitor#visitFile(ICVSFile) - */ + @Override public void visitFile(ICVSFile file) throws CVSException { byte[] syncBytes = file.getSyncBytes(); if (syncBytes == null) { @@ -136,9 +134,7 @@ public class PrepareForReplaceVisitor implements ICVSResourceVisitor { return false; } - /** - * @see ICVSResourceVisitor#visitFolder(ICVSFolder) - */ + @Override public void visitFolder(ICVSFolder folder) throws CVSException { // Delete unmanaged folders if the user wants them deleted if (!folder.isCVSFolder()) { 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 eae3e7510..1daca5d76 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 @@ package org.eclipse.team.internal.ccvs.ui; 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 @@ public class AdaptableHierarchicalResourceList extends AdaptableResourceList { 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 class AdaptableHierarchicalResourceList extends AdaptableResourceList { */ 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 b056f7c3a..3e5499027 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 @@ public class AddToVersionControlDialog extends DetailsDialog { 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 fe60e937f..15c6caac1 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 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork 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 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork 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 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork 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 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork 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 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork 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 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork prefs.setDefault(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION, fNewResource.getSelection()); } + @Override public void widgetDefaultSelected(SelectionEvent e) { } } @@ -271,6 +282,7 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork item.setControl(composite); } + @Override public void initializeValues(IPreferenceStore store) { fFileDecoration.initializeValue(store); fFolderDecoration.initializeValue(store); @@ -279,6 +291,7 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork dirtyFlag.setText(store.getString(ICVSUIConstants.PREF_DIRTY_FLAG)); } + @Override public void performOk(IPreferenceStore store) { fFileDecoration.performOk(store); fFolderDecoration.performOk(store); @@ -287,6 +300,7 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork store.setValue(ICVSUIConstants.PREF_DIRTY_FLAG, dirtyFlag.getText()); } + @Override public void performDefaults(IPreferenceStore store) { fFileDecoration.performDefaults(store); fFolderDecoration.performDefaults(store); @@ -308,11 +322,13 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork 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 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork 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 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork } } + @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 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork return getDecoration(element).getFont(); } + @Override public String getText(Object element) { final CVSDecoration decoration = getDecoration(element); final StringBuffer buffer = new StringBuffer(); @@ -482,6 +512,7 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork return decoration; } + @Override public Image getImage(Object element) { final String s; switch (((PreviewFile)element).type) { @@ -512,6 +543,7 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork ThemeListener(Preview preview) { fPreview= preview; } + @Override public void propertyChange(PropertyChangeEvent event) { fPreview.refresh(); } @@ -562,6 +594,7 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork 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 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork return tabFolder; } + @Override public void dispose() { if (fThemeListener != null) PlatformUI.getWorkbench().getThemeManager().removePropertyChangeListener(fThemeListener); @@ -611,9 +645,7 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork setValid(true); } - /** - * @see IWorkbenchPreferencePage#init(IWorkbench) - */ + @Override public void init(IWorkbench workbench) { } @@ -622,6 +654,7 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork * * @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 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork * Defaults was clicked. Restore the CVS preferences to * their default values */ + @Override protected void performDefaults() { final IPreferenceStore store = getPreferenceStore(); @@ -655,6 +689,7 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork * * @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 3f3a51b32..a9b1060ba 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 @@ public abstract class CVSFieldEditorPreferencePage extends FieldEditorPreference 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 @@ public abstract class CVSFieldEditorPreferencePage extends FieldEditorPreference return control; } - /** - * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ + @Override public void init(IWorkbench workbench) { } @@ -74,9 +70,7 @@ public abstract class CVSFieldEditorPreferencePage extends FieldEditorPreference */ 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 a4f91959b..1c14839e8 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 @@ import com.ibm.icu.text.DateFormat; 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 bd7b0d6f6..20de8a4c2 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.core.runtime.IAdaptable; 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 @@ public class CVSFolderPropertiesPage extends CVSPropertiesPage { 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 6867694e9..792359752 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 @@ public class CVSHistoryFilter extends ViewerFilter { 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 c093f372a..bb629317a 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.action.IAction; 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 @@ public class CVSHistoryFilterAction extends Action { 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 @@ public class CVSHistoryFilterAction extends Action { 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 af12c09dd..52163627b 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 @@ public class CVSHistoryPage extends HistoryPage implements IAdaptable, IHistoryC } 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 d926a07c3..424fb6988 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 @@ package org.eclipse.team.internal.ccvs.ui; 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 @@ public class CVSHistorySearchFilter extends org.eclipse.jface.viewers.ViewerFilt 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 f5a81d20d..d942b74c7 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 @@ public class CVSProjectPropertiesPage extends CVSPropertiesPage { 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 90b5be933..65d3f6fc2 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 @@ import org.eclipse.ui.actions.WorkspaceModifyOperation; 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 @@ public class CVSProjectSetSerializer implements IProjectSetSerializer { 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 b4ff98f41..ab74ecc5d 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 @@ public class CVSUIPlugin extends AbstractUIPlugin { } } - /** - * @see Plugin#start(BundleContext) - */ @Override public void start(BundleContext context) throws Exception { super.start(context); @@ -717,9 +714,6 @@ public class CVSUIPlugin extends AbstractUIPlugin { } - /** - * @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 cc8ef720d..f8bc0d4d0 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 @@ public class CommitCommentArea extends DialogArea { 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 23a934fd9..6d54ac1c9 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 @@ public class ConfigureRepositoryLocationsDialog extends TitleAreaDialog { 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 fc7dbb8f2..158a89372 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 @@ public class EditorsView extends ViewPart { 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 @@ public class EditorsView extends ViewPart { } - /** - * @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 @@ public class EditorsView extends ViewPart { 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 @@ public class EditorsView extends ViewPart { } } - /** - * @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 @@ public class EditorsView extends ViewPart { 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 @@ public class EditorsView extends ViewPart { }; } - /** - * @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 3ceba83d6..5c1a2afa1 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 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc 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 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc 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 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc return super.performOk(); } - /* - * @see PreferencePage#performDefaults() - */ @Override protected void performDefaults() { IPreferenceStore store = getPreferenceStore(); @@ -283,9 +271,6 @@ public class ExtMethodPreferencePage extends PreferencePage implements IWorkbenc 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 33442e60c..ecd1ecc1d 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 @@ package org.eclipse.team.internal.ccvs.ui; 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 @@ public class KeyboardInteractiveDialog extends TrayDialog { isPasswordAuth=true; } } - /** - * @see Window#configureShell - */ + @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); @@ -107,9 +104,7 @@ protected void configureShell(Shell newShell) { PlatformUI.getWorkbench().getHelpSystem().setHelp(newShell, IHelpContextIds.KEYBOARD_INTERACTIVE_DIALOG); } - /** - * @see Window#create - */ + @Override public void create() { super.create(); @@ -123,9 +118,7 @@ public void create() { 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 61c25f280..78b7e90e6 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 @@ public class ListSelectionArea extends DialogArea { 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 @@ public class ListSelectionArea extends DialogArea { 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 @@ public class ListSelectionArea extends DialogArea { 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 @@ public class ListSelectionArea extends DialogArea { 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 8aff9891b..941fe1058 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 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi } }; - /* - * @see org.eclipse.test.quickdiff.DocumentLineDiffer.IQuickDiffReferenceProvider#getReference() - */ @Override public IDocument getReference(IProgressMonitor monitor) throws CoreException { if(! fReferenceInitialized) return null; @@ -168,9 +165,6 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi } } - /* - * @see org.eclipse.jface.text.source.diff.DocumentLineDiffer.IQuickDiffReferenceProvider#dispose() - */ @Override public void dispose() { fReferenceInitialized = false; @@ -186,17 +180,11 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi 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 a1e71495e..29fa1b73f 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 @@ public class ResourceEditionNode implements IStructureComparator, ITypedElement, return children; } - /** - * @see IStreamContentAccessor#getContents() - */ @Override public InputStream getContents() throws CoreException { IStorage storage = getStorage(); @@ -141,9 +138,6 @@ public class ResourceEditionNode implements IStructureComparator, ITypedElement, 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 98acc2bef..f1cf28e85 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.jface.dialogs.Dialog; 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 @@ public class ResourcePropertiesPage extends PropertyPage { // 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 495c4f8f9..ee3f9c7cb 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 @@ public class SimpleContentProvider implements IStructuredContentProvider { 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 fa018b68e..b7696be26 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 @@ package org.eclipse.team.internal.ccvs.ui; 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 @@ public class UserValidationDialog extends TrayDialog { this.cachingCheckbox=cachingCheckbox; } - /** - * @see Window#configureShell - */ @Override protected void configureShell(Shell newShell) { super.configureShell(newShell); @@ -91,9 +87,7 @@ public class UserValidationDialog extends TrayDialog { // 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 @@ public class UserValidationDialog extends TrayDialog { } } - /** - * @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 ad7204980..03dc364f9 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 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator { } 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 fa0e37b5e..680c2efc1 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 @@ public class WorkingSetSelectionArea extends DialogArea { * 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 @@ public class WorkingSetSelectionArea extends DialogArea { 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 @@ public class WorkingSetSelectionArea extends DialogArea { 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 @@ public class WorkingSetSelectionArea extends DialogArea { 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 @@ public class WorkingSetSelectionArea extends DialogArea { 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 2e830dda2..525167a46 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 @@ abstract public class CVSAction extends TeamAction implements IEditorActionDeleg } 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 1effe0a4f..b406dc583 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 @@ import org.eclipse.team.internal.ccvs.ui.operations.RemoteCompareOperation; */ 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 @@ public class CompareRemoteResourcesAction extends CVSAction { && 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 0a160d5ef..ba9304243 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 @@ import org.eclipse.team.internal.ccvs.ui.tags.TagSource; */ 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 @@ public class CompareRemoteWithTagAction extends CVSAction { } } - /** - * @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 bbe2c9ba2..2d821f732 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 @@ public class ConfigureTagsFromRepoViewOnFolder extends CVSAction { return new ICVSRemoteFolder[0]; } - /* - * @see CVSAction@execute(IAction) - */ @Override public void execute(IAction action) throws InvocationTargetException, InterruptedException { run((IRunnableWithProgress) monitor -> { @@ -79,16 +76,11 @@ public class ConfigureTagsFromRepoViewOnFolder extends CVSAction { }, 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 f697745d2..7ab13e685 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 @@ import org.eclipse.ui.PlatformUI; 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 @@ public class EditAction extends WorkspaceAction { }); } - /** - * @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 68fafc15f..02db4f1c4 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 @@ public class EditorsAction implements IProviderAction, IRunnableWithProgress { 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 @@ public class EditorsAction implements IProviderAction, IRunnableWithProgress { // 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 @@ public class EditorsAction implements IProviderAction, IRunnableWithProgress { * * @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 6adb09440..c05eec73e 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 @@ public class IgnoreAction extends WorkspaceTraversalAction { // 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 7975b0b14..6e598a1ba 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 @@ import org.eclipse.team.internal.ccvs.ui.tags.TagSelectionDialog; 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 75c078d8a..9ce9592fa 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.jface.wizard.WizardDialog; 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 @@ public class NewRepositoryAction implements IWorkbenchWindowActionDelegate, IVie 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 c46467df6..8845dc42f 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 @@ public class OpenLogEntryAction extends CVSAction { } return new ILogEntry[0]; } - /* - * @see CVSAction#execute(IAction) - */ + @Override public void execute(IAction action) throws InterruptedException, InvocationTargetException { run((IRunnableWithProgress) monitor -> { @@ -78,9 +76,7 @@ public class OpenLogEntryAction extends CVSAction { } }, 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 1b42777fd..76070f5a6 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 @@ public class OpenRemoteFileAction extends CVSAction { } return new ICVSRemoteFile[0]; } - /* - * @see CVSAction#execute(IAction) - */ @Override public void execute(IAction action) throws InterruptedException, InvocationTargetException { run((IRunnableWithProgress) monitor -> { @@ -75,9 +72,7 @@ public class OpenRemoteFileAction extends CVSAction { } }, 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 994ca7e6a..0186e7612 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 @@ public class RestoreFromRepositoryAction extends WorkspaceTraversalAction { } } - /** - * @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 @@ public class RestoreFromRepositoryAction extends WorkspaceTraversalAction { 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 70ea14811..2ec2dbf3a 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 @@ import org.eclipse.team.internal.ccvs.ui.wizards.ModeWizard; */ 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 3e68bd2f0..a365879db 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 @@ public class ShowHistoryAction extends CVSAction { } return new ICVSRemoteFile[0]; } - /* - * @see CVSAction#executeIAction) - */ + @Override public void execute(IAction action) throws InterruptedException, InvocationTargetException { run((IRunnableWithProgress) monitor -> { @@ -68,17 +66,13 @@ public class ShowHistoryAction extends CVSAction { 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 a1d3bcb0b..7987a39bc 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.internal.ui.TeamUIPlugin; 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 @@ public class ShowResourceInHistoryAction extends WorkspaceAction { }, 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 4ac4955c8..22bf5c49b 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 @@ public abstract class TagAction extends WorkspaceTraversalAction { // 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 @@ public abstract class TagAction extends WorkspaceTraversalAction { 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 7b8d275e6..099bfacda 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.ICVSRepositoryLocation; 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 @@ public class TagInRepositoryAction extends TagAction { 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 ee384f64e..5798096c1 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 @@ public class UnmanageAction extends WorkspaceAction { private boolean deleteContent = false; - /* - * @see IActionDelegate#run(IAction) - */ @Override public void execute(IAction action) throws InterruptedException, InvocationTargetException { if(confirmDeleteProjects()) { @@ -133,17 +130,11 @@ public class UnmanageAction extends WorkspaceAction { 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 c7a10ee19..563409201 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 @@ import org.eclipse.team.internal.ccvs.ui.wizards.UpdateWizard; * 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 0e30db985..7da395b4c 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 abstract class WorkspaceAction extends CVSAction { 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 a63d91f58..342d709a1 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 @@ public class CVSRemoteFilePropertySource implements IPropertySource { 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 1b8d78338..ec663e48b 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.CVSTag; 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 @@ public class CVSRemoteFolderPropertySource implements IPropertySource { /** * Do nothing because properties are read only. */ + @Override public Object getEditableValue() { return this; } @@ -60,13 +59,12 @@ public class CVSRemoteFolderPropertySource implements IPropertySource { /** * 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 @@ public class CVSRemoteFolderPropertySource implements IPropertySource { * 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 @@ public class CVSRemoteFolderPropertySource implements IPropertySource { * * @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 bba0ca3d5..32b00c8ae 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 @@ package org.eclipse.team.internal.ccvs.ui.model; 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 @@ public class CVSRepositoryLocationPropertySource implements IPropertySource { /** * Do nothing because properties are read only. */ + @Override public Object getEditableValue() { return this; } @@ -74,13 +73,12 @@ public class CVSRepositoryLocationPropertySource implements IPropertySource { /** * 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 @@ public class CVSRepositoryLocationPropertySource implements IPropertySource { * 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 @@ public class CVSRepositoryLocationPropertySource implements IPropertySource { * * @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 f188851d3..45ab84623 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 class RemoteProjectsElement extends CVSTagElement { 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 @@ public class RemoteProjectsElement extends CVSTagElement { 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 9fac87af9..fa8e05390 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 @@ public class AddToBranchAction extends CVSAction { 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 @@ public class AddToBranchAction extends CVSAction { }, 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 f8d68bf06..ff5318b85 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 @@ public class CVSRepositoryPropertiesPage extends PropertyPage { private Button useCustomLabel; private Text labelText; - /* - * @see PreferencesPage#createContents - */ @Override protected Control createContents(Composite parent) { initialize(); @@ -434,9 +431,7 @@ public class CVSRepositoryPropertiesPage extends PropertyPage { 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 4b041d8d4..2c90aef1f 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 @@ package org.eclipse.team.internal.ccvs.ui.repo; 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 @@ class CommentHistoryContentHandler extends DefaultHandler { 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 @@ class CommentHistoryContentHandler extends DefaultHandler { } } - /** - * @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 81891947b..8a4b17387 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 @@ class CommentTemplatesContentHandler extends DefaultHandler { 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 @@ class CommentTemplatesContentHandler extends DefaultHandler { } } - /** - * @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 21b59b888..57015f8e7 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 @@ public class RefreshRemoteProjectSelectionPage extends CVSWizardPage { 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 50c3d52c8..5677462a3 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 @@ public class RefreshRemoteProjectWizard extends Wizard { setWindowTitle(CVSUIMessages.RefreshRemoteProjectWizard_title); } - /** - * @see org.eclipse.jface.wizard.IWizard#addPages() - */ @Override public void addPages() { setNeedsProgressMonitor(true); @@ -100,9 +97,6 @@ public class RefreshRemoteProjectWizard extends Wizard { 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 dcf6ea9a8..c27523555 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 @@ import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; */ 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 ee3f657ca..204e49302 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.*; 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 @@ public abstract class RemoteViewPart extends ViewPart implements ISelectionListe 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 @@ public abstract class RemoteViewPart extends ViewPart implements ISelectionListe PlatformUI.getWorkbench().getHelpSystem().setHelp(viewer.getControl(), helpID); } - /** - * @see WorkbenchPart#setFocus - */ @Override public void setFocus() { viewer.getControl().setFocus(); @@ -332,16 +327,10 @@ public abstract class RemoteViewPart extends ViewPart implements ISelectionListe 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 1a6c3c8dd..7072f0059 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 @@ public class RepositoriesFilterAction extends Action { 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 0ea3d00d4..063302a89 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 @@ public class RepositoriesViewContentHandler extends DefaultHandler { 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 @@ public class RepositoriesViewContentHandler extends DefaultHandler { 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 0636942bf..3ba1123d6 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 @@ public class BranchPromptDialog extends DetailsDialog { this.versionName = versionName; } - /** - * @see DetailsDialog#createMainDialogArea(Composite) - */ @Override protected void createMainDialogArea(Composite composite) { @@ -130,9 +127,6 @@ public class BranchPromptDialog extends DetailsDialog { } } - /** - * @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 814c256a8..b6a5c8f54 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 @@ public class CVSFileElement extends CVSResourceElement { /** * 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 @@ public class CVSFileElement extends CVSResourceElement { return null; } } - /** - * @see IWorkbenchAdapter#getParent(Object) - */ + + @Override public Object getParent(Object o) { return null; } @@ -69,9 +71,8 @@ public class CVSFileElement extends CVSResourceElement { 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 71e94dd73..26e7664f3 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 @@ public class CVSFolderElement extends CVSResourceElement { /** * 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 @@ public class CVSFolderElement extends CVSResourceElement { * 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 2bda09700..3b46a4526 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 @@ public class TagAsVersionDialog extends DetailsDialog { 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 f13bdc6f7..a3de224d6 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 @@ public class CheckoutAsProjectSelectionPage extends CVSWizardPage { 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 7083fcd84..0494a1d92 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 @@ public class CheckoutAsWizard extends Wizard { 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 @@ public class CheckoutAsWizard extends Wizard { 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 129b76ea6..013ee872f 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 @@ public class ConfigurationWizardAutoconnectPage extends CVSWizardPage { 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 bd056e837..b4410999e 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 @@ public class GenerateDiffFileWizard extends Wizard { 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 d16e99685..f0afb980b 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 @@ public class NewLocationWizard extends Wizard implements INewWizard { 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 a4d172fd5..1e00d3b71 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 @@ public class RestoreFromRepositoryFileSelectionPage extends CVSWizardPage { 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 340603099..964a9a4b4 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.resource.ImageDescriptor; 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 @@ public class RestoreFromRepositoryWizard extends Wizard { 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 91ea803a6..d45565578 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 @@ public class SharingWizard extends Wizard implements IConfigurationWizard, ICVSW return null; } - /* - * @see IWizard#performFinish - */ @Override public boolean performFinish() { final boolean[] result = new boolean[] { true }; @@ -371,9 +368,6 @@ public class SharingWizard extends Wizard implements IConfigurationWizard, ICVSW 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 38206321a..8bc35262a 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 @@ public class UpdateWizard extends ResizableWizard { 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 @@ public class UpdateWizard extends ResizableWizard { 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 38b8f957b..8ac7d6259 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 @@ public class PropertyChangeHandler { 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 853b39680..c5f61691e 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.IExtension; 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 @@ public class TeamUIPlugin extends AbstractUIPlugin { 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 0ed1e78e8..3dd65964a 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 @@ public class PreferencePageContainerDialog extends TrayDialog this.pages = pages; } - /** - * @see Dialog#okPressed() - */ @Override protected void okPressed() { for (int i = 0; i < pages.length; i++) { @@ -134,9 +131,6 @@ public class PreferencePageContainerDialog extends TrayDialog } } - /** - * @see Dialog#createDialogArea(Composite) - */ @Override protected Control createDialogArea(Composite parent) { Composite composite = (Composite)super.createDialogArea(parent); @@ -375,9 +369,6 @@ public class PreferencePageContainerDialog extends TrayDialog } } - /** - * @see IPreferencePageContainer#updateMessage() - */ @Override public void updateMessage() { if (currentPage != null) { @@ -407,17 +398,11 @@ public class PreferencePageContainerDialog extends TrayDialog } } - /** - * @see IPreferencePageContainer#getPreferenceStore() - */ @Override public IPreferenceStore getPreferenceStore() { return null; } - /** - * @see IPreferencePageContainer#updateButtons() - */ @Override public void updateButtons() { if (fOkButton != null) { @@ -433,17 +418,11 @@ public class PreferencePageContainerDialog extends TrayDialog } } - /** - * @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 95119f0e0..25d37b81d 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 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison 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 e8961039c..e60e615b3 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 @@ public class ImportProjectSetMainPage extends TeamWizardPage { } - /* - * @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 98e087342..193f32ed1 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 @@ Manifest-Version: 1.0 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 7eba00b1c..8c1e678d0 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 0962fe2e3..30fdfb540 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 @@ public abstract class AbstractMatching { 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 @@ public abstract class AbstractMatching { 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 4fdc8ae64..71872bb4e 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 @@ public class IdMap { fOrdered= ordered; } - /* - * @see Object#equals(Object) - */ @Override public boolean equals(Object object) { if (!(object instanceof IdMap)) @@ -98,9 +95,6 @@ public class IdMap { 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 21c5e64ae..9ad4c81f4 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 @@ public class Mapping { fIdAttribute = idattribute; } - /* - * @see Object#equals(Object) - */ @Override public boolean equals(Object object) { if (!(object instanceof Mapping)) @@ -55,9 +52,6 @@ public class Mapping { 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 4266bb142..e4120dd0f 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 @@ public class SWTUtil { } } - /* - * @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 9084f05f6..33d63ae39 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 @@ public class XMLComparePreferencePage extends PreferencePage implements IWorkben fOrderedElementsInternal= plugin.getOrderedElementsInternal(); } - /** - * @see PreferencePage#createContents(Composite) - */ @Override protected Control createContents(Composite ancestor) { Composite parent= new Composite(ancestor, SWT.NULL); @@ -772,9 +769,6 @@ public class XMLComparePreferencePage extends PreferencePage implements IWorkben 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 04a8b0eb4..1b31f8edd 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 @@ public class XMLNode extends DocumentRangeNode implements ITypedElement { return fValue; } - /* - * @see ITypedElement#getName - */ @Override public String getName() { if (fName != null) @@ -83,9 +80,6 @@ public class XMLNode extends DocumentRangeNode implements ITypedElement { 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 30f5cf852..2c61f4338 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 @@ public abstract class StatusDialog extends Dialog { fOkButton.setEnabled(!status.matches(IStatus.ERROR)); } - /* - * @see Window#create(Shell) - */ @Override protected void configureShell(Shell shell) { super.configureShell(shell); @@ -98,9 +95,6 @@ public abstract class StatusDialog extends Dialog { shell.setText(fTitle); } - /* - * @see Window#create() - */ @Override public void create() { super.create(); @@ -115,18 +109,12 @@ public abstract class StatusDialog extends Dialog { } } - /* - * @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 22a48e139..9f46d8698 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 @@ public class StatusInfo implements IStatus { return fSeverity == IStatus.ERROR; } - /* - * @see IStatus#getMessage - */ @Override public String getMessage() { return fStatusMessage; @@ -119,9 +116,6 @@ public class StatusInfo implements IStatus { fSeverity= IStatus.OK; } - /* - * @see IStatus#matches(int) - */ @Override public boolean matches(int severityMask) { return (fSeverity & severityMask) != 0; @@ -136,17 +130,11 @@ public class StatusInfo implements IStatus { 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 76b52e88a..b945dc303 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 @@ import org.eclipse.team.internal.ui.actions.TeamAction; */ 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 ba912f4cf..b837bc758 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.core.runtime.IAdaptable; 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 @@ public class FileSystemPropertiesPage extends PropertyPage { 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 2a4dceb7e..47f12a6e2 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 @@ public abstract class ModelResource extends ModelObject{ 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 @@ public abstract class ModelResource extends ModelObject{ 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 cb01bf474..07c5ee344 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 @@ public class PessimisticFilesystemProvider extends RepositoryProvider { 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 ee77e88b9..1fb183f2b 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 @@ extends FileModificationValidator { fProvider= provider; } - /** - * @see IFileModificationValidator#validateEdit(IFile[], Object) - */ @Override public IStatus validateEdit(IFile[] files, FileModificationValidationContext context) { if (files.length == 0) { @@ -146,9 +143,6 @@ extends FileModificationValidator { 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 4c35307e0..3ee5c2ba6 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 @@ public class ResourceChangeListener implements IResourceDeltaVisitor, IResourceC 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 f19c5abfb..0168b9932 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 @@ public class CheckInAction extends SourceManagementAction { * * @see PessimisticProviderAction#shouldEnableFor(IResource) */ + @Override protected boolean shouldEnableFor(IResource resource) { if (resource == null) return false; @@ -42,9 +43,7 @@ public class CheckInAction extends SourceManagementAction { 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 f3ea2df21..38ca10a8e 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 @@ public class CheckOutAction extends SourceManagementAction { * * @see PessimisticProviderAction#shouldEnableFor(IResource) */ + @Override protected boolean shouldEnableFor(IResource resource) { if (resource == null) return false; @@ -41,9 +42,7 @@ public class CheckOutAction extends SourceManagementAction { 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 c713ec4d8..14c058d13 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 @@ public class ConfigurationWizard extends Wizard implements IConfigurationWizard */ 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 @@ public class ConfigurationWizard extends Wizard implements IConfigurationWizard 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 158e4a9f9..322a13705 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.jface.preference.PreferencePage; 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 @@ public class PessimisticPreferencesPage IPessimisticFilesystemConstants.OPTION_DO_NOTHING, }; - /* - * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore() - */ + @Override protected IPreferenceStore doGetPreferenceStore() { return PessimisticFilesystemProviderPlugin.getInstance().getPreferenceStore(); } @@ -139,9 +141,7 @@ public class PessimisticPreferencesPage 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 @@ public class PessimisticPreferencesPage 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 @@ public class PessimisticPreferencesPage 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 7055dbc2d..a06bf4668 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 @@ import org.eclipse.team.examples.pessimistic.PessimisticFilesystemProvider; * 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 7f17558c3..d1efd473f 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 @@ public class RepositoryProviderBic extends RepositoryProvider { 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 444055285..baf35a567 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 @@ public class RepositoryProviderNaish extends RepositoryProvider { 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 class RepositoryProviderNaish extends RepositoryProvider { 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 a549e1b10..d0b0b1dd5 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 @@ public class RepositoryProviderOtherSport extends RepositoryProvider { 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 dd8fa7a42..27475f496 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 @@ import org.eclipse.team.core.*; 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 @@ public class RepositoryProviderTypeBic extends RepositoryProviderType { }; } - /** - * @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 cf1f8bf60..c2ebc1646 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 class PessimisticRepositoryProvider extends RepositoryProvider implements 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 799187e35..1f76bd56c 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 @@ public class IsModifiedTests extends EclipseTest { } } - /** - * @see junit.framework.TestCase#setUp() - */ @Override protected void setUp() throws Exception { super.setUp(); @@ -156,9 +153,6 @@ public class IsModifiedTests extends EclipseTest { 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 7e448d3d1..342597b44 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 @@ package org.eclipse.team.tests.ccvs.core.provider; 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.internal.ccvs.core.CVSTag; 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 @@ public class WatchEditTest extends EclipseTest { //return new CVSTestSetup(new WatchEditTest("testReadOnly")); } + @Override protected boolean isFailOnSyncInfoMismatch() { // See bug 198382 return CVSTestSetup.FAIL_ON_BAD_DIFF ; @@ -116,17 +119,13 @@ public class WatchEditTest extends EclipseTest { 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 a526c63ea..bd0c14a73 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 @@ public class CVSWorkspaceSubscriberTest extends CVSSyncSubscriberTest { } /* - * @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) |