diff options
author | Alexander Kurtakov | 2019-04-17 08:59:47 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2019-04-17 09:37:04 +0000 |
commit | 13e262c90c87ff0d0261ab9706b151e915cb0b11 (patch) | |
tree | fbfd9a3bbf8504048a0cd5c96c133c35a92b32fc | |
parent | 24d8de28c7f995ee0aa29f50d07a8b38cb5cf1c6 (diff) | |
download | eclipse.platform.team-13e262c90c87ff0d0261ab9706b151e915cb0b11.tar.gz eclipse.platform.team-13e262c90c87ff0d0261ab9706b151e915cb0b11.tar.xz eclipse.platform.team-13e262c90c87ff0d0261ab9706b151e915cb0b11.zip |
Remove useless non-javadoc/@see comments. (take 3)
Put @Override instead where needed.
Change-Id: I7ccbb74b2ab634fe2440728fbe79712e7cba765d
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
103 files changed, 160 insertions, 1005 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/StorageTypedElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/StorageTypedElement.java index 22dc95225..3861b2cb0 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/StorageTypedElement.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/StorageTypedElement.java @@ -81,17 +81,11 @@ public abstract class StorageTypedElement implements ITypedElement, IEncodedStre return bufferedContents; } - /* (non-Javadoc) - * @see org.eclipse.compare.ITypedElement#getImage() - */ @Override public Image getImage() { return CompareUI.getImage(getType()); } - /* (non-Javadoc) - * @see org.eclipse.compare.ITypedElement#getType() - */ @Override public String getType() { String name = getName(); @@ -106,9 +100,6 @@ public abstract class StorageTypedElement implements ITypedElement, IEncodedStre return ITypedElement.FOLDER_TYPE; } - /* (non-Javadoc) - * @see org.eclipse.compare.IEncodedStreamContentAccessor#getCharset() - */ @Override public String getCharset() throws CoreException { if (localEncoding != null) diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java index f16b4c43e..853b39680 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/TeamUIPlugin.java @@ -246,9 +246,6 @@ public class TeamUIPlugin extends AbstractUIPlugin { StreamMergerDelegate.start(); } - /* (non-Javadoc) - * @see Plugin#stop(BundleContext) - */ @Override public void stop(BundleContext context) throws Exception { try { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/JobRunnableContext.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/JobRunnableContext.java index 30cc37b20..21a704b83 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/JobRunnableContext.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/JobRunnableContext.java @@ -97,9 +97,6 @@ public class JobRunnableContext implements ITeamRunnableContext { this.site = site; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.operations.ITeamRunnableContext#run(java.lang.String, boolean, org.eclipse.jface.operation.IRunnableWithProgress) - */ @Override public void run(IRunnableWithProgress runnable) { Job job; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java index 8f74960bf..bab147fd1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/actions/TeamAction.java @@ -447,9 +447,6 @@ public abstract class TeamAction extends AbstractHandler implements IObjectActio } } - /* (non-Javadoc) - * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) - */ @Override public void init(IViewPart view) { if(view != null) { @@ -595,9 +592,6 @@ public abstract class TeamAction extends AbstractHandler implements IObjectActio run(action); } - /* (non-Javadoc) - * @see org.eclipse.core.commands.AbstractHandler#setEnabled(java.lang.Object) - */ @Override public void setEnabled(Object evaluationContext) { IWorkbenchWindow activeWorkbenchWindow = (IWorkbenchWindow) HandlerUtil diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java index 8c2bb0f11..7915698a3 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialog.java @@ -87,8 +87,7 @@ abstract public class DetailsDialog extends TrayDialog { setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL); } - /* (non-Javadoc) - * Method declared on Dialog. + /* * Handles the pressing of the Ok or Details button in this dialog. * If the Ok button was pressed then close this dialog. If the Details * button was pressed then toggle the displaying of the error details area. @@ -104,9 +103,6 @@ abstract public class DetailsDialog extends TrayDialog { } } - /* (non-Javadoc) - * Method declared in Window. - */ @Override protected void configureShell(Shell shell) { super.configureShell(shell); @@ -117,9 +113,6 @@ abstract public class DetailsDialog extends TrayDialog { } } - /* (non-Javadoc) - * Method declared on Dialog. - */ @Override protected void createButtonsForButtonBar(Composite parent) { // create OK and Details buttons @@ -143,8 +136,7 @@ abstract public class DetailsDialog extends TrayDialog { return IDialogConstants.HIDE_DETAILS_LABEL; } - /* (non-Javadoc) - * Method declared on Dialog. + /* * Creates and returns the contents of the upper part * of the dialog (above the button bar). */ diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java index 37499658b..45c6e8a5e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/dialogs/DetailsDialogWithProjects.java @@ -54,9 +54,6 @@ public class DetailsDialogWithProjects extends DetailsDialog { this.includeCancelButton = includeCancelButton; } - /** - * @see DetailsDialog#createMainDialogArea(Composite) - */ @Override protected void createMainDialogArea(Composite composite) { Label label = new Label(composite, SWT.WRAP); @@ -67,9 +64,6 @@ public class DetailsDialogWithProjects extends DetailsDialog { updateEnablements(); } - /** - * @see DetailsDialog#createDropDownDialogArea(Composite) - */ @Override protected Composite createDropDownDialogArea(Composite parent) { // create a composite with standard margins and spacing @@ -100,26 +94,16 @@ public class DetailsDialogWithProjects extends DetailsDialog { return composite; } - /** - * @see DetailsDialog#updateEnablements() - */ @Override protected void updateEnablements() { setPageComplete(true); } - /** - * @see DetailsDialog#includeCancelButton() - */ @Override protected boolean includeCancelButton() { return includeCancelButton; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#isMainGrabVertical() - * @since 3.4 - */ @Override protected boolean isMainGrabVertical() { return false; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionTypedElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionTypedElement.java index 4a0255498..df6a3db50 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionTypedElement.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/FileRevisionTypedElement.java @@ -55,17 +55,11 @@ public class FileRevisionTypedElement extends StorageTypedElement { this.fileRevision = fileRevision; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.StorageTypedElement#getName() - */ @Override public String getName() { return fileRevision.getName(); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.StorageTypedElement#getElementStorage(org.eclipse.core.runtime.IProgressMonitor) - */ @Override protected IStorage fetchContents(IProgressMonitor monitor) throws CoreException { return fileRevision.getStorage(monitor); @@ -109,9 +103,6 @@ public class FileRevisionTypedElement extends StorageTypedElement { return getName(); } - /* (non-Javadoc) - * @see org.eclipse.compare.ISharedDocumentAdapter#getDocumentKey(java.lang.Object) - */ @Override public IEditorInput getDocumentKey(Object element) { if (element == this && getBufferedStorage() != null) { @@ -120,9 +111,6 @@ public class FileRevisionTypedElement extends StorageTypedElement { return null; } - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { return fileRevision.hashCode(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java index 709fcbfb1..6cb46704e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/GenericHistoryTableProvider.java @@ -98,9 +98,6 @@ public class GenericHistoryTableProvider { return dateFormat; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object) - */ @Override public Color getForeground(Object element) { IFileRevision entry = adaptToFileRevision(element); @@ -110,17 +107,10 @@ public class GenericHistoryTableProvider { return null; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object) - */ @Override public Color getBackground(Object element) { return null; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object) - */ @Override public Font getFont(Object element) { IFileRevision entry = adaptToFileRevision(element); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java index bc5f8ae0a..a0fe007ab 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/LocalHistoryPage.java @@ -743,9 +743,6 @@ public class LocalHistoryPage extends HistoryPage implements IHistoryCompareAdap return null; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.history.IHistoryCompareAdapter#prepareInput(org.eclipse.compare.structuremergeviewer.ICompareInput, org.eclipse.compare.CompareConfiguration, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void prepareInput(ICompareInput input, CompareConfiguration configuration, IProgressMonitor monitor) { Object right = input.getRight(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java index 20393c44a..c1e4ff3be 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/AbstractCompareInput.java @@ -44,9 +44,6 @@ public abstract class AbstractCompareInput implements ICompareInput { this.right = right; } - /* (non-Javadoc) - * @see org.eclipse.compare.structuremergeviewer.DiffNode#addCompareInputChangeListener(org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener) - */ @Override public void addCompareInputChangeListener( ICompareInputChangeListener listener) { @@ -56,9 +53,6 @@ public abstract class AbstractCompareInput implements ICompareInput { } } - /* (non-Javadoc) - * @see org.eclipse.compare.structuremergeviewer.DiffNode#removeCompareInputChangeListener(org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener) - */ @Override public void removeCompareInputChangeListener( ICompareInputChangeListener listener) { @@ -103,25 +97,16 @@ public abstract class AbstractCompareInput implements ICompareInput { return false; } - /* (non-Javadoc) - * @see org.eclipse.compare.structuremergeviewer.ICompareInput#copy(boolean) - */ @Override public void copy(boolean leftToRight) { Assert.isTrue(false, "Copy is not support by this type of compare input"); //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.compare.structuremergeviewer.ICompareInput#getAncestor() - */ @Override public ITypedElement getAncestor() { return ancestor; } - /* (non-Javadoc) - * @see org.eclipse.compare.structuremergeviewer.ICompareInput#getImage() - */ @Override public Image getImage() { return getMainElement().getImage(); @@ -143,9 +128,6 @@ public abstract class AbstractCompareInput implements ICompareInput { return ancestor; } - /* (non-Javadoc) - * @see org.eclipse.compare.structuremergeviewer.ICompareInput#getKind() - */ @Override public int getKind() { return kind; @@ -159,25 +141,16 @@ public abstract class AbstractCompareInput implements ICompareInput { this.kind = kind; } - /* (non-Javadoc) - * @see org.eclipse.compare.structuremergeviewer.ICompareInput#getLeft() - */ @Override public ITypedElement getLeft() { return left; } - /* (non-Javadoc) - * @see org.eclipse.compare.structuremergeviewer.ICompareInput#getName() - */ @Override public String getName() { return getMainElement().getName(); } - /* (non-Javadoc) - * @see org.eclipse.compare.structuremergeviewer.ICompareInput#getRight() - */ @Override public ITypedElement getRight() { return right; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/BuildScopeOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/BuildScopeOperation.java index f5d4e5dce..4ac972a7a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/BuildScopeOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/BuildScopeOperation.java @@ -34,9 +34,6 @@ public class BuildScopeOperation extends ModelOperation { super(part, manager); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.operations.ModelOperation#execute(org.eclipse.core.runtime.IProgressMonitor) - */ @Override protected void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java index ae53f0a21..367665c27 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java @@ -29,9 +29,6 @@ public class DefaultResourceMappingMerger extends ResourceMappingMerger { this.provider = provider; } - /* (non-Javadoc) - * @see org.eclipse.team.core.mapping.ResourceMappingMerger#getModelProvider() - */ @Override protected ModelProvider getModelProvider() { return provider; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java index a51884225..0db2beed3 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java @@ -237,9 +237,6 @@ public class DiffTreeChangesSection extends ForwardingChangesSection implements calculateDescription(); } - /* (non-Javadoc) - * @see org.eclipse.team.core.diff.IDiffChangeListener#propertyChanged(int, org.eclipse.core.runtime.IPath[]) - */ @Override public void propertyChanged(IDiffTree tree, int property, IPath[] paths) { // Do nothing diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeStatusLineContributionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeStatusLineContributionGroup.java index a75cd057b..7d750b373 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeStatusLineContributionGroup.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeStatusLineContributionGroup.java @@ -70,9 +70,6 @@ public class DiffTreeStatusLineContributionGroup extends updateCounts(); } - /* (non-Javadoc) - * @see org.eclipse.team.core.diff.IDiffChangeListener#propertyChanged(int, org.eclipse.core.runtime.IPath[]) - */ @Override public void propertyChanged(IDiffTree tree, int property, IPath[] paths) { // Do nothing diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeAllOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeAllOperation.java index ea5627e04..b681f06b6 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeAllOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeAllOperation.java @@ -93,9 +93,7 @@ public final class MergeAllOperation extends SynchronizationOperation { true); createDetailsButton(parent); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.ErrorDialog#buttonPressed(int) - */ + @Override protected void buttonPressed(int id) { if (id == IDialogConstants.YES_ID) diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelActionProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelActionProvider.java index f8796d8ef..dd5473553 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelActionProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelActionProvider.java @@ -39,9 +39,6 @@ public class ResourceModelActionProvider extends SynchronizationActionProvider { public ResourceModelActionProvider() { } - /* (non-Javadoc) - * @see org.eclipse.team.ui.mapping.SynchronizationActionProvider#initialize() - */ @Override protected void initialize() { super.initialize(); @@ -78,18 +75,12 @@ public class ResourceModelActionProvider extends SynchronizationActionProvider { return null; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.mapping.SynchronizationActionProvider#fillActionBars(org.eclipse.ui.IActionBars) - */ @Override public void fillActionBars(IActionBars actionBars) { super.fillActionBars(actionBars); if (refactorActions != null) refactorActions.fillActionBars(actionBars); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.mapping.SynchronizationActionProvider#fillContextMenu(org.eclipse.jface.action.IMenuManager) - */ @Override public void fillContextMenu(IMenuManager menu) { super.fillContextMenu(menu); @@ -99,27 +90,18 @@ public class ResourceModelActionProvider extends SynchronizationActionProvider { } } - /* (non-Javadoc) - * @see org.eclipse.ui.actions.ActionGroup#updateActionBars() - */ @Override public void updateActionBars() { super.updateActionBars(); if (refactorActions != null) refactorActions.updateActionBars(); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#dispose() - */ @Override public void dispose() { super.dispose(); if (refactorActions != null) refactorActions.dispose(); } - /* (non-Javadoc) - * @see org.eclipse.ui.actions.ActionGroup#setContext(org.eclipse.ui.actions.ActionContext) - */ @Override public void setContext(ActionContext context) { super.setContext(context); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelProviderOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelProviderOperation.java index cf52f9d6c..cd8e86bf8 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelProviderOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelProviderOperation.java @@ -176,9 +176,6 @@ public abstract class ResourceModelProviderOperation extends SynchronizationOper return getElements(); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.TeamOperation#canRunAsJob() - */ @Override protected boolean canRunAsJob() { return true; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelScopeParticipantFactory.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelScopeParticipantFactory.java index 6ad0f1981..03d598a93 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelScopeParticipantFactory.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelScopeParticipantFactory.java @@ -27,9 +27,6 @@ public class ResourceModelScopeParticipantFactory implements this.provider = provider; } - /* (non-Javadoc) - * @see org.eclipse.team.core.mapping.IResourceMappingScopeParticipantFactory#createParticipant(org.eclipse.core.resources.mapping.ModelProvider, org.eclipse.team.core.mapping.provider.ResourceMappingScopeManager) - */ @Override public ISynchronizationScopeParticipant createParticipant( ModelProvider provider, ISynchronizationScope scope) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/StorageStreamMerger.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/StorageStreamMerger.java index be72feb28..eb520d922 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/StorageStreamMerger.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/StorageStreamMerger.java @@ -96,9 +96,6 @@ public class StorageStreamMerger implements IStorageMerger { return outputEncoding; } - /* (non-Javadoc) - * @see org.eclipse.team.core.mapping.IStorageMerger#canMergeWithoutAncestor() - */ @Override public boolean canMergeWithoutAncestor() { return false; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/ResourceModelPreferencePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/ResourceModelPreferencePage.java index 1552e7b45..9330b3d3f 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/ResourceModelPreferencePage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/ResourceModelPreferencePage.java @@ -35,9 +35,6 @@ public class ResourceModelPreferencePage extends FieldEditorPreferencePage imple setPreferenceStore(TeamUIPlugin.getPlugin().getPreferenceStore()); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ @Override public void createControl(Composite parent) { super.createControl(parent); @@ -45,9 +42,6 @@ public class ResourceModelPreferencePage extends FieldEditorPreferencePage imple PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.RESOURCE_MODEL_PREFERENCE_PAGE); } - /* (non-Javadoc) - * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors() - */ @Override protected void createFieldEditors() { defaultLayout = new RadioGroupFieldEditor(SYNCVIEW_DEFAULT_LAYOUT, @@ -61,17 +55,11 @@ public class ResourceModelPreferencePage extends FieldEditorPreferencePage imple addField(defaultLayout); } - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench) - */ @Override public void init(IWorkbench workbench) { // Nothing to do } - /* (non-Javadoc) - * @see org.eclipse.jface.preference.IPreferencePage#performOk() - */ @Override public boolean performOk() { TeamUIPlugin.getPlugin().savePluginPreferences(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/SynchronizeParticipantDescriptor.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/SynchronizeParticipantDescriptor.java index 11bafba16..888303a47 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/SynchronizeParticipantDescriptor.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/SynchronizeParticipantDescriptor.java @@ -87,9 +87,6 @@ public class SynchronizeParticipantDescriptor implements ISynchronizeParticipant return label; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ISynchronizeParticipantDescriptor#isPersistent() - */ @Override public boolean isPersistent() { return persistent; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamContentProviderDescriptor.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamContentProviderDescriptor.java index c573277cc..61328c5af 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamContentProviderDescriptor.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/registry/TeamContentProviderDescriptor.java @@ -103,25 +103,16 @@ public class TeamContentProviderDescriptor implements ITeamContentProviderDescri throw new CoreException(new Status(IStatus.ERROR, TeamUIPlugin.ID, 0, reason, null)); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.registry.ITeamContentProviderDescriptor#getContentExtensionId() - */ @Override public String getContentExtensionId() { return contentExtensionId; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.registry.ITeamContentProviderDescriptor#getModelProviderId() - */ @Override public String getModelProviderId() { return modelProviderId; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.registry.ITeamContentProviderDescriptor#getImageDescriptor() - */ @Override public ImageDescriptor getImageDescriptor() { if (imageDescriptor != null) @@ -133,9 +124,6 @@ public class TeamContentProviderDescriptor implements ITeamContentProviderDescri return imageDescriptor; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.registry.ITeamContentProviderDescriptor#createPreferencePage() - */ @Override public IPreferencePage createPreferencePage() throws CoreException { if (configElement.getAttribute(ATT_PREFERENCE_PAGE) == null) @@ -144,9 +132,6 @@ public class TeamContentProviderDescriptor implements ITeamContentProviderDescri return (IPreferencePage) obj; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.mapping.ITeamContentProviderDescriptor#isEnabled() - */ @Override public boolean isEnabled() { if (!hasPreferences()) { @@ -227,9 +212,6 @@ public class TeamContentProviderDescriptor implements ITeamContentProviderDescri return null; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.mapping.ITeamContentProviderDescriptor#isFlatLayoutSupported() - */ @Override public boolean isFlatLayoutSupported() { return supportsFlatLayout; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractTreeViewerAdvisor.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractTreeViewerAdvisor.java index eae5294af..2f69a6675 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractTreeViewerAdvisor.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractTreeViewerAdvisor.java @@ -358,7 +358,7 @@ public abstract class AbstractTreeViewerAdvisor extends StructuredViewerAdvisor return hasChange((TreeViewer)getViewer(), next); } - /* (non-Javadoc) + /* * Allow adding an advisor to the PartNavigator and support coordinated * navigation between several objects. * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActionDelegateWrapper.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActionDelegateWrapper.java index 1fc26d9e7..59bda8403 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActionDelegateWrapper.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActionDelegateWrapper.java @@ -70,17 +70,11 @@ public class ActionDelegateWrapper extends Action implements ISelectionChangedLi .getSelectionProvider().removeSelectionChangedListener(ActionDelegateWrapper.this)); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent) - */ @Override public void selectionChanged(SelectionChangedEvent event) { getDelegate().selectionChanged(this, event.getSelection()); } - /* (non-Javadoc) - * @see org.eclipse.jface.action.IAction#run() - */ @Override public void run() { getDelegate().run(this); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java index aa257a58b..3dae67dcf 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java @@ -87,9 +87,6 @@ public class ChangeSetLabelDecorator extends LabelProvider implements ILabelDeco return collector.isDefault(set); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, java.lang.Object) - */ @Override public Image decorateImage(Image image, Object element) { return image; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelManager.java index 4f756172d..26595c5a4 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelManager.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelManager.java @@ -104,18 +104,12 @@ public class ChangeSetModelManager extends HierarchicalModelManager implements I } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelManager#dispose() - */ @Override public void dispose() { getConfiguration().removePropertyChangeListener(this); super.dispose(); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelManager#createModelProvider(java.lang.String) - */ @Override protected ISynchronizeModelProvider createModelProvider(String id) { if (enabled) { @@ -125,9 +119,6 @@ public class ChangeSetModelManager extends HierarchicalModelManager implements I } } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelManager#getSelectedProviderId() - */ @Override protected String getSelectedProviderId() { String id = super.getSelectedProviderId(); @@ -138,16 +129,10 @@ public class ChangeSetModelManager extends HierarchicalModelManager implements I } } - /* (non-Javadoc) - * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ @Override public void propertyChange(PropertyChangeEvent event) { } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelManager#saveProviderSettings(java.lang.String) - */ @Override protected void saveProviderSettings(String id) { super.saveProviderSettings(id); @@ -157,9 +142,6 @@ public class ChangeSetModelManager extends HierarchicalModelManager implements I } } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelManager#initialize(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration) - */ @Override public void initialize(ISynchronizePageConfiguration configuration) { // Load our setting before invoking super since the inherited @@ -183,9 +165,6 @@ public class ChangeSetModelManager extends HierarchicalModelManager implements I } } - /* (non-Javadoc) - * This method is public so it can be invoked from test cases - */ @Override public ISynchronizeModelProvider getActiveModelProvider() { return super.getActiveModelProvider(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java index 5f26a7941..003407375 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java @@ -165,17 +165,11 @@ public class ChangeSetModelProvider extends CompositeModelProvider { } } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.CompositeModelProvider#handleAddition(org.eclipse.team.core.synchronize.SyncInfo) - */ @Override protected void handleAddition(SyncInfo info) { // Nothing to do since change handling was bypassed } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#buildModelObjects(org.eclipse.team.ui.synchronize.ISynchronizeModelElement) - */ @Override protected IDiffElement[] buildModelObjects(ISynchronizeModelElement node) { // This method is invoked on a reset after the provider state has been cleared. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelSorter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelSorter.java index feaabcdbf..63c91f990 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelSorter.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelSorter.java @@ -69,9 +69,6 @@ public class ChangeSetModelSorter extends ViewerSorter { return d1.compareTo(d2); } - /* (non-Javadoc) - * Method declared on ViewerSorter. - */ @Override public int compare(Viewer viewer, Object o1, Object o2) { //have to deal with non-resources in navigator diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java index c67351844..e6d15e509 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java @@ -138,9 +138,6 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro */ protected abstract void handleAddition(SyncInfo info); - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#handleResourceChanges(org.eclipse.team.core.synchronize.ISyncInfoTreeChangeEvent) - */ @Override protected final void handleResourceChanges(ISyncInfoTreeChangeEvent event) { SyncInfo[] infos = event.getChangedResources(); @@ -160,9 +157,6 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro handleAddition(info); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#handleResourceRemovals(org.eclipse.team.core.synchronize.ISyncInfoTreeChangeEvent) - */ @Override protected final void handleResourceRemovals(ISyncInfoTreeChangeEvent event) { IResource[] resources = event.getRemovedResources(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureRefreshScheduleDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureRefreshScheduleDialog.java index fa54be582..5c345e5c1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureRefreshScheduleDialog.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureRefreshScheduleDialog.java @@ -37,9 +37,6 @@ public class ConfigureRefreshScheduleDialog extends DetailsDialog { this.schedule = schedule; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected void createMainDialogArea(Composite parent) { IPageValidator validator = new IPageValidator() { @@ -53,34 +50,22 @@ public class ConfigureRefreshScheduleDialog extends DetailsDialog { Dialog.applyDialogFont(parent); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ @Override protected void okPressed() { scheduleComposite.saveValues(); super.okPressed(); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#includeDetailsButton() - */ @Override protected boolean includeDetailsButton() { return false; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#createDropDownDialogArea(org.eclipse.swt.widgets.Composite) - */ @Override protected Composite createDropDownDialogArea(Composite parent) { return null; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#updateEnablements() - */ @Override protected void updateEnablements() { } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java index 5e5e36ebe..8ae43d9cd 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java @@ -97,9 +97,6 @@ public class ConfigureSynchronizeScheduleComposite extends Composite { } } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite) - */ protected void createMainDialogArea(Composite parent) { GC gc = new GC(parent); gc.setFont(JFaceResources.getDialogFont()); @@ -181,9 +178,6 @@ public class ConfigureSynchronizeScheduleComposite extends Composite { updateEnablements(); } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#okPressed() - */ public void saveValues() { if (enableBackgroundRefresh.getSelection()) { @@ -227,9 +221,6 @@ public class ConfigureSynchronizeScheduleComposite extends Composite { schedule.getRefreshable().setRefreshSchedule(schedule); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#updateEnablements() - */ public void updateEnablements() { if (!enableBackgroundRefresh.getSelection()) { validator.setComplete(null); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DecoratingColorLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DecoratingColorLabelProvider.java index c9cf853d5..c7b2e274f 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DecoratingColorLabelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DecoratingColorLabelProvider.java @@ -32,10 +32,6 @@ public class DecoratingColorLabelProvider extends DecoratingLabelProvider implem super(provider, new MultiLabelDecorator(decorators)); } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object) - */ @Override public Color getForeground(Object element) { ILabelProvider p = getLabelProvider(); @@ -45,10 +41,6 @@ public class DecoratingColorLabelProvider extends DecoratingLabelProvider implem return null; } - /* - * (non-Javadoc) - * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object) - */ @Override public Color getBackground(Object element) { ILabelProvider p = getLabelProvider(); @@ -58,9 +50,6 @@ public class DecoratingColorLabelProvider extends DecoratingLabelProvider implem return null; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object) - */ @Override public Font getFont(Object element) { ILabelProvider p = getLabelProvider(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DiffNodeWorkbenchAdapter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DiffNodeWorkbenchAdapter.java index 51b202229..7133ca847 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DiffNodeWorkbenchAdapter.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DiffNodeWorkbenchAdapter.java @@ -20,18 +20,12 @@ import org.eclipse.ui.model.IWorkbenchAdapter; public class DiffNodeWorkbenchAdapter implements IWorkbenchAdapter { - /* (non-Javadoc) - * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) - */ @Override public Object[] getChildren(Object o) { DiffNode node = getDiffNode(o); return node != null ? node.getChildren() : new Object[0]; } - /* (non-Javadoc) - * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) - */ @Override public ImageDescriptor getImageDescriptor(Object o) { DiffNode node = getDiffNode(o); @@ -41,18 +35,12 @@ public class DiffNodeWorkbenchAdapter implements IWorkbenchAdapter { return null; } - /* (non-Javadoc) - * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) - */ @Override public String getLabel(Object o) { DiffNode node = getDiffNode(o); return node != null ? node.getName() : ""; //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) - */ @Override public Object getParent(Object o) { DiffNode node = getDiffNode(o); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/EditableSharedDocumentAdapter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/EditableSharedDocumentAdapter.java index 440aa1969..17835febc 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/EditableSharedDocumentAdapter.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/EditableSharedDocumentAdapter.java @@ -85,9 +85,6 @@ public class EditableSharedDocumentAdapter extends this.listener = listener; } - /* (non-Javadoc) - * @see org.eclipse.compare.SharedDocumentAdapter#connect(org.eclipse.ui.texteditor.IDocumentProvider, org.eclipse.ui.IEditorInput) - */ @Override public void connect(IDocumentProvider provider, IEditorInput documentKey) throws CoreException { @@ -99,9 +96,6 @@ public class EditableSharedDocumentAdapter extends } } - /* (non-Javadoc) - * @see org.eclipse.compare.SharedDocumentAdapter#disconnect(org.eclipse.ui.texteditor.IDocumentProvider, org.eclipse.ui.IEditorInput) - */ @Override public void disconnect(IDocumentProvider provider, IEditorInput documentKey) { @@ -160,9 +154,6 @@ public class EditableSharedDocumentAdapter extends } } - /* (non-Javadoc) - * @see org.eclipse.compare.SharedDocumentAdapter#flushDocument(org.eclipse.ui.texteditor.IDocumentProvider, org.eclipse.ui.IEditorInput, org.eclipse.jface.text.IDocument, boolean, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void flushDocument(IDocumentProvider provider, IEditorInput documentKey, IDocument document, @@ -177,33 +168,21 @@ public class EditableSharedDocumentAdapter extends this.listener.handleDocumentFlushed(); } - /* (non-Javadoc) - * @see org.eclipse.ui.texteditor.IElementStateListener#elementContentAboutToBeReplaced(java.lang.Object) - */ @Override public void elementContentAboutToBeReplaced(Object element) { // Nothing to do } - /* (non-Javadoc) - * @see org.eclipse.ui.texteditor.IElementStateListener#elementContentReplaced(java.lang.Object) - */ @Override public void elementContentReplaced(Object element) { // Nothing to do } - /* (non-Javadoc) - * @see org.eclipse.ui.texteditor.IElementStateListener#elementDeleted(java.lang.Object) - */ @Override public void elementDeleted(Object element) { listener.handleDocumentDeleted(); } - /* (non-Javadoc) - * @see org.eclipse.ui.texteditor.IElementStateListener#elementDirtyStateChanged(java.lang.Object, boolean) - */ @Override public void elementDirtyStateChanged(Object element, boolean isDirty) { if (!isDirty) { @@ -211,9 +190,6 @@ public class EditableSharedDocumentAdapter extends } } - /* (non-Javadoc) - * @see org.eclipse.ui.texteditor.IElementStateListener#elementMoved(java.lang.Object, java.lang.Object) - */ @Override public void elementMoved(Object originalElement, Object movedElement) { // Nothing to do diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java index 23cb52975..0ac8ef88f 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java @@ -110,9 +110,6 @@ public class FlatModelProvider extends SynchronizeModelProvider { return collator.compare(s1, s2); } - /* (non-Javadoc) - * Method declared on ViewerSorter. - */ @Override public int compare(Viewer viewer, Object o1, Object o2) { @@ -196,9 +193,6 @@ public class FlatModelProvider extends SynchronizeModelProvider { sortByResource.add(new ToggleSortOrderAction(TeamUIMessages.FlatModelProvider_9, FlatSorter.PARENT_NAME)); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#dispose() - */ @Override public void dispose() { sortByResource.dispose(); @@ -237,25 +231,16 @@ public class FlatModelProvider extends SynchronizeModelProvider { } } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#createActionGroup() - */ @Override protected SynchronizePageActionGroup createActionGroup() { return new FlatActionGroup(); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.ISynchronizeModelProvider#getViewerSorter() - */ @Override public ViewerSorter getViewerSorter() { return new FlatSorter(sortCriteria); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#buildModelObjects(org.eclipse.team.ui.synchronize.ISynchronizeModelElement) - */ @Override protected IDiffElement[] buildModelObjects(ISynchronizeModelElement node) { if (node == getModelRoot()); @@ -268,26 +253,17 @@ public class FlatModelProvider extends SynchronizeModelProvider { return (IDiffElement[]) result.toArray(new IDiffElement[result.size()]); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#handleResourceAdditions(org.eclipse.team.core.synchronize.ISyncInfoTreeChangeEvent) - */ @Override protected void handleResourceAdditions(ISyncInfoTreeChangeEvent event) { addResources(event.getAddedResources()); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#handleResourceRemovals(org.eclipse.team.core.synchronize.ISyncInfoTreeChangeEvent) - */ @Override protected void handleResourceRemovals(ISyncInfoTreeChangeEvent event) { IResource[] resources = event.getRemovedResources(); removeFromViewer(resources); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.ISynchronizeModelProvider#getDescriptor() - */ @Override public ISynchronizeModelProviderDescriptor getDescriptor() { return flatDescriptor; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelManager.java index 7df4d0674..61278d117 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelManager.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelManager.java @@ -24,9 +24,6 @@ public class HierarchicalModelManager extends SynchronizeModelManager { super(configuration); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelManager#getSupportedModelProviders() - */ @Override protected ISynchronizeModelProviderDescriptor[] getSupportedModelProviders() { return new ISynchronizeModelProviderDescriptor[] { @@ -35,9 +32,6 @@ public class HierarchicalModelManager extends SynchronizeModelManager { new CompressedFoldersModelProvider.CompressedFolderModelProviderDescriptor() }; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelManager#createModelProvider(java.lang.String) - */ @Override protected ISynchronizeModelProvider createModelProvider(String id) { if(id == null) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java index 606c661bd..51562f8f4 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java @@ -28,9 +28,6 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon this.decorators = decorators; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, java.lang.Object) - */ @Override public Image decorateImage(Image image, Object element) { for (int i = 0; i < decorators.length; i++) { @@ -43,9 +40,6 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon return image; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelDecorator#decorateText(java.lang.String, java.lang.Object) - */ @Override public String decorateText(String text, Object element) { for (int i = 0; i < decorators.length; i++) { @@ -58,9 +52,6 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon return text; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() - */ @Override public void dispose() { for (int i = 0; i < decorators.length; i++) { @@ -69,9 +60,6 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon } } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IFontDecorator#decorateFont(java.lang.Object) - */ @Override public Font decorateFont(Object element) { for (int i = 0; i < decorators.length; i++) { @@ -83,9 +71,6 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon return null; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IColorDecorator#decorateForeground(java.lang.Object) - */ @Override public Color decorateForeground(Object element) { for (int i = 0; i < decorators.length; i++) { @@ -97,9 +82,6 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon return null; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IColorDecorator#decorateBackground(java.lang.Object) - */ @Override public Color decorateBackground(Object element) { for (int i = 0; i < decorators.length; i++) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java index 887b233f2..593ffa68e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java @@ -32,9 +32,6 @@ public class RefreshSubscriberParticipantJob extends RefreshParticipantJob { this.resources = resources; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.RefreshSubscriberJob#getSubscriber() - */ protected Subscriber getSubscriber() { return ((SubscriberParticipant)getParticipant()).getSubscriber(); } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RemoteResourceTypedElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RemoteResourceTypedElement.java index 26e639fec..33081e5f9 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RemoteResourceTypedElement.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RemoteResourceTypedElement.java @@ -43,17 +43,11 @@ public class RemoteResourceTypedElement extends StorageTypedElement { this.remote = remote; } - /* (non-Javadoc) - * @see org.eclipse.compare.ITypedElement#getName() - */ @Override public String getName() { return remote.getName(); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.StorageTypedElement#getType() - */ @Override public String getType() { if (remote.isContainer()) { @@ -62,17 +56,11 @@ public class RemoteResourceTypedElement extends StorageTypedElement { return super.getType(); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.StorageTypedElement#fetchContents(org.eclipse.core.runtime.IProgressMonitor) - */ @Override protected IStorage fetchContents(IProgressMonitor monitor) throws TeamException { return remote.getStorage(monitor); } - /* (non-Javadoc) - * @see org.eclipse.compare.ISharedDocumentAdapter#getDocumentKey(java.lang.Object) - */ @Override public IEditorInput getDocumentKey(Object element) { if (element == this && getBufferedStorage() != null) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java index 0cffea39f..2f7b2a21a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java @@ -595,14 +595,6 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements } } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.compare.CompareEditorInput#addCompareInputChangeListener( - * org.eclipse.compare.structuremergeviewer.ICompareInput, - * org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener) - */ @Override public void addCompareInputChangeListener(ICompareInput input, ICompareInputChangeListener listener) { @@ -613,14 +605,6 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements } } - /* - * (non-Javadoc) - * - * @see - * org.eclipse.compare.CompareEditorInput#removeCompareInputChangeListener - * (org.eclipse.compare.structuremergeviewer.ICompareInput, - * org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener) - */ @Override public void removeCompareInputChangeListener(ICompareInput input, ICompareInputChangeListener listener) { @@ -652,11 +636,6 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements } } - /* - * (non-Javadoc) - * - * @see org.eclipse.compare.CompareEditorInput#getTitleImage() - */ @Override public Image getTitleImage() { ImageRegistry reg = TeamUIPlugin.getPlugin().getImageRegistry(); @@ -668,11 +647,6 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements return image; } - /* - * (non-Javadoc) - * - * @see org.eclipse.ui.IEditorInput#getImageDescriptor() - */ @Override public ImageDescriptor getImageDescriptor() { return TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_SYNC_VIEW); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ScopableSubscriberParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ScopableSubscriberParticipant.java index 1905b1589..9d0ef4241 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ScopableSubscriberParticipant.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ScopableSubscriberParticipant.java @@ -36,10 +36,6 @@ public abstract class ScopableSubscriberParticipant extends SubscriberParticipan super(scope); } - - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.subscriber.SubscriberParticipant#setSubscriber(org.eclipse.team.core.subscribers.Subscriber) - */ @Override protected void setSubscriber(Subscriber subscriber) { super.setSubscriber(subscriber); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StartupPreferencePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StartupPreferencePage.java index 4f346d448..467f888a6 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StartupPreferencePage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StartupPreferencePage.java @@ -46,9 +46,6 @@ public class StartupPreferencePage extends FieldEditorPreferencePage implements // Nothing to do } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ @Override public void createControl(Composite parent) { super.createControl(parent); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberParticipantPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberParticipantPage.java index 92c6a3504..0c882a737 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberParticipantPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberParticipantPage.java @@ -120,16 +120,10 @@ public final class SubscriberParticipantPage extends AbstractSynchronizePage { configuration.setProperty(SynchronizePageConfiguration.P_WORKING_SET_SYNC_INFO_SET, collector.getWorkingSetSyncInfoSet()); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.SyncInfoSetSynchronizePage#isThreeWay() - */ protected boolean isThreeWay() { return getParticipant().getSubscriber().getResourceComparator().isThreeWay(); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.SyncInfoSetSynchronizePage#reset() - */ @Override public void reset() { getParticipant().reset(); @@ -149,9 +143,6 @@ public final class SubscriberParticipantPage extends AbstractSynchronizePage { collector.dispose(); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizePage#createChangesSection(org.eclipse.swt.widgets.Composite) - */ @Override protected ChangesSection createChangesSection(Composite parent) { return new SyncInfoSetChangesSection(parent, this, getConfiguration()); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java index 9f070444a..361c227bd 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java @@ -230,7 +230,7 @@ public abstract class SyncInfoSetChangeSetCollector extends ChangeSetManager { provider.performUpdate(runnable, preserveExpansion, false /* run in the handler thread and refresh at the end */); } - /* (non-javadoc) + /* * Sets the provider for this collector. This method is for internal use only. */ public final void setProvider(ChangeSetModelProvider provider) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementSorter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementSorter.java index 966ce6c6f..8c54f89d3 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementSorter.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementSorter.java @@ -28,9 +28,6 @@ public class SynchronizeModelElementSorter extends ResourceSorter { super(ResourceSorter.NAME); } - /* (non-Javadoc) - * Method declared on ViewerSorter. - */ @Override public int compare(Viewer viewer, Object o1, Object o2) { IResource resource1 = getResource(o1); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java index 2d237f246..0e01553fd 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java @@ -77,9 +77,6 @@ public abstract class SynchronizeModelManager extends SynchronizePageActionGroup setChecked(getSelectedProviderId().equals(descriptor.getId())); } - /* (non-Javadoc) - * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ @Override public void propertyChange(PropertyChangeEvent event) { if (event.getProperty().equals(SynchronizePageConfiguration.P_MODEL)) { @@ -229,9 +226,6 @@ public abstract class SynchronizeModelManager extends SynchronizePageActionGroup } } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.IActionContribution#initialize(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration) - */ @Override public void initialize(ISynchronizePageConfiguration configuration) { super.initialize(configuration); @@ -258,9 +252,6 @@ public abstract class SynchronizeModelManager extends SynchronizePageActionGroup } } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.IActionContribution#setActionBars(org.eclipse.ui.IActionBars) - */ @Override public void fillActionBars(IActionBars actionBars) { if (toggleModelProviderActions == null) return; @@ -289,9 +280,6 @@ public abstract class SynchronizeModelManager extends SynchronizePageActionGroup } } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.IActionContribution#dispose() - */ @Override public void dispose() { if(modelProvider != null) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TeamSynchronizingPerspective.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TeamSynchronizingPerspective.java index 013aa7f4e..ef2a2c9de 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TeamSynchronizingPerspective.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TeamSynchronizingPerspective.java @@ -23,9 +23,6 @@ public class TeamSynchronizingPerspective implements IPerspectiveFactory { public final static String ID = "org.eclipse.team.ui.TeamSynchronizingPerspective"; //$NON-NLS-1$ - /* (Non-javadoc) - * Method declared on IPerpsectiveFactory - */ @Override public void createInitialLayout(IPageLayout layout) { defineActions(layout); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/UnchangedResourceModelElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/UnchangedResourceModelElement.java index 137729c75..66e851b99 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/UnchangedResourceModelElement.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/UnchangedResourceModelElement.java @@ -38,9 +38,6 @@ public class UnchangedResourceModelElement extends SynchronizeModelElement { return resource; } - /* (non-Javadoc) - * @see org.eclipse.compare.structuremergeviewer.DiffNode#getName() - */ @Override public String getName() { return resource.getName(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchAction.java index f9e75b76e..d871e7496 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchAction.java @@ -23,9 +23,6 @@ import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction; */ public class WorkbenchAction extends Action implements IWorkbenchAction { - /* (non-Javadoc) - * @see org.eclipse.ui.actions.ActionFactory.IWorkbenchAction#dispose() - */ @Override public void dispose() { } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchPartSynchronizePageSite.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchPartSynchronizePageSite.java index 5df245819..fae36c38d 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchPartSynchronizePageSite.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchPartSynchronizePageSite.java @@ -37,81 +37,51 @@ public class WorkbenchPartSynchronizePageSite implements ISynchronizePageSite { this.settings = settings; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getPart() - */ @Override public IWorkbenchPart getPart() { return part; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getShell() - */ @Override public Shell getShell() { return part.getSite().getShell(); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getSelectionProvider() - */ @Override public ISelectionProvider getSelectionProvider() { return site.getSelectionProvider(); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#setSelectionProvider(org.eclipse.jface.viewers.ISelectionProvider) - */ @Override public void setSelectionProvider(ISelectionProvider provider) { site.setSelectionProvider(provider); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getWorkbenchSite() - */ @Override public IWorkbenchSite getWorkbenchSite() { return part.getSite(); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getKeyBindingService() - */ @Override public IKeyBindingService getKeyBindingService() { return part.getSite().getKeyBindingService(); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#setFocus() - */ @Override public void setFocus() { part.getSite().getPage().activate(part); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getPageSettings() - */ @Override public IDialogSettings getPageSettings() { return settings; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getActionBars() - */ @Override public IActionBars getActionBars() { return site.getActionBars(); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#isModal() - */ @Override public boolean isModal() { return false; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DefaultSynchronizePageActions.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DefaultSynchronizePageActions.java index 11410b954..3afe5d6e2 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DefaultSynchronizePageActions.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DefaultSynchronizePageActions.java @@ -35,9 +35,6 @@ public class DefaultSynchronizePageActions extends SynchronizePageActionGroup { private RefactorActionGroup refactorActions; private SyncViewerShowPreferencesAction showPreferences; - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.IActionContribution#initialize(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration) - */ @Override public void initialize(ISynchronizePageConfiguration configuration) { super.initialize(configuration); @@ -58,9 +55,6 @@ public class DefaultSynchronizePageActions extends SynchronizePageActionGroup { } } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#fillActionBars(org.eclipse.ui.IActionBars) - */ @Override public void fillActionBars(IActionBars actionBars) { if (openWithActions != null) openWithActions.fillActionBars(actionBars); @@ -71,18 +65,12 @@ public class DefaultSynchronizePageActions extends SynchronizePageActionGroup { } } - /* (non-Javadoc) - * @see org.eclipse.ui.actions.ActionGroup#updateActionBars() - */ @Override public void updateActionBars() { if (openWithActions != null) openWithActions.updateActionBars(); if (refactorActions != null) refactorActions.updateActionBars(); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.IActionContribution#fillContextMenu(org.eclipse.jface.action.IMenuManager) - */ @Override public void fillContextMenu(IMenuManager manager) { @@ -97,9 +85,6 @@ public class DefaultSynchronizePageActions extends SynchronizePageActionGroup { } } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#dispose() - */ @Override public void dispose() { super.dispose(); @@ -107,9 +92,6 @@ public class DefaultSynchronizePageActions extends SynchronizePageActionGroup { if (openWithActions != null) openWithActions.dispose(); } - /* (non-Javadoc) - * @see org.eclipse.ui.actions.ActionGroup#setContext(org.eclipse.ui.actions.ActionContext) - */ @Override public void setContext(ActionContext context) { if (openWithActions != null) openWithActions.setContext(context); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DirectionFilterActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DirectionFilterActionGroup.java index 93c88a157..864bbbf88 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DirectionFilterActionGroup.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DirectionFilterActionGroup.java @@ -140,9 +140,6 @@ public class DirectionFilterActionGroup extends ActionGroup implements IProperty return 0; } - /* (non-Javadoc) - * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars) - */ public void fillActionBars(IActionBars actionBars, String group) { super.fillActionBars(actionBars); IToolBarManager toolBar = actionBars.getToolBarManager(); @@ -181,9 +178,6 @@ public class DirectionFilterActionGroup extends ActionGroup implements IProperty } } - /* (non-Javadoc) - * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ @Override public void propertyChange(PropertyChangeEvent event) { if(event.getProperty().equals(ISynchronizePageConfiguration.P_MODE)) { @@ -192,9 +186,6 @@ public class DirectionFilterActionGroup extends ActionGroup implements IProperty } } - /* (non-Javadoc) - * @see org.eclipse.ui.actions.ActionGroup#dispose() - */ @Override public void dispose() { super.dispose(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefreshActionContribution.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefreshActionContribution.java index aa024d765..7972decbc 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefreshActionContribution.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefreshActionContribution.java @@ -33,9 +33,6 @@ public class RefreshActionContribution extends SynchronizePageActionGroup { private org.eclipse.team.internal.ui.mapping.RemoveFromViewAction removeFromViewAction; private org.eclipse.team.internal.ui.mapping.RestoreRemovedItemsAction restoreRemovedItemsAction; - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.IActionContribution#initialize(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration) - */ @Override public void initialize(final ISynchronizePageConfiguration configuration) { super.initialize(configuration); @@ -75,9 +72,6 @@ public class RefreshActionContribution extends SynchronizePageActionGroup { appendToGroup(ISynchronizePageConfiguration.P_VIEW_MENU, ISynchronizePageConfiguration.SYNCHRONIZE_GROUP, restoreRemovedItemsAction); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.IActionContribution#fillContextMenu(org.eclipse.jface.action.IMenuManager) - */ @Override public void fillContextMenu(IMenuManager manager) { if (findGroup(manager, ISynchronizePageConfiguration.SYNCHRONIZE_GROUP) != null @@ -91,9 +85,6 @@ public class RefreshActionContribution extends SynchronizePageActionGroup { } } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.IActionContribution#setActionBars(org.eclipse.ui.IActionBars) - */ @Override public void fillActionBars(IActionBars actionBars) { super.fillActionBars(actionBars); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RestoreRemovedItemsAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RestoreRemovedItemsAction.java index 18dd22339..4ee171fbe 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RestoreRemovedItemsAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RestoreRemovedItemsAction.java @@ -63,9 +63,6 @@ public class RestoreRemovedItemsAction extends SynchronizeModelAction { return true; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#needsToSaveDirtyEditors() - */ @Override protected boolean needsToSaveDirtyEditors() { return false; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SubscriberActionContribution.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SubscriberActionContribution.java index 4a9172f8a..55ac6a035 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SubscriberActionContribution.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SubscriberActionContribution.java @@ -36,9 +36,6 @@ public final class SubscriberActionContribution extends SynchronizePageActionGro private RemoveFromViewAction removeFromViewAction; private RestoreRemovedItemsAction restoreRemovedItemsAction; - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.IActionContribution#initialize(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration) - */ @Override public void initialize(final ISynchronizePageConfiguration configuration) { super.initialize(configuration); @@ -80,9 +77,6 @@ public final class SubscriberActionContribution extends SynchronizePageActionGro appendToGroup(ISynchronizePageConfiguration.P_VIEW_MENU, ISynchronizePageConfiguration.SYNCHRONIZE_GROUP, restoreRemovedItemsAction); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.IActionContribution#fillContextMenu(org.eclipse.jface.action.IMenuManager) - */ @Override public void fillContextMenu(IMenuManager manager) { if (findGroup(manager, ISynchronizePageConfiguration.SYNCHRONIZE_GROUP) != null @@ -96,9 +90,6 @@ public final class SubscriberActionContribution extends SynchronizePageActionGro } } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.IActionContribution#setActionBars(org.eclipse.ui.IActionBars) - */ @Override public void fillActionBars(IActionBars actionBars) { super.fillActionBars(actionBars); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SyncInfoSetStatusLineContributionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SyncInfoSetStatusLineContributionGroup.java index 454413945..8ff75a39d 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SyncInfoSetStatusLineContributionGroup.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SyncInfoSetStatusLineContributionGroup.java @@ -38,27 +38,17 @@ public class SyncInfoSetStatusLineContributionGroup extends getSyncInfoSet().removeSyncSetChangedListener(this); super.dispose(); } - /* - * (non-Javadoc) - * - * @see org.eclipse.team.internal.ui.sync.sets.ISyncSetChangedListener#syncSetChanged(org.eclipse.team.internal.ui.sync.sets.SyncSetChangedEvent) - */ + @Override public void syncInfoChanged(ISyncInfoSetChangeEvent event, IProgressMonitor monitor) { updateCounts(); } - /* (non-Javadoc) - * @see org.eclipse.team.core.subscribers.ISyncInfoSetChangeListener#syncInfoSetReset(org.eclipse.team.core.subscribers.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void syncInfoSetReset(SyncInfoSet set, IProgressMonitor monitor) { updateCounts(); } - /* (non-Javadoc) - * @see org.eclipse.team.core.subscribers.ISyncInfoSetChangeListener#syncInfoSetError(org.eclipse.team.core.subscribers.SyncInfoSet, org.eclipse.team.core.ITeamStatus[], org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void syncInfoSetErrors(SyncInfoSet set, ITeamStatus[] errors, IProgressMonitor monitor) { // Nothing to do for errors diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizeAndRefreshAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizeAndRefreshAction.java index 0e7bc456e..c525abc0e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizeAndRefreshAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizeAndRefreshAction.java @@ -36,9 +36,6 @@ public class SynchronizeAndRefreshAction extends Action { fView= view; } - /* (non-Javadoc) - * @see org.eclipse.jface.action.IAction#run() - */ @Override public void run() { ISynchronizeParticipant current = fView.getParticipant(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkbenchLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkbenchLabelProvider.java index d85e7a988..56fd29c9e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkbenchLabelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkbenchLabelProvider.java @@ -24,33 +24,21 @@ public class PatchWorkbenchLabelProvider extends WorkbenchLabelProvider private ICommonContentExtensionSite extensionSite; - /* (non-Javadoc) - * @see org.eclipse.ui.navigator.ICommonLabelProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite) - */ @Override public void init(ICommonContentExtensionSite aConfig) { extensionSite = aConfig; } - /* (non-Javadoc) - * @see org.eclipse.ui.navigator.IMementoAware#restoreState(org.eclipse.ui.IMemento) - */ @Override public void restoreState(IMemento aMemento) { // Nothing to do } - /* (non-Javadoc) - * @see org.eclipse.ui.navigator.IMementoAware#saveState(org.eclipse.ui.IMemento) - */ @Override public void saveState(IMemento aMemento) { // Nothing to do } - /* (non-Javadoc) - * @see org.eclipse.ui.navigator.IDescriptionProvider#getDescription(java.lang.Object) - */ @Override public String getDescription(Object anElement) { if (anElement instanceof DiffNode) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureMultipleProjectsWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureMultipleProjectsWizard.java index 5a884525b..fd05df7c1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureMultipleProjectsWizard.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureMultipleProjectsWizard.java @@ -42,9 +42,6 @@ public class ConfigureMultipleProjectsWizard extends Wizard { addPage(projectSelectionPage); } - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ @Override public boolean performFinish() { // Prompt if there are still unshared projects diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalSynchronizeWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalSynchronizeWizard.java index 4e32663ef..7080985a3 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalSynchronizeWizard.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalSynchronizeWizard.java @@ -51,18 +51,12 @@ public class GlobalSynchronizeWizard extends Wizard { setDialogSettings(wizardSettings); } - /* - * @see Wizard#addPages - */ @Override public void addPages() { mainPage = new GlobalRefreshWizardSelectionPage(); addPage(mainPage); } - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.IWizard#canFinish() - */ @Override public boolean canFinish() { // If we are on the first page, never allow finish unless the selected @@ -76,9 +70,6 @@ public class GlobalSynchronizeWizard extends Wizard { return super.canFinish(); } - /* - * @see Wizard#performFinish - */ @Override public boolean performFinish() { // If we are on the first page and the selected wizard has no pages then allow it to finish. diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java index 43dd88ff3..b6abc5fb1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java @@ -91,11 +91,6 @@ public class ImportProjectSetOperation extends TeamOperation { createWorkingSet(workingSets, newProjects); } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor) - */ @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException{ @@ -106,21 +101,11 @@ public class ImportProjectSetOperation extends TeamOperation { } } - /* - * (non-Javadoc) - * - * @see org.eclipse.team.ui.TeamOperation#canRunAsJob() - */ @Override protected boolean canRunAsJob() { return true; } - /* - * (non-Javadoc) - * - * @see org.eclipse.team.ui.TeamOperation#getJobName() - */ @Override protected String getJobName() { return TeamUIMessages.ImportProjectSetMainPage_jobName; diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageCompareEditorInput.java index a62ffee0e..158028f82 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageCompareEditorInput.java @@ -64,9 +64,6 @@ public abstract class PageCompareEditorInput extends CompareEditorInput implemen super(configuration); } - /* (non-Javadoc) - * @see org.eclipse.compare.CompareEditorInput#createStructureInputPane(org.eclipse.swt.widgets.Composite) - */ @Override protected CompareViewerPane createStructureInputPane(Composite parent) { pagePane = new CompareViewerPane(parent, SWT.BORDER | SWT.FLAT) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/ElementLocalHistoryPageSource.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/ElementLocalHistoryPageSource.java index d25f11546..8bbb71e63 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/ElementLocalHistoryPageSource.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/ElementLocalHistoryPageSource.java @@ -44,17 +44,11 @@ public abstract class ElementLocalHistoryPageSource extends HistoryPageSource { super(); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.history.IHistoryPageSource#canShowHistoryFor(java.lang.Object) - */ @Override public final boolean canShowHistoryFor(Object object) { return getFile(object) != null; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.history.IHistoryPageSource#createPage(java.lang.Object) - */ @Override public final Page createPage(Object object) { return new EditionHistoryPage(getFile(object), object); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPage.java index 096fc2896..5738a6ae5 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPage.java @@ -32,34 +32,22 @@ public abstract class HistoryPage extends Page implements IHistoryPage, IAdaptab private IHistoryView historyView; private PropertyChangeHandler fChangeHandler; - /* (non-Javadoc) - * @see org.eclipse.team.ui.history.IHistoryPage#setSite(org.eclipse.team.ui.history.IHistoryPageSite) - */ @Override public void setSite(IHistoryPageSite site) { this.site = site; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.history.IHistoryPage#getHistoryPageSite() - */ @Override public IHistoryPageSite getHistoryPageSite() { return site; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.history.IHistoryPage#getInput() - */ @Override public Object getInput() { return input; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.history.IHistoryPage#setInput(java.lang.Object, boolean) - */ @Override public boolean setInput(Object object) { this.input = object; @@ -79,9 +67,6 @@ public abstract class HistoryPage extends Page implements IHistoryPage, IAdaptab this.historyView = historyView; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.history.IHistoryPage#getHistoryView() - */ @Override public IHistoryView getHistoryView() { if (historyView != null) @@ -90,9 +75,6 @@ public abstract class HistoryPage extends Page implements IHistoryPage, IAdaptab return null; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.history.IHistoryPage#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) - */ @Override public synchronized void addPropertyChangeListener(IPropertyChangeListener listener) { if (fChangeHandler == null) { @@ -101,9 +83,6 @@ public abstract class HistoryPage extends Page implements IHistoryPage, IAdaptab fChangeHandler.addPropertyChangeListener(listener); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.history.IHistoryPage#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) - */ @Override public void removePropertyChangeListener(IPropertyChangeListener listener) { if (fChangeHandler != null) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java index 7cddc4a14..7ba671538 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java @@ -62,18 +62,12 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput { this.object = object; } - /* (non-Javadoc) - * @see org.eclipse.compare.CompareEditorInput#prepareInput(org.eclipse.core.runtime.IProgressMonitor) - */ @Override protected Object prepareInput(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { return object; } - /* (non-Javadoc) - * @see org.eclipse.compare.CompareEditorInput#handleDispose() - */ @Override protected void handleDispose() { super.handleDispose(); @@ -83,9 +77,6 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput { } } - /* (non-Javadoc) - * @see org.eclipse.team.ui.PageCompareEditorInput#createPage(org.eclipse.compare.CompareViewerPane, org.eclipse.jface.action.IToolBarManager) - */ @Override protected IPage createPage(CompareViewerPane parent, IToolBarManager toolBarManager) { site = new DialogHistoryPageSite(parent.getShell()); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationLabelProvider.java index 9e928a2b4..c42240761 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationLabelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationLabelProvider.java @@ -48,9 +48,6 @@ public abstract class SynchronizationLabelProvider extends AbstractSynchronizeLa this.context = context; } - /* (non-Javadoc) - * @see org.eclipse.ui.navigator.ICommonLabelProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite) - */ @Override public void init(ICommonContentExtensionSite site) { this.site = site; @@ -79,9 +76,6 @@ public abstract class SynchronizationLabelProvider extends AbstractSynchronizeLa return scope; } - /* (non-Javadoc) - * @see org.eclipse.ui.navigator.IMementoAware#restoreState(org.eclipse.ui.IMemento) - */ @Override public void restoreState(IMemento aMemento) { ILabelProvider provider = getDelegateLabelProvider(); @@ -90,9 +84,6 @@ public abstract class SynchronizationLabelProvider extends AbstractSynchronizeLa } } - /* (non-Javadoc) - * @see org.eclipse.ui.navigator.IMementoAware#saveState(org.eclipse.ui.IMemento) - */ @Override public void saveState(IMemento aMemento) { ILabelProvider provider = getDelegateLabelProvider(); @@ -101,9 +92,6 @@ public abstract class SynchronizationLabelProvider extends AbstractSynchronizeLa } } - /* (non-Javadoc) - * @see org.eclipse.ui.navigator.IDescriptionProvider#getDescription(java.lang.Object) - */ @Override public String getDescription(Object anElement) { ILabelProvider provider = getDelegateLabelProvider(); @@ -113,17 +101,11 @@ public abstract class SynchronizationLabelProvider extends AbstractSynchronizeLa return null; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.mapping.SynchronizationStateLabelProvider#isDecorationEnabled() - */ @Override protected boolean isDecorationEnabled() { return getContext() != null; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.mapping.SynchronizationStateLabelProvider#getImage(java.lang.Object) - */ @Override public Image getImage(Object element) { Image image = super.getImage(element); @@ -143,9 +125,6 @@ public abstract class SynchronizationLabelProvider extends AbstractSynchronizeLa return ResourcesPlugin.getWorkspace().getRoot(); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeLabelProvider#getText(java.lang.Object) - */ @Override public String getText(Object element) { String text = super.getText(element); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationOperation.java index de6f25006..6086f3b90 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationOperation.java @@ -123,9 +123,6 @@ public abstract class SynchronizationOperation extends TeamOperation { return null; } - /* (non-Javadoc) - * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor) - */ @Override public final void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeLabelProvider.java index f07014bac..d6ca571a2 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeLabelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeLabelProvider.java @@ -57,9 +57,6 @@ public abstract class AbstractSynchronizeLabelProvider implements ILabelProvider private ImageManager localImageManager; - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) - */ @Override public Image getImage(Object element) { Image base = getDelegateImage(element); @@ -149,9 +146,6 @@ public abstract class AbstractSynchronizeLabelProvider implements ILabelProvider return ResourceDiffCompareInput.getCompareKind(node); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) - */ @Override public String getText(Object element) { String base = getDelegateText(element); @@ -198,34 +192,22 @@ public abstract class AbstractSynchronizeLabelProvider implements ILabelProvider return base; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) - */ @Override public void addListener(ILabelProviderListener listener) { getDelegateLabelProvider().addListener(listener); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose() - */ @Override public void dispose() { if (localImageManager != null) localImageManager.dispose(); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String) - */ @Override public boolean isLabelProperty(Object element, String property) { return getDelegateLabelProvider().isLabelProperty(internalGetElement(element), property); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) - */ @Override public void removeListener(ILabelProviderListener listener) { getDelegateLabelProvider().removeListener(listener); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeScope.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeScope.java index 39c0ba082..8ad236475 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeScope.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeScope.java @@ -100,9 +100,6 @@ public abstract class AbstractSynchronizeScope implements ISynchronizeScope { init(memento); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.ScopableSubscriberParticipant.ISynchronizeScope#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) - */ @Override public void addPropertyChangeListener(IPropertyChangeListener listener) { synchronized(listeners) { @@ -110,9 +107,6 @@ public abstract class AbstractSynchronizeScope implements ISynchronizeScope { } } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.ScopableSubscriberParticipant.ISynchronizeScope#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener) - */ @Override public void removePropertyChangeListener(IPropertyChangeListener listener) { synchronized(listeners) { @@ -120,9 +114,6 @@ public abstract class AbstractSynchronizeScope implements ISynchronizeScope { } } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ISynchronizeScope#dispose() - */ @Override public void dispose() { // Do nothing by default diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantAction.java index 913aeb964..70a645c86 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantAction.java @@ -81,9 +81,6 @@ public abstract class ModelParticipantAction extends BaseSelectionListenerAction } - /* (non-Javadoc) - * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection) - */ @Override protected boolean updateSelection(IStructuredSelection selection) { super.updateSelection(selection); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantMergeOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantMergeOperation.java index 624c33adf..833dc10d6 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantMergeOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantMergeOperation.java @@ -65,9 +65,6 @@ public abstract class ModelParticipantMergeOperation extends ModelMergeOperation super(part, manager); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.operations.ModelMergeOperation#initializeContext(org.eclipse.core.runtime.IProgressMonitor) - */ @Override protected void initializeContext(IProgressMonitor monitor) throws CoreException { if (participant == null) { @@ -89,9 +86,6 @@ public abstract class ModelParticipantMergeOperation extends ModelMergeOperation } } - /* (non-Javadoc) - * @see org.eclipse.team.ui.operations.ModelMergeOperation#execute(org.eclipse.core.runtime.IProgressMonitor) - */ @Override protected void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { @@ -102,18 +96,12 @@ public abstract class ModelParticipantMergeOperation extends ModelMergeOperation } } - /* (non-Javadoc) - * @see org.eclipse.team.ui.mapping.ModelMergeOperation#executeMerge(org.eclipse.core.runtime.IProgressMonitor) - */ @Override protected void executeMerge(IProgressMonitor monitor) throws CoreException { if (!sentToSyncView) super.executeMerge(monitor); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.operations.ModelMergeOperation#handlePreviewRequest() - */ @Override protected void handlePreviewRequest() { Job job = new WorkbenchJob(getJobName()) { @@ -174,9 +162,6 @@ public abstract class ModelParticipantMergeOperation extends ModelMergeOperation return true; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.operations.ResourceMappingOperation#getContext() - */ @Override protected ISynchronizationContext getContext() { if (participant != null) @@ -184,9 +169,6 @@ public abstract class ModelParticipantMergeOperation extends ModelMergeOperation return null; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.operations.ResourceMappingOperation#getPreviewRequestMessage() - */ @Override protected String getPreviewRequestMessage() { if (!isPreviewRequested()) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantWizard.java index 0d7a7b500..9d69d3c74 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantWizard.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantWizard.java @@ -35,9 +35,6 @@ public abstract class ModelParticipantWizard extends ParticipantSynchronizeWizar setNeedsProgressMonitor(true); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#createParticipant() - */ @Override protected final void createParticipant() { ISynchronizeParticipant participant = createParticipant(selectionPage.getSelectedMappings()); @@ -46,9 +43,6 @@ public abstract class ModelParticipantWizard extends ParticipantSynchronizeWizar participant.run(null /* no site */); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#createScopeSelectionPage() - */ @Override protected final WizardPage createScopeSelectionPage() { selectionPage = new ModelElementSelectionPage(getRootResources()); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java index 74d444005..94ac3f6b0 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java @@ -84,9 +84,6 @@ public class ModelSynchronizeParticipantActionGroup extends SynchronizePageActio private MergeAction overwrite; private MergeAction markAsMerged; - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#initialize(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration) - */ @Override public void initialize(ISynchronizePageConfiguration configuration) { super.initialize(configuration); @@ -129,9 +126,6 @@ public class ModelSynchronizeParticipantActionGroup extends SynchronizePageActio } } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager) - */ @Override public void fillContextMenu(IMenuManager menu) { super.fillContextMenu(menu); @@ -283,9 +277,6 @@ public class ModelSynchronizeParticipantActionGroup extends SynchronizePageActio } } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#dispose() - */ @Override public void dispose() { if (modelPicker != null) diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageDialog.java index b9c12267b..b1e2e6868 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageDialog.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageDialog.java @@ -56,9 +56,6 @@ public class ParticipantPageDialog extends SaveablePartDialog { this.participant = participant; } - /* (non-Javadoc) - * Method declared on Dialog. - */ @Override protected Control createDialogArea(Composite parent2) { Composite parent = (Composite) super.createDialogArea(parent2); @@ -70,9 +67,6 @@ public class ParticipantPageDialog extends SaveablePartDialog { return parent; } - /* (non-Javadoc) - * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int) - */ @Override protected void buttonPressed(int buttonId) { if(buttonId == IDialogConstants.OK_ID && isRememberParticipant()) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPagePane.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPagePane.java index cb9fb35a5..b3da4335a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPagePane.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPagePane.java @@ -72,9 +72,6 @@ public final class ParticipantPagePane { this.pageConfiguration = pageConfiguration; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.SaveablePartAdapter#dispose() - */ public void dispose() { if(titleImage != null) { titleImage.dispose(); @@ -86,9 +83,6 @@ public final class ParticipantPagePane { site.dispose(); } - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPart#getTitleImage() - */ public Image getTitleImage() { if(titleImage == null) { titleImage = participant.getImageDescriptor().createImage(); @@ -96,16 +90,10 @@ public final class ParticipantPagePane { return titleImage; } - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPart#getTitle() - */ public String getTitle() { return Utils.shortenText(SynchronizeView.MAX_NAME_LENGTH, participant.getName()); } - /* (non-Javadoc) - * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) - */ public Control createPartControl(Composite parent) { Composite top = new Composite(parent, SWT.NULL); GridLayout layout = new GridLayout(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantSynchronizeWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantSynchronizeWizard.java index c556b552f..170904112 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantSynchronizeWizard.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantSynchronizeWizard.java @@ -42,17 +42,11 @@ public abstract class ParticipantSynchronizeWizard extends Wizard { setNeedsProgressMonitor(false); } - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#getWindowTitle() - */ @Override public String getWindowTitle() { return TeamUIMessages.GlobalRefreshSubscriberPage_0; } - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#addPages() - */ @Override public void addPages() { if (getRootResources().length == 0) { @@ -74,9 +68,6 @@ public abstract class ParticipantSynchronizeWizard extends Wizard { } } - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.IWizard#performFinish() - */ @Override public boolean performFinish() { if (importWizard != null) { @@ -87,9 +78,6 @@ public abstract class ParticipantSynchronizeWizard extends Wizard { } } - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#getNextPage(org.eclipse.jface.wizard.IWizardPage) - */ @Override public IWizardPage getNextPage(IWizardPage page) { if(importWizard != null ) { @@ -98,9 +86,6 @@ public abstract class ParticipantSynchronizeWizard extends Wizard { return super.getNextPage(page); } - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#performCancel() - */ @Override public boolean performCancel() { if(importWizard != null) { @@ -109,9 +94,6 @@ public abstract class ParticipantSynchronizeWizard extends Wizard { return super.performCancel(); } - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#canFinish() - */ @Override public boolean canFinish() { if(importWizard != null) { @@ -120,9 +102,6 @@ public abstract class ParticipantSynchronizeWizard extends Wizard { return super.canFinish(); } - /* (non-Javadoc) - * @see org.eclipse.jface.wizard.Wizard#getStartingPage() - */ @Override public IWizardPage getStartingPage() { if(importWizard != null) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipantWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipantWizard.java index 45ceea23c..cf6cd48b0 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipantWizard.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipantWizard.java @@ -29,18 +29,12 @@ public abstract class SubscriberParticipantWizard extends ParticipantSynchronize private GlobalRefreshResourceSelectionPage selectionPage; - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#createScopeSelectionPage() - */ @Override protected final WizardPage createScopeSelectionPage() { selectionPage = new GlobalRefreshResourceSelectionPage(getRootResources()); return selectionPage; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#createParticipant() - */ @Override protected final void createParticipant() { IResource[] resources = selectionPage.getRootResources(); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java index 389aa324a..7dc79f057 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java @@ -159,9 +159,6 @@ public abstract class SynchronizeModelAction extends BaseSelectionListenerAction Utils.handle(e); } - /* (non-Javadoc) - * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection) - */ @Override protected boolean updateSelection(IStructuredSelection selection) { super.updateSelection(selection); diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkspaceScope.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkspaceScope.java index 32bb96e7f..6591af0d6 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkspaceScope.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkspaceScope.java @@ -30,17 +30,11 @@ public class WorkspaceScope extends AbstractSynchronizeScope { public WorkspaceScope() { } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.ScopableSubscriberParticipant.ISynchronizeScope#getName() - */ @Override public String getName() { return TeamUIMessages.WorkspaceScope_0; } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ui.synchronize.ScopableSubscriberParticipant.ISynchronizeScope#getRoots() - */ @Override public IResource[] getRoots() { // Return null which indicates to use the subscriber roots diff --git a/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF b/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF index 632eda215..3a169357c 100644 --- a/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.team.examples.filesystem; singleton:=true -Bundle-Version: 3.5.300.qualifier +Bundle-Version: 3.5.400.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.team.examples.filesystem, diff --git a/examples/org.eclipse.team.examples.filesystem/pom.xml b/examples/org.eclipse.team.examples.filesystem/pom.xml index 48e60b4e7..01fb30f1b 100644 --- a/examples/org.eclipse.team.examples.filesystem/pom.xml +++ b/examples/org.eclipse.team.examples.filesystem/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.team</groupId> <artifactId>org.eclipse.team.examples.filesystem</artifactId> - <version>3.5.300-SNAPSHOT</version> + <version>3.5.400-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java index 35a598dfb..a15f0446a 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProvider.java @@ -91,6 +91,7 @@ public class FileSystemProvider extends RepositoryProvider { * * @see org.eclipse.team.core.RepositoryProvider#configureProject() */ + @Override public void configureProject() { FileSystemSubscriber.getInstance().handleRootChanged(getProject(), true /* added */); } @@ -101,6 +102,7 @@ public class FileSystemProvider extends RepositoryProvider { * * @see org.eclipse.core.resources.IProjectNature#deconfigure() */ + @Override public void deconfigure() throws CoreException { // Clear the persistant property containing the location getProject().setPersistentProperty(FILESYSTEM_REPO_LOC, null); @@ -112,6 +114,7 @@ public class FileSystemProvider extends RepositoryProvider { * * @see RepositoryProvider#getID() */ + @Override public String getID() { return FileSystemPlugin.PROVIDER_ID; } @@ -175,16 +178,12 @@ public class FileSystemProvider extends RepositoryProvider { return new FileSystemOperations(this); } - /* (non-Javadoc) - * @see org.eclipse.team.core.RepositoryProvider#getFileModificationValidator() - */ + @Override public IFileModificationValidator getFileModificationValidator() { return getFileModificationValidator2(); } - /* (non-Javadoc) - * @see org.eclipse.team.core.RepositoryProvider#getFileModificationValidator2() - */ + @Override public FileModificationValidator getFileModificationValidator2() { return new org.eclipse.team.examples.filesystem.FileModificationValidator(this); } @@ -229,13 +228,12 @@ public class FileSystemProvider extends RepositoryProvider { return null; } - /* (non-Javadoc) - * @see org.eclipse.team.core.RepositoryProvider#getRuleFactory() - */ + @Override public IResourceRuleFactory getRuleFactory() { return RESOURCE_RULE_FACTORY; } + @Override public IFileHistoryProvider getFileHistoryProvider() { if (FileSystemProvider.fileHistoryProvider == null) { FileSystemProvider.fileHistoryProvider = new FileSystemHistoryProvider(); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProviderType.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProviderType.java index f4fb25a8c..0f518fb6c 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProviderType.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/FileSystemProviderType.java @@ -21,9 +21,7 @@ import org.eclipse.team.core.RepositoryProviderType; */ public class FileSystemProviderType extends RepositoryProviderType { - /* (non-Javadoc) - * @see org.eclipse.team.core.RepositoryProviderType#getProjectSetCapability() - */ + @Override public ProjectSetCapability getProjectSetCapability() { // Create an empty project set capability to test backwards compatibility return new ProjectSetCapability() {}; diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemMergeContext.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemMergeContext.java index 29e35ae73..2e8d003ed 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemMergeContext.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemMergeContext.java @@ -15,7 +15,9 @@ package org.eclipse.team.examples.filesystem.subscriber; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.*; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.team.core.diff.IDiff; import org.eclipse.team.core.diff.IThreeWayDiff; @@ -39,18 +41,14 @@ public class FileSystemMergeContext extends SubscriberMergeContext { initialize(); } - /* (non-Javadoc) - * @see org.eclipse.team.core.mapping.provider.MergeContext#makeInSync(org.eclipse.team.core.diff.IDiff, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected void makeInSync(IDiff diff, IProgressMonitor monitor) throws CoreException { IResource resource = ResourceDiffTree.getResourceFor(diff); FileSystemSubscriber.getInstance().makeInSync(resource); } - /* (non-Javadoc) - * @see org.eclipse.team.core.mapping.IMergeContext#markAsMerged(org.eclipse.team.core.diff.IDiff, boolean, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void markAsMerged(IDiff diff, boolean inSyncHint, IProgressMonitor monitor) throws CoreException { // TODO if inSyncHint is true, we should test to see if the contents match @@ -58,24 +56,18 @@ public class FileSystemMergeContext extends SubscriberMergeContext { FileSystemSubscriber.getInstance().markAsMerged(resource, monitor); } - /* (non-Javadoc) - * @see org.eclipse.team.core.mapping.IMergeContext#reject(org.eclipse.team.core.diff.IDiff, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public void reject(IDiff diff, IProgressMonitor monitor) throws CoreException { markAsMerged(diff, false, monitor); } - /* (non-Javadoc) - * @see org.eclipse.team.core.mapping.provider.MergeContext#getMergeRule(org.eclipse.team.core.diff.IDiff) - */ + @Override public ISchedulingRule getMergeRule(IDiff node) { return ResourceDiffTree.getResourceFor(node).getProject(); } - /* (non-Javadoc) - * @see org.eclipse.team.core.mapping.provider.MergeContext#merge(org.eclipse.team.core.diff.IDiff, boolean, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public IStatus merge(IDiff diff, boolean ignoreLocalChanges, IProgressMonitor monitor) throws CoreException { // Only attempt the merge for non-conflicts. The reason we do this // is because the file system provider doesn't really have the proper base diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemRemoteTree.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemRemoteTree.java index 7465fbbe5..a6dd1acce 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemRemoteTree.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemRemoteTree.java @@ -35,16 +35,12 @@ public class FileSystemRemoteTree extends ThreeWayRemoteTree { super(subscriber); } - /* (non-Javadoc) - * @see org.eclipse.team.core.variants.AbstractResourceVariantTree#fetchMembers(org.eclipse.team.core.variants.IResourceVariant, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected IResourceVariant[] fetchMembers(IResourceVariant variant, IProgressMonitor progress) { return ((FileSystemResourceVariant)variant).members(); } - /* (non-Javadoc) - * @see org.eclipse.team.core.variants.AbstractResourceVariantTree#fetchVariant(org.eclipse.core.resources.IResource, int, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected IResourceVariant fetchVariant(IResource resource, int depth, IProgressMonitor monitor) { RepositoryProvider provider = RepositoryProvider.getProvider(resource.getProject(), FileSystemPlugin.PROVIDER_ID); if (provider != null) { diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemResourceVariant.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemResourceVariant.java index 1c500c21f..f52203578 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemResourceVariant.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemResourceVariant.java @@ -56,16 +56,12 @@ public class FileSystemResourceVariant extends CachedResourceVariant { this.bytes = bytes; } - /* (non-Javadoc) - * @see org.eclipse.team.core.variants.CachedResourceVariant#fetchContents(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected void fetchContents(IProgressMonitor monitor) throws TeamException { setContents(getContents(), monitor); } - /* (non-Javadoc) - * @see org.eclipse.team.core.variants.CachedResourceVariant#getCachePath() - */ + @Override protected String getCachePath() { // append the timestamp to the file path to give each variant a unique path return getFilePath() + " " + ioFile.lastModified(); //$NON-NLS-1$ @@ -82,38 +78,28 @@ public class FileSystemResourceVariant extends CachedResourceVariant { } } - /* (non-Javadoc) - * @see org.eclipse.team.core.variants.CachedResourceVariant#getCacheId() - */ + @Override protected String getCacheId() { return FileSystemPlugin.ID; } - /* (non-Javadoc) - * @see org.eclipse.team.core.variants.IResourceVariant#getName() - */ + @Override public String getName() { return ioFile.getName(); } - /* (non-Javadoc) - * @see org.eclipse.team.core.variants.IResourceVariant#isContainer() - */ + @Override public boolean isContainer() { return ioFile.isDirectory(); } - /* (non-Javadoc) - * @see org.eclipse.team.core.variants.IResourceVariant#getContentIdentifier() - */ + @Override public String getContentIdentifier() { // Use the modification timestamp as the content identifier return new Date(ioFile.lastModified()).toString(); } - /* (non-Javadoc) - * @see org.eclipse.team.core.variants.IResourceVariant#asBytes() - */ + @Override public byte[] asBytes() { if (bytes == null) { // For simplicity, convert the timestamp to it's string representation. diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemSyncInfo.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemSyncInfo.java index c0f97c503..6dfe3e7fa 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemSyncInfo.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/subscriber/FileSystemSyncInfo.java @@ -30,9 +30,7 @@ public class FileSystemSyncInfo extends SyncInfo { super(local, base, remote, comparator); } - /* (non-Javadoc) - * @see org.eclipse.team.core.subscribers.SyncInfo#calculateKind(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected int calculateKind() throws TeamException { if (getLocal().getType() != IResource.FILE) { if (getLocal().exists() && getRemote() != null) { @@ -42,9 +40,7 @@ public class FileSystemSyncInfo extends SyncInfo { return super.calculateKind(); } - /* (non-Javadoc) - * @see org.eclipse.team.core.synchronize.SyncInfo#getBase() - */ + @Override public IResourceVariant getBase() { // If the kind has been set and there is an incoming change // return null as the base since the server does not keep the diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemSynchronizeParticipant.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemSynchronizeParticipant.java index 8b9363eef..6c6478f8f 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemSynchronizeParticipant.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/FileSystemSynchronizeParticipant.java @@ -16,7 +16,9 @@ package org.eclipse.team.examples.filesystem.ui; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.mapping.ResourceMapping; import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.action.*; +import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IContributionItem; +import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.viewers.ILabelDecorator; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; @@ -32,48 +34,48 @@ import org.eclipse.team.examples.filesystem.subscriber.FileSystemSubscriber; import org.eclipse.team.internal.ui.TeamUIPlugin; import org.eclipse.team.ui.TeamUI; import org.eclipse.team.ui.mapping.SynchronizationActionProvider; -import org.eclipse.team.ui.synchronize.*; +import org.eclipse.team.ui.synchronize.ISynchronizeModelElement; +import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; +import org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant; +import org.eclipse.team.ui.synchronize.ModelSynchronizeParticipantActionGroup; /** * This is an example synchronize participant for the file system provider. It will allow * showing synchronization state for local resources mapped to a remote file system * location. - * + * * @since 3.0 */ public class FileSystemSynchronizeParticipant extends ModelSynchronizeParticipant { - + /** * The participant id for the org.eclipse.team.ui.synchronizeParticipant extension point. */ public static final String ID = "org.eclipse.team.examples.filesystem.participant"; //$NON-NLS-1$ - + /** * The viewer id for the org.eclipse.ui.navigator.viewer extension point. */ public static final String VIEWER_ID = "org.eclipse.team.examples.filesystem.syncViewer"; //$NON-NLS-1$ - + /** * Custom menu groups included in the viewer definition in the plugin.xml. */ public static final String CONTEXT_MENU_PUT_GROUP_1 = "put"; //$NON-NLS-1$ public static final String CONTEXT_MENU_OVERWRITE_GROUP_1 = "overwrite"; //$NON-NLS-1$ - + /** * A custom label decorator that will show the remote mapped path for each * file. */ public class FileSystemParticipantLabelDecorator extends LabelProvider implements ILabelDecorator { - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, java.lang.Object) - */ + @Override public Image decorateImage(Image image, Object element) { return image; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.ILabelDecorator#decorateText(java.lang.String, java.lang.Object) - */ + + @Override public String decorateText(String text, Object element) { try { if (element instanceof ISynchronizeModelElement) { @@ -92,26 +94,22 @@ public class FileSystemSynchronizeParticipant extends ModelSynchronizeParticipan return null; } } - + /** - * Action group that contributes the get an put menus to the context menu + * Action group that contributes the get an put menus to the context menu * in the synchronize view */ public class FileSystemParticipantActionGroup extends ModelSynchronizeParticipantActionGroup { - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#initialize(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration) - */ + @Override public void initialize(ISynchronizePageConfiguration configuration) { super.initialize(configuration); appendToGroup( - ISynchronizePageConfiguration.P_CONTEXT_MENU, + ISynchronizePageConfiguration.P_CONTEXT_MENU, CONTEXT_MENU_PUT_GROUP_1, new ModelPutAction("Put", configuration)); } - - /* (non-Javadoc) - * @see org.eclipse.team.ui.operations.MergeActionGroup#configureMergeAction(java.lang.String, org.eclipse.jface.action.Action) - */ + + @Override protected void configureMergeAction(String mergeActionId, Action action) { if (mergeActionId == SynchronizationActionProvider.MERGE_ACTION_ID) { // Custom label for overwrite @@ -123,7 +121,8 @@ public class FileSystemSynchronizeParticipant extends ModelSynchronizeParticipan super.configureMergeAction(mergeActionId, action); } } - + + @Override protected void addToContextMenu(String mergeActionId, Action action, IMenuManager manager) { IContributionItem group = null; if (mergeActionId == SynchronizationActionProvider.MERGE_ACTION_ID) { @@ -147,7 +146,7 @@ public class FileSystemSynchronizeParticipant extends ModelSynchronizeParticipan } } - + /** * Create a file system participant. This method is invoked by the * Synchronize view when a persisted participant is being restored. @@ -160,7 +159,7 @@ public class FileSystemSynchronizeParticipant extends ModelSynchronizeParticipan public FileSystemSynchronizeParticipant() { super(); } - + /** * Create the participant for the given context. This method is used * by the file system plugin to create a participant and then add it to @@ -176,35 +175,27 @@ public class FileSystemSynchronizeParticipant extends ModelSynchronizeParticipan } setSecondaryId(Long.toString(System.currentTimeMillis())); } - - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.subscribers.SubscriberParticipant#initializeConfiguration(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration) - */ + + @Override protected void initializeConfiguration(ISynchronizePageConfiguration configuration) { super.initializeConfiguration(configuration); configuration.setProperty(ISynchronizePageConfiguration.P_VIEWER_ID, VIEWER_ID); - + // Add the label decorator configuration.addLabelDecorator(new FileSystemParticipantLabelDecorator()); } - - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant#createMergeActionGroup() - */ + + @Override protected ModelSynchronizeParticipantActionGroup createMergeActionGroup() { return new FileSystemParticipantActionGroup(); } - - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant#restoreContext(org.eclipse.team.core.mapping.ISynchronizationScopeManager) - */ + + @Override protected MergeContext restoreContext(ISynchronizationScopeManager manager) { return new FileSystemMergeContext(manager); } - - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant#createScopeManager(org.eclipse.core.resources.mapping.ResourceMapping[]) - */ + + @Override protected ISynchronizationScopeManager createScopeManager(ResourceMapping[] mappings) { return FileSystemOperation.createScopeManager(getName(), mappings); } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetOperation.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetOperation.java index b3b1541df..b22573688 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetOperation.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetOperation.java @@ -17,7 +17,7 @@ import org.eclipse.core.resources.mapping.ResourceTraversal; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.diff.*; +import org.eclipse.team.core.diff.IThreeWayDiff; import org.eclipse.team.core.subscribers.SubscriberScopeManager; import org.eclipse.team.examples.filesystem.FileSystemProvider; import org.eclipse.team.examples.filesystem.Policy; @@ -35,9 +35,7 @@ public class GetOperation extends FileSystemOperation { super(part, manager); } - /* (non-Javadoc) - * @see org.eclipse.team.examples.filesystem.ui.FileSystemOperation#execute(org.eclipse.team.examples.filesystem.FileSystemProvider, org.eclipse.core.resources.mapping.ResourceTraversal[], org.eclipse.core.runtime.SubProgressMonitor) - */ + @Override protected void execute(FileSystemProvider provider, ResourceTraversal[] traversals, IProgressMonitor monitor) throws CoreException { @@ -51,16 +49,14 @@ public class GetOperation extends FileSystemOperation { private boolean hasIncomingChanges(ResourceTraversal[] traversals) throws CoreException { final RuntimeException found = new RuntimeException(); try { - FileSystemSubscriber.getInstance().accept(traversals, new IDiffVisitor() { - public boolean visit(IDiff diff) { - if (diff instanceof IThreeWayDiff) { - IThreeWayDiff twd = (IThreeWayDiff) diff; - if (twd.getDirection() == IThreeWayDiff.INCOMING || twd.getDirection() == IThreeWayDiff.CONFLICTING) { - throw found; - } + FileSystemSubscriber.getInstance().accept(traversals, diff -> { + if (diff instanceof IThreeWayDiff) { + IThreeWayDiff twd = (IThreeWayDiff) diff; + if (twd.getDirection() == IThreeWayDiff.INCOMING || twd.getDirection() == IThreeWayDiff.CONFLICTING) { + throw found; } - return false; } + return false; }); } catch (RuntimeException e) { if (e == found) @@ -87,9 +83,7 @@ public class GetOperation extends FileSystemOperation { this.overwriteOutgoing = overwriteOutgoing; } - /* (non-Javadoc) - * @see org.eclipse.team.examples.filesystem.ui.FileSystemOperation#getTaskName() - */ + @Override protected String getTaskName() { return Policy.bind("GetAction.working"); //$NON-NLS-1$ } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergeOperation.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergeOperation.java index 32c0d8cf9..a2453c77d 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergeOperation.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/NonSyncModelMergeOperation.java @@ -14,7 +14,9 @@ package org.eclipse.team.examples.filesystem.ui; import org.eclipse.core.resources.mapping.RemoteResourceMappingContext; -import org.eclipse.core.runtime.*; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; @@ -55,9 +57,7 @@ public class NonSyncModelMergeOperation extends ModelMergeOperation { super(part, manager); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ModelMergeOperation#initializeContext(org.eclipse.core.runtime.IProgressMonitor) - */ + @Override protected void initializeContext(IProgressMonitor monitor) throws CoreException { try { monitor.beginTask(null, 100); @@ -77,9 +77,7 @@ public class NonSyncModelMergeOperation extends ModelMergeOperation { } } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ModelOperation#getContext() - */ + @Override protected ISynchronizationContext getContext() { return context; } @@ -89,15 +87,14 @@ public class NonSyncModelMergeOperation extends ModelMergeOperation { * any changes. * @see org.eclipse.team.ui.synchronize.ModelMergeOperation#handlePreviewRequest() */ + @Override protected void handlePreviewRequest() { // We perform a syncExec so that the job will dispose of the scope manager // after the dialog closes Display.getDefault().syncExec(() -> NonSyncMergeDialog.openFor(NonSyncModelMergeOperation.this)); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.TeamOperation#getShell() - */ + @Override public Shell getShell() { // Change method to public return super.getShell(); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutOperation.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutOperation.java index d2d5630ef..e4fc8e9b7 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutOperation.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutOperation.java @@ -17,7 +17,7 @@ import org.eclipse.core.resources.mapping.ResourceTraversal; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.team.core.TeamException; -import org.eclipse.team.core.diff.*; +import org.eclipse.team.core.diff.IThreeWayDiff; import org.eclipse.team.core.subscribers.SubscriberScopeManager; import org.eclipse.team.examples.filesystem.FileSystemProvider; import org.eclipse.team.examples.filesystem.Policy; @@ -40,9 +40,7 @@ public class PutOperation extends FileSystemOperation { super(part, manager); } - /* (non-Javadoc) - * @see org.eclipse.team.examples.filesystem.ui.FileSystemOperation#execute(org.eclipse.team.examples.filesystem.FileSystemProvider, org.eclipse.core.resources.mapping.ResourceTraversal[], org.eclipse.core.runtime.SubProgressMonitor) - */ + @Override protected void execute(FileSystemProvider provider, ResourceTraversal[] traversals, IProgressMonitor monitor) throws CoreException { @@ -56,16 +54,14 @@ public class PutOperation extends FileSystemOperation { private boolean hasOutgoingChanges(ResourceTraversal[] traversals) throws CoreException { final RuntimeException found = new RuntimeException(); try { - FileSystemSubscriber.getInstance().accept(traversals, new IDiffVisitor() { - public boolean visit(IDiff diff) { - if (diff instanceof IThreeWayDiff) { - IThreeWayDiff twd = (IThreeWayDiff) diff; - if (twd.getDirection() == IThreeWayDiff.OUTGOING || twd.getDirection() == IThreeWayDiff.CONFLICTING) { - throw found; - } + FileSystemSubscriber.getInstance().accept(traversals, diff -> { + if (diff instanceof IThreeWayDiff) { + IThreeWayDiff twd = (IThreeWayDiff) diff; + if (twd.getDirection() == IThreeWayDiff.OUTGOING || twd.getDirection() == IThreeWayDiff.CONFLICTING) { + throw found; } - return false; } + return false; }); } catch (RuntimeException e) { if (e == found) @@ -75,9 +71,7 @@ public class PutOperation extends FileSystemOperation { return false; } - /* (non-Javadoc) - * @see org.eclipse.team.examples.filesystem.ui.FileSystemOperation#getTaskName() - */ + @Override protected String getTaskName() { return Policy.bind("PutAction.working"); //$NON-NLS-1$ } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ReplaceAction.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ReplaceAction.java index 62dc3183b..5a068bbf4 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ReplaceAction.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/ReplaceAction.java @@ -19,9 +19,7 @@ package org.eclipse.team.examples.filesystem.ui; */ public class ReplaceAction extends GetAction { - /* (non-Javadoc) - * @see org.eclipse.team.examples.filesystem.ui.GetAction#isOverwriteOutgoing() - */ + @Override protected boolean isOverwriteOutgoing() { return true; } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SyncDialogModelMergeOperation.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SyncDialogModelMergeOperation.java index d9469cd89..b034b920a 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SyncDialogModelMergeOperation.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SyncDialogModelMergeOperation.java @@ -30,9 +30,7 @@ public class SyncDialogModelMergeOperation extends super(part, manager); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ModelParticipantMergeOperation#createMergeContext() - */ + @Override protected SynchronizationContext createMergeContext() { return new FileSystemMergeContext(getScopeManager()); } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SynchronizeWizard.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SynchronizeWizard.java index 84679d382..fab46cd5a 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SynchronizeWizard.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/SynchronizeWizard.java @@ -35,9 +35,7 @@ public class SynchronizeWizard extends ModelParticipantWizard { super(); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ModelParticipantWizard#createParticipant(org.eclipse.core.resources.mapping.ResourceMapping[]) - */ + @Override protected ISynchronizeParticipant createParticipant(ResourceMapping[] selectedMappings) { SubscriberScopeManager manager = FileSystemOperation.createScopeManager(FileSystemSubscriber.getInstance().getName(), selectedMappings); FileSystemMergeContext context = new FileSystemMergeContext(manager); @@ -45,9 +43,7 @@ public class SynchronizeWizard extends ModelParticipantWizard { return participant; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#getImportWizard() - */ + @Override protected IWizard getImportWizard() { // We don't have an import wizard for the file system example but // if we did, we could return it here and it would be used if the @@ -55,16 +51,12 @@ public class SynchronizeWizard extends ModelParticipantWizard { return importWizard; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#getPageTitle() - */ + @Override protected String getPageTitle() { return "Synchronize File System Example"; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#getRootResources() - */ + @Override protected IResource[] getRootResources() { return FileSystemSubscriber.getInstance().roots(); } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelNature.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelNature.java index bfe32b83c..092278a59 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelNature.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ModelNature.java @@ -22,35 +22,27 @@ import org.eclipse.core.resources.IProjectNature; public class ModelNature implements IProjectNature { public static final String NATURE_ID = "org.eclipse.team.examples.filesystem.modelNature"; - - private IProject project; - - /* (non-Javadoc) - * @see org.eclipse.core.resources.IProjectNature#configure() - */ - public void configure() { - // Nothing to do - } - - /* (non-Javadoc) - * @see org.eclipse.core.resources.IProjectNature#deconfigure() - */ - public void deconfigure() { - // Nothing to do - } - - /* (non-Javadoc) - * @see org.eclipse.core.resources.IProjectNature#getProject() - */ - public IProject getProject() { - return project; - } - - /* (non-Javadoc) - * @see org.eclipse.core.resources.IProjectNature#setProject(org.eclipse.core.resources.IProject) - */ - public void setProject(IProject project) { - this.project = project; - } + + private IProject project; + + @Override + public void configure() { + // Nothing to do + } + + @Override + public void deconfigure() { + // Nothing to do + } + + @Override + public IProject getProject() { + return project; + } + + @Override + public void setProject(IProject project) { + this.project = project; + } } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelContainerResourceMapping.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelContainerResourceMapping.java index afb877682..29e096830 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelContainerResourceMapping.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelContainerResourceMapping.java @@ -28,9 +28,7 @@ public class ModelContainerResourceMapping extends ModelResourceMapping { super(container); } - /* (non-Javadoc) - * @see org.eclipse.core.resources.mapping.ResourceMapping#getTraversals(org.eclipse.core.resources.mapping.ResourceMappingContext, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public ResourceTraversal[] getTraversals(ResourceMappingContext context, IProgressMonitor monitor) { return new ResourceTraversal[] { @@ -44,9 +42,7 @@ public class ModelContainerResourceMapping extends ModelResourceMapping { return ((ModelContainer)getModelObject()).getResource(); } - /* (non-Javadoc) - * @see org.eclipse.core.resources.mapping.ResourceMapping#contains(org.eclipse.core.resources.mapping.ResourceMapping) - */ + @Override public boolean contains(ResourceMapping mapping) { if (mapping instanceof ModelResourceMapping) { ModelObject object = (ModelObject)mapping.getModelObject(); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java index 7ddbe9a34..6dc403b0e 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelMerger.java @@ -57,17 +57,11 @@ public class ModelMerger extends ResourceMappingMerger { this.provider = provider; } - /* (non-Javadoc) - * @see org.eclipse.team.core.mapping.ResourceMappingMerger#getModelProvider() - */ @Override protected org.eclipse.core.resources.mapping.ModelProvider getModelProvider() { return provider; } - /* (non-Javadoc) - * @see org.eclipse.team.core.mapping.ResourceMappingMerger#merge(org.eclipse.team.core.mapping.IMergeContext, org.eclipse.core.runtime.IProgressMonitor) - */ @Override public IStatus merge(IMergeContext mergeContext, IProgressMonitor monitor) throws CoreException { try { diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelResourceMapping.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelResourceMapping.java index 17894f809..c5177587b 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelResourceMapping.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/ModelResourceMapping.java @@ -15,7 +15,10 @@ package org.eclipse.team.examples.model.mapping; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.mapping.ResourceMapping; -import org.eclipse.team.examples.model.*; +import org.eclipse.team.examples.model.ModelContainer; +import org.eclipse.team.examples.model.ModelObject; +import org.eclipse.team.examples.model.ModelObjectDefinitionFile; +import org.eclipse.team.examples.model.ModelObjectElementFile; public abstract class ModelResourceMapping extends ResourceMapping { @@ -38,23 +41,17 @@ public abstract class ModelResourceMapping extends ResourceMapping { this.object = object; } - /* (non-Javadoc) - * @see org.eclipse.core.resources.mapping.ResourceMapping#getModelObject() - */ + @Override public Object getModelObject() { return object; } - /* (non-Javadoc) - * @see org.eclipse.core.resources.mapping.ResourceMapping#getModelProviderId() - */ + @Override public String getModelProviderId() { return ExampleModelProvider.ID; } - /* (non-Javadoc) - * @see org.eclipse.core.resources.mapping.ResourceMapping#getProjects() - */ + @Override public IProject[] getProjects() { return new IProject[] { (IProject)object.getProject().getResource() }; } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/MoeResourceMapping.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/MoeResourceMapping.java index bb3062f2a..0c515c4a6 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/MoeResourceMapping.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/mapping/MoeResourceMapping.java @@ -27,9 +27,7 @@ public class MoeResourceMapping extends ModelResourceMapping { super(file); } - /* (non-Javadoc) - * @see org.eclipse.core.resources.mapping.ResourceMapping#getTraversals(org.eclipse.core.resources.mapping.ResourceMappingContext, org.eclipse.core.runtime.IProgressMonitor) - */ + @Override public ResourceTraversal[] getTraversals(ResourceMappingContext context, IProgressMonitor monitor) { return new ResourceTraversal[] { @@ -43,9 +41,7 @@ public class MoeResourceMapping extends ModelResourceMapping { return ((ModelResource)getModelObject()).getResource(); } - /* (non-Javadoc) - * @see org.eclipse.core.resources.mapping.ResourceMapping#contains(org.eclipse.core.resources.mapping.ResourceMapping) - */ + @Override public boolean contains(ResourceMapping mapping) { if (mapping.equals(this)) return true; diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorLabelProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorLabelProvider.java index 9b10e86a4..7768114e1 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorLabelProvider.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelNavigatorLabelProvider.java @@ -29,30 +29,22 @@ public class ModelNavigatorLabelProvider extends WorkbenchLabelProvider implemen private ICommonContentExtensionSite extensionSite; - /* (non-Javadoc) - * @see org.eclipse.ui.navigator.ICommonLabelProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite) - */ + @Override public void init(ICommonContentExtensionSite aConfig) { extensionSite = aConfig; } - /* (non-Javadoc) - * @see org.eclipse.ui.navigator.IMementoAware#restoreState(org.eclipse.ui.IMemento) - */ + @Override public void restoreState(IMemento aMemento) { // Nothing to do } - /* (non-Javadoc) - * @see org.eclipse.ui.navigator.IMementoAware#saveState(org.eclipse.ui.IMemento) - */ + @Override public void saveState(IMemento aMemento) { // Nothing to do } - /* (non-Javadoc) - * @see org.eclipse.ui.navigator.IDescriptionProvider#getDescription(java.lang.Object) - */ + @Override public String getDescription(Object anElement) { if (anElement instanceof ModelObject) { return ((ModelObject) anElement).getPath(); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelWorkbenchAdapter.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelWorkbenchAdapter.java index 650be58a9..8f4d7587b 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelWorkbenchAdapter.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/ModelWorkbenchAdapter.java @@ -15,10 +15,17 @@ package org.eclipse.team.examples.model.ui; import java.net.URL; -import org.eclipse.core.runtime.*; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Path; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.team.examples.filesystem.FileSystemPlugin; -import org.eclipse.team.examples.model.*; +import org.eclipse.team.examples.model.ModelFolder; +import org.eclipse.team.examples.model.ModelObject; +import org.eclipse.team.examples.model.ModelObjectDefinitionFile; +import org.eclipse.team.examples.model.ModelObjectElementFile; +import org.eclipse.team.examples.model.ModelProject; +import org.eclipse.team.examples.model.ModelWorkspace; import org.eclipse.ui.model.IWorkbenchAdapter; /** @@ -29,9 +36,7 @@ public class ModelWorkbenchAdapter implements IWorkbenchAdapter { // image path private static final String ICON_PATH = "$nl$/icons/full/"; //$NON-NLS-1$ - /* (non-Javadoc) - * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object) - */ + @Override public Object[] getChildren(Object o) { if (o instanceof ModelObject) { ModelObject mo = (ModelObject) o; @@ -44,9 +49,7 @@ public class ModelWorkbenchAdapter implements IWorkbenchAdapter { return new Object[0]; } - /* (non-Javadoc) - * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object) - */ + @Override public ImageDescriptor getImageDescriptor(Object object) { if (object instanceof ModelProject) { return createImageDescriptor("obj/prj_obj.gif"); @@ -66,9 +69,7 @@ public class ModelWorkbenchAdapter implements IWorkbenchAdapter { return null; } - /* (non-Javadoc) - * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object) - */ + @Override public String getLabel(Object o) { if (o instanceof ModelObject) { ModelObject mo = (ModelObject) o; @@ -77,9 +78,7 @@ public class ModelWorkbenchAdapter implements IWorkbenchAdapter { return null; } - /* (non-Javadoc) - * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object) - */ + @Override public Object getParent(Object o) { if (o instanceof ModelObject) { ModelObject mo = (ModelObject) o; diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncActionProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncActionProvider.java index 61848cb25..2ae215a22 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncActionProvider.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncActionProvider.java @@ -25,9 +25,7 @@ public class ModelSyncActionProvider extends SynchronizationActionProvider { super(); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.mapping.SynchronizationActionProvider#initialize() - */ + @Override protected void initialize() { super.initialize(); final ISynchronizePageConfiguration configuration= getSynchronizePageConfiguration(); diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncLabelProvider.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncLabelProvider.java index a99922f15..53cf0ecde 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncLabelProvider.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/model/ui/mapping/ModelSyncLabelProvider.java @@ -38,34 +38,26 @@ public class ModelSyncLabelProvider extends SynchronizationLabelProvider { super(); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.mapping.SynchronizationLabelProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite) - */ + @Override public void init(ICommonContentExtensionSite site) { super.init(site); delegate = new ModelNavigatorLabelProvider(); delegate.init(site); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeLabelProvider#dispose() - */ + @Override public void dispose() { super.dispose(); if (delegate != null) delegate.dispose(); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeLabelProvider#getDelegateLabelProvider() - */ + @Override protected ILabelProvider getDelegateLabelProvider() { return delegate; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeLabelProvider#getDiff(java.lang.Object) - */ + @Override protected IDiff getDiff(Object element) { if (element instanceof ModelResource) { ModelResource mr = (ModelResource) element; @@ -74,16 +66,12 @@ public class ModelSyncLabelProvider extends SynchronizationLabelProvider { return super.getDiff(element); } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeLabelProvider#isIncludeOverlays() - */ + @Override protected boolean isIncludeOverlays() { return true; } - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeLabelProvider#isBusy(java.lang.Object) - */ + @Override protected boolean isBusy(Object element) { if (element instanceof ModelResource) { ModelResource mr = (ModelResource) element; @@ -92,8 +80,7 @@ public class ModelSyncLabelProvider extends SynchronizationLabelProvider { ModelObjectDefinitionFile modFile = (ModelObjectDefinitionFile) mr; try { ModelObjectElementFile[] children = modFile.getModelObjectElementFiles(); - for (int i = 0; i < children.length; i++) { - ModelObjectElementFile file = children[i]; + for (ModelObjectElementFile file : children) { busy = getContext().getDiffTree().getProperty(file.getResource().getFullPath(), IDiffTree.P_BUSY_HINT); if (busy) break; @@ -107,6 +94,7 @@ public class ModelSyncLabelProvider extends SynchronizationLabelProvider { return super.isBusy(element); } + @Override protected boolean hasDecendantConflicts(Object element) { if (element instanceof ModelResource) { ModelResource mr = (ModelResource) element; @@ -115,8 +103,7 @@ public class ModelSyncLabelProvider extends SynchronizationLabelProvider { ModelObjectDefinitionFile modFile = (ModelObjectDefinitionFile) mr; try { ModelObjectElementFile[] children = modFile.getModelObjectElementFiles(); - for (int i = 0; i < children.length; i++) { - ModelObjectElementFile file = children[i]; + for (ModelObjectElementFile file : children) { conflict = getContext().getDiffTree().getProperty(file.getResource().getFullPath(), IDiffTree.P_HAS_DESCENDANT_CONFLICTS); if (conflict) break; |