diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui')
73 files changed, 169 insertions, 485 deletions
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(); |