Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2019-04-17 02:51:48 -0400
committerAlexander Kurtakov2019-04-17 02:51:48 -0400
commit24d8de28c7f995ee0aa29f50d07a8b38cb5cf1c6 (patch)
tree3b1fcbcfa1753454af004c5db9c69c15998df45f
parenteaf7e086953a77a044e97cfb889e378f814a97eb (diff)
downloadeclipse.platform.team-24d8de28c7f995ee0aa29f50d07a8b38cb5cf1c6.tar.gz
eclipse.platform.team-24d8de28c7f995ee0aa29f50d07a8b38cb5cf1c6.tar.xz
eclipse.platform.team-24d8de28c7f995ee0aa29f50d07a8b38cb5cf1c6.zip
Remove useless non-javadoc/@see comments. (take 2)
Put @Override instead where needed. Change-Id: I7739642c6d6ccdb4845bb02ae89ac7b03f408b33 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java19
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotatePreferencePage.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java22
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java21
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPerspective.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSResourceTransfer.java23
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommentTemplateEditDialog.java16
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java19
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ComparePreferencePage.java22
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/DateTagDialog.java18
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java15
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/KeyboardInteractiveDialog.java23
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java37
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java19
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TableViewerAction.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WatchEditPreferencePage.java25
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java24
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/BranchAction.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java15
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAction.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutWizardAction.java20
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java15
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRemoteAction.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java15
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/FetchAllMembersAction.java5
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java18
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MergeAction.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OutgoingChangesDialog.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithLatestRevisionAction.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRevisionAction.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithSelectableTagAction.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowEditorsAction.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagLocalAction.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UneditAction.java23
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateSilentAction.java16
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSOutputConsole.java21
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/ConsolePreferencesPage.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractModelMergeOperation.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSSubscriberMergeContext.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java30
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetSorter.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java14
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CommitAction.java11
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CompareSubscriberContext.java21
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CreatePatchAction.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/MergeSubscriberContext.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelCompareParticipant.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeOperation.java15
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeParticipant.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelParticipantChangeSetCapability.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelReplaceOperation.java15
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelSynchronizeWizard.java11
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java15
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceCommitAction.java17
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceModelParticipant.java15
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java18
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/DateTagCategory.java18
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteModule.java33
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/TagCategory.java13
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/AddOperation.java13
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/BranchOperation.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java18
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheBaseContentsOperation.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheRemoteContentsOperation.java13
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheTreeContentsOperation.java35
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutMultipleProjectsOperation.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutOperation.java16
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutSingleProjectOperation.java13
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutToRemoteFolderOperation.java16
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ClipboardDiffOperation.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CommitOperation.java27
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DisconnectOperation.java24
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchAllMembersOperation.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchMembersOperation.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FileDiffOperation.java5
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/OverrideAndUpdateOperation.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ProjectMetaFileOperation.java14
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java15
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java18
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryLocationOperation.java11
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShareProjectOperation.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java36
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java21
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java15
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/NewDateTagAction.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesSortingActionGroup.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java150
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetActionGroup.java5
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCapability.java23
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java33
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipant.java15
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipantAction.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberOperation.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CommitSetDialog.java18
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java50
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertAction.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertOperation.java13
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedAction.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedOperation.java16
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CreatePatchAction.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CreatePatchWizardParticipant.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/LogEntryCacheUpdateHandler.java24
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java24
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateOperation.java18
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndCommitAction.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java7
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateSubscriberOperation.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateAction.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateOperation.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateOperation.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/UpdateDialog.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java11
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java16
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java30
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateOperation.java16
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/FilteredTagList.java15
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/LocalProjectTagSource.java18
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java15
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/SingleFileTagSource.java18
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/SingleFolderTagSource.java18
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagAsVersionDialog.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagContentAssistProcessor.java24
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagElement.java17
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagRefreshButtonArea.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionWizardPage.java9
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AlternativeLocationWizard.java5
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSScmUrlImportWizardPage.java29
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSWizardPage.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java7
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java12
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java21
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java17
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardParticipant.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizard.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardPageActionGroup.java5
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardSyncPage.java12
170 files changed, 438 insertions, 1915 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java
index 546041fa8..b056f7c3a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AddToVersionControlDialog.java
@@ -69,17 +69,11 @@ public class AddToVersionControlDialog extends DetailsDialog {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#getHelpContextId()
- */
@Override
protected String getHelpContextId() {
return IHelpContextIds.ADD_TO_VERSION_CONTROL_DIALOG;
}
- /**
- * @see org.eclipse.team.internal.ui.DetailsDialog#createDropDownDialogArea(org.eclipse.swt.widgets.Composite)
- */
@Override
protected Composite createDropDownDialogArea(Composite parent) {
// create a composite with standard margins and spacing
@@ -168,9 +162,6 @@ public class AddToVersionControlDialog extends DetailsDialog {
deselectButton.addSelectionListener(listener);
}
- /**
- * @see org.eclipse.team.internal.ui.DetailsDialog#updateEnablements()
- */
@Override
protected void updateEnablements() {
}
@@ -188,9 +179,6 @@ public class AddToVersionControlDialog extends DetailsDialog {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
- */
@Override
protected void createButtonsForButtonBar(Composite parent) {
createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL, true);
@@ -198,16 +186,11 @@ public class AddToVersionControlDialog extends DetailsDialog {
super.createButtonsForButtonBar(parent);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.DetailsDialog#includeOkButton()
- */
@Override
protected boolean includeOkButton() {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
- */
+
@Override
protected void buttonPressed(int id) {
// hijack yes and no buttons to set the correct return
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotatePreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotatePreferencePage.java
index 6cadee3b8..4c8b0d662 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotatePreferencePage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/AnnotatePreferencePage.java
@@ -15,7 +15,8 @@ package org.eclipse.team.internal.ccvs.ui;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
-import org.eclipse.jface.preference.*;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.RadioGroupFieldEditor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.*;
@@ -30,12 +31,14 @@ public class AnnotatePreferencePage extends FieldEditorPreferencePage implements
setPreferenceStore(CVSUIPlugin.getPlugin().getPreferenceStore());
}
+ @Override
public void createControl(Composite parent) {
super.createControl(parent);
// set F1 help
PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.ANNOTATE_VIEW);
}
+ @Override
public void createFieldEditors() {
binaryPrompt = new RadioGroupFieldEditor(ICVSUIConstants.PREF_ANNOTATE_PROMPTFORBINARY, CVSUIMessages.AnnotatePreferencePage_AnnotatePrefPageBinaryFileMessage, 3, new String[][] { {CVSUIMessages.CVSPreferencesPage_11, MessageDialogWithToggle.ALWAYS}, {CVSUIMessages.CVSPreferencesPage_12, MessageDialogWithToggle.NEVER}, {CVSUIMessages.CVSPreferencesPage_13, MessageDialogWithToggle.PROMPT}}, getFieldEditorParent(), true /* use a group */);
addField(binaryPrompt);
@@ -44,12 +47,11 @@ public class AnnotatePreferencePage extends FieldEditorPreferencePage implements
getFieldEditorParent().layout(true);
}
+ @Override
public void init(IWorkbench workbench) {
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferencePage#performOk()
- */
+ @Override
public boolean performOk() {
CVSUIPlugin.getPlugin().savePluginPreferences();
return super.performOk();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java
index 93b390edf..39993dfcb 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSHistoryTableProvider.java
@@ -141,9 +141,6 @@ public class CVSHistoryTableProvider {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.CellLabelProvider#getToolTipText(java.lang.Object)
- */
@Override
public String getToolTipText(Object element) {
if (column == COL_COMMENT && !isSingleLine(element)) {
@@ -154,9 +151,6 @@ public class CVSHistoryTableProvider {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.CellLabelProvider#useNativeToolTip(java.lang.Object)
- */
@Override
public boolean useNativeToolTip(Object object) {
return column != COL_COMMENT || isSingleLine(object);
@@ -169,9 +163,6 @@ public class CVSHistoryTableProvider {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ColumnLabelProvider#getImage(java.lang.Object)
- */
@Override
public Image getImage(Object element) {
return getColumnImage(element, column);
@@ -208,9 +199,6 @@ public class CVSHistoryTableProvider {
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ColumnLabelProvider#getText(java.lang.Object)
- */
@Override
public String getText(Object element) {
return getColumnText(element, column);
@@ -276,9 +264,6 @@ public class CVSHistoryTableProvider {
return dateFormat;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
- */
@Override
public Color getForeground(Object element) {
if (element instanceof AbstractHistoryCategory){
@@ -294,18 +279,11 @@ public class CVSHistoryTableProvider {
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) {
if (element instanceof AbstractHistoryCategory) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java
index 326dd447e..1b72d8a43 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSLightweightDecorator.java
@@ -496,25 +496,16 @@ public class CVSLightweightDecorator extends LabelProvider implements ILightweig
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#resourceSyncInfoChanged(org.eclipse.core.resources.IResource[])
- */
@Override
public void resourceSyncInfoChanged(IResource[] changedResources) {
resourceStateChanged(changedResources);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#externalSyncInfoChange(org.eclipse.core.resources.IResource[])
- */
@Override
public void externalSyncInfoChange(IResource[] changedResources) {
resourceStateChanged(changedResources);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#resourceModificationStateChanged(org.eclipse.core.resources.IResource[])
- */
@Override
public void resourceModified(IResource[] changedResources) {
resourceStateChanged(changedResources);
@@ -544,16 +535,10 @@ public class CVSLightweightDecorator extends LabelProvider implements ILightweig
postLabelEvent(new LabelProviderChangedEvent(this, resourcesToUpdate.toArray()));
}
- /**
- * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#projectConfigured(org.eclipse.core.resources.IProject)
- */
@Override
public void projectConfigured(IProject project) {
refresh(project);
}
- /**
- * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#projectDeconfigured(org.eclipse.core.resources.IProject)
- */
@Override
public void projectDeconfigured(IProject project) {
refresh(project);
@@ -568,9 +553,6 @@ public class CVSLightweightDecorator extends LabelProvider implements ILightweig
Display.getDefault().asyncExec(() -> fireLabelProviderChanged(event));
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
- */
@Override
public void dispose() {
super.dispose();
@@ -611,9 +593,6 @@ public class CVSLightweightDecorator extends LabelProvider implements ILightweig
exceptions.handleException(e);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
- */
@Override
public void propertyChange(PropertyChangeEvent event) {
if (isEventOfInterest(event)) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPerspective.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPerspective.java
index 410096895..755071061 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPerspective.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSPerspective.java
@@ -23,9 +23,7 @@ public class CVSPerspective implements IPerspectiveFactory {
public final static String ID = "org.eclipse.team.cvs.ui.cvsPerspective"; //$NON-NLS-1$
- /* (Non-javadoc)
- * Method declared on IPerpsectiveFactory
- */
+ @Override
public void createInitialLayout(IPageLayout layout) {
defineActions(layout);
defineLayout(layout);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSResourceTransfer.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSResourceTransfer.java
index 9f77acdb2..90acf4934 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSResourceTransfer.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSResourceTransfer.java
@@ -44,21 +44,18 @@ public final class CVSResourceTransfer extends ByteArrayTransfer {
}
- protected int[] getTypeIds() {
+ @Override
+ protected int[] getTypeIds() {
return new int[] { TYPE };
}
- protected String[] getTypeNames() {
+ @Override
+ protected String[] getTypeNames() {
return new String[] { TYPE_NAME };
}
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.dnd.Transfer#javaToNative(java.lang.Object,org.eclipse.swt.dnd.TransferData)
- */
- public void javaToNative(Object object, TransferData transferData) {
+ @Override
+ public void javaToNative(Object object, TransferData transferData) {
if (!isSupportedType(transferData)) {
DND.error(DND.ERROR_INVALID_DATA);
}
@@ -69,12 +66,8 @@ public final class CVSResourceTransfer extends ByteArrayTransfer {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.dnd.Transfer#nativeToJava(org.eclipse.swt.dnd.TransferData)
- */
- protected Object nativeToJava(TransferData transferData) {
+ @Override
+ protected Object nativeToJava(TransferData transferData) {
byte[] bytes = (byte[]) super.nativeToJava(transferData);
return fromByteArray(bytes);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommentTemplateEditDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommentTemplateEditDialog.java
index a665eb4ef..2a55ea5b2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommentTemplateEditDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommentTemplateEditDialog.java
@@ -95,9 +95,6 @@ public class CommentTemplateEditDialog extends Dialog {
this.validator = validator;
}
- /*
- * (non-Javadoc) Method declared on Dialog.
- */
@Override
protected void buttonPressed(int buttonId) {
if (buttonId == IDialogConstants.OK_ID) {
@@ -108,11 +105,6 @@ public class CommentTemplateEditDialog extends Dialog {
super.buttonPressed(buttonId);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
@Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
@@ -120,11 +112,6 @@ public class CommentTemplateEditDialog extends Dialog {
shell.setText(title);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
- */
@Override
protected void createButtonsForButtonBar(Composite parent) {
// create OK and Cancel buttons by default
@@ -141,9 +128,6 @@ public class CommentTemplateEditDialog extends Dialog {
}
}
- /*
- * (non-Javadoc) Method declared on Dialog.
- */
@Override
protected Control createDialogArea(Composite parent) {
// create composite
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
index c819b32ba..cc8ef720d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
@@ -134,21 +134,11 @@ public class CommitCommentArea extends DialogArea {
final ICompletionProposal proposal = computeQuickAssistProposals[i];
quickFixMenu.add(new Action(proposal.getDisplayString()) {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.action.Action#run()
- */
@Override
public void run() {
proposal.apply(sourceViewer.getDocument());
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.action.Action#getImageDescriptor()
- */
@Override
public ImageDescriptor getImageDescriptor() {
if (proposal.getImage() != null) {
@@ -182,9 +172,6 @@ public class CommitCommentArea extends DialogArea {
}
- /* (non-Javadoc)
- * @see org.eclipse.swt.events.FocusAdapter#focusLost(org.eclipse.swt.events.FocusEvent)
- */
@Override
public void focusLost(FocusEvent e) {
IHandlerService service = PlatformUI.getWorkbench().getService(IHandlerService.class);
@@ -261,9 +248,6 @@ public class CommitCommentArea extends DialogArea {
*/
private ActionHandler createQuickFixActionHandler(final ITextOperationTarget textOperationTarget) {
Action quickFixAction= new Action() {
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
@Override
public void run() {
textOperationTarget.doOperation(ISourceViewer.QUICK_ASSIST);
@@ -427,9 +411,6 @@ public class CommitCommentArea extends DialogArea {
public void focusGained(FocusEvent e) {
}
- /* (non-Javadoc)
- * @see org.eclipse.swt.events.FocusListener#focusLost(org.eclipse.swt.events.FocusEvent)
- */
@Override
public void focusLost(FocusEvent e) {
fCombo.removeSelectionListener(this);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ComparePreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ComparePreferencePage.java
index a0c41cad0..7afbdffcc 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ComparePreferencePage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ComparePreferencePage.java
@@ -29,24 +29,18 @@ public class ComparePreferencePage extends CVSFieldEditorPreferencePage {
private BooleanFieldEditor contents;
private StringFieldEditor regex;
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.CVSFieldEditorPreferencePage#getPageHelpContextId()
- */
- protected String getPageHelpContextId() {
+ @Override
+ protected String getPageHelpContextId() {
return IHelpContextIds.COMPARE_PREFERENCE_PAGE;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.CVSFieldEditorPreferencePage#getPageDescription()
- */
- protected String getPageDescription() {
+ @Override
+ protected String getPageDescription() {
return CVSUIMessages.ComparePreferencePage_0;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
- */
- protected void createFieldEditors() {
+ @Override
+ protected void createFieldEditors() {
IPreferenceStore store = getPreferenceStore();
contents = new BooleanFieldEditor(ICVSUIConstants.PREF_CONSIDER_CONTENTS,
@@ -59,18 +53,21 @@ public class ComparePreferencePage extends CVSFieldEditorPreferencePage {
return event;
}
// invert the UI
+ @Override
protected void doLoad() {
super.doLoad();
getChangeControl(getFieldEditorParent()).setSelection(!getBooleanValue());
getChangeControl(getFieldEditorParent()).notifyListeners(SWT.Selection,
selectionEvent);
}
+ @Override
protected void doLoadDefault() {
super.doLoadDefault();
getChangeControl(getFieldEditorParent()).setSelection(!getBooleanValue());
getChangeControl(getFieldEditorParent()).notifyListeners(SWT.Selection,
selectionEvent);
}
+ @Override
protected void doStore() {
getPreferenceStore().setValue(getPreferenceName(), !getBooleanValue());
}
@@ -113,6 +110,7 @@ public class ComparePreferencePage extends CVSFieldEditorPreferencePage {
}
}
+ @Override
public void propertyChange(PropertyChangeEvent event) {
super.propertyChange(event);
regex.setEnabled(!contents.getBooleanValue(), getFieldEditorParent());
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/DateTagDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/DateTagDialog.java
index 06572032b..e7e8ac95c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/DateTagDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/DateTagDialog.java
@@ -46,6 +46,7 @@ public class DateTagDialog extends TrayDialog {
*/
private static final int DateTime_MIN_YEAR = 1752;
+ @Override
public void createArea(Composite parent) {
Composite composite = createComposite(parent, 2, false);
initializeDialogUnits(composite);
@@ -85,9 +86,7 @@ public class DateTagDialog extends TrayDialog {
private Button includeTime, localTime, utcTime;
private DateTime time;
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.dialogs.DialogArea#createArea(org.eclipse.swt.widgets.Composite)
- */
+ @Override
public void createArea(Composite parent) {
Composite composite = createComposite(parent, 2, false);
initializeDialogUnits(composite);
@@ -98,6 +97,7 @@ public class DateTagDialog extends TrayDialog {
utcTime = createRadioButton(composite, CVSUIMessages.DateTagDialog_4, 2);
includeTime.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
updateWidgetEnablements();
}
@@ -139,17 +139,13 @@ public class DateTagDialog extends TrayDialog {
}
}
- /* (non-Javadoc)
- * Method declared on Window.
- */
+ @Override
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
newShell.setText(CVSUIMessages.DateTagDialog_5);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
+ @Override
protected Control createDialogArea(Composite parent) {
Composite topLevel = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout();
@@ -206,9 +202,7 @@ public class DateTagDialog extends TrayDialog {
return calendar.getTime();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
- */
+ @Override
protected void buttonPressed(int buttonId) {
if (buttonId == IDialogConstants.OK_ID) {
dateEntered = privateGetDate();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java
index aa484435a..1dc8cb7b5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java
@@ -45,9 +45,6 @@ public class FileModificationValidator extends CVSCoreFileModificationValidator
public FileModificationValidator() {
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.CVSCoreFileModificationValidator#edit(org.eclipse.core.resources.IFile[], org.eclipse.core.resources.team.FileModificationValidationContext)
- */
@Override
protected IStatus edit(IFile[] readOnlyFiles, FileModificationValidationContext context) {
return edit(readOnlyFiles, getShell(context));
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java
index 58edacb40..3e43a48e4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryTableProvider.java
@@ -124,9 +124,6 @@ public class HistoryTableProvider {
return dateFormat;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
- */
@Override
public Color getForeground(Object element) {
ILogEntry entry = adaptToLogEntry(element);
@@ -136,17 +133,12 @@ public class HistoryTableProvider {
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) {
ILogEntry entry = adaptToLogEntry(element);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java
index fb3c708d2..d82a0d188 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IgnoreResourcesDialog.java
@@ -106,27 +106,18 @@ public class IgnoreResourcesDialog extends TitleAreaDialog {
throw new IllegalStateException();
}
- /* (non-Javadoc)
- * Method declared on Dialog.
- */
@Override
protected void createButtonsForButtonBar(Composite parent) {
createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
}
- /* (non-Javadoc)
- * Method declared on Dialog.
- */
@Override
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
newShell.setText(CVSUIMessages.IgnoreResourcesDialog_dialogTitle);
}
- /* (non-Javadoc)
- * Method declared on Dialog.
- */
@Override
protected Control createContents(Composite parent) {
Control control = super.createContents(parent);
@@ -140,9 +131,6 @@ public class IgnoreResourcesDialog extends TitleAreaDialog {
return control;
}
- /* (non-Javadoc)
- * Method declared on Dialog.
- */
@Override
protected Control createDialogArea(Composite parent) {
Composite top = new Composite((Composite) super
@@ -227,9 +215,6 @@ public class IgnoreResourcesDialog extends TitleAreaDialog {
return top;
}
- /* (non-Javadoc)
- * Method declared on Dialog.
- */
@Override
protected void okPressed() {
settings.put(ACTION_KEY, selectedAction);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/KeyboardInteractiveDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/KeyboardInteractiveDialog.java
index c1f6b9abf..33442e60c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/KeyboardInteractiveDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/KeyboardInteractiveDialog.java
@@ -14,8 +14,9 @@
*******************************************************************************/
package org.eclipse.team.internal.ccvs.ui;
-import org.eclipse.jface.dialogs.*;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TrayDialog;
import org.eclipse.jface.window.Window;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
@@ -93,7 +94,8 @@ public class KeyboardInteractiveDialog extends TrayDialog {
/**
* @see Window#configureShell
*/
- protected void configureShell(Shell newShell) {
+ @Override
+protected void configureShell(Shell newShell) {
super.configureShell(newShell);
if (isPasswordAuth) {
newShell.setText(CVSUIMessages.UserValidationDialog_required);
@@ -108,7 +110,8 @@ public class KeyboardInteractiveDialog extends TrayDialog {
/**
* @see Window#create
*/
- public void create() {
+ @Override
+public void create() {
super.create();
if (isPasswordAuth && usernameField != null && userName != null) {
@@ -123,7 +126,8 @@ public class KeyboardInteractiveDialog extends TrayDialog {
/**
* @see Dialog#createDialogArea
*/
- protected Control createDialogArea(Composite parent) {
+ @Override
+protected Control createDialogArea(Composite parent) {
Composite top = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout();
layout.numColumns = 2;
@@ -202,6 +206,7 @@ public class KeyboardInteractiveDialog extends TrayDialog {
data.horizontalSpan = 3;
allowCachingButton.setLayoutData(data);
allowCachingButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
allowCaching = allowCachingButton.getSelection();
}
@@ -275,7 +280,8 @@ public class KeyboardInteractiveDialog extends TrayDialog {
* and closes the dialog. Subclasses may override.
* </p>
*/
- protected void okPressed() {
+ @Override
+protected void okPressed() {
result=new String[prompt.length];
for(int i=0; i<texts.length; i++){
result[i]=texts[i].getText();
@@ -290,14 +296,13 @@ public class KeyboardInteractiveDialog extends TrayDialog {
* and closes the dialog. Subclasses may override.
* </p>
*/
- protected void cancelPressed() {
+ @Override
+protected void cancelPressed() {
result=null;
super.cancelPressed();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#close()
- */
+ @Override
public boolean close(){
if(keyLockImage!=null){
keyLockImage.dispose();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java
index 017fc7277..885fa480b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java
@@ -63,23 +63,17 @@ public class ReleaseCommentDialog extends DetailsDialog {
}
}
- /* (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#includeErrorMessage()
- */
+ @Override
protected boolean includeErrorMessage() {
return false;
}
- /*
- * @see Dialog#createDialogArea(Composite)
- */
+ @Override
protected void createMainDialogArea(Composite parent) {
getShell().setText(CVSUIMessages.ReleaseCommentDialog_title);
Composite composite = new Composite(parent, SWT.NULL);
@@ -88,6 +82,7 @@ public class ReleaseCommentDialog extends DetailsDialog {
commitCommentArea.createArea(composite);
commitCommentArea.addPropertyChangeListener(new IPropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty() == CommitCommentArea.OK_REQUESTED)
okPressed();
@@ -97,16 +92,12 @@ public class ReleaseCommentDialog extends DetailsDialog {
Dialog.applyDialogFont(parent);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#getHelpContextId()
- */
+ @Override
protected String getHelpContextId() {
return IHelpContextIds.RELEASE_COMMENT_DIALOG;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
+ @Override
protected Point getInitialSize() {
try {
return new Point(settings.getInt(WIDTH_KEY), settings.getInt(HEIGHT_KEY));
@@ -122,22 +113,16 @@ public class ReleaseCommentDialog extends DetailsDialog {
return commitCommentArea.getComment(true);
}
- /* (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() {
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.window.Window#close()
- */
+ @Override
public boolean close() {
Rectangle bounds = getShell().getBounds();
settings.put(HEIGHT_KEY, bounds.height);
@@ -145,9 +130,7 @@ public class ReleaseCommentDialog extends DetailsDialog {
return super.close();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#createContents(org.eclipse.swt.widgets.Composite)
- */
+ @Override
protected Control createContents(Composite parent) {
Control c = super.createContents(parent);
commitCommentArea.setFocus();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java
index 57f8231a5..8aff9891b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RemoteRevisionQuickDiffProvider.java
@@ -86,6 +86,7 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi
* Updates the document if a sync changes occurs to the associated CVS file.
*/
private ISubscriberChangeListener teamChangeListener = new ISubscriberChangeListener() {
+ @Override
public void subscriberResourceChanged(ISubscriberChangeEvent[] deltas) {
if(fReferenceInitialized) {
for (int i = 0; i < deltas.length; i++) {
@@ -106,21 +107,26 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi
* Updates the document if the document is changed (e.g. replace with)
*/
private IElementStateListener documentListener = new IElementStateListener() {
+ @Override
public void elementDirtyStateChanged(Object element, boolean isDirty) {
}
+ @Override
public void elementContentAboutToBeReplaced(Object element) {
}
+ @Override
public void elementContentReplaced(Object element) {
if(fEditor != null && fEditor.getEditorInput() == element) {
fetchContentsInJob();
}
}
+ @Override
public void elementDeleted(Object element) {
}
+ @Override
public void elementMoved(Object originalElement, Object movedElement) {
}
};
@@ -128,6 +134,7 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi
/*
* @see org.eclipse.test.quickdiff.DocumentLineDiffer.IQuickDiffReferenceProvider#getReference()
*/
+ @Override
public IDocument getReference(IProgressMonitor monitor) throws CoreException {
if(! fReferenceInitialized) return null;
if (fReference == null) {
@@ -136,9 +143,7 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi
return fReference;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.texteditor.quickdiff.IQuickDiffProviderImplementation#setActiveEditor(org.eclipse.ui.texteditor.ITextEditor)
- */
+ @Override
public void setActiveEditor(ITextEditor targetEditor) {
IEditorInput editorInput = targetEditor.getEditorInput();
if (editorInput == null || ResourceUtil.getFile(editorInput) == null) return;
@@ -152,9 +157,7 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi
fReferenceInitialized= true;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.texteditor.quickdiff.IQuickDiffProviderImplementation#isEnabled()
- */
+ @Override
public boolean isEnabled() {
if (! fReferenceInitialized)
return false;
@@ -168,6 +171,7 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi
/*
* @see org.eclipse.jface.text.source.diff.DocumentLineDiffer.IQuickDiffReferenceProvider#dispose()
*/
+ @Override
public void dispose() {
fReferenceInitialized = false;
// stop update job
@@ -185,6 +189,7 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi
/*
* @see org.eclipse.quickdiff.QuickDiffTestPlugin.IQuickDiffProviderImplementation#setId(java.lang.String)
*/
+ @Override
public void setId(String id) {
fId= id;
}
@@ -192,6 +197,7 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi
/*
* @see org.eclipse.jface.text.source.diff.DocumentLineDiffer.IQuickDiffReferenceProvider#getId()
*/
+ @Override
public String getId() {
return fId;
}
@@ -342,6 +348,7 @@ public class RemoteRevisionQuickDiffProvider implements IQuickDiffReferenceProvi
fUpdateJob.cancel();
}
fUpdateJob = new Job(CVSUIMessages.RemoteRevisionQuickDiffProvider_fetchingFile) {
+ @Override
protected IStatus run(IProgressMonitor monitor) {
try {
readDocument(monitor);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java
index 2e743c1b9..a1e71495e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ResourceEditionNode.java
@@ -149,9 +149,6 @@ public class ResourceEditionNode implements IStructureComparator, ITypedElement,
return getName().hashCode();
}
- /* (non-Javadoc)
- * @see org.eclipse.compare.IEncodedStreamContentAccessor#getCharset()
- */
@Override
public String getCharset() throws CoreException {
// Use the local file encoding if there is one
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TableViewerAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TableViewerAction.java
index 473329ff3..e02b67a90 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TableViewerAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TableViewerAction.java
@@ -38,11 +38,7 @@ public class TableViewerAction extends Action {
this.viewer = viewer;
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.action.Action#run()
- */
+ @Override
public void run() {
if (viewer.getSelection() instanceof StructuredSelection) {
StructuredSelection selection = (StructuredSelection) viewer.getSelection();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java
index a6c8c6b62..fa018b68e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/UserValidationDialog.java
@@ -14,8 +14,9 @@
package org.eclipse.team.internal.ccvs.ui;
-import org.eclipse.jface.dialogs.*;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.TrayDialog;
import org.eclipse.jface.window.Window;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
@@ -83,6 +84,7 @@ public class UserValidationDialog extends TrayDialog {
/**
* @see Window#configureShell
*/
+ @Override
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
newShell.setText(CVSUIMessages.UserValidationDialog_required);
@@ -92,6 +94,7 @@ public class UserValidationDialog extends TrayDialog {
/**
* @see Window#create
*/
+ @Override
public void create() {
super.create();
// add some default values
@@ -110,6 +113,7 @@ public class UserValidationDialog extends TrayDialog {
/**
* @see Dialog#createDialogArea
*/
+ @Override
protected Control createDialogArea(Composite parent) {
Composite top = new Composite(parent, SWT.NONE);
GridLayout layout = new GridLayout();
@@ -169,6 +173,7 @@ public class UserValidationDialog extends TrayDialog {
data.horizontalSpan = 3;
allowCachingButton.setLayoutData(data);
allowCachingButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
allowCaching = allowCachingButton.getSelection();
}
@@ -246,6 +251,7 @@ public class UserValidationDialog extends TrayDialog {
* and closes the dialog. Subclasses may override.
* </p>
*/
+ @Override
protected void okPressed() {
password = passwordField.getText();
username = usernameField.getText();
@@ -263,9 +269,7 @@ public class UserValidationDialog extends TrayDialog {
isUsernameMutable = value;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#close()
- */
+ @Override
public boolean close() {
if(keyLockImage != null) {
keyLockImage.dispose();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WatchEditPreferencePage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WatchEditPreferencePage.java
index bf56f01ea..d7ae00144 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WatchEditPreferencePage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WatchEditPreferencePage.java
@@ -28,23 +28,17 @@ public class WatchEditPreferencePage extends CVSFieldEditorPreferencePage {
private RadioGroupFieldEditor actionEditor;
private IPreferenceStore store;
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.CVSFieldEditorPreferencePage#getPageHelpContextId()
- */
+ @Override
protected String getPageHelpContextId() {
return IHelpContextIds.WATCH_EDIT_PREFERENCE_PAGE;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.CVSFieldEditorPreferencePage#getPageDescription()
- */
+ @Override
protected String getPageDescription() {
return CVSUIMessages.WatchEditPreferencePage_description; //;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors()
- */
+ @Override
protected void createFieldEditors() {
addField(new BooleanFieldEditor(
ICVSUIConstants.PREF_CHECKOUT_READ_ONLY,
@@ -97,9 +91,7 @@ public class WatchEditPreferencePage extends CVSFieldEditorPreferencePage {
return store.getString(ICVSUIConstants.PREF_EDIT_ACTION).equals(ICVSUIConstants.PREF_EDIT_PROMPT_EDIT);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.CVSFieldEditorPreferencePage#pushPreferences()
- */
+ @Override
protected void pushPreferences() {
store = getCVSPreferenceStore();
Preferences target = CVSProviderPlugin.getPlugin().getPluginPreferences();
@@ -111,9 +103,7 @@ public class WatchEditPreferencePage extends CVSFieldEditorPreferencePage {
store.getBoolean(ICVSUIConstants.PREF_ENABLE_WATCH_ON_EDIT));
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
- */
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getSource() == actionEditor) {
boolean enabled = event.getNewValue().equals(ICVSUIConstants.PREF_EDIT_PROMPT_EDIT);
@@ -123,10 +113,7 @@ public class WatchEditPreferencePage extends CVSFieldEditorPreferencePage {
super.propertyChange(event);
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.FieldEditorPreferencePage#initialize()
- */
+ @Override
protected void initialize() {
super.initialize();
promptEditor.setEnabled(isEditEnabled(), getFieldEditorParent());
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java
index 7d5066821..ad7204980 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/WorkbenchUserAuthenticator.java
@@ -274,9 +274,6 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator {
userinfo.setPassword(result[0]);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.IUserAuthenticator#prompt(org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation, int, java.lang.String, java.lang.String, int[], int)
- */
@Override
public int prompt(final ICVSRepositoryLocation location, final int promptType, final String title, final String message, final int[] promptResponses, final int defaultResponse) {
final Display display = CVSUIPlugin.getStandardDisplay();
@@ -314,11 +311,6 @@ public class WorkbenchUserAuthenticator implements IUserAuthenticator {
return openConfirm[0];
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.team.internal.ccvs.core.IUserAuthenticator#promptToConfigureRepositoryLocations(java.util.Map)
- */
@Override
public Map promptToConfigureRepositoryLocations(final Map alternativeMap) {
final Map[] result = new Map[1];
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java
index 669351350..9625232ce 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/AddAction.java
@@ -31,9 +31,7 @@ import org.eclipse.team.internal.ccvs.ui.wizards.AddWizard;
*/
public class AddAction extends WorkspaceTraversalAction {
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
- */
+ @Override
public void execute(IAction action) throws InterruptedException, InvocationTargetException {
if (!promptForAddOfIgnored()) return;
if (!promptForAdd()) return;
@@ -75,30 +73,22 @@ public class AddAction extends WorkspaceTraversalAction {
return true;
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForManagedResources()
- */
+ @Override
protected boolean isEnabledForManagedResources() {
return false;
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForUnmanagedResources()
- */
+ @Override
protected boolean isEnabledForUnmanagedResources() {
return true;
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForIgnoredResources()
- */
+ @Override
protected boolean isEnabledForIgnoredResources() {
return true;
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource)
- */
+ @Override
protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException {
// Add to version control should never be enabled for linked resources
IResource resource = cvsResource.getIResource();
@@ -106,9 +96,7 @@ public class AddAction extends WorkspaceTraversalAction {
return super.isEnabledForCVSResource(cvsResource);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getId()
- */
+ @Override
public String getId() {
return ICVSUIConstants.CMD_ADD;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/BranchAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/BranchAction.java
index 64792bfb4..01f7cba49 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/BranchAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/BranchAction.java
@@ -29,9 +29,6 @@ import org.eclipse.team.internal.ccvs.ui.operations.BranchOperation;
*/
public class BranchAction extends WorkspaceTraversalAction {
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
- */
@Override
public void execute(IAction action) throws InvocationTargetException, InterruptedException {
ResourceMapping[] resourceMappings = getCVSResourceMappings();
@@ -60,9 +57,6 @@ public class BranchAction extends WorkspaceTraversalAction {
return mappings.toArray(new ResourceMapping[mappings.size()]);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getId()
- */
@Override
public String getId() {
return ICVSUIConstants.CMD_BRANCH;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
index 054672f1d..2e830dda2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CVSAction.java
@@ -592,9 +592,9 @@ abstract public class CVSAction extends TeamAction implements IEditorActionDeleg
return CVSUIPlugin.getPlugin().getRepositoryManager();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.TeamAction#getSelectedResources()
- */
+ /*
+ * @see org.eclipse.team.internal.ui.actions.TeamAction#getSelectedResources()
+ */
protected final IResource[] getSelectedResourcesWithOverlap() {
IStructuredSelection selection = getSelection();
CVSActionSelectionProperties props = CVSActionSelectionProperties.getProperties(getSelection());
@@ -604,9 +604,6 @@ abstract public class CVSAction extends TeamAction implements IEditorActionDeleg
return props.getAllSelectedResources();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.TeamAction#getSelectedResources()
- */
@Override
protected final IResource[] getSelectedResources() {
IStructuredSelection selection = getSelection();
@@ -617,9 +614,6 @@ abstract public class CVSAction extends TeamAction implements IEditorActionDeleg
return props.getNonoverlappingSelectedResources();
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart)
- */
@Override
public void setActiveEditor(IAction action, IEditorPart targetEditor) {
}
@@ -637,9 +631,6 @@ abstract public class CVSAction extends TeamAction implements IEditorActionDeleg
public void addHandlerListener(IHandlerListener handlerListener) {
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.IHandler#isHandled()
- */
@Override
public boolean isHandled() {
return true;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAction.java
index 0a32ef2e0..c24887c25 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAction.java
@@ -29,17 +29,13 @@ import org.eclipse.team.internal.ccvs.ui.operations.ProjectMetaFileOperation;
*/
public class CheckoutAction extends CVSAction {
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
- */
+ @Override
protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
new CheckoutMultipleProjectsOperation(getTargetPart(), getSelectedRemoteFoldersWithProjectName(), null)
.run();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
- */
+ @Override
public boolean isEnabled() {
ICVSRemoteFolder[] folders = getSelectedRemoteFolders();
if (folders.length == 0) return false;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java
index d6d7fa78c..2c2420145 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutAsAction.java
@@ -25,9 +25,7 @@ import org.eclipse.team.internal.ccvs.ui.wizards.CheckoutAsWizard;
public class CheckoutAsAction extends CVSAction {
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
- */
+ @Override
public void execute(IAction action) throws InvocationTargetException, InterruptedException {
ICVSRemoteFolder[] folders = getSelectedRemoteFolders();
boolean withName = CVSUIPlugin.getPlugin().isUseProjectNameOnCheckout();
@@ -46,9 +44,7 @@ public class CheckoutAsAction extends CVSAction {
dialog.open();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
- */
+ @Override
public boolean isEnabled() {
return getSelectedRemoteFolders().length > 0;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutWizardAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutWizardAction.java
index 72e493bd4..5d9d3bb08 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutWizardAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CheckoutWizardAction.java
@@ -30,37 +30,27 @@ public class CheckoutWizardAction extends CVSAction implements IWorkbenchWindowA
Shell shell;
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate2#dispose()
- */
+ @Override
public void dispose() {
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
- */
+ @Override
public void init(IWorkbenchWindow window) {
this.shell = window.getShell();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
- */
+ @Override
protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
CheckoutWizard wizard = new CheckoutWizard();
WizardDialog dialog = new WizardDialog(shell, wizard);
dialog.open();
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
- */
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
- */
+ @Override
public boolean isEnabled() {
return true;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java
index acdf26374..b1674e1a5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java
@@ -52,9 +52,6 @@ public class CommitAction extends WorkspaceTraversalAction {
}
}
- /*
- * @see CVSAction#execute(IAction)
- */
@Override
public void execute(IAction action) throws InvocationTargetException, InterruptedException {
final ResourceTraversal[][] traversals = new ResourceTraversal[][] { null };
@@ -77,33 +74,21 @@ public class CommitAction extends WorkspaceTraversalAction {
}, false, PROGRESS_BUSYCURSOR);
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle()
- */
@Override
protected String getErrorTitle() {
return CVSUIMessages.CommitAction_commitFailed;
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForUnmanagedResources()
- */
@Override
protected boolean isEnabledForUnmanagedResources() {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources()
- */
@Override
protected boolean isEnabledForNonExistantResources() {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getId()
- */
@Override
public String getId() {
return ICVSUIConstants.CMD_COMMIT;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRemoteAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRemoteAction.java
index f4aebb3c3..2480ca1de 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRemoteAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRemoteAction.java
@@ -29,6 +29,7 @@ public class CompareWithRemoteAction extends SyncAction {
* Update the text label for the action based on the tags in the selection.
* @see TeamAction#setActionEnablement(org.eclipse.jface.action.IAction)
*/
+ @Override
protected void setActionEnablement(IAction action) {
super.setActionEnablement(action);
action.setText(calculateActionTagValue());
@@ -39,13 +40,12 @@ public class CompareWithRemoteAction extends SyncAction {
*
* @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource)
*/
+ @Override
protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException {
return super.isEnabledForCVSResource(cvsResource) || cvsResource.getParent().isCVSFolder();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources()
- */
+ @Override
protected boolean isEnabledForNonExistantResources() {
return true;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java
index 6b9dd3339..ce4d17578 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithRevisionAction.java
@@ -37,9 +37,6 @@ import org.eclipse.team.ui.history.*;
public class CompareWithRevisionAction extends WorkspaceAction {
- /*
- * @see CVSAction#execute(IAction)
- */
@Override
public void execute(IAction action) throws InvocationTargetException, InterruptedException {
@@ -85,33 +82,21 @@ public class CompareWithRevisionAction extends WorkspaceAction {
return CVSUIMessages.CompareWithRevisionAction_4;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle()
- */
@Override
protected String getErrorTitle() {
return CVSUIMessages.CompareWithRevisionAction_compare;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource)
- */
@Override
protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException {
return (!cvsResource.isFolder() && super.isEnabledForCVSResource(cvsResource));
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForMultipleResources()
- */
@Override
protected boolean isEnabledForMultipleResources() {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources()
- */
@Override
protected boolean isEnabledForAddedResources() {
return true;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java
index fce9bd48d..2c8736cac 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CompareWithTagAction.java
@@ -24,7 +24,8 @@ import org.eclipse.team.core.subscribers.SubscriberScopeManager;
import org.eclipse.team.internal.ccvs.core.*;
import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
-import org.eclipse.team.internal.ccvs.ui.mappings.*;
+import org.eclipse.team.internal.ccvs.ui.mappings.CompareSubscriberContext;
+import org.eclipse.team.internal.ccvs.ui.mappings.ModelCompareParticipant;
import org.eclipse.team.internal.ccvs.ui.subscriber.CompareParticipant;
import org.eclipse.team.internal.ccvs.ui.tags.TagSelectionDialog;
import org.eclipse.team.internal.ccvs.ui.tags.TagSource;
@@ -37,6 +38,7 @@ public class CompareWithTagAction extends WorkspaceTraversalAction {
return CVSUIPlugin.getPlugin().getPreferenceStore().getBoolean(ICVSUIConstants.PREF_OPEN_COMPARE_EDITOR_FOR_SINGLE_FILE);
}
+ @Override
public void execute(IAction action) throws InvocationTargetException, InterruptedException {
// First, determine the tag to compare with
@@ -66,6 +68,7 @@ public class CompareWithTagAction extends WorkspaceTraversalAction {
// ignore, the compare will fail if there is a real problem.
}
SubscriberScopeManager manager = new SubscriberScopeManager(compareSubscriber.getName(), mappings, compareSubscriber, true){
+ @Override
public void dispose() {
compareSubscriber.dispose();
super.dispose();
@@ -110,9 +113,7 @@ public class CompareWithTagAction extends WorkspaceTraversalAction {
return tag;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources()
- */
+ @Override
protected boolean isEnabledForNonExistantResources() {
return true;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/FetchAllMembersAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/FetchAllMembersAction.java
index 90d59ef0f..d40065374 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/FetchAllMembersAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/FetchAllMembersAction.java
@@ -22,15 +22,14 @@ import org.eclipse.team.internal.ccvs.ui.operations.FetchAllMembersOperation;
public class FetchAllMembersAction extends CVSAction {
+ @Override
protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
ICVSRemoteFolder[] folders = getSelectedRemoteFolders();
ICVSRepositoryLocation repoLocation = getRepositoryManager().getRepositoryLocationFor(folders[0]);
new FetchAllMembersOperation (getTargetPart(), folders, repoLocation).run();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
- */
+ @Override
public boolean isEnabled() {
//Only enable for one selection for now
return getSelectedRemoteFolders().length == 1;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java
index 173e9eb0e..cf28b19f1 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/GenerateDiffFileAction.java
@@ -37,9 +37,6 @@ import org.eclipse.ui.PlatformUI;
*/
public class GenerateDiffFileAction extends WorkspaceTraversalAction{
- /** (Non-javadoc)
- * Method declared on IActionDelegate.
- */
@Override
public void execute(IAction action) {
@@ -100,26 +97,17 @@ public class GenerateDiffFileAction extends WorkspaceTraversalAction{
private IResource[] members(IResource resource) throws CoreException {
return CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber().members(resource);
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForMultipleResources()
- */
@Override
protected boolean isEnabledForMultipleResources() {
return true;
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForUnmanagedResources()
- */
@Override
protected boolean isEnabledForUnmanagedResources() {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getId()
- */
@Override
public String getId() {
return ICVSUIConstants.CMD_CREATEPATCH;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java
index 8beb68d8b..6adb09440 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java
@@ -45,17 +45,11 @@ public class IgnoreAction extends WorkspaceTraversalAction {
this.dialog = dialog;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
- */
@Override
protected String getTaskName(CVSTeamProvider provider) {
return NLS.bind(CVSUIMessages.IgnoreAction_0, new String[] { provider.getProject().getName() });
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#execute(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void execute(CVSTeamProvider provider, IResource[] resources, boolean recurse, IProgressMonitor monitor) throws CVSException, InterruptedException {
try {
@@ -76,17 +70,11 @@ public class IgnoreAction extends WorkspaceTraversalAction {
collectStatus(Status.OK_STATUS);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
@Override
protected String getTaskName() {
return CVSUIMessages.IgnoreAction_1;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#consultModelsForMappings()
- */
@Override
public boolean consultModelsForMappings() {
return false;
@@ -130,9 +118,6 @@ public class IgnoreAction extends WorkspaceTraversalAction {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource)
- */
@Override
protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException {
if (super.isEnabledForCVSResource(cvsResource)) {
@@ -151,9 +136,6 @@ public class IgnoreAction extends WorkspaceTraversalAction {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getId()
- */
@Override
public String getId() {
return ICVSUIConstants.CMD_IGNORE;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MergeAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MergeAction.java
index c0004f162..aa971e835 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MergeAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MergeAction.java
@@ -22,9 +22,6 @@ import org.eclipse.team.internal.ccvs.ui.wizards.MergeWizard;
public class MergeAction extends WorkspaceTraversalAction {
- /*
- * @see CVSAction#execute()
- */
@Override
public void execute(IAction action) {
final Shell shell = getShell();
@@ -36,9 +33,6 @@ public class MergeAction extends WorkspaceTraversalAction {
});
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getId()
- */
@Override
public String getId() {
return ICVSUIConstants.CMD_MERGE;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OutgoingChangesDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OutgoingChangesDialog.java
index e50188739..adc81eeec 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OutgoingChangesDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/OutgoingChangesDialog.java
@@ -121,26 +121,17 @@ public class OutgoingChangesDialog extends DetailsDialog {
return context[0];
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#isMainGrabVertical()
- */
@Override
protected boolean isMainGrabVertical() {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#updateEnablements()
- */
@Override
protected void updateEnablements() {
// Can always finish
setPageComplete(true);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#includeErrorMessage()
- */
@Override
protected boolean includeErrorMessage() {
return false;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithLatestRevisionAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithLatestRevisionAction.java
index 3f44da275..59d9b878a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithLatestRevisionAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithLatestRevisionAction.java
@@ -19,9 +19,7 @@ import org.eclipse.team.internal.ccvs.ui.operations.ReplaceOperation;
public class ReplaceWithLatestRevisionAction extends ReplaceWithTagAction {
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.ReplaceWithTagAction.getTag(ReplaceOperation)
- */
+ @Override
protected CVSTag getTag(ReplaceOperation replaceOperation) {
return CVSTag.BASE;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java
index b47d425d6..b2f3ceb76 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRemoteAction.java
@@ -44,25 +44,16 @@ public class ReplaceWithRemoteAction extends WorkspaceTraversalAction {
replaceOperation.run();
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle()
- */
@Override
protected String getErrorTitle() {
return CVSUIMessages.ReplaceWithRemoteAction_problemMessage;
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources()
- */
@Override
protected boolean isEnabledForAddedResources() {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources()
- */
@Override
protected boolean isEnabledForNonExistantResources() {
return true;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRevisionAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRevisionAction.java
index b2210e3e9..f86cf3473 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRevisionAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithRevisionAction.java
@@ -35,6 +35,7 @@ import org.eclipse.ui.part.IPage;
*/
public class ReplaceWithRevisionAction extends CompareWithRevisionAction {
+ @Override
protected void showCompareInDialog(Shell shell, Object object){
IHistoryPageSource pageSource = HistoryPageSource.getHistoryPageSource(object);
if (pageSource != null && pageSource.canShowHistoryFor(object)) {
@@ -42,16 +43,19 @@ public class ReplaceWithRevisionAction extends CompareWithRevisionAction {
cc.setLeftEditable(false);
cc.setRightEditable(false);
HistoryPageCompareEditorInput input = new HistoryPageCompareEditorInput(cc, pageSource, object) {
+ @Override
public void saveChanges(IProgressMonitor monitor) throws CoreException {
super.saveChanges(monitor);
((CVSHistoryPage)getHistoryPage()).saveChanges(monitor);
setDirty(false);
}
+ @Override
protected void performReplace(Object o) throws CoreException {
FileRevisionTypedElement right = (FileRevisionTypedElement)o;
IFile file = (IFile)getCompareResult();
file.setContents(right.getContents(), false, true, null);
}
+ @Override
protected IPage createPage(CompareViewerPane parent,
IToolBarManager toolBarManager) {
IPage page = super.createPage(parent, toolBarManager);
@@ -64,13 +68,13 @@ public class ReplaceWithRevisionAction extends CompareWithRevisionAction {
CompareUI.openCompareDialog(input);
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CompareWithRevisionAction#getActionTitle()
- */
+
+ @Override
protected String getActionTitle() {
return CVSUIMessages.ReplaceWithRevisionAction_1;
}
+ @Override
protected boolean isShowInDialog() {
// Always show a replace in a dialog
return true;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithSelectableTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithSelectableTagAction.java
index 05fd2f77b..7774db0ee 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithSelectableTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithSelectableTagAction.java
@@ -23,9 +23,7 @@ import org.eclipse.team.internal.ccvs.ui.tags.TagSource;
public class ReplaceWithSelectableTagAction extends ReplaceWithTagAction {
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.ReplaceWithTagAction.getTag(ReplaceOperation)
- */
+ @Override
protected CVSTag getTag(final ReplaceOperation replaceOperation) {
TagSelectionDialog dialog = new TagSelectionDialog(getShell(), TagSource.create(replaceOperation.getScope().getMappings()),
CVSUIMessages.ReplaceWithTagAction_message,
@@ -40,9 +38,7 @@ public class ReplaceWithSelectableTagAction extends ReplaceWithTagAction {
return dialog.getResult();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.ReplaceWithTagAction#getReplaceOperation()
- */
+ @Override
protected ReplaceOperation createReplaceOperation() {
ReplaceOperation replaceOperation= super.createReplaceOperation();
replaceOperation.ignoreResourcesWithMissingTag();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java
index 540cfc05b..ab620823c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ReplaceWithTagAction.java
@@ -29,9 +29,6 @@ import org.eclipse.team.internal.ccvs.ui.operations.ReplaceOperation;
*/
public abstract class ReplaceWithTagAction extends WorkspaceTraversalAction {
- /*
- * Method declared on IActionDelegate.
- */
@Override
public void execute(IAction action) throws InterruptedException, InvocationTargetException {
final ReplaceOperation replaceOperation= createReplaceOperation();
@@ -90,17 +87,11 @@ public abstract class ReplaceWithTagAction extends WorkspaceTraversalAction {
return new ReplaceOperation(getTargetPart(), getCVSResourceMappings(), null);
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getErrorTitle()
- */
@Override
protected String getErrorTitle() {
return CVSUIMessages.ReplaceWithTagAction_replace;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources()
- */
@Override
protected boolean isEnabledForNonExistantResources() {
return true;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowEditorsAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowEditorsAction.java
index 7117646e1..97738cd2a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowEditorsAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowEditorsAction.java
@@ -43,25 +43,16 @@ public class ShowEditorsAction extends WorkspaceAction {
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources()
- */
@Override
protected boolean isEnabledForAddedResources() {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources()
- */
@Override
protected boolean isEnabledForNonExistantResources() {
return true;
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForMultipleResources()
- */
@Override
protected boolean isEnabledForMultipleResources() {
// We support one selected Resource,
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java
index fd8f8bc1d..a1d3bcb0b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/ShowResourceInHistoryAction.java
@@ -63,25 +63,16 @@ public class ShowResourceInHistoryAction extends WorkspaceAction {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources()
- */
@Override
protected boolean isEnabledForNonExistantResources() {
return true;
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource)
- */
@Override
protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException {
return (!cvsResource.isFolder() && super.isEnabledForCVSResource(cvsResource));
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getId()
- */
@Override
public String getId() {
return ICVSUIConstants.CMD_HISTORY;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagLocalAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagLocalAction.java
index d1b223690..b9392b086 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagLocalAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/TagLocalAction.java
@@ -26,9 +26,6 @@ import org.eclipse.team.internal.ccvs.ui.operations.TagOperation;
*/
public class TagLocalAction extends TagAction {
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.TagAction#performPrompting(org.eclipse.team.internal.ccvs.ui.operations.ITagOperation)
- */
@Override
protected boolean performPrompting(ITagOperation operation) {
if (operation instanceof TagOperation) {
@@ -56,17 +53,11 @@ public class TagLocalAction extends TagAction {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.TagAction#createTagOperation()
- */
@Override
protected ITagOperation createTagOperation() {
return new TagOperation(getTargetPart(), getCVSResourceMappings());
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getId()
- */
@Override
public String getId() {
return ICVSUIConstants.CMD_TAGASVERSION;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UneditAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UneditAction.java
index 696a4a220..c429faecf 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UneditAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UneditAction.java
@@ -21,18 +21,13 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.team.core.Team;
-import org.eclipse.team.internal.ccvs.core.CVSException;
-import org.eclipse.team.internal.ccvs.core.CVSTeamProvider;
-import org.eclipse.team.internal.ccvs.core.ICVSFile;
-import org.eclipse.team.internal.ccvs.core.ICVSResource;
+import org.eclipse.team.internal.ccvs.core.*;
import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
public class UneditAction extends WorkspaceAction {
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
- */
+ @Override
protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
if(! MessageDialog.openConfirm(getShell(), CVSUIMessages.Uneditaction_confirmTitle, CVSUIMessages.Uneditaction_confirmMessage)) { //
@@ -40,8 +35,10 @@ public class UneditAction extends WorkspaceAction {
}
run(new WorkspaceModifyOperation(null) {
+ @Override
public void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
executeProviderAction(new IProviderAction() {
+ @Override
public IStatus execute(CVSTeamProvider provider, IResource[] resources, IProgressMonitor monitor) throws CVSException {
provider.unedit(resources, false /* recurse */, true /* notify server */, monitor);
return Team.OK_STATUS;
@@ -51,23 +48,17 @@ public class UneditAction extends WorkspaceAction {
}, true /* cancelable */, PROGRESS_DIALOG);
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources()
- */
+ @Override
protected boolean isEnabledForAddedResources() {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources()
- */
+ @Override
protected boolean isEnabledForNonExistantResources() {
return true;
}
- /**
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource)
- */
+ @Override
protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException {
if (cvsResource.isFolder()) return false;
if (super.isEnabledForCVSResource(cvsResource)) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateSilentAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateSilentAction.java
index 1b316d852..68699f7c2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateSilentAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/UpdateSilentAction.java
@@ -30,23 +30,17 @@ import org.eclipse.team.internal.ccvs.ui.operations.UpdateOperation;
*/
public class UpdateSilentAction extends WorkspaceTraversalAction {
- /*
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForAddedResources()
- */
+ @Override
protected boolean isEnabledForAddedResources() {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForNonExistantResources()
- */
+ @Override
protected boolean isEnabledForNonExistantResources() {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
- */
+ @Override
public void execute(IAction action) throws InterruptedException, InvocationTargetException {
if (CVSUIPlugin.getPlugin().getPreferenceStore().getString(ICVSUIConstants.PREF_UPDATE_HANDLING).equals(ICVSUIConstants.PREF_UPDATE_HANDLING_TRADITIONAL)) {
new UpdateOperation(getTargetPart(), getCVSResourceMappings(), Command.NO_LOCAL_OPTIONS, null /* no tag */).run();
@@ -55,9 +49,7 @@ public class UpdateSilentAction extends WorkspaceTraversalAction {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getId()
- */
+ @Override
public String getId() {
return ICVSUIConstants.CMD_UPDATE;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSOutputConsole.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSOutputConsole.java
index 03b2bbb6b..0ac823e15 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSOutputConsole.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/CVSOutputConsole.java
@@ -128,9 +128,6 @@ public class CVSOutputConsole extends MessageConsole implements IConsoleListener
CVSUIPlugin.getPlugin().getPreferenceStore().addPropertyChangeListener(CVSOutputConsole.this);
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.console.AbstractConsole#init()
- */
@Override
protected void init() {
// Called when console is added to the console view
@@ -227,9 +224,6 @@ public class CVSOutputConsole extends MessageConsole implements IConsoleListener
show(false);
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.console.MessageConsole#dispose()
- */
@Override
protected void dispose() {
// Here we can't call super.dispose() because we actually want the partitioner to remain
@@ -259,9 +253,6 @@ public class CVSOutputConsole extends MessageConsole implements IConsoleListener
CVSUIPlugin.getPlugin().getPreferenceStore().removePropertyChangeListener(this);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.client.listeners.IConsoleListener#commandInvoked(java.lang.String)
- */
@Override
public void commandInvoked(Session session, String line) {
if (!session.isOutputToConsole()) return;
@@ -270,9 +261,6 @@ public class CVSOutputConsole extends MessageConsole implements IConsoleListener
appendLine(ConsoleDocument.COMMAND, line);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.client.listeners.IConsoleListener#messageLineReceived(java.lang.String)
- */
@Override
public void messageLineReceived(Session session, String line, IStatus status) {
if (session.isOutputToConsole()) {
@@ -280,9 +268,6 @@ public class CVSOutputConsole extends MessageConsole implements IConsoleListener
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.client.listeners.IConsoleListener#errorLineReceived(java.lang.String)
- */
@Override
public void errorLineReceived(Session session, String line, IStatus status) {
if (session.isOutputToConsole()) {
@@ -290,9 +275,6 @@ public class CVSOutputConsole extends MessageConsole implements IConsoleListener
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.client.listeners.IConsoleListener#commandCompleted(org.eclipse.core.runtime.IStatus, java.lang.Exception)
- */
@Override
public void commandCompleted(Session session, IStatus status, Exception exception) {
if (!session.isOutputToConsole()) return;
@@ -360,9 +342,6 @@ public class CVSOutputConsole extends MessageConsole implements IConsoleListener
appendLine(ConsoleDocument.COMMAND, buffer.toString());
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
- */
@Override
public void propertyChange(PropertyChangeEvent event) {
String property = event.getProperty();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/ConsolePreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/ConsolePreferencesPage.java
index 7ebc170d0..faefc5641 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/ConsolePreferencesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/console/ConsolePreferencesPage.java
@@ -38,6 +38,7 @@ public class ConsolePreferencesPage extends FieldEditorPreferencePage implements
private IntegerFieldEditor highWaterMark;
private IntegerFieldEditor width;
+ @Override
protected void createFieldEditors() {
final Composite composite = getFieldEditorParent();
createLabel(composite, CVSUIMessages.ConsolePreferencesPage_9);
@@ -85,6 +86,7 @@ public class ConsolePreferencesPage extends FieldEditorPreferencePage implements
}
+ @Override
public void propertyChange(PropertyChangeEvent event) {
super.propertyChange(event);
highWaterMark.setEnabled(restrictOutput.getBooleanValue(), getFieldEditorParent());
@@ -118,15 +120,11 @@ public class ConsolePreferencesPage extends FieldEditorPreferencePage implements
return editor;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
- */
+ @Override
public void init(IWorkbench workbench) {
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferencePage#performOk()
- */
+ @Override
public boolean performOk() {
CVSUIPlugin.getPlugin().savePluginPreferences();
return super.performOk();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java
index b00a37b4c..8cfbcd909 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java
@@ -40,9 +40,6 @@ public abstract class AbstractCommitAction extends CVSModelProviderAction {
super(configuration);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
@Override
public void execute() {
final List resources = new ArrayList();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractModelMergeOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractModelMergeOperation.java
index 72900ae0b..bb9670edd 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractModelMergeOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractModelMergeOperation.java
@@ -32,20 +32,17 @@ public abstract class AbstractModelMergeOperation extends ModelParticipantMergeO
this.ownsManager = ownsManager;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#canRunAsJob()
- */
+ @Override
protected boolean canRunAsJob() {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.operations.ResourceMappingMergeOperation#isPreviewInDialog()
- */
+ @Override
protected boolean isPreviewInDialog() {
return CVSUIPlugin.getPlugin().getPreferenceStore().getString(ICVSUIConstants.PREF_UPDATE_PREVIEW).equals(ICVSUIConstants.PREF_UPDATE_PREVIEW_IN_DIALOG);
}
+ @Override
protected void endOperation(IProgressMonitor monitor) throws InvocationTargetException {
if (ownsManager) {
ISynchronizationScopeManager manager = getScopeManager();
@@ -54,6 +51,7 @@ public abstract class AbstractModelMergeOperation extends ModelParticipantMergeO
super.endOperation(monitor);
}
+ @Override
protected ModelSynchronizeParticipant createParticipant() {
ModelSynchronizeParticipant participant = super.createParticipant();
// Transfer ownership of the manager to the participant
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSSubscriberMergeContext.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSSubscriberMergeContext.java
index ed5c5d594..93751c354 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSSubscriberMergeContext.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CVSSubscriberMergeContext.java
@@ -79,9 +79,6 @@ public abstract class CVSSubscriberMergeContext extends SubscriberMergeContext {
super(subscriber, manager);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.mapping.MergeContext#run(org.eclipse.core.resources.IWorkspaceRunnable, org.eclipse.core.runtime.jobs.ISchedulingRule, int, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void run(final IWorkspaceRunnable runnable, final ISchedulingRule rule, int flags, IProgressMonitor monitor) throws CoreException {
super.run(monitor1 -> EclipseSynchronizer.getInstance().run(rule, monitor2 -> {
@@ -93,26 +90,17 @@ public abstract class CVSSubscriberMergeContext extends SubscriberMergeContext {
}, monitor1), rule, flags, monitor);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.mapping.MergeContext#getMergeRule(org.eclipse.core.resources.IResource)
- */
@Override
public ISchedulingRule getMergeRule(IDiff node) {
// Return the project since that is what the EclipseSynchronize needs
return getDiffTree().getResource(node).getProject();
}
- /* (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 {
markAsMerged(diff, true, 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);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java
index 95552b832..fcb025868 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetActionProvider.java
@@ -144,9 +144,6 @@ public class ChangeSetActionProvider extends ResourceModelActionProvider {
super(title);
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
- */
@Override
protected boolean updateSelection(IStructuredSelection selection) {
return getSelectedSet() != null;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java
index 3b826025f..2149d4548 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java
@@ -44,9 +44,6 @@ import org.eclipse.ui.navigator.*;
public class ChangeSetContentProvider extends ResourceModelContentProvider implements ITreePathContentProvider {
private final class CollectorListener implements IChangeSetChangeListener, BatchingChangeSetManager.IChangeSetCollectorChangeListener {
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.core.subscribers.IChangeSetChangeListener#setAdded(org.eclipse.team.internal.core.subscribers.ChangeSet)
- */
@Override
public void setAdded(final ChangeSet set) {
// We only react here for active change sets.
@@ -66,9 +63,6 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple
getUnassignedSet().remove(set.getResources());
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.core.subscribers.IChangeSetChangeListener#defaultSetChanged(org.eclipse.team.internal.core.subscribers.ChangeSet, org.eclipse.team.internal.core.subscribers.ChangeSet)
- */
@Override
public void defaultSetChanged(final ChangeSet previousDefault, final ChangeSet set) {
if (isVisibleInMode(set) || isVisibleInMode(previousDefault)) {
@@ -86,9 +80,6 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.core.subscribers.IChangeSetChangeListener#setRemoved(org.eclipse.team.internal.core.subscribers.ChangeSet)
- */
@Override
public void setRemoved(final ChangeSet set) {
// We only react here for active change sets.
@@ -114,9 +105,6 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple
getUnassignedSet().add((IDiff[]) toAdd.toArray(new IDiff[toAdd.size()]));
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.core.subscribers.IChangeSetChangeListener#nameChanged(org.eclipse.team.internal.core.subscribers.ChangeSet)
- */
@Override
public void nameChanged(final ChangeSet set) {
if (isVisibleInMode(set)) {
@@ -125,9 +113,6 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.core.subscribers.IChangeSetChangeListener#resourcesChanged(org.eclipse.team.internal.core.subscribers.ChangeSet, org.eclipse.core.runtime.IPath[])
- */
@Override
public void resourcesChanged(final ChangeSet set, final IPath[] paths) {
// We only react here for active change sets.
@@ -257,9 +242,6 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple
private IDiffChangeListener diffTreeListener = new IDiffChangeListener() {
- /* (non-Javadoc)
- * @see org.eclipse.team.core.diff.IDiffChangeListener#propertyChanged(org.eclipse.team.core.diff.IDiffTree, int, org.eclipse.core.runtime.IPath[])
- */
@Override
public void propertyChanged(IDiffTree tree, int property, IPath[] paths) {
// Ignore
@@ -269,9 +251,6 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple
return getVisibleSetsInViewer().contains(set);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.diff.IDiffChangeListener#diffsChanged(org.eclipse.team.core.diff.IDiffChangeEvent, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void diffsChanged(IDiffChangeEvent event, IProgressMonitor monitor) {
Object input = getViewer().getInput();
@@ -293,9 +272,6 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple
private CheckedInChangeSetCollector checkedInCollector;
private boolean collectorInitialized;
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.mapping.ResourceModelContentProvider#getModelProviderId()
- */
@Override
protected String getModelProviderId() {
return ChangeSetModelProvider.ID;
@@ -319,9 +295,6 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple
return (input instanceof ChangeSetModelProvider);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.mapping.ResourceModelContentProvider#getElements(java.lang.Object)
- */
@Override
public Object[] getElements(Object parent) {
if (parent instanceof ISynchronizationContext) {
@@ -398,9 +371,6 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.mapping.ResourceModelContentProvider#getTraversals(org.eclipse.team.core.mapping.ISynchronizationContext, java.lang.Object)
- */
@Override
protected ResourceTraversal[] getTraversals(
ISynchronizationContext context, Object object) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetSorter.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetSorter.java
index a165d05a5..ebeb3c0f8 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetSorter.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetSorter.java
@@ -32,9 +32,7 @@ public class ChangeSetSorter extends ResourceModelSorter {
super();
}
- /* (non-Javadoc)
- * Method declared on ViewerSorter.
- */
+ @Override
public int compare(Viewer viewer, Object o1, Object o2) {
//have to deal with non-resources in navigator
//if one or both objects are not resources, returned a comparison
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java
index 0a67c2e0e..d5eadefe3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CheckedInChangeSetCollector.java
@@ -233,9 +233,6 @@ public class CheckedInChangeSetCollector extends BatchingChangeSetManager implem
return subscriber;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.views.HierarchicalModelProvider#dispose()
- */
@Override
public void dispose() {
// No longer listen for log entry changes
@@ -442,9 +439,11 @@ public class CheckedInChangeSetCollector extends BatchingChangeSetManager implem
return !remote.equals(remoteResource);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SyncInfoSetChangeSetCollector#waitUntilDone(org.eclipse.core.runtime.IProgressMonitor)
- */
+ /*
+ * @see
+ * org.eclipse.team.ui.synchronize.SyncInfoSetChangeSetCollector#waitUntilDone(
+ * org.eclipse.core.runtime.IProgressMonitor)
+ */
public void waitUntilDone(IProgressMonitor monitor) {
monitor.worked(1);
// wait for the event handler to process changes.
@@ -462,9 +461,6 @@ public class CheckedInChangeSetCollector extends BatchingChangeSetManager implem
monitor.worked(1);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.LogEntryCacheUpdateHandler.ILogsFetchedListener#logEntriesFetched(org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void logEntriesFetched(SyncInfoSet set, LogEntryCache logEntryCache, IProgressMonitor monitor) {
if (disposed) return;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CommitAction.java
index 6340a8f2e..1b8b33e20 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CommitAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CommitAction.java
@@ -33,13 +33,12 @@ public class CommitAction extends AbstractCommitAction implements IPropertyChang
setActionDefinitionId(ICVSUIConstants.CMD_COMMIT);
}
+ @Override
protected String getBundleKeyPrefix() {
return "WorkspaceCommitAction."; //$NON-NLS-1$
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.mapping.ModelProviderAction#isEnabledForSelection(org.eclipse.jface.viewers.IStructuredSelection)
- */
+ @Override
protected boolean isEnabledForSelection(IStructuredSelection selection) {
return internalIsEnabled(selection);
}
@@ -53,20 +52,20 @@ public class CommitAction extends AbstractCommitAction implements IPropertyChang
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
- */
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getSource() == getConfiguration() && event.getProperty() == ISynchronizePageConfiguration.P_MODE) {
setEnabled(internalIsEnabled(getStructuredSelection()));
}
}
+ @Override
protected ResourceTraversal[] getCommitTraversals(IStructuredSelection selection, IProgressMonitor monitor)
throws CoreException {
return getResourceTraversals(selection, monitor);
}
+ @Override
protected IStructuredSelection getActualSelection() throws CVSException {
IStructuredSelection selection = getStructuredSelection();
IStructuredSelection actualSelection = internalGetActualSelection();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CompareSubscriberContext.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CompareSubscriberContext.java
index 529d166c4..f2844bf16 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CompareSubscriberContext.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CompareSubscriberContext.java
@@ -15,7 +15,7 @@ package org.eclipse.team.internal.ccvs.ui.mappings;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.preferences.*;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
import org.eclipse.team.core.diff.DiffFilter;
@@ -43,30 +43,25 @@ public class CompareSubscriberContext extends CVSSubscriberMergeContext implemen
((IEclipsePreferences) CVSUIPlugin.getPlugin().getInstancePreferences().node("")).addPreferenceChangeListener(this); //$NON-NLS-1$
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.SubscriberMergeContext#dispose()
- */
+ @Override
public void dispose() {
super.dispose();
((IEclipsePreferences) CVSUIPlugin.getPlugin().getInstancePreferences().node("")).removePreferenceChangeListener(this); //$NON-NLS-1$
}
- /* (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 node, boolean inSyncHint,
IProgressMonitor monitor) throws CoreException {
// Do nothing
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.SubscriberMergeContext#getDiffFilter()
- */
+ @Override
protected DiffFilter getDiffFilter() {
final DiffFilter contentFilter = createContentFilter();
final DiffFilter regexFilter = createRegexFilter();
if (contentFilter != null && regexFilter != null) {
return new DiffFilter() {
+ @Override
public boolean select(IDiff diff, IProgressMonitor monitor) {
return !contentFilter.select(diff, monitor)
&& !regexFilter.select(diff, monitor);
@@ -74,12 +69,14 @@ public class CompareSubscriberContext extends CVSSubscriberMergeContext implemen
};
} else if (contentFilter != null) {
return new DiffFilter() {
+ @Override
public boolean select(IDiff diff, IProgressMonitor monitor) {
return !contentFilter.select(diff, monitor);
}
};
} else if (regexFilter != null) {
return new DiffFilter() {
+ @Override
public boolean select(IDiff diff, IProgressMonitor monitor) {
return !regexFilter.select(diff, monitor);
}
@@ -111,9 +108,7 @@ public class CompareSubscriberContext extends CVSSubscriberMergeContext implemen
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
- */
+ @Override
public void preferenceChange(PreferenceChangeEvent event) {
if (event.getKey().equals(ICVSUIConstants.PREF_CONSIDER_CONTENTS) || event.getKey().equals(ICVSUIConstants.PREF_SYNCVIEW_REGEX_FILTER_PATTERN)) {
SubscriberDiffTreeEventHandler handler = getHandler();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CreatePatchAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CreatePatchAction.java
index 67c1e1d3a..f910d7279 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CreatePatchAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CreatePatchAction.java
@@ -37,9 +37,6 @@ public class CreatePatchAction extends CVSModelProviderAction implements IDiffCh
getSynchronizationContext().getDiffTree().addDiffChangeListener(this);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.mapping.ModelProviderAction#isEnabledForSelection(org.eclipse.jface.viewers.IStructuredSelection)
- */
@Override
protected boolean isEnabledForSelection(IStructuredSelection selection) {
return internalIsEnabled(selection);
@@ -72,9 +69,6 @@ public class CreatePatchAction extends CVSModelProviderAction implements IDiffCh
return (IResource[]) resources.toArray(new IResource[resources.size()]);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.mappings.CVSModelProviderAction#getBundleKeyPrefix()
- */
@Override
protected String getBundleKeyPrefix() {
return "GenerateDiffFileAction."; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/MergeSubscriberContext.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/MergeSubscriberContext.java
index 6b8344a13..476f70639 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/MergeSubscriberContext.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/MergeSubscriberContext.java
@@ -46,9 +46,6 @@ public class MergeSubscriberContext extends CVSSubscriberMergeContext {
super(subscriber, manager);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.mapping.IMergeContext#markAsMerged(org.eclipse.team.core.diff.IDiffNode, boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void markAsMerged(final IDiff diff, boolean inSyncHint, IProgressMonitor monitor) throws CoreException {
run(monitor1 -> ((CVSMergeSubscriber) getSubscriber())
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelCompareParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelCompareParticipant.java
index 09b9d2f43..13337f45f 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelCompareParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelCompareParticipant.java
@@ -28,6 +28,7 @@ public class ModelCompareParticipant extends CVSModelSynchronizeParticipant impl
public static final String VIEWER_ID = "org.eclipse.team.cvs.ui.compareSynchronization"; //$NON-NLS-1$
public class CompareChangeSetCapability extends ModelParticipantChangeSetCapability {
+ @Override
public CheckedInChangeSetCollector createCheckedInChangeSetCollector(ISynchronizePageConfiguration configuration) {
return new CheckedInChangeSetCollector(configuration, getSubscriber());
}
@@ -45,9 +46,7 @@ public class ModelCompareParticipant extends CVSModelSynchronizeParticipant impl
setSecondaryId(Long.toString(System.currentTimeMillis()));
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.operations.ModelSynchronizeParticipant#initializeConfiguration(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
- */
+ @Override
protected void initializeConfiguration(ISynchronizePageConfiguration configuration) {
configuration.setProperty(ISynchronizePageConfiguration.P_VIEWER_ID, VIEWER_ID);
super.initializeConfiguration(configuration);
@@ -57,6 +56,7 @@ public class ModelCompareParticipant extends CVSModelSynchronizeParticipant impl
return ((SubscriberMergeContext)getContext()).getSubscriber();
}
+ @Override
public ChangeSetCapability getChangeSetCapability() {
if (capability == null) {
capability = new CompareChangeSetCapability();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeOperation.java
index 4938c3ed4..5bf22bed3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeOperation.java
@@ -37,6 +37,7 @@ public class ModelMergeOperation extends AbstractModelMergeOperation {
*/
public ModelMergeOperation(IWorkbenchPart part, ResourceMapping[] mappings, final CVSMergeSubscriber subscriber, boolean attempAutomerge) {
super(part, new SubscriberScopeManager(subscriber.getName(), mappings, subscriber, true){
+ @Override
public void dispose() {
subscriber.cancel();
super.dispose();
@@ -46,32 +47,28 @@ public class ModelMergeOperation extends AbstractModelMergeOperation {
this.attempAutomerge = attempAutomerge;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.operations.ModelParticipantMergeOperation#createMergeContext()
- */
+ @Override
protected SynchronizationContext createMergeContext() {
return MergeSubscriberContext.createContext(getScopeManager(), subscriber);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#getJobName()
- */
+ @Override
protected String getJobName() {
return CVSUIMessages.MergeUpdateAction_jobName;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.mappings.AbstractModelMergeOperation#createParticipant()
- */
+ @Override
protected ModelSynchronizeParticipant createParticipant() {
setOwnsManager(false);
return new ModelMergeParticipant((MergeSubscriberContext)createMergeContext());
}
+ @Override
protected boolean isPreviewInDialog() {
return false;
}
+ @Override
public boolean isPreviewRequested() {
return !attempAutomerge;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeParticipant.java
index bee1ced8c..8503f363f 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelMergeParticipant.java
@@ -87,9 +87,6 @@ public class ModelMergeParticipant extends CVSModelSynchronizeParticipant {
return new MergeActionGroup();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.operations.ModelSynchronizeParticipant#initializeConfiguration(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
- */
@Override
protected void initializeConfiguration(ISynchronizePageConfiguration configuration) {
configuration.setProperty(ISynchronizePageConfiguration.P_VIEWER_ID, VIEWER_ID);
@@ -214,9 +211,6 @@ public class ModelMergeParticipant extends CVSModelSynchronizeParticipant {
return MergeSubscriberContext.createContext(manager, subscriber);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#getName()
- */
@Override
public String getName() {
return NLS.bind(CVSUIMessages.CompareParticipant_0, new String[] { getSubscriber().getName(), Utils.getScopeDescription(getContext().getScope()) });
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelParticipantChangeSetCapability.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelParticipantChangeSetCapability.java
index b71fa9f54..f4c44a78d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelParticipantChangeSetCapability.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelParticipantChangeSetCapability.java
@@ -20,23 +20,17 @@ import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
public abstract class ModelParticipantChangeSetCapability extends ChangeSetCapability {
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.synchronize.ChangeSetCapability#enableChangeSetsByDefault()
- */
+ @Override
public boolean enableChangeSetsByDefault() {
return CVSUIPlugin.getPlugin().getPreferenceStore().getBoolean(ICVSUIConstants.PREF_COMMIT_SET_DEFAULT_ENABLEMENT);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.synchronize.ChangeSetCapability#supportsCheckedInChangeSets()
- */
+ @Override
public boolean supportsCheckedInChangeSets() {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.synchronize.ChangeSetCapability#enableCheckedInChangeSetsFor(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
- */
+ @Override
public boolean enableCheckedInChangeSetsFor(ISynchronizePageConfiguration configuration) {
return supportsCheckedInChangeSets() &&
configuration.getMode() != ISynchronizePageConfiguration.OUTGOING_MODE;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelReplaceOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelReplaceOperation.java
index 3f2cf9ccc..c44647716 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelReplaceOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelReplaceOperation.java
@@ -34,42 +34,27 @@ public class ModelReplaceOperation extends ModelUpdateOperation {
super(part, selectedMappings, consultModels);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#getJobName()
- */
@Override
protected String getJobName() {
return CVSUIMessages.ReplaceOperation_taskName;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.operations.ResourceMappingMergeOperation#isAttemptHeadlessMerge()
- */
@Override
protected boolean isAttemptHeadlessMerge() {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.operations.ResourceMappingMergeOperation#hasChangesOfInterest()
- */
@Override
protected boolean hasChangesOfInterest() {
IMergeContext context = (IMergeContext)getContext();
return !context.getDiffTree().isEmpty();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.mappings.ModelUpdateOperation#getMergeType()
- */
@Override
protected int getMergeType() {
return ISynchronizationContext.TWO_WAY;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.operations.ResourceMappingMergeOperation#performMerge(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected IStatus performMerge(IProgressMonitor monitor) throws CoreException {
if (!hasLocalChanges() || promptForOverwrite()) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelSynchronizeWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelSynchronizeWizard.java
index e189d4959..5e73e6371 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelSynchronizeWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelSynchronizeWizard.java
@@ -39,9 +39,7 @@ public class ModelSynchronizeWizard extends ParticipantSynchronizeWizard {
return CVSUIPlugin.getPlugin().getPreferenceStore().getBoolean(ICVSUIConstants.PREF_ENABLE_MODEL_SYNC);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#createParticipant()
- */
+ @Override
protected void createParticipant() {
if (isShowModelSync()) {
ISynchronizeParticipant participant = createParticipant(
@@ -60,9 +58,7 @@ public class ModelSynchronizeWizard extends ParticipantSynchronizeWizard {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#createScopeSelectionPage()
- */
+ @Override
protected final WizardPage createScopeSelectionPage() {
if (isShowModelSync())
selectionPage = new ModelElementSelectionPage(getRootResources());
@@ -102,6 +98,7 @@ public class ModelSynchronizeWizard extends ParticipantSynchronizeWizard {
}
}
+ @Override
protected String getPageTitle() {
ISynchronizeParticipantDescriptor desc = TeamUI.getSynchronizeManager().getParticipantDescriptor(WorkspaceModelParticipant.ID);
if(desc != null) {
@@ -111,10 +108,12 @@ public class ModelSynchronizeWizard extends ParticipantSynchronizeWizard {
}
}
+ @Override
protected IWizard getImportWizard() {
return new CheckoutWizard();
}
+ @Override
protected IResource[] getRootResources() {
return CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber().roots();
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java
index 9c7006a77..8c68411bd 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelUpdateOperation.java
@@ -47,17 +47,11 @@ public class ModelUpdateOperation extends AbstractModelMergeOperation {
super(targetPart, manager, true);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#getJobName()
- */
@Override
protected String getJobName() {
return CVSUIMessages.UpdateOperation_taskName;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.operations.ResourceMappingOperation#isPreviewRequested()
- */
@Override
public boolean isPreviewRequested() {
return super.isPreviewRequested() || !isAttemptHeadlessMerge();
@@ -75,17 +69,11 @@ public class ModelUpdateOperation extends AbstractModelMergeOperation {
return ISynchronizationContext.THREE_WAY;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.operations.ResourceMappingMergeOperation#createParticipant()
- */
@Override
protected ModelSynchronizeParticipant createParticipant() {
return new WorkspaceModelParticipant(createMergeContext());
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.operations.ModelParticipantMergeOperation#createMergeContext()
- */
@Override
protected SynchronizationContext createMergeContext() {
return WorkspaceSubscriberContext.createContext(getScopeManager(), getMergeType());
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java
index 2b52f7c47..b85167427 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java
@@ -30,26 +30,17 @@ import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
public class WorkspaceChangeSetCapability extends ModelParticipantChangeSetCapability {
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.synchronize.ChangeSetCapability#supportsActiveChangeSets()
- */
@Override
public boolean supportsActiveChangeSets() {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.synchronize.ChangeSetCapability#enableActiveChangeSetsFor(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
- */
@Override
public boolean enableActiveChangeSetsFor(ISynchronizePageConfiguration configuration) {
return supportsActiveChangeSets() &&
configuration.getMode() != ISynchronizePageConfiguration.INCOMING_MODE;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.synchronize.ChangeSetCapability#createChangeSet(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration, org.eclipse.team.core.diff.IDiff[])
- */
@Override
public ActiveChangeSet createChangeSet(ISynchronizePageConfiguration configuration, IDiff[] infos) {
ActiveChangeSet set = getActiveChangeSetManager().createSet(CVSUIMessages.WorkspaceChangeSetCapability_1, new IDiff[0]);
@@ -71,9 +62,6 @@ public class WorkspaceChangeSetCapability extends ModelParticipantChangeSetCapab
return result.toArray(new IResource[result.size()]);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#editChangeSet(org.eclipse.team.core.subscribers.ActiveChangeSet)
- */
@Override
public void editChangeSet(ISynchronizePageConfiguration configuration, ActiveChangeSet set) {
CommitSetDialog dialog = new CommitSetDialog(configuration.getSite().getShell(), set, set.getResources(), CommitSetDialog.EDIT);
@@ -82,9 +70,6 @@ public class WorkspaceChangeSetCapability extends ModelParticipantChangeSetCapab
// Nothing to do here as the set was updated by the dialog
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#getActiveChangeSetManager()
- */
@Override
public ActiveChangeSetManager getActiveChangeSetManager() {
return CVSUIPlugin.getPlugin().getChangeSetManager();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceCommitAction.java
index 283eafc79..44d3081bb 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceCommitAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceCommitAction.java
@@ -41,6 +41,7 @@ public class WorkspaceCommitAction extends AbstractCommitAction implements IDiff
final IDiffTree tree = getDiffTree();
tree.addDiffChangeListener(this);
getSynchronizationContext().getCache().addCacheListener(new ICacheListener() {
+ @Override
public void cacheDisposed(ICache cache) {
tree.removeDiffChangeListener(WorkspaceCommitAction.this);
}
@@ -49,6 +50,7 @@ public class WorkspaceCommitAction extends AbstractCommitAction implements IDiff
}
+ @Override
protected String getBundleKeyPrefix() {
return "WorkspaceToolbarCommitAction."; //$NON-NLS-1$
}
@@ -59,38 +61,35 @@ public class WorkspaceCommitAction extends AbstractCommitAction implements IDiff
return tree;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.mapping.ModelProviderAction#isEnabledForSelection(org.eclipse.jface.viewers.IStructuredSelection)
- */
+ @Override
protected boolean isEnabledForSelection(IStructuredSelection selection) {
// Enablement has nothing to do with selection
return isEnabled();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.diff.IDiffChangeListener#diffChanged(org.eclipse.team.core.diff.IDiffChangeEvent, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
public void diffsChanged(IDiffChangeEvent event, IProgressMonitor monitor) {
updateEnablement();
}
- /* (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
}
+ @Override
public void updateEnablement() {
boolean enabled = (getDiffTree().countFor(IThreeWayDiff.OUTGOING, IThreeWayDiff.DIRECTION_MASK) > 0)
&& (getDiffTree().countFor(IThreeWayDiff.CONFLICTING, IThreeWayDiff.DIRECTION_MASK) == 0);
setEnabled(enabled);
}
+ @Override
protected IResource[] getTargetResources() {
return getSynchronizationContext().getScope().getRoots();
}
+ @Override
protected ResourceTraversal[] getCommitTraversals(IStructuredSelection selection, IProgressMonitor monitor)
throws CoreException {
return getSynchronizationContext().getScope().getTraversals();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceModelParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceModelParticipant.java
index 943a45573..b1fd688e4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceModelParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceModelParticipant.java
@@ -159,9 +159,6 @@ public class WorkspaceModelParticipant extends
}
}
- /* (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) {
@@ -220,34 +217,22 @@ public class WorkspaceModelParticipant extends
isConsultChangeSets = isConsultChangeSets(context.getScopeManager());
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.operations.ModelSynchronizeParticipant#initializeConfiguration(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
- */
@Override
protected void initializeConfiguration(ISynchronizePageConfiguration configuration) {
configuration.setProperty(ISynchronizePageConfiguration.P_VIEWER_ID, VIEWER_ID);
super.initializeConfiguration(configuration);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.operations.ResourceMappingSynchronizeParticipant#createMergeActionGroup()
- */
@Override
protected ModelSynchronizeParticipantActionGroup createMergeActionGroup() {
return new WorkspaceMergeActionGroup();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.operations.ModelSynchronizeParticipant#restoreContext(org.eclipse.team.core.mapping.IResourceMappingScope, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected MergeContext restoreContext(ISynchronizationScopeManager manager) {
return WorkspaceSubscriberContext.createContext(manager, ISynchronizationContext.THREE_WAY);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.operations.ModelSynchronizeParticipant#createScopeManager(org.eclipse.core.resources.mapping.ResourceMapping[])
- */
@Override
protected ISynchronizationScopeManager createScopeManager(ResourceMapping[] mappings) {
return WorkspaceSubscriberContext.createWorkspaceScopeManager(mappings, true, isConsultChangeSets);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java
index ead6a4890..6a076f904 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceSubscriberContext.java
@@ -89,9 +89,6 @@ public class WorkspaceSubscriberContext extends CVSSubscriberMergeContext implem
return mergeContext;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.SubscriberMergeContext#getDiffFilter()
- */
@Override
protected DiffFilter getDiffFilter() {
final DiffFilter contentFilter = createContentFilter();
@@ -128,9 +125,6 @@ public class WorkspaceSubscriberContext extends CVSSubscriberMergeContext implem
((IEclipsePreferences) CVSUIPlugin.getPlugin().getInstancePreferences().node("")).addPreferenceChangeListener(this); //$NON-NLS-1$
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.SubscriberMergeContext#dispose()
- */
@Override
public void dispose() {
super.dispose();
@@ -160,9 +154,6 @@ public class WorkspaceSubscriberContext extends CVSSubscriberMergeContext implem
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
- */
@Override
public void preferenceChange(PreferenceChangeEvent event) {
if (event.getKey().equals(ICVSUIConstants.PREF_CONSIDER_CONTENTS) || event.getKey().equals(ICVSUIConstants.PREF_SYNCVIEW_REGEX_FILTER_PATTERN)) {
@@ -319,9 +310,6 @@ public class WorkspaceSubscriberContext extends CVSSubscriberMergeContext implem
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.mapping.MergeContext#merge(org.eclipse.team.core.diff.IDiffNode, boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public IStatus merge(IDiff delta, boolean force, IProgressMonitor monitor) throws CoreException {
if (getMergeType() == ISynchronizationContext.TWO_WAY) {
@@ -374,17 +362,11 @@ public class WorkspaceSubscriberContext extends CVSSubscriberMergeContext implem
cvsResources);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.mapping.provider.MergeContext#getMergeType()
- */
@Override
public int getMergeType() {
return type;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.SubscriberMergeContext#refresh(org.eclipse.core.resources.mapping.ResourceTraversal[], int, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void refresh(final ResourceTraversal[] traversals, int flags, IProgressMonitor monitor) throws CoreException {
SubscriberDiffTreeEventHandler handler = getHandler();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/DateTagCategory.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/DateTagCategory.java
index 12766ec4a..f9d4da45e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/DateTagCategory.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/DateTagCategory.java
@@ -17,8 +17,6 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.team.internal.ccvs.core.*;
import org.eclipse.team.internal.ccvs.ui.*;
-import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
-import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
/**
* The DateTagCategory is the parent of all the date tags in the repositories view.
@@ -29,30 +27,22 @@ public class DateTagCategory extends TagCategory {
super(repository);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.model.TagCategory#getTags(org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected CVSTag[] getTags(IProgressMonitor monitor) throws CVSException {
return CVSUIPlugin.getPlugin().getRepositoryManager().getRepositoryRootFor(repository).getDateTags();
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
- */
+ @Override
public ImageDescriptor getImageDescriptor(Object object) {
return CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_DATES_CATEGORY);
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object)
- */
+ @Override
public String getLabel(Object o) {
return CVSUIMessages.DateTagCategory_0;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.model.TagCategory#getAdapter(java.lang.Class)
- */
+ @Override
public <T> T getAdapter(Class<T> adapter) {
if (adapter.equals(ICVSRepositoryLocation.class)) {
return adapter.cast(getRepository(null));
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java
index b9d1230ae..93888a648 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteContentProvider.java
@@ -42,9 +42,6 @@ public class RemoteContentProvider extends WorkbenchContentProvider {
cachedTrees = new HashMap<>();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
if (viewer instanceof AbstractTreeViewer) {
@@ -100,9 +97,6 @@ public class RemoteContentProvider extends WorkbenchContentProvider {
return workingSet;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.model.WorkbenchContentProvider#getChildren(java.lang.Object)
- */
@Override
public Object[] getChildren(Object element) {
//check to see if we already have the children cached in the tree map
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteModule.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteModule.java
index 33c040ba7..9509e8991 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteModule.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/RemoteModule.java
@@ -49,7 +49,8 @@ public class RemoteModule extends CVSModelElement implements IAdaptable,
* Returns an object which is an instance of the given class associated with
* this object. Returns <code>null</code> if no such object can be found.
*/
- public <T> T getAdapter(Class<T> adapter) {
+ @Override
+ public <T> T getAdapter(Class<T> adapter) {
if (adapter == IWorkbenchAdapter.class)
return adapter.cast(this);
if (adapter == IDeferredWorkbenchAdapter.class)
@@ -66,7 +67,8 @@ public class RemoteModule extends CVSModelElement implements IAdaptable,
* new image is returned, and the caller is responsible for
* disposing it.
*/
- public ImageDescriptor getImageDescriptor(Object object) {
+ @Override
+ public ImageDescriptor getImageDescriptor(Object object) {
return CVSUIPlugin.getPlugin().getImageDescriptor(
ICVSUIConstants.IMG_PROJECT_VERSION);
}
@@ -75,14 +77,16 @@ public class RemoteModule extends CVSModelElement implements IAdaptable,
* Returns the name of this element. This will typically be used to assign a
* label to this object when displayed in the UI.
*/
- public String getLabel(Object o) {
+ @Override
+ public String getLabel(Object o) {
return folder.getName();
}
/**
* Returns the logical parent of the given object in its tree.
*/
- public Object getParent(Object o) {
+ @Override
+ public Object getParent(Object o) {
return parent;
}
@@ -93,10 +97,11 @@ public class RemoteModule extends CVSModelElement implements IAdaptable,
return folder.getRepository();
}
- /**
- * (Non-javadoc) For debugging purposes only.
- */
- public String toString() {
+ /*
+ * For debugging purposes only.
+ */
+ @Override
+ public String toString() {
return "RemoteModule(" + folder.getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -113,7 +118,8 @@ public class RemoteModule extends CVSModelElement implements IAdaptable,
* @see org.eclipse.team.internal.ccvs.ui.model.CVSModelElement#internalGetChildren(java.lang.Object,
* org.eclipse.core.runtime.IProgressMonitor)
*/
- public Object[] fetchChildren(Object o, IProgressMonitor monitor)
+ @Override
+ public Object[] fetchChildren(Object o, IProgressMonitor monitor)
throws TeamException {
RepositoryManager manager = CVSUIPlugin.getPlugin()
.getRepositoryManager();
@@ -131,7 +137,8 @@ public class RemoteModule extends CVSModelElement implements IAdaptable,
return versions;
}
- public void fetchDeferredChildren(Object o, IElementCollector collector,
+ @Override
+ public void fetchDeferredChildren(Object o, IElementCollector collector,
IProgressMonitor monitor) {
try {
collector.add(fetchChildren(o, monitor), monitor);
@@ -140,11 +147,13 @@ public class RemoteModule extends CVSModelElement implements IAdaptable,
}
}
- public boolean isContainer() {
+ @Override
+ public boolean isContainer() {
return true;
}
- public ISchedulingRule getRule(Object element) {
+ @Override
+ public ISchedulingRule getRule(Object element) {
return new RepositoryLocationSchedulingRule(folder.getRepository());
}
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/TagCategory.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/TagCategory.java
index ae0f54b23..9a1d02f2d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/TagCategory.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/model/TagCategory.java
@@ -14,9 +14,7 @@
package org.eclipse.team.internal.ccvs.ui.model;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.team.internal.ccvs.core.CVSException;
-import org.eclipse.team.internal.ccvs.core.CVSTag;
-import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation;
+import org.eclipse.team.internal.ccvs.core.*;
import org.eclipse.ui.model.IWorkbenchAdapter;
/**
@@ -29,9 +27,7 @@ public abstract class TagCategory extends CVSModelElement {
this.repository = repository;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.model.CVSModelElement#fetchChildren(java.lang.Object, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
public Object[] fetchChildren(Object o, IProgressMonitor monitor) throws CVSException {
CVSTag[] tags = getTags(monitor);
CVSTagElement[] elements = new CVSTagElement[tags.length];
@@ -48,9 +44,7 @@ public abstract class TagCategory extends CVSModelElement {
*/
protected abstract CVSTag[] getTags(IProgressMonitor monitor) throws CVSException;
- /* (non-Javadoc)
- * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
- */
+ @Override
public Object getParent(Object o) {
return repository;
}
@@ -67,6 +61,7 @@ public abstract class TagCategory extends CVSModelElement {
* associated with this object. Returns <code>null</code> if
* no such object can be found.
*/
+ @Override
public <T> T getAdapter(Class<T> adapter) {
if (adapter == IWorkbenchAdapter.class) return adapter.cast(this);
return null;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/AddOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/AddOperation.java
index b84009392..1893d642e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/AddOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/AddOperation.java
@@ -53,9 +53,7 @@ public class AddOperation extends RepositoryProviderOperation {
public void addModesForNames(Map modes) {
fModesForFiles= modes;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#execute(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor)
- */
+
@Override
protected void execute(CVSTeamProvider provider, IResource[] resources, boolean recurse, IProgressMonitor monitor) throws CVSException, InterruptedException {
if (resources.length == 0)
@@ -63,17 +61,11 @@ public class AddOperation extends RepositoryProviderOperation {
add(provider, resources, recurse ? IResource.DEPTH_INFINITE : IResource.DEPTH_ONE, monitor);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
@Override
protected String getTaskName() {
return CVSUIMessages.AddAction_adding;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
- */
@Override
protected String getTaskName(CVSTeamProvider provider) {
return NLS.bind(CVSUIMessages.AddOperation_0, new String[] { provider.getProject().getName() });
@@ -229,9 +221,6 @@ public class AddOperation extends RepositoryProviderOperation {
return cvsResource.isManaged() && (!cvsResource.isFolder() || ((ICVSFolder)cvsResource).isCVSFolder());
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getErrorMessage(org.eclipse.core.runtime.IStatus[], int)
- */
@Override
protected String getErrorMessage(IStatus[] failures, int totalOperations) {
return CVSUIMessages.AddAction_addFailed;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/BranchOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/BranchOperation.java
index c01cc73b8..071f36568 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/BranchOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/BranchOperation.java
@@ -56,9 +56,6 @@ public class BranchOperation extends RepositoryProviderOperation {
this.update = updateToBranch;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#shouldRun()
- */
@Override
protected boolean shouldRun() {
try {
@@ -111,9 +108,6 @@ public class BranchOperation extends RepositoryProviderOperation {
return super.shouldRun();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#execute(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void execute(CVSTeamProvider provider, IResource[] providerResources, boolean recurse, IProgressMonitor monitor) throws CVSException, InterruptedException {
try {
@@ -275,17 +269,11 @@ public class BranchOperation extends RepositoryProviderOperation {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
@Override
protected String getTaskName() {
return CVSUIMessages.BranchOperation_0;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
- */
@Override
protected String getTaskName(CVSTeamProvider provider) {
return NLS.bind(CVSUIMessages.BranchOperation_1, new String[] { provider.getProject().getName() });
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java
index 0e2a58940..705564909 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java
@@ -56,25 +56,16 @@ public abstract class CVSOperation extends TeamOperation implements IShellProvid
super(part);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.TeamOperation#getJobName()
- */
@Override
protected String getJobName() {
return getTaskName();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#getOperationIcon()
- */
@Override
protected URL getOperationIcon() {
return Platform.find(CVSUIPlugin.getPlugin().getBundle(), new Path(ICVSUIConstants.ICON_PATH + ICVSUIConstants.IMG_CVS_PERSPECTIVE));
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public final void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
startOperation();
@@ -282,9 +273,6 @@ public abstract class CVSOperation extends TeamOperation implements IShellProvid
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.TeamOperation#getShell()
- */
@Override
public Shell getShell() {
// Use the shell assigned to the operation if possible
@@ -304,18 +292,12 @@ public abstract class CVSOperation extends TeamOperation implements IShellProvid
this.shell = shell;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#canRunAsJob()
- */
@Override
protected boolean canRunAsJob() {
// Put CVS jobs in the background by default.
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#isSameFamilyAs(org.eclipse.team.ui.TeamOperation)
- */
@Override
protected boolean isSameFamilyAs(TeamOperation operation) {
// Trat all CVS operations as a single family
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheBaseContentsOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheBaseContentsOperation.java
index 21a98048c..cd0d15bac 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheBaseContentsOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheBaseContentsOperation.java
@@ -44,9 +44,6 @@ public class CacheBaseContentsOperation extends CacheTreeContentsOperation {
super(part, mappings, tree);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CacheTreeContentsOperation#getRemoteFileState(org.eclipse.team.core.diff.IThreeWayDiff)
- */
@Override
protected IFileRevision getRemoteFileState(IThreeWayDiff twd) {
IResourceDiff diff = (IResourceDiff)twd.getRemoteChange();
@@ -56,17 +53,11 @@ public class CacheBaseContentsOperation extends CacheTreeContentsOperation {
return base;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CacheTreeContentsOperation#isEnabledForDirection(int)
- */
@Override
protected boolean isEnabledForDirection(int direction) {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CacheTreeContentsOperation#buildTree(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
- */
@Override
protected ICVSRemoteResource buildTree(CVSTeamProvider provider) throws TeamException {
return CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber().buildBaseTree(provider.getProject(), true, new NullProgressMonitor());
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheRemoteContentsOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheRemoteContentsOperation.java
index 8ca5c79c9..ed15c8f3b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheRemoteContentsOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheRemoteContentsOperation.java
@@ -33,9 +33,7 @@ public class CacheRemoteContentsOperation extends CacheTreeContentsOperation {
super(part, mappers, tree);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CacheTreeContentsOperation#getRemoteFileState(org.eclipse.team.core.diff.IThreeWayDiff)
- */
+ @Override
protected IFileRevision getRemoteFileState(IThreeWayDiff twd) {
IResourceDiff diff = (IResourceDiff)twd.getRemoteChange();
if (diff == null)
@@ -43,16 +41,13 @@ public class CacheRemoteContentsOperation extends CacheTreeContentsOperation {
return diff.getAfterState();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CacheTreeContentsOperation#isEnabledForDirection(int)
- */
+ @Override
protected boolean isEnabledForDirection(int direction) {
return direction == IThreeWayDiff.CONFLICTING ||
direction == IThreeWayDiff.INCOMING;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CacheTreeContentsOperation#buildTree(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
- */
+
+ @Override
protected ICVSRemoteResource buildTree(CVSTeamProvider provider) throws TeamException {
return CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber().buildRemoteTree(provider.getProject(), true, new NullProgressMonitor());
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheTreeContentsOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheTreeContentsOperation.java
index 86c554e43..9177bbe08 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheTreeContentsOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CacheTreeContentsOperation.java
@@ -49,9 +49,6 @@ public abstract class CacheTreeContentsOperation extends SingleCommandOperation
this.tree = tree;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation#execute(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void execute(CVSTeamProvider provider, IResource[] resources, boolean recurse, IProgressMonitor monitor) throws CVSException, InterruptedException {
IResource[] files = getFilesWithUncachedContents(resources, recurse);
@@ -108,12 +105,13 @@ public abstract class CacheTreeContentsOperation extends SingleCommandOperation
*/
protected abstract boolean isEnabledForDirection(int direction);
- /* (non-Javadoc)
- *
- * Use a local root that is really the base tree so we can cache
- * the base contents without affecting the local contents.
+ /*
+ * Use a local root that is really the base tree so we can cache the base
+ * contents without affecting the local contents.
*
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getLocalRoot(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
+ * @see
+ * org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#
+ * getLocalRoot(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
*/
@Override
protected ICVSFolder getLocalRoot(CVSTeamProvider provider)
@@ -128,9 +126,6 @@ public abstract class CacheTreeContentsOperation extends SingleCommandOperation
protected abstract ICVSRemoteResource buildTree(CVSTeamProvider provider) throws TeamException;
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getCVSArguments(org.eclipse.core.resources.IResource[])
- */
@Override
protected ICVSResource[] getCVSArguments(Session session, IResource[] resources) {
List<ICVSResource> result = new ArrayList<>();
@@ -148,9 +143,6 @@ public abstract class CacheTreeContentsOperation extends SingleCommandOperation
return result.toArray(new ICVSResource[result.size()]);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation#executeCommand(org.eclipse.team.internal.ccvs.core.client.Session, org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.team.internal.ccvs.core.ICVSResource[], boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected IStatus executeCommand(Session session, CVSTeamProvider provider, ICVSResource[] resources, boolean recurse, IProgressMonitor monitor) throws CVSException, InterruptedException {
return Command.UPDATE.execute(
@@ -180,25 +172,16 @@ public abstract class CacheTreeContentsOperation extends SingleCommandOperation
monitor);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation#getLocalOptions(boolean)
- */
@Override
protected LocalOption[] getLocalOptions(boolean recurse) {
return Update.IGNORE_LOCAL_CHANGES.addTo(super.getLocalOptions(recurse));
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
- */
@Override
protected String getTaskName(CVSTeamProvider provider) {
return NLS.bind(CVSUIMessages.CacheTreeContentsOperation_0, new String[] {provider.getProject().getName()});
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
@Override
protected String getTaskName() {
return CVSUIMessages.CacheTreeContentsOperation_1;
@@ -212,17 +195,11 @@ public abstract class CacheTreeContentsOperation extends SingleCommandOperation
return tree;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#consultModelsForMappings()
- */
@Override
public boolean consultModelsForMappings() {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#isReportableError(org.eclipse.core.runtime.IStatus)
- */
@Override
protected boolean isReportableError(IStatus status) {
return super.isReportableError(status) && status.getSeverity() == IStatus.ERROR;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java
index c62a72227..2337cd727 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java
@@ -61,9 +61,6 @@ public class CheckoutIntoOperation extends CheckoutOperation {
this.localFolderName = localFolder.getName();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CheckoutOperation#getTaskName()
- */
@Override
protected String getTaskName() {
ICVSRemoteFolder[] remoteFolders = getRemoteFolders();
@@ -86,9 +83,6 @@ public class CheckoutIntoOperation extends CheckoutOperation {
return recursive;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CheckoutOperation#checkout(org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected IStatus checkout(final ICVSRemoteFolder folder, IProgressMonitor monitor) throws CVSException {
final IStatus[] result = new IStatus[] { null };
@@ -107,9 +101,6 @@ public class CheckoutIntoOperation extends CheckoutOperation {
return result[0];
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CheckoutOperation#checkout(org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder[], org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void checkout(final ICVSRemoteFolder[] folders, IProgressMonitor monitor) throws CVSException {
// Batch sync info changes with the CVS synchronizer to optimize cache writing
@@ -422,9 +413,6 @@ public class CheckoutIntoOperation extends CheckoutOperation {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getSchedulingRule()
- */
@Override
protected ISchedulingRule getSchedulingRule() {
//use the modfiy rule for the time being
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutMultipleProjectsOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutMultipleProjectsOperation.java
index 72e0242fd..a0f40a179 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutMultipleProjectsOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutMultipleProjectsOperation.java
@@ -48,19 +48,19 @@ public class CheckoutMultipleProjectsOperation extends CheckoutProjectOperation
*
* @param project
*/
+ @Override
protected IPath getTargetLocationFor(IProject project) {
IPath targetLocation = super.getTargetLocationFor(project);
if (targetLocation == null) return null;
return targetLocation.append(project.getName());
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CheckoutOperation#checkout(org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected IStatus checkout(ICVSRemoteFolder folder, IProgressMonitor monitor) throws CVSException {
return checkout(folder, null, monitor);
}
+ @Override
protected IWorkingSet[] getWorkingSets(){
return workingSets;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutOperation.java
index 54d37bbea..03ce62031 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutOperation.java
@@ -27,9 +27,7 @@ public abstract class CheckoutOperation extends RemoteOperation {
super(part, remoteFolders);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
public void execute(IProgressMonitor monitor) throws CVSException, InterruptedException {
ICVSRemoteFolder[] folders = getRemoteFolders();
checkout(folders, monitor);
@@ -65,24 +63,18 @@ public abstract class CheckoutOperation extends RemoteOperation {
*/
protected abstract IStatus checkout(ICVSRemoteFolder folder, IProgressMonitor monitor) throws CVSException;
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#canRunAsJob()
- */
+ @Override
public boolean canRunAsJob() {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#isKeepOneProgressServiceEntry()
- */
+ @Override
public boolean isKeepOneProgressServiceEntry() {
// Keep the last repository provider operation in the progress service
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#getGotoAction()
- */
+ @Override
protected IAction getGotoAction() {
return getShowConsoleAction();
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutSingleProjectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutSingleProjectOperation.java
index f3d6cd8ce..feeb1ae9a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutSingleProjectOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutSingleProjectOperation.java
@@ -46,30 +46,25 @@ public class CheckoutSingleProjectOperation extends CheckoutProjectOperation {
return preconfigured;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CheckoutOperation#needsPromptForOverwrite(org.eclipse.core.resources.IProject)
- */
+ @Override
public boolean needsPromptForOverwrite(IProject project) {
// No need to prompt if the project was preconfigured
if (isPreconfigured()) return false;
return super.needsPromptForOverwrite(project);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CheckoutProjectOperation#performScrubProjects()
- */
+ @Override
protected boolean performScrubProjects() {
// Do not scrub the projects if they were preconfigured.
return !isPreconfigured();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CheckoutOperation#checkout(org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected IStatus checkout(ICVSRemoteFolder folder, IProgressMonitor monitor) throws CVSException {
return checkout(folder, targetProject, monitor);
}
+ @Override
protected IWorkingSet[] getWorkingSets(){
return workingSets;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutToRemoteFolderOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutToRemoteFolderOperation.java
index 5d5a21bb7..512d8a3b9 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutToRemoteFolderOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutToRemoteFolderOperation.java
@@ -44,9 +44,7 @@ public class CheckoutToRemoteFolderOperation extends CheckoutOperation {
public CreatedResponseHandler() {
super(UpdatedHandler.HANDLE_CREATED);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.client.UpdatedHandler#receiveTargetFile(org.eclipse.team.internal.ccvs.core.client.Session, org.eclipse.team.internal.ccvs.core.ICVSFile, java.lang.String, java.util.Date, boolean, boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
+
@Override
protected void receiveTargetFile(
Session session,
@@ -90,9 +88,6 @@ public class CheckoutToRemoteFolderOperation extends CheckoutOperation {
public class SandboxCheckout extends Checkout {
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.client.Command#commandFinished(org.eclipse.team.internal.ccvs.core.client.Session, org.eclipse.team.internal.ccvs.core.client.Command.GlobalOption[], org.eclipse.team.internal.ccvs.core.client.Command.LocalOption[], org.eclipse.team.internal.ccvs.core.ICVSResource[], org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IStatus)
- */
@Override
protected IStatus commandFinished(
Session session,
@@ -107,9 +102,6 @@ public class CheckoutToRemoteFolderOperation extends CheckoutOperation {
return status;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.client.Command#doExecute(org.eclipse.team.internal.ccvs.core.client.Session, org.eclipse.team.internal.ccvs.core.client.Command.GlobalOption[], org.eclipse.team.internal.ccvs.core.client.Command.LocalOption[], java.lang.String[], org.eclipse.team.internal.ccvs.core.client.listeners.ICommandOutputListener, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected IStatus doExecute(
Session session,
@@ -146,9 +138,6 @@ public class CheckoutToRemoteFolderOperation extends CheckoutOperation {
super(part, new ICVSRemoteFolder[] { remoteFolder });
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CheckoutOperation#checkout(org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected IStatus checkout(
ICVSRemoteFolder folder,
@@ -166,9 +155,6 @@ public class CheckoutToRemoteFolderOperation extends CheckoutOperation {
return checkout(folder, sandbox, monitor);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
@Override
protected String getTaskName() {
return NLS.bind(CVSUIMessages.CheckoutToRemoteFolderOperation_0, new String[] { getRemoteFolders()[0].getName() });
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ClipboardDiffOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ClipboardDiffOperation.java
index 1fc4c9e50..f7125bee5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ClipboardDiffOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ClipboardDiffOperation.java
@@ -56,9 +56,6 @@ public class ClipboardDiffOperation extends DiffOperation {
});
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.DiffOperation#openStream()
- */
@Override
protected PrintStream openStream() {
return new PrintStream(os);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CommitOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CommitOperation.java
index 533c775ee..273f7e7a4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CommitOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CommitOperation.java
@@ -20,8 +20,9 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.osgi.util.NLS;
import org.eclipse.team.core.subscribers.SubscriberResourceMappingContext;
import org.eclipse.team.internal.ccvs.core.*;
-import org.eclipse.team.internal.ccvs.core.client.*;
+import org.eclipse.team.internal.ccvs.core.client.Command;
import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
+import org.eclipse.team.internal.ccvs.core.client.Session;
import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
import org.eclipse.ui.IWorkbenchPart;
@@ -35,9 +36,7 @@ public class CommitOperation extends SingleCommandOperation {
addLocalOption(Command.makeArgumentOption(Command.MESSAGE_OPTION, comment));
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation#executeCommand(org.eclipse.team.internal.ccvs.core.client.Session, org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.team.internal.ccvs.core.ICVSResource[], org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected IStatus executeCommand(Session session, CVSTeamProvider provider, ICVSResource[] resources, boolean recurse, IProgressMonitor monitor) throws CVSException, InterruptedException {
return Command.COMMIT.execute(session,
Command.NO_GLOBAL_OPTIONS,
@@ -47,37 +46,27 @@ public class CommitOperation extends SingleCommandOperation {
monitor);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
+ @Override
protected String getTaskName() {
return CVSUIMessages.RepositoryManager_committing;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
- */
+ @Override
protected String getTaskName(CVSTeamProvider provider) {
return NLS.bind(CVSUIMessages.CommitOperation_0, new String[] { provider.getProject().getName() });
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getErrorMessage(org.eclipse.core.runtime.IStatus[], int)
- */
+ @Override
protected String getErrorMessage(IStatus[] failures, int totalOperations) {
return CVSUIMessages.CommitAction_commitFailed;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation#isServerModificationOperation()
- */
+ @Override
protected boolean isServerModificationOperation() {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getResourceMappingContext()
- */
+ @Override
protected ResourceMappingContext getResourceMappingContext() {
return SubscriberResourceMappingContext.createContext(CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber());
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java
index 5cfa92654..96ca3a870 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DiffOperation.java
@@ -595,9 +595,6 @@ public abstract class DiffOperation extends SingleCommandOperation {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#consultModelsForMappings()
- */
@Override
public boolean consultModelsForMappings() {
return false;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DisconnectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DisconnectOperation.java
index 7fc440908..71041bbd0 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DisconnectOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/DisconnectOperation.java
@@ -37,9 +37,7 @@ public class DisconnectOperation extends RepositoryProviderOperation {
this.unmanage = unmanage;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#execute(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected void execute(
CVSTeamProvider provider,
IResource[] resources,
@@ -62,38 +60,28 @@ public class DisconnectOperation extends RepositoryProviderOperation {
monitor.done();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
+ @Override
protected String getTaskName() {
return CVSUIMessages.DisconnectOperation_0;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
- */
+ @Override
protected String getTaskName(CVSTeamProvider provider) {
return NLS.bind(CVSUIMessages.DisconnectOperation_1, new String[] { provider.getProject().getName() });
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#canRunAsJob()
- */
+ @Override
public boolean canRunAsJob() {
// Do not run in the background
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#consultModelsForMappings()
- */
+ @Override
public boolean consultModelsForMappings() {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getSchedulingRule(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
- */
+ @Override
protected ISchedulingRule getSchedulingRule(CVSTeamProvider provider) {
return ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(provider.getProject());
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchAllMembersOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchAllMembersOperation.java
index cb531e0dd..a8fea5535 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchAllMembersOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchAllMembersOperation.java
@@ -58,9 +58,11 @@ public class FetchAllMembersOperation extends RemoteOperation {
tree.setChildren(new ICVSRemoteResource[0]);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.client.listeners.RDiffSummaryListener.IFileDiffListener#newFile(java.lang.String, java.lang.String)
- */
+ /*
+ * @see
+ * org.eclipse.team.internal.ccvs.core.client.listeners.RDiffSummaryListener.
+ * IFileDiffListener#newFile(java.lang.String, java.lang.String)
+ */
public void newFile(IPath remoteFilePath, ICVSRemoteFile remoteFile) {
try {
addFile(tree,tag,remoteFile, remoteFilePath);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchMembersOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchMembersOperation.java
index a6b54bb35..128c66700 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchMembersOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FetchMembersOperation.java
@@ -102,9 +102,6 @@ public class FetchMembersOperation extends RemoteOperation {
this.collector = collector;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void execute(IProgressMonitor monitor) throws CVSException, InterruptedException {
ICVSRemoteFolder remote = getRemoteFolder();
@@ -136,9 +133,6 @@ public class FetchMembersOperation extends RemoteOperation {
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
@Override
protected String getTaskName() {
return NLS.bind(CVSUIMessages.FetchMembersOperation_0, new String[] { getRemoteFolder().getName() });
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FileDiffOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FileDiffOperation.java
index 6f3151f5f..99a818dac 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FileDiffOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/FileDiffOperation.java
@@ -40,6 +40,7 @@ public class FileDiffOperation extends DiffOperation {
this.file = file;
}
+ @Override
public void execute(IProgressMonitor monitor) throws CVSException, InterruptedException {
super.execute(monitor);
@@ -80,9 +81,7 @@ public class FileDiffOperation extends DiffOperation {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.DiffOperation#openStream()
- */
+ @Override
protected PrintStream openStream() throws CVSException {
try {
os = new FileOutputStream(tempFile);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/OverrideAndUpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/OverrideAndUpdateOperation.java
index c0dc51ceb..86879e025 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/OverrideAndUpdateOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/OverrideAndUpdateOperation.java
@@ -38,9 +38,6 @@ public class OverrideAndUpdateOperation extends ReplaceOperation {
this.conflictingAdditions = conflictingAdditions;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.ReplaceOperation#getResourcesToUpdate(org.eclipse.team.internal.ccvs.core.ICVSResource[])
- */
@Override
protected ICVSResource[] getResourcesToUpdate(ICVSResource[] resources, IProgressMonitor monitor) throws CVSException {
// Add the conflicting additions to the list of resources to update
@@ -51,9 +48,6 @@ public class OverrideAndUpdateOperation extends ReplaceOperation {
return update.toArray(new ICVSResource[update.size()]);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.UpdateOperation#getResourceMappingContext()
- */
@Override
protected ResourceMappingContext getResourceMappingContext() {
return new SingleProjectSubscriberContext(CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber(), false, project);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ProjectMetaFileOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ProjectMetaFileOperation.java
index eddf8e55a..368409a3d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ProjectMetaFileOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ProjectMetaFileOperation.java
@@ -136,9 +136,7 @@ public class ProjectMetaFileOperation extends CVSOperation {
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
public void execute(IProgressMonitor monitor) throws CVSException, InterruptedException {
checkForMetafileAndUpdateFoldersWithRemoteProjectName(remoteFolders, monitor);
}
@@ -162,16 +160,12 @@ public class ProjectMetaFileOperation extends CVSOperation {
return remoteFolders;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
+ @Override
protected String getTaskName() {
return CVSUIMessages.ProjectMetaFile_taskName;
}
-
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#canRunAsJob()
- */
+
+ @Override
public boolean canRunAsJob() {
// This operation should never be run in the background.
return false;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java
index b4ea0683e..5e432a224 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReconcileProjectOperation.java
@@ -44,26 +44,17 @@ public class ReconcileProjectOperation extends ShareProjectOperation {
this.folder = folder;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
@Override
protected String getTaskName() {
return NLS.bind(CVSUIMessages.ReconcileProjectOperation_0, new String[] { getProject().getName(), folder.getRepositoryRelativePath() });
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.ShareProjectOperation#createRemoteFolder(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected ICVSRemoteFolder createRemoteFolder(IProgressMonitor monitor) throws CVSException {
// The folder already exists so just return the handle
return folder;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.ShareProjectOperation#mapProjectToRemoteFolder(org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void mapProjectToRemoteFolder(ICVSRemoteFolder remote, IProgressMonitor monitor) throws TeamException {
// Map the project
@@ -74,8 +65,10 @@ public class ReconcileProjectOperation extends ShareProjectOperation {
monitor.done();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
+ /*
+ * @see
+ * org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse
+ * .core.runtime.IProgressMonitor)
*/
protected void reconcileSyncInfo(IProgressMonitor monitor) throws CVSException {
try {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java
index 617a6f8a5..d8b5a6d6b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteCompareOperation.java
@@ -166,9 +166,6 @@ public class RemoteCompareOperation extends RemoteOperation {
tree.setChildren(newChildren);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.client.listeners.RDiffSummaryListener.IFileDiffListener#fileDiff(java.lang.String, java.lang.String, java.lang.String)
- */
@Override
public void fileDiff(String remoteFilePath, String leftRevision, String rightRevision) {
try {
@@ -183,9 +180,6 @@ public class RemoteCompareOperation extends RemoteOperation {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.client.listeners.RDiffSummaryListener.IFileDiffListener#newFile(java.lang.String, java.lang.String)
- */
@Override
public void newFile(String remoteFilePath, String rightRevision) {
try {
@@ -195,9 +189,6 @@ public class RemoteCompareOperation extends RemoteOperation {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.client.listeners.RDiffSummaryListener.IFileDiffListener#deletedFile(java.lang.String)
- */
@Override
public void deletedFile(String remoteFilePath, String leftRevision) {
// The leftRevision may be null in which case the tag is used
@@ -208,9 +199,6 @@ public class RemoteCompareOperation extends RemoteOperation {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.client.listeners.RDiffSummaryListener.IFileDiffListener#directory(java.lang.String)
- */
@Override
public void directory(String remoteFolderPath) {
try {
@@ -324,9 +312,6 @@ public class RemoteCompareOperation extends RemoteOperation {
return getRemoteResources()[0];
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void execute(IProgressMonitor monitor) throws CVSException {
boolean fetchContents = CVSUIPlugin.getPlugin().getPluginPreferences().getBoolean(ICVSUIConstants.PREF_CONSIDER_CONTENTS);
@@ -384,9 +369,6 @@ public class RemoteCompareOperation extends RemoteOperation {
return new LocalOption[] {RDiff.SUMMARY, RDiff.makeTagOption(left), RDiff.makeTagOption(right)};
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
@Override
protected String getTaskName() {
return NLS.bind(CVSUIMessages.RemoteCompareOperation_0, (new Object[] {left.getName(), right.getName(), getRemoteResource().getRepositoryRelativePath()}));
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java
index 2c7ab5ea2..b9f01201a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RemoteLogOperation.java
@@ -217,9 +217,6 @@ public class RemoteLogOperation extends RepositoryLocationOperation {
entries.remove(remotePath);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.core.client.listeners.ILogEntryListener#addEntry(org.eclipse.team.internal.ccvs.core.client.listeners.LogEntry)
- */
@Override
public void handleLogEntryReceived(ILogEntry entry) {
ICVSRemoteFile file = entry.getRemoteFile();
@@ -241,9 +238,6 @@ public class RemoteLogOperation extends RepositoryLocationOperation {
this.entryCache = cache;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryLocationOperation#execute(org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation, org.eclipse.team.internal.ccvs.core.ICVSRemoteResource[], org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void execute(ICVSRepositoryLocation location, ICVSRemoteResource[] remoteResources, IProgressMonitor monitor) throws CVSException {
monitor.beginTask(NLS.bind(CVSUIMessages.RemoteLogOperation_0, new String[] { location.getHost() }), 100);
@@ -276,9 +270,6 @@ public class RemoteLogOperation extends RepositoryLocationOperation {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
@Override
protected String getTaskName() {
return CVSUIMessages.RemoteLogOperation_1;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java
index f2640da71..8fb53734a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ReplaceOperation.java
@@ -47,17 +47,11 @@ public class ReplaceOperation extends UpdateOperation {
super(part, mappings, new LocalOption[] { Update.IGNORE_LOCAL_CHANGES }, tag);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
@Override
protected String getTaskName() {
return CVSUIMessages.ReplaceOperation_taskName;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation#executeCommand(org.eclipse.team.internal.ccvs.core.client.Session, org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected IStatus executeCommand(
final Session session,
@@ -187,9 +181,6 @@ public class ReplaceOperation extends UpdateOperation {
return Arrays.asList(tags).contains(tag);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.UpdateOperation#getUpdateCommand()
- */
@Override
protected Update getUpdateCommand() {
// Use a special replace command that doesn't set back the timestamps
@@ -197,9 +188,6 @@ public class ReplaceOperation extends UpdateOperation {
return new Replace(prepDeletedFiles);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
- */
@Override
protected String getTaskName(CVSTeamProvider provider) {
return NLS.bind(CVSUIMessages.ReplaceOperation_0, new String[] { provider.getProject().getName() });
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryLocationOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryLocationOperation.java
index 4e2f00fde..450b29a3c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryLocationOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryLocationOperation.java
@@ -13,12 +13,7 @@
*******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.operations;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.team.internal.ccvs.core.*;
@@ -34,9 +29,7 @@ public abstract class RepositoryLocationOperation extends RemoteOperation {
super(part, remoteResources);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
public void execute(IProgressMonitor monitor) throws CVSException, InterruptedException {
Map table = getLocationMapping(getRemoteResources());
Set keySet = table.keySet();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java
index cb58477e2..12246e034 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/RepositoryProviderOperation.java
@@ -200,9 +200,6 @@ public abstract class RepositoryProviderOperation extends CVSOperation {
this.selectedMappings = selectedMappings;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void execute(IProgressMonitor monitor) throws CVSException, InterruptedException {
try {
@@ -447,18 +444,12 @@ public abstract class RepositoryProviderOperation extends CVSOperation {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#isKeepOneProgressServiceEntry()
- */
@Override
public boolean isKeepOneProgressServiceEntry() {
// Keep the last repository provider operation in the progress service
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#getGotoAction()
- */
@Override
protected IAction getGotoAction() {
return getShowConsoleAction();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShareProjectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShareProjectOperation.java
index ef21ca0be..eebe6925d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShareProjectOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShareProjectOperation.java
@@ -47,9 +47,6 @@ public class ShareProjectOperation extends CVSOperation {
this.location = location;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void execute(IProgressMonitor monitor) throws CVSException, InterruptedException {
try {
@@ -166,9 +163,6 @@ public class ShareProjectOperation extends CVSOperation {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
@Override
protected String getTaskName() {
return NLS.bind(CVSUIMessages.ShareProjectOperation_0, new String[] { project.getName(), moduleName });
@@ -181,9 +175,6 @@ public class ShareProjectOperation extends CVSOperation {
return project;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getShell()
- */
@Override
public Shell getShell() {
return shell;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java
index cc0fd1d93..40403b4df 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/ShowAnnotationOperation.java
@@ -69,9 +69,6 @@ public class ShowAnnotationOperation extends CVSOperation {
fBinary = binary;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void execute(IProgressMonitor monitor) throws CVSException, InterruptedException {
@@ -128,9 +125,6 @@ public class ShowAnnotationOperation extends CVSOperation {
return historyView;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
@Override
protected String getTaskName() {
return CVSUIMessages.ShowAnnotationOperation_taskName;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java
index 1ad362726..a2424a47c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/SingleCommandOperation.java
@@ -18,8 +18,8 @@ import org.eclipse.core.resources.mapping.ResourceMapping;
import org.eclipse.core.runtime.*;
import org.eclipse.team.internal.ccvs.core.*;
import org.eclipse.team.internal.ccvs.core.client.Command;
-import org.eclipse.team.internal.ccvs.core.client.Session;
import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
+import org.eclipse.team.internal.ccvs.core.client.Session;
import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.ui.IWorkbenchPart;
@@ -34,9 +34,7 @@ public abstract class SingleCommandOperation extends RepositoryProviderOperation
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#execute(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected void execute(CVSTeamProvider provider, IResource[] resources, boolean recurse, IProgressMonitor monitor) throws CVSException, InterruptedException {
monitor.beginTask(null, 100);
Session session = new Session(getRemoteLocation(provider), getLocalRoot(provider), true /* output to console */);
@@ -51,6 +49,7 @@ public abstract class SingleCommandOperation extends RepositoryProviderOperation
}
}
+ @Override
protected final ICVSResource[] getCVSArguments(IResource[] resources) {
return super.getCVSArguments(resources);
}
@@ -59,9 +58,7 @@ public abstract class SingleCommandOperation extends RepositoryProviderOperation
return getCVSArguments(resources);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#execute(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation.ICVSTraversal, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected void execute(CVSTeamProvider provider, ICVSTraversal entry, IProgressMonitor monitor) throws CVSException, InterruptedException {
try {
// TODO: This does not properly count the number of operations
@@ -91,6 +88,7 @@ public abstract class SingleCommandOperation extends RepositoryProviderOperation
*/
protected abstract IStatus executeCommand(Session session, CVSTeamProvider provider, ICVSResource[] resources, boolean recurse, IProgressMonitor monitor) throws CVSException, InterruptedException;
+ @Override
protected LocalOption[] getLocalOptions(boolean recurse) {
LocalOption[] result = options;
if (recurse) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java
index c1eea4d2f..8ac845dbd 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java
@@ -20,8 +20,9 @@ import java.util.Set;
import org.eclipse.core.runtime.*;
import org.eclipse.osgi.util.NLS;
import org.eclipse.team.internal.ccvs.core.*;
-import org.eclipse.team.internal.ccvs.core.client.*;
+import org.eclipse.team.internal.ccvs.core.client.Command;
import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
+import org.eclipse.team.internal.ccvs.core.client.RTag;
import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
import org.eclipse.team.internal.ccvs.ui.actions.TagAction;
import org.eclipse.team.internal.ccvs.ui.tags.TagSource;
@@ -36,9 +37,7 @@ public class TagInRepositoryOperation extends RemoteOperation implements ITagOpe
super(part, remoteResource);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
public void execute(IProgressMonitor monitor) throws CVSException, InterruptedException {
ICVSRemoteResource[] resources = getRemoteResources();
monitor.beginTask(null, 1000 * resources.length);
@@ -58,6 +57,7 @@ public class TagInRepositoryOperation extends RemoteOperation implements ITagOpe
/**
* Override to dislay the number of tag operations that succeeded
*/
+ @Override
protected String getErrorMessage(IStatus[] problems, int operationCount) {
if(operationCount == 1) {
return CVSUIMessages.TagInRepositoryAction_tagProblemsMessage;
@@ -70,16 +70,12 @@ public class TagInRepositoryOperation extends RemoteOperation implements ITagOpe
return (LocalOption[]) localOptions.toArray(new LocalOption[localOptions.size()]);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#getTag()
- */
+ @Override
public CVSTag getTag() {
return tag;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#setTag(org.eclipse.team.internal.ccvs.core.CVSTag)
- */
+ @Override
public void setTag(CVSTag tag) {
this.tag = tag;
}
@@ -88,9 +84,7 @@ public class TagInRepositoryOperation extends RemoteOperation implements ITagOpe
localOptions.add(option);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#moveTag()
- */
+ @Override
public void moveTag() {
addLocalOption(RTag.FORCE_REASSIGNMENT);
addLocalOption(RTag.CLEAR_FROM_REMOVED);
@@ -99,32 +93,28 @@ public class TagInRepositoryOperation extends RemoteOperation implements ITagOpe
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#recurse()
- */
+ @Override
public void doNotRecurse() {
addLocalOption(Command.DO_NOT_RECURSE);
}
+ @Override
protected String getTaskName() {
return CVSUIMessages.TagFromRepository_taskName;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#getTagSource()
- */
+ @Override
public TagSource getTagSource() {
return TagSource.create(getCVSResources());
}
- protected boolean isReportableError(IStatus status) {
+ @Override
+ protected boolean isReportableError(IStatus status) {
return super.isReportableError(status)
|| status.getCode() == CVSStatus.TAG_ALREADY_EXISTS;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#isEmpty()
- */
+ @Override
public boolean isEmpty() {
return getCVSResources().length == 0;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java
index 64e91a3f6..b9ae57e79 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java
@@ -51,9 +51,6 @@ public class TagOperation extends RepositoryProviderOperation implements ITagOpe
this.tag = tag;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#execute(org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void execute(CVSTeamProvider provider, IResource[] resources, boolean recurse, IProgressMonitor monitor) throws CVSException, InterruptedException {
IStatus status = tag(provider, resources, recurse, monitor);
@@ -121,17 +118,11 @@ public class TagOperation extends RepositoryProviderOperation implements ITagOpe
localOptions.add(option);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#moveTag()
- */
@Override
public void moveTag() {
addLocalOption(Tag.FORCE_REASSIGNMENT);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#recurse()
- */
@Override
public void doNotRecurse() {
addLocalOption(Command.DO_NOT_RECURSE);
@@ -142,17 +133,11 @@ public class TagOperation extends RepositoryProviderOperation implements ITagOpe
return CVSUIMessages.TagFromWorkspace_taskName;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
- */
@Override
protected String getTaskName(CVSTeamProvider provider) {
return NLS.bind(CVSUIMessages.TagOperation_0, new String[] { provider.getProject().getName() });
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void execute(IProgressMonitor monitor) throws CVSException, InterruptedException {
super.execute(monitor);
@@ -174,9 +159,6 @@ public class TagOperation extends RepositoryProviderOperation implements ITagOpe
return cvsResources;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#getTagSource()
- */
@Override
public TagSource getTagSource() {
return TagSource.create(getProjects());
@@ -198,9 +180,6 @@ public class TagOperation extends RepositoryProviderOperation implements ITagOpe
|| status.getCode() == CVSStatus.TAG_ALREADY_EXISTS;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.ITagOperation#isEmpty()
- */
@Override
public boolean isEmpty() {
return getSelectedMappings().length == 0;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java
index c8e5940b0..16e26ef1c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java
@@ -41,9 +41,6 @@ public class UpdateOnlyMergableOperation extends SingleCommandOperation {
this.project = project;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation#executeCommand(org.eclipse.team.internal.ccvs.core.client.Session, org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected IStatus executeCommand(Session session, CVSTeamProvider provider, ICVSResource[] resources, boolean recurse, IProgressMonitor monitor) throws CVSException, InterruptedException {
UpdateMergableOnly update = new UpdateMergableOnly();
@@ -61,17 +58,11 @@ public class UpdateOnlyMergableOperation extends SingleCommandOperation {
return status;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName()
- */
@Override
protected String getTaskName() {
return CVSUIMessages.UpdateOnlyMergeable_taskName;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
- */
@Override
protected String getTaskName(CVSTeamProvider provider) {
return NLS.bind(CVSUIMessages.UpdateOperation_0, new String[] { provider.getProject().getName() });
@@ -85,9 +76,6 @@ public class UpdateOnlyMergableOperation extends SingleCommandOperation {
return skippedFiles.toArray(new IFile[skippedFiles.size()]);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.UpdateOperation#getResourceMappingContext()
- */
@Override
protected ResourceMappingContext getResourceMappingContext() {
return new SingleProjectSubscriberContext(CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber(), false, project);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java
index abb1e78d9..d84d546f2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOperation.java
@@ -60,9 +60,6 @@ public class UpdateOperation extends SingleCommandOperation {
this.tag = tag;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation#executeCommand(org.eclipse.team.internal.ccvs.core.client.Session, org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected IStatus executeCommand(
Session session,
@@ -105,17 +102,11 @@ public class UpdateOperation extends SingleCommandOperation {
return Command.UPDATE;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getTaskName()
- */
@Override
protected String getTaskName() {
return CVSUIMessages.UpdateOperation_taskName; //;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
- */
@Override
protected String getTaskName(CVSTeamProvider provider) {
return NLS.bind(CVSUIMessages.UpdateOperation_0, new String[] { provider.getProject().getName() });
@@ -138,17 +129,11 @@ public class UpdateOperation extends SingleCommandOperation {
|| status.getCode() == CVSStatus.RESPONSE_HANDLING_FAILURE;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#getErrorMessage(org.eclipse.core.runtime.IStatus[], int)
- */
@Override
protected String getErrorMessage(IStatus[] failures, int totalOperations) {
return CVSUIMessages.UpdateAction_update;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getResourceMappingContext()
- */
@Override
protected ResourceMappingContext getResourceMappingContext() {
return SubscriberResourceMappingContext.createContext(CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber());
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java
index 5016ded25..f8d68bf06 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/CVSRepositoryPropertiesPage.java
@@ -446,9 +446,6 @@ public class CVSRepositoryPropertiesPage extends PropertyPage {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
- */
@Override
protected void performDefaults() {
super.performDefaults();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/NewDateTagAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/NewDateTagAction.java
index 066476f6a..70e078f75 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/NewDateTagAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/NewDateTagAction.java
@@ -29,9 +29,7 @@ import org.eclipse.team.internal.ccvs.ui.DateTagDialog;
*/
public class NewDateTagAction extends CVSRepoViewAction {
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#execute(org.eclipse.jface.action.IAction)
- */
+ @Override
protected void execute(IAction action) throws InvocationTargetException, InterruptedException {
ICVSRepositoryLocation[] locations = getSelectedRepositoryLocations();
if (locations.length != 1) return;
@@ -49,9 +47,7 @@ public class NewDateTagAction extends CVSRepoViewAction {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.TeamAction#isEnabled()
- */
+ @Override
public boolean isEnabled() {
ICVSRepositoryLocation[] locations = getSelectedRepositoryLocations();
if (locations.length != 1) return false;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesSortingActionGroup.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesSortingActionGroup.java
index 37ac9b07b..a51ba772c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesSortingActionGroup.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoriesSortingActionGroup.java
@@ -54,6 +54,7 @@ public class RepositoriesSortingActionGroup extends ActionGroup {
labelSortingAction = new Action(
CVSUIMessages.RepositoriesSortingActionGroup_label,
Action.AS_RADIO_BUTTON) {
+ @Override
public void run() {
if (labelSortingAction.isChecked())
setComparatorOrder(RepositoryComparator.ORDER_BY_LABEL);
@@ -62,6 +63,7 @@ public class RepositoriesSortingActionGroup extends ActionGroup {
locationSortingAction = new Action(
CVSUIMessages.RepositoriesSortingActionGroup_location,
Action.AS_RADIO_BUTTON) {
+ @Override
public void run() {
if (locationSortingAction.isChecked())
setComparatorOrder(RepositoryComparator.ORDER_BY_LOCATION);
@@ -70,6 +72,7 @@ public class RepositoriesSortingActionGroup extends ActionGroup {
hostSortingAction = new Action(
CVSUIMessages.RepositoriesSortingActionGroup_host,
Action.AS_RADIO_BUTTON) {
+ @Override
public void run() {
if (hostSortingAction.isChecked())
setComparatorOrder(RepositoryComparator.ORDER_BY_HOST);
@@ -78,6 +81,7 @@ public class RepositoriesSortingActionGroup extends ActionGroup {
reverseSortingOrderAction = new Action(
CVSUIMessages.RepositoriesSortingActionGroup_descending,
Action.AS_CHECK_BOX) {
+ @Override
public void run() {
reverseSortingOrder();
}
@@ -104,11 +108,7 @@ public class RepositoriesSortingActionGroup extends ActionGroup {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars)
- */
+ @Override
public void fillActionBars(IActionBars actionBars) {
IMenuManager menuManager = actionBars.getMenuManager();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java
index c44167d61..8abe42e71 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RepositoryEncodingPropertyPage.java
@@ -64,33 +64,25 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro
this.defaults = defaults;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
- */
+ @Override
public void addPropertyChangeListener(IPropertyChangeListener listener) {
// TODO Auto-generated method stub
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
- */
+ @Override
public void removePropertyChangeListener(IPropertyChangeListener listener) {
// TODO Auto-generated method stub
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#firePropertyChangeEvent(java.lang.String, java.lang.Object, java.lang.Object)
- */
+ @Override
public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
// TODO Auto-generated method stub
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#contains(java.lang.String)
- */
+ @Override
public boolean contains(String name) {
try {
String[] keys = preferences.keys();
@@ -108,16 +100,12 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#getBoolean(java.lang.String)
- */
+ @Override
public boolean getBoolean(String name) {
return preferences.getBoolean(name, getDefaultBoolean(name));
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultBoolean(java.lang.String)
- */
+ @Override
public boolean getDefaultBoolean(String name) {
if (defaults != null) {
return defaults.getBoolean(name, false);
@@ -125,9 +113,7 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultDouble(java.lang.String)
- */
+ @Override
public double getDefaultDouble(String name) {
if (defaults != null) {
return defaults.getDouble(name, 0);
@@ -135,9 +121,7 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro
return 0;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultFloat(java.lang.String)
- */
+ @Override
public float getDefaultFloat(String name) {
if (defaults != null) {
return defaults.getFloat(name, 0);
@@ -145,9 +129,7 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro
return 0;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultInt(java.lang.String)
- */
+ @Override
public int getDefaultInt(String name) {
if (defaults != null) {
return defaults.getInt(name, 0);
@@ -155,9 +137,7 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro
return 0;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultLong(java.lang.String)
- */
+ @Override
public long getDefaultLong(String name) {
if (defaults != null) {
return defaults.getLong(name, 0);
@@ -165,9 +145,7 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro
return 0;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#getDefaultString(java.lang.String)
- */
+ @Override
public String getDefaultString(String name) {
if (defaults != null) {
return defaults.get(name, null);
@@ -175,164 +153,120 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#getDouble(java.lang.String)
- */
+ @Override
public double getDouble(String name) {
return preferences.getDouble(name, getDefaultDouble(name));
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#getFloat(java.lang.String)
- */
+ @Override
public float getFloat(String name) {
return preferences.getFloat(name, getDefaultFloat(name));
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#getInt(java.lang.String)
- */
+ @Override
public int getInt(String name) {
return preferences.getInt(name, getDefaultInt(name));
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#getLong(java.lang.String)
- */
+ @Override
public long getLong(String name) {
return preferences.getLong(name, getDefaultLong(name));
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#getString(java.lang.String)
- */
+ @Override
public String getString(String name) {
return preferences.get(name, getDefaultString(name));
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#isDefault(java.lang.String)
- */
+ @Override
public boolean isDefault(String name) {
return !contains(name);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#needsSaving()
- */
+ @Override
public boolean needsSaving() {
return dirty;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#putValue(java.lang.String, java.lang.String)
- */
+ @Override
public void putValue(String name, String value) {
preferences.put(name, value);
dirty = true;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, double)
- */
+ @Override
public void setDefault(String name, double value) {
// Defaults cannot be set this way
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, float)
- */
+ @Override
public void setDefault(String name, float value) {
// Defaults cannot be set this way
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, int)
- */
+ @Override
public void setDefault(String name, int value) {
// Defaults cannot be set this way
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, long)
- */
+ @Override
public void setDefault(String name, long value) {
// Defaults cannot be set this way
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, java.lang.String)
- */
+ @Override
public void setDefault(String name, String defaultObject) {
// Defaults cannot be set this way
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#setDefault(java.lang.String, boolean)
- */
+ @Override
public void setDefault(String name, boolean value) {
// Defaults cannot be set this way
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#setToDefault(java.lang.String)
- */
+ @Override
public void setToDefault(String name) {
preferences.remove(name);
dirty = true;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, double)
- */
+ @Override
public void setValue(String name, double value) {
preferences.putDouble(name, value);
dirty = true;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, float)
- */
+ @Override
public void setValue(String name, float value) {
preferences.putFloat(name, value);
dirty = true;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, int)
- */
+ @Override
public void setValue(String name, int value) {
preferences.putInt(name, value);
dirty = true;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, long)
- */
+ @Override
public void setValue(String name, long value) {
preferences.putLong(name, value);
dirty = true;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, java.lang.String)
- */
+ @Override
public void setValue(String name, String value) {
putValue(name, value);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferenceStore#setValue(java.lang.String, boolean)
- */
+ @Override
public void setValue(String name, boolean value) {
preferences.putBoolean(name, value);
dirty = true;
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
- */
+ @Override
protected Control createContents(Composite parent) {
initialize();
@@ -351,11 +285,7 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro
Link pageLink = new Link(composite, SWT.LEFT | SWT.WRAP);
pageLink.addSelectionListener(new SelectionAdapter() {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
- */
+ @Override
public void widgetSelected(SelectionEvent e) {
PreferenceDialog dialog = PreferencesUtil
@@ -394,9 +324,7 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
- */
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty() == FieldEditor.IS_VALID) {
setValid(((Boolean)event.getNewValue()).booleanValue());
@@ -407,9 +335,7 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.IPreferencePage#performOk()
- */
+ @Override
public boolean performOk() {
if (!valueChanged) {
// See bug 137073
@@ -430,9 +356,7 @@ public class RepositoryEncodingPropertyPage extends PropertyPage implements IPro
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
- */
+ @Override
protected void performDefaults() {
super.performDefaults();
encoding.loadDefault();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetActionGroup.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetActionGroup.java
index f3d5bd439..d8ed0894d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetActionGroup.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetActionGroup.java
@@ -24,14 +24,13 @@ public class CVSChangeSetActionGroup extends SynchronizePageActionGroup {
private OpenChangeSetAction openCommitSet;
+ @Override
public void initialize(ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
openCommitSet = new OpenChangeSetAction(configuration);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager)
- */
+ @Override
public void fillContextMenu(IMenuManager menu) {
ISynchronizeParticipant participant = getConfiguration().getParticipant();
if (participant instanceof IChangeSetProvider) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCapability.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCapability.java
index b34e74490..c115f6a5c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCapability.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCapability.java
@@ -17,42 +17,33 @@ import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
import org.eclipse.team.internal.ui.synchronize.ChangeSetCapability;
import org.eclipse.team.internal.ui.synchronize.SyncInfoSetChangeSetCollector;
-import org.eclipse.team.ui.synchronize.*;
+import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
+import org.eclipse.team.ui.synchronize.SynchronizePageActionGroup;
public class CVSChangeSetCapability extends ChangeSetCapability {
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#supportsCheckedInChangeSets()
- */
+ @Override
public boolean supportsCheckedInChangeSets() {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#supportsActiveChangeSets()
- */
+ @Override
public boolean supportsActiveChangeSets() {
return getActiveChangeSetManager() != null;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#createCheckedInChangeSetCollector(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
- */
+ @Override
public SyncInfoSetChangeSetCollector createSyncInfoSetChangeSetCollector(ISynchronizePageConfiguration configuration) {
return new CVSChangeSetCollector(configuration);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#getActionGroup()
- */
+ @Override
public SynchronizePageActionGroup getActionGroup() {
return new CVSChangeSetActionGroup();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#enableChangeSetsByDefault()
- */
+ @Override
public boolean enableChangeSetsByDefault() {
return CVSUIPlugin.getPlugin().getPreferenceStore().getBoolean(ICVSUIConstants.PREF_COMMIT_SET_DEFAULT_ENABLEMENT);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java
index c24bed962..b2a1537c6 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSChangeSetCollector.java
@@ -87,25 +87,16 @@ public class CVSChangeSetCollector extends SyncInfoSetChangeSetCollector impleme
public DefaultCheckedInChangeSet(String name) {
setName(name);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.CheckedInChangeSet#getAuthor()
- */
@Override
public String getAuthor() {
return ""; //$NON-NLS-1$
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.CheckedInChangeSet#getDate()
- */
@Override
public Date getDate() {
return date;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.ChangeSet#getComment()
- */
@Override
public String getComment() {
return ""; //$NON-NLS-1$
@@ -129,25 +120,16 @@ public class CVSChangeSetCollector extends SyncInfoSetChangeSetCollector impleme
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.CheckedInChangeSet#getAuthor()
- */
@Override
public String getAuthor() {
return entry.getAuthor();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.CheckedInChangeSet#getDate()
- */
@Override
public Date getDate() {
return entry.getDate();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.ChangeSet#getComment()
- */
@Override
public String getComment() {
return entry.getComment();
@@ -191,9 +173,6 @@ public class CVSChangeSetCollector extends SyncInfoSetChangeSetCollector impleme
return logEntryHandler;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.core.subscribers.SyncInfoSetChangeSetCollector#add(org.eclipse.team.core.synchronize.SyncInfo[])
- */
@Override
protected void add(SyncInfo[] infos) {
LogEntryCacheUpdateHandler handler = getLogEntryHandler();
@@ -205,9 +184,6 @@ public class CVSChangeSetCollector extends SyncInfoSetChangeSetCollector impleme
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SyncInfoSetChangeSetCollector#reset(org.eclipse.team.core.synchronize.SyncInfoSet)
- */
@Override
public void reset(SyncInfoSet seedSet) {
// Notify that handler to stop any fetches in progress
@@ -218,9 +194,6 @@ public class CVSChangeSetCollector extends SyncInfoSetChangeSetCollector impleme
super.reset(seedSet);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.views.HierarchicalModelProvider#dispose()
- */
@Override
public void dispose() {
// No longer listen for log entry changes
@@ -425,9 +398,6 @@ public class CVSChangeSetCollector extends SyncInfoSetChangeSetCollector impleme
return !remote.equals(remoteResource);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SyncInfoSetChangeSetCollector#waitUntilDone(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void waitUntilDone(IProgressMonitor monitor) {
super.waitUntilDone(monitor);
@@ -447,9 +417,6 @@ public class CVSChangeSetCollector extends SyncInfoSetChangeSetCollector impleme
monitor.worked(1);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.LogEntryCacheUpdateHandler.ILogsFetchedListener#logEntriesFetched(org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void logEntriesFetched(SyncInfoSet set, LogEntryCache logEntryCache, IProgressMonitor monitor) {
if (disposed) return;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipant.java
index 624e0f435..8050fc515 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipant.java
@@ -39,9 +39,6 @@ public class CVSParticipant extends SubscriberParticipant implements IChangeSetP
private CVSChangeSetCapability capability;
- /* (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);
@@ -50,9 +47,6 @@ public class CVSParticipant extends SubscriberParticipant implements IChangeSetP
configuration.addLabelDecorator(labelDecorator);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#updateLabels(org.eclipse.team.ui.synchronize.ISynchronizeModelElement, org.eclipse.compare.CompareConfiguration, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void prepareCompareInput(ISynchronizeModelElement element, CompareConfiguration config, IProgressMonitor monitor) throws TeamException {
monitor.beginTask(null, 100);
@@ -143,9 +137,6 @@ public class CVSParticipant extends SubscriberParticipant implements IChangeSetP
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#getPreferencePages()
- */
@Override
public PreferencePage[] getPreferencePages() {
return addCVSPreferencePages(super.getPreferencePages());
@@ -161,9 +152,6 @@ public class CVSParticipant extends SubscriberParticipant implements IChangeSetP
return pages;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#getChangeSetCapability()
- */
@Override
public ChangeSetCapability getChangeSetCapability() {
if (capability == null) {
@@ -180,9 +168,6 @@ public class CVSParticipant extends SubscriberParticipant implements IChangeSetP
return new CVSChangeSetCapability();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#isViewerContributionsSupported()
- */
@Override
protected boolean isViewerContributionsSupported() {
return true;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipantAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipantAction.java
index 420596713..7a96a5fe2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipantAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipantAction.java
@@ -14,9 +14,7 @@
package org.eclipse.team.internal.ccvs.ui.subscriber;
import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
-import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
-import org.eclipse.team.internal.ccvs.ui.Policy;
+import org.eclipse.team.internal.ccvs.ui.*;
import org.eclipse.team.internal.ui.Utils;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
import org.eclipse.team.ui.synchronize.SynchronizeModelAction;
@@ -51,14 +49,13 @@ public abstract class CVSParticipantAction extends SynchronizeModelAction {
return name.substring(lastDot + 1) + "."; //$NON-NLS-1$
}
+ @Override
protected boolean needsToSaveDirtyEditors() {
int option = CVSUIPlugin.getPlugin().getPreferenceStore().getInt(ICVSUIConstants.PREF_SAVE_DIRTY_EDITORS);
return option != ICVSUIConstants.OPTION_NEVER;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#confirmSaveOfDirtyEditor()
- */
+ @Override
protected boolean confirmSaveOfDirtyEditor() {
int option = CVSUIPlugin.getPlugin().getPreferenceStore().getInt(ICVSUIConstants.PREF_SAVE_DIRTY_EDITORS);
return option == ICVSUIConstants.OPTION_PROMPT;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberOperation.java
index d3c0aa738..588c34f9a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberOperation.java
@@ -42,9 +42,6 @@ public abstract class CVSSubscriberOperation extends SynchronizeModelOperation {
super(configuration, elements);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
// Divide the sync info by project
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CommitSetDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CommitSetDialog.java
index 01fadeb5d..ad35c092f 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CommitSetDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CommitSetDialog.java
@@ -70,9 +70,6 @@ public class CommitSetDialog extends TitleAreaDialog {
commitCommentArea.setProject(files[0].getProject());
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.TitleAreaDialog#createContents(org.eclipse.swt.widgets.Composite)
- */
@Override
protected Control createContents(Composite parent) {
Control contents = super.createContents(parent);
@@ -81,9 +78,6 @@ public class CommitSetDialog extends TitleAreaDialog {
return contents;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
- */
@Override
protected Control createDialogArea(Composite parent) {
Composite parentComposite = (Composite) super.createDialogArea(parent);
@@ -134,9 +128,6 @@ public class CommitSetDialog extends TitleAreaDialog {
return composite;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.window.Window#getInitialSize()
- */
@Override
protected Point getInitialSize() {
final Point size= super.getInitialSize();
@@ -260,9 +251,6 @@ public class CommitSetDialog extends TitleAreaDialog {
return commitCommentArea.hasCommitTemplate();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#okPressed()
- */
@Override
protected void okPressed() {
String title = null;
@@ -293,9 +281,6 @@ public class CommitSetDialog extends TitleAreaDialog {
return label;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#createButtonBar(org.eclipse.swt.widgets.Composite)
- */
@Override
protected Control createButtonBar(Composite parent) {
Control control = super.createButtonBar(parent);
@@ -303,9 +288,6 @@ public class CommitSetDialog extends TitleAreaDialog {
return control;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
- */
@Override
protected void configureShell(Shell shell) {
super.configureShell(shell);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java
index 98253f703..9faaf017d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java
@@ -18,7 +18,7 @@ import java.util.Arrays;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.preferences.*;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
import org.eclipse.osgi.util.NLS;
@@ -44,6 +44,7 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
* Actions for the compare particpant's toolbar
*/
public class CompareParticipantActionContribution extends SynchronizePageActionGroup {
+ @Override
public void initialize(ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
@@ -68,6 +69,7 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
private SyncInfoFilter contentComparison = new SyncInfoFilter() {
private SyncInfoFilter contentCompare = new SyncInfoFilter.ContentComparisonSyncInfoFilter();
+ @Override
public boolean select(SyncInfo info, IProgressMonitor monitor) {
// Want to select infos whose contents do not match
return !contentCompare.select(info, monitor);
@@ -78,6 +80,7 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
final SyncInfoFilter regexFilter = createRegexFilter();
if (isConsiderContents() && regexFilter != null) {
return new SyncInfoFilter() {
+ @Override
public boolean select(SyncInfo info, IProgressMonitor monitor) {
return contentComparison.select(info, monitor)
&& !regexFilter.select(info, monitor);
@@ -85,12 +88,14 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
};
} else if (isConsiderContents()) {
return new SyncInfoFilter() {
+ @Override
public boolean select(SyncInfo info, IProgressMonitor monitor) {
return contentComparison.select(info, monitor);
}
};
} else if (regexFilter != null) {
return new SyncInfoFilter() {
+ @Override
public boolean select(SyncInfo info, IProgressMonitor monitor) {
// want to select infos which contain at least one unmatched difference
return !regexFilter.select(info, monitor);
@@ -118,9 +123,7 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
setSubscriber(subscriber);
}
- /* (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);
setSyncInfoFilter(createSyncInfoFilter());
@@ -135,9 +138,7 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
((IEclipsePreferences) CVSUIPlugin.getPlugin().getInstancePreferences().node("")).addPreferenceChangeListener(this); //$NON-NLS-1$
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#getName()
- */
+ @Override
public String getName() {
return NLS.bind(CVSUIMessages.CompareParticipant_0, new String[] { getSubscriber().getName(), Utils.convertSelection(getSubscriber().roots()) });
}
@@ -193,9 +194,7 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
return (CVSCompareSubscriber)getSubscriber();
}
- /* (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.addMenuGroup(
@@ -207,18 +206,14 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
configuration.addActionContribution(new CompareParticipantActionContribution());
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#dispose()
- */
+ @Override
public void dispose() {
super.dispose();
((IEclipsePreferences) CVSUIPlugin.getPlugin().getInstancePreferences().node("")).removePreferenceChangeListener(this); //$NON-NLS-1$
getCVSCompareSubscriber().dispose();
}
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
- */
+ @Override
public void preferenceChange(PreferenceChangeEvent event) {
if (event.getKey().equals(ICVSUIConstants.PREF_CONSIDER_CONTENTS) || event.getKey().equals(ICVSUIConstants.PREF_SYNCVIEW_REGEX_FILTER_PATTERN)) {
SyncInfoFilter filter = createSyncInfoFilter();
@@ -230,32 +225,25 @@ public class CompareParticipant extends CVSParticipant implements IPreferenceCha
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#getLongTaskName()
- */
+ @Override
protected String getLongTaskName() {
return getName();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#getShortTaskName()
- */
+ @Override
protected String getShortTaskName() {
return CVSUIMessages.Participant_comparing;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSParticipant#createChangeSetCapability()
- */
- protected CVSChangeSetCapability createChangeSetCapability() {
+ @Override
+ protected CVSChangeSetCapability createChangeSetCapability() {
return new CVSChangeSetCapability() {
- public ActiveChangeSetManager getActiveChangeSetManager() {
+ @Override
+ public ActiveChangeSetManager getActiveChangeSetManager() {
return CVSUIPlugin.getPlugin().getChangeSetManager();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#enableActiveChangeSetsFor(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
- */
- public boolean enableActiveChangeSetsFor(ISynchronizePageConfiguration configuration) {
+ @Override
+ public boolean enableActiveChangeSetsFor(ISynchronizePageConfiguration configuration) {
return super.enableActiveChangeSetsFor(configuration) ||
configuration.getComparisonType() == ISynchronizePageConfiguration.TWO_WAY;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertAction.java
index 7945f881e..39c1556e3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertAction.java
@@ -26,9 +26,7 @@ public class CompareRevertAction extends CVSParticipantAction {
super(configuration);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.SubscriberAction#getSubscriberOperation(org.eclipse.compare.structuremergeviewer.IDiffElement[])
- */
+ @Override
protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
return new CompareRevertOperation(configuration, elements);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertOperation.java
index 3df7da7a6..30f8a8376 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareRevertOperation.java
@@ -13,10 +13,7 @@
*******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.subscriber;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import org.eclipse.compare.structuremergeviewer.IDiffElement;
import org.eclipse.core.resources.IProject;
@@ -36,18 +33,14 @@ public class CompareRevertOperation extends CVSSubscriberOperation {
super(configuration, elements);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#getJobName()
- */
+ @Override
protected String getJobName() {
SyncInfoSet syncSet = getSyncInfoSet();
return NLS.bind(CVSUIMessages.CompareRevertAction_0, new String[] { Integer.valueOf(syncSet.size()).toString() });
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#run(org.eclipse.team.core.subscribers.MutableSyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected void runWithProjectRule(IProject project, SyncInfoSet syncSet, IProgressMonitor monitor) throws TeamException {
SyncInfo[] changed = syncSet.getSyncInfos();
if (changed.length == 0) return;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedAction.java
index b514e0fa7..f4a584394 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedAction.java
@@ -15,8 +15,8 @@ package org.eclipse.team.internal.ccvs.ui.subscriber;
import org.eclipse.compare.structuremergeviewer.IDiffElement;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter;
-import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoDirectionFilter;
+import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
import org.eclipse.team.ui.synchronize.SynchronizeModelOperation;
@@ -26,16 +26,12 @@ public class ConfirmMergedAction extends CVSParticipantAction {
super(configuration);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter()
- */
+ @Override
protected FastSyncInfoFilter getSyncInfoFilter() {
return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING});
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.SubscriberAction#getSubscriberOperation(org.eclipse.compare.structuremergeviewer.IDiffElement[])
- */
+ @Override
protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
return new ConfirmMergedOperation(configuration, elements);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedOperation.java
index 10be74410..57aba8f18 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/ConfirmMergedOperation.java
@@ -21,11 +21,11 @@ import org.eclipse.osgi.util.NLS;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.core.synchronize.SyncInfoSet;
-import org.eclipse.team.internal.ccvs.core.CVSException;
-import org.eclipse.team.internal.ccvs.core.CVSSyncInfo;
-import org.eclipse.team.internal.ccvs.core.ICVSFolder;
+import org.eclipse.team.internal.ccvs.core.*;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
-import org.eclipse.team.internal.ccvs.ui.*;
+import org.eclipse.team.internal.ccvs.ui.CVSUIMessages;
+import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
+import org.eclipse.team.internal.ccvs.ui.Policy;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
/**
@@ -38,17 +38,13 @@ public class ConfirmMergedOperation extends CVSSubscriberOperation {
super(configuration, elements);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.TeamOperation#getJobName()
- */
+ @Override
protected String getJobName() {
SyncInfoSet syncSet = getSyncInfoSet();
return NLS.bind(CVSUIMessages.SubscriberConfirmMergedAction_jobName, new String[] { Integer.valueOf(syncSet.size()).toString() });
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberOperation#run(org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected void runWithProjectRule(IProject project, SyncInfoSet syncSet, IProgressMonitor monitor) throws CVSException {
SyncInfo[] syncResources = syncSet.getSyncInfos();
monitor.beginTask(null, 100 * syncResources.length);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CreatePatchAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CreatePatchAction.java
index 0f6cff4da..7a03054b7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CreatePatchAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CreatePatchAction.java
@@ -27,17 +27,17 @@ public class CreatePatchAction extends CVSParticipantAction {
super(configuration);
}
+ @Override
protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter()
- */
+ @Override
protected FastSyncInfoFilter getSyncInfoFilter() {
return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING, SyncInfo.OUTGOING});
}
+ @Override
public void runOperation() {
final SyncInfoSet set = getSyncInfoSet();
GenerateDiffFileWizard.run(getConfiguration().getSite().getPart(), set.getResources(), false);
@@ -60,7 +60,8 @@ public class CreatePatchAction extends CVSParticipantAction {
return filtered;
}
- protected String getBundleKeyPrefix() {
+ @Override
+ protected String getBundleKeyPrefix() {
return "GenerateDiffFileAction."; //$NON-NLS-1$
}
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CreatePatchWizardParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CreatePatchWizardParticipant.java
index 110cb6cf2..91bbf51c2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CreatePatchWizardParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CreatePatchWizardParticipant.java
@@ -27,9 +27,7 @@ public class CreatePatchWizardParticipant extends WorkspaceSynchronizeParticipan
fWizard= wizard;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.WorkspaceSynchronizeParticipant#initializeConfiguration(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
- */
+ @Override
protected void initializeConfiguration( ISynchronizePageConfiguration configuration) {
super.initializeConfiguration(configuration);
configuration.setProperty(ISynchronizePageConfiguration.P_TOOLBAR_MENU, new String[] {ISynchronizePageConfiguration.LAYOUT_GROUP});
@@ -38,9 +36,8 @@ public class CreatePatchWizardParticipant extends WorkspaceSynchronizeParticipan
configuration.setSupportedModes(ISynchronizePageConfiguration.OUTGOING_MODE);
configuration.setMode(ISynchronizePageConfiguration.OUTGOING_MODE);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#doesSupportSynchronize()
- */
+
+ @Override
public boolean doesSupportSynchronize() {
return false;
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/LogEntryCacheUpdateHandler.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/LogEntryCacheUpdateHandler.java
index 54e64690d..93eb373a0 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/LogEntryCacheUpdateHandler.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/LogEntryCacheUpdateHandler.java
@@ -135,17 +135,11 @@ public class LogEntryCacheUpdateHandler extends BackgroundEventHandler {
super(subscriber);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.core.subscribers.SubscriberResourceCollector#remove(org.eclipse.core.resources.IResource)
- */
@Override
protected void remove(IResource resource) {
queueEvent(new ResourceEvent(resource, REMOVAL, IResource.DEPTH_INFINITE), false /* do not put in on the front of the queue*/);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.core.subscribers.SubscriberResourceCollector#change(org.eclipse.core.resources.IResource, int)
- */
@Override
protected void change(IResource resource, int depth) {
queueEvent(new ResourceEvent(resource, CHANGE, depth), false /* do not put in on the front of the queue*/);
@@ -209,17 +203,11 @@ public class LogEntryCacheUpdateHandler extends BackgroundEventHandler {
this.listener = listener;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.core.BackgroundEventHandler#getJobFamiliy()
- */
@Override
protected Object getJobFamiliy() {
return ISynchronizeManager.FAMILY_SYNCHRONIZE_OPERATION;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.core.BackgroundEventHandler#createEventHandlingJob()
- */
@Override
protected void createEventHandlingJob() {
super.createEventHandlingJob();
@@ -228,9 +216,6 @@ public class LogEntryCacheUpdateHandler extends BackgroundEventHandler {
job.setUser(false);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.core.BackgroundEventHandler#processEvent(org.eclipse.team.internal.core.BackgroundEventHandler.Event, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void processEvent(Event event, IProgressMonitor monitor) throws CoreException {
Policy.checkCanceled(monitor);
@@ -248,9 +233,6 @@ public class LogEntryCacheUpdateHandler extends BackgroundEventHandler {
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.core.BackgroundEventHandler#doDispatchEvents(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected boolean doDispatchEvents(IProgressMonitor monitor) throws TeamException {
Policy.checkCanceled(monitor);
@@ -289,9 +271,6 @@ public class LogEntryCacheUpdateHandler extends BackgroundEventHandler {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.core.BackgroundEventHandler#shutdown()
- */
@Override
public void shutdown() {
super.shutdown();
@@ -428,9 +407,6 @@ public class LogEntryCacheUpdateHandler extends BackgroundEventHandler {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.core.BackgroundEventHandler#queueEvent(org.eclipse.team.internal.core.BackgroundEventHandler.Event, boolean)
- */
@Override
protected void queueEvent(Event event, boolean front) {
// Override to snure that queues by this handler are serialized
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java
index 8879c47f5..e688683da 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java
@@ -100,9 +100,6 @@ public class MergeSynchronizeParticipant extends CVSParticipant {
setSubscriber(subscriber);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.sync.SubscriberParticipant#setSubscriber(org.eclipse.team.core.subscribers.TeamSubscriber)
- */
@Override
public void setSubscriber(Subscriber subscriber) {
super.setSubscriber(subscriber);
@@ -116,9 +113,6 @@ public class MergeSynchronizeParticipant extends CVSParticipant {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#init(org.eclipse.ui.IMemento)
- */
@Override
public void init(String secondayId, IMemento memento) throws PartInitException {
super.init(secondayId, memento);
@@ -137,9 +131,6 @@ public class MergeSynchronizeParticipant extends CVSParticipant {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#init(org.eclipse.ui.IMemento)
- */
@Override
public void saveState(IMemento memento) {
super.saveState(memento);
@@ -147,9 +138,6 @@ public class MergeSynchronizeParticipant extends CVSParticipant {
write(s, memento);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.sync.AbstractSynchronizeParticipant#dispose()
- */
@Override
public void dispose() {
super.dispose();
@@ -160,9 +148,6 @@ public class MergeSynchronizeParticipant extends CVSParticipant {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#getName()
- */
@Override
public String getName() {
return NLS.bind(CVSUIMessages.CompareParticipant_0, new String[] { ((CVSMergeSubscriber)getSubscriber()).getName(), Utils.convertSelection(getSubscriber().roots()) });
@@ -257,9 +242,6 @@ public class MergeSynchronizeParticipant extends CVSParticipant {
((CVSMergeSubscriber)getSubscriber()).cancel();
}
- /* (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);
@@ -275,17 +257,11 @@ public class MergeSynchronizeParticipant extends CVSParticipant {
configuration.addActionContribution(new MergeParticipantActionContribution());
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#getLongTaskName()
- */
@Override
protected String getLongTaskName() {
return getName();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#getShortTaskName()
- */
@Override
protected String getShortTaskName() {
return CVSUIMessages.Participant_merging;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
index 87ca96939..c0502eded 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
@@ -16,9 +16,9 @@ package org.eclipse.team.internal.ccvs.ui.subscriber;
import org.eclipse.compare.structuremergeviewer.IDiffElement;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter;
-import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter.OrSyncInfoFilter;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoDirectionFilter;
+import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
import org.eclipse.team.ui.synchronize.SynchronizeModelOperation;
@@ -35,9 +35,7 @@ public class MergeUpdateAction extends CVSParticipantAction {
private boolean promptBeforeUpdate;
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter()
- */
+ @Override
protected FastSyncInfoFilter getSyncInfoFilter() {
// Update works for all incoming and conflicting nodes
return new OrSyncInfoFilter(new FastSyncInfoFilter[] {
@@ -46,9 +44,7 @@ public class MergeUpdateAction extends CVSParticipantAction {
});
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.SubscriberAction#getSubscriberOperation(org.eclipse.compare.structuremergeviewer.IDiffElement[])
- */
+ @Override
protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
return new MergeUpdateOperation(configuration, elements, promptBeforeUpdate);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateOperation.java
index e2775510d..db00c0d42 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateOperation.java
@@ -44,26 +44,17 @@ public class MergeUpdateOperation extends SafeUpdateOperation {
super(configuration, elements, promptBeforeUpdate);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#getJobName(org.eclipse.team.ui.sync.SyncInfoSet)
- */
@Override
protected String getJobName() {
SyncInfoSet syncSet = getSyncInfoSet();
return NLS.bind(CVSUIMessages.MergeUpdateAction_jobName, new String[] { Integer.valueOf(syncSet.size()).toString() });
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#getOverwriteLocalChanges()
- */
@Override
protected boolean getOverwriteLocalChanges() {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#updated(org.eclipse.core.resources.IResource[])
- */
@Override
protected void updated(IResource[] resources) throws TeamException {
// Mark all succesfully updated resources as merged
@@ -72,9 +63,6 @@ public class MergeUpdateOperation extends SafeUpdateOperation {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#runUpdateDeletions(org.eclipse.team.core.synchronize.SyncInfo[], org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void runUpdateDeletions(SyncInfo[] nodes, IProgressMonitor monitor) throws TeamException {
// When merging, update deletions become outgoing deletions so just delete
@@ -95,9 +83,6 @@ public class MergeUpdateOperation extends SafeUpdateOperation {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#runSafeUpdate(org.eclipse.team.core.synchronize.SyncInfo[], org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void runSafeUpdate(IProject project, SyncInfo[] nodes, IProgressMonitor monitor) throws TeamException {
if(nodes.length > 0) {
@@ -159,9 +144,6 @@ public class MergeUpdateOperation extends SafeUpdateOperation {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#overwriteUpdate(org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void overwriteUpdate(SyncInfoSet set, IProgressMonitor monitor) throws TeamException {
SyncInfo[] nodes = set.getSyncInfos();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java
index 57e1a7794..0973d88f7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OpenChangeSetAction.java
@@ -41,9 +41,6 @@ class OpenChangeSetAction extends SynchronizeModelAction {
super(CVSUIMessages.OpenCommitSetAction_20, configuration);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#getSyncInfoFilter()
- */
@Override
protected FastSyncInfoFilter getSyncInfoFilter() {
return new AndSyncInfoFilter(new FastSyncInfoFilter[] {
@@ -104,9 +101,6 @@ class OpenChangeSetAction extends SynchronizeModelAction {
return getChangeSet((ISynchronizeModelElement)element.getParent());
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
- */
@Override
protected boolean updateSelection(IStructuredSelection selection) {
boolean enabled = super.updateSelection(selection);
@@ -119,9 +113,6 @@ class OpenChangeSetAction extends SynchronizeModelAction {
return false;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#getSubscriberOperation(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration, org.eclipse.compare.structuremergeviewer.IDiffElement[])
- */
@Override
protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
return new SynchronizeModelOperation(configuration, elements) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndCommitAction.java
index 88b20f4bb..41c93589b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndCommitAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndCommitAction.java
@@ -15,8 +15,8 @@ package org.eclipse.team.internal.ccvs.ui.subscriber;
import org.eclipse.compare.structuremergeviewer.IDiffElement;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter;
-import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoDirectionFilter;
+import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
import org.eclipse.team.ui.synchronize.SynchronizeModelOperation;
@@ -26,16 +26,12 @@ public class OverrideAndCommitAction extends CVSParticipantAction {
super(configuration);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.SubscriberAction#getSyncInfoFilter()
- */
+ @Override
protected FastSyncInfoFilter getSyncInfoFilter() {
return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING, SyncInfo.INCOMING});
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.SubscriberAction#getSubscriberOperation(org.eclipse.compare.structuremergeviewer.IDiffElement[])
- */
+ @Override
protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
return new WorkspaceCommitOperation(configuration, elements, true /* override */);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
index 3eb080102..09593e915 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
@@ -15,8 +15,8 @@ package org.eclipse.team.internal.ccvs.ui.subscriber;
import org.eclipse.compare.structuremergeviewer.IDiffElement;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter;
-import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoDirectionFilter;
+import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
import org.eclipse.team.ui.synchronize.SynchronizeModelOperation;
@@ -31,13 +31,12 @@ public class OverrideAndUpdateAction extends CVSParticipantAction {
super(configuration);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter()
- */
+ @Override
protected FastSyncInfoFilter getSyncInfoFilter() {
return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING, SyncInfo.OUTGOING});
}
+ @Override
protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
return new OverrideAndUpdateSubscriberOperation(configuration, elements);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateSubscriberOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateSubscriberOperation.java
index fc03874e4..94a497634 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateSubscriberOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateSubscriberOperation.java
@@ -34,17 +34,11 @@ public class OverrideAndUpdateSubscriberOperation extends CVSSubscriberOperation
protected OverrideAndUpdateSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
super(configuration, elements);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#shouldRun()
- */
@Override
public boolean shouldRun() {
SyncInfoSet syncSet = getSyncInfoSet();
return(promptForOverwrite(syncSet));
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberOperation#run(org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void runWithProjectRule(IProject project, SyncInfoSet set, IProgressMonitor monitor) throws TeamException {
try {
@@ -69,9 +63,6 @@ public class OverrideAndUpdateSubscriberOperation extends CVSSubscriberOperation
});
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#getJobName(org.eclipse.team.ui.sync.SyncInfoSet)
- */
@Override
protected String getJobName() {
SyncInfoSet syncSet = getSyncInfoSet();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateAction.java
index de7206f86..630879dff 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateAction.java
@@ -15,10 +15,8 @@ package org.eclipse.team.internal.ccvs.ui.subscriber;
import org.eclipse.compare.structuremergeviewer.IDiffElement;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter;
+import org.eclipse.team.core.synchronize.FastSyncInfoFilter.*;
import org.eclipse.team.core.synchronize.SyncInfo;
-import org.eclipse.team.core.synchronize.FastSyncInfoFilter.AndSyncInfoFilter;
-import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoChangeTypeFilter;
-import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoDirectionFilter;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
import org.eclipse.team.ui.synchronize.SynchronizeModelOperation;
@@ -31,9 +29,7 @@ public class RefreshDirtyStateAction extends CVSParticipantAction {
super(configuration);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter()
- */
+ @Override
protected FastSyncInfoFilter getSyncInfoFilter() {
// Only interested in outgoing changes
return new AndSyncInfoFilter(new FastSyncInfoFilter[] {
@@ -42,9 +38,7 @@ public class RefreshDirtyStateAction extends CVSParticipantAction {
});
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#getSubscriberOperation(org.eclipse.ui.IWorkbenchPart, org.eclipse.compare.structuremergeviewer.IDiffElement[])
- */
+ @Override
protected SynchronizeModelOperation getSubscriberOperation(
ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
return new RefreshDirtyStateOperation(configuration, elements);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateOperation.java
index 4929e4bac..284a1923b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/RefreshDirtyStateOperation.java
@@ -46,9 +46,6 @@ public class RefreshDirtyStateOperation extends CVSSubscriberOperation {
super(configuration, elements);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberOperation#run(org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
protected void runWithProjectRule(IProject project, SyncInfoSet set, IProgressMonitor monitor) throws TeamException {
final SyncInfo[] infos = set.getSyncInfos();
@@ -126,9 +123,6 @@ public class RefreshDirtyStateOperation extends CVSSubscriberOperation {
return CVSUIMessages.RefreshDirtyStateOperation_0;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#getJobName(org.eclipse.team.ui.sync.SyncInfoSet)
- */
@Override
protected String getJobName() {
return CVSUIMessages.RefreshDirtyStateOperation_1;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateOperation.java
index f530db496..0ed91f517 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateOperation.java
@@ -62,9 +62,6 @@ public abstract class SafeUpdateOperation extends CVSSubscriberOperation {
this.promptBeforeUpdate = promptBeforeUpdate;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#shouldRun()
- */
@Override
public boolean shouldRun() {
return promptIfNeeded();
@@ -127,9 +124,6 @@ public abstract class SafeUpdateOperation extends CVSSubscriberOperation {
return rule;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberOperation#run(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
skipped.clear();
@@ -141,9 +135,6 @@ public abstract class SafeUpdateOperation extends CVSSubscriberOperation {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#run(org.eclipse.team.ui.sync.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void runWithProjectRule(IProject project, SyncInfoSet syncSet, IProgressMonitor monitor) throws TeamException {
try {
@@ -460,9 +451,6 @@ public abstract class SafeUpdateOperation extends CVSSubscriberOperation {
return CVSUIMessages.UpdateAction_update;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#getJobName(org.eclipse.team.ui.sync.SyncInfoSet)
- */
@Override
protected String getJobName() {
SyncInfoSet syncSet = getSyncInfoSet();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java
index 5dd2c8b41..496def9fa 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SyncInfoSetDetailsDialog.java
@@ -47,9 +47,6 @@ public abstract class SyncInfoSetDetailsDialog extends DetailsDialog {
this.syncSet = syncSet;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.DetailsDialog#createDropDownDialogArea(org.eclipse.swt.widgets.Composite)
- */
@Override
protected Composite createDropDownDialogArea(Composite parent) {
Composite composite = createComposite(parent);
@@ -147,10 +144,6 @@ public abstract class SyncInfoSetDetailsDialog extends DetailsDialog {
return syncSet.getResources();
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.team.internal.ui.DetailsDialog#updateEnablements()
- */
@Override
protected void updateEnablements() {
}
@@ -162,9 +155,6 @@ public abstract class SyncInfoSetDetailsDialog extends DetailsDialog {
return syncSet;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
- */
@Override
protected void buttonPressed(int id) {
if (id == IDialogConstants.OK_ID) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/UpdateDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/UpdateDialog.java
index 1b25cab2c..3a1b12aba 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/UpdateDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/UpdateDialog.java
@@ -34,9 +34,7 @@ public class UpdateDialog extends SyncInfoSetDetailsDialog {
super(parentShell, CVSUIMessages.UpdateDialog_overwriteTitle, syncSet); //
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.DetailsDialog#createMainDialogArea(org.eclipse.swt.widgets.Composite)
- */
+ @Override
protected void createMainDialogArea(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
composite.setLayout(new GridLayout());
@@ -47,20 +45,24 @@ public class UpdateDialog extends SyncInfoSetDetailsDialog {
createWrappingLabel(composite, CVSUIMessages.UpdateDialog_overwriteMessage);
}
+ @Override
protected void createButtonsForButtonBar(Composite parent) {
createButton(parent, YES, IDialogConstants.YES_LABEL, false);
createButton(parent, IDialogConstants.NO_ID, IDialogConstants.NO_LABEL, true);
super.createButtonsForButtonBar(parent);
}
+ @Override
protected boolean includeOkButton() {
return false;
}
+ @Override
protected boolean includeCancelButton() {
return false;
}
+ @Override
protected void buttonPressed(int id) {
// hijack yes and no buttons to set the correct return
// codes.
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java
index a956a580a..949518018 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java
@@ -41,21 +41,18 @@ public class WorkspaceCommitAction extends CVSParticipantAction {
setActionDefinitionId(ICVSUIConstants.CMD_COMMIT_ALL);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter()
- */
+ @Override
protected FastSyncInfoFilter getSyncInfoFilter() {
return new SyncInfoDirectionFilter(new int[] { SyncInfo.OUTGOING });
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.SubscriberAction#getSubscriberOperation(org.eclipse.compare.structuremergeviewer.IDiffElement[])
- */
+ @Override
protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
return new WorkspaceCommitOperation(configuration, elements, false /* override */);
}
- public void runOperation() {
+ @Override
+ public void runOperation() {
final SyncInfoSet set = getSyncInfoSet();
final Shell shell= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
try {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java
index e2849dd9c..1cb5b6796 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitOperation.java
@@ -54,35 +54,23 @@ public class WorkspaceCommitOperation extends CVSSubscriberOperation {
this.override = override;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberOperation#getErrorTitle()
- */
@Override
protected String getErrorTitle() {
return CVSUIMessages.CommitAction_commitFailed;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.TeamOperation#getJobName()
- */
@Override
protected String getJobName() {
SyncInfoSet syncSet = getSyncInfoSet();
return NLS.bind(CVSUIMessages.CommitAction_jobName, new String[] { Integer.valueOf(syncSet.size()).toString() });
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.TeamOperation#shouldRun()
- */
@Override
public boolean shouldRun() {
SyncInfoSet set = getSyncInfoSet();
return !set.isEmpty();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.SubscriberOperation#getSyncInfoSet()
- */
@Override
protected SyncInfoSet getSyncInfoSet() {
if (syncSet == null) {
@@ -129,10 +117,6 @@ public class WorkspaceCommitOperation extends CVSSubscriberOperation {
return true;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberOperation#run(org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void runWithProjectRule(IProject project, SyncInfoSet syncSet, IProgressMonitor monitor) throws TeamException {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java
index 70fccda94..ec699627e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java
@@ -145,9 +145,6 @@ public class WorkspaceSynchronizeParticipant extends ScopableSubscriberParticipa
}
public class WorkspaceChangeSetCapability extends CVSChangeSetCapability {
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#createChangeSet(org.eclipse.team.core.synchronize.SyncInfo[])
- */
@Override
public ActiveChangeSet createChangeSet(ISynchronizePageConfiguration configuration, IDiff[] infos) {
ActiveChangeSet set = getActiveChangeSetManager().createSet(CVSUIMessages.WorkspaceChangeSetCapability_1, new IDiff[0]);
@@ -169,9 +166,6 @@ public class WorkspaceSynchronizeParticipant extends ScopableSubscriberParticipa
return result.toArray(new IResource[result.size()]);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#editChangeSet(org.eclipse.team.core.subscribers.ActiveChangeSet)
- */
@Override
public void editChangeSet(ISynchronizePageConfiguration configuration, ActiveChangeSet set) {
CommitSetDialog dialog = new CommitSetDialog(configuration.getSite().getShell(), set, set.getResources(), CommitSetDialog.EDIT);
@@ -180,9 +174,6 @@ public class WorkspaceSynchronizeParticipant extends ScopableSubscriberParticipa
// Nothing to do here as the set was updated by the dialog
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#getActiveChangeSetManager()
- */
@Override
public ActiveChangeSetManager getActiveChangeSetManager() {
return CVSUIPlugin.getPlugin().getChangeSetManager();
@@ -261,18 +252,12 @@ public class WorkspaceSynchronizeParticipant extends ScopableSubscriberParticipa
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#init(org.eclipse.ui.IMemento)
- */
@Override
public void init(String secondaryId, IMemento memento) throws PartInitException {
super.init(secondaryId, memento);
setSubscriber(CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber());
}
- /* (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);
@@ -308,9 +293,6 @@ public class WorkspaceSynchronizeParticipant extends ScopableSubscriberParticipa
return TeamUI.getSynchronizeManager().getParticipantDescriptor(ID);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#updateLabels(org.eclipse.team.ui.synchronize.ISynchronizeModelElement, org.eclipse.compare.CompareConfiguration, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void prepareCompareInput(ISynchronizeModelElement element, CompareConfiguration config, IProgressMonitor monitor) throws TeamException {
monitor.beginTask(null, 100);
@@ -320,17 +302,11 @@ public class WorkspaceSynchronizeParticipant extends ScopableSubscriberParticipa
monitor.done();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#getPreferencePages()
- */
@Override
public PreferencePage[] getPreferencePages() {
return CVSParticipant.addCVSPreferencePages(super.getPreferencePages());
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#getChangeSetCapability()
- */
@Override
public ChangeSetCapability getChangeSetCapability() {
if (capability == null) {
@@ -339,9 +315,6 @@ public class WorkspaceSynchronizeParticipant extends ScopableSubscriberParticipa
return capability;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#isViewerContributionsSupported()
- */
@Override
protected boolean isViewerContributionsSupported() {
return true;
@@ -357,9 +330,6 @@ public class WorkspaceSynchronizeParticipant extends ScopableSubscriberParticipa
((IEclipsePreferences) CVSUIPlugin.getPlugin().getInstancePreferences().node("")).removePreferenceChangeListener(this); //$NON-NLS-1$
}
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
- */
@Override
public void preferenceChange(PreferenceChangeEvent event) {
if (event.getKey().equals(ICVSUIConstants.PREF_CONSIDER_CONTENTS) || event.getKey().equals(ICVSUIConstants.PREF_SYNCVIEW_REGEX_FILTER_PATTERN)) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java
index 66fa74dfb..8c14c4ac1 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java
@@ -16,8 +16,8 @@ package org.eclipse.team.internal.ccvs.ui.subscriber;
import org.eclipse.compare.structuremergeviewer.IDiffElement;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter;
-import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoDirectionFilter;
+import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
import org.eclipse.team.ui.synchronize.SynchronizeModelOperation;
@@ -38,16 +38,12 @@ public class WorkspaceUpdateAction extends CVSParticipantAction {
setActionDefinitionId(ICVSUIConstants.CMD_UPDATE_ALL);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter()
- */
+ @Override
protected FastSyncInfoFilter getSyncInfoFilter() {
return new SyncInfoDirectionFilter(new int[] {SyncInfo.INCOMING, SyncInfo.CONFLICTING});
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.actions.SubscriberAction#getSubscriberOperation(org.eclipse.compare.structuremergeviewer.IDiffElement[])
- */
+ @Override
protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
return new WorkspaceUpdateOperation(configuration, elements, promptBeforeUpdate);
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateOperation.java
index 4bf914ccb..facf43d0d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateOperation.java
@@ -39,9 +39,7 @@ public class WorkspaceUpdateOperation extends SafeUpdateOperation {
super(configuration, elements, promptBeforeUpdate);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#runUpdateDeletions(org.eclipse.team.core.synchronize.SyncInfo[], org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected void runUpdateDeletions(SyncInfo[] nodes, IProgressMonitor monitor) throws TeamException {
monitor.beginTask(null, nodes.length * 100);
for (int i = 0; i < nodes.length; i++) {
@@ -53,16 +51,12 @@ public class WorkspaceUpdateOperation extends SafeUpdateOperation {
monitor.done();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#runSafeUpdate(org.eclipse.team.core.synchronize.SyncInfo[], org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected void runSafeUpdate(IProject project, SyncInfo[] nodes, IProgressMonitor monitor) throws TeamException {
safeUpdate(project, getIResourcesFrom(nodes), new LocalOption[] { Command.DO_NOT_RECURSE }, monitor);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#overwriteUpdate(org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
- */
+ @Override
protected void overwriteUpdate(SyncInfoSet syncSet, IProgressMonitor monitor) throws TeamException {
try {
new ReplaceOperation(getPart(), syncSet.getResources(), null /* tag */, false /* recurse */)
@@ -76,9 +70,7 @@ public class WorkspaceUpdateOperation extends SafeUpdateOperation {
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateOperation#updated(org.eclipse.core.resources.IResource[])
- */
+ @Override
protected void updated(IResource[] resources) throws TeamException {
// Do nothing
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java
index 64a4889e2..0636942bf 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/BranchPromptDialog.java
@@ -107,9 +107,6 @@ public class BranchPromptDialog extends DetailsDialog {
branchText.setFocus();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#getHelpContextId()
- */
@Override
protected String getHelpContextId() {
return IHelpContextIds.BRANCH_DIALOG;
@@ -207,9 +204,6 @@ public class BranchPromptDialog extends DetailsDialog {
return update;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#isMainGrabVertical()
- */
@Override
protected boolean isMainGrabVertical() {
return false;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/FilteredTagList.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/FilteredTagList.java
index 0e77c233a..de826969e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/FilteredTagList.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/FilteredTagList.java
@@ -36,9 +36,6 @@ public class FilteredTagList implements IWorkbenchAdapter, IAdaptable {
this.types = types;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object)
- */
@Override
public Object[] getChildren(Object o) {
CVSTag[] tags = getTags();
@@ -61,33 +58,21 @@ public class FilteredTagList implements IWorkbenchAdapter, IAdaptable {
return tagSource.getTags(types);
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
- */
@Override
public ImageDescriptor getImageDescriptor(Object object) {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object)
- */
@Override
public String getLabel(Object o) {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
- */
@Override
public Object getParent(Object o) {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
- */
@Override
public <T> T getAdapter(Class<T> adapter) {
if (adapter == IWorkbenchAdapter.class) return adapter.cast(this);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/LocalProjectTagSource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/LocalProjectTagSource.java
index 910cbadd9..efc2e6e90 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/LocalProjectTagSource.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/LocalProjectTagSource.java
@@ -78,50 +78,32 @@ public class LocalProjectTagSource extends TagSource {
return result.toArray(new ICVSRemoteFolder[result.size()]);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.tags.TagSource#refresh(boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public CVSTag[] refresh(boolean bestEffort, IProgressMonitor monitor) throws TeamException {
// This tag source should not be refreshed
return new CVSTag[0];
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.tags.TagSource#getLocation()
- */
@Override
public ICVSRepositoryLocation getLocation() {
return seedFolder.getRepository();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.tags.TagSource#getShortDescription()
- */
@Override
public String getShortDescription() {
return NLS.bind(CVSUIMessages.LocalProjectTagSource_0, new String[] { Integer.toString(remoteFolders.length) });
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.tags.TagSource#commit(org.eclipse.team.internal.ccvs.core.CVSTag[], boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void commit(CVSTag[] tags, boolean replace, IProgressMonitor monitor) throws CVSException {
// Does not commit tags
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.tags.TagSource#getCVSResources()
- */
@Override
public ICVSResource[] getCVSResources() {
return remoteFolders;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.tags.TagSource#getTags(int)
- */
@Override
public CVSTag[] getTags(int type) {
if (type == CVSTag.HEAD || type == BASE) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java
index 8fd781195..393e4265e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/MultiFolderTagSource.java
@@ -39,17 +39,11 @@ public class MultiFolderTagSource extends SingleFolderTagSource {
this.folders = folders;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.merge.SingleFolderTagSource#getShortDescription()
- */
@Override
public String getShortDescription() {
return NLS.bind(CVSUIMessages.MultiFolderTagSource_0, new String[] { Integer.toString(folders.length) });
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.merge.TagSource#getTags(int)
- */
@Override
public CVSTag[] getTags(int type) {
if (type == CVSTag.HEAD || type == BASE) {
@@ -62,9 +56,6 @@ public class MultiFolderTagSource extends SingleFolderTagSource {
return tags.toArray(new CVSTag[tags.size()]);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.tags.SingleFolderTagSource#refresh(boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public CVSTag[] refresh(boolean bestEffort, IProgressMonitor monitor) throws TeamException {
monitor.beginTask("", folders.length); //$NON-NLS-1$
@@ -79,9 +70,6 @@ public class MultiFolderTagSource extends SingleFolderTagSource {
return result.toArray(new CVSTag[result.size()]);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.tags.SingleFolderTagSource#getCVSResources()
- */
@Override
public ICVSResource[] getCVSResources() {
return folders;
@@ -91,9 +79,6 @@ public class MultiFolderTagSource extends SingleFolderTagSource {
return folders;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.merge.TagSource#commit(org.eclipse.team.internal.ccvs.core.CVSTag[], boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void commit(final CVSTag[] tags, final boolean replace, IProgressMonitor monitor) throws CVSException {
try {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/SingleFileTagSource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/SingleFileTagSource.java
index f1f806a0b..42b58e19d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/SingleFileTagSource.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/SingleFileTagSource.java
@@ -50,17 +50,11 @@ public class SingleFileTagSource extends TagSource {
parentFolderTagSource = TagSource.create(new ICVSResource[] { file.getParent() });
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.tags.TagSource#getTags(int)
- */
@Override
public CVSTag[] getTags(int type) {
return parentFolderTagSource.getTags(type);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.tags.TagSource#refresh(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public CVSTag[] refresh(boolean bestEffort, IProgressMonitor monitor) throws TeamException {
CVSTag[] tags = fetchTagsFor(file, monitor);
@@ -69,9 +63,6 @@ public class SingleFileTagSource extends TagSource {
return tags;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.tags.TagSource#getLocation()
- */
@Override
public ICVSRepositoryLocation getLocation() {
RepositoryManager mgr = CVSUIPlugin.getPlugin().getRepositoryManager();
@@ -79,26 +70,17 @@ public class SingleFileTagSource extends TagSource {
return location;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.tags.TagSource#getShortDescription()
- */
@Override
public String getShortDescription() {
return file.getName();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.tags.TagSource#commit(org.eclipse.team.internal.ccvs.core.CVSTag[], boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void commit(CVSTag[] tags, boolean replace, IProgressMonitor monitor) throws CVSException {
parentFolderTagSource.commit(tags, replace, monitor);
fireChange();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.tags.TagSource#getCVSResources()
- */
@Override
public ICVSResource[] getCVSResources() {
return new ICVSResource[] { file };
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/SingleFolderTagSource.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/SingleFolderTagSource.java
index ea8c2af4e..330ea088f 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/SingleFolderTagSource.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/SingleFolderTagSource.java
@@ -40,9 +40,6 @@ public class SingleFolderTagSource extends TagSource {
this.folder = folder;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.merge.TagSource#getTags(int)
- */
@Override
public CVSTag[] getTags(int type) {
if (type == CVSTag.HEAD || type == BASE) {
@@ -59,9 +56,6 @@ public class SingleFolderTagSource extends TagSource {
return folder;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.merge.TagSource#refresh(org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public CVSTag[] refresh(boolean bestEffort, IProgressMonitor monitor) throws TeamException {
CVSTag[] tags = CVSUIPlugin.getPlugin().getRepositoryManager().refreshDefinedTags(getFolder(), bestEffort /* recurse */, true /* notify */, monitor);
@@ -69,9 +63,6 @@ public class SingleFolderTagSource extends TagSource {
return tags;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.merge.TagSource#getLocation()
- */
@Override
public ICVSRepositoryLocation getLocation() {
RepositoryManager mgr = CVSUIPlugin.getPlugin().getRepositoryManager();
@@ -79,17 +70,11 @@ public class SingleFolderTagSource extends TagSource {
return location;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.merge.TagSource#getShortDescription()
- */
@Override
public String getShortDescription() {
return getFolder().getName();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.merge.TagSource#commit(org.eclipse.team.internal.ccvs.core.CVSTag[], boolean, org.eclipse.core.runtime.IProgressMonitor)
- */
@Override
public void commit(final CVSTag[] tags, final boolean replace, IProgressMonitor monitor) throws CVSException {
try {
@@ -114,9 +99,6 @@ public class SingleFolderTagSource extends TagSource {
fireChange();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.tags.TagSource#getCVSResources()
- */
@Override
public ICVSResource[] getCVSResources() {
final ICVSResource[][] resources = new ICVSResource[][] { null };
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagAsVersionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagAsVersionDialog.java
index 4f17fdec0..2bda09700 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagAsVersionDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagAsVersionDialog.java
@@ -93,9 +93,6 @@ public class TagAsVersionDialog extends DetailsDialog {
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#getHelpContextId()
- */
@Override
protected String getHelpContextId() {
return IHelpContextIds.TAG_AS_VERSION_DIALOG;
@@ -105,9 +102,6 @@ public class TagAsVersionDialog extends DetailsDialog {
return moveTag;
}
- /**
- * @see DetailsDialog#createDropDownDialogArea(Composite)
- */
@Override
protected Composite createDropDownDialogArea(Composite parent) {
@@ -180,9 +174,6 @@ public class TagAsVersionDialog extends DetailsDialog {
return operation;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#isMainGrabVertical()
- */
@Override
protected boolean isMainGrabVertical() {
return false;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagContentAssistProcessor.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagContentAssistProcessor.java
index a237969b8..92f71d777 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagContentAssistProcessor.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagContentAssistProcessor.java
@@ -57,9 +57,6 @@ public class TagContentAssistProcessor implements ISubjectControlContentAssistPr
tags = new FilteredTagList(tagSource, TagSource.convertIncludeFlaqsToTagTypes(includeFlags));
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.contentassist.ISubjectControlContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.contentassist.IContentAssistSubjectControl, int)
- */
@Override
public ICompletionProposal[] computeCompletionProposals(IContentAssistSubjectControl contentAssistSubjectControl, int documentOffset) {
Control c = contentAssistSubjectControl.getControl();
@@ -92,58 +89,37 @@ public class TagContentAssistProcessor implements ISubjectControlContentAssistPr
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.contentassist.ISubjectControlContentAssistProcessor#computeContextInformation(org.eclipse.jface.contentassist.IContentAssistSubjectControl, int)
- */
@Override
public IContextInformation[] computeContextInformation(IContentAssistSubjectControl contentAssistSubjectControl, int documentOffset) {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int)
- */
@Override
public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
Assert.isTrue(false, "ITextViewer not supported"); //$NON-NLS-1$
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int)
- */
@Override
public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
- */
@Override
public char[] getCompletionProposalAutoActivationCharacters() {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
- */
@Override
public char[] getContextInformationAutoActivationCharacters() {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getErrorMessage()
- */
@Override
public String getErrorMessage() {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
- */
@Override
public IContextInformationValidator getContextInformationValidator() {
return null;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagElement.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagElement.java
index 589babd94..9f7e93454 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagElement.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagElement.java
@@ -14,6 +14,7 @@
package org.eclipse.team.internal.ccvs.ui.tags;
import java.util.Date;
+
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.team.internal.ccvs.core.CVSTag;
@@ -40,6 +41,7 @@ public class TagElement implements IWorkbenchAdapter, IAdaptable {
* @deprecated
* @param tag
*/
+ @Deprecated
public TagElement(CVSTag tag) {
this(null, tag);
}
@@ -47,17 +49,21 @@ public class TagElement implements IWorkbenchAdapter, IAdaptable {
this.parent = parent;
this.tag = tag;
}
+ @Override
public Object[] getChildren(Object o) {
return new Object[0];
}
+ @Override
public <T> T getAdapter(Class<T> adapter) {
if (adapter == IWorkbenchAdapter.class) return adapter.cast(this);
return null;
}
+ @Override
public ImageDescriptor getImageDescriptor(Object object) {
return getImageDescriptor(tag);
}
- public String getLabel(Object o) {
+ @Override
+ public String getLabel(Object o) {
if(tag.getType() == CVSTag.DATE){
Date date = tag.asDate();
if (date != null){
@@ -66,6 +72,7 @@ public class TagElement implements IWorkbenchAdapter, IAdaptable {
}
return tag.getName();
}
+ @Override
public Object getParent(Object o) {
return parent;
}
@@ -73,16 +80,12 @@ public class TagElement implements IWorkbenchAdapter, IAdaptable {
return tag;
}
- /* (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
+ @Override
public int hashCode() {
return tag.hashCode();
}
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
+ @Override
public boolean equals(Object obj) {
if (obj instanceof TagElement) {
return tag.equals(((TagElement)obj).getTag());
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagRefreshButtonArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagRefreshButtonArea.java
index 43033cc64..7366075b8 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagRefreshButtonArea.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagRefreshButtonArea.java
@@ -50,9 +50,6 @@ public class TagRefreshButtonArea extends DialogArea {
this.tagSource = tagSource;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ui.dialogs.DialogArea#createArea(org.eclipse.swt.widgets.Composite)
- */
@Override
public void createArea(Composite parent) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionWizardPage.java
index fdd48bfd6..265bd6fc9 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionWizardPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/tags/TagSelectionWizardPage.java
@@ -65,9 +65,7 @@ public class TagSelectionWizardPage extends CVSWizardPage {
this.helpContextId = helpContextId;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
+ @Override
public void createControl(Composite parent) {
final PixelConverter converter= SWTUtils.createDialogPixelConverter(parent);
@@ -83,6 +81,7 @@ public class TagSelectionWizardPage extends CVSWizardPage {
if (allowNoTag) {
SelectionListener listener = new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
useResourceTag = useResourceTagButton.getSelection();
updateEnablement();
@@ -107,7 +106,8 @@ public class TagSelectionWizardPage extends CVSWizardPage {
tagArea.setRunnableContext(getContainer());
tagArea.createArea(composite);
tagArea.addPropertyChangeListener(new IPropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent event) {
+ @Override
+ public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().equals(TagSelectionArea.SELECTED_TAG)) {
selectedTag = tagArea.getSelection();
updateEnablement();
@@ -147,6 +147,7 @@ public class TagSelectionWizardPage extends CVSWizardPage {
allowNoTag = b;
}
+ @Override
public void setVisible(boolean visible) {
super.setVisible(visible);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AlternativeLocationWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AlternativeLocationWizard.java
index 14bb3b1a0..0feebdea3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AlternativeLocationWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/AlternativeLocationWizard.java
@@ -136,11 +136,6 @@ public class AlternativeLocationWizard extends NewLocationWizard {
super(pageName, title, titleImage);
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.team.internal.ccvs.ui.wizards.ConfigurationWizardMainPage#validateFields()
- */
@Override
protected void validateFields() {
super.validateFields();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSScmUrlImportWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSScmUrlImportWizardPage.java
index 351026ada..cff8b0249 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSScmUrlImportWizardPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSScmUrlImportWizardPage.java
@@ -44,23 +44,17 @@ public class CVSScmUrlImportWizardPage extends WizardPage implements IScmUrlImpo
class CVSLabelProvider extends StyledCellLabelProvider implements ILabelProvider {
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
- */
+ @Override
public Image getImage(Object element) {
return PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
- */
+ @Override
public String getText(Object element) {
return getStyledText(element).getString();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.StyledCellLabelProvider#update(org.eclipse.jface.viewers.ViewerCell)
- */
+ @Override
public void update(ViewerCell cell) {
StyledString string = getStyledText(cell.getElement());
cell.setText(string.getString());
@@ -101,9 +95,7 @@ public class CVSScmUrlImportWizardPage extends WizardPage implements IScmUrlImpo
setDescription(CVSUIMessages.CVSScmUrlImportWizardPage_1);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
+ @Override
public void createControl(Composite parent) {
Composite comp = SWTUtils.createHVFillComposite(parent, SWTUtils.MARGINS_NONE, 1);
Composite group = SWTUtils.createHFillComposite(comp, SWTUtils.MARGINS_NONE, 1);
@@ -111,6 +103,7 @@ public class CVSScmUrlImportWizardPage extends WizardPage implements IScmUrlImpo
Button versions = SWTUtils.createRadioButton(group, CVSUIMessages.CVSScmUrlImportWizardPage_3);
useHead = SWTUtils.createRadioButton(group, CVSUIMessages.CVSScmUrlImportWizardPage_2);
SelectionListener listener = new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
bundlesViewer.refresh(true);
}
@@ -147,9 +140,7 @@ public class CVSScmUrlImportWizardPage extends WizardPage implements IScmUrlImpo
PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.CVS_SCM_URL_IMPORT_PAGE);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.IScmUrlImportWizardPage#finish()
- */
+ @Override
public boolean finish() {
boolean head = false;
if (getControl() != null) {
@@ -178,16 +169,12 @@ public class CVSScmUrlImportWizardPage extends WizardPage implements IScmUrlImpo
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.IScmUrlImportWizardPage#getSelection()
- */
+ @Override
public ScmUrlImportDescription[] getSelection() {
return descriptions;
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.IScmUrlImportWizardPage#getSelection()
- */
+ @Override
public void setSelection(ScmUrlImportDescription[] descriptions) {
this.descriptions = descriptions;
// fill viewer
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSWizardPage.java
index 1a39f85a1..81076abd3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSWizardPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CVSWizardPage.java
@@ -293,9 +293,6 @@ public abstract class CVSWizardPage extends WizardPage {
this.wizard = wizard;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
- */
@Override
public IWizardPage getNextPage() {
ICVSWizard w = getCVSWizard();
@@ -307,9 +304,6 @@ public abstract class CVSWizardPage extends WizardPage {
return super.getNextPage();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
- */
@Override
public boolean canFlipToNextPage() {
ICVSWizard w = getCVSWizard();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java
index 841381354..060b5b321 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsLocationSelectionPage.java
@@ -103,9 +103,6 @@ public class CheckoutAsLocationSelectionPage extends CVSWizardPage {
return singleProject;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
@Override
public void createControl(Composite parent) {
Composite composite= createComposite(parent, 1, false);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java
index 66c1f6733..4a2dc12ad 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsMainPage.java
@@ -68,9 +68,6 @@ public class CheckoutAsMainPage extends CVSWizardPage {
this.allowProjectConfiguration = allowProjectConfiguration;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
@Override
public void createControl(Composite parent) {
@@ -236,9 +233,7 @@ public class CheckoutAsMainPage extends CVSWizardPage {
public boolean isPerformCheckoutAs() {
return simpleProjectButton.getSelection();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.wizards.CVSWizardPage#createRadioButton(org.eclipse.swt.widgets.Composite, java.lang.String, int)
- */
+
@Override
protected Button createRadioButton(Composite parent, String label, int span) {
Button radio = super.createRadioButton(parent, label, span);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java
index 3bda16e63..7083fcd84 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutAsWizard.java
@@ -127,9 +127,6 @@ public class CheckoutAsWizard extends Wizard {
addPage(tagSelectionPage);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#performFinish()
- */
@Override
public boolean performFinish() {
try {
@@ -153,16 +150,10 @@ public class CheckoutAsWizard extends Wizard {
return false;
}
- /**
- * @return
- */
private boolean isSingleFolder() {
return remoteFolders.length == 1;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#canFinish()
- */
@Override
public boolean canFinish() {
return (mainPage.isPageComplete()
@@ -171,9 +162,6 @@ public class CheckoutAsWizard extends Wizard {
|| (mainPage.isPerformCheckoutAs() && locationSelectionPage.isPageComplete())));
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
- */
@Override
public IWizardPage getNextPage(IWizardPage page) {
if (page == mainPage) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java
index cc3be767d..65c1d25cf 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java
@@ -46,9 +46,6 @@ public class CheckoutWizard extends Wizard implements ICVSWizard, INewWizard {
setWindowTitle(CVSUIMessages.CheckoutWizard_0);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
@Override
public void addPages() {
setNeedsProgressMonitor(true);
@@ -89,18 +86,12 @@ public class CheckoutWizard extends Wizard implements ICVSWizard, INewWizard {
return CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_CHECKOUT);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#canFinish()
- */
@Override
public boolean canFinish() {
return (wizard == null && getSelectedModules().length > 0) ||
(wizard != null && wizard.canFinish());
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#performFinish()
- */
@Override
public boolean performFinish() {
if (wizard != null) {
@@ -132,9 +123,6 @@ public class CheckoutWizard extends Wizard implements ICVSWizard, INewWizard {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performCancel()
- */
@Override
public boolean performCancel() {
if (location != null && isNewLocation) {
@@ -144,9 +132,6 @@ public class CheckoutWizard extends Wizard implements ICVSWizard, INewWizard {
return wizard == null || wizard.performCancel();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
- */
@Override
public IWizardPage getNextPage(IWizardPage page) {
// Assume the page is about to be shown when this method is
@@ -154,9 +139,6 @@ public class CheckoutWizard extends Wizard implements ICVSWizard, INewWizard {
return getNextPage(page, true /* about to show*/);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.wizards.ICVSWizard#getNextPage(org.eclipse.jface.wizard.IWizardPage, boolean)
- */
@Override
public IWizardPage getNextPage(IWizardPage page, boolean aboutToShow) {
if (page == locationPage) {
@@ -295,9 +277,6 @@ public class CheckoutWizard extends Wizard implements ICVSWizard, INewWizard {
return location;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
- */
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java
index 0d563a010..c42d365db 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizard.java
@@ -137,10 +137,6 @@ public class CommitWizard extends ResizableWizard {
this.jobListener = jobListener;
}
-
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.jobs.IJobChangeListener#done(org.eclipse.core.runtime.jobs.IJobChangeEvent)
- */
@Override
public void done(IJobChangeEvent event) {
super.done(event);
@@ -148,9 +144,6 @@ public class CommitWizard extends ResizableWizard {
jobListener.done(event);
}
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.jobs.IJobChangeListener#scheduled(org.eclipse.core.runtime.jobs.IJobChangeEvent)
- */
@Override
public void scheduled(IJobChangeEvent event) {
super.scheduled(event);
@@ -327,9 +320,6 @@ public class CommitWizard extends ResizableWizard {
return super.performFinish();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.wizards.ResizableWizard#performCancel()
- */
@Override
public boolean performCancel() {
fCommitPage.finish();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java
index 334a6c4c7..353ca068f 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardCommitPage.java
@@ -103,9 +103,6 @@ public class CommitWizardCommitPage extends WizardPage implements IPropertyChang
});
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
@Override
public void createControl(Composite parent) {
initializeDialogUnits(parent);
@@ -268,9 +265,6 @@ public class CommitWizardCommitPage extends WizardPage implements IPropertyChang
return CVSUIPlugin.getPlugin().getPreferenceStore().getInt(ICVSUIConstants.PREF_COMMIT_FILES_DISPLAY_THRESHOLD);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.DialogPage#dispose()
- */
@Override
public void dispose() {
super.dispose();
@@ -288,9 +282,6 @@ public class CommitWizardCommitPage extends WizardPage implements IPropertyChang
return fCommentArea.getCommentWithPrompt(shell);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
- */
@Override
public boolean isPageComplete() {
/* if empty comment is not allowed (see bug 114678) */
@@ -308,11 +299,6 @@ public class CommitWizardCommitPage extends WizardPage implements IPropertyChang
return super.isPageComplete();
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)
- */
@Override
public void setVisible(boolean visible) {
super.setVisible(visible);
@@ -408,9 +394,6 @@ public class CommitWizardCommitPage extends WizardPage implements IPropertyChang
return fWizard.getParticipant().getContext().getScope().getTraversals();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
- */
@Override
public void propertyChange(PropertyChangeEvent event) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardParticipant.java
index b99762df0..39836e4e4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CommitWizardParticipant.java
@@ -111,9 +111,6 @@ public class CommitWizardParticipant extends WorkspaceModelParticipant {
return new Decorator(configuration, fWizard);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.internal.ccvs.ui.subscriber.WorkspaceSynchronizeParticipant#initializeConfiguration(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
- */
@Override
protected void initializeConfiguration(final ISynchronizePageConfiguration configuration) {
super.initializeConfiguration(configuration);
@@ -165,9 +162,6 @@ public class CommitWizardParticipant extends WorkspaceModelParticipant {
});
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#doesSupportSynchronize()
- */
@Override
public boolean doesSupportSynchronize() {
return false;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
index 1e1226a6e..bd056e837 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
@@ -1485,9 +1485,6 @@ public class GenerateDiffFileWizard extends Wizard {
}
}
- /* (Non-javadoc)
- * Method declared on IWizard.
- */
@Override
public boolean needsProgressMonitor() {
return true;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java
index 841bdbc6c..02b52e4c7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java
@@ -50,9 +50,6 @@ public class MergeWizardPage extends CVSWizardPage {
this.tagSource = tagSource;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
@Override
public void createControl(Composite parent) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizard.java
index 6c5d4180e..dfff977c3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModeWizard.java
@@ -120,9 +120,6 @@ public class ModeWizard extends ResizableWizard {
addPage(fPage);
}
- /* (Non-javadoc)
- * Method declared on IWizard.
- */
@Override
public boolean needsProgressMonitor() {
return true;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
index c19406af1..91ea803a6 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizard.java
@@ -273,9 +273,6 @@ public class SharingWizard extends Wizard implements IConfigurationWizard, ICVSW
return result[0];
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#performCancel()
- */
@Override
public boolean performCancel() {
boolean disposeLocation = isNewLocation;
@@ -538,9 +535,6 @@ public class SharingWizard extends Wizard implements IConfigurationWizard, ICVSW
});
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.IWizard#getPreviousPage(org.eclipse.jface.wizard.IWizardPage)
- */
@Override
public IWizardPage getPreviousPage(IWizardPage page) {
if (page == syncPage) {
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardPageActionGroup.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardPageActionGroup.java
index eac8fccd8..fe4d92334 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardPageActionGroup.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardPageActionGroup.java
@@ -25,9 +25,7 @@ public class SharingWizardPageActionGroup extends SynchronizePageActionGroup {
public static final String ACTION_GROUP = "cvs_sharing_page_actions"; //$NON-NLS-1$
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.subscriber.SynchronizeViewerAdvisor#initializeActions(org.eclipse.jface.viewers.StructuredViewer)
- */
+ @Override
public void initialize(ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
configuration.addMenuGroup(ISynchronizePageConfiguration.P_TOOLBAR_MENU, ACTION_GROUP);
@@ -36,6 +34,7 @@ public class SharingWizardPageActionGroup extends SynchronizePageActionGroup {
ISynchronizePageConfiguration.P_TOOLBAR_MENU,
ACTION_GROUP,
new CVSActionDelegateWrapper(new IgnoreAction(), configuration, null /* no id to avoid conflict with context menu (bug 198319)*/){
+ @Override
protected String getBundleKeyPrefix() {
return "SharingWizardIgnore."; //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardSyncPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardSyncPage.java
index 30db2a3a6..85964f94e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardSyncPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardSyncPage.java
@@ -71,9 +71,6 @@ public class SharingWizardSyncPage extends CVSWizardPage implements IDiffChangeL
this.project = project;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
@Override
public void createControl(Composite parent) {
@@ -171,9 +168,6 @@ public class SharingWizardSyncPage extends CVSWizardPage implements IDiffChangeL
return ModelSynchronizeWizard.createWorkspaceParticipant(Utils.getResourceMappings(new IProject[] { project }), getShell());
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#dispose()
- */
@Override
public void dispose() {
if (input != null) {
@@ -181,9 +175,6 @@ public class SharingWizardSyncPage extends CVSWizardPage implements IDiffChangeL
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.WizardPage#setPreviousPage(org.eclipse.jface.wizard.IWizardPage)
- */
@Override
public void setPreviousPage(IWizardPage page) {
// There's no going back from this page
@@ -206,9 +197,6 @@ public class SharingWizardSyncPage extends CVSWizardPage implements IDiffChangeL
return (ModelSynchronizeParticipant)configuration.getParticipant();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#setVisible(boolean)
- */
@Override
public void setVisible(boolean visible) {
super.setVisible(visible);

Back to the top