Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2016-04-12 05:45:04 +0000
committerSergey Prigogin2016-04-12 17:14:59 +0000
commit50893f1e3d4290baebb209619a34d1ed2387edf8 (patch)
tree878554b71036bcc55f94ed7c1ff0241cef1ef62e
parent132925c986c76f54c95685d5fa19b26a3a8d7b10 (diff)
downloadeclipse.platform.team-50893f1e3d4290baebb209619a34d1ed2387edf8.tar.gz
eclipse.platform.team-50893f1e3d4290baebb209619a34d1ed2387edf8.tar.xz
eclipse.platform.team-50893f1e3d4290baebb209619a34d1ed2387edf8.zip
Bug 491484 - Add @Override to org.eclipse.team.ui
Change-Id: I1d158ffc0d865a25cdca12c5595d36edab7ac557 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java41
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizePage.java13
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractTreeViewerAdvisor.java9
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActionDelegateWrapper.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java35
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetDiffNode.java15
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java8
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelManager.java24
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java51
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelSorter.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java31
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java18
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureRefreshScheduleDialog.java9
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DecoratingColorLabelProvider.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DialogSynchronizePageSite.java18
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DiffNodeWorkbenchAdapter.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/EditableSharedDocumentAdapter.java8
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java28
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java8
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java7
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelManager.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java14
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ImageManager.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java13
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceTypedElement.java14
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/NavigationActionGroup.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RangeDifferenceComparator.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshChangeListener.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshEvent.java8
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java15
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java26
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java12
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicy.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicyInModalDialog.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffComparator.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffFilter.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RemoteResourceTypedElement.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java40
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ScopableSubscriberParticipant.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StartupPreferencePage.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java12
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberParticipantPage.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberRefreshSchedule.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoModelElement.java7
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java15
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java17
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java17
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElement.java13
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementLabelProvider.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementSorter.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java14
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java15
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java45
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java47
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java39
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeViewWorkbenchPart.java12
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TeamSynchronizingPerspective.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TreeViewerAdvisor.java27
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/UnchangedResourceModelElement.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchAction.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchPartSynchronizePageSite.java10
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java50
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java8
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DefaultSynchronizePageActions.java13
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DirectionFilterActionGroup.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ExpandAllAction.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/GlobalRefreshAction.java15
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/NavigateAction.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenFileInSystemEditorAction.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PasteAction.java9
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PinParticipantAction.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefactorActionGroup.java9
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefreshActionContribution.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveFromViewAction.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RestoreRemovedItemsAction.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineCLabelContribution.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SubscriberActionContribution.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SyncInfoSetStatusLineContributionGroup.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SyncViewerShowPreferencesAction.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizeAndRefreshAction.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java9
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ToggleLinkingAction.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/AdapterFactory.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java7
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchOperation.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java8
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriberMergeContext.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java7
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/DiffProjectResourceMapping.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/FilePatchResourceMapping.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/HunkResourceMapping.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchCompareAdapter.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchParsedPage.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncContentProvider.java9
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncLabelProvider.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkbenchAdapter.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkbenchLabelProvider.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkspace.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchedFileVariant.java10
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchedFileVariantComparator.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigurationWizardElement.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureMultipleProjectsWizard.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java8
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetLocationPage.java18
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java29
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalRefreshWizardSelectionPage.java11
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalSynchronizeWizard.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java8
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PatchInaccessibleProjectsPage.java8
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSelectionPage.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetExportWizard.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetImportWizard.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PsfFilenameStore.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PsfUrlStore.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/WorkingSetsDialog.java15
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/ISaveableWorkbenchPart.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageCompareEditorInput.java11
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageSaveablePart.java11
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/SaveablePartAdapter.java11
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/SaveablePartDialog.java8
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamOperation.java11
133 files changed, 1152 insertions, 133 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java
index c9e889704..7f00a30d9 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java
@@ -109,6 +109,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
/*
* Override to ensure that the diff viewer will appear in CompareEditorInputs
*/
+ @Override
public boolean hasChildren() {
return true;
}
@@ -157,6 +158,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
* @return the set that contains the elements this provider is
* using as a basis for creating a presentation model.
*/
+ @Override
public SyncInfoSet getSyncInfoSet() {
return set;
}
@@ -167,6 +169,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
*
* @return the input created by this provider.
*/
+ @Override
public ISynchronizeModelElement getModelRoot() {
return root;
}
@@ -185,6 +188,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
* provider or <code>null</code> if the viewer is not of the proper type.
* @return the structured viewer that is displaying the model managed by this provider
*/
+ @Override
public StructuredViewer getViewer() {
ISynchronizePage page = configuration.getPage();
if (page == null) return null;
@@ -198,6 +202,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
/**
* Builds the viewer model based on the contents of the sync set.
*/
+ @Override
public ISynchronizeModelElement prepareInput(IProgressMonitor monitor) {
// Connect to the sync set which will register us as a listener and give us a reset event
// in a background thread
@@ -330,6 +335,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
// progress. If there is, the background update will refresh
if (!updateHandler.isPerformingBackgroundUpdate()) {
Utils.asyncExec(new Runnable() {
+ @Override
public void run() {
refreshModelRoot();
}
@@ -515,6 +521,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
final IResource[][] selectedResources = new IResource[1][0];
final IResource[][] checkedResources = new IResource[1][0];
viewer.getControl().getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
if (viewer != null && !viewer.getControl().isDisposed()) {
expandedResources[0] = getExpandedResources();
@@ -626,14 +633,16 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
/* (non-Javadoc)
* @see org.eclipse.swt.events.TreeListener#treeCollapsed(org.eclipse.swt.events.TreeEvent)
*/
- public void treeCollapsed(TreeEvent e) {
+ @Override
+ public void treeCollapsed(TreeEvent e) {
clearResourceCache(P_VIEWER_EXPANSION_STATE);
}
/* (non-Javadoc)
* @see org.eclipse.swt.events.TreeListener#treeExpanded(org.eclipse.swt.events.TreeEvent)
*/
- public void treeExpanded(TreeEvent e) {
+ @Override
+ public void treeExpanded(TreeEvent e) {
clearResourceCache(P_VIEWER_EXPANSION_STATE);
}
@@ -647,6 +656,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ISynchronizeModelProvider#saveState()
*/
+ @Override
public void saveState() {
saveViewerState();
}
@@ -680,6 +690,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
/**
* Dispose of the provider
*/
+ @Override
public void dispose() {
// Only dispose the update handler if it is
// directly associated with this provider
@@ -691,7 +702,8 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
}
if (actionGroup != null) {
Utils.syncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
actionGroup.dispose();
}
}, getViewer());
@@ -762,12 +774,14 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
/* (non-Javadoc)
* @see org.eclipse.team.core.synchronize.ISyncInfoSetChangeListener#syncInfoChanged(org.eclipse.team.core.synchronize.ISyncInfoSetChangeEvent, org.eclipse.core.runtime.IProgressMonitor)
*/
- public void syncInfoChanged(final ISyncInfoSetChangeEvent event, final IProgressMonitor monitor) {
+ @Override
+ public void syncInfoChanged(final ISyncInfoSetChangeEvent event, final IProgressMonitor monitor) {
if (! (event instanceof ISyncInfoTreeChangeEvent)) {
reset();
} else {
updateHandler.runViewUpdate(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
handleChanges((ISyncInfoTreeChangeEvent)event, monitor);
}
}, true /* preserve expansion */);
@@ -777,7 +791,8 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
/* (non-Javadoc)
* @see org.eclipse.team.core.synchronize.ISyncInfoSetChangeListener#syncInfoSetErrors(org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.team.core.ITeamStatus[], org.eclipse.core.runtime.IProgressMonitor)
*/
- public void syncInfoSetErrors(SyncInfoSet set, ITeamStatus[] errors, IProgressMonitor monitor) {
+ @Override
+ public void syncInfoSetErrors(SyncInfoSet set, ITeamStatus[] errors, IProgressMonitor monitor) {
// Not handled
}
@@ -785,7 +800,8 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
/* (non-Javadoc)
* @see org.eclipse.team.core.synchronize.ISyncInfoSetChangeListener#syncInfoSetReset(org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
*/
- public void syncInfoSetReset(SyncInfoSet set, IProgressMonitor monitor) {
+ @Override
+ public void syncInfoSetReset(SyncInfoSet set, IProgressMonitor monitor) {
reset();
}
@@ -1007,7 +1023,8 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
// Default is to do nothing
}
- public void addPropertyChangeListener(IPropertyChangeListener listener) {
+ @Override
+ public void addPropertyChangeListener(IPropertyChangeListener listener) {
synchronized (this) {
if (listeners == null) {
listeners = new ListenerList(ListenerList.IDENTITY);
@@ -1016,7 +1033,8 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
}
}
- public void removePropertyChangeListener(IPropertyChangeListener listener) {
+ @Override
+ public void removePropertyChangeListener(IPropertyChangeListener listener) {
if (listeners != null) {
synchronized (this) {
listeners.remove(listener);
@@ -1036,9 +1054,11 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
for (int i = 0; i < allListeners.length; i++) {
final IPropertyChangeListener listener = (IPropertyChangeListener)allListeners[i];
SafeRunner.run(new ISafeRunnable() {
+ @Override
public void handleException(Throwable exception) {
// Error is logged by platform
}
+ @Override
public void run() throws Exception {
listener.propertyChange(event);
}
@@ -1069,7 +1089,8 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
- public String toString() {
+ @Override
+ public String toString() {
ISynchronizeModelElement element = getModelRoot();
String name = getClass().getName();
int index = name.lastIndexOf("."); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizePage.java
index b572705e8..bb84dcdd9 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizePage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizePage.java
@@ -50,12 +50,14 @@ public abstract class AbstractSynchronizePage extends Page implements ISynchroni
*/
class ModeFilterActions extends SynchronizePageActionGroup {
private DirectionFilterActionGroup modes;
+ @Override
public void initialize(ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
if (isThreeWay()) {
modes = new DirectionFilterActionGroup(configuration);
}
}
+ @Override
public void fillActionBars(IActionBars actionBars) {
super.fillActionBars(actionBars);
if (modes == null) return;
@@ -95,6 +97,7 @@ public abstract class AbstractSynchronizePage extends Page implements ISynchroni
/* (non-Javadoc)
* @see org.eclipse.ui.part.IPage#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
composite = new Composite(parent, SWT.NONE);
//sc.setContent(composite);
@@ -141,6 +144,7 @@ public abstract class AbstractSynchronizePage extends Page implements ISynchroni
/* (non-Javadoc)
* @see org.eclipse.ui.part.IPage#setActionBars(org.eclipse.ui.IActionBars)
*/
+ @Override
public void setActionBars(IActionBars actionBars) {
// Delegate menu creation to the advisor
viewerAdvisor.setActionBars(actionBars);
@@ -149,6 +153,7 @@ public abstract class AbstractSynchronizePage extends Page implements ISynchroni
/* (non-Javadoc)
* @see org.eclipse.ui.part.IPage#getControl()
*/
+ @Override
public Control getControl() {
return composite;
}
@@ -156,6 +161,7 @@ public abstract class AbstractSynchronizePage extends Page implements ISynchroni
/* (non-Javadoc)
* @see org.eclipse.ui.part.IPage#setFocus()
*/
+ @Override
public void setFocus() {
changesSection.setFocus();
}
@@ -163,6 +169,7 @@ public abstract class AbstractSynchronizePage extends Page implements ISynchroni
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePage#init(org.eclipse.team.ui.synchronize.ISynchronizePageSite)
*/
+ @Override
public void init(ISynchronizePageSite site) {
this.site = site;
IDialogSettings settings = getSettings();
@@ -184,6 +191,7 @@ public abstract class AbstractSynchronizePage extends Page implements ISynchroni
/* (non-Javadoc)
* @see org.eclipse.ui.part.Page#dispose()
*/
+ @Override
public void dispose() {
changesSection.dispose();
composite.dispose();
@@ -193,6 +201,7 @@ public abstract class AbstractSynchronizePage extends Page implements ISynchroni
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePage#getViewer()
*/
+ @Override
public Viewer getViewer() {
return changesViewer;
}
@@ -200,6 +209,7 @@ public abstract class AbstractSynchronizePage extends Page implements ISynchroni
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePage#aboutToChangeProperty(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration, java.lang.String, java.lang.Object)
*/
+ @Override
public boolean aboutToChangeProperty(
ISynchronizePageConfiguration configuration, String key,
Object newValue) {
@@ -224,11 +234,13 @@ public abstract class AbstractSynchronizePage extends Page implements ISynchroni
*
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public Object getAdapter(Class key) {
if (key.equals(ISelectionProvider.class))
return changesViewer;
if (key == IShowInSource.class) {
return new IShowInSource() {
+ @Override
public ShowInContext getShowInContext() {
StructuredViewer v = (StructuredViewer)changesViewer;
if (v == null) return null;
@@ -243,6 +255,7 @@ public abstract class AbstractSynchronizePage extends Page implements ISynchroni
}
if (key == IShowInTargetList.class) {
return new IShowInTargetList() {
+ @Override
public String[] getShowInTargetIds() {
return new String[] { IPageLayout.ID_RES_NAV };
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractTreeViewerAdvisor.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractTreeViewerAdvisor.java
index 9e2f7e3c6..c0e4c0cff 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractTreeViewerAdvisor.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractTreeViewerAdvisor.java
@@ -44,6 +44,7 @@ public abstract class AbstractTreeViewerAdvisor extends StructuredViewerAdvisor
/* (non-Javadoc)
* @see org.eclipse.compare.CompareNavigator#getNavigatables()
*/
+ @Override
protected INavigatable[] getNavigatables() {
INavigatable navigatable = getNavigatable();
return new INavigatable[] { navigatable };
@@ -52,6 +53,7 @@ public abstract class AbstractTreeViewerAdvisor extends StructuredViewerAdvisor
/* (non-Javadoc)
* @see org.eclipse.compare.CompareNavigator#selectChange(boolean)
*/
+ @Override
public boolean selectChange(boolean next) {
if (getSubNavigator() != null) {
if (getSubNavigator().hasChange(next)) {
@@ -95,6 +97,7 @@ public abstract class AbstractTreeViewerAdvisor extends StructuredViewerAdvisor
/* (non-Javadoc)
* @see org.eclipse.compare.CompareNavigator#hasChange(boolean)
*/
+ @Override
public boolean hasChange(boolean next) {
if (getSubNavigator() != null) {
if (getSubNavigator().hasChange(next)) {
@@ -350,6 +353,7 @@ public abstract class AbstractTreeViewerAdvisor extends StructuredViewerAdvisor
* navigation between several objects.
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public Object getAdapter(Class adapter) {
if(adapter == ICompareNavigator.class) {
if(nav == null) {
@@ -366,6 +370,7 @@ public abstract class AbstractTreeViewerAdvisor extends StructuredViewerAdvisor
private synchronized INavigatable getNavigatable() {
if(navigatable == null) {
navigatable = new INavigatable() {
+ @Override
public boolean selectChange(int flag) {
if (flag == INavigatable.FIRST_CHANGE) {
getViewer().setSelection(StructuredSelection.EMPTY);
@@ -377,6 +382,7 @@ public abstract class AbstractTreeViewerAdvisor extends StructuredViewerAdvisor
return navigate((TreeViewer)getViewer(), flag == INavigatable.NEXT_CHANGE, true, false);
}
+ @Override
public boolean openSelectedChange() {
Viewer v = getViewer();
if (v instanceof ITreeViewerAccessor && !v.getControl().isDisposed()) {
@@ -386,9 +392,11 @@ public abstract class AbstractTreeViewerAdvisor extends StructuredViewerAdvisor
}
return false;
}
+ @Override
public boolean hasChange(int changeFlag) {
return AbstractTreeViewerAdvisor.this.hasChange(changeFlag == INavigatable.NEXT_CHANGE);
}
+ @Override
public Object getInput() {
return getViewer().getInput();
}
@@ -404,6 +412,7 @@ public abstract class AbstractTreeViewerAdvisor extends StructuredViewerAdvisor
* @param viewer the viewer
* @param event the double-click event
*/
+ @Override
protected boolean handleDoubleClick(StructuredViewer viewer, DoubleClickEvent event) {
if (super.handleDoubleClick(viewer, event)) return true;
IStructuredSelection selection = (IStructuredSelection) event.getSelection();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActionDelegateWrapper.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActionDelegateWrapper.java
index b0fe3af25..07285702c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActionDelegateWrapper.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActionDelegateWrapper.java
@@ -60,6 +60,7 @@ public class ActionDelegateWrapper extends Action implements ISelectionChangedLi
protected void initialize(final ISynchronizePageConfiguration configuration) {
configuration.getSite().getSelectionProvider().addSelectionChangedListener(this);
configuration.getPage().getViewer().getControl().addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
configuration.getSite().getSelectionProvider().removeSelectionChangedListener(ActionDelegateWrapper.this);
}
@@ -69,6 +70,7 @@ public class ActionDelegateWrapper extends Action implements ISelectionChangedLi
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
*/
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
getDelegate().selectionChanged(this, event.getSelection());
}
@@ -76,6 +78,7 @@ public class ActionDelegateWrapper extends Action implements ISelectionChangedLi
/* (non-Javadoc)
* @see org.eclipse.jface.action.IAction#run()
*/
+ @Override
public void run() {
getDelegate().run(this);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java
index 442cb6e28..0833f0fb3 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java
@@ -55,28 +55,34 @@ public class ActiveChangeSetCollector implements IDiffChangeListener {
*/
private IChangeSetChangeListener activeChangeSetListener = new IChangeSetChangeListener() {
- public void setAdded(final ChangeSet set) {
+ @Override
+ public void setAdded(final ChangeSet set) {
// Remove any resources that are in the new set
provider.performUpdate(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) {
+ @Override
+ public void run(IProgressMonitor monitor) {
remove(set.getResources());
createSyncInfoSet(set);
}
}, true, true);
}
- public void defaultSetChanged(final ChangeSet previousDefault, final ChangeSet set) {
+ @Override
+ public void defaultSetChanged(final ChangeSet previousDefault, final ChangeSet set) {
provider.performUpdate(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) {
+ @Override
+ public void run(IProgressMonitor monitor) {
if (listener != null)
listener.defaultSetChanged(previousDefault, set);
}
}, true, true);
}
- public void setRemoved(final ChangeSet set) {
+ @Override
+ public void setRemoved(final ChangeSet set) {
provider.performUpdate(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) {
+ @Override
+ public void run(IProgressMonitor monitor) {
remove(set);
if (!set.isEmpty()) {
add(getSyncInfos(set).getSyncInfos());
@@ -85,16 +91,19 @@ public class ActiveChangeSetCollector implements IDiffChangeListener {
}, true, true);
}
- public void nameChanged(final ChangeSet set) {
+ @Override
+ public void nameChanged(final ChangeSet set) {
provider.performUpdate(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) {
+ @Override
+ public void run(IProgressMonitor monitor) {
if (listener != null)
listener.nameChanged(set);
}
}, true, true);
}
- public void resourcesChanged(final ChangeSet set, final IPath[] paths) {
+ @Override
+ public void resourcesChanged(final ChangeSet set, final IPath[] paths) {
// Look for any resources that were removed from the set but are still out-of sync.
// Re-add those resources
final List outOfSync = new ArrayList();
@@ -109,7 +118,8 @@ public class ActiveChangeSetCollector implements IDiffChangeListener {
}
if (!outOfSync.isEmpty()) {
provider.performUpdate(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) {
+ @Override
+ public void run(IProgressMonitor monitor) {
add((SyncInfo[]) outOfSync.toArray(new SyncInfo[outOfSync.size()]));
}
}, true, true);
@@ -452,9 +462,11 @@ public class ActiveChangeSetCollector implements IDiffChangeListener {
}
}
+ @Override
public void diffsChanged(final IDiffChangeEvent event, IProgressMonitor monitor) {
provider.performUpdate(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) {
+ @Override
+ public void run(IProgressMonitor monitor) {
ChangeSet changeSet = getChangeSet(event.getTree());
if (changeSet != null) {
SyncInfoSet targetSet = getSyncInfoSet(changeSet);
@@ -470,6 +482,7 @@ public class ActiveChangeSetCollector implements IDiffChangeListener {
}, true /* preserver expansion */, true /* run in UI thread */);
}
+ @Override
public void propertyChanged(IDiffTree tree, int property, IPath[] paths) {
// Nothing to do
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetDiffNode.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetDiffNode.java
index 9c2723e37..fbe6ada15 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetDiffNode.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetDiffNode.java
@@ -32,7 +32,8 @@ public class ChangeSetDiffNode extends SynchronizeModelElement {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeModelElement#getResource()
*/
- public IResource getResource() {
+ @Override
+ public IResource getResource() {
return null;
}
@@ -43,6 +44,7 @@ public class ChangeSetDiffNode extends SynchronizeModelElement {
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
*/
+ @Override
public ImageDescriptor getImageDescriptor(Object object) {
return TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_CHANGE_SET);
}
@@ -50,6 +52,7 @@ public class ChangeSetDiffNode extends SynchronizeModelElement {
/* (non-Javadoc)
* @see org.eclipse.compare.structuremergeviewer.DiffNode#getName()
*/
+ @Override
public String getName() {
return set.getName();
}
@@ -57,6 +60,7 @@ public class ChangeSetDiffNode extends SynchronizeModelElement {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SyncInfoModelElement#toString()
*/
+ @Override
public String toString() {
return getName();
}
@@ -64,14 +68,16 @@ public class ChangeSetDiffNode extends SynchronizeModelElement {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelElement#hashCode()
*/
- public int hashCode() {
+ @Override
+ public int hashCode() {
return set.hashCode();
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelElement#equals(java.lang.Object)
*/
- public boolean equals(Object object) {
+ @Override
+ public boolean equals(Object object) {
if (object instanceof ChangeSetDiffNode) {
return((ChangeSetDiffNode)object).getSet() == set;
}
@@ -81,7 +87,8 @@ public class ChangeSetDiffNode extends SynchronizeModelElement {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelElement#getAdapter(java.lang.Class)
*/
- public Object getAdapter(Class adapter) {
+ @Override
+ public Object getAdapter(Class adapter) {
if (adapter.equals(ChangeSet.class)) {
return set;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java
index 71945edfa..75437e1f6 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetLabelDecorator.java
@@ -36,7 +36,8 @@ public class ChangeSetLabelDecorator extends LabelProvider implements ILabelDeco
}
}
- public String decorateText(String input, Object element) {
+ @Override
+ public String decorateText(String input, Object element) {
String text = input;
if (element instanceof ChangeSetDiffNode) {
ChangeSet set = ((ChangeSetDiffNode)element).getSet();
@@ -47,12 +48,14 @@ public class ChangeSetLabelDecorator extends LabelProvider implements ILabelDeco
return text;
}
+ @Override
public void dispose() {
if(boldFont != null) {
boldFont.dispose();
}
}
+ @Override
public Font decorateFont(Object element) {
if (element instanceof ChangeSetDiffNode) {
ChangeSet set = ((ChangeSetDiffNode)element).getSet();
@@ -78,7 +81,8 @@ public class ChangeSetLabelDecorator extends LabelProvider implements ILabelDeco
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, java.lang.Object)
*/
- public Image decorateImage(Image image, Object element) {
+ @Override
+ public Image decorateImage(Image image, Object element) {
return image;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelManager.java
index a0bb012c7..52dc38d2e 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelManager.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelManager.java
@@ -37,7 +37,8 @@ public class ChangeSetModelManager extends HierarchicalModelManager implements I
setToolTipText(TeamUIMessages.ChangeLogModelManager_0);
update();
}
- public void run() {
+ @Override
+ public void run() {
setCommitSetsEnabled(!enabled);
update();
}
@@ -50,7 +51,8 @@ public class ChangeSetModelManager extends HierarchicalModelManager implements I
private class CommitSetActionContribution extends SynchronizePageActionGroup {
- public void initialize(ISynchronizePageConfiguration configuration) {
+ @Override
+ public void initialize(ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
toggleCommitSetAction = new ToggleCommitSetAction();
@@ -72,7 +74,8 @@ public class ChangeSetModelManager extends HierarchicalModelManager implements I
configuration.addLabelDecorator(new ChangeSetLabelDecorator(configuration));
}
configuration.addPropertyChangeListener(new IPropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent event) {
+ @Override
+ public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().equals(ISynchronizePageConfiguration.P_MODE)) {
updateEnablement();
}
@@ -104,6 +107,7 @@ public class ChangeSetModelManager extends HierarchicalModelManager implements I
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelManager#dispose()
*/
+ @Override
public void dispose() {
getConfiguration().removePropertyChangeListener(this);
super.dispose();
@@ -112,6 +116,7 @@ public class ChangeSetModelManager extends HierarchicalModelManager implements I
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelManager#createModelProvider(java.lang.String)
*/
+ @Override
protected ISynchronizeModelProvider createModelProvider(String id) {
if (enabled) {
return new ChangeSetModelProvider(getConfiguration(), getSyncInfoSet(), id);
@@ -123,7 +128,8 @@ public class ChangeSetModelManager extends HierarchicalModelManager implements I
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelManager#getSelectedProviderId()
*/
- protected String getSelectedProviderId() {
+ @Override
+ protected String getSelectedProviderId() {
String id = super.getSelectedProviderId();
if (id.equals(ChangeSetModelProvider.ChangeSetModelProviderDescriptor.ID)) {
return ((ChangeSetModelProvider)getActiveModelProvider()).getSubproviderId();
@@ -135,13 +141,15 @@ public class ChangeSetModelManager extends HierarchicalModelManager implements I
/* (non-Javadoc)
* @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelManager#saveProviderSettings(java.lang.String)
*/
- protected void saveProviderSettings(String id) {
+ @Override
+ protected void saveProviderSettings(String id) {
super.saveProviderSettings(id);
IDialogSettings pageSettings = getConfiguration().getSite().getPageSettings();
if(pageSettings != null) {
@@ -152,7 +160,8 @@ public class ChangeSetModelManager extends HierarchicalModelManager implements I
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelManager#initialize(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
*/
- public void initialize(ISynchronizePageConfiguration configuration) {
+ @Override
+ public void initialize(ISynchronizePageConfiguration configuration) {
// Load our setting before invoking super since the inherited
// initialize will create the provider
IDialogSettings pageSettings = getConfiguration().getSite().getPageSettings();
@@ -177,7 +186,8 @@ public class ChangeSetModelManager extends HierarchicalModelManager implements I
/* (non-Javadoc)
* This method is public so it can be invoked from test cases
*/
- public ISynchronizeModelProvider getActiveModelProvider() {
+ @Override
+ public ISynchronizeModelProvider getActiveModelProvider() {
return super.getActiveModelProvider();
}
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java
index 5825679a7..28b2b5407 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java
@@ -47,7 +47,8 @@ public class ChangeSetModelProvider extends CompositeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.core.subscribers.IChangeSetChangeListener#setAdded(org.eclipse.team.core.subscribers.ChangeSet)
*/
- public void setAdded(final ChangeSet set) {
+ @Override
+ public void setAdded(final ChangeSet set) {
final SyncInfoTree syncInfoSet;
// TODO: May need to be modified to work with two-way
if (set instanceof CheckedInChangeSet) {
@@ -62,7 +63,8 @@ public class ChangeSetModelProvider extends CompositeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.core.subscribers.IChangeSetChangeListener#defaultSetChanged(org.eclipse.team.core.subscribers.ChangeSet, org.eclipse.team.core.subscribers.ChangeSet)
*/
- public void defaultSetChanged(final ChangeSet previousDefault, final ChangeSet set) {
+ @Override
+ public void defaultSetChanged(final ChangeSet previousDefault, final ChangeSet set) {
refreshLabel(previousDefault);
refreshLabel(set);
}
@@ -70,21 +72,24 @@ public class ChangeSetModelProvider extends CompositeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.core.subscribers.IChangeSetChangeListener#setRemoved(org.eclipse.team.core.subscribers.ChangeSet)
*/
- public void setRemoved(final ChangeSet set) {
+ @Override
+ public void setRemoved(final ChangeSet set) {
removeModelElementForSet(set);
}
/* (non-Javadoc)
* @see org.eclipse.team.core.subscribers.IChangeSetChangeListener#nameChanged(org.eclipse.team.core.subscribers.ChangeSet)
*/
- public void nameChanged(final ChangeSet set) {
+ @Override
+ public void nameChanged(final ChangeSet set) {
refreshLabel(set);
}
/* (non-Javadoc)
* @see org.eclipse.team.core.subscribers.IChangeSetChangeListener#resourcesChanged(org.eclipse.team.core.subscribers.ChangeSet, org.eclipse.core.resources.IResource[])
*/
- public void resourcesChanged(ChangeSet set, IPath[] paths) {
+ @Override
+ public void resourcesChanged(ChangeSet set, IPath[] paths) {
// The sub-providers listen directly to the sets for changes
// There is no global action to be taken for such changes
}
@@ -97,12 +102,15 @@ public class ChangeSetModelProvider extends CompositeModelProvider {
*/
public static class ChangeSetModelProviderDescriptor implements ISynchronizeModelProviderDescriptor {
public static final String ID = TeamUIPlugin.ID + ".modelprovider_cvs_changelog"; //$NON-NLS-1$
+ @Override
public String getId() {
return ID;
}
+ @Override
public String getName() {
return TeamUIMessages.ChangeLogModelProvider_5;
}
+ @Override
public ImageDescriptor getImageDescriptor() {
return TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_CHANGE_SET);
}
@@ -128,7 +136,8 @@ public class ChangeSetModelProvider extends CompositeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#handleChanges(org.eclipse.team.core.synchronize.ISyncInfoTreeChangeEvent, org.eclipse.core.runtime.IProgressMonitor)
*/
- protected void handleChanges(ISyncInfoTreeChangeEvent event, IProgressMonitor monitor) {
+ @Override
+ protected void handleChanges(ISyncInfoTreeChangeEvent event, IProgressMonitor monitor) {
boolean handled = false;
if (checkedInCollector != null && getChangeSetCapability().enableCheckedInChangeSetsFor(getConfiguration())) {
checkedInCollector.handleChange(event);
@@ -166,14 +175,16 @@ public class ChangeSetModelProvider extends CompositeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.CompositeModelProvider#handleAddition(org.eclipse.team.core.synchronize.SyncInfo)
*/
- protected void handleAddition(SyncInfo info) {
+ @Override
+ protected void handleAddition(SyncInfo info) {
// Nothing to do since change handling was bypassed
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#buildModelObjects(org.eclipse.team.ui.synchronize.ISynchronizeModelElement)
*/
- protected IDiffElement[] buildModelObjects(ISynchronizeModelElement node) {
+ @Override
+ protected IDiffElement[] buildModelObjects(ISynchronizeModelElement node) {
// This method is invoked on a reset after the provider state has been cleared.
// Resetting the collector will rebuild the model
@@ -215,14 +226,16 @@ public class ChangeSetModelProvider extends CompositeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ISynchronizeModelProvider#getDescriptor()
*/
- public ISynchronizeModelProviderDescriptor getDescriptor() {
+ @Override
+ public ISynchronizeModelProviderDescriptor getDescriptor() {
return descriptor;
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ISynchronizeModelProvider#getViewerSorter()
*/
- public ViewerSorter getViewerSorter() {
+ @Override
+ public ViewerSorter getViewerSorter() {
if (viewerSorter == null) {
viewerSorter = new ChangeSetModelSorter(this, ChangeSetActionGroup.getSortCriteria(getConfiguration()));
}
@@ -240,7 +253,8 @@ public class ChangeSetModelProvider extends CompositeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#createActionGroup()
*/
- protected SynchronizePageActionGroup createActionGroup() {
+ @Override
+ protected SynchronizePageActionGroup createActionGroup() {
return new ChangeSetActionGroup(this);
}
@@ -258,7 +272,8 @@ public class ChangeSetModelProvider extends CompositeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.CompositeModelProvider#removeProvider(org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider)
*/
- protected void removeProvider(ISynchronizeModelProvider provider) {
+ @Override
+ protected void removeProvider(ISynchronizeModelProvider provider) {
rootToProvider.remove(provider.getModelRoot());
super.removeProvider(provider);
}
@@ -282,7 +297,8 @@ public class ChangeSetModelProvider extends CompositeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.CompositeModelProvider#clearModelObjects(org.eclipse.team.ui.synchronize.ISynchronizeModelElement)
*/
- protected void recursiveClearModelObjects(ISynchronizeModelElement node) {
+ @Override
+ protected void recursiveClearModelObjects(ISynchronizeModelElement node) {
super.recursiveClearModelObjects(node);
if (node == getModelRoot()) {
rootToProvider.clear();
@@ -315,7 +331,8 @@ public class ChangeSetModelProvider extends CompositeModelProvider {
// This action group will be disposed when the provider is disposed
getConfiguration().addActionContribution(actionGroup);
provider.addPropertyChangeListener(new IPropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent event) {
+ @Override
+ public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().equals(P_VIEWER_SORTER)) {
embeddedSorter = provider.getViewerSorter();
ChangeSetModelProvider.this.firePropertyChange(P_VIEWER_SORTER, null, null);
@@ -353,7 +370,8 @@ public class ChangeSetModelProvider extends CompositeModelProvider {
return null;
}
- public void dispose() {
+ @Override
+ public void dispose() {
if (checkedInCollector != null) {
checkedInCollector.removeListener(changeSetListener);
checkedInCollector.dispose();
@@ -366,7 +384,8 @@ public class ChangeSetModelProvider extends CompositeModelProvider {
}
- public void waitUntilDone(IProgressMonitor monitor) {
+ @Override
+ public void waitUntilDone(IProgressMonitor monitor) {
super.waitUntilDone(monitor);
if (checkedInCollector != null) {
checkedInCollector.waitUntilDone(monitor);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelSorter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelSorter.java
index f44fa5108..5ebbaba68 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelSorter.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelSorter.java
@@ -67,6 +67,7 @@ public class ChangeSetModelSorter extends ViewerSorter {
/* (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.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
index e10b187e1..7547035fd 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
@@ -103,6 +103,7 @@ public class ChangesSection extends Composite {
/* (non-Javadoc)
* @see org.eclipse.swt.widgets.Widget#dispose()
*/
+ @Override
public void dispose() {
super.dispose();
forms.dispose();
@@ -115,6 +116,7 @@ public class ChangesSection extends Composite {
protected void initializeChangesViewer() {
TeamUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
Control control = ChangesSection.this.getChangesViewer().getControl();
if (!getContainer().isDisposed() && !control.isDisposed()) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java
index 8ecd90aa8..2c9a14a00 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompositeModelProvider.java
@@ -54,14 +54,16 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#getProvider(org.eclipse.team.ui.synchronize.ISynchronizeModelElement)
*/
- protected ISynchronizeModelProvider getProvider(ISynchronizeModelElement element) {
+ @Override
+ protected ISynchronizeModelProvider getProvider(ISynchronizeModelElement element) {
return (ISynchronizeModelProvider)elementToProvider.get(element);
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#getClosestExistingParents(org.eclipse.core.resources.IResource)
*/
- public ISynchronizeModelElement[] getClosestExistingParents(IResource resource) {
+ @Override
+ public ISynchronizeModelElement[] getClosestExistingParents(IResource resource) {
ISynchronizeModelProvider[] providers = getProviders();
if (providers.length == 0) {
return new ISynchronizeModelElement[0];
@@ -112,7 +114,8 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#handleResourceAdditions(org.eclipse.team.core.synchronize.ISyncInfoTreeChangeEvent)
*/
- protected final void handleResourceAdditions(ISyncInfoTreeChangeEvent event) {
+ @Override
+ protected final void handleResourceAdditions(ISyncInfoTreeChangeEvent event) {
handleAdditions(event.getAddedResources());
}
@@ -137,7 +140,8 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#handleResourceChanges(org.eclipse.team.core.synchronize.ISyncInfoTreeChangeEvent)
*/
- protected final void handleResourceChanges(ISyncInfoTreeChangeEvent event) {
+ @Override
+ protected final void handleResourceChanges(ISyncInfoTreeChangeEvent event) {
SyncInfo[] infos = event.getChangedResources();
for (int i = 0; i < infos.length; i++) {
SyncInfo info = infos[i];
@@ -158,7 +162,8 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#handleResourceRemovals(org.eclipse.team.core.synchronize.ISyncInfoTreeChangeEvent)
*/
- protected final void handleResourceRemovals(ISyncInfoTreeChangeEvent event) {
+ @Override
+ protected final void handleResourceRemovals(ISyncInfoTreeChangeEvent event) {
IResource[] resources = event.getRemovedResources();
for (int i = 0; i < resources.length; i++) {
IResource resource = resources[i];
@@ -194,6 +199,7 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#nodeAdded(org.eclipse.team.ui.synchronize.ISynchronizeModelElement)
*/
+ @Override
protected void nodeAdded(ISynchronizeModelElement node, AbstractSynchronizeModelProvider provider) {
// Update the resource-to-element map and the element-to-provider map
IResource r = node.getResource();
@@ -212,7 +218,8 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#modelObjectCleared(org.eclipse.team.ui.synchronize.ISynchronizeModelElement)
*/
- public void modelObjectCleared(ISynchronizeModelElement node) {
+ @Override
+ public void modelObjectCleared(ISynchronizeModelElement node) {
super.modelObjectCleared(node);
IResource r = node.getResource();
if(r != null) {
@@ -230,7 +237,8 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#clearModelObjects(org.eclipse.team.ui.synchronize.ISynchronizeModelElement)
*/
- protected void recursiveClearModelObjects(ISynchronizeModelElement node) {
+ @Override
+ protected void recursiveClearModelObjects(ISynchronizeModelElement node) {
super.recursiveClearModelObjects(node);
if (node == getModelRoot()) {
clearProviders();
@@ -266,7 +274,8 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#dispose()
*/
- public void dispose() {
+ @Override
+ public void dispose() {
clearProviders();
super.dispose();
}
@@ -274,14 +283,16 @@ public abstract class CompositeModelProvider extends AbstractSynchronizeModelPro
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#hasViewerState()
*/
- protected boolean hasViewerState() {
+ @Override
+ protected boolean hasViewerState() {
return resourceToElements != null && !resourceToElements.isEmpty();
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#getModelObjects(org.eclipse.core.resources.IResource)
*/
- protected ISynchronizeModelElement[] getModelObjects(IResource resource) {
+ @Override
+ protected ISynchronizeModelElement[] getModelObjects(IResource resource) {
List elements = (List)resourceToElements.get(resource);
if (elements == null) {
return new ISynchronizeModelElement[0];
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java
index bf61ec588..d15689e02 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/CompressedFoldersModelProvider.java
@@ -38,6 +38,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider {
/* (non-Javadoc)
* @see org.eclipse.compare.structuremergeviewer.DiffNode#getName()
*/
+ @Override
public String getName() {
IResource resource = getResource();
return resource.getProjectRelativePath().toString();
@@ -46,6 +47,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SyncInfoModelElement#getImageDescriptor(java.lang.Object)
*/
+ @Override
public ImageDescriptor getImageDescriptor(Object object) {
return TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_COMPRESSED_FOLDER);
}
@@ -63,6 +65,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider {
/* (non-Javadoc)
* @see org.eclipse.compare.structuremergeviewer.DiffNode#getName()
*/
+ @Override
public String getName() {
IResource resource = getResource();
return resource.getProjectRelativePath().toString();
@@ -71,6 +74,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SyncInfoModelElement#getImageDescriptor(java.lang.Object)
*/
+ @Override
public ImageDescriptor getImageDescriptor(Object object) {
return TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_COMPRESSED_FOLDER);
}
@@ -78,12 +82,15 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider {
public static class CompressedFolderModelProviderDescriptor implements ISynchronizeModelProviderDescriptor {
public static final String ID = TeamUIPlugin.ID + ".modelprovider_compressedfolders"; //$NON-NLS-1$
+ @Override
public String getId() {
return ID;
}
+ @Override
public String getName() {
return TeamUIMessages.CompressedFoldersModelProvider_0;
}
+ @Override
public ImageDescriptor getImageDescriptor() {
return TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_COMPRESSED_FOLDER);
}
@@ -104,6 +111,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.HierarchicalModelProvider#getDescriptor()
*/
+ @Override
public ISynchronizeModelProviderDescriptor getDescriptor() {
return compressedDescriptor;
}
@@ -111,8 +119,10 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SyncInfoDiffNodeRoot#getSorter()
*/
+ @Override
public ViewerSorter getViewerSorter() {
return new SynchronizeModelElementSorter() {
+ @Override
protected int compareNames(IResource resource1, IResource resource2) {
if (resource1.getType() == IResource.FOLDER && resource2.getType() == IResource.FOLDER) {
return collator.compare(resource1.getProjectRelativePath().toString(), resource2.getProjectRelativePath().toString());
@@ -125,6 +135,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.viewers.HierarchicalModelProvider#createModelObjects(org.eclipse.compare.structuremergeviewer.DiffNode)
*/
+ @Override
protected IDiffElement[] createModelObjects(ISynchronizeModelElement container) {
IResource resource = null;
if (container == getModelRoot()) {
@@ -190,6 +201,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.viewers.HierarchicalModelProvider#createModelObject(org.eclipse.compare.structuremergeviewer.DiffNode, org.eclipse.core.resources.IResource)
*/
+ @Override
protected ISynchronizeModelElement createModelObject(ISynchronizeModelElement parent, IResource resource) {
if (resource.getType() == IResource.FOLDER) {
SyncInfo info = getSyncInfoTree().getSyncInfo(resource);
@@ -211,6 +223,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider {
* Subclasses may override.
* @param event
*/
+ @Override
protected void handleResourceAdditions(ISyncInfoTreeChangeEvent event) {
SyncInfo[] infos = event.getAddedResources();
for (int i = 0; i < infos.length; i++) {
@@ -219,6 +232,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider {
}
}
+ @Override
protected void addResource(SyncInfo info) {
IResource local = info.getLocal();
ISynchronizeModelElement existingNode = getModelObject(local);
@@ -256,6 +270,7 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.sync.views.SyncSetContentProvider#handleResourceRemovals(org.eclipse.team.internal.ui.sync.views.SyncSetChangedEvent)
*/
+ @Override
protected void handleResourceRemovals(ISyncInfoTreeChangeEvent event) {
IResource[] roots = event.getRemovedSubtreeRoots();
@@ -298,7 +313,8 @@ public class CompressedFoldersModelProvider extends HierarchicalModelProvider {
}
}
- protected int getLogicalModelDepth(IResource resource) {
+ @Override
+ protected int getLogicalModelDepth(IResource resource) {
if(resource.getType() == IResource.PROJECT) {
return IResource.DEPTH_INFINITE;
} else {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureRefreshScheduleDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureRefreshScheduleDialog.java
index d0b839ec7..857d7aef3 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureRefreshScheduleDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureRefreshScheduleDialog.java
@@ -35,8 +35,10 @@ public class ConfigureRefreshScheduleDialog extends DetailsDialog {
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
*/
+ @Override
protected void createMainDialogArea(Composite parent) {
IPageValidator validator = new IPageValidator() {
+ @Override
public void setComplete(String errorMessage) {
setPageComplete(errorMessage == null);
setErrorMessage(errorMessage);
@@ -49,6 +51,7 @@ public class ConfigureRefreshScheduleDialog extends DetailsDialog {
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.Dialog#okPressed()
*/
+ @Override
protected void okPressed() {
scheduleComposite.saveValues();
super.okPressed();
@@ -57,6 +60,7 @@ public class ConfigureRefreshScheduleDialog extends DetailsDialog {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#includeDetailsButton()
*/
+ @Override
protected boolean includeDetailsButton() {
return false;
}
@@ -64,6 +68,7 @@ public class ConfigureRefreshScheduleDialog extends DetailsDialog {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#createDropDownDialogArea(org.eclipse.swt.widgets.Composite)
*/
+ @Override
protected Composite createDropDownDialogArea(Composite parent) {
return null;
}
@@ -71,10 +76,12 @@ public class ConfigureRefreshScheduleDialog extends DetailsDialog {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.dialogs.DetailsDialog#updateEnablements()
*/
+ @Override
protected void updateEnablements() {
}
- protected String getHelpContextId() {
+ @Override
+ protected String getHelpContextId() {
return IHelpContextIds.CONFIGURE_REFRESH_SCHEDULE_DIALOG;
}
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java
index 40ad00ab5..8697205b0 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ConfigureSynchronizeScheduleComposite.java
@@ -113,9 +113,11 @@ public class ConfigureSynchronizeScheduleComposite extends Composite {
enableBackgroundRefresh.setLayoutData(gridData);
enableBackgroundRefresh.setText(TeamUIMessages.ConfigureRefreshScheduleDialog_3);
enableBackgroundRefresh.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetSelected(SelectionEvent e) {
updateEnablements();
}
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
}
});
@@ -129,9 +131,11 @@ public class ConfigureSynchronizeScheduleComposite extends Composite {
repeatEvery = createIndentedButton(area, TeamUIMessages.ConfigureRefreshScheduleDialog_4, 20);
repeatEvery.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetSelected(SelectionEvent e) {
updateEnablements();
}
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
}
});
@@ -141,11 +145,13 @@ public class ConfigureSynchronizeScheduleComposite extends Composite {
gridData.widthHint = 35;
timeInterval.setLayoutData(gridData);
timeInterval.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
updateEnablements();
}
});
timeInterval.addVerifyListener(new VerifyListener() {
+ @Override
public void verifyText(VerifyEvent e) {
String string = e.text;
char[] chars = new char[string.length()];
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DecoratingColorLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DecoratingColorLabelProvider.java
index c3593b8f9..c19014b5e 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DecoratingColorLabelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DecoratingColorLabelProvider.java
@@ -33,6 +33,7 @@ public class DecoratingColorLabelProvider extends DecoratingLabelProvider implem
* (non-Javadoc)
* @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
*/
+ @Override
public Color getForeground(Object element) {
ILabelProvider p = getLabelProvider();
if (p instanceof IColorProvider) {
@@ -45,6 +46,7 @@ public class DecoratingColorLabelProvider extends DecoratingLabelProvider implem
* (non-Javadoc)
* @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
*/
+ @Override
public Color getBackground(Object element) {
ILabelProvider p = getLabelProvider();
if (p instanceof IColorProvider) {
@@ -56,6 +58,7 @@ public class DecoratingColorLabelProvider extends DecoratingLabelProvider implem
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
*/
+ @Override
public Font getFont(Object element) {
ILabelProvider p = getLabelProvider();
if (p instanceof IFontProvider) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DialogSynchronizePageSite.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DialogSynchronizePageSite.java
index 183536387..da70574fd 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DialogSynchronizePageSite.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DialogSynchronizePageSite.java
@@ -48,59 +48,69 @@ public class DialogSynchronizePageSite implements ISynchronizePageSite {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getSelectionProvider()
*/
+ @Override
public ISelectionProvider getSelectionProvider() {
return selectionProvider;
}
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getShell()
*/
+ @Override
public Shell getShell() {
return shell;
}
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#setSelectionProvider(org.eclipse.jface.viewers.ISelectionProvider)
*/
+ @Override
public void setSelectionProvider(ISelectionProvider provider) {
selectionProvider = provider;
}
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getWorkbenchSite()
*/
+ @Override
public IWorkbenchSite getWorkbenchSite() {
return null;
}
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getPart()
*/
+ @Override
public IWorkbenchPart getPart() {
return null;
}
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getKeyBindingService()
*/
+ @Override
public IKeyBindingService getKeyBindingService() {
return null;
}
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#setFocus()
*/
+ @Override
public void setFocus() {
}
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getPageSettings()
*/
+ @Override
public IDialogSettings getPageSettings() {
return null;
}
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getActionBars()
*/
+ @Override
public IActionBars getActionBars() {
return actionBars;
}
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#isModal()
*/
+ @Override
public boolean isModal() {
return isModal;
}
@@ -112,20 +122,26 @@ public class DialogSynchronizePageSite implements ISynchronizePageSite {
public void createActionBars(final IToolBarManager toolbar) {
if (actionBars == null) {
actionBars = new IActionBars() {
+ @Override
public void clearGlobalActionHandlers() {
}
+ @Override
public IAction getGlobalActionHandler(String actionId) {
return null;
}
+ @Override
public IMenuManager getMenuManager() {
return null;
}
+ @Override
public IStatusLineManager getStatusLineManager() {
return null;
}
+ @Override
public IToolBarManager getToolBarManager() {
return toolbar;
}
+ @Override
public void setGlobalActionHandler(String actionId, IAction action) {
if (actionId != null && !"".equals(actionId)) { //$NON-NLS-1$
IHandler handler = new ActionHandler(action);
@@ -135,8 +151,10 @@ public class DialogSynchronizePageSite implements ISynchronizePageSite {
}
}
+ @Override
public void updateActionBars() {
}
+ @Override
public IServiceLocator getServiceLocator() {
return null;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DiffNodeWorkbenchAdapter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DiffNodeWorkbenchAdapter.java
index 22d5d8788..b610724a0 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DiffNodeWorkbenchAdapter.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DiffNodeWorkbenchAdapter.java
@@ -20,6 +20,7 @@ public class DiffNodeWorkbenchAdapter implements IWorkbenchAdapter {
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object)
*/
+ @Override
public Object[] getChildren(Object o) {
DiffNode node = getDiffNode(o);
return node != null ? node.getChildren() : new Object[0];
@@ -28,6 +29,7 @@ public class DiffNodeWorkbenchAdapter implements IWorkbenchAdapter {
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
*/
+ @Override
public ImageDescriptor getImageDescriptor(Object o) {
DiffNode node = getDiffNode(o);
if(node instanceof ISynchronizeModelElement) {
@@ -39,6 +41,7 @@ public class DiffNodeWorkbenchAdapter implements IWorkbenchAdapter {
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object)
*/
+ @Override
public String getLabel(Object o) {
DiffNode node = getDiffNode(o);
return node != null ? node.getName() : ""; //$NON-NLS-1$
@@ -47,6 +50,7 @@ public class DiffNodeWorkbenchAdapter implements IWorkbenchAdapter {
/* (non-Javadoc)
* @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
*/
+ @Override
public Object getParent(Object o) {
DiffNode node = getDiffNode(o);
return node != null ? node.getParent() : null;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/EditableSharedDocumentAdapter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/EditableSharedDocumentAdapter.java
index 774877540..f4773fd70 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/EditableSharedDocumentAdapter.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/EditableSharedDocumentAdapter.java
@@ -85,6 +85,7 @@ public class EditableSharedDocumentAdapter extends
/* (non-Javadoc)
* @see org.eclipse.compare.SharedDocumentAdapter#connect(org.eclipse.ui.texteditor.IDocumentProvider, org.eclipse.ui.IEditorInput)
*/
+ @Override
public void connect(IDocumentProvider provider, IEditorInput documentKey)
throws CoreException {
super.connect(provider, documentKey);
@@ -98,6 +99,7 @@ public class EditableSharedDocumentAdapter extends
/* (non-Javadoc)
* @see org.eclipse.compare.SharedDocumentAdapter#disconnect(org.eclipse.ui.texteditor.IDocumentProvider, org.eclipse.ui.IEditorInput)
*/
+ @Override
public void disconnect(IDocumentProvider provider,
IEditorInput documentKey) {
try {
@@ -158,6 +160,7 @@ public class EditableSharedDocumentAdapter extends
/* (non-Javadoc)
* @see org.eclipse.compare.SharedDocumentAdapter#flushDocument(org.eclipse.ui.texteditor.IDocumentProvider, org.eclipse.ui.IEditorInput, org.eclipse.jface.text.IDocument, boolean, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void flushDocument(IDocumentProvider provider,
IEditorInput documentKey, IDocument document,
boolean overwrite)
@@ -174,6 +177,7 @@ public class EditableSharedDocumentAdapter extends
/* (non-Javadoc)
* @see org.eclipse.ui.texteditor.IElementStateListener#elementContentAboutToBeReplaced(java.lang.Object)
*/
+ @Override
public void elementContentAboutToBeReplaced(Object element) {
// Nothing to do
}
@@ -181,6 +185,7 @@ public class EditableSharedDocumentAdapter extends
/* (non-Javadoc)
* @see org.eclipse.ui.texteditor.IElementStateListener#elementContentReplaced(java.lang.Object)
*/
+ @Override
public void elementContentReplaced(Object element) {
// Nothing to do
}
@@ -188,6 +193,7 @@ public class EditableSharedDocumentAdapter extends
/* (non-Javadoc)
* @see org.eclipse.ui.texteditor.IElementStateListener#elementDeleted(java.lang.Object)
*/
+ @Override
public void elementDeleted(Object element) {
listener.handleDocumentDeleted();
}
@@ -195,6 +201,7 @@ public class EditableSharedDocumentAdapter extends
/* (non-Javadoc)
* @see org.eclipse.ui.texteditor.IElementStateListener#elementDirtyStateChanged(java.lang.Object, boolean)
*/
+ @Override
public void elementDirtyStateChanged(Object element, boolean isDirty) {
if (!isDirty) {
this.listener.handleDocumentSaved();
@@ -204,6 +211,7 @@ public class EditableSharedDocumentAdapter extends
/* (non-Javadoc)
* @see org.eclipse.ui.texteditor.IElementStateListener#elementMoved(java.lang.Object, java.lang.Object)
*/
+ @Override
public void elementMoved(Object originalElement, Object movedElement) {
// Nothing to do
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java
index 60dfb33f3..93e85c683 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/FlatModelProvider.java
@@ -33,12 +33,15 @@ public class FlatModelProvider extends SynchronizeModelProvider {
public static class FlatModelProviderDescriptor implements ISynchronizeModelProviderDescriptor {
public static final String ID = TeamUIPlugin.ID + ".modelprovider_flat"; //$NON-NLS-1$
+ @Override
public String getId() {
return ID;
}
+ @Override
public String getName() {
return TeamUIMessages.FlatModelProvider_0;
}
+ @Override
public ImageDescriptor getImageDescriptor() {
return TeamImages.getImageDescriptor(ITeamUIImages.IMG_FLAT);
}
@@ -57,6 +60,7 @@ public class FlatModelProvider extends SynchronizeModelProvider {
public FullPathSyncInfoElement(IDiffContainer parent, SyncInfo info) {
super(parent, info);
}
+ @Override
public String getName() {
IResource resource = getResource();
return resource.getName() + " - " + resource.getFullPath().toString(); //$NON-NLS-1$
@@ -98,6 +102,7 @@ public class FlatModelProvider extends SynchronizeModelProvider {
/* (non-Javadoc)
* Method declared on ViewerSorter.
*/
+ @Override
public int compare(Viewer viewer, Object o1, Object o2) {
if (o1 instanceof FullPathSyncInfoElement && o2 instanceof FullPathSyncInfoElement) {
@@ -134,6 +139,7 @@ public class FlatModelProvider extends SynchronizeModelProvider {
update();
}
+ @Override
public void run() {
if (isChecked() && sortCriteria != criteria) {
sortCriteria = criteria;
@@ -161,6 +167,7 @@ public class FlatModelProvider extends SynchronizeModelProvider {
*/
public class FlatActionGroup extends SynchronizePageActionGroup {
private MenuManager sortByResource;
+ @Override
public void initialize(ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
sortByResource = new MenuManager(TeamUIMessages.FlatModelProvider_6);
@@ -181,6 +188,7 @@ public class FlatModelProvider extends SynchronizeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#dispose()
*/
+ @Override
public void dispose() {
sortByResource.dispose();
sortByResource.removeAll();
@@ -221,21 +229,24 @@ public class FlatModelProvider extends SynchronizeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#createActionGroup()
*/
- protected SynchronizePageActionGroup createActionGroup() {
+ @Override
+ protected SynchronizePageActionGroup createActionGroup() {
return new FlatActionGroup();
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ISynchronizeModelProvider#getViewerSorter()
*/
- public ViewerSorter getViewerSorter() {
+ @Override
+ public ViewerSorter getViewerSorter() {
return new FlatSorter(sortCriteria);
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#buildModelObjects(org.eclipse.team.ui.synchronize.ISynchronizeModelElement)
*/
- protected IDiffElement[] buildModelObjects(ISynchronizeModelElement node) {
+ @Override
+ protected IDiffElement[] buildModelObjects(ISynchronizeModelElement node) {
if (node == getModelRoot());
SyncInfo[] infos = getSyncInfoSet().getSyncInfos();
List result = new ArrayList();
@@ -249,14 +260,16 @@ public class FlatModelProvider extends SynchronizeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#handleResourceAdditions(org.eclipse.team.core.synchronize.ISyncInfoTreeChangeEvent)
*/
- protected void handleResourceAdditions(ISyncInfoTreeChangeEvent event) {
+ @Override
+ protected void handleResourceAdditions(ISyncInfoTreeChangeEvent event) {
addResources(event.getAddedResources());
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#handleResourceRemovals(org.eclipse.team.core.synchronize.ISyncInfoTreeChangeEvent)
*/
- protected void handleResourceRemovals(ISyncInfoTreeChangeEvent event) {
+ @Override
+ protected void handleResourceRemovals(ISyncInfoTreeChangeEvent event) {
IResource[] resources = event.getRemovedResources();
removeFromViewer(resources);
}
@@ -264,10 +277,12 @@ public class FlatModelProvider extends SynchronizeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ISynchronizeModelProvider#getDescriptor()
*/
- public ISynchronizeModelProviderDescriptor getDescriptor() {
+ @Override
+ public ISynchronizeModelProviderDescriptor getDescriptor() {
return flatDescriptor;
}
+ @Override
protected void addResource(SyncInfo info) {
// Add the node to the root
ISynchronizeModelElement node = getModelObject(info.getLocal());
@@ -279,6 +294,7 @@ public class FlatModelProvider extends SynchronizeModelProvider {
createModelObject(getModelRoot(), info);
}
+ @Override
protected ISynchronizeModelElement createModelObject(ISynchronizeModelElement parent, SyncInfo info) {
SynchronizeModelElement newNode = new FullPathSyncInfoElement(parent, info);
addToViewer(newNode);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java
index 850506b4c..e86a52839 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java
@@ -41,6 +41,7 @@ public abstract class ForwardingChangesSection extends ChangesSection {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ChangesSection#initializeChangesViewer()
*/
+ @Override
protected void initializeChangesViewer() {
calculateDescription();
}
@@ -50,6 +51,7 @@ public abstract class ForwardingChangesSection extends ChangesSection {
return;
if(getVisibleChangesCount() == 0) {
TeamUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
if (!getContainer().isDisposed())
updatePage(getEmptyChangesComposite(getContainer()));
@@ -57,6 +59,7 @@ public abstract class ForwardingChangesSection extends ChangesSection {
});
} else {
TeamUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
updatePage(null);
}
@@ -118,6 +121,7 @@ public abstract class ForwardingChangesSection extends ChangesSection {
Hyperlink link = getForms().createHyperlink(composite, NLS.bind(TeamUIMessages.ChangesSection_filterChange, new String[] { Utils.modeToString(candidateMode) }), SWT.WRAP);
link.addHyperlinkListener(new HyperlinkAdapter() {
+ @Override
public void linkActivated(HyperlinkEvent e) {
getConfiguration().setMode(candidateMode);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java
index 1b8a4b939..ed2cdb60d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshElementSelectionPage.java
@@ -67,6 +67,7 @@ public abstract class GlobalRefreshElementSelectionPage extends WizardPage {
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent2) {
Composite top = new Composite(parent2, SWT.NULL);
top.setLayout(new GridLayout());
@@ -99,6 +100,7 @@ public abstract class GlobalRefreshElementSelectionPage extends WizardPage {
selectAll.setText(TeamUIMessages.GlobalRefreshResourceSelectionPage_12);
selectAll.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
participantScope.setSelection(true);
selectedResourcesScope.setSelection(false);
@@ -115,6 +117,7 @@ public abstract class GlobalRefreshElementSelectionPage extends WizardPage {
deSelectAll.setText(TeamUIMessages.GlobalRefreshResourceSelectionPage_13);
deSelectAll.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
fViewer.setCheckedElements(new Object[0]);
updateOKStatus();
@@ -137,6 +140,7 @@ public abstract class GlobalRefreshElementSelectionPage extends WizardPage {
participantScope.setText(TeamUIMessages.GlobalRefreshResourceSelectionPage_7);
participantScope.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
updateParticipantScope();
}
@@ -146,6 +150,7 @@ public abstract class GlobalRefreshElementSelectionPage extends WizardPage {
selectedResourcesScope.setText(TeamUIMessages.GlobalRefreshResourceSelectionPage_8);
selectedResourcesScope.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
updateSelectedResourcesScope();
}
@@ -158,6 +163,7 @@ public abstract class GlobalRefreshElementSelectionPage extends WizardPage {
workingSetScope.setText(TeamUIMessages.GlobalRefreshResourceSelectionPage_10);
workingSetScope.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
if (isWorkingSetSelected()) {
updateWorkingSetScope();
@@ -174,6 +180,7 @@ public abstract class GlobalRefreshElementSelectionPage extends WizardPage {
selectWorkingSetButton.setText(TeamUIMessages.GlobalRefreshResourceSelectionPage_11);
selectWorkingSetButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
selectWorkingSetAction();
}
@@ -270,6 +277,7 @@ public abstract class GlobalRefreshElementSelectionPage extends WizardPage {
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#dispose()
*/
+ @Override
public void dispose() {
if(workingSets != null && isWorkingSetSelected()) {
String concatsWorkingSets = makeWorkingSetLabel();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java
index f22b76e32..628480c83 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/GlobalRefreshResourceSelectionPage.java
@@ -46,6 +46,7 @@ public class GlobalRefreshResourceSelectionPage extends GlobalRefreshElementSele
* returns the participants root resources.
*/
class MyContentProvider extends BaseWorkbenchContentProvider {
+ @Override
public Object[] getChildren(Object element) {
if(element instanceof List) {
return ((List)element).toArray(new IResource[((List)element).size()]);
@@ -60,6 +61,7 @@ public class GlobalRefreshResourceSelectionPage extends GlobalRefreshElementSele
*/
class MyLabelProvider extends LabelProvider {
private LabelProvider workbenchProvider = new WorkbenchLabelProvider();
+ @Override
public String getText(Object element) {
if(element instanceof IContainer) {
IContainer c = (IContainer)element;
@@ -69,6 +71,7 @@ public class GlobalRefreshResourceSelectionPage extends GlobalRefreshElementSele
}
return workbenchProvider.getText(element);
}
+ @Override
public Image getImage(Object element) {
return workbenchProvider.getImage(element);
}
@@ -87,6 +90,7 @@ public class GlobalRefreshResourceSelectionPage extends GlobalRefreshElementSele
setTitle(TeamUIMessages.GlobalRefreshResourceSelectionPage_3);
}
+ @Override
protected ContainerCheckedTreeViewer createViewer(Composite top) {
GridData data;
ContainerCheckedTreeViewer fViewer = new ContainerCheckedTreeViewer(top, SWT.BORDER);
@@ -98,6 +102,7 @@ public class GlobalRefreshResourceSelectionPage extends GlobalRefreshElementSele
fViewer.setLabelProvider(new DecoratingLabelProvider(new MyLabelProvider(), PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator()));
fViewer.addCheckStateListener(new ICheckStateListener() {
+ @Override
public void checkStateChanged(CheckStateChangedEvent event) {
updateOKStatus();
}
@@ -107,10 +112,12 @@ public class GlobalRefreshResourceSelectionPage extends GlobalRefreshElementSele
return fViewer;
}
+ @Override
protected void checkAll() {
getViewer().setCheckedElements(resources.toArray());
}
+ @Override
protected boolean checkWorkingSetElements() {
List allWorkingSetResources = new ArrayList();
IWorkingSet[] workingSets = getWorkingSets();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelManager.java
index ea2b08257..fe57c7af0 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelManager.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelManager.java
@@ -24,6 +24,7 @@ public class HierarchicalModelManager extends SynchronizeModelManager {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelManager#getSupportedModelProviders()
*/
+ @Override
protected ISynchronizeModelProviderDescriptor[] getSupportedModelProviders() {
return new ISynchronizeModelProviderDescriptor[] {
new FlatModelProvider.FlatModelProviderDescriptor(),
@@ -34,6 +35,7 @@ public class HierarchicalModelManager extends SynchronizeModelManager {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelManager#createModelProvider(java.lang.String)
*/
+ @Override
protected ISynchronizeModelProvider createModelProvider(String id) {
if(id == null) {
id = getDefaultProviderId();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java
index 7ab3cd791..43d5d27e3 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/HierarchicalModelProvider.java
@@ -44,12 +44,15 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider {
public static class HierarchicalModelProviderDescriptor implements ISynchronizeModelProviderDescriptor {
public static final String ID = TeamUIPlugin.ID + ".modelprovider_hierarchical"; //$NON-NLS-1$
+ @Override
public String getId() {
return ID;
}
+ @Override
public String getName() {
return TeamUIMessages.HierarchicalModelProvider_0;
}
+ @Override
public ImageDescriptor getImageDescriptor() {
return TeamImages.getImageDescriptor(ITeamUIImages.IMG_HIERARCHICAL);
}
@@ -81,10 +84,12 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ISynchronizeModelProvider#getDescriptor()
*/
+ @Override
public ISynchronizeModelProviderDescriptor getDescriptor() {
return hierarchicalDescriptor;
}
+ @Override
public ViewerSorter getViewerSorter() {
return new SynchronizeModelElementSorter();
}
@@ -170,6 +175,7 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.viewers.SynchronizeModelProvider#buildModelObjects(org.eclipse.team.ui.synchronize.viewers.SynchronizeModelElement)
*/
+ @Override
protected IDiffElement[] buildModelObjects(ISynchronizeModelElement node) {
IDiffElement[] children = createModelObjects(node);
for (int i = 0; i < children.length; i++) {
@@ -184,6 +190,7 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.viewers.SynchronizeModelProvider#handleResourceAdditions(org.eclipse.team.core.synchronize.ISyncInfoTreeChangeEvent)
*/
+ @Override
protected void handleResourceAdditions(ISyncInfoTreeChangeEvent event) {
SyncInfo[] infos = event.getAddedResources();
HashSet set = new HashSet();
@@ -199,6 +206,7 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.viewers.SynchronizeModelProvider#handleResourceRemovals(org.eclipse.team.core.synchronize.ISyncInfoTreeChangeEvent)
*/
+ @Override
protected void handleResourceRemovals(ISyncInfoTreeChangeEvent event) {
// Remove the removed subtrees
IResource[] removedRoots = event.getRemovedSubtreeRoots();
@@ -220,14 +228,16 @@ public class HierarchicalModelProvider extends SynchronizeModelProvider {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelProvider#createModelObject(org.eclipse.team.ui.synchronize.ISynchronizeModelElement, org.eclipse.team.core.synchronize.SyncInfo)
*/
- protected ISynchronizeModelElement createModelObject(ISynchronizeModelElement parent, SyncInfo info) {
+ @Override
+ protected ISynchronizeModelElement createModelObject(ISynchronizeModelElement parent, SyncInfo info) {
return createModelObject(parent, info.getLocal());
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.SynchronizeModelProvider#addResource(org.eclipse.team.core.synchronize.SyncInfo)
*/
- protected void addResource(SyncInfo info) {
+ @Override
+ protected void addResource(SyncInfo info) {
addResource(info.getLocal());
}
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ImageManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ImageManager.java
index 23a56af28..17dce141f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ImageManager.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ImageManager.java
@@ -40,6 +40,7 @@ public class ImageManager {
if (v != null) {
// It is best to dispose the images when the view is disposed (see bug 198383)
v.getControl().addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
newRegistry.dispose();
}
@@ -47,6 +48,7 @@ public class ImageManager {
} else {
// The viewer wasn't available so we'll dispose when the context is disposed
context.getCache().addCacheListener(new ICacheListener() {
+ @Override
public void cacheDisposed(ICache cache) {
newRegistry.dispose();
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java
index ea3f947dc..04993d9f5 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceSaveableComparison.java
@@ -82,6 +82,7 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison
if (te instanceof IContentChangeNotifier) {
if (contentChangeListener == null) {
contentChangeListener = new IContentChangeListener() {
+ @Override
public void contentChanged(IContentChangeNotifier source) {
try {
if(! isSaving) {
@@ -121,6 +122,7 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.SaveableCompareModel#performSave(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected void performSave(IProgressMonitor monitor) throws CoreException {
if (checkForUpdateConflicts()) {
return;
@@ -210,6 +212,7 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.SaveableCompareModel#isDirty()
*/
+ @Override
public boolean isDirty() {
// We need to get the dirty state from the compare editor input
// since it is our only connection to the merge viewer
@@ -222,6 +225,7 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.SaveableCompareModel#setDirty(boolean)
*/
+ @Override
protected void setDirty(boolean dirty) {
if (editorInput instanceof SaveablesCompareEditorInput) {
((SaveablesCompareEditorInput) editorInput).setDirty(dirty,
@@ -236,6 +240,7 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.SaveableCompareModel#performRevert(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected void performRevert(IProgressMonitor monitor) {
// Only the left is ever editable
ITypedElement left = getFileElement();
@@ -246,6 +251,7 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison
/* (non-Javadoc)
* @see org.eclipse.ui.Saveable#getName()
*/
+ @Override
public String getName() {
// Return the name of the file element as held in the compare input
if (input.getLeft() != null && input.getLeft().equals(fileElement)) {
@@ -262,6 +268,7 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison
/* (non-Javadoc)
* @see org.eclipse.ui.Saveable#getToolTipText()
*/
+ @Override
public String getToolTipText() {
return editorInput.getToolTipText();
}
@@ -269,6 +276,7 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison
/* (non-Javadoc)
* @see org.eclipse.ui.Saveable#getImageDescriptor()
*/
+ @Override
public ImageDescriptor getImageDescriptor() {
Image image = input.getImage();
if (image != null)
@@ -279,6 +287,7 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison
/* (non-Javadoc)
* @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent e) {
String propertyName= e.getProperty();
if (CompareEditorInput.DIRTY_STATE.equals(propertyName)) {
@@ -315,6 +324,7 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison
/*
* @see org.eclipse.ui.Saveable#hashCode()
*/
+ @Override
public int hashCode() {
if (document != null) {
return document.hashCode();
@@ -325,6 +335,7 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison
/*
* @see org.eclipse.ui.Saveable#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj)
return true;
@@ -348,6 +359,7 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison
return false;
}
+ @Override
public Object getAdapter(Class adapter) {
if (adapter == IDocument.class) {
if (document != null)
@@ -392,6 +404,7 @@ public abstract class LocalResourceSaveableComparison extends SaveableComparison
return false;
}
+ @Override
public boolean isSaving() {
return isSaving;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceTypedElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceTypedElement.java
index f73254cad..737c8c0e6 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceTypedElement.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/LocalResourceTypedElement.java
@@ -66,6 +66,7 @@ public class LocalResourceTypedElement extends ResourceNode implements IAdaptabl
/* (non-Javadoc)
* @see org.eclipse.compare.BufferedContent#setContent(byte[])
*/
+ @Override
public void setContent(byte[] contents) {
fDirty = true;
super.setContent(contents);
@@ -114,6 +115,7 @@ public class LocalResourceTypedElement extends ResourceNode implements IAdaptabl
/* (non-Javadoc)
* @see org.eclipse.compare.ResourceNode#getContents()
*/
+ @Override
public InputStream getContents() throws CoreException {
if (exists)
return super.getContents();
@@ -123,6 +125,7 @@ public class LocalResourceTypedElement extends ResourceNode implements IAdaptabl
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public Object getAdapter(Class adapter) {
if (adapter == ISharedDocumentAdapter.class) {
if (isSharedDocumentsEnable())
@@ -140,26 +143,31 @@ public class LocalResourceTypedElement extends ResourceNode implements IAdaptabl
private synchronized ISharedDocumentAdapter getSharedDocumentAdapter() {
if (sharedDocumentAdapter == null)
sharedDocumentAdapter = new EditableSharedDocumentAdapter(new EditableSharedDocumentAdapter.ISharedDocumentAdapterListener() {
+ @Override
public void handleDocumentConnected() {
LocalResourceTypedElement.this.updateTimestamp();
if (sharedDocumentListener != null)
sharedDocumentListener.handleDocumentConnected();
}
+ @Override
public void handleDocumentFlushed() {
LocalResourceTypedElement.this.fireContentChanged();
if (sharedDocumentListener != null)
sharedDocumentListener.handleDocumentFlushed();
}
+ @Override
public void handleDocumentDeleted() {
LocalResourceTypedElement.this.update();
if (sharedDocumentListener != null)
sharedDocumentListener.handleDocumentDeleted();
}
+ @Override
public void handleDocumentSaved() {
LocalResourceTypedElement.this.updateTimestamp();
if (sharedDocumentListener != null)
sharedDocumentListener.handleDocumentSaved();
}
+ @Override
public void handleDocumentDisconnected() {
if (sharedDocumentListener != null)
sharedDocumentListener.handleDocumentDisconnected();
@@ -171,6 +179,7 @@ public class LocalResourceTypedElement extends ResourceNode implements IAdaptabl
/* (non-Javadoc)
* @see org.eclipse.compare.ResourceNode#isEditable()
*/
+ @Override
public boolean isEditable() {
// Do not allow non-existent files to be edited
IResource resource = getResource();
@@ -211,6 +220,7 @@ public class LocalResourceTypedElement extends ResourceNode implements IAdaptabl
/* (non-Javadoc)
* @see org.eclipse.compare.ResourceNode#createStream()
*/
+ @Override
protected InputStream createStream() throws CoreException {
InputStream inputStream = super.createStream();
updateTimestamp();
@@ -238,6 +248,7 @@ public class LocalResourceTypedElement extends ResourceNode implements IAdaptabl
/* (non-Javadoc)
* @see org.eclipse.compare.ResourceNode#hashCode()
*/
+ @Override
public int hashCode() {
return getResource().hashCode();
}
@@ -247,6 +258,7 @@ public class LocalResourceTypedElement extends ResourceNode implements IAdaptabl
* <code>LocalResourceTypedElement</code> and their corresponding resources
* are identical. The content is not considered.
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this)
return true;
@@ -294,6 +306,7 @@ public class LocalResourceTypedElement extends ResourceNode implements IAdaptabl
/* (non-Javadoc)
* @see org.eclipse.compare.BufferedContent#fireContentChanged()
*/
+ @Override
protected void fireContentChanged() {
super.fireContentChanged();
}
@@ -306,6 +319,7 @@ public class LocalResourceTypedElement extends ResourceNode implements IAdaptabl
* buffer will remain.
* #see {@link #isDirty()}
*/
+ @Override
public void discardBuffer() {
if (sharedDocumentAdapter != null)
sharedDocumentAdapter.releaseBuffer();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java
index 0b6645612..07d4566b8 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/MultiLabelDecorator.java
@@ -23,6 +23,7 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ILabelDecorator#decorateImage(org.eclipse.swt.graphics.Image, java.lang.Object)
*/
+ @Override
public Image decorateImage(Image image, Object element) {
for (int i = 0; i < decorators.length; i++) {
ILabelDecorator decorator = decorators[i];
@@ -37,6 +38,7 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ILabelDecorator#decorateText(java.lang.String, java.lang.Object)
*/
+ @Override
public String decorateText(String text, Object element) {
for (int i = 0; i < decorators.length; i++) {
ILabelDecorator decorator = decorators[i];
@@ -51,6 +53,7 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
*/
+ @Override
public void dispose() {
for (int i = 0; i < decorators.length; i++) {
ILabelDecorator d = decorators[i];
@@ -61,6 +64,7 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IFontDecorator#decorateFont(java.lang.Object)
*/
+ @Override
public Font decorateFont(Object element) {
for (int i = 0; i < decorators.length; i++) {
ILabelDecorator decorator = decorators[i];
@@ -74,6 +78,7 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IColorDecorator#decorateForeground(java.lang.Object)
*/
+ @Override
public Color decorateForeground(Object element) {
for (int i = 0; i < decorators.length; i++) {
ILabelDecorator decorator = decorators[i];
@@ -87,6 +92,7 @@ class MultiLabelDecorator extends LabelProvider implements ILabelDecorator, IFon
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IColorDecorator#decorateBackground(java.lang.Object)
*/
+ @Override
public Color decorateBackground(Object element) {
for (int i = 0; i < decorators.length; i++) {
ILabelDecorator decorator = decorators[i];
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/NavigationActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/NavigationActionGroup.java
index c630ab8da..80d501ef9 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/NavigationActionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/NavigationActionGroup.java
@@ -32,6 +32,7 @@ public class NavigationActionGroup extends SynchronizePageActionGroup {
private NavigateAction gotoNext;
private NavigateAction gotoPrevious;
+ @Override
public void initialize(ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
final Viewer viewer = configuration.getPage().getViewer();
@@ -41,6 +42,7 @@ public class NavigationActionGroup extends SynchronizePageActionGroup {
Utils.initAction(expandAllAction, "action.expandAll."); //$NON-NLS-1$
collapseAll = new Action() {
+ @Override
public void run() {
if (viewer.getControl().isDisposed() || !(viewer instanceof AbstractTreeViewer))
return;
@@ -58,6 +60,7 @@ public class NavigationActionGroup extends SynchronizePageActionGroup {
}
}
}
+ @Override
public void fillContextMenu(IMenuManager manager) {
if (manager == null || expandAllAction == null)
return;
@@ -67,6 +70,7 @@ public class NavigationActionGroup extends SynchronizePageActionGroup {
else
appendToGroup(manager, ISynchronizePageConfiguration.NAVIGATE_GROUP, expandAllAction);
}
+ @Override
public void fillActionBars(IActionBars actionBars) {
IToolBarManager manager = actionBars.getToolBarManager();
appendToGroup(manager, ISynchronizePageConfiguration.NAVIGATE_GROUP, collapseAll);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RangeDifferenceComparator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RangeDifferenceComparator.java
index 63839174d..acbb630ce 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RangeDifferenceComparator.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RangeDifferenceComparator.java
@@ -45,6 +45,7 @@ public abstract class RangeDifferenceComparator extends
abstract protected boolean compareRangeDifferences(RangeDifference[] ranges,
IDocument lDoc, IDocument rDoc);
+ @Override
protected boolean contentsEqual(IProgressMonitor monitor, InputStream is1,
InputStream is2, boolean ignoreWhitespace) {
try {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshChangeListener.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshChangeListener.java
index 43756b34f..fd32b5d51 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshChangeListener.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshChangeListener.java
@@ -31,6 +31,7 @@ public class RefreshChangeListener implements ISubscriberChangeListener, IChange
this.resources = resources;
this.collector = collector;
}
+ @Override
public void subscriberResourceChanged(ISubscriberChangeEvent[] deltas) {
for (int i = 0; i < deltas.length; i++) {
ISubscriberChangeEvent delta = deltas[i];
@@ -65,6 +66,7 @@ public class RefreshChangeListener implements ISubscriberChangeListener, IChange
private boolean isThreeWay() {
return collector.getSubscriber().getResourceComparator().isThreeWay();
}
+ @Override
public int getChangeCount() {
return getChanges().length;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshEvent.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshEvent.java
index 4badfdc89..5d4c8edc9 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshEvent.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshEvent.java
@@ -34,10 +34,12 @@ public class RefreshEvent implements IRefreshEvent {
this.description = description;
}
+ @Override
public int getRefreshType() {
return type;
}
+ @Override
public long getStartTime() {
return startTime;
}
@@ -46,6 +48,7 @@ public class RefreshEvent implements IRefreshEvent {
this.startTime = startTime;
}
+ @Override
public long getStopTime() {
return stopTime;
}
@@ -54,6 +57,7 @@ public class RefreshEvent implements IRefreshEvent {
this.stopTime = stopTime;
}
+ @Override
public IStatus getStatus() {
return status;
}
@@ -62,18 +66,22 @@ public class RefreshEvent implements IRefreshEvent {
this.status = status;
}
+ @Override
public ISynchronizeParticipant getParticipant() {
return participant;
}
+ @Override
public IChangeDescription getChangeDescription() {
return description;
}
+ @Override
public boolean isLink() {
return isLink;
}
+ @Override
public void setIsLink(boolean isLink) {
this.isLink = isLink;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java
index 267130d95..3191b0fe9 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshModelParticipantJob.java
@@ -33,10 +33,12 @@ public class RefreshModelParticipantJob extends RefreshParticipantJob {
public class ChangeDescription implements IChangeDescription, IDiffChangeListener {
Map changes = new HashMap();
+ @Override
public int getChangeCount() {
return changes.size();
}
+ @Override
public void diffsChanged(IDiffChangeEvent event, IProgressMonitor monitor) {
IDiff[] additions = event.getAdditions();
for (int i = 0; i < additions.length; i++) {
@@ -50,6 +52,7 @@ public class RefreshModelParticipantJob extends RefreshParticipantJob {
}
}
+ @Override
public void propertyChanged(IDiffTree tree, int property, IPath[] paths) {
// Do nothing
}
@@ -60,6 +63,7 @@ public class RefreshModelParticipantJob extends RefreshParticipantJob {
this.mappings = mappings;
}
+ @Override
protected void doRefresh(IChangeDescription changeListener,
IProgressMonitor monitor) throws CoreException {
ISynchronizationContext context = ((ModelSynchronizeParticipant)getParticipant()).getContext();
@@ -78,29 +82,35 @@ public class RefreshModelParticipantJob extends RefreshParticipantJob {
}
}
+ @Override
protected int getChangeCount() {
return ((ModelSynchronizeParticipant)getParticipant()).getContext().getDiffTree().size();
}
- protected int getIncomingChangeCount() {
+ @Override
+ protected int getIncomingChangeCount() {
IResourceDiffTree diffTree = ((ModelSynchronizeParticipant)getParticipant()).getContext().getDiffTree();
return (int) diffTree.countFor(IThreeWayDiff.INCOMING, IThreeWayDiff.DIRECTION_MASK);
}
- protected int getOutgoingChangeCount() {
+ @Override
+ protected int getOutgoingChangeCount() {
IResourceDiffTree diffTree = ((ModelSynchronizeParticipant)getParticipant()).getContext().getDiffTree();
return (int) diffTree.countFor(IThreeWayDiff.OUTGOING, IThreeWayDiff.DIRECTION_MASK);
}
+ @Override
protected void handleProgressGroupSet(IProgressMonitor group, int ticks) {
this.group = group;
this.groupTicks = ticks;
}
+ @Override
protected IChangeDescription createChangeDescription() {
return new ChangeDescription();
}
+ @Override
public boolean belongsTo(Object family) {
if (family instanceof RefreshModelParticipantJob) {
RefreshModelParticipantJob rmpj = (RefreshModelParticipantJob) family;
@@ -111,6 +121,7 @@ public class RefreshModelParticipantJob extends RefreshParticipantJob {
return super.belongsTo(family);
}
+ @Override
public IStatus run(IProgressMonitor monitor) {
if (group != null)
monitor = wrapMonitorWithGroup(monitor);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java
index 657af2667..b1626c87f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java
@@ -100,26 +100,30 @@ public abstract class RefreshParticipantJob extends Job {
private final class GotoActionWrapper extends WorkbenchAction {
private ActionFactory.IWorkbenchAction gotoAction;
private IStatus status;
- public void run() {
+ @Override
+ public void run() {
if (status != null && !status.isOK()) {
ErrorDialog.openError(Utils.getShell(null), null, TeamUIMessages.RefreshSubscriberJob_3, status);
} else if(gotoAction != null) {
gotoAction.run();
}
}
- public boolean isEnabled() {
+ @Override
+ public boolean isEnabled() {
if(gotoAction != null) {
return gotoAction.isEnabled();
}
return true;
}
- public String getText() {
+ @Override
+ public String getText() {
if(gotoAction != null) {
return gotoAction.getText();
}
return null;
}
- public String getToolTipText() {
+ @Override
+ public String getToolTipText() {
if (status != null && !status.isOK()) {
return status.getMessage();
}
@@ -128,7 +132,8 @@ public abstract class RefreshParticipantJob extends Job {
}
return Utils.shortenText(SynchronizeView.MAX_NAME_LENGTH, RefreshParticipantJob.this.getName());
}
- public void dispose() {
+ @Override
+ public void dispose() {
super.dispose();
if(gotoAction != null) {
gotoAction.dispose();
@@ -139,6 +144,7 @@ public abstract class RefreshParticipantJob extends Job {
setEnabled(isEnabled());
setToolTipText(getToolTipText());
gotoAction.addPropertyChangeListener(new IPropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if(event.getProperty().equals(IAction.ENABLED)) {
Boolean bool = (Boolean) event.getNewValue();
@@ -157,6 +163,7 @@ public abstract class RefreshParticipantJob extends Job {
*/
private abstract class Notification implements ISafeRunnable {
private IRefreshSubscriberListener listener;
+ @Override
public void handleException(Throwable exception) {
// don't log the exception....it is already being logged in Platform#run
}
@@ -164,6 +171,7 @@ public abstract class RefreshParticipantJob extends Job {
this.listener = listener;
SafeRunner.run(this);
}
+ @Override
public void run() throws Exception {
notify(listener);
}
@@ -187,6 +195,7 @@ public abstract class RefreshParticipantJob extends Job {
super(monitor);
this.job = job;
}
+ @Override
public boolean isCanceled() {
if (super.isCanceled()) {
return true;
@@ -232,6 +241,7 @@ public abstract class RefreshParticipantJob extends Job {
// Handle restarting of job if it is configured as a scheduled refresh job.
addJobChangeListener(new JobChangeAdapter() {
+ @Override
public void done(IJobChangeEvent event) {
if(shouldReschedule()) {
IStatus result = event.getResult();
@@ -252,6 +262,7 @@ public abstract class RefreshParticipantJob extends Job {
initialize(listener);
}
+ @Override
public boolean belongsTo(Object family) {
if (family instanceof SubscriberParticipant) {
return family == participant;
@@ -268,6 +279,7 @@ public abstract class RefreshParticipantJob extends Job {
* This is run by the job scheduler. A list of subscribers will be refreshed, errors will not stop the job
* and it will continue to refresh the other subscribers.
*/
+ @Override
public IStatus run(IProgressMonitor monitor) {
// Perform a pre-check for auto-build or manual build jobs
// when auto-refreshing
@@ -441,11 +453,13 @@ public abstract class RefreshParticipantJob extends Job {
setProperty(IProgressConstants.KEEPONE_PROPERTY, Boolean.valueOf(! isJobModal()));
// Listener delegate
IRefreshSubscriberListener autoListener = new IRefreshSubscriberListener() {
+ @Override
public void refreshStarted(IRefreshEvent event) {
if(listener != null) {
listener.refreshStarted(event);
}
}
+ @Override
public ActionFactory.IWorkbenchAction refreshDone(IRefreshEvent event) {
if(listener != null) {
boolean isModal = isJobModal();
@@ -456,6 +470,7 @@ public abstract class RefreshParticipantJob extends Job {
if(isModal) {
if(runnable != null) {
Job update = new UIJob("") { //$NON-NLS-1$
+ @Override
public IStatus runInUIThread(IProgressMonitor monitor) {
runnable.run();
return Status.OK_STATUS;
@@ -556,6 +571,7 @@ public abstract class RefreshParticipantJob extends Job {
for (int i = 0; i < listenerArray.length; i++) {
IRefreshSubscriberListener listener = listenerArray[i];
Notification notification = new Notification() {
+ @Override
protected void notify(IRefreshSubscriberListener listener) {
switch (state) {
case STARTED:
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java
index 34eed38d4..a75e329d6 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberParticipantJob.java
@@ -40,6 +40,7 @@ public class RefreshSubscriberParticipantJob extends RefreshParticipantJob {
return ((SubscriberParticipant)getParticipant()).getSubscriberSyncInfoCollector();
}
+ @Override
protected int getChangeCount() {
int numChanges = 0;
SubscriberSyncInfoCollector collector = getCollector();
@@ -56,11 +57,13 @@ public class RefreshSubscriberParticipantJob extends RefreshParticipantJob {
return numChanges;
}
- protected int getIncomingChangeCount() {
+ @Override
+ protected int getIncomingChangeCount() {
return getChangesInMode(SyncInfo.INCOMING);
}
- protected int getOutgoingChangeCount() {
+ @Override
+ protected int getOutgoingChangeCount() {
return getChangesInMode(SyncInfo.OUTGOING);
}
@@ -84,10 +87,12 @@ public class RefreshSubscriberParticipantJob extends RefreshParticipantJob {
return numChanges;
}
+ @Override
protected RefreshParticipantJob.IChangeDescription createChangeDescription() {
return new RefreshChangeListener(resources, getCollector());
}
+ @Override
protected void handleProgressGroupSet(IProgressMonitor group, int ticks) {
getCollector().setProgressGroup(group, ticks);
}
@@ -96,11 +101,13 @@ public class RefreshSubscriberParticipantJob extends RefreshParticipantJob {
* If a collector is available then run the refresh and the background event processing
* within the same progress group.
*/
+ @Override
public boolean shouldRun() {
// Ensure that any progress shown as a result of this refresh occurs hidden in a progress group.
return getSubscriber() != null && getCollector().getSyncInfoSet() != null;
}
+ @Override
public boolean belongsTo(Object family) {
if(family instanceof RefreshSubscriberParticipantJob) {
return ((RefreshSubscriberParticipantJob)family).getSubscriber() == getSubscriber();
@@ -108,6 +115,7 @@ public class RefreshSubscriberParticipantJob extends RefreshParticipantJob {
return super.belongsTo(family);
}
+ @Override
protected void doRefresh(IChangeDescription changeListener, IProgressMonitor monitor) throws TeamException {
Subscriber subscriber = getSubscriber();
if (subscriber != null) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicy.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicy.java
index fdb85a01a..f9286fa8d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicy.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicy.java
@@ -40,8 +40,10 @@ public class RefreshUserNotificationPolicy implements IRefreshSubscriberListener
* (non-Javadoc)
* @see org.eclipse.team.internal.ui.jobs.IRefreshSubscriberListener#refreshStarted(org.eclipse.team.internal.ui.jobs.IRefreshEvent)
*/
+ @Override
public void refreshStarted(final IRefreshEvent event) {
TeamUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
if (event.getRefreshType() == IRefreshEvent.USER_REFRESH && event.getParticipant() == participant) {
ISynchronizeView view = TeamUI.getSynchronizeManager().showSynchronizeViewInActivePage();
@@ -57,6 +59,7 @@ public class RefreshUserNotificationPolicy implements IRefreshSubscriberListener
* (non-Javadoc)
* @see org.eclipse.team.internal.ui.jobs.IRefreshSubscriberListener#refreshDone(org.eclipse.team.internal.ui.jobs.IRefreshEvent)
*/
+ @Override
public ActionFactory.IWorkbenchAction refreshDone(final IRefreshEvent event) {
// Ensure that this event was generated for this participant
if (event.getParticipant() != participant) return null;
@@ -65,6 +68,7 @@ public class RefreshUserNotificationPolicy implements IRefreshSubscriberListener
if(severity == IStatus.CANCEL || severity == IStatus.ERROR) return null;
// Decide on what action to take after the refresh is completed
return new WorkbenchAction() {
+ @Override
public void run() {
boolean prompt = (event.getStatus().getCode() == IRefreshEvent.STATUS_NO_CHANGES);
@@ -84,6 +88,7 @@ public class RefreshUserNotificationPolicy implements IRefreshSubscriberListener
}
}
+ @Override
public String getToolTipText() {
boolean prompt = (event.getStatus().getCode() == IRefreshEvent.STATUS_NO_CHANGES);
if(prompt) {
@@ -97,6 +102,7 @@ public class RefreshUserNotificationPolicy implements IRefreshSubscriberListener
private void notifyIfNeededModal(final IRefreshEvent event) {
TeamUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
String title = (event.getRefreshType() == IRefreshEvent.SCHEDULED_REFRESH ?
NLS.bind(TeamUIMessages.RefreshCompleteDialog_4a, new String[] { Utils.getTypeName(participant) }) :
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicyInModalDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicyInModalDialog.java
index 06105099d..462e9ef18 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicyInModalDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshUserNotificationPolicyInModalDialog.java
@@ -34,9 +34,11 @@ public class RefreshUserNotificationPolicyInModalDialog implements IRefreshSubsc
this.shell = shell;
}
+ @Override
public void refreshStarted(IRefreshEvent event) {
}
+ @Override
public ActionFactory.IWorkbenchAction refreshDone(final IRefreshEvent event) {
// Ensure that this event was generated for this participant
if (event.getParticipant() != participant)
@@ -47,6 +49,7 @@ public class RefreshUserNotificationPolicyInModalDialog implements IRefreshSubsc
return null;
return new WorkbenchAction() {
+ @Override
public void run() {
// If there are no changes
if (event.getStatus().getCode() == IRefreshEvent.STATUS_NO_CHANGES) {
@@ -56,6 +59,7 @@ public class RefreshUserNotificationPolicyInModalDialog implements IRefreshSubsc
compareAndOpenDialog(event, participant);
setEnabled(false);
}
+ @Override
public void dispose() {
if (TeamUI.getSynchronizeManager().get(participant.getId(), participant.getSecondaryId()) == null) {
participant.dispose();
@@ -67,6 +71,7 @@ public class RefreshUserNotificationPolicyInModalDialog implements IRefreshSubsc
protected void compareAndOpenDialog(final IRefreshEvent event, final SubscriberParticipant participant) {
CompareConfiguration cc = new CompareConfiguration();
ParticipantPageSaveablePart input = new ParticipantPageSaveablePart(Utils.getShell(null), cc, configuration, participant) {
+ @Override
public String getTitle() {
return RefreshUserNotificationPolicyInModalDialog.this.title;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffComparator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffComparator.java
index 333b9afa1..ba27e10db 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffComparator.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffComparator.java
@@ -32,6 +32,7 @@ public class RegexDiffComparator extends RangeDifferenceComparator {
this.pattern = pattern;
}
+ @Override
protected boolean compareRangeDifferences(RangeDifference[] ranges,
IDocument lDoc, IDocument rDoc) {
try {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffFilter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffFilter.java
index dce36567b..c12f2b1d6 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffFilter.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RegexDiffFilter.java
@@ -50,6 +50,7 @@ public class RegexDiffFilter extends DiffFilter {
Pattern.DOTALL), ignoreWhitespace);
}
+ @Override
public boolean select(IDiff diff, IProgressMonitor monitor) {
IFileRevision remote = SyncInfoToDiffConverter.getRemote(diff);
IResource local = ResourceDiffTree.getResourceFor(diff);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RemoteResourceTypedElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RemoteResourceTypedElement.java
index 1d367f541..f7e94afff 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RemoteResourceTypedElement.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RemoteResourceTypedElement.java
@@ -42,6 +42,7 @@ public class RemoteResourceTypedElement extends StorageTypedElement {
/* (non-Javadoc)
* @see org.eclipse.compare.ITypedElement#getName()
*/
+ @Override
public String getName() {
return remote.getName();
}
@@ -49,6 +50,7 @@ public class RemoteResourceTypedElement extends StorageTypedElement {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.StorageTypedElement#getType()
*/
+ @Override
public String getType() {
if (remote.isContainer()) {
return ITypedElement.FOLDER_TYPE;
@@ -59,6 +61,7 @@ public class RemoteResourceTypedElement extends StorageTypedElement {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.StorageTypedElement#fetchContents(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected IStorage fetchContents(IProgressMonitor monitor) throws TeamException {
return remote.getStorage(monitor);
}
@@ -66,6 +69,7 @@ public class RemoteResourceTypedElement extends StorageTypedElement {
/* (non-Javadoc)
* @see org.eclipse.compare.ISharedDocumentAdapter#getDocumentKey(java.lang.Object)
*/
+ @Override
public IEditorInput getDocumentKey(Object element) {
if (element == this && getBufferedStorage() != null) {
return new FileRevisionEditorInput(new ResourceVariantFileRevision(remote), getBufferedStorage(), getLocalEncoding());
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java
index 9e9eac71a..04e623ba4 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SaveablesCompareEditorInput.java
@@ -116,9 +116,11 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
*
* @see org.eclipse.compare.CompareEditorInput#contentsCreated()
*/
+ @Override
protected void contentsCreated() {
super.contentsCreated();
compareInputChangeListener = new ICompareInputChangeListener() {
+ @Override
public void compareInputChanged(ICompareInput source) {
if (source == getCompareResult()) {
boolean closed = false;
@@ -141,6 +143,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
if (getLeftSaveable() instanceof SaveableComparison) {
SaveableComparison lscm = (SaveableComparison) fLeftSaveable;
fLeftPropertyListener = new IPropertyListener() {
+ @Override
public void propertyChanged(Object source, int propId) {
if (propId == SaveableComparison.PROP_DIRTY) {
setLeftDirty(fLeftSaveable.isDirty());
@@ -153,6 +156,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
if (getRightSaveable() instanceof SaveableComparison) {
SaveableComparison rscm = (SaveableComparison) fRightSaveable;
fRightPropertyListener = new IPropertyListener() {
+ @Override
public void propertyChanged(Object source, int propId) {
if (propId == SaveableComparison.PROP_DIRTY) {
setRightDirty(fRightSaveable.isDirty());
@@ -171,6 +175,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
*
* @see org.eclipse.compare.CompareEditorInput#handleDispose()
*/
+ @Override
protected void handleDispose() {
super.handleDispose();
ICompareInput compareInput = getCompareInput();
@@ -221,6 +226,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
return new String[] { fLeftElement.getName(), fRightElement.getName() };
}
+ @Override
public String getToolTipText() {
String[] labels = getLabels();
if (labels.length == 3)
@@ -228,6 +234,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
return NLS.bind(TeamUIMessages.SaveablesCompareEditorInput_twoWayTooltip, labels);
}
+ @Override
public String getTitle() {
String[] labels = getLabels();
if (labels.length == 3)
@@ -303,6 +310,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
*
* @see org.eclipse.ui.ISaveablesSource#getActiveSaveables()
*/
+ @Override
public Saveable[] getActiveSaveables() {
if (getCompareResult() == null)
return new Saveable[0];
@@ -314,6 +322,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
*
* @see org.eclipse.ui.ISaveablesSource#getSaveables()
*/
+ @Override
public Saveable[] getSaveables() {
return getActiveSaveables();
}
@@ -327,6 +336,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
* org.eclipse.compare.structuremergeviewer.ICompareInput,
* org.eclipse.swt.widgets.Composite)
*/
+ @Override
public Viewer findContentViewer(Viewer pOldViewer, ICompareInput pInput,
Composite pParent) {
Viewer newViewer = super.findContentViewer(pOldViewer, pInput, pParent);
@@ -342,6 +352,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
dsp.addPropertyChangeListener(rpcl);
Control c = newViewer.getControl();
c.addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
dsp.removePropertyChangeListener(lpcl);
dsp.removePropertyChangeListener(rpcl);
@@ -351,6 +362,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
return newViewer;
}
+ @Override
public boolean isDirty() {
if (fLeftSaveable != null && fLeftSaveable.isDirty())
return true;
@@ -421,6 +433,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
return false;
} else {
Runnable runnable = new Runnable() {
+ @Override
public void run() {
IEditorPart part = getPage().findEditor(
SaveablesCompareEditorInput.this);
@@ -448,6 +461,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
*
* @see org.eclipse.compare.CompareEditorInput#prepareInput(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected Object prepareInput(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
final ICompareInput input = prepareCompareInput(monitor);
@@ -515,6 +529,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
}
private CompareInputChangeNotifier notifier = new CompareInputChangeNotifier() {
+ @Override
protected IResource[] getResources(ICompareInput input) {
IResource leftResource = getResource(fLeftElement);
IResource rightResource = getResource(fRightElement);
@@ -538,18 +553,22 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
super(Differencer.CONFLICTING, ancestor, left, right);
}
+ @Override
public void fireChange() {
super.fireChange();
}
+ @Override
protected CompareInputChangeNotifier getChangeNotifier() {
return notifier;
}
+ @Override
public boolean needsUpdate() {
return true;
}
+ @Override
public void update() {
fireChange();
}
@@ -563,6 +582,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
return null;
}
+ @Override
public void registerContextMenu(final MenuManager pMenuManager,
final ISelectionProvider pSelectionProvider) {
super.registerContextMenu(pMenuManager, pSelectionProvider);
@@ -571,6 +591,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
.getLeft(), this);
if (lLeftSaveable instanceof LocalResourceSaveableComparison) {
pMenuManager.addMenuListener(new IMenuListener() {
+ @Override
public void menuAboutToShow(IMenuManager manager) {
handleMenuAboutToShow(manager, getContainer(), lLeftSaveable, lLeftElement, pSelectionProvider);
}
@@ -581,6 +602,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
.getRight(), this);
if (lRightSaveable instanceof LocalResourceSaveableComparison) {
pMenuManager.addMenuListener(new IMenuListener() {
+ @Override
public void menuAboutToShow(IMenuManager manager) {
handleMenuAboutToShow(manager, getContainer(), lRightSaveable, lRightElement, pSelectionProvider);
}
@@ -596,6 +618,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
* org.eclipse.compare.structuremergeviewer.ICompareInput,
* org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener)
*/
+ @Override
public void addCompareInputChangeListener(ICompareInput input,
ICompareInputChangeListener listener) {
if (input == getCompareResult()) {
@@ -613,6 +636,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
* (org.eclipse.compare.structuremergeviewer.ICompareInput,
* org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener)
*/
+ @Override
public void removeCompareInputChangeListener(ICompareInput input,
ICompareInputChangeListener listener) {
if (input == getCompareResult()) {
@@ -629,10 +653,12 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
for (int i = 0; i < allListeners.length; i++) {
final ICompareInputChangeListener listener = (ICompareInputChangeListener) allListeners[i];
SafeRunner.run(new ISafeRunnable() {
+ @Override
public void run() throws Exception {
listener.compareInputChanged(compareResult);
}
+ @Override
public void handleException(Throwable exception) {
// Logged by the safe runner
}
@@ -646,6 +672,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
*
* @see org.eclipse.compare.CompareEditorInput#getTitleImage()
*/
+ @Override
public Image getTitleImage() {
ImageRegistry reg = TeamUIPlugin.getPlugin().getImageRegistry();
Image image = reg.get(ITeamUIImages.IMG_SYNC_VIEW);
@@ -661,6 +688,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
*
* @see org.eclipse.ui.IEditorInput#getImageDescriptor()
*/
+ @Override
public ImageDescriptor getImageDescriptor() {
return TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_SYNC_VIEW);
}
@@ -670,6 +698,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
*
* @see org.eclipse.compare.CompareEditorInput#canRunAsJob()
*/
+ @Override
public boolean canRunAsJob() {
return true;
}
@@ -711,16 +740,19 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
}
}
+ @Override
protected void fireInputChange() {
SaveablesCompareEditorInput.this.fireInputChange();
}
+ @Override
public void dispose() {
super.dispose();
if (lrte != null)
lrte.setSharedDocumentListener(null);
}
+ @Override
public void handleDocumentConnected() {
if (connected)
return;
@@ -751,18 +783,22 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
}
}
+ @Override
public void handleDocumentDeleted() {
// Ignore
}
+ @Override
public void handleDocumentDisconnected() {
// Ignore
}
+ @Override
public void handleDocumentFlushed() {
// Ignore
}
+ @Override
public void handleDocumentSaved() {
// Ignore
}
@@ -770,6 +806,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
/*
* @see org.eclipse.ui.Saveable#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj) {
if (this == obj)
return true;
@@ -821,6 +858,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
* @see org.eclipse.ui.actions.OpenWithMenu#openEditor(org.eclipse.ui.
* IEditorDescriptor, boolean)
*/
+ @Override
protected void openEditor(IEditorDescriptor editorDescriptor, boolean openUsingDescriptor) {
super.openEditor(editorDescriptor, openUsingDescriptor);
IEditorPart editor= ws.getPage().getActiveEditor();
@@ -837,6 +875,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
*
* @see org.eclipse.ui.actions.OpenSystemEditorAction#run()
*/
+ @Override
public void run() {
super.run();
IEditorPart editor= ws.getPage().getActiveEditor();
@@ -876,6 +915,7 @@ public class SaveablesCompareEditorInput extends CompareEditorInput implements
final IEditorInput input= editor.getEditorInput();
if (input instanceof IFileEditorInput) {
WorkspaceModifyOperation op= new WorkspaceModifyOperation() {
+ @Override
protected void execute(IProgressMonitor monitor) throws CoreException {
IMarker marker= null;
try {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ScopableSubscriberParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ScopableSubscriberParticipant.java
index e43473142..c38d9009b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ScopableSubscriberParticipant.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ScopableSubscriberParticipant.java
@@ -35,6 +35,7 @@ public abstract class ScopableSubscriberParticipant extends SubscriberParticipan
/* (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);
try {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StartupPreferencePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StartupPreferencePage.java
index 1ad77f9b4..73ca47487 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StartupPreferencePage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StartupPreferencePage.java
@@ -34,6 +34,7 @@ public class StartupPreferencePage extends FieldEditorPreferencePage implements
setPreferenceStore(store);
}
+ @Override
public void init(IWorkbench workbench) {
// Nothing to do
}
@@ -41,12 +42,14 @@ public class StartupPreferencePage extends FieldEditorPreferencePage implements
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
super.createControl(parent);
// set F1 help
PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), IHelpContextIds.SYNC_STARTUP_PREFERENCE_PAGE);
}
+ @Override
protected void createFieldEditors() {
addField(new RadioGroupFieldEditor(PROP_STARTUP_ACTION,
TeamUIMessages.StartupPreferencePage_2, 1,
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java
index 3fa10fb2f..0d8508ed5 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/StructuredViewerAdvisor.java
@@ -66,6 +66,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor {
// - working set selection by the user
// - decorator format change selected by the user
private IPropertyChangeListener propertyListener = new IPropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent event) {
// Change to showing of sync state in text labels preference
if(event.getProperty().equals(IPreferenceIds.SYNCVIEW_VIEW_SYNCINFO_IN_LABEL)) {
@@ -95,6 +96,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor {
* can be shown to the user.
* @param viewer the viewer being installed
*/
+ @Override
public void initializeViewer(final StructuredViewer viewer) {
super.initializeViewer(viewer);
initializeListeners(viewer);
@@ -121,6 +123,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor {
*/
protected void initializeListeners(final StructuredViewer viewer) {
viewer.getControl().addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
StructuredViewerAdvisor.this.dispose();
}
@@ -128,6 +131,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor {
new OpenAndLinkWithEditorHelper(viewer) {
+ @Override
protected void activate(ISelection selection) {
final int currentMode= OpenStrategy.getOpenMethod();
try {
@@ -138,10 +142,12 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor {
}
}
+ @Override
protected void linkToEditor(ISelection selection) {
// not supported by this part
}
+ @Override
protected void open(ISelection selection, boolean activate) {
handleOpen();
}
@@ -149,12 +155,14 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor {
};
viewer.addDoubleClickListener(new IDoubleClickListener() {
+ @Override
public void doubleClick(DoubleClickEvent event) {
handleDoubleClick(viewer, event);
}
});
viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
// Update the action bars enablement for any contributed action groups
updateActionBars((IStructuredSelection)viewer.getSelection());
@@ -197,6 +205,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor {
* action groups registered with the configuration to fill the action bars.
* @param actionBars the Action bars for the page
*/
+ @Override
public final void setActionBars(IActionBars actionBars) {
if(actionBars != null) {
IToolBarManager manager = actionBars.getToolBarManager();
@@ -263,6 +272,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor {
menuMgr.setRemoveAllWhenShown(true);
menuMgr.addMenuListener(new IMenuListener() {
+ @Override
public void menuAboutToShow(IMenuManager manager) {
fillContextMenu(viewer, manager);
}
@@ -270,6 +280,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor {
Menu menu = menuMgr.createContextMenu(viewer.getControl());
menu.addMenuListener(new MenuListener() {
+ @Override
public void menuHidden(MenuEvent e) {
}
@@ -278,6 +289,7 @@ public abstract class StructuredViewerAdvisor extends AbstractViewerAdvisor {
// the state of the selection changes and the contributions
// need to update enablement based on this.
// TODO: Is this hack still needed
+ @Override
public void menuShown(MenuEvent e) {
IContributionItem[] items = menuMgr.getItems();
for (int i = 0; i < items.length; i++) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberParticipantPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberParticipantPage.java
index 29e806e31..67aa93c95 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberParticipantPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberParticipantPage.java
@@ -71,6 +71,7 @@ public final class SubscriberParticipantPage extends AbstractSynchronizePage {
return participant;
}
+ @Override
protected AbstractViewerAdvisor createViewerAdvisor(Composite parent) {
return new TreeViewerAdvisor(parent, getConfiguration());
}
@@ -83,6 +84,7 @@ public final class SubscriberParticipantPage extends AbstractSynchronizePage {
* <code>OUTGOING_MODE_FILTER</code>, <code>CONFLICTING_MODE_FILTER</code>
* or <code>BOTH_MODE_FILTER</code>)
*/
+ @Override
protected void updateMode(int mode) {
if(collector != null && isThreeWay()) {
@@ -125,6 +127,7 @@ public final class SubscriberParticipantPage extends AbstractSynchronizePage {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.SyncInfoSetSynchronizePage#reset()
*/
+ @Override
public void reset() {
getParticipant().reset();
}
@@ -137,6 +140,7 @@ public final class SubscriberParticipantPage extends AbstractSynchronizePage {
return collector;
}
+ @Override
public void dispose() {
super.dispose();
collector.dispose();
@@ -145,6 +149,7 @@ public final class SubscriberParticipantPage extends AbstractSynchronizePage {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizePage#createChangesSection(org.eclipse.swt.widgets.Composite)
*/
+ @Override
protected ChangesSection createChangesSection(Composite parent) {
return new SyncInfoSetChangesSection(parent, this, getConfiguration());
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberRefreshSchedule.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberRefreshSchedule.java
index 1b3ae2001..d02715b24 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberRefreshSchedule.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SubscriberRefreshSchedule.java
@@ -63,8 +63,10 @@ public class SubscriberRefreshSchedule {
private static final String CTX_REFRESHSCHEDULE_RUNONCE = TeamUIPlugin.ID + ".CTX_REFRESHSCHEDULE_RUNONCE"; //$NON-NLS-1$
private IRefreshSubscriberListener refreshSubscriberListener = new IRefreshSubscriberListener() {
+ @Override
public void refreshStarted(IRefreshEvent event) {
}
+ @Override
public ActionFactory.IWorkbenchAction refreshDone(final IRefreshEvent event) {
if (getRefreshable(event.getParticipant()) == refreshable) {
lastRefreshEvent = event;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoModelElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoModelElement.java
index 50cf13ab3..8a69bfae3 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoModelElement.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoModelElement.java
@@ -104,6 +104,7 @@ public class SyncInfoModelElement extends SynchronizeModelElement {
/* (non-Javadoc)
* @see org.eclipse.compare.structuremergeviewer.DiffElement#getKind()
*/
+ @Override
public int getKind() {
SyncInfo info = getSyncInfo();
if (info != null) {
@@ -118,6 +119,7 @@ public class SyncInfoModelElement extends SynchronizeModelElement {
* setter. See:
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=52261
*/
+ @Override
public void setAncestor(ITypedElement ancestor) {
this.ancestor = ancestor;
}
@@ -125,6 +127,7 @@ public class SyncInfoModelElement extends SynchronizeModelElement {
/* (non-Javadoc)
* @see org.eclipse.compare.structuremergeviewer.DiffNode#getAncestor()
*/
+ @Override
public ITypedElement getAncestor() {
return this.ancestor;
}
@@ -132,6 +135,7 @@ public class SyncInfoModelElement extends SynchronizeModelElement {
/* (non-Javadoc)
* @see org.eclipse.compare.structuremergeviewer.DiffNode#getName()
*/
+ @Override
public String getName() {
IResource resource = getResource();
if(resource != null) {
@@ -144,6 +148,7 @@ public class SyncInfoModelElement extends SynchronizeModelElement {
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public Object getAdapter(Class adapter) {
if(adapter == SyncInfo.class) {
return getSyncInfo();
@@ -157,6 +162,7 @@ public class SyncInfoModelElement extends SynchronizeModelElement {
* @return the resource associated with this node or <code>null</code> if the local
* contributor is not a resource.
*/
+ @Override
public IResource getResource() {
return info.getLocal();
}
@@ -164,6 +170,7 @@ public class SyncInfoModelElement extends SynchronizeModelElement {
/* (non-Javadoc)
* @see java.lang.Object#toString()
*/
+ @Override
public String toString() {
return getResource().getFullPath().toString();
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java
index bb8590089..a8c1b6ced 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangeSetCollector.java
@@ -49,21 +49,24 @@ public abstract class SyncInfoSetChangeSetCollector extends ChangeSetManager {
/* (non-Javadoc)
* @see org.eclipse.team.core.synchronize.ISyncInfoSetChangeListener#syncInfoSetReset(org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
*/
- public void syncInfoSetReset(SyncInfoSet set, IProgressMonitor monitor) {
+ @Override
+ public void syncInfoSetReset(SyncInfoSet set, IProgressMonitor monitor) {
handleChangeEvent(set);
}
/* (non-Javadoc)
* @see org.eclipse.team.core.synchronize.ISyncInfoSetChangeListener#syncInfoChanged(org.eclipse.team.core.synchronize.ISyncInfoSetChangeEvent, org.eclipse.core.runtime.IProgressMonitor)
*/
- public void syncInfoChanged(ISyncInfoSetChangeEvent event, IProgressMonitor monitor) {
+ @Override
+ public void syncInfoChanged(ISyncInfoSetChangeEvent event, IProgressMonitor monitor) {
handleChangeEvent(event.getSet());
}
/* (non-Javadoc)
* @see org.eclipse.team.core.synchronize.ISyncInfoSetChangeListener#syncInfoSetErrors(org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.team.core.ITeamStatus[], org.eclipse.core.runtime.IProgressMonitor)
*/
- public void syncInfoSetErrors(SyncInfoSet set, ITeamStatus[] errors, IProgressMonitor monitor) {
+ @Override
+ public void syncInfoSetErrors(SyncInfoSet set, ITeamStatus[] errors, IProgressMonitor monitor) {
// TODO Auto-generated method stub
}
@@ -247,12 +250,14 @@ public abstract class SyncInfoSetChangeSetCollector extends ChangeSetManager {
// Do nothing, by default
}
- protected void handleSetAdded(ChangeSet set) {
+ @Override
+ protected void handleSetAdded(ChangeSet set) {
((CheckedInChangeSet)set).getSyncInfoSet().addSyncSetChangedListener(getChangeSetChangeListener());
super.handleSetAdded(set);
}
- protected void handleSetRemoved(ChangeSet set) {
+ @Override
+ protected void handleSetRemoved(ChangeSet set) {
((CheckedInChangeSet)set).getSyncInfoSet().removeSyncSetChangedListener(getChangeSetChangeListener());
super.handleSetRemoved(set);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java
index c834e829d..6e0d4cc8b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java
@@ -45,6 +45,7 @@ public class SyncInfoSetChangesSection extends ForwardingChangesSection {
* change notification so that we can update message to user and totals.
*/
private SynchronizePageActionGroup changedListener = new SynchronizePageActionGroup() {
+ @Override
public void modelChanged(ISynchronizeModelElement root) {
calculateDescription();
}
@@ -55,12 +56,15 @@ public class SyncInfoSetChangesSection extends ForwardingChangesSection {
* all out-of-sync resources for the subscriber.
*/
private ISyncInfoSetChangeListener subscriberListener = new ISyncInfoSetChangeListener() {
+ @Override
public void syncInfoSetReset(SyncInfoSet set, IProgressMonitor monitor) {
// Handled by output set listener
}
+ @Override
public void syncInfoChanged(ISyncInfoSetChangeEvent event, IProgressMonitor monitor) {
calculateDescription();
}
+ @Override
public void syncInfoSetErrors(SyncInfoSet set, ITeamStatus[] errors, IProgressMonitor monitor) {
// Handled by output set listener
}
@@ -71,13 +75,16 @@ public class SyncInfoSetChangesSection extends ForwardingChangesSection {
* only the visible sync info.
*/
private ISyncInfoSetChangeListener outputSetListener = new ISyncInfoSetChangeListener() {
+ @Override
public void syncInfoSetReset(SyncInfoSet set, IProgressMonitor monitor) {
calculateDescription();
}
+ @Override
public void syncInfoChanged(ISyncInfoSetChangeEvent event, IProgressMonitor monitor) {
// Input changed listener will call calculateDescription()
// The input will then react to output set changes
}
+ @Override
public void syncInfoSetErrors(SyncInfoSet set, ITeamStatus[] errors, IProgressMonitor monitor) {
calculateDescription();
}
@@ -97,6 +104,7 @@ public class SyncInfoSetChangesSection extends ForwardingChangesSection {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ChangesSection#initializeChangesViewer()
*/
+ @Override
protected void initializeChangesViewer() {
super.initializeChangesViewer();
getConfiguration().addActionContribution(changedListener);
@@ -104,11 +112,13 @@ public class SyncInfoSetChangesSection extends ForwardingChangesSection {
getVisibleSyncInfoSet().addSyncSetChangedListener(outputSetListener);
}
+ @Override
protected void calculateDescription() {
SyncInfoTree syncInfoTree = getVisibleSyncInfoSet();
if (syncInfoTree.getErrors().length > 0) {
if (!showingError) {
TeamUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
updatePage(getErrorComposite(getContainer()));
showingError = true;
@@ -122,6 +132,7 @@ public class SyncInfoSetChangesSection extends ForwardingChangesSection {
super.calculateDescription();
}
+ @Override
protected long getChangesInMode(int candidateMode) {
SyncInfoSet participantSet = getParticipantSyncInfoSet();
long numChanges;
@@ -147,6 +158,7 @@ public class SyncInfoSetChangesSection extends ForwardingChangesSection {
* Return the candidate mode based on the presence of unfiltered changes
* and the modes supported by the page.
*/
+ @Override
protected int getCandidateMode() {
SyncInfoSet participantSet = getParticipantSyncInfoSet();
SynchronizePageConfiguration configuration = (SynchronizePageConfiguration)getConfiguration();
@@ -171,6 +183,7 @@ public class SyncInfoSetChangesSection extends ForwardingChangesSection {
return configuration.getMode();
}
+ @Override
public void dispose() {
super.dispose();
getConfiguration().removeActionContribution(changedListener);
@@ -191,6 +204,7 @@ public class SyncInfoSetChangesSection extends ForwardingChangesSection {
Hyperlink link = new Hyperlink(composite, SWT.WRAP);
link.setText(TeamUIMessages.ChangesSection_8);
link.addHyperlinkListener(new HyperlinkAdapter() {
+ @Override
public void linkActivated(HyperlinkEvent e) {
showErrors();
}
@@ -201,6 +215,7 @@ public class SyncInfoSetChangesSection extends ForwardingChangesSection {
link = new Hyperlink(composite, SWT.WRAP);
link.setText(TeamUIMessages.ChangesSection_9);
link.addHyperlinkListener(new HyperlinkAdapter() {
+ @Override
public void linkActivated(HyperlinkEvent e) {
getPage().reset();
}
@@ -224,10 +239,12 @@ public class SyncInfoSetChangesSection extends ForwardingChangesSection {
}
}
+ @Override
protected int getChangesCount() {
return getParticipantSyncInfoSet().size();
}
+ @Override
protected long getVisibleChangesCount() {
return getVisibleSyncInfoSet().size();
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java
index c9d58faf0..bb17d635b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeManager.java
@@ -98,10 +98,12 @@ public class SynchronizeManager implements ISynchronizeManager {
private int fType;
private ISynchronizeParticipant[] fChanged;
+ @Override
public void handleException(Throwable exception) {
TeamUIPlugin.log(IStatus.ERROR, TeamUIMessages.SynchronizeManager_7, exception);
}
+ @Override
public void run() throws Exception {
switch (fType) {
case ADDED :
@@ -165,6 +167,7 @@ public class SynchronizeManager implements ISynchronizeManager {
}
}
+ @Override
public boolean equals(Object other) {
if(other == this) return true;
if (! (other instanceof ISynchronizeParticipantReference)) return false;
@@ -176,6 +179,7 @@ public class SynchronizeManager implements ISynchronizeManager {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipantReference#getId()
*/
+ @Override
public String getId() {
return descriptor.getId();
}
@@ -183,6 +187,7 @@ public class SynchronizeManager implements ISynchronizeManager {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipantReference#getSecondaryId()
*/
+ @Override
public String getSecondaryId() {
return secondaryId;
}
@@ -191,6 +196,7 @@ public class SynchronizeManager implements ISynchronizeManager {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipantReference#getDisplayName()
*/
+ @Override
public String getDisplayName() {
String key = Utils.getKey(descriptor.getId(), getSecondaryId());
ISynchronizeParticipant participant = (ISynchronizeParticipant) participants.get(key);
@@ -208,6 +214,7 @@ public class SynchronizeManager implements ISynchronizeManager {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipantReference#createParticipant()
*/
+ @Override
public ISynchronizeParticipant getParticipant() throws TeamException {
if (dead) return null;
String key = Utils.getKey(descriptor.getId(), getSecondaryId());
@@ -234,6 +241,7 @@ public class SynchronizeManager implements ISynchronizeManager {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipantReference#getDescriptor()
*/
+ @Override
public ISynchronizeParticipantDescriptor getDescriptor() {
return descriptor;
}
@@ -279,6 +287,7 @@ public class SynchronizeManager implements ISynchronizeManager {
*
* @see org.eclipse.team.ui.sync.ISynchronizeManager#addSynchronizeParticipantListener(org.eclipse.team.ui.sync.ISynchronizeParticipantListener)
*/
+ @Override
public void addSynchronizeParticipantListener(ISynchronizeParticipantListener listener) {
if (fListeners == null) {
fListeners = new ListenerList(ListenerList.IDENTITY);
@@ -291,6 +300,7 @@ public class SynchronizeManager implements ISynchronizeManager {
*
* @see org.eclipse.team.ui.sync.ISynchronizeManager#removeSynchronizeParticipantListener(org.eclipse.team.ui.sync.ISynchronizeParticipantListener)
*/
+ @Override
public void removeSynchronizeParticipantListener(ISynchronizeParticipantListener listener) {
if (fListeners != null) {
fListeners.remove(listener);
@@ -334,6 +344,7 @@ public class SynchronizeManager implements ISynchronizeManager {
*
* @see org.eclipse.team.ui.sync.ISynchronizeManager#addSynchronizeParticipants(org.eclipse.team.ui.sync.ISynchronizeParticipant[])
*/
+ @Override
public synchronized void addSynchronizeParticipants(ISynchronizeParticipant[] participants) {
// renamed to createSynchronizeParticipant(id)
List added = new ArrayList(participants.length);
@@ -395,6 +406,7 @@ public class SynchronizeManager implements ISynchronizeManager {
*
* @see org.eclipse.team.ui.sync.ISynchronizeManager#removeSynchronizeParticipants(org.eclipse.team.ui.sync.ISynchronizeParticipant[])
*/
+ @Override
public synchronized void removeSynchronizeParticipants(ISynchronizeParticipant[] participants) {
List removed = new ArrayList(participants.length);
for (int i = 0; i < participants.length; i++) {
@@ -417,6 +429,7 @@ public class SynchronizeManager implements ISynchronizeManager {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeManager#get(java.lang.String)
*/
+ @Override
public ISynchronizeParticipantReference get(String id, String secondaryId) {
String key = Utils.getKey(id, secondaryId);
return (ISynchronizeParticipantReference) participantReferences.get(key);
@@ -425,6 +438,7 @@ public class SynchronizeManager implements ISynchronizeManager {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeManager#get(java.lang.String)
*/
+ @Override
public ISynchronizeParticipantReference[] get(String id) {
ISynchronizeParticipantReference[] refs = getSynchronizeParticipants();
ArrayList refsForId = new ArrayList();
@@ -442,6 +456,7 @@ public class SynchronizeManager implements ISynchronizeManager {
*
* @see org.eclipse.team.ui.sync.ISynchronizeManager#getSynchronizeParticipants()
*/
+ @Override
public synchronized ISynchronizeParticipantReference[] getSynchronizeParticipants() {
return (ISynchronizeParticipantReference[]) participantReferences.values().toArray(new ISynchronizeParticipantReference[participantReferences.values().size()]);
}
@@ -449,6 +464,7 @@ public class SynchronizeManager implements ISynchronizeManager {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeManager#showSynchronizeViewInActivePage()
*/
+ @Override
public ISynchronizeView showSynchronizeViewInActivePage() {
IWorkbench workbench = TeamUIPlugin.getPlugin().getWorkbench();
IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
@@ -666,6 +682,7 @@ public class SynchronizeManager implements ISynchronizeManager {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeManager#getDescriptor()
*/
+ @Override
public ISynchronizeParticipantDescriptor getParticipantDescriptor(String id) {
return participantRegistry.find(id);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElement.java
index fd0156fe7..0447f492e 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElement.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElement.java
@@ -51,10 +51,12 @@ public abstract class SynchronizeModelElement extends DiffNode implements IAdapt
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public Object getAdapter(Class adapter) {
return Platform.getAdapterManager().getAdapter(this, adapter);
}
+ @Override
public synchronized void addPropertyChangeListener(IPropertyChangeListener listener) {
if (listeners == null) {
listeners = new ListenerList(ListenerList.IDENTITY);
@@ -62,6 +64,7 @@ public abstract class SynchronizeModelElement extends DiffNode implements IAdapt
listeners.add(listener);
}
+ @Override
public synchronized void removePropertyChangeListener(IPropertyChangeListener listener) {
if (listeners != null) {
listeners.remove(listener);
@@ -74,6 +77,7 @@ public abstract class SynchronizeModelElement extends DiffNode implements IAdapt
/* (non-Javadoc)
* @see org.eclipse.compare.structuremergeviewer.IDiffElement#setParent(org.eclipse.compare.structuremergeviewer.IDiffContainer)
*/
+ @Override
public void setParent(IDiffContainer parent) {
super.setParent(parent);
internalSetParent(parent);
@@ -84,6 +88,7 @@ public abstract class SynchronizeModelElement extends DiffNode implements IAdapt
* @param propertyName the flag to test
* @return <code>true</code> if the property is set
*/
+ @Override
public boolean getProperty(String propertyName) {
return (getFlags() & getFlag(propertyName)) > 0;
}
@@ -92,6 +97,7 @@ public abstract class SynchronizeModelElement extends DiffNode implements IAdapt
* Add the flag to the flags for this node
* @param propertyName the flag to add
*/
+ @Override
public void setProperty(String propertyName, boolean value) {
if (value) {
if (!getProperty(propertyName)) {
@@ -108,6 +114,7 @@ public abstract class SynchronizeModelElement extends DiffNode implements IAdapt
}
}
+ @Override
public void setPropertyToRoot(String propertyName, boolean value) {
if (value) {
addToRoot(propertyName);
@@ -120,6 +127,7 @@ public abstract class SynchronizeModelElement extends DiffNode implements IAdapt
fireChange();
}
+ @Override
public ImageDescriptor getImageDescriptor(Object object) {
IResource resource = getResource();
if(resource != null) {
@@ -129,6 +137,7 @@ public abstract class SynchronizeModelElement extends DiffNode implements IAdapt
return null;
}
+ @Override
public abstract IResource getResource();
private void addToRoot(String flag) {
@@ -152,9 +161,11 @@ public abstract class SynchronizeModelElement extends DiffNode implements IAdapt
if (object instanceof IPropertyChangeListener) {
final IPropertyChangeListener listener = (IPropertyChangeListener)object;
SafeRunner.run(new ISafeRunnable() {
+ @Override
public void handleException(Throwable exception) {
// Exceptions logged by the platform
}
+ @Override
public void run() throws Exception {
listener.propertyChange(event);
}
@@ -218,6 +229,7 @@ public abstract class SynchronizeModelElement extends DiffNode implements IAdapt
* @param object The object to test
* @return true if the objects are identical
*/
+ @Override
public boolean equals(Object object) {
return this==object;
}
@@ -225,6 +237,7 @@ public abstract class SynchronizeModelElement extends DiffNode implements IAdapt
/* (non-Javadoc)
* @see org.eclipse.compare.structuremergeviewer.DiffNode#hashCode()
*/
+ @Override
public int hashCode() {
// Use the name to get the hashCode to ensure that we can find equal elements.
// (The inherited hashCode uses the path which can change when items are removed)
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementLabelProvider.java
index ce9369259..dcfa0cea2 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementLabelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementLabelProvider.java
@@ -54,6 +54,7 @@ public class SynchronizeModelElementLabelProvider extends LabelProvider implemen
* (non-Javadoc)
* @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
*/
+ @Override
public Color getForeground(Object element) {
return null;
}
@@ -62,6 +63,7 @@ public class SynchronizeModelElementLabelProvider extends LabelProvider implemen
* (non-Javadoc)
* @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
*/
+ @Override
public Color getBackground(Object element) {
return null;
}
@@ -69,6 +71,7 @@ public class SynchronizeModelElementLabelProvider extends LabelProvider implemen
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object)
*/
+ @Override
public Font getFont(Object element) {
if (element instanceof ISynchronizeModelElement) {
ISynchronizeModelElement node = (ISynchronizeModelElement)element;
@@ -91,6 +94,7 @@ public class SynchronizeModelElementLabelProvider extends LabelProvider implemen
* (non-Javadoc)
* @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
*/
+ @Override
public Image getImage(Object element) {
Image base = workbenchLabelProvider.getImage(element);
if (base != null) {
@@ -112,6 +116,7 @@ public class SynchronizeModelElementLabelProvider extends LabelProvider implemen
* (non-Javadoc)
* @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
*/
+ @Override
public String getText(Object element) {
String base = workbenchLabelProvider.getText(element);
if (element instanceof DiffNode) {
@@ -211,6 +216,7 @@ public class SynchronizeModelElementLabelProvider extends LabelProvider implemen
* (non-Javadoc)
* @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
*/
+ @Override
public void dispose() {
workbenchLabelProvider.dispose();
if(busyFont != null) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementSorter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementSorter.java
index af94ed8cc..8fa2548d6 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementSorter.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelElementSorter.java
@@ -28,6 +28,7 @@ public class SynchronizeModelElementSorter extends ResourceSorter {
/* (non-Javadoc)
* Method declared on ViewerSorter.
*/
+ @Override
public int compare(Viewer viewer, Object o1, Object o2) {
IResource resource1 = getResource(o1);
IResource resource2 = getResource(o2);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java
index 147458373..98a1f03ed 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelManager.java
@@ -50,6 +50,7 @@ public abstract class SynchronizeModelManager extends SynchronizePageActionGroup
configuration.addPropertyChangeListener(this);
}
+ @Override
public void run() {
if (!getSelectedProviderId().equals(descriptor.getId())) {
setInput(descriptor.getId(), null);
@@ -63,6 +64,7 @@ public abstract class SynchronizeModelManager extends SynchronizePageActionGroup
/* (non-Javadoc)
* @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().equals(SynchronizePageConfiguration.P_MODEL)) {
update();
@@ -178,21 +180,29 @@ public abstract class SynchronizeModelManager extends SynchronizePageActionGroup
public ISynchronizeModelElement getModelRoot() {
if (modelProvider != null && modelProvider instanceof SynchronizeModelProvider) {
((SynchronizeModelProvider)modelProvider).waitUntilDone(new IProgressMonitor() {
+ @Override
public void beginTask(String name, int totalWork) {
}
+ @Override
public void done() {
}
+ @Override
public void internalWorked(double work) {
}
+ @Override
public boolean isCanceled() {
return false;
}
+ @Override
public void setCanceled(boolean value) {
}
+ @Override
public void setTaskName(String name) {
}
+ @Override
public void subTask(String name) {
}
+ @Override
public void worked(int work) {
while (Display.getCurrent().readAndDispatch()) {}
}
@@ -206,6 +216,7 @@ public abstract class SynchronizeModelManager extends SynchronizePageActionGroup
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.IActionContribution#initialize(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
*/
+ @Override
public void initialize(ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
ISynchronizeModelProviderDescriptor[] providers = getSupportedModelProviders();
@@ -234,6 +245,7 @@ public abstract class SynchronizeModelManager extends SynchronizePageActionGroup
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.IActionContribution#setActionBars(org.eclipse.ui.IActionBars)
*/
+ @Override
public void fillActionBars(IActionBars actionBars) {
if (toggleModelProviderActions == null) return;
IToolBarManager toolbar = actionBars.getToolBarManager();
@@ -264,6 +276,7 @@ public abstract class SynchronizeModelManager extends SynchronizePageActionGroup
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.IActionContribution#dispose()
*/
+ @Override
public void dispose() {
if(modelProvider != null) {
modelProvider.dispose();
@@ -275,6 +288,7 @@ public abstract class SynchronizeModelManager extends SynchronizePageActionGroup
* Returns the configuration
* @return the configuration.
*/
+ @Override
public ISynchronizePageConfiguration getConfiguration() {
return configuration;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java
index 5fe0e6e82..38b5d8650 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java
@@ -61,6 +61,7 @@ public abstract class SynchronizeModelProvider extends AbstractSynchronizeModelP
/**
* Dispose of the builder
*/
+ @Override
public void dispose() {
resourceMap.clear();
super.dispose();
@@ -71,6 +72,7 @@ public abstract class SynchronizeModelProvider extends AbstractSynchronizeModelP
*
* @return the sorter for this model provider.
*/
+ @Override
public abstract ViewerSorter getViewerSorter();
/**
@@ -87,7 +89,8 @@ public abstract class SynchronizeModelProvider extends AbstractSynchronizeModelP
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#getModelObjects(org.eclipse.core.resources.IResource)
*/
- protected ISynchronizeModelElement[] getModelObjects(IResource resource) {
+ @Override
+ protected ISynchronizeModelElement[] getModelObjects(IResource resource) {
ISynchronizeModelElement element = getModelObject(resource);
if (element == null) {
return new ISynchronizeModelElement[0];
@@ -140,6 +143,7 @@ public abstract class SynchronizeModelProvider extends AbstractSynchronizeModelP
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#clearModelObjects(org.eclipse.team.ui.synchronize.ISynchronizeModelElement)
*/
+ @Override
protected void recursiveClearModelObjects(ISynchronizeModelElement node) {
super.recursiveClearModelObjects(node);
if (node == getModelRoot()) {
@@ -159,6 +163,7 @@ public abstract class SynchronizeModelProvider extends AbstractSynchronizeModelP
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#addToViewer(org.eclipse.team.ui.synchronize.ISynchronizeModelElement)
*/
+ @Override
protected void addToViewer(ISynchronizeModelElement node) {
associateDiffNode(node);
super.addToViewer(node);
@@ -167,10 +172,12 @@ public abstract class SynchronizeModelProvider extends AbstractSynchronizeModelP
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#hasViewerState()
*/
- protected boolean hasViewerState() {
+ @Override
+ protected boolean hasViewerState() {
return ! resourceMap.isEmpty();
}
+ @Override
public ISynchronizeModelElement[] getClosestExistingParents(IResource resource) {
ISynchronizeModelElement element = getModelObject(resource);
if(element == null) {
@@ -188,13 +195,15 @@ public abstract class SynchronizeModelProvider extends AbstractSynchronizeModelP
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#handleChanges(org.eclipse.team.core.synchronize.ISyncInfoTreeChangeEvent)
*/
- protected final void handleChanges(ISyncInfoTreeChangeEvent event, IProgressMonitor monitor) {
+ @Override
+ protected final void handleChanges(ISyncInfoTreeChangeEvent event, IProgressMonitor monitor) {
super.handleChanges(event, monitor);
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.AbstractSynchronizeModelProvider#handleResourceChanges(org.eclipse.team.core.synchronize.ISyncInfoTreeChangeEvent)
*/
+ @Override
protected void handleResourceChanges(ISyncInfoTreeChangeEvent event) {
// Refresh the viewer for each changed resource
SyncInfo[] infos = event.getChangedResources();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java
index a34b3b2b5..9b5332938 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelUpdateHandler.java
@@ -108,6 +108,7 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem
}
private IPropertyChangeListener listener = new IPropertyChangeListener() {
+ @Override
public void propertyChange(final PropertyChangeEvent event) {
if (event.getProperty() == ISynchronizeModelElement.BUSY_PROPERTY) {
Object source = event.getSource();
@@ -154,6 +155,7 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem
/* (non-Javadoc)
* @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
*/
+ @Override
public void resourceChanged(final IResourceChangeEvent event) {
String[] markerTypes = getMarkerTypes();
Set handledResources = new HashSet();
@@ -195,7 +197,8 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem
/* (non-Javadoc)
* @see org.eclipse.team.internal.core.BackgroundEventHandler#processEvent(org.eclipse.team.internal.core.BackgroundEventHandler.Event, org.eclipse.core.runtime.IProgressMonitor)
*/
- protected void processEvent(Event event, IProgressMonitor monitor) throws CoreException {
+ @Override
+ protected void processEvent(Event event, IProgressMonitor monitor) throws CoreException {
switch (event.getType()) {
case BackgroundEventHandler.RUNNABLE_EVENT :
executeRunnable(event, monitor);
@@ -247,13 +250,15 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem
/* (non-Javadoc)
* @see org.eclipse.team.internal.core.BackgroundEventHandler#doDispatchEvents(org.eclipse.core.runtime.IProgressMonitor)
*/
- protected boolean doDispatchEvents(IProgressMonitor monitor) throws TeamException {
+ @Override
+ protected boolean doDispatchEvents(IProgressMonitor monitor) throws TeamException {
// Fire label changed
dispatchEarly = false;
if (pendingLabelUpdates.isEmpty()) {
return false;
} else {
Utils.asyncExec(new Runnable() {
+ @Override
public void run() {
firePendingLabelUpdates();
}
@@ -397,7 +402,8 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem
/* (non-Javadoc)
* @see org.eclipse.team.internal.core.BackgroundEventHandler#getShortDispatchDelay()
*/
- protected long getShortDispatchDelay() {
+ @Override
+ protected long getShortDispatchDelay() {
if (dispatchEarly) {
dispatchEarly = false;
return EARLY_DISPATCH_INCREMENT;
@@ -469,7 +475,8 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem
/* (non-Javadoc)
* @see org.eclipse.team.core.synchronize.ISyncInfoSetChangeListener#syncInfoSetReset(org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
*/
- public void syncInfoSetReset(SyncInfoSet set, IProgressMonitor monitor) {
+ @Override
+ public void syncInfoSetReset(SyncInfoSet set, IProgressMonitor monitor) {
if(provider.isDisposed()) {
set.removeSyncSetChangedListener(this);
} else {
@@ -480,7 +487,8 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem
/* (non-Javadoc)
* @see org.eclipse.team.core.synchronize.ISyncInfoSetChangeListener#syncInfoChanged(org.eclipse.team.core.synchronize.ISyncInfoSetChangeEvent, org.eclipse.core.runtime.IProgressMonitor)
*/
- public void syncInfoChanged(final ISyncInfoSetChangeEvent event, IProgressMonitor monitor) {
+ @Override
+ public void syncInfoChanged(final ISyncInfoSetChangeEvent event, IProgressMonitor monitor) {
if (! (event instanceof ISyncInfoTreeChangeEvent)) {
reset();
} else {
@@ -493,7 +501,8 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem
*/
private void handleChanges(final ISyncInfoSetChangeEvent event, final IProgressMonitor monitor) {
runViewUpdate(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
provider.handleChanges((ISyncInfoTreeChangeEvent)event, monitor);
firePendingLabelUpdates();
}
@@ -503,7 +512,8 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem
/* (non-Javadoc)
* @see org.eclipse.team.core.synchronize.ISyncInfoSetChangeListener#syncInfoSetErrors(org.eclipse.team.core.synchronize.SyncInfoSet, org.eclipse.team.core.ITeamStatus[], org.eclipse.core.runtime.IProgressMonitor)
*/
- public void syncInfoSetErrors(SyncInfoSet set, ITeamStatus[] errors, IProgressMonitor monitor) {
+ @Override
+ public void syncInfoSetErrors(SyncInfoSet set, ITeamStatus[] errors, IProgressMonitor monitor) {
// When errors occur we currently don't process them. It may be possible to decorate
// elements in the model with errors, but currently we prefer to let ignore and except
// another listener to display them.
@@ -530,10 +540,12 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem
final Control ctrl = getViewer().getControl();
if (ctrl != null && !ctrl.isDisposed()) {
ctrl.getDisplay().syncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
if (!ctrl.isDisposed()) {
BusyIndicator.showWhile(ctrl.getDisplay(), new Runnable() {
- public void run() {
+ @Override
+ public void run() {
internalRunViewUpdate(runnable, preserveExpansion);
}
});
@@ -624,10 +636,12 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem
*/
private IWorkspaceRunnable getUIUpdateRunnable(final IWorkspaceRunnable runnable, final boolean preserveExpansion) {
return new IWorkspaceRunnable() {
- public void run(final IProgressMonitor monitor) throws CoreException {
+ @Override
+ public void run(final IProgressMonitor monitor) throws CoreException {
final CoreException[] exception = new CoreException[] { null };
runViewUpdate(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
try {
runnable.run(monitor);
} catch (CoreException e) {
@@ -649,7 +663,8 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem
return new IWorkspaceRunnable() {
IResource[] expanded;
IResource[] selected;
- public void run(IProgressMonitor monitor) throws CoreException {
+ @Override
+ public void run(IProgressMonitor monitor) throws CoreException {
if (preserveExpansion)
recordExpandedResources();
try {
@@ -665,7 +680,8 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem
final StructuredViewer viewer = getViewer();
if (viewer != null && !viewer.getControl().isDisposed() && viewer instanceof AbstractTreeViewer) {
viewer.getControl().getDisplay().syncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
if (viewer != null && !viewer.getControl().isDisposed()) {
expanded = provider.getExpandedResources();
selected = provider.getSelectedResources();
@@ -677,7 +693,8 @@ public class SynchronizeModelUpdateHandler extends BackgroundEventHandler implem
private void updateView() {
// Refresh the view and then set the expansion
runViewUpdate(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
provider.getViewer().refresh();
if (expanded != null)
provider.expandResources(expanded);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java
index 9924ea341..77209661c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java
@@ -135,6 +135,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#getParticipant()
*/
+ @Override
public ISynchronizeParticipant getParticipant() {
return participant;
}
@@ -142,6 +143,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#getSite()
*/
+ @Override
public ISynchronizePageSite getSite() {
return site;
}
@@ -158,6 +160,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
*/
+ @Override
public void addPropertyChangeListener(IPropertyChangeListener listener) {
synchronized(propertyChangeListeners) {
propertyChangeListeners.add(listener);
@@ -167,6 +170,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
*/
+ @Override
public void removePropertyChangeListener(IPropertyChangeListener listener) {
synchronized(propertyChangeListeners) {
propertyChangeListeners.remove(listener);
@@ -176,6 +180,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#setProperty(java.lang.String, java.lang.Object)
*/
+ @Override
public void setProperty(String key, Object newValue) {
Object oldValue = properties.get(key);
if (page == null || page.aboutToChangeProperty(this, key, newValue)) {
@@ -188,6 +193,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#getProperty(java.lang.String)
*/
+ @Override
public Object getProperty(String key) {
return properties.get(key);
}
@@ -195,6 +201,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#addActionContribution(org.eclipse.team.ui.synchronize.IActionContribution)
*/
+ @Override
public void addActionContribution(SynchronizePageActionGroup contribution) {
int currentActionState;
synchronized(actionContributions) {
@@ -220,6 +227,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#removeActionContribution(org.eclipse.team.ui.synchronize.IActionContribution)
*/
+ @Override
public void removeActionContribution(SynchronizePageActionGroup contribution) {
synchronized(actionContributions) {
actionContributions.remove(contribution);
@@ -235,9 +243,11 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
for (int i = 0; i < listeners.length; i++) {
final IPropertyChangeListener listener = (IPropertyChangeListener)listeners[i];
SafeRunner.run(new ISafeRunnable() {
+ @Override
public void handleException(Throwable exception) {
// Error is logged by platform
}
+ @Override
public void run() throws Exception {
listener.propertyChange(event);
}
@@ -248,6 +258,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.IActionContribution#initialize(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
*/
+ @Override
public void initialize(final ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
// need to synchronize here to ensure that actions that are added concurrently also get initialized
@@ -263,9 +274,11 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
for (int i= 0; i < listeners.length; i++) {
final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i];
SafeRunner.run(new ISafeRunnable() {
+ @Override
public void handleException(Throwable exception) {
// Logged by Platform
}
+ @Override
public void run() throws Exception {
contribution.initialize(configuration);
}
@@ -276,6 +289,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.ui.actions.ActionGroup#setContext(org.eclipse.ui.actions.ActionContext)
*/
+ @Override
public void setContext(final ActionContext context) {
super.setContext(context);
final Object[] listeners;
@@ -285,9 +299,11 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
for (int i= 0; i < listeners.length; i++) {
final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i];
SafeRunner.run(new ISafeRunnable() {
+ @Override
public void handleException(Throwable exception) {
// Logged by Platform
}
+ @Override
public void run() throws Exception {
contribution.setContext(context);
}
@@ -300,6 +316,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
* about to be shown.
* @param manager the context menu manager
*/
+ @Override
public void fillContextMenu(final IMenuManager manager) {
final Object[] listeners;
synchronized(actionContributions) {
@@ -308,9 +325,11 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
for (int i= 0; i < listeners.length; i++) {
final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i];
SafeRunner.run(new ISafeRunnable() {
+ @Override
public void handleException(Throwable exception) {
// Logged by Platform
}
+ @Override
public void run() throws Exception {
contribution.fillContextMenu(manager);
}
@@ -322,6 +341,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
* Callback invoked from the page to fill the action bars.
* @param actionBars the action bars of the view
*/
+ @Override
public void fillActionBars(final IActionBars actionBars) {
if (actionState == UNINITIALIZED) {
initialize(this);
@@ -333,9 +353,11 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
for (int i= 0; i < listeners.length; i++) {
final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i];
SafeRunner.run(new ISafeRunnable() {
+ @Override
public void handleException(Throwable exception) {
// Logged by Platform
}
+ @Override
public void run() throws Exception {
contribution.fillActionBars(actionBars);
}
@@ -346,6 +368,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.ui.actions.ActionGroup#updateActionBars()
*/
+ @Override
public void updateActionBars() {
final Object[] listeners;
synchronized(actionContributions) {
@@ -354,9 +377,11 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
for (int i= 0; i < listeners.length; i++) {
final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i];
SafeRunner.run(new ISafeRunnable() {
+ @Override
public void handleException(Throwable exception) {
// Logged by Platform
}
+ @Override
public void run() throws Exception {
contribution.updateActionBars();
}
@@ -367,6 +392,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#modelChanged(org.eclipse.team.ui.synchronize.ISynchronizeModelElement)
*/
+ @Override
public void modelChanged(final ISynchronizeModelElement root) {
final Object[] listeners;
synchronized(actionContributions) {
@@ -375,9 +401,11 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
for (int i= 0; i < listeners.length; i++) {
final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i];
SafeRunner.run(new ISafeRunnable() {
+ @Override
public void handleException(Throwable exception) {
// Logged by Platform
}
+ @Override
public void run() throws Exception {
contribution.modelChanged(root);
}
@@ -388,6 +416,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.IActionContribution#dispose()
*/
+ @Override
public void dispose() {
super.dispose();
final Object[] listeners;
@@ -398,9 +427,11 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
for (int i= 0; i < listeners.length; i++) {
final SynchronizePageActionGroup contribution = (SynchronizePageActionGroup)listeners[i];
SafeRunner.run(new ISafeRunnable() {
+ @Override
public void handleException(Throwable exception) {
// Logged by Platform
}
+ @Override
public void run() throws Exception {
contribution.dispose();
}
@@ -411,6 +442,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#setMenu(java.lang.String, java.lang.String[])
*/
+ @Override
public void setMenuGroups(String menuPropertyId, String[] groups) {
setProperty(menuPropertyId, groups);
}
@@ -418,6 +450,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#appendMenu(java.lang.String, java.lang.String)
*/
+ @Override
public void addMenuGroup(String menuPropertyId, String groupId) {
String[] menuGroups = (String[])getProperty(menuPropertyId);
if (menuGroups == null) {
@@ -432,6 +465,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#hasMenuGroup(java.lang.String, java.lang.String)
*/
+ @Override
public boolean hasMenuGroup(String menuPropertyId, String groupId) {
String[] groups = (String[])getProperty(menuPropertyId);
if (groups == null) {
@@ -459,6 +493,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#addLabelDecorator(org.eclipse.jface.viewers.ILabelDecorator)
*/
+ @Override
public void addLabelDecorator(ILabelDecorator decorator) {
ILabelDecorator[] decorators = (ILabelDecorator[])getProperty(P_LABEL_DECORATORS);
if (decorators == null) {
@@ -493,6 +528,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.subscribers.ISubscriberPageConfiguration#getMode()
*/
+ @Override
public int getMode() {
Object o = getProperty(P_MODE);
if (o instanceof Integer) {
@@ -504,6 +540,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.subscribers.ISubscriberPageConfiguration#setMode(int)
*/
+ @Override
public void setMode(int mode) {
if (isModeSupported(mode))
setProperty(P_MODE, new Integer(mode));
@@ -513,6 +550,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
return (getSupportedModes() & mode) > 0;
}
+ @Override
public int getSupportedModes() {
Object o = getProperty(P_SUPPORTED_MODES);
if (o instanceof Integer) {
@@ -524,6 +562,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.subscribers.ISubscriberPageConfiguration#setSupportedModes(int)
*/
+ @Override
public void setSupportedModes(int modes) {
setProperty(P_SUPPORTED_MODES, new Integer(modes));
}
@@ -531,12 +570,14 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/**
* @return Returns the page.
*/
+ @Override
public ISynchronizePage getPage() {
return page;
}
/**
* @param page The page to set.
*/
+ @Override
public void setPage(ISynchronizePage page) {
this.page = page;
}
@@ -562,6 +603,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#getSyncInfoSet()
*/
+ @Override
public SyncInfoSet getSyncInfoSet() {
Object o = getProperty(P_SYNC_INFO_SET);
if (o instanceof SyncInfoSet) {
@@ -573,6 +615,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#getComparisonType()
*/
+ @Override
public String getComparisonType() {
return (String)getProperty(P_COMPARISON_TYPE);
}
@@ -580,6 +623,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#setComparisonType(java.lang.String)
*/
+ @Override
public void setComparisonType(String type) {
setProperty(P_COMPARISON_TYPE,type);
}
@@ -587,6 +631,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#setRunnableContext(org.eclipse.jface.operation.IRunnableContext)
*/
+ @Override
public void setRunnableContext(IRunnableContext context) {
this.context = context;
}
@@ -594,10 +639,12 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration#getRunnableContext()
*/
+ @Override
public IRunnableContext getRunnableContext() {
return context;
}
+ @Override
public String getViewerId() {
String viewerId = (String)getProperty(P_VIEWER_ID);
if (viewerId != null)
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java
index 532315535..a7c402b09 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeView.java
@@ -116,6 +116,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
Object source = event.getSource();
if (source instanceof ISynchronizeParticipant) {
@@ -125,6 +126,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
}
} else if (event.getProperty().equals(ModelSynchronizeParticipant.PROP_DIRTY)) {
Display.getDefault().asyncExec(new Runnable() {
+ @Override
public void run() {
firePropertyChange(PROP_DIRTY);
}
@@ -142,6 +144,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
final IWorkbenchSiteProgressService ps = (IWorkbenchSiteProgressService)getSite().getAdapter(IWorkbenchSiteProgressService.class);
if (ps != null)
Display.getDefault().asyncExec(new Runnable() {
+ @Override
public void run() {
ps.warnOfContentChange();
}
@@ -165,6 +168,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart)
*/
+ @Override
public void partClosed(IWorkbenchPart part) {
super.partClosed(part);
}
@@ -172,6 +176,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.team.ui.sync.ISynchronizeView#getParticipant()
*/
+ @Override
public ISynchronizeParticipant getParticipant() {
return activeParticipantRef;
}
@@ -179,6 +184,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.part.PageBookView#showPageRec(org.eclipse.ui.part.PageBookView.PageRec)
*/
+ @Override
protected void showPageRec(PageRec pageRec) {
super.showPageRec(pageRec);
activeParticipantRef = (ISynchronizeParticipant)fPartToParticipant.get(pageRec.part);
@@ -209,6 +215,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.part.PageBookView#doDestroyPage(org.eclipse.ui.IWorkbenchPart, org.eclipse.ui.part.PageBookView.PageRec)
*/
+ @Override
protected void doDestroyPage(IWorkbenchPart part, PageRec pageRecord) {
IPage page = pageRecord.page;
page.dispose();
@@ -232,6 +239,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.part.PageBookView#doCreatePage(org.eclipse.ui.IWorkbenchPart)
*/
+ @Override
protected PageRec doCreatePage(IWorkbenchPart dummyPart) {
SynchronizeViewWorkbenchPart part = (SynchronizeViewWorkbenchPart)dummyPart;
ISynchronizeParticipant participant = part.getParticipant();
@@ -271,6 +279,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.part.PageBookView#isImportant(org.eclipse.ui.IWorkbenchPart)
*/
+ @Override
protected boolean isImportant(IWorkbenchPart part) {
return part instanceof SynchronizeViewWorkbenchPart;
}
@@ -278,6 +287,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#dispose()
*/
+ @Override
public void dispose() {
super.dispose();
TeamUI.getSynchronizeManager().removeSynchronizeParticipantListener(this);
@@ -306,6 +316,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.part.PageBookView#createDefaultPage(org.eclipse.ui.part.PageBook)
*/
+ @Override
protected IPage createDefaultPage(PageBook book) {
Page page = new MessagePage();
page.createControl(getPageBook());
@@ -316,6 +327,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.team.ui.sync.ISynchronizeParticipantListener#participantsAdded(org.eclipse.team.ui.sync.ISynchronizeParticipant[])
*/
+ @Override
public void participantsAdded(final ISynchronizeParticipant[] participants) {
for (int i = 0; i < participants.length; i++) {
ISynchronizeParticipant participant = participants[i];
@@ -326,6 +338,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
}
}
Display.getDefault().asyncExec(new Runnable() {
+ @Override
public void run() {
firePropertyChange(PROP_DIRTY);
}
@@ -335,9 +348,11 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.team.ui.sync.ISynchronizeParticipantListener#participantsRemoved(org.eclipse.team.ui.sync.ISynchronizeParticipant[])
*/
+ @Override
public void participantsRemoved(final ISynchronizeParticipant[] participants) {
if (isAvailable()) {
Runnable r = new Runnable() {
+ @Override
public void run() {
for (int i = 0; i < participants.length; i++) {
ISynchronizeParticipant participant = participants[i];
@@ -443,6 +458,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeView#display(org.eclipse.team.ui.synchronize.ISynchronizeParticipant)
*/
+ @Override
public void display(ISynchronizeParticipant participant) {
SynchronizeViewWorkbenchPart part = (SynchronizeViewWorkbenchPart)fParticipantToPart.get(participant);
if (part != null) {
@@ -458,6 +474,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
if (fOpenAndLinkWithEditorHelper != null)
fOpenAndLinkWithEditorHelper.dispose();
fOpenAndLinkWithEditorHelper= new OpenAndLinkWithEditorHelper(viewer) {
+ @Override
protected void activate(ISelection selection) {
try {
final Object selectedElement = getSingleElement(selection);
@@ -469,10 +486,12 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
}
}
+ @Override
protected void linkToEditor(ISelection selection) {
SynchronizeView.this.linkToEditor(selection);
}
+ @Override
protected void open(ISelection selection, boolean activate) {
// TODO: implement, bug 291211
}
@@ -484,6 +503,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.part.PageBookView#getBootstrapPart()
*/
+ @Override
protected IWorkbenchPart getBootstrapPart() {
return null;
}
@@ -515,6 +535,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
* </ul>
* @see IWorkbenchPart#createPartControl(Composite)
*/
+ @Override
public void createPartControl(Composite parent) {
super.createPartControl(parent);
restoreLinkingEnabled();
@@ -653,6 +674,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablesSource#getSaveables()
*/
+ @Override
public Saveable[] getSaveables() {
Set result = new HashSet();
for (Iterator iter = fPartToParticipant.keySet().iterator(); iter.hasNext();) {
@@ -676,6 +698,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablesSource#getActiveSaveables()
*/
+ @Override
public Saveable[] getActiveSaveables() {
ISynchronizeParticipant participant = getParticipant();
Saveable s = getSaveable(participant);
@@ -687,6 +710,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void doSave(IProgressMonitor monitor) {
Saveable[] saveables = getSaveables();
if (saveables.length == 0)
@@ -708,6 +732,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#doSaveAs()
*/
+ @Override
public void doSaveAs() {
// Not allowed
}
@@ -715,6 +740,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#isDirty()
*/
+ @Override
public boolean isDirty() {
Saveable[] saveables = getSaveables();
for (int i = 0; i < saveables.length; i++) {
@@ -728,6 +754,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#isSaveAsAllowed()
*/
+ @Override
public boolean isSaveAsAllowed() {
return false;
}
@@ -735,6 +762,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#isSaveOnCloseNeeded()
*/
+ @Override
public boolean isSaveOnCloseNeeded() {
return true;
}
@@ -768,18 +796,26 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
// copy-pasted from org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart and modified
private IPartListener2 fLinkWithEditorListener= new IPartListener2() {
+ @Override
public void partVisible(IWorkbenchPartReference partRef) {}
+ @Override
public void partBroughtToTop(IWorkbenchPartReference partRef) {}
+ @Override
public void partClosed(IWorkbenchPartReference partRef) {}
+ @Override
public void partDeactivated(IWorkbenchPartReference partRef) {}
+ @Override
public void partHidden(IWorkbenchPartReference partRef) {}
+ @Override
public void partOpened(IWorkbenchPartReference partRef) {}
+ @Override
public void partInputChanged(IWorkbenchPartReference partRef) {
if (partRef instanceof IEditorReference) {
editorActivated(((IEditorReference) partRef).getEditor(true));
}
}
+ @Override
public void partActivated(IWorkbenchPartReference partRef) {
if (partRef instanceof IEditorReference) {
editorActivated(((IEditorReference) partRef).getEditor(true));
@@ -805,6 +841,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
return null;
}
+ @Override
public int hashCode(Object element) {
Object r = getContributedResourceOrResourceVariant(element);
if (r != null)
@@ -812,6 +849,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
return element.hashCode();
}
+ @Override
public boolean equals(Object a, Object b) {
// no need to check for null, CustomeHashtable cannot contain null keys
if (a instanceof IResource || a instanceof IResourceVariant) {
@@ -1066,6 +1104,7 @@ public class SynchronizeView extends PageBookView implements ISynchronizeView, I
/* (non-Javadoc)
* @see org.eclipse.ui.part.IShowInTarget#show(org.eclipse.ui.part.ShowInContext)
*/
+ @Override
public boolean show(ShowInContext context) {
Object selection = getSingleElement(context.getSelection());
if (selection != null) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeViewWorkbenchPart.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeViewWorkbenchPart.java
index ee170d532..00cf7e190 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeViewWorkbenchPart.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeViewWorkbenchPart.java
@@ -30,6 +30,7 @@ public class SynchronizeViewWorkbenchPart implements IWorkbenchPart {
/* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj) {
return (obj instanceof SynchronizeViewWorkbenchPart) &&
participant.equals(((SynchronizeViewWorkbenchPart)obj).getParticipant());
@@ -38,6 +39,7 @@ public class SynchronizeViewWorkbenchPart implements IWorkbenchPart {
/* (non-Javadoc)
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode() {
return participant.hashCode();
}
@@ -54,24 +56,28 @@ public class SynchronizeViewWorkbenchPart implements IWorkbenchPart {
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#addPropertyListener(org.eclipse.ui.IPropertyListener)
*/
+ @Override
public void addPropertyListener(IPropertyListener listener) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createPartControl(Composite parent) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#dispose()
*/
+ @Override
public void dispose() {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#getSite()
*/
+ @Override
public IWorkbenchPartSite getSite() {
return site;
}
@@ -79,6 +85,7 @@ public class SynchronizeViewWorkbenchPart implements IWorkbenchPart {
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#getTitle()
*/
+ @Override
public String getTitle() {
return ""; //$NON-NLS-1$
}
@@ -86,6 +93,7 @@ public class SynchronizeViewWorkbenchPart implements IWorkbenchPart {
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#getTitleImage()
*/
+ @Override
public Image getTitleImage() {
return null;
}
@@ -93,6 +101,7 @@ public class SynchronizeViewWorkbenchPart implements IWorkbenchPart {
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#getTitleToolTip()
*/
+ @Override
public String getTitleToolTip() {
return ""; //$NON-NLS-1$
}
@@ -100,18 +109,21 @@ public class SynchronizeViewWorkbenchPart implements IWorkbenchPart {
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#removePropertyListener(org.eclipse.ui.IPropertyListener)
*/
+ @Override
public void removePropertyListener(IPropertyListener listener) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#setFocus()
*/
+ @Override
public void setFocus() {
}
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public Object getAdapter(Class adapter) {
return null;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TeamSynchronizingPerspective.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TeamSynchronizingPerspective.java
index 2e208bab3..ce2ca9201 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TeamSynchronizingPerspective.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TeamSynchronizingPerspective.java
@@ -21,6 +21,7 @@ public class TeamSynchronizingPerspective implements IPerspectiveFactory {
/* (Non-javadoc)
* Method declared on IPerpsectiveFactory
*/
+ @Override
public void createInitialLayout(IPageLayout layout) {
defineActions(layout);
defineLayout(layout);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TreeViewerAdvisor.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TreeViewerAdvisor.java
index 6eaf5cc29..57b274117 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TreeViewerAdvisor.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/TreeViewerAdvisor.java
@@ -70,10 +70,12 @@ public class TreeViewerAdvisor extends AbstractTreeViewerAdvisor {
setUseHashlookup(true);
}
+ @Override
public void createChildren(TreeItem item) {
super.createChildren(item);
}
+ @Override
public void openSelection() {
fireOpen(new OpenEvent(this, getSelection()));
}
@@ -89,10 +91,12 @@ public class TreeViewerAdvisor extends AbstractTreeViewerAdvisor {
setUseHashlookup(true);
}
+ @Override
public void createChildren(TreeItem item) {
super.createChildren(item);
}
+ @Override
public void openSelection() {
fireOpen(new OpenEvent(this, getSelection()));
}
@@ -138,6 +142,7 @@ public class TreeViewerAdvisor extends AbstractTreeViewerAdvisor {
initializeViewer(viewer);
}
+ @Override
public void setInitialInput() {
// The input will be set later
}
@@ -171,6 +176,7 @@ public class TreeViewerAdvisor extends AbstractTreeViewerAdvisor {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.viewers.StructuredViewerAdvisor#initializeViewer(org.eclipse.jface.viewers.StructuredViewer)
*/
+ @Override
public boolean validateViewer(StructuredViewer viewer) {
return viewer instanceof AbstractTreeViewer;
}
@@ -178,9 +184,11 @@ public class TreeViewerAdvisor extends AbstractTreeViewerAdvisor {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.viewers.StructuredViewerAdvisor#initializeListeners(org.eclipse.jface.viewers.StructuredViewer)
*/
+ @Override
protected void initializeListeners(final StructuredViewer viewer) {
super.initializeListeners(viewer);
viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
updateStatusLine((IStructuredSelection) event.getSelection());
}
@@ -224,6 +232,7 @@ public class TreeViewerAdvisor extends AbstractTreeViewerAdvisor {
final ISynchronizeModelElement modelRoot = modelProvider.getModelRoot();
getActionGroup().modelChanged(modelRoot);
modelRoot.addCompareInputChangeListener(new ICompareInputChangeListener() {
+ @Override
public void compareInputChanged(ICompareInput source) {
getActionGroup().modelChanged(modelRoot);
}
@@ -233,11 +242,13 @@ public class TreeViewerAdvisor extends AbstractTreeViewerAdvisor {
viewer.setSorter(modelProvider.getViewerSorter());
viewer.setInput(modelRoot);
modelProvider.addPropertyChangeListener(new IPropertyChangeListener() {
- public void propertyChange(PropertyChangeEvent event) {
+ @Override
+ public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty() == ISynchronizeModelProvider.P_VIEWER_SORTER) {
if (viewer != null && !viewer.getControl().isDisposed()) {
viewer.getControl().getDisplay().syncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
if (viewer != null && !viewer.getControl().isDisposed()) {
ViewerSorter newSorter = modelProvider.getViewerSorter();
ViewerSorter oldSorter = viewer.getSorter();
@@ -262,18 +273,21 @@ public class TreeViewerAdvisor extends AbstractTreeViewerAdvisor {
* can be shown to the user.
* @param viewer the viewer being installed
*/
+ @Override
public final void initializeViewer(final StructuredViewer viewer) {
super.initializeViewer(viewer);
final DragSourceListener listener = new DragSourceListener() {
- public void dragStart(DragSourceEvent event) {
+ @Override
+ public void dragStart(DragSourceEvent event) {
final IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
final Object [] array= selection.toArray();
event.doit= Utils.getResources(array).length > 0;
}
- public void dragSetData(DragSourceEvent event) {
+ @Override
+ public void dragSetData(DragSourceEvent event) {
if (ResourceTransfer.getInstance().isSupportedType(event.dataType)) {
final IStructuredSelection selection= (IStructuredSelection)viewer.getSelection();
@@ -282,7 +296,8 @@ public class TreeViewerAdvisor extends AbstractTreeViewerAdvisor {
}
}
- public void dragFinished(DragSourceEvent event) {}
+ @Override
+ public void dragFinished(DragSourceEvent event) {}
};
final int ops = DND.DROP_COPY | DND.DROP_LINK;
@@ -322,6 +337,7 @@ public class TreeViewerAdvisor extends AbstractTreeViewerAdvisor {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.StructuredViewerAdvisor#dispose()
*/
+ @Override
public void dispose() {
if (statusLine != null) {
statusLine.dispose();
@@ -332,6 +348,7 @@ public class TreeViewerAdvisor extends AbstractTreeViewerAdvisor {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.StructuredViewerAdvisor#initializeStatusLine(org.eclipse.ui.IActionBars)
*/
+ @Override
protected void initializeStatusLine(IActionBars actionBars) {
statusLine = new SyncInfoSetStatusLineContributionGroup(
getConfiguration().getSite().getShell(),
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/UnchangedResourceModelElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/UnchangedResourceModelElement.java
index 7b27c3873..870b87dff 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/UnchangedResourceModelElement.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/UnchangedResourceModelElement.java
@@ -30,6 +30,7 @@ public class UnchangedResourceModelElement extends SynchronizeModelElement {
/**
* @return Returns the resource.
*/
+ @Override
public IResource getResource() {
return resource;
}
@@ -37,6 +38,7 @@ public class UnchangedResourceModelElement extends SynchronizeModelElement {
/* (non-Javadoc)
* @see org.eclipse.compare.structuremergeviewer.DiffNode#getName()
*/
+ @Override
public String getName() {
return resource.getName();
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchAction.java
index 5c7ea0ffd..d05cb34f8 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchAction.java
@@ -23,6 +23,7 @@ public class WorkbenchAction extends Action implements IWorkbenchAction {
/* (non-Javadoc)
* @see org.eclipse.ui.actions.ActionFactory.IWorkbenchAction#dispose()
*/
+ @Override
public void dispose() {
}
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchPartSynchronizePageSite.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchPartSynchronizePageSite.java
index 9593ea827..0829d0512 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchPartSynchronizePageSite.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/WorkbenchPartSynchronizePageSite.java
@@ -34,6 +34,7 @@ public class WorkbenchPartSynchronizePageSite implements ISynchronizePageSite {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getPart()
*/
+ @Override
public IWorkbenchPart getPart() {
return part;
}
@@ -41,6 +42,7 @@ public class WorkbenchPartSynchronizePageSite implements ISynchronizePageSite {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getShell()
*/
+ @Override
public Shell getShell() {
return part.getSite().getShell();
}
@@ -48,6 +50,7 @@ public class WorkbenchPartSynchronizePageSite implements ISynchronizePageSite {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getSelectionProvider()
*/
+ @Override
public ISelectionProvider getSelectionProvider() {
return site.getSelectionProvider();
}
@@ -55,6 +58,7 @@ public class WorkbenchPartSynchronizePageSite implements ISynchronizePageSite {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#setSelectionProvider(org.eclipse.jface.viewers.ISelectionProvider)
*/
+ @Override
public void setSelectionProvider(ISelectionProvider provider) {
site.setSelectionProvider(provider);
}
@@ -62,6 +66,7 @@ public class WorkbenchPartSynchronizePageSite implements ISynchronizePageSite {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getWorkbenchSite()
*/
+ @Override
public IWorkbenchSite getWorkbenchSite() {
return part.getSite();
}
@@ -69,6 +74,7 @@ public class WorkbenchPartSynchronizePageSite implements ISynchronizePageSite {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getKeyBindingService()
*/
+ @Override
public IKeyBindingService getKeyBindingService() {
return part.getSite().getKeyBindingService();
}
@@ -76,6 +82,7 @@ public class WorkbenchPartSynchronizePageSite implements ISynchronizePageSite {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#setFocus()
*/
+ @Override
public void setFocus() {
part.getSite().getPage().activate(part);
}
@@ -83,6 +90,7 @@ public class WorkbenchPartSynchronizePageSite implements ISynchronizePageSite {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getPageSettings()
*/
+ @Override
public IDialogSettings getPageSettings() {
return settings;
}
@@ -90,6 +98,7 @@ public class WorkbenchPartSynchronizePageSite implements ISynchronizePageSite {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#getActionBars()
*/
+ @Override
public IActionBars getActionBars() {
return site.getActionBars();
}
@@ -97,6 +106,7 @@ public class WorkbenchPartSynchronizePageSite implements ISynchronizePageSite {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizePageSite#isModal()
*/
+ @Override
public boolean isModal() {
return false;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java
index 156378070..c3c51cc00 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ChangeSetActionGroup.java
@@ -62,6 +62,7 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#needsToSaveDirtyEditors()
*/
+ @Override
protected boolean needsToSaveDirtyEditors() {
return false;
}
@@ -69,18 +70,22 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#getSyncInfoFilter()
*/
- protected FastSyncInfoFilter getSyncInfoFilter() {
+ @Override
+ protected FastSyncInfoFilter getSyncInfoFilter() {
return OUTGOING_RESOURCE_FILTER;
}
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#getSubscriberOperation(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration, org.eclipse.compare.structuremergeviewer.IDiffElement[])
*/
- protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
+ @Override
+ protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
return new SynchronizeModelOperation(configuration, elements) {
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
+ @Override
+ public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
syncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
ActiveChangeSet set = createChangeSet(getDiffs(getSyncInfoSet().getResources()));
if (set != null) {
getActiveChangeSetManager().add(set);
@@ -101,7 +106,8 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
*/
- protected boolean updateSelection(IStructuredSelection selection) {
+ @Override
+ protected boolean updateSelection(IStructuredSelection selection) {
return getSelectedSet() != null;
}
@@ -126,7 +132,8 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
super(TeamUIMessages.ChangeLogModelProvider_6, configuration);
}
- public void run() {
+ @Override
+ public void run() {
ActiveChangeSet set = getSelectedSet();
if (set == null) return;
editChangeSet(set);
@@ -139,7 +146,8 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
super(TeamUIMessages.ChangeLogModelProvider_7, configuration);
}
- public void run() {
+ @Override
+ public void run() {
ActiveChangeSet set = getSelectedSet();
if (set == null) return;
if (MessageDialog.openConfirm(getConfiguration().getSite().getShell(), TeamUIMessages.ChangeSetActionGroup_0, NLS.bind(TeamUIMessages.ChangeSetActionGroup_1, new String[] { LegacyActionTools.escapeMnemonics(set.getTitle()) }))) { //
@@ -155,6 +163,7 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
super(TeamUIMessages.ChangeLogModelProvider_9, configuration);
}
+ @Override
protected boolean updateSelection(IStructuredSelection selection) {
if (getSelectedSet() != null) {
setText(TeamUIMessages.ChangeLogModelProvider_9);
@@ -167,6 +176,7 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
return true;
}
+ @Override
public void run() {
getActiveChangeSetManager().makeDefault(
isChecked() ? getSelectedSet() : null);
@@ -190,10 +200,12 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#getSyncInfoFilter()
*/
- protected FastSyncInfoFilter getSyncInfoFilter() {
+ @Override
+ protected FastSyncInfoFilter getSyncInfoFilter() {
return OUTGOING_RESOURCE_FILTER;
}
+ @Override
protected boolean needsToSaveDirtyEditors() {
return false;
}
@@ -201,9 +213,11 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#getSubscriberOperation(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration, org.eclipse.compare.structuremergeviewer.IDiffElement[])
*/
- protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
+ @Override
+ protected SynchronizeModelOperation getSubscriberOperation(ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
return new SynchronizeModelOperation(configuration, elements) {
- public void run(IProgressMonitor monitor)
+ @Override
+ public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
IResource[] resources = getSyncInfoSet().getResources();
if (set != null) {
@@ -232,6 +246,7 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
update();
}
+ @Override
public void run() {
if (isChecked() && sortCriteria != criteria) {
sortCriteria = criteria;
@@ -302,6 +317,7 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
this.provider = provider;
}
+ @Override
public void initialize(ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
@@ -317,7 +333,8 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
addToChangeSet = new MenuManager(TeamUIMessages.ChangeLogModelProvider_12);
addToChangeSet.setRemoveAllWhenShown(true);
addToChangeSet.addMenuListener(new IMenuListener() {
- public void menuAboutToShow(IMenuManager manager) {
+ @Override
+ public void menuAboutToShow(IMenuManager manager) {
addChangeSets(manager);
}
});
@@ -338,7 +355,8 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager)
*/
- public void fillContextMenu(IMenuManager menu) {
+ @Override
+ public void fillContextMenu(IMenuManager menu) {
if (getChangeSetCapability().enableCheckedInChangeSetsFor(getConfiguration())) {
appendToGroup(menu, ISynchronizePageConfiguration.SORT_GROUP, sortByComment);
}
@@ -369,7 +387,8 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
ChangeSet[] sets = getActiveChangeSetManager().getSets();
Arrays.sort(sets, new Comparator() {
private Collator collator = Collator.getInstance();
- public int compare(Object o1, Object o2) {
+ @Override
+ public int compare(Object o1, Object o2) {
return collator.compare(((ChangeSet) o1).getName(), ((ChangeSet) o2).getName());
}
});
@@ -398,6 +417,7 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#dispose()
*/
+ @Override
public void dispose() {
if (addToChangeSet != null) {
addToChangeSet.dispose();
@@ -414,7 +434,8 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
}
- public void updateActionBars() {
+ @Override
+ public void updateActionBars() {
if (editChangeSet != null)
editChangeSet.selectionChanged((IStructuredSelection)getContext().getSelection());
if (removeChangeSet != null)
@@ -428,6 +449,7 @@ public class ChangeSetActionGroup extends SynchronizePageActionGroup {
final Control ctrl = getConfiguration().getPage().getViewer().getControl();
if (ctrl != null && !ctrl.isDisposed()) {
ctrl.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
if (!ctrl.isDisposed()) {
runnable.run();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java
index b22b5f9e4..0ef23ce8f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/CopyToClipboardAction.java
@@ -58,7 +58,8 @@ class CopyToClipboardAction extends SelectionListenerAction {
setId(ID);
}
- public void run() {
+ @Override
+ public void run() {
copyResources(getSelectedResources(), getTextualClipboardContents());
}
@@ -191,7 +192,8 @@ class CopyToClipboardAction extends SelectionListenerAction {
}
}
- protected boolean updateSelection(IStructuredSelection selection) {
+ @Override
+ protected boolean updateSelection(IStructuredSelection selection) {
if (!super.updateSelection(selection))
return false;
// Calling our own selection utility because the elements in the
@@ -227,10 +229,12 @@ class CopyToClipboardAction extends SelectionListenerAction {
return false;
}
+ @Override
protected List getSelectedNonResources() {
return Arrays.asList(Utils.getNonResources(getStructuredSelection().toArray()));
}
+ @Override
protected List getSelectedResources() {
// Calling our own selection utility because the elements in the
// synchronize view can't adapt to IResource because we don't want the usual object
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DefaultSynchronizePageActions.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DefaultSynchronizePageActions.java
index b85978312..83a177f0c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DefaultSynchronizePageActions.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DefaultSynchronizePageActions.java
@@ -35,6 +35,7 @@ public class DefaultSynchronizePageActions extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.IActionContribution#initialize(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
*/
+ @Override
public void initialize(ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
final ISynchronizePageSite site = configuration.getSite();
@@ -43,6 +44,7 @@ public class DefaultSynchronizePageActions extends SynchronizePageActionGroup {
openWithActions = new OpenWithActionGroup(configuration, true);
refactorActions = new RefactorActionGroup(site);
configuration.setProperty(SynchronizePageConfiguration.P_OPEN_ACTION, new Action() {
+ @Override
public void run() {
openWithActions.openInCompareEditor();
}
@@ -56,7 +58,8 @@ public class DefaultSynchronizePageActions extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#fillActionBars(org.eclipse.ui.IActionBars)
*/
- public void fillActionBars(IActionBars actionBars) {
+ @Override
+ public void fillActionBars(IActionBars actionBars) {
if (openWithActions != null) openWithActions.fillActionBars(actionBars);
if (refactorActions != null) refactorActions.fillActionBars(actionBars);
if (actionBars != null && showPreferences != null) {
@@ -68,7 +71,8 @@ public class DefaultSynchronizePageActions extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.ui.actions.ActionGroup#updateActionBars()
*/
- public void updateActionBars() {
+ @Override
+ public void updateActionBars() {
if (openWithActions != null) openWithActions.updateActionBars();
if (refactorActions != null) refactorActions.updateActionBars();
}
@@ -76,6 +80,7 @@ public class DefaultSynchronizePageActions extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.IActionContribution#fillContextMenu(org.eclipse.jface.action.IMenuManager)
*/
+ @Override
public void fillContextMenu(IMenuManager manager) {
final IContributionItem fileGroup = findGroup(manager, ISynchronizePageConfiguration.FILE_GROUP);
@@ -92,6 +97,7 @@ public class DefaultSynchronizePageActions extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#dispose()
*/
+ @Override
public void dispose() {
super.dispose();
if (refactorActions != null) refactorActions.dispose();
@@ -101,7 +107,8 @@ public class DefaultSynchronizePageActions extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.ui.actions.ActionGroup#setContext(org.eclipse.ui.actions.ActionContext)
*/
- public void setContext(ActionContext context) {
+ @Override
+ public void setContext(ActionContext context) {
if (openWithActions != null) openWithActions.setContext(context);
if (refactorActions != null) refactorActions.setContext(context);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DirectionFilterActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DirectionFilterActionGroup.java
index d2fe8d6ff..3e5869c52 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DirectionFilterActionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/DirectionFilterActionGroup.java
@@ -52,6 +52,7 @@ public class DirectionFilterActionGroup extends ActionGroup implements IProperty
this.modeId = modeId;
Utils.initAction(this, prefix);
}
+ @Override
public void run() {
if(isChecked()) {
configuration.setMode(modeId);
@@ -178,6 +179,7 @@ public class DirectionFilterActionGroup extends ActionGroup implements IProperty
/* (non-Javadoc)
* @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if(event.getProperty().equals(ISynchronizePageConfiguration.P_MODE)) {
Integer mode = (Integer)event.getNewValue();
@@ -188,6 +190,7 @@ public class DirectionFilterActionGroup extends ActionGroup implements IProperty
/* (non-Javadoc)
* @see org.eclipse.ui.actions.ActionGroup#dispose()
*/
+ @Override
public void dispose() {
super.dispose();
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ExpandAllAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ExpandAllAction.java
index a2fac9b89..3d8e66697 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ExpandAllAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ExpandAllAction.java
@@ -24,6 +24,7 @@ public class ExpandAllAction extends Action implements ISelectionChangedListener
this.viewer = viewer;
viewer.addSelectionChangedListener(this);
}
+ @Override
public void run() {
expandAllFromSelection();
}
@@ -48,6 +49,7 @@ public class ExpandAllAction extends Action implements ISelectionChangedListener
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
*/
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
ISelection selection = event.getSelection();
if (selection instanceof IStructuredSelection) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/GlobalRefreshAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/GlobalRefreshAction.java
index 6e59e8d90..f95fc2151 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/GlobalRefreshAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/GlobalRefreshAction.java
@@ -53,6 +53,7 @@ public class GlobalRefreshAction extends Action implements IMenuCreator, IWorkbe
class RefreshParticipantAction extends Action {
private ISynchronizeParticipantReference participant;
+ @Override
public void run() {
TeamUIPlugin.getPlugin().getPreferenceStore().setValue(IPreferenceIds.SYNCHRONIZING_DEFAULT_PARTICIPANT, participant.getId());
TeamUIPlugin.getPlugin().getPreferenceStore().setValue(IPreferenceIds.SYNCHRONIZING_DEFAULT_PARTICIPANT_SEC_ID, participant.getSecondaryId());
@@ -74,6 +75,7 @@ public class GlobalRefreshAction extends Action implements IMenuCreator, IWorkbe
* (non-Javadoc)
* @see org.eclipse.jface.action.IMenuCreator#dispose()
*/
+ @Override
public void dispose() {
if(menuManager != null) {
menuManager.dispose();
@@ -98,6 +100,7 @@ public class GlobalRefreshAction extends Action implements IMenuCreator, IWorkbe
* (non-Javadoc)
* @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu)
*/
+ @Override
public Menu getMenu(Menu parent) {
return null;
}
@@ -106,6 +109,7 @@ public class GlobalRefreshAction extends Action implements IMenuCreator, IWorkbe
* (non-Javadoc)
* @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control)
*/
+ @Override
public Menu getMenu(Control parent) {
Menu fMenu = null;
if (menuManager == null) {
@@ -131,10 +135,12 @@ public class GlobalRefreshAction extends Action implements IMenuCreator, IWorkbe
* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
*/
+ @Override
public void init(IWorkbenchWindow window) {
this.window = window;
synchronizeAction = new Action(TeamUIMessages.GlobalRefreshAction_4) {
+ @Override
public void run() {
IWizard wizard = new GlobalSynchronizeWizard();
WizardDialog dialog = new WizardDialog(GlobalRefreshAction.this.window.getShell(), wizard);
@@ -148,6 +154,7 @@ public class GlobalRefreshAction extends Action implements IMenuCreator, IWorkbe
if (hs != null) {
// hook up actions to the commands
IHandler handler = new AbstractHandler() {
+ @Override
public Object execute(ExecutionEvent event)
throws ExecutionException {
synchronizeAction.run();
@@ -157,6 +164,7 @@ public class GlobalRefreshAction extends Action implements IMenuCreator, IWorkbe
syncAll = hs.activateHandler("org.eclipse.team.ui.synchronizeAll", handler); //$NON-NLS-1$
handler = new AbstractHandler() {
+ @Override
public Object execute(ExecutionEvent event)
throws ExecutionException {
run();
@@ -169,6 +177,7 @@ public class GlobalRefreshAction extends Action implements IMenuCreator, IWorkbe
TeamUI.getSynchronizeManager().addSynchronizeParticipantListener(this);
}
+ @Override
public void run() {
String id = TeamUIPlugin.getPlugin().getPreferenceStore().getString(IPreferenceIds.SYNCHRONIZING_DEFAULT_PARTICIPANT);
String secondaryId = TeamUIPlugin.getPlugin().getPreferenceStore().getString(IPreferenceIds.SYNCHRONIZING_DEFAULT_PARTICIPANT_SEC_ID);
@@ -184,6 +193,7 @@ public class GlobalRefreshAction extends Action implements IMenuCreator, IWorkbe
* (non-Javadoc)
* @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
*/
+ @Override
public void run(IAction action) {
run();
actionProxy = action;
@@ -205,9 +215,11 @@ public class GlobalRefreshAction extends Action implements IMenuCreator, IWorkbe
/* (non-Javadoc)
* @see org.eclipse.team.ui.sync.ISynchronizeParticipantListener#participantsAdded(org.eclipse.team.ui.sync.ISynchronizeParticipant[])
*/
+ @Override
public void participantsAdded(ISynchronizeParticipant[] consoles) {
Display display = TeamUIPlugin.getStandardDisplay();
display.asyncExec(new Runnable() {
+ @Override
public void run() {
if(menuManager != null) {
menuManager.dispose();
@@ -221,9 +233,11 @@ public class GlobalRefreshAction extends Action implements IMenuCreator, IWorkbe
/* (non-Javadoc)
* @see org.eclipse.team.ui.sync.ISynchronizeParticipantListener#participantsRemoved(org.eclipse.team.ui.sync.ISynchronizeParticipant[])
*/
+ @Override
public void participantsRemoved(ISynchronizeParticipant[] consoles) {
Display display = TeamUIPlugin.getStandardDisplay();
display.asyncExec(new Runnable() {
+ @Override
public void run() {
if(menuManager != null) {
menuManager.dispose();
@@ -239,6 +253,7 @@ public class GlobalRefreshAction extends Action implements IMenuCreator, IWorkbe
* @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
* org.eclipse.jface.viewers.ISelection)
*/
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
actionProxy = action;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/NavigateAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/NavigateAction.java
index 341f00428..568a5b40d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/NavigateAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/NavigateAction.java
@@ -50,6 +50,7 @@ public class NavigateAction extends Action {
* Two types of navigation is supported: navigation that is specific to coordinating between a view
* and a compare editor and navigation simply using the configured navigator.
*/
+ @Override
public void run() {
ICompareNavigator nav = (ICompareNavigator)configuration.getProperty(SynchronizePageConfiguration.P_NAVIGATOR);
nav.selectChange(next);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenFileInSystemEditorAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenFileInSystemEditorAction.java
index 08f8b10d1..d2e34ffed 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenFileInSystemEditorAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenFileInSystemEditorAction.java
@@ -29,6 +29,7 @@ public class OpenFileInSystemEditorAction extends OpenFileAction {
/* (non-Javadoc)
* @see org.eclipse.ui.actions.SelectionListenerAction#getSelectedResources()
*/
+ @Override
protected List getSelectedResources() {
IStructuredSelection selection = getStructuredSelection();
IResource[] resources = Utils.getResources(selection.toArray());
@@ -38,6 +39,7 @@ public class OpenFileInSystemEditorAction extends OpenFileAction {
/* (non-Javadoc)
* @see org.eclipse.ui.actions.SelectionListenerAction#getSelectedNonResources()
*/
+ @Override
protected List getSelectedNonResources() {
return Collections.EMPTY_LIST;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java
index 8fbfdab0b..5ab2e6fbc 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/OpenInCompareAction.java
@@ -49,6 +49,7 @@ public class OpenInCompareAction extends Action {
Utils.initAction(this, "action.openInCompareEditor."); //$NON-NLS-1$
}
+ @Override
public void run() {
ISelection selection = configuration.getSite().getSelectionProvider().getSelection();
if(selection instanceof IStructuredSelection) {
@@ -134,6 +135,7 @@ public class OpenInCompareAction extends Action {
final boolean[] result = new boolean[] { false };
try {
PlatformUI.getWorkbench().getProgressService().run(true, true, new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException,
InterruptedException {
try {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PasteAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PasteAction.java
index 8f496d640..668843932 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PasteAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PasteAction.java
@@ -46,6 +46,7 @@ public class PasteAction extends SelectionListenerAction {
setId(ID);
}
+ @Override
public void run() {
IStorage patchStorage = getPatchStorage();
if (patchStorage != null) {
@@ -59,6 +60,7 @@ public class PasteAction extends SelectionListenerAction {
// https://bugs.eclipse.org/309803
ApplyPatchOperation operation = new ApplyPatchOperation(null,
patchStorage, resource, new CompareConfiguration()) {
+ @Override
protected boolean isApplyPatchInSynchronizeView() {
// ignore the preference, apply in the sync view
return true;
@@ -77,22 +79,27 @@ public class PasteAction extends SelectionListenerAction {
return null;
IStorage storage = new IEncodedStorage() {
+ @Override
public Object getAdapter(Class adapter) {
return null;
}
+ @Override
public boolean isReadOnly() {
return false;
}
+ @Override
public String getName() {
return null;
}
+ @Override
public IPath getFullPath() {
return null;
}
+ @Override
public InputStream getContents() throws CoreException {
try {
return new ByteArrayInputStream(text.getBytes(getCharset()));
@@ -102,6 +109,7 @@ public class PasteAction extends SelectionListenerAction {
}
}
+ @Override
public String getCharset() throws CoreException {
return "UTF-8"; //$NON-NLS-1$
}
@@ -139,6 +147,7 @@ public class PasteAction extends SelectionListenerAction {
// see bug 33028 for explanation why we need this
final Object[] result = new Object[1];
shell.getDisplay().syncExec(new Runnable() {
+ @Override
public void run() {
result[0] = clipboard.getContents(transfer);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PinParticipantAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PinParticipantAction.java
index 68d0bbec1..446b98298 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PinParticipantAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/PinParticipantAction.java
@@ -49,10 +49,12 @@ public class PinParticipantAction extends Action implements IPropertyChangeListe
setChecked(participant != null && participant.isPinned());
}
+ @Override
public void run() {
if (participant != null) {
try {
PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
participant.setPinned(!participant.isPinned());
@@ -70,6 +72,7 @@ public class PinParticipantAction extends Action implements IPropertyChangeListe
/* (non-Javadoc)
* @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getSource() == participant) {
updateState();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefactorActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefactorActionGroup.java
index 0c0c6d91a..55e915b30 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefactorActionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefactorActionGroup.java
@@ -64,13 +64,15 @@ public class RefactorActionGroup extends ActionGroup {
parentMenu.appendToGroup(groupId, renameAction);
}
- public void fillActionBars(IActionBars actionBars) {
+ @Override
+ public void fillActionBars(IActionBars actionBars) {
actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(), copyAction);
actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), deleteAction);
actionBars.setGlobalActionHandler(ActionFactory.RENAME.getId(), renameAction);
actionBars.setGlobalActionHandler(ActionFactory.MOVE.getId(), moveAction);
}
+ @Override
public void updateActionBars() {
copyAction.selectionChanged(getObjectSelection());
deleteAction.selectionChanged(getObjectSelection());
@@ -91,10 +93,12 @@ public class RefactorActionGroup extends ActionGroup {
.getImageDescriptor(ISharedImages.IMG_TOOL_COPY_DISABLED));
deleteAction = new DeleteResourceAction(shell) {
+ @Override
protected List getSelectedResources() {
return getSelection().toList();// Arrays.asList(Utils.getResources(getSelection().toArray()));
}
+ @Override
protected boolean updateSelection(IStructuredSelection selection) {
// TODO Auto-generated method stub
return super.updateSelection(selection)
@@ -110,6 +114,7 @@ public class RefactorActionGroup extends ActionGroup {
.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE_DISABLED));
moveAction = new MoveResourceAction(shell) {
+ @Override
protected boolean updateSelection(IStructuredSelection selection) {
// TODO Auto-generated method stub
return super.updateSelection(selection)
@@ -120,6 +125,7 @@ public class RefactorActionGroup extends ActionGroup {
moveAction.setActionDefinitionId(IWorkbenchCommandConstants.FILE_MOVE);
renameAction = new RenameResourceAction(shell) {
+ @Override
protected boolean updateSelection(IStructuredSelection selection) {
// TODO Auto-generated method stub
return super.updateSelection(selection)
@@ -176,6 +182,7 @@ public class RefactorActionGroup extends ActionGroup {
/* (non-Javadoc)
* @see org.eclipse.ui.actions.ActionGroup#dispose()
*/
+ @Override
public void dispose() {
super.dispose();
copyAction.dispose();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefreshActionContribution.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefreshActionContribution.java
index 10464e056..ada54606e 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefreshActionContribution.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RefreshActionContribution.java
@@ -30,6 +30,7 @@ public class RefreshActionContribution extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.IActionContribution#initialize(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
*/
+ @Override
public void initialize(final ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
final ISynchronizePageSite site = configuration.getSite();
@@ -37,6 +38,7 @@ public class RefreshActionContribution extends SynchronizePageActionGroup {
// toolbar
if (participant.doesSupportSynchronize()) {
refreshSelectionAction = new Action() {
+ @Override
public void run() {
IStructuredSelection selection = (IStructuredSelection)site.getSelectionProvider().getSelection();
ResourceMapping[] mappings = Utils.getResourceMappings(selection.toArray());
@@ -51,6 +53,7 @@ public class RefreshActionContribution extends SynchronizePageActionGroup {
if (o instanceof IRefreshable) {
final IRefreshable refreshable = (IRefreshable) o;
configureSchedule = new Action() {
+ @Override
public void run() {
ConfigureRefreshScheduleDialog d = new ConfigureRefreshScheduleDialog(
site.getShell(), refreshable.getRefreshSchedule());
@@ -69,6 +72,7 @@ public class RefreshActionContribution extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.IActionContribution#fillContextMenu(org.eclipse.jface.action.IMenuManager)
*/
+ @Override
public void fillContextMenu(IMenuManager manager) {
if (findGroup(manager, ISynchronizePageConfiguration.SYNCHRONIZE_GROUP) != null
&& findGroup(manager, ISynchronizePageConfiguration.NAVIGATE_GROUP) != null) {
@@ -84,6 +88,7 @@ public class RefreshActionContribution extends SynchronizePageActionGroup {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.IActionContribution#setActionBars(org.eclipse.ui.IActionBars)
*/
+ @Override
public void fillActionBars(IActionBars actionBars) {
super.fillActionBars(actionBars);
if(actionBars != null) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveFromViewAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveFromViewAction.java
index c3d4546c1..a69ca7aeb 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveFromViewAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveFromViewAction.java
@@ -39,6 +39,7 @@ public class RemoveFromViewAction extends SynchronizeModelAction {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#run()
*/
+ @Override
public void run() {
if (confirmRemove()) {
super.run();
@@ -48,12 +49,15 @@ public class RemoveFromViewAction extends SynchronizeModelAction {
/* (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) {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
SyncInfoSet set = getSyncInfoSet();
removeFromView(set);
}
+ @Override
protected boolean canRunAsJob() {
return false;
}
@@ -66,6 +70,7 @@ public class RemoveFromViewAction extends SynchronizeModelAction {
if (page instanceof SubscriberParticipantPage) {
final WorkingSetFilteredSyncInfoCollector collector = ((SubscriberParticipantPage)page).getCollector();
collector.run(new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
collector.getWorkingSetSyncInfoSet().removeAll(set.getResources());
}
@@ -78,6 +83,7 @@ public class RemoveFromViewAction extends SynchronizeModelAction {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#needsToSaveDirtyEditors()
*/
+ @Override
protected boolean needsToSaveDirtyEditors() {
return false;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java
index b420d67fb..64ce63531 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RemoveSynchronizeParticipantAction.java
@@ -51,9 +51,11 @@ public class RemoveSynchronizeParticipantAction extends Action {
}
}
+ @Override
public void run() {
try {
PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
if (removeAll) {
removeAll();
@@ -76,6 +78,7 @@ public class RemoveSynchronizeParticipantAction extends Action {
if (participant.isPinned() || !dirtyModels.isEmpty()) {
final boolean[] keepGoing = new boolean[] { false };
Display.getDefault().syncExec(new Runnable() {
+ @Override
public void run() {
if (!dirtyModels.isEmpty()) {
keepGoing[0] = promptToSave(dirtyModels);
@@ -116,6 +119,7 @@ public class RemoveSynchronizeParticipantAction extends Action {
if (!dirtyModels.isEmpty()) {
final boolean[] keepGoing = new boolean[] { false };
Display.getDefault().syncExec(new Runnable() {
+ @Override
public void run() {
if (!dirtyModels.isEmpty()) {
keepGoing[0] = promptToSave(dirtyModels);
@@ -176,6 +180,7 @@ public class RemoveSynchronizeParticipantAction extends Action {
// Create save block.
final List finalModels = dirtyModels;
IRunnableWithProgress progressOp = new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) {
monitor.beginTask(null, finalModels.size());
for (Iterator i = finalModels.iterator(); i.hasNext();) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RestoreRemovedItemsAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RestoreRemovedItemsAction.java
index c5819126d..55921618f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RestoreRemovedItemsAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/RestoreRemovedItemsAction.java
@@ -26,12 +26,15 @@ public class RestoreRemovedItemsAction extends SynchronizeModelAction {
Utils.initAction(this, "action.restoreRemovedFromView."); //$NON-NLS-1$
}
+ @Override
protected SynchronizeModelOperation getSubscriberOperation(
ISynchronizePageConfiguration configuration, IDiffElement[] elements) {
return new SynchronizeModelOperation(configuration, elements) {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
restoreRemovedItems();
}
+ @Override
protected boolean canRunAsJob() {
return false;
}
@@ -49,6 +52,7 @@ public class RestoreRemovedItemsAction extends SynchronizeModelAction {
};
}
+ @Override
public boolean isEnabled(){
return true;
}
@@ -56,6 +60,7 @@ public class RestoreRemovedItemsAction extends SynchronizeModelAction {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#needsToSaveDirtyEditors()
*/
+ @Override
protected boolean needsToSaveDirtyEditors() {
return false;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java
index 28c0b80e3..5c51fcde5 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ShowSynchronizeParticipantAction.java
@@ -29,6 +29,7 @@ public class ShowSynchronizeParticipantAction extends Action implements IPropert
private ISynchronizeParticipantReference fPage;
private ISynchronizeView fView;
+ @Override
public void run() {
try {
if (!fPage.equals(fView.getParticipant())) {
@@ -59,6 +60,7 @@ public class ShowSynchronizeParticipantAction extends Action implements IPropert
}
}
+ @Override
public void propertyChange( PropertyChangeEvent event) {
String property = event.getProperty();
if( AbstractSynchronizeParticipant.P_PINNED.equals( property) ||
@@ -84,6 +86,7 @@ public class ShowSynchronizeParticipantAction extends Action implements IPropert
}
}
+ @Override
protected void drawCompositeImage(int width, int height) {
drawImage(this.imageData, 0, 0);
if (this.participant.isPinned()) {
@@ -103,6 +106,7 @@ public class ShowSynchronizeParticipantAction extends Action implements IPropert
}
}
+ @Override
protected Point getSize() {
return new Point(this.imageData.width, this.imageData.height);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineCLabelContribution.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineCLabelContribution.java
index f25e5d558..11af76d02 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineCLabelContribution.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineCLabelContribution.java
@@ -41,6 +41,7 @@ public class StatusLineCLabelContribution extends ContributionItem {
setVisible(false); // no text to start with
}
+ @Override
public void fill(Composite parent) {
Label sep = new Label(parent, SWT.SEPARATOR);
label = new CLabel(parent, SWT.SHADOW_NONE);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java
index 98e5b0361..c5afc13fd 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java
@@ -59,6 +59,7 @@ public abstract class StatusLineContributionGroup extends ActionGroup {
private StatusLineCLabelContribution createStatusLineContribution(String id, final int mode, String label, Image image) {
StatusLineCLabelContribution item = new StatusLineCLabelContribution(id, 15);
item.addListener(SWT.MouseDown, new Listener() {
+ @Override
public void handleEvent(Event event) {
configuration.setMode(mode);
}
@@ -68,6 +69,7 @@ public abstract class StatusLineContributionGroup extends ActionGroup {
return item;
}
+ @Override
public void dispose() {
if (isThreeWay()) {
incomingImage.dispose();
@@ -85,6 +87,7 @@ public abstract class StatusLineContributionGroup extends ActionGroup {
final int workspaceIncoming = ((supportedModes & ISynchronizePageConfiguration.INCOMING_MODE) != 0) ? countFor(SyncInfo.INCOMING) : 0;
TeamUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
+ @Override
public void run() {
if (isThreeWay()) {
conflicting.setText(new Integer(workspaceConflicting).toString());
@@ -114,6 +117,7 @@ public abstract class StatusLineContributionGroup extends ActionGroup {
*
* @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars)
*/
+ @Override
public void fillActionBars(IActionBars actionBars) {
IStatusLineManager mgr = actionBars.getStatusLineManager();
if (isThreeWay()) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SubscriberActionContribution.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SubscriberActionContribution.java
index 5bda01f69..585708f00 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SubscriberActionContribution.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SubscriberActionContribution.java
@@ -33,6 +33,7 @@ public final class SubscriberActionContribution extends SynchronizePageActionGro
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.IActionContribution#initialize(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
*/
+ @Override
public void initialize(final ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
final SubscriberParticipant participant = (SubscriberParticipant)configuration.getParticipant();
@@ -41,6 +42,7 @@ public final class SubscriberActionContribution extends SynchronizePageActionGro
if(participant.doesSupportSynchronize()) {
refreshSelectionAction = new Action() {
+ @Override
public void run() {
IStructuredSelection selection = (IStructuredSelection)site.getSelectionProvider().getSelection();
IResource[] resources = Utils.getResources(selection.toArray());
@@ -56,6 +58,7 @@ public final class SubscriberActionContribution extends SynchronizePageActionGro
refreshSelectionAction.setId("org.eclipse.team.ui.synchronizeLast"); //$NON-NLS-1$
configureSchedule = new Action() {
+ @Override
public void run() {
ConfigureRefreshScheduleDialog d = new ConfigureRefreshScheduleDialog(
site.getShell(), participant.getRefreshSchedule());
@@ -74,6 +77,7 @@ public final class SubscriberActionContribution extends SynchronizePageActionGro
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.IActionContribution#fillContextMenu(org.eclipse.jface.action.IMenuManager)
*/
+ @Override
public void fillContextMenu(IMenuManager manager) {
if (findGroup(manager, ISynchronizePageConfiguration.SYNCHRONIZE_GROUP) != null
&& findGroup(manager, ISynchronizePageConfiguration.NAVIGATE_GROUP) != null) {
@@ -89,6 +93,7 @@ public final class SubscriberActionContribution extends SynchronizePageActionGro
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.IActionContribution#setActionBars(org.eclipse.ui.IActionBars)
*/
+ @Override
public void fillActionBars(IActionBars actionBars) {
super.fillActionBars(actionBars);
if(actionBars != null) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SyncInfoSetStatusLineContributionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SyncInfoSetStatusLineContributionGroup.java
index 7b24edf0c..349db2f7d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SyncInfoSetStatusLineContributionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SyncInfoSetStatusLineContributionGroup.java
@@ -27,6 +27,7 @@ public class SyncInfoSetStatusLineContributionGroup extends
set.addSyncSetChangedListener(this);
}
+ @Override
public void dispose() {
getSyncInfoSet().removeSyncSetChangedListener(this);
super.dispose();
@@ -36,6 +37,7 @@ public class SyncInfoSetStatusLineContributionGroup extends
*
* @see org.eclipse.team.internal.ui.sync.sets.ISyncSetChangedListener#syncSetChanged(org.eclipse.team.internal.ui.sync.sets.SyncSetChangedEvent)
*/
+ @Override
public void syncInfoChanged(ISyncInfoSetChangeEvent event, IProgressMonitor monitor) {
updateCounts();
}
@@ -43,6 +45,7 @@ public class SyncInfoSetStatusLineContributionGroup extends
/* (non-Javadoc)
* @see org.eclipse.team.core.subscribers.ISyncInfoSetChangeListener#syncInfoSetReset(org.eclipse.team.core.subscribers.SyncInfoSet, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void syncInfoSetReset(SyncInfoSet set, IProgressMonitor monitor) {
updateCounts();
}
@@ -50,6 +53,7 @@ public class SyncInfoSetStatusLineContributionGroup extends
/* (non-Javadoc)
* @see org.eclipse.team.core.subscribers.ISyncInfoSetChangeListener#syncInfoSetError(org.eclipse.team.core.subscribers.SyncInfoSet, org.eclipse.team.core.ITeamStatus[], org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void syncInfoSetErrors(SyncInfoSet set, ITeamStatus[] errors, IProgressMonitor monitor) {
// Nothing to do for errors
}
@@ -58,10 +62,12 @@ public class SyncInfoSetStatusLineContributionGroup extends
return (SyncInfoSet)getConfiguration().getProperty(SynchronizePageConfiguration.P_WORKING_SET_SYNC_INFO_SET);
}
+ @Override
protected int getChangeCount() {
return getSyncInfoSet().size();
}
+ @Override
protected int countFor(int state) {
return (int)getSyncInfoSet().countFor(state, SyncInfo.DIRECTION_MASK);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SyncViewerShowPreferencesAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SyncViewerShowPreferencesAction.java
index 77e9ba717..362ded5e5 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SyncViewerShowPreferencesAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SyncViewerShowPreferencesAction.java
@@ -24,6 +24,7 @@ public class SyncViewerShowPreferencesAction extends Action {
Utils.initAction(this, "action.syncViewPreferences."); //$NON-NLS-1$
}
+ @Override
public void run() {
PreferencePage[] pages = configuration.getParticipant().getPreferencePages();
PreferencePageContainerDialog dialog = new PreferencePageContainerDialog(configuration.getSite().getShell(), pages);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizeAndRefreshAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizeAndRefreshAction.java
index db80c1f47..d4c57ff9f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizeAndRefreshAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizeAndRefreshAction.java
@@ -34,6 +34,7 @@ public class SynchronizeAndRefreshAction extends Action {
/* (non-Javadoc)
* @see org.eclipse.jface.action.IAction#run()
*/
+ @Override
public void run() {
ISynchronizeParticipant current = fView.getParticipant();
if(current != null) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java
index b4b1c26c3..ac8a0d833 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/SynchronizePageDropDownAction.java
@@ -34,6 +34,7 @@ public class SynchronizePageDropDownAction extends Action implements IMenuCreato
Utils.initAction(this, "action.refreshSubscriber."); //$NON-NLS-1$
synchronizeAction = new Action(TeamUIMessages.GlobalRefreshAction_4) {
+ @Override
public void run() {
IWizard wizard = new GlobalSynchronizeWizard();
WizardDialog dialog = new WizardDialog(fView.getViewSite().getShell(), wizard);
@@ -53,6 +54,7 @@ public class SynchronizePageDropDownAction extends Action implements IMenuCreato
/* (non-Javadoc)
* @see org.eclipse.jface.action.IMenuCreator#dispose()
*/
+ @Override
public void dispose() {
if(menuManager != null) {
menuManager.dispose();
@@ -64,6 +66,7 @@ public class SynchronizePageDropDownAction extends Action implements IMenuCreato
/* (non-Javadoc)
* @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu)
*/
+ @Override
public Menu getMenu(Menu parent) {
return null;
}
@@ -71,6 +74,7 @@ public class SynchronizePageDropDownAction extends Action implements IMenuCreato
/* (non-Javadoc)
* @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control)
*/
+ @Override
public Menu getMenu(Control parent) {
Menu fMenu = null;
if (menuManager == null) {
@@ -106,6 +110,7 @@ public class SynchronizePageDropDownAction extends Action implements IMenuCreato
/* (non-Javadoc)
* @see org.eclipse.jface.action.IAction#run()
*/
+ @Override
public void run() {
ISynchronizeParticipant current = fView.getParticipant();
if(current != null) {
@@ -119,9 +124,11 @@ public class SynchronizePageDropDownAction extends Action implements IMenuCreato
/* (non-Javadoc)
* @see org.eclipse.team.ui.sync.ISynchronizeParticipantListener#participantsAdded(org.eclipse.team.ui.sync.ISynchronizeParticipant[])
*/
+ @Override
public void participantsAdded(ISynchronizeParticipant[] consoles) {
Display display = TeamUIPlugin.getStandardDisplay();
display.asyncExec(new Runnable() {
+ @Override
public void run() {
if(menuManager != null) {
menuManager.dispose();
@@ -135,9 +142,11 @@ public class SynchronizePageDropDownAction extends Action implements IMenuCreato
/* (non-Javadoc)
* @see org.eclipse.team.ui.sync.ISynchronizeParticipantListener#participantsRemoved(org.eclipse.team.ui.sync.ISynchronizeParticipant[])
*/
+ @Override
public void participantsRemoved(ISynchronizeParticipant[] consoles) {
Display display = TeamUIPlugin.getStandardDisplay();
display.asyncExec(new Runnable() {
+ @Override
public void run() {
if(menuManager != null) {
menuManager.dispose();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ToggleLinkingAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ToggleLinkingAction.java
index 9227f5284..d3b5528bb 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ToggleLinkingAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/ToggleLinkingAction.java
@@ -30,6 +30,7 @@ public class ToggleLinkingAction extends Action {
setChecked(view.isLinkingEnabled());
}
+ @Override
public void run() {
view.setLinkingEnabled(isChecked());
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/AdapterFactory.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/AdapterFactory.java
index 6fab0e281..4cf0265ec 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/AdapterFactory.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/AdapterFactory.java
@@ -22,6 +22,7 @@ public class AdapterFactory implements IAdapterFactory {
private IWorkbenchAdapter modelAdapter = new PatchWorkbenchAdapter();
private ISynchronizationCompareAdapter compareAdapter;
+ @Override
public Object getAdapter(Object adaptableObject, Class adapterType) {
if (adapterType == ResourceMapping.class) {
if (adaptableObject instanceof PatchProjectDiffNode) {
@@ -55,6 +56,7 @@ public class AdapterFactory implements IAdapterFactory {
return null;
}
+ @Override
public Class[] getAdapterList() {
return new Class[] { ResourceMapping.class, IWorkbenchAdapter.class,
IResource.class };
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java
index df0e6d2cb..0152a40cb 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelCompareEditorInput.java
@@ -35,11 +35,13 @@ public class ApplyPatchModelCompareEditorInput extends ModelCompareEditorInput {
super(participant, input, page, synchronizeConfiguration);
}
+ @Override
protected void handleMenuAboutToShow(IMenuManager manager) {
StructuredSelection selection = new StructuredSelection(((IResourceProvider)getCompareInput()).getResource());
final ResourceMarkAsMergedHandler markAsMergedHandler = new ResourceMarkAsMergedHandler(getSynchronizeConfiguration());
markAsMergedHandler.updateEnablement(selection);
Action markAsMergedAction = new Action(TeamUIMessages.ModelCompareEditorInput_0) {
+ @Override
public void run() {
try {
markAsMergedHandler.execute(new ExecutionEvent());
@@ -55,6 +57,7 @@ public class ApplyPatchModelCompareEditorInput extends ModelCompareEditorInput {
final ResourceMergeHandler mergeHandler = new ResourceMergeHandler(getSynchronizeConfiguration(), false);
mergeHandler.updateEnablement(selection);
Action mergeAction = new Action(TeamUIMessages.ModelCompareEditorInput_1) {
+ @Override
public void run() {
try {
mergeHandler.execute(new ExecutionEvent());
@@ -71,6 +74,7 @@ public class ApplyPatchModelCompareEditorInput extends ModelCompareEditorInput {
manager.insertAfter("merge", mergeAction); //$NON-NLS-1$
}
+ @Override
protected void contentsCreated() {
super.contentsCreated();
ICompareNavigator nav = getNavigator();
@@ -81,6 +85,7 @@ public class ApplyPatchModelCompareEditorInput extends ModelCompareEditorInput {
CompareViewerPane cvp = (CompareViewerPane) pane;
cvp.setSelection(StructuredSelection.EMPTY);
cvp.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent e) {
feed1(cein);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java
index 5b1f6ffe9..8dabe3a7f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchModelSynchronizeParticipant.java
@@ -45,6 +45,7 @@ public class ApplyPatchModelSynchronizeParticipant extends
}
}
+ @Override
protected void initializeConfiguration(
final ISynchronizePageConfiguration configuration) {
super.initializeConfiguration(configuration);
@@ -54,12 +55,14 @@ public class ApplyPatchModelSynchronizeParticipant extends
configuration.setMode(ISynchronizePageConfiguration.INCOMING_MODE);
}
+ @Override
protected ModelSynchronizeParticipantActionGroup createMergeActionGroup() {
return new ApplyPatchModelSynchronizeParticipantActionGroup();
}
public class ApplyPatchModelSynchronizeParticipantActionGroup extends
ModelSynchronizeParticipantActionGroup {
+ @Override
protected void addToContextMenu(String mergeActionId, Action action,
IMenuManager manager) {
if (mergeActionId == SynchronizationActionProvider.OVERWRITE_ACTION_ID) {
@@ -69,6 +72,7 @@ public class ApplyPatchModelSynchronizeParticipant extends
super.addToContextMenu(mergeActionId, action, manager);
}
+ @Override
public void fillActionBars(IActionBars actionBars) {
if (actionBars != null) {
IMenuManager menu = actionBars.getMenuManager();
@@ -105,6 +109,7 @@ public class ApplyPatchModelSynchronizeParticipant extends
}
};
+ @Override
public ModelProvider[] getEnabledModelProviders() {
ModelProvider[] enabledProviders = super.getEnabledModelProviders();
// add Patch model provider if it's not there
@@ -124,6 +129,7 @@ public class ApplyPatchModelSynchronizeParticipant extends
return extended;
}
+ @Override
public ICompareInput asCompareInput(Object object) {
// consult adapter first
ISynchronizationCompareAdapter adapter = Utils
@@ -136,6 +142,7 @@ public class ApplyPatchModelSynchronizeParticipant extends
return null;
}
+ @Override
public Object getAdapter(Class adapter) {
if (adapter == IRefreshable.class) {
return null;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchOperation.java
index f316ce949..118ccf37c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchOperation.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchOperation.java
@@ -213,6 +213,7 @@ public class ApplyPatchOperation implements Runnable {
/* (non-Javadoc)
* @see java.lang.Runnable#run()
*/
+ @Override
public void run() {
openWizard();
}
@@ -222,6 +223,7 @@ public class ApplyPatchOperation implements Runnable {
BufferedReader reader = Utilities.createReader(storage);
try {
PatchReader patchReader = new PatchReader() {
+ @Override
protected FilePatch2 createFileDiff(IPath oldPath, long oldDate,
IPath newPath, long newDate) {
return new FilePatch(oldPath, oldDate, newPath,
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java
index 765bfc82b..d444013ac 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriber.java
@@ -36,6 +36,7 @@ public class ApplyPatchSubscriber extends Subscriber {
super(local, base, remote, comparator);
}
+ @Override
protected int calculateKind() throws TeamException {
// TODO: this works only for files, see bug 300214
if (!getPatcher().isEnabled(PatchModelProvider.getPatchObject(getLocal(), patcher)))
@@ -79,14 +80,17 @@ public class ApplyPatchSubscriber extends Subscriber {
getPatcher().refresh();
}
+ @Override
public String getName() {
return "Apply Patch Subscriber"; //$NON-NLS-1$
}
+ @Override
public IResourceVariantComparator getResourceComparator() {
return comparator;
}
+ @Override
public SyncInfo getSyncInfo(IResource resource) throws TeamException {
if (!isSupervised(resource)) return null;
// TODO: called too many times, optimize
@@ -108,11 +112,13 @@ public class ApplyPatchSubscriber extends Subscriber {
}
}
+ @Override
public boolean isSupervised(IResource resource) throws TeamException {
return resource.getType() == IResource.FILE
&& PatchModelProvider.getPatchObject(resource, getPatcher()) != null;
}
+ @Override
public IResource[] members(IResource resource) throws TeamException {
//XXX: what if there is an addition in the patch that needs to add 3 subfolders?
try {
@@ -144,6 +150,7 @@ public class ApplyPatchSubscriber extends Subscriber {
}
}
+ @Override
public void refresh(IResource[] resources, int depth,
IProgressMonitor monitor) throws TeamException {
Set /* <FilePatch> */diffs = new HashSet();
@@ -158,6 +165,7 @@ public class ApplyPatchSubscriber extends Subscriber {
getPatcher().refresh((FilePatch2[]) diffs.toArray(new FilePatch2[0]));
}
+ @Override
public IResource[] roots() {
Set roots = new HashSet();
if (getPatcher().isWorkspacePatch()) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriberMergeContext.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriberMergeContext.java
index 5d51217e4..7bd3c76b9 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriberMergeContext.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSubscriberMergeContext.java
@@ -37,11 +37,13 @@ public class ApplyPatchSubscriberMergeContext extends SubscriberMergeContext {
return mergeContext;
}
+ @Override
protected void makeInSync(IDiff diff, IProgressMonitor monitor)
throws CoreException {
markAsMerged(diff, true, monitor);
}
+ @Override
public void markAsMerged(IDiff node, boolean inSyncHint,
IProgressMonitor monitor) throws CoreException {
IResource resource = getDiffTree().getResource(node);
@@ -69,6 +71,7 @@ public class ApplyPatchSubscriberMergeContext extends SubscriberMergeContext {
// see ApplyPatchSubscriber.ApplyPatchSyncInfo.calculateKind()
}
+ @Override
protected IStatus performThreeWayMerge(IThreeWayDiff diff,
IProgressMonitor monitor) throws CoreException {
IStatus status = super.performThreeWayMerge(diff, monitor);
@@ -94,6 +97,7 @@ public class ApplyPatchSubscriberMergeContext extends SubscriberMergeContext {
return status;
}
+ @Override
public void reject(IDiff diff, IProgressMonitor monitor)
throws CoreException {
// do nothing
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java
index a8c685ad8..7f8838521 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java
@@ -24,12 +24,14 @@ public class ApplyPatchSynchronizationActionProvider extends
super();
}
+ @Override
protected void initialize() {
super.initialize();
final ISynchronizePageConfiguration configuration = getSynchronizePageConfiguration();
// Use custom handlers, disabled for hunks.
registerHandler(MERGE_ACTION_ID, new ResourceMergeHandler(
configuration, false) {
+ @Override
public void updateEnablement(IStructuredSelection selection) {
super.updateEnablement(selection);
// disable merge for hunks
@@ -44,6 +46,7 @@ public class ApplyPatchSynchronizationActionProvider extends
});
registerHandler(MARK_AS_MERGE_ACTION_ID,
new ResourceMarkAsMergedHandler(configuration) {
+ @Override
public void updateEnablement(IStructuredSelection selection) {
super.updateEnablement(selection);
// disable mark as merged for hunks
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java
index a44fde1f5..509fd2b11 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationWizard.java
@@ -43,6 +43,7 @@ public class ApplyPatchSynchronizationWizard extends PatchWizard implements
setNeedsProgressMonitor(true);
}
+ @Override
public boolean performFinish() {
if (fPatchInaccessibleProjectsPage != null) {
IProject[] projects = fPatchInaccessibleProjectsPage
@@ -81,15 +82,18 @@ public class ApplyPatchSynchronizationWizard extends PatchWizard implements
return true;
}
+ @Override
public void init(IWorkbench workbench, IProject project) {
// nothing to do here
}
+ @Override
public void addPages() {
if (getPatch() == null)
addPage(fPatchWizardPage = new InputPatchPage(this));
if (getPatch() == null || !getPatcher().isWorkspacePatch())
addPage(fPatchTargetPage = new PatchTargetPage(getPatcher()) {
+ @Override
public IWizardPage getNextPage() {
IWizardPage nextPage = super.getNextPage();
if (!isTargetingInaccessibleProjects() && nextPage != this)
@@ -123,6 +127,7 @@ public class ApplyPatchSynchronizationWizard extends PatchWizard implements
return false;
}
+ @Override
public boolean canFinish() {
IWizardPage currentPage = getContainer().getCurrentPage();
if (currentPage.getName().equals(
@@ -136,6 +141,7 @@ public class ApplyPatchSynchronizationWizard extends PatchWizard implements
return super.canFinish();
}
+ @Override
public WorkspacePatcher getPatcher() {
// make the patcher available to other classes in the package
return super.getPatcher();
@@ -144,6 +150,7 @@ public class ApplyPatchSynchronizationWizard extends PatchWizard implements
private void openSelectedProjects(final IProject projects[]) {
Job openProjectsJob = new Job(
TeamUIMessages.PatchInaccessibleProjectsPage_openingProjects) {
+ @Override
protected IStatus run(IProgressMonitor monitor) {
monitor.beginTask(
TeamUIMessages.PatchInaccessibleProjectsPage_openingProjects,
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/DiffProjectResourceMapping.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/DiffProjectResourceMapping.java
index eab387c8b..36aa3deaa 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/DiffProjectResourceMapping.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/DiffProjectResourceMapping.java
@@ -24,20 +24,24 @@ public class DiffProjectResourceMapping extends ResourceMapping {
object = adaptableObject;
}
+ @Override
public Object getModelObject() {
return object;
}
+ @Override
public String getModelProviderId() {
return PatchModelProvider.ID;
}
+ @Override
public IProject[] getProjects() {
IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(
object.getName());
return new IProject[] { p };
}
+ @Override
public ResourceTraversal[] getTraversals(ResourceMappingContext context,
IProgressMonitor monitor) throws CoreException {
return new ResourceTraversal[] { new ResourceTraversal(
@@ -49,6 +53,7 @@ public class DiffProjectResourceMapping extends ResourceMapping {
return getProjects()[0];
}
+ @Override
public boolean contains(ResourceMapping mapping) {
if (mapping instanceof DiffProjectResourceMapping) {
DiffProject diffProject = (DiffProject) mapping.getModelObject();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/FilePatchResourceMapping.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/FilePatchResourceMapping.java
index f774ec6d8..eb2d9a95d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/FilePatchResourceMapping.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/FilePatchResourceMapping.java
@@ -26,14 +26,17 @@ public class FilePatchResourceMapping extends ResourceMapping {
object = fileDiffResult;
}
+ @Override
public Object getModelObject() {
return object;
}
+ @Override
public String getModelProviderId() {
return PatchModelProvider.ID;
}
+ @Override
public IProject[] getProjects() {
DiffProject dp = (DiffProject) object.getDiff().getProject();
IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(
@@ -41,6 +44,7 @@ public class FilePatchResourceMapping extends ResourceMapping {
return new IProject[] { p };
}
+ @Override
public ResourceTraversal[] getTraversals(ResourceMappingContext context,
IProgressMonitor monitor) throws CoreException {
return new ResourceTraversal[] { new ResourceTraversal(
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/HunkResourceMapping.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/HunkResourceMapping.java
index 0cfc76023..d0a433cb6 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/HunkResourceMapping.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/HunkResourceMapping.java
@@ -24,14 +24,17 @@ public class HunkResourceMapping extends ResourceMapping {
this.object = hunkResult;
}
+ @Override
public Object getModelObject() {
return object;
}
+ @Override
public String getModelProviderId() {
return PatchModelProvider.ID;
}
+ @Override
public IProject[] getProjects() {
DiffProject dp = (DiffProject) object.getHunk().getParent()
.getProject();
@@ -45,6 +48,7 @@ public class HunkResourceMapping extends ResourceMapping {
return getProjects()[0].getFile(path);
}
+ @Override
public ResourceTraversal[] getTraversals(ResourceMappingContext context,
IProgressMonitor monitor) throws CoreException {
return new ResourceTraversal[] { new ResourceTraversal(
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchCompareAdapter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchCompareAdapter.java
index 4c0a664f2..1b02ca651 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchCompareAdapter.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchCompareAdapter.java
@@ -22,6 +22,7 @@ import org.eclipse.ui.IMemento;
public class PatchCompareAdapter extends SynchronizationCompareAdapter
implements ITraversalFactory {
+ @Override
public ICompareInput asCompareInput(ISynchronizationContext context,
Object o) {
// PatchFileDiffNode can adapt to IFile
@@ -33,15 +34,18 @@ public class PatchCompareAdapter extends SynchronizationCompareAdapter
return super.asCompareInput(context, o);
}
+ @Override
public void save(ResourceMapping[] mappings, IMemento memento) {
// Don't save
}
+ @Override
public ResourceMapping[] restore(IMemento memento) {
// Don't restore
return null;
}
+ @Override
public ResourceTraversal[] getTraversals(ISynchronizationScope scope) {
return scope.getTraversals(ModelProvider.RESOURCE_MODEL_PROVIDER_ID);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchParsedPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchParsedPage.java
index 1c4c042c9..825e9c8cd 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchParsedPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchParsedPage.java
@@ -29,6 +29,7 @@ public class PatchParsedPage extends WizardPage {
setDescription(TeamUIMessages.PatchParsedPage_description);
}
+ @Override
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NULL);
composite.setLayout(new GridLayout());
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncContentProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncContentProvider.java
index 0cf0e01f7..6f74b0e0a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncContentProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncContentProvider.java
@@ -33,25 +33,30 @@ public class PatchSyncContentProvider extends SynchronizationContentProvider {
private BaseWorkbenchContentProvider delegate;
+ @Override
public void init(ICommonContentExtensionSite site) {
super.init(site);
delegate = new BaseWorkbenchContentProvider();
}
+ @Override
public void dispose() {
super.dispose();
if (delegate != null)
delegate.dispose();
}
+ @Override
protected ITreeContentProvider getDelegateContentProvider() {
return delegate;
}
+ @Override
protected String getModelProviderId() {
return PatchModelProvider.ID;
}
+ @Override
protected Object getModelRoot() {
if (getContext() instanceof ApplyPatchSubscriberMergeContext) {
ApplyPatchSubscriberMergeContext context = (ApplyPatchSubscriberMergeContext) getContext();
@@ -66,6 +71,7 @@ public class PatchSyncContentProvider extends SynchronizationContentProvider {
* org.eclipse.team.examples.model.ui.mapping.ModelSyncContentProvider
* .getTraversals(ISynchronizationContext, Object)
*/
+ @Override
protected ResourceTraversal[] getTraversals(
ISynchronizationContext context, Object object) {
if (object instanceof IDiffElement) {
@@ -81,6 +87,7 @@ public class PatchSyncContentProvider extends SynchronizationContentProvider {
return new ResourceTraversal[0];
}
+ @Override
protected boolean isInScope(ISynchronizationScope scope, Object parent,
Object element) {
if (element instanceof PatchDiffNode) {
@@ -94,12 +101,14 @@ public class PatchSyncContentProvider extends SynchronizationContentProvider {
return false;
}
+ @Override
public boolean hasChildren(final Object element) {
if (element instanceof HunkDiffNode)
return false;
return super.hasChildren(element);
}
+ @Override
public Object[] getChildren(Object parent) {
Object[] children = super.getChildren(parent);
List result = new ArrayList();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncLabelProvider.java
index f48d6121f..98c187b3f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncLabelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchSyncLabelProvider.java
@@ -27,21 +27,25 @@ public class PatchSyncLabelProvider extends SynchronizationLabelProvider {
super();
}
+ @Override
public void init(ICommonContentExtensionSite site) {
super.init(site);
delegate = new PatchWorkbenchLabelProvider();
}
+ @Override
public void dispose() {
super.dispose();
if (delegate != null)
delegate.dispose();
}
+ @Override
protected ILabelProvider getDelegateLabelProvider() {
return delegate;
}
+ @Override
protected IDiff getDiff(Object element) {
if (element instanceof PatchDiffNode) {
IResource resource = PatchModelProvider
@@ -51,6 +55,7 @@ public class PatchSyncLabelProvider extends SynchronizationLabelProvider {
return super.getDiff(element);
}
+ @Override
protected Image getCompareImage(Image base, int kind) {
/*
* Need to swap left and right for PatchDiffNodes as done in Apply Patch
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkbenchAdapter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkbenchAdapter.java
index ef1a3e4d0..5b26c4185 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkbenchAdapter.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkbenchAdapter.java
@@ -17,6 +17,7 @@ import org.eclipse.ui.model.IWorkbenchAdapter;
public class PatchWorkbenchAdapter implements IWorkbenchAdapter {
+ @Override
public Object[] getChildren(Object o) {
if (o instanceof DiffNode) {
return ((DiffNode) o).getChildren();
@@ -24,6 +25,7 @@ public class PatchWorkbenchAdapter implements IWorkbenchAdapter {
return null;
}
+ @Override
public ImageDescriptor getImageDescriptor(Object object) {
if (object instanceof DiffNode) {
Image image = ((DiffNode) object).getImage();
@@ -32,6 +34,7 @@ public class PatchWorkbenchAdapter implements IWorkbenchAdapter {
return null;
}
+ @Override
public String getLabel(Object o) {
if (o instanceof DiffNode) {
return ((DiffNode) o).getName();
@@ -39,6 +42,7 @@ public class PatchWorkbenchAdapter implements IWorkbenchAdapter {
return null;
}
+ @Override
public Object getParent(Object o) {
if (o instanceof DiffNode) {
return ((DiffNode) o).getParent();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkbenchLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkbenchLabelProvider.java
index 2ee1a2102..b9c13e3d3 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkbenchLabelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkbenchLabelProvider.java
@@ -24,6 +24,7 @@ public class PatchWorkbenchLabelProvider extends WorkbenchLabelProvider
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.ICommonLabelProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite)
*/
+ @Override
public void init(ICommonContentExtensionSite aConfig) {
extensionSite = aConfig;
}
@@ -31,6 +32,7 @@ public class PatchWorkbenchLabelProvider extends WorkbenchLabelProvider
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IMementoAware#restoreState(org.eclipse.ui.IMemento)
*/
+ @Override
public void restoreState(IMemento aMemento) {
// Nothing to do
}
@@ -38,6 +40,7 @@ public class PatchWorkbenchLabelProvider extends WorkbenchLabelProvider
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IMementoAware#saveState(org.eclipse.ui.IMemento)
*/
+ @Override
public void saveState(IMemento aMemento) {
// Nothing to do
}
@@ -45,6 +48,7 @@ public class PatchWorkbenchLabelProvider extends WorkbenchLabelProvider
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IDescriptionProvider#getDescription(java.lang.Object)
*/
+ @Override
public String getDescription(Object anElement) {
if (anElement instanceof DiffNode) {
return ((DiffNode) anElement).getName();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkspace.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkspace.java
index 84ba4081c..e62a063dd 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkspace.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchWorkspace.java
@@ -41,14 +41,17 @@ public class PatchWorkspace extends DiffNode implements IAdaptable {
return ResourcesPlugin.getWorkspace().getRoot();
}
+ @Override
public String getName() {
return "Patch Root Workspace"; //$NON-NLS-1$
}
+ @Override
public IDiffContainer getParent() {
return null;
}
+ @Override
public IDiffElement[] getChildren() {
/*
* Create a complete tree of patch model objects - elements of the
@@ -107,6 +110,7 @@ public class PatchWorkspace extends DiffNode implements IAdaptable {
private static ITypedElement getLeftElement(final FileDiffResult result) {
return new LocalResourceTypedElement(((WorkspaceFileDiffResult)result).getTargetFile()) {
+ @Override
public String getName() {
// as in org.eclipse.compare.internal.patch.PatchFileTypedElement
return result.getTargetPath().toString();
@@ -116,6 +120,7 @@ public class PatchWorkspace extends DiffNode implements IAdaptable {
private static ITypedElement getLeftElement(final HunkResult result) {
return new LocalResourceTypedElement(((WorkspaceFileDiffResult)result.getDiffResult()).getTargetFile()) {
+ @Override
public String getName() {
// as in org.eclipse.compare.internal.patch.HunkTypedElement
return result.getHunk().getLabel();
@@ -125,6 +130,7 @@ public class PatchWorkspace extends DiffNode implements IAdaptable {
// cannot extend PlatformObject (already extends DiffNode) so implement
// IAdaptable
+ @Override
public Object getAdapter(Class adapter) {
return Platform.getAdapterManager().getAdapter(this, adapter);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchedFileVariant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchedFileVariant.java
index 1283f5a7b..c079bb6dd 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchedFileVariant.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchedFileVariant.java
@@ -30,38 +30,47 @@ public class PatchedFileVariant implements IResourceVariant {
this.patcher = patcher;
}
+ @Override
public byte[] asBytes() {
// We don't persist the variant between sessions.
return null;
}
+ @Override
public String getContentIdentifier() {
return "(After Patch)"; //$NON-NLS-1$
}
+ @Override
public String getName() {
return diff.getPath(patcher.isReversed()).lastSegment();
}
+ @Override
public IStorage getStorage(IProgressMonitor monitor) throws TeamException {
return new IStorage() {
+ @Override
public Object getAdapter(Class adapter) {
return null;
}
+ @Override
public boolean isReadOnly() {
return true;
}
+ @Override
public String getName() {
return PatchedFileVariant.this.getName();
}
+ @Override
public IPath getFullPath() {
return null;
}
+ @Override
public InputStream getContents() throws CoreException {
FileDiffResult diffResult = patcher.getDiffResult(diff);
return diffResult.getPatchedContents();
@@ -69,6 +78,7 @@ public class PatchedFileVariant implements IResourceVariant {
};
}
+ @Override
public boolean isContainer() {
return false;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchedFileVariantComparator.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchedFileVariantComparator.java
index af968befe..eac1d6c6e 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchedFileVariantComparator.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/PatchedFileVariantComparator.java
@@ -17,6 +17,7 @@ import org.eclipse.team.internal.core.mapping.LocalResourceVariant;
public class PatchedFileVariantComparator implements IResourceVariantComparator {
+ @Override
public boolean compare(IResource local, IResourceVariant remote) {
if (remote instanceof LocalResourceVariant)
// return true when matching with base
@@ -24,10 +25,12 @@ public class PatchedFileVariantComparator implements IResourceVariantComparator
return false;
}
+ @Override
public boolean compare(IResourceVariant base, IResourceVariant remote) {
return false;
}
+ @Override
public boolean isThreeWay() {
return true;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigurationWizardElement.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigurationWizardElement.java
index 0db87db17..1e41aba0c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigurationWizardElement.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigurationWizardElement.java
@@ -86,6 +86,7 @@ public class ConfigurationWizardElement extends WorkbenchAdapter implements IAda
/*
* Method declared on IAdaptable.
*/
+ @Override
public Object getAdapter(Class adapter) {
if (adapter == IWorkbenchAdapter.class) {
return this;
@@ -106,6 +107,7 @@ public class ConfigurationWizardElement extends WorkbenchAdapter implements IAda
* @param element the element to get the image for
* @return the image for the given element
*/
+ @Override
public ImageDescriptor getImageDescriptor(Object element) {
return imageDescriptor;
}
@@ -115,6 +117,7 @@ public class ConfigurationWizardElement extends WorkbenchAdapter implements IAda
* @param element the element to get the label for
* @return the label for the given element
*/
+ @Override
public String getLabel(Object element) {
return name;
}
@@ -170,6 +173,7 @@ public class ConfigurationWizardElement extends WorkbenchAdapter implements IAda
/* (non-Javadoc)
* @see org.eclipse.ui.IPluginContribution#getLocalId()
*/
+ @Override
public String getLocalId() {
return configurationElement.getAttribute(ConfigureProjectWizard.ATT_ID);
}
@@ -177,6 +181,7 @@ public class ConfigurationWizardElement extends WorkbenchAdapter implements IAda
/* (non-Javadoc)
* @see org.eclipse.ui.IPluginContribution#getPluginId()
*/
+ @Override
public String getPluginId() {
return configurationElement.getNamespaceIdentifier();
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureMultipleProjectsWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureMultipleProjectsWizard.java
index 107cc421e..65f519442 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureMultipleProjectsWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureMultipleProjectsWizard.java
@@ -33,6 +33,7 @@ public class ConfigureMultipleProjectsWizard extends Wizard {
}
+ @Override
public void addPages() {
projectSelectionPage = new ProjectSelectionPage(projects, element);
addPage(projectSelectionPage);
@@ -41,6 +42,7 @@ public class ConfigureMultipleProjectsWizard extends Wizard {
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#performFinish()
*/
+ @Override
public boolean performFinish() {
// Prompt if there are still unshared projects
if (projectSelectionPage.hasUnsharedProjects()) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java
index 37666b1bb..045e6b93f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java
@@ -45,6 +45,7 @@ public class ConfigureProjectWizard extends Wizard {
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#addPages()
*/
+ @Override
public void addPages() {
AdaptableList disabledWizards = new AdaptableList();
AdaptableList wizards = getAvailableWizards(disabledWizards);
@@ -57,6 +58,7 @@ public class ConfigureProjectWizard extends Wizard {
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#canFinish()
*/
+ @Override
public boolean canFinish() {
// If we are on the first page, never allow finish unless the selected wizard has no pages.
if (getContainer().getCurrentPage() == mainPage) {
@@ -71,6 +73,7 @@ public class ConfigureProjectWizard extends Wizard {
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#performFinish()
*/
+ @Override
public boolean performFinish() {
// If we are on the first page and the selected wizard has no pages then
// allow it to finish.
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java
index 2f1648985..64666006a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java
@@ -92,12 +92,14 @@ public class ConfigureProjectWizardMainPage extends WizardPage {
/*
* @see WizardPage#canFlipToNextPage
*/
+ @Override
public boolean canFlipToNextPage() {
return selectedWizard != null && selectedWizard.getPageCount() > 0;
}
/*
* @see WizardPage#createControl
*/
+ @Override
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NULL);
composite.setLayout(new GridLayout());
@@ -122,6 +124,7 @@ public class ConfigureProjectWizardMainPage extends WizardPage {
viewer.setContentProvider(new WorkbenchContentProvider());
viewer.setLabelProvider(new WorkbenchLabelProvider());
viewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
// Initialize the wizard so we can tell whether to enable the Next button
ISelection selection = event.getSelection();
@@ -152,11 +155,13 @@ public class ConfigureProjectWizardMainPage extends WizardPage {
}
});
viewer.addDoubleClickListener(new IDoubleClickListener() {
+ @Override
public void doubleClick(DoubleClickEvent event) {
getWizard().getContainer().showPage(getNextPage());
}
});
viewer.setComparator(new ViewerComparator() {
+ @Override
public int compare(Viewer viewer, Object e1, Object e2) {
if (e1 instanceof ConfigurationWizardElement && e2 instanceof ConfigurationWizardElement) {
ConfigurationWizardElement wizard1 = (ConfigurationWizardElement) e1;
@@ -171,6 +176,7 @@ public class ConfigureProjectWizardMainPage extends WizardPage {
showAllToggle = new Button(composite, SWT.CHECK);
showAllToggle.setText(TeamUIMessages.ConfigureProjectWizard_showAll);
showAllToggle.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
ArrayList all = new ArrayList(Arrays.asList(wizards.getChildren()));
if(showAllToggle.getSelection()) {
@@ -210,6 +216,7 @@ public class ConfigureProjectWizardMainPage extends WizardPage {
*
* @see WizardPage#getNextPage
*/
+ @Override
public IWizardPage getNextPage() {
if (selectedWizard == null) return null;
if(! WorkbenchActivityHelper.allowUseOf(getTriggerPoint(), ((IStructuredSelection)viewer.getSelection()).getFirstElement())) return null;
@@ -226,6 +233,7 @@ public class ConfigureProjectWizardMainPage extends WizardPage {
this.projects = projects;
}
+ @Override
public void setVisible(boolean visible) {
super.setVisible(visible);
if (visible) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetLocationPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetLocationPage.java
index 65916c580..58ca33d3f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetLocationPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetLocationPage.java
@@ -49,6 +49,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
setDescription(TeamUIMessages.ExportProjectSetMainPage_description);
}
+ @Override
public void createControl(Composite parent) {
Composite composite = createComposite(parent, 1);
initializeDialogUnits(composite);
@@ -75,6 +76,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
fileRadio = new Button(composite, SWT.RADIO);
fileRadio.setText(TeamUIMessages.ExportProjectSetMainPage_FileButton);
fileRadio.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
saveToFileSystem = true;
file = fileCombo.getText();
@@ -95,6 +97,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
fileCombo.setItems(PsfFilenameStore.getInstance().getHistory());
fileCombo.setText(file);
fileCombo.addListener(SWT.Modify, new Listener() {
+ @Override
public void handleEvent(Event event) {
file = fileCombo.getText();
updateEnablement();
@@ -109,6 +112,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
data.widthHint = Math.max(widthHint, browseButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
browseButton.setLayoutData(data);
browseButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
if (!isSaveToFileSystem())
saveToFileSystem = true;
@@ -138,6 +142,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
workspaceRadio = new Button(composite, SWT.RADIO);
workspaceRadio.setText(TeamUIMessages.ExportProjectSetMainPage_WorkspaceButton);
workspaceRadio.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
saveToFileSystem = false;
updateEnablement();
@@ -155,6 +160,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
workspaceText = createTextField(nameGroup);
workspaceText.setEditable(false);
workspaceText.addListener(SWT.Modify, new Listener() {
+ @Override
public void handleEvent(Event event) {
file = workspaceFile.getLocation().toString();
updateEnablement();
@@ -168,6 +174,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
wsBrowseButton.setLayoutData(gd);
wsBrowseButton.setText(TeamUIMessages.ExportProjectSetMainPage_Browse);
wsBrowseButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
if (isSaveToFileSystem())
saveToFileSystem = false;
@@ -213,6 +220,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
setPageComplete(complete);
}
+ @Override
public void setVisible(boolean visible) {
super.setVisible(visible);
if (visible) {
@@ -252,6 +260,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
super(shell);
}
+ @Override
protected Control createContents(Composite parent) {
Control control = super.createContents(parent);
setTitle(TeamUIMessages.ExportProjectSetMainPage_WorkspaceDialogTitle);
@@ -260,6 +269,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
return control;
}
+ @Override
protected Control createDialogArea(Composite parent) {
Composite composite = (Composite) super.createDialogArea(parent);
@@ -300,11 +310,13 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
return parent;
}
+ @Override
protected void createButtonsForButtonBar(Composite parent) {
super.createButtonsForButtonBar(parent);
okButton = getButton(IDialogConstants.OK_ID);
}
+ @Override
protected void okPressed() {
//Make sure that a container has been selected
if (wsContainer == null) {
@@ -331,12 +343,14 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
}
}
+ @Override
protected void cancelPressed() {
//this.page.validatePage();
getSelectedContainer();
super.cancelPressed();
}
+ @Override
public boolean close() {
/* if (dlgTitleImage != null)
dlgTitleImage.dispose();*/
@@ -345,6 +359,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
void setupListeners() {
wsTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
IStructuredSelection s = (IStructuredSelection) event.getSelection();
Object obj = s.getFirstElement();
@@ -362,6 +377,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
});
wsTreeViewer.addDoubleClickListener(new IDoubleClickListener() {
+ @Override
public void doubleClick(DoubleClickEvent event) {
ISelection s = event.getSelection();
if (s instanceof IStructuredSelection) {
@@ -375,6 +391,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
});
wsFilenameText.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
String patchName = wsFilenameText.getText();
if (patchName.trim().equals("")) { //$NON-NLS-1$
@@ -398,6 +415,7 @@ public class ExportProjectSetLocationPage extends TeamWizardPage {
//Never show closed projects
boolean showClosedProjects = false;
+ @Override
public Object[] getChildren(Object element) {
if (element instanceof IWorkspace) {
// check if closed projects should be shown
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java
index 88009c195..6f2f1bdd3 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ExportProjectSetMainPage.java
@@ -54,6 +54,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
class ProjectContentProvider implements ITreePathContentProvider{
+ @Override
public Object[] getChildren(TreePath parentPath) {
Object obj = parentPath.getLastSegment();
if (obj instanceof IWorkingSet){
@@ -62,6 +63,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
return null;
}
+ @Override
public TreePath[] getParents(Object element) {
if (element instanceof IProject){
ArrayList treePaths = new ArrayList();
@@ -80,6 +82,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
return null;
}
+ @Override
public boolean hasChildren(TreePath path) {
Object obj = path.getLastSegment();
if (obj instanceof IWorkingSet)
@@ -88,6 +91,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
return false;
}
+ @Override
public Object[] getElements(Object inputElement) {
if (inputElement instanceof IWorkspaceRoot) {
IWorkspaceRoot root = (IWorkspaceRoot) inputElement;
@@ -131,10 +135,12 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
return null;
}
+ @Override
public void dispose() {
}
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
@@ -143,6 +149,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
private class ExportProjectSetLabelProvider extends WorkbenchLabelProvider {
+ @Override
public Color getForeground(Object element) {
if (element instanceof IProject
&& !isProjectExportable((IProject) element)) {
@@ -203,6 +210,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
/*
* @see IDialogPage#createControl(Composite)
*/
+ @Override
public void createControl(Composite parent) {
Composite c = SWTUtils.createHVFillComposite(parent, 0);
@@ -246,6 +254,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
exportWorkingSets.setSelection(false);
exportWorkingSets.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
if (((Button) e.widget).getSelection()){
book.showPage(workingSetPage.getControl());
@@ -295,6 +304,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
ArrayList referenceCountProjects = new ArrayList();
ArrayList selectedWorkingSet = new ArrayList();
+ @Override
public void createControl(Composite parent) {
projectComposite = SWTUtils.createHVFillComposite(parent, 1);
@@ -307,10 +317,12 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
setPageComplete(selectedProjects.size() > 0);
}
+ @Override
public Control getControl() {
return projectComposite;
}
+ @Override
public void setFocus() {
projectComposite.setFocus();
}
@@ -329,6 +341,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
tableViewer.setLabelProvider(new WorkbenchLabelProvider());
tableViewer.setComparator(new ResourceComparator(ResourceComparator.NAME));
tableViewer.addCheckStateListener(new ICheckStateListener() {
+ @Override
public void checkStateChanged(CheckStateChangedEvent event) {
Object temp = event.getElement();
if (temp instanceof IProject){
@@ -375,6 +388,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
selectAll.setLayoutData(data);
selectAll.setText(TeamUIMessages.ExportProjectSetMainPage_SelectAll);
selectAll.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
tableViewer.setAllChecked(true);
selectedProjects.removeAll(selectedProjects);
@@ -395,6 +409,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
deselectAll.setLayoutData(data);
deselectAll.setText(TeamUIMessages.ExportProjectSetMainPage_DeselectAll);
deselectAll.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
tableViewer.setAllChecked(false);
selectedProjects.removeAll(selectedProjects);
@@ -424,14 +439,17 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
setPageComplete(complete);
}
+ @Override
public ArrayList getReferenceCountProjects() {
return referenceCountProjects;
}
+ @Override
public HashSet getSelectedProjects() {
return selectedProjects;
}
+ @Override
public ArrayList getWorkingSet() {
return selectedWorkingSet;
}
@@ -458,6 +476,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
*/
private boolean pageShown = false;
+ @Override
public void createControl(Composite parent) {
projectComposite = SWTUtils.createHVFillComposite(parent, 1);
@@ -506,6 +525,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
wsTableViewer.setContentProvider(new ProjectContentProvider());
wsTableViewer.setLabelProvider(new WorkbenchLabelProvider());
wsTableViewer.addCheckStateListener(new ICheckStateListener() {
+ @Override
public void checkStateChanged(CheckStateChangedEvent event) {
Object temp = event.getElement();
if (temp instanceof IWorkingSet){
@@ -546,6 +566,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
selectAll.setLayoutData(data);
selectAll.setText(TeamUIMessages.ExportProjectSetMainPage_SelectAll);
selectAll.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
wsTableViewer.setAllChecked(true);
@@ -574,6 +595,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
deselectAll.setLayoutData(data);
deselectAll.setText(TeamUIMessages.ExportProjectSetMainPage_DeselectAll);
deselectAll.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
wsTableViewer.setAllChecked(false);
selectedWorkingSet.removeAll(selectedWorkingSet);
@@ -593,6 +615,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
newWorkingSet.setLayoutData(data);
newWorkingSet.setText(TeamUIMessages.ExportProjectSetMainPage_EditButton);
newWorkingSet.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
final IWorkingSetManager workingSetManager = TeamUIPlugin.getPlugin().getWorkbench().getWorkingSetManager();
IWorkingSetSelectionDialog wsWizard = workingSetManager.createWorkingSetSelectionDialog(getShell(), false);
@@ -601,6 +624,7 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
try {
//add event listener
propListener = new IPropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent event) {
}};
@@ -633,10 +657,12 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
});
}
+ @Override
public Control getControl() {
return projectComposite;
}
+ @Override
public void setFocus() {
projectComposite.setFocus();
}
@@ -685,14 +711,17 @@ public class ExportProjectSetMainPage extends TeamWizardPage {
pageShown = true;
}
+ @Override
public ArrayList getReferenceCountProjects() {
return referenceCountProjects;
}
+ @Override
public HashSet getSelectedProjects() {
return selectedProjects;
}
+ @Override
public ArrayList getWorkingSet() {
return selectedWorkingSet;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalRefreshWizardSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalRefreshWizardSelectionPage.java
index 2b4a87acd..ac4d35d9a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalRefreshWizardSelectionPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalRefreshWizardSelectionPage.java
@@ -48,6 +48,7 @@ public class GlobalRefreshWizardSelectionPage extends WizardPage implements IDou
private List createdImages;
class MyContentProvider extends BaseWorkbenchContentProvider {
+ @Override
public Object[] getChildren(Object element) {
if(element instanceof SynchronizeManager) {
SynchronizeManager manager = (SynchronizeManager)element;
@@ -58,6 +59,7 @@ public class GlobalRefreshWizardSelectionPage extends WizardPage implements IDou
}
class MyLabelProvider extends LabelProvider {
+ @Override
public String getText(Object element) {
if(element instanceof SynchronizeWizardDescription) {
SynchronizeWizardDescription descriptor = (SynchronizeWizardDescription)element;
@@ -66,6 +68,7 @@ public class GlobalRefreshWizardSelectionPage extends WizardPage implements IDou
return null;
}
+ @Override
public Image getImage(Object element) {
if(element instanceof SynchronizeWizardDescription) {
SynchronizeWizardDescription descriptor = (SynchronizeWizardDescription)element;
@@ -90,6 +93,7 @@ public class GlobalRefreshWizardSelectionPage extends WizardPage implements IDou
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#dispose()
*/
+ @Override
public void dispose() {
if (createdImages != null) {
for (Iterator it = createdImages.iterator(); it.hasNext();) {
@@ -116,6 +120,7 @@ public class GlobalRefreshWizardSelectionPage extends WizardPage implements IDou
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent2) {
Composite top = new Composite(parent2, SWT.NULL);
top.setLayout(new GridLayout());
@@ -164,7 +169,8 @@ public class GlobalRefreshWizardSelectionPage extends WizardPage implements IDou
return null;
}
- public void doubleClick(DoubleClickEvent event) {
+ @Override
+ public void doubleClick(DoubleClickEvent event) {
selectionChanged(
new SelectionChangedEvent(
event.getViewer(),
@@ -172,6 +178,7 @@ public class GlobalRefreshWizardSelectionPage extends WizardPage implements IDou
getContainer().showPage(getNextPage());
}
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
// Initialize the wizard so we can tell whether to enable the
// Next button
@@ -204,11 +211,13 @@ public class GlobalRefreshWizardSelectionPage extends WizardPage implements IDou
return this.wizard;
}
+ @Override
public IWizardPage getNextPage() {
if (wizard == null) return null;
return wizard.getStartingPage();
}
+ @Override
public void setVisible(boolean visible) {
super.setVisible(visible);
if (visible) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalSynchronizeWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalSynchronizeWizard.java
index aeab9dd50..b84a17f4a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalSynchronizeWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/GlobalSynchronizeWizard.java
@@ -51,6 +51,7 @@ public class GlobalSynchronizeWizard extends Wizard {
/*
* @see Wizard#addPages
*/
+ @Override
public void addPages() {
mainPage = new GlobalRefreshWizardSelectionPage();
addPage(mainPage);
@@ -59,6 +60,7 @@ public class GlobalSynchronizeWizard extends Wizard {
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizard#canFinish()
*/
+ @Override
public boolean canFinish() {
// If we are on the first page, never allow finish unless the selected
// wizard has no pages.
@@ -74,6 +76,7 @@ public class GlobalSynchronizeWizard extends Wizard {
/*
* @see Wizard#performFinish
*/
+ @Override
public boolean performFinish() {
// If we are on the first page and the selected wizard has no pages then allow it to finish.
if (getContainer().getCurrentPage() == mainPage) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java
index bd8ecbf11..360aaf9e1 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetMainPage.java
@@ -87,6 +87,7 @@ public class ImportProjectSetMainPage extends TeamWizardPage {
/*
* @see IDialogPage#createControl(Composite)
*/
+ @Override
public void createControl(Composite parent) {
Composite composite = createComposite(parent, 1);
initializeDialogUnits(composite);
@@ -107,6 +108,7 @@ public class ImportProjectSetMainPage extends TeamWizardPage {
.setText(TeamUIMessages.ImportProjectSetMainPage_Project_Set_File);
fileInputButton.setEnabled(true);
fileInputButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
setInputType(InputType_file);
}
@@ -117,6 +119,7 @@ public class ImportProjectSetMainPage extends TeamWizardPage {
fileCombo.setItems(psfFilenameStore.getHistory());
fileCombo.setText(file);
fileCombo.addListener(SWT.Modify, new Listener() {
+ @Override
public void handleEvent(Event event) {
file = fileCombo.getText();
updateFileEnablement();
@@ -130,6 +133,7 @@ public class ImportProjectSetMainPage extends TeamWizardPage {
urlInputButton
.setText(TeamUIMessages.ImportProjectSetMainPage_Project_Set_Url);
urlInputButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
setInputType(InputType_URL);
}
@@ -142,6 +146,7 @@ public class ImportProjectSetMainPage extends TeamWizardPage {
gd.horizontalSpan = 2;
urlCombo.setLayoutData(gd);
urlCombo.addListener(SWT.Modify, new Listener() {
+ @Override
public void handleEvent(Event event) {
urlString = urlCombo.getText();
updateUrlEnablement();
@@ -154,6 +159,7 @@ public class ImportProjectSetMainPage extends TeamWizardPage {
data.widthHint = Math.max(widthHint, browseButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
browseButton.setLayoutData(data);
browseButton.addListener(SWT.Selection, new Listener() {
+ @Override
public void handleEvent(Event event) {
FileDialog d = new FileDialog(getShell());
d.setFilterExtensions(new String[] {"*.psf", "*"}); //$NON-NLS-1$ //$NON-NLS-2$
@@ -182,6 +188,7 @@ public class ImportProjectSetMainPage extends TeamWizardPage {
runInBackgroundCheckbox.setSelection(isRunInBackgroundPreferenceOn());
runInBackgroundCheckbox.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
runInBackground = !runInBackground;
}
@@ -301,6 +308,7 @@ public class ImportProjectSetMainPage extends TeamWizardPage {
return urlString;
}
+ @Override
public void setVisible(boolean visible) {
super.setVisible(visible);
if (visible) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java
index 1d6418f14..08a053a3c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ImportProjectSetOperation.java
@@ -91,6 +91,7 @@ public class ImportProjectSetOperation extends TeamOperation {
*
* @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException{
if (psfFileContents != null) {
@@ -105,6 +106,7 @@ public class ImportProjectSetOperation extends TeamOperation {
*
* @see org.eclipse.team.ui.TeamOperation#canRunAsJob()
*/
+ @Override
protected boolean canRunAsJob() {
return true;
}
@@ -114,6 +116,7 @@ public class ImportProjectSetOperation extends TeamOperation {
*
* @see org.eclipse.team.ui.TeamOperation#getJobName()
*/
+ @Override
protected String getJobName() {
return TeamUIMessages.ImportProjectSetMainPage_jobName;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PatchInaccessibleProjectsPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PatchInaccessibleProjectsPage.java
index 5132be98a..62c05fb7c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PatchInaccessibleProjectsPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PatchInaccessibleProjectsPage.java
@@ -50,6 +50,7 @@ public class PatchInaccessibleProjectsPage extends WizardPage {
fPatcher = patcher;
}
+ @Override
public void createControl(Composite parent) {
initializeDialogUnits(parent);
@@ -64,6 +65,7 @@ public class PatchInaccessibleProjectsPage extends WizardPage {
| SWT.V_SCROLL | SWT.BORDER);
checkList.setContentProvider(new ArrayContentProvider());
checkList.setLabelProvider(new WorkbenchLabelProvider() {
+ @Override
public Color getForeground(Object element) {
if (element instanceof IProject
&& !((IProject) element).exists())
@@ -72,6 +74,7 @@ public class PatchInaccessibleProjectsPage extends WizardPage {
return super.getForeground(element);
}
+ @Override
protected String decorateText(String input, Object element) {
if (element instanceof IProject
&& !((IProject) element).exists())
@@ -83,6 +86,7 @@ public class PatchInaccessibleProjectsPage extends WizardPage {
}
});
checkList.addCheckStateListener(new ICheckStateListener() {
+ @Override
public void checkStateChanged(CheckStateChangedEvent event) {
IProject project = (IProject) event.getElement();
if (event.getChecked() && !project.exists())
@@ -104,6 +108,7 @@ public class PatchInaccessibleProjectsPage extends WizardPage {
checkAllButton
.setText(TeamUIMessages.PatchInaccessibleProjectsPage_selectExisting);
checkAllButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
setAllChecked(true);
}
@@ -115,6 +120,7 @@ public class PatchInaccessibleProjectsPage extends WizardPage {
uncheckAllButton
.setText(TeamUIMessages.PatchInaccessibleProjectsPage_deselectAll);
uncheckAllButton.addSelectionListener(new SelectionAdapter() {
+ @Override
public void widgetSelected(SelectionEvent e) {
setAllChecked(false);
}
@@ -139,12 +145,14 @@ public class PatchInaccessibleProjectsPage extends WizardPage {
checkList.setInput(projects.toArray(new IProject[] {}));
}
+ @Override
public void setVisible(boolean visible) {
super.setVisible(visible);
if (visible)
updateControls();
}
+ @Override
public IWizardPage getNextPage() {
// Skipping the patch parsed page in case this one is displayed
Control control = getControl();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSelectionPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSelectionPage.java
index 5c6fdd4e1..22de48cfb 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSelectionPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSelectionPage.java
@@ -51,6 +51,7 @@ public class ProjectSelectionPage extends WizardPage {
this.element = element;
}
+ @Override
public void createControl(Composite parent) {
Composite composite = SWTUtils.createHVFillComposite(parent, SWTUtils.MARGINS_DIALOG, 2);
createProjectList(composite);
@@ -69,6 +70,7 @@ public class ProjectSelectionPage extends WizardPage {
projectViewer.setInput(projectList);
projectViewer.getTable().select(0);
projectViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
updateEnablements();
}
@@ -83,9 +85,11 @@ public class ProjectSelectionPage extends WizardPage {
shareButton.setLayoutData(gridData);
shareButton.setText(TeamUIMessages.ProjectSelectionPage_2);
shareButton.addSelectionListener(new SelectionListener() {
+ @Override
public void widgetSelected(SelectionEvent e) {
shareSelectedProject();
}
+ @Override
public void widgetDefaultSelected(SelectionEvent e) {
// Ignore
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetExportWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetExportWizard.java
index 0bc668ecb..3109a7734 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetExportWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetExportWizard.java
@@ -40,6 +40,7 @@ public class ProjectSetExportWizard extends Wizard implements IExportWizard {
setWindowTitle(TeamUIMessages.ProjectSetExportWizard_Project_Set_1);
}
+ @Override
public void addPages() {
mainPage = new ExportProjectSetMainPage("projectSetMainPage", TeamUIMessages.ProjectSetExportWizard_Export_a_Project_Set_3, TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_PROJECTSET_EXPORT_BANNER)); //$NON-NLS-1$
IProject[] projects = (IProject[])selection.toList().toArray(new IProject[0]);
@@ -49,10 +50,12 @@ public class ProjectSetExportWizard extends Wizard implements IExportWizard {
addPage(locationPage);
}
+ @Override
public boolean performFinish() {
final boolean[] result = new boolean[] {false};
try {
getContainer().run(false, false, new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException {
String filename = locationPage.getFileName();
Path path = new Path(filename);
@@ -98,6 +101,7 @@ public class ProjectSetExportWizard extends Wizard implements IExportWizard {
Set list = (Set)map.get(id);
if (list == null) {
list = new TreeSet(new Comparator() {
+ @Override
public int compare(Object o1, Object o2) {
return ((IProject) o1).getName().toLowerCase().compareTo(((IProject) o2).getName().toLowerCase());
}
@@ -217,6 +221,7 @@ public class ProjectSetExportWizard extends Wizard implements IExportWizard {
return result[0];
}
+ @Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
this.selection = selection;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetImportWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetImportWizard.java
index 6d338d776..e2ed08300 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetImportWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ProjectSetImportWizard.java
@@ -32,11 +32,13 @@ public class ProjectSetImportWizard extends Wizard implements IImportWizard {
setWindowTitle(TeamUIMessages.ProjectSetImportWizard_Project_Set_1);
}
+ @Override
public void addPages() {
mainPage = new ImportProjectSetMainPage("projectSetMainPage", TeamUIMessages.ProjectSetImportWizard_Import_a_Project_Set_3, TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_PROJECTSET_IMPORT_BANNER)); //$NON-NLS-1$
addPage(mainPage);
}
+ @Override
public boolean performFinish() {
final boolean[] result = new boolean[] {false};
try {
@@ -79,6 +81,7 @@ public class ProjectSetImportWizard extends Wizard implements IImportWizard {
return result[0];
}
+ @Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
// The code that finds "selection" is broken (it is always empty), so we
// must dig for the selection in the workbench.
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PsfFilenameStore.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PsfFilenameStore.java
index aa5c735f6..d2dfd62bc 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PsfFilenameStore.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PsfFilenameStore.java
@@ -81,6 +81,7 @@ public class PsfFilenameStore extends PsfStore {
_selectedFilename = path.toOSString();
}
+ @Override
public String getSuggestedDefault() {
if (_selectedFilename != null) {
return _selectedFilename;
@@ -88,10 +89,12 @@ public class PsfFilenameStore extends PsfStore {
return getPrevious();
}
+ @Override
protected String getPreviousTag() {
return PREVIOUS;
}
+ @Override
protected String getListTag() {
return FILENAMES;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PsfUrlStore.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PsfUrlStore.java
index bbeec617b..115230fa9 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PsfUrlStore.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/PsfUrlStore.java
@@ -32,14 +32,17 @@ public class PsfUrlStore extends PsfStore {
// Singleton
}
+ @Override
protected String getPreviousTag() {
return PREVIOUS;
}
+ @Override
protected String getListTag() {
return URLS;
}
+ @Override
public String getSuggestedDefault() {
return getPrevious();
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/WorkingSetsDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/WorkingSetsDialog.java
index d020155b5..ccc119fb3 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/WorkingSetsDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/WorkingSetsDialog.java
@@ -43,6 +43,7 @@ public class WorkingSetsDialog extends TitleAreaDialog {
setShellStyle(getShellStyle() | SWT.RESIZE);
}
+ @Override
protected Control createDialogArea(Composite parent) {
setTitle(TeamUIMessages.WorkingSetsDialog_Title);
setMessage(TeamUIMessages.WorkingSetsDialog_Message);
@@ -86,6 +87,7 @@ public class WorkingSetsDialog extends TitleAreaDialog {
return parent;
}
+ @Override
protected void okPressed() {
selectedWorkingSet = wsNameText.getText();
@@ -97,10 +99,12 @@ public class WorkingSetsDialog extends TitleAreaDialog {
super.okPressed();
}
+ @Override
protected void cancelPressed() {
super.cancelPressed();
}
+ @Override
public boolean close() {
if (dlgTitleImage != null)
dlgTitleImage.dispose();
@@ -109,6 +113,7 @@ public class WorkingSetsDialog extends TitleAreaDialog {
void setupListeners() {
wsTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
IStructuredSelection s = (IStructuredSelection) event.getSelection();
Object obj = s.getFirstElement();
@@ -118,6 +123,7 @@ public class WorkingSetsDialog extends TitleAreaDialog {
});
wsNameText.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
setErrorMessage(null);
}
@@ -131,7 +137,8 @@ public class WorkingSetsDialog extends TitleAreaDialog {
icons = new Hashtable();
}
- public void dispose() {
+ @Override
+ public void dispose() {
Iterator iterator = icons.values().iterator();
while (iterator.hasNext()) {
@@ -141,7 +148,8 @@ public class WorkingSetsDialog extends TitleAreaDialog {
super.dispose();
}
- public Image getImage(Object object) {
+ @Override
+ public Image getImage(Object object) {
Assert.isTrue(object instanceof IWorkingSet);
IWorkingSet workingSet = (IWorkingSet) object;
ImageDescriptor imageDescriptor = workingSet.getImageDescriptor();
@@ -158,7 +166,8 @@ public class WorkingSetsDialog extends TitleAreaDialog {
return icon;
}
- public String getText(Object object) {
+ @Override
+ public String getText(Object object) {
Assert.isTrue(object instanceof IWorkingSet);
IWorkingSet workingSet = (IWorkingSet) object;
return workingSet.getLabel();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/ISaveableWorkbenchPart.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/ISaveableWorkbenchPart.java
index 60ccb4ea3..9d9e5d235 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/ISaveableWorkbenchPart.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/ISaveableWorkbenchPart.java
@@ -24,6 +24,7 @@ import org.eclipse.ui.IWorkbenchPart;
* @deprecated Clients should use a subclass of {@link CompareEditorInput}
* and {@link CompareUI#openCompareDialog(org.eclipse.compare.CompareEditorInput)}
*/
+@Deprecated
public interface ISaveableWorkbenchPart extends ISaveablePart, IWorkbenchPart {
/**
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageCompareEditorInput.java
index b0dc04cf4..fa13643b2 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageCompareEditorInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageCompareEditorInput.java
@@ -51,8 +51,10 @@ public abstract class PageCompareEditorInput extends CompareEditorInput implemen
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#createStructureInputPane(org.eclipse.swt.widgets.Composite)
*/
+ @Override
protected CompareViewerPane createStructureInputPane(Composite parent) {
pagePane = new CompareViewerPane(parent, SWT.BORDER | SWT.FLAT) {
+ @Override
public void selectionChanged(SelectionChangedEvent ev) {
ISelection selection = ev.getSelection();
StructuredSelection newSelection = convertSelection(selection, false);
@@ -71,23 +73,28 @@ public abstract class PageCompareEditorInput extends CompareEditorInput implemen
}
return newSelection;
}
+ @Override
public ISelection getSelection() {
return convertSelection(getSelectionProvider().getSelection(), false);
}
+ @Override
public Object getInput() {
return PageCompareEditorInput.this.getCompareResult();
}
+ @Override
public void open(OpenEvent event) {
ISelection selection = event.getSelection();
StructuredSelection newSelection = convertSelection(selection, true);
super.open(new OpenEvent((Viewer)event.getSource(), newSelection));
}
+ @Override
public void doubleClick(DoubleClickEvent event) {
ISelection selection = event.getSelection();
StructuredSelection newSelection = convertSelection(selection, true);
super.doubleClick(new DoubleClickEvent((Viewer)event.getSource(), newSelection));
}
+ @Override
public void setInput(Object input) {
super.setInput(input);
Composite c = getParent();
@@ -134,6 +141,7 @@ public abstract class PageCompareEditorInput extends CompareEditorInput implemen
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#handleDispose()
*/
+ @Override
protected void handleDispose() {
super.handleDispose();
cleanupListeners();
@@ -230,6 +238,7 @@ public abstract class PageCompareEditorInput extends CompareEditorInput implemen
try {
// TODO: we need a better progress story here (i.e. support for cancellation) bug 127075
manager.busyCursorWhile(new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
prepareInput(input, getCompareConfiguration(), monitor);
hookContentChangeListener(input);
@@ -245,6 +254,7 @@ public abstract class PageCompareEditorInput extends CompareEditorInput implemen
/* (non-Javadoc)
* @see org.eclipse.compare.IContentChangeListener#contentChanged(org.eclipse.compare.IContentChangeNotifier)
*/
+ @Override
public void contentChanged(IContentChangeNotifier source) {
setDirty(true);
}
@@ -252,6 +262,7 @@ public abstract class PageCompareEditorInput extends CompareEditorInput implemen
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#canRunInBackground()
*/
+ @Override
public boolean canRunAsJob() {
return true;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageSaveablePart.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageSaveablePart.java
index 34d2e2344..ad532771b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageSaveablePart.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/PageSaveablePart.java
@@ -50,6 +50,7 @@ import org.eclipse.ui.progress.IProgressService;
* @deprecated Clients should use a subclass of {@link CompareEditorInput}
* and {@link CompareUI#openCompareDialog(org.eclipse.compare.CompareEditorInput)}
*/
+@Deprecated
public abstract class PageSaveablePart extends SaveablePartAdapter implements IContentChangeListener{
private CompareConfiguration cc;
@@ -79,6 +80,7 @@ public abstract class PageSaveablePart extends SaveablePartAdapter implements IC
this.cc = compareConfiguration;
fDirtyStateListener= new IPropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent e) {
String propertyName= e.getProperty();
if (CompareEditorInput.DIRTY_STATE.equals(propertyName)) {
@@ -95,6 +97,7 @@ public abstract class PageSaveablePart extends SaveablePartAdapter implements IC
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#isDirty()
*/
+ @Override
public boolean isDirty() {
return fDirty || fDirtyViewers.size() > 0;
}
@@ -102,6 +105,7 @@ public abstract class PageSaveablePart extends SaveablePartAdapter implements IC
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createPartControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NULL);
GridLayout layout = new GridLayout();
@@ -121,6 +125,7 @@ public abstract class PageSaveablePart extends SaveablePartAdapter implements IC
Splitter hsplitter = new Splitter(vsplitter, SWT.HORIZONTAL);
fEditionPane = new CompareViewerPane(hsplitter, SWT.BORDER | SWT.FLAT);
fStructuredComparePane = new CompareViewerSwitchingPane(hsplitter, SWT.BORDER | SWT.FLAT, true) {
+ @Override
protected Viewer getViewer(Viewer oldViewer, Object input) {
if (input instanceof ICompareInput)
return findStructureViewer(this, oldViewer, (ICompareInput)input);
@@ -128,12 +133,14 @@ public abstract class PageSaveablePart extends SaveablePartAdapter implements IC
}
};
fStructuredComparePane.addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent e) {
feedInput2(e.getSelection());
}
});
fEditionPane.setText(TeamUIMessages.ParticipantPageSaveablePart_0);
fContentPane = new CompareViewerSwitchingPane(vsplitter, SWT.BORDER | SWT.FLAT) {
+ @Override
protected Viewer getViewer(Viewer oldViewer, Object input) {
if (!(input instanceof ICompareInput))
return null;
@@ -145,6 +152,7 @@ public abstract class PageSaveablePart extends SaveablePartAdapter implements IC
Control c= newViewer.getControl();
c.addDisposeListener(
new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
dsp.removePropertyChangeListener(fDirtyStateListener);
}
@@ -168,6 +176,7 @@ public abstract class PageSaveablePart extends SaveablePartAdapter implements IC
}
getSelectionProvider().addSelectionChangedListener(new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
ICompareInput input = getCompareInput(event.getSelection());
if (input != null)
@@ -268,6 +277,7 @@ public abstract class PageSaveablePart extends SaveablePartAdapter implements IC
try {
// TODO: we need a better progress story here (i.e. support for cancellation) bug 127075
manager.busyCursorWhile(new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
prepareInput(input, getCompareConfiguration(), monitor);
hookContentChangeListener(input);
@@ -408,6 +418,7 @@ public abstract class PageSaveablePart extends SaveablePartAdapter implements IC
* @param monitor
* a progress monitor
*/
+ @Override
public void doSave(IProgressMonitor monitor) {
flushViewers(monitor);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/SaveablePartAdapter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/SaveablePartAdapter.java
index b388fd278..b97b4546a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/SaveablePartAdapter.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/SaveablePartAdapter.java
@@ -26,17 +26,20 @@ import org.eclipse.ui.*;
* @deprecated Clients should use a subclass of {@link CompareEditorInput}
* and {@link CompareUI#openCompareDialog(org.eclipse.compare.CompareEditorInput)}
*/
+@Deprecated
public abstract class SaveablePartAdapter implements ISaveableWorkbenchPart {
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#doSaveAs()
*/
+ @Override
public void doSaveAs() {
}
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#isSaveAsAllowed()
*/
+ @Override
public boolean isSaveAsAllowed() {
return false;
}
@@ -44,6 +47,7 @@ public abstract class SaveablePartAdapter implements ISaveableWorkbenchPart {
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#isSaveOnCloseNeeded()
*/
+ @Override
public boolean isSaveOnCloseNeeded() {
return false;
}
@@ -51,18 +55,21 @@ public abstract class SaveablePartAdapter implements ISaveableWorkbenchPart {
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#addPropertyListener(org.eclipse.ui.IPropertyListener)
*/
+ @Override
public void addPropertyListener(IPropertyListener listener) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#dispose()
*/
+ @Override
public void dispose() {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#getSite()
*/
+ @Override
public IWorkbenchPartSite getSite() {
return null;
}
@@ -70,6 +77,7 @@ public abstract class SaveablePartAdapter implements ISaveableWorkbenchPart {
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#getTitleToolTip()
*/
+ @Override
public String getTitleToolTip() {
return null;
}
@@ -77,18 +85,21 @@ public abstract class SaveablePartAdapter implements ISaveableWorkbenchPart {
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#removePropertyListener(org.eclipse.ui.IPropertyListener)
*/
+ @Override
public void removePropertyListener(IPropertyListener listener) {
}
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#setFocus()
*/
+ @Override
public void setFocus() {
}
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public Object getAdapter(Class adapter) {
return null;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/SaveablePartDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/SaveablePartDialog.java
index 060deacbf..73adaed7c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/SaveablePartDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/SaveablePartDialog.java
@@ -33,6 +33,7 @@ import org.eclipse.ui.PlatformUI;
* @deprecated Clients should use a subclass of {@link CompareEditorInput}
* and {@link CompareUI#openCompareDialog(org.eclipse.compare.CompareEditorInput)}
*/
+@Deprecated
public class SaveablePartDialog extends TrayDialog {
private ISaveableWorkbenchPart input;
@@ -55,6 +56,7 @@ public class SaveablePartDialog extends TrayDialog {
/* (non-Javadoc)
* Method declared on Dialog.
*/
+ @Override
protected void createButtonsForButtonBar(Composite parent) {
createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
}
@@ -62,6 +64,7 @@ public class SaveablePartDialog extends TrayDialog {
/* (non-Javadoc)
* Method declared on Dialog.
*/
+ @Override
protected Control createDialogArea(Composite parent2) {
Composite parent = (Composite) super.createDialogArea(parent2);
input.createPartControl(parent);
@@ -75,6 +78,7 @@ public class SaveablePartDialog extends TrayDialog {
/* (non-Javadoc)
* @see org.eclipse.compare.internal.ResizableDialog#close()
*/
+ @Override
public boolean close() {
saveChanges();
return super.close();
@@ -91,6 +95,7 @@ public class SaveablePartDialog extends TrayDialog {
if (input.isDirty() && dialog.open() == IDialogConstants.OK_ID) {
BusyIndicator.showWhile(null, new Runnable() {
+ @Override
public void run() {
input.doSave(new NullProgressMonitor());
}
@@ -110,6 +115,7 @@ public class SaveablePartDialog extends TrayDialog {
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.Dialog#getDialogBoundsSettings()
*/
+ @Override
protected IDialogSettings getDialogBoundsSettings() {
IDialogSettings compareSettings = TeamUIPlugin.getPlugin().getDialogSettings();
String sectionName = this.getClass().getName();
@@ -132,6 +138,7 @@ public class SaveablePartDialog extends TrayDialog {
/*
* @see org.eclipse.jface.window.Window#configureShell(Shell)
*/
+ @Override
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
if (fContextId != null)
@@ -141,6 +148,7 @@ public class SaveablePartDialog extends TrayDialog {
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.Dialog#getInitialSize()
*/
+ @Override
protected Point getInitialSize() {
Point initialSize = super.getInitialSize();
if (hasSettings) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamOperation.java
index d3ad27233..3f9227b3a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamOperation.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamOperation.java
@@ -66,6 +66,7 @@ public abstract class TeamOperation extends JobChangeAdapter implements IRunnabl
this.operation = operation;
}
+ @Override
protected void configureJob(Job job) {
super.configureJob(job);
if (operation.isKeepOneProgressServiceEntry())
@@ -83,7 +84,8 @@ public abstract class TeamOperation extends JobChangeAdapter implements IRunnabl
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.actions.JobRunnableContext#belongsTo(org.eclipse.team.internal.ui.actions.JobRunnableContext.IContextJob, java.lang.Object)
*/
- protected boolean belongsTo(IContextJob job, Object family) {
+ @Override
+ protected boolean belongsTo(IContextJob job, Object family) {
if (family instanceof IContextJob) {
IContextJob otherJob = (IContextJob)family;
IRunnableWithProgress runnable = otherJob.getRunnable();
@@ -97,7 +99,8 @@ public abstract class TeamOperation extends JobChangeAdapter implements IRunnabl
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.actions.JobRunnableContext#getCompletionStatus()
*/
- protected IStatus getCompletionStatus() {
+ @Override
+ protected IStatus getCompletionStatus() {
if (gotoAction != null) {
return new Status(IStatus.OK, TeamUIPlugin.ID, IStatus.OK, gotoAction.getText(), null);
}
@@ -107,7 +110,8 @@ public abstract class TeamOperation extends JobChangeAdapter implements IRunnabl
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.actions.JobRunnableContext#isUser()
*/
- protected boolean isUser() {
+ @Override
+ protected boolean isUser() {
return operation.isUserInitiated();
}
}
@@ -327,6 +331,7 @@ public abstract class TeamOperation extends JobChangeAdapter implements IRunnabl
final Shell[] shell = new Shell[] { null };
if (Display.getCurrent() == null) {
Display.getDefault().syncExec(new Runnable() {
+ @Override
public void run() {
shell[0] = Utils.getShell(getSite());
}

Back to the top