Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2016-04-12 01:43:41 -0400
committerLars Vogel2016-04-12 01:43:41 -0400
commit2c29d2886b5f82ebeae2f33f39249288387dbc97 (patch)
treee3c49dfee2cc46086da5c947b0dcf5a49d3daf23
parent92faeacdde13313fa8407d7247cf189833f77f65 (diff)
downloadeclipse.platform.team-2c29d2886b5f82ebeae2f33f39249288387dbc97.tar.gz
eclipse.platform.team-2c29d2886b5f82ebeae2f33f39249288387dbc97.tar.xz
eclipse.platform.team-2c29d2886b5f82ebeae2f33f39249288387dbc97.zip
Bug 491484 - Add @Override to org.eclipse.team.ui
Part II of the automatic cleanup Change-Id: I1b6c7cf8bba164644afb7b623d3ae59549736895 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/ElementLocalHistoryPageSource.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPage.java7
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java12
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageSaveablePart.java9
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/ITeamStateDescription.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeActionHandler.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SaveableComparison.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationActionProvider.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationCompareAdapter.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java13
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationLabelProvider.java7
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationOperation.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeLabelProvider.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeParticipant.java19
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeScope.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ISynchronizeView.java1
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java8
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelOperation.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantAction.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantMergeOperation.java9
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantWizard.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipant.java15
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageCompareEditorInput.java16
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageDialog.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java13
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantSynchronizeWizard.java7
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ResourceScope.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java28
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java14
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipantWizard.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberTeamStateProvider.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SyncInfoCompareInput.java15
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelOperation.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizePageActionGroup.java9
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateChangeEvent.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateDescription.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateProvider.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkingSetScope.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkspaceScope.java2
42 files changed, 297 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/ElementLocalHistoryPageSource.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/ElementLocalHistoryPageSource.java
index 0ed7040d6..9556d01a8 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/ElementLocalHistoryPageSource.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/ElementLocalHistoryPageSource.java
@@ -44,6 +44,7 @@ public abstract class ElementLocalHistoryPageSource extends HistoryPageSource {
/* (non-Javadoc)
* @see org.eclipse.team.ui.history.IHistoryPageSource#canShowHistoryFor(java.lang.Object)
*/
+ @Override
public final boolean canShowHistoryFor(Object object) {
return getFile(object) != null;
}
@@ -51,6 +52,7 @@ public abstract class ElementLocalHistoryPageSource extends HistoryPageSource {
/* (non-Javadoc)
* @see org.eclipse.team.ui.history.IHistoryPageSource#createPage(java.lang.Object)
*/
+ @Override
public final Page createPage(Object object) {
return new EditionHistoryPage(getFile(object), object);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPage.java
index f4988122c..a86ff636d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPage.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPage.java
@@ -32,6 +32,7 @@ public abstract class HistoryPage extends Page implements IHistoryPage, IAdaptab
/* (non-Javadoc)
* @see org.eclipse.team.ui.history.IHistoryPage#setSite(org.eclipse.team.ui.history.IHistoryPageSite)
*/
+ @Override
public void setSite(IHistoryPageSite site) {
this.site = site;
}
@@ -39,6 +40,7 @@ public abstract class HistoryPage extends Page implements IHistoryPage, IAdaptab
/* (non-Javadoc)
* @see org.eclipse.team.ui.history.IHistoryPage#getHistoryPageSite()
*/
+ @Override
public IHistoryPageSite getHistoryPageSite() {
return site;
}
@@ -47,6 +49,7 @@ public abstract class HistoryPage extends Page implements IHistoryPage, IAdaptab
/* (non-Javadoc)
* @see org.eclipse.team.ui.history.IHistoryPage#getInput()
*/
+ @Override
public Object getInput() {
return input;
}
@@ -54,6 +57,7 @@ public abstract class HistoryPage extends Page implements IHistoryPage, IAdaptab
/* (non-Javadoc)
* @see org.eclipse.team.ui.history.IHistoryPage#setInput(java.lang.Object, boolean)
*/
+ @Override
public boolean setInput(Object object) {
this.input = object;
return inputSet();
@@ -75,6 +79,7 @@ public abstract class HistoryPage extends Page implements IHistoryPage, IAdaptab
/* (non-Javadoc)
* @see org.eclipse.team.ui.history.IHistoryPage#getHistoryView()
*/
+ @Override
public IHistoryView getHistoryView() {
if (historyView != null)
return historyView;
@@ -85,6 +90,7 @@ public abstract class HistoryPage extends Page implements IHistoryPage, IAdaptab
/* (non-Javadoc)
* @see org.eclipse.team.ui.history.IHistoryPage#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
*/
+ @Override
public synchronized void addPropertyChangeListener(IPropertyChangeListener listener) {
if (fChangeHandler == null) {
fChangeHandler = new PropertyChangeHandler();
@@ -95,6 +101,7 @@ public abstract class HistoryPage extends Page implements IHistoryPage, IAdaptab
/* (non-Javadoc)
* @see org.eclipse.team.ui.history.IHistoryPage#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
*/
+ @Override
public void removePropertyChangeListener(IPropertyChangeListener listener) {
if (fChangeHandler != null) {
fChangeHandler.removePropertyChangeListener(listener);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java
index c9d636427..e2dbaf1a1 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageCompareEditorInput.java
@@ -42,6 +42,7 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput {
private final Object object;
private final IHistoryPageSource pageSource;
private final IPropertyChangeListener changeListener = new IPropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent event) {
handlePropertyChange(event);
}
@@ -63,6 +64,7 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#prepareInput(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected Object prepareInput(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
return object;
@@ -71,6 +73,7 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#handleDispose()
*/
+ @Override
protected void handleDispose() {
super.handleDispose();
if (historyPage != null) {
@@ -82,6 +85,7 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageCompareEditorInput#createPage(org.eclipse.compare.CompareViewerPane, org.eclipse.jface.action.IToolBarManager)
*/
+ @Override
protected IPage createPage(CompareViewerPane parent, IToolBarManager toolBarManager) {
site = new DialogHistoryPageSite(parent.getShell());
historyPage = (IHistoryPage)pageSource.createPage(object);
@@ -102,6 +106,7 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageCompareEditorInput#asCompareInput(org.eclipse.jface.viewers.ISelection)
*/
+ @Override
protected ICompareInput asCompareInput(ISelection selection) {
ICompareInput compareInput = super.asCompareInput(selection);
if (compareInput != null)
@@ -122,6 +127,7 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageCompareEditorInput#getSelectionProvider()
*/
+ @Override
protected ISelectionProvider getSelectionProvider() {
return site.getSelectionProvider();
}
@@ -129,6 +135,7 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageCompareEditorInput#prepareInput(org.eclipse.compare.structuremergeviewer.ICompareInput, org.eclipse.compare.CompareConfiguration, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected void prepareInput(ICompareInput input,
CompareConfiguration configuration, IProgressMonitor monitor)
throws InvocationTargetException {
@@ -155,12 +162,14 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput {
if (event.getSource() == historyPage) {
if (event.getProperty().equals(IHistoryPage.P_NAME)) {
Display.getDefault().asyncExec(new Runnable() {
+ @Override
public void run() {
setTitle(historyPage.getName());
}
});
} else if (event.getProperty().equals(IHistoryPage.P_DESCRIPTION)) {
Display.getDefault().asyncExec(new Runnable() {
+ @Override
public void run() {
setPageDescription(historyPage.getDescription());
}
@@ -172,6 +181,7 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#isEditionSelectionDialog()
*/
+ @Override
public boolean isEditionSelectionDialog() {
return isReplaceDialog();
}
@@ -199,6 +209,7 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#getOKButtonLabel()
*/
+ @Override
public String getOKButtonLabel() {
if (isReplaceDialog())
return TeamUIMessages.HistoryPageCompareEditorInput_0;
@@ -208,6 +219,7 @@ public class HistoryPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#okPressed()
*/
+ @Override
public boolean okPressed() {
if (!isReplaceDialog())
return super.okPressed();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageSaveablePart.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageSaveablePart.java
index 88523fc54..7d7357213 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageSaveablePart.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/HistoryPageSaveablePart.java
@@ -34,6 +34,7 @@ import org.eclipse.ui.part.Page;
* @deprecated use {@link HistoryPageCompareEditorInput}
* @since 3.2
*/
+@Deprecated
public class HistoryPageSaveablePart extends PageSaveablePart {
private IHistoryPage historyPage;
@@ -87,6 +88,7 @@ public class HistoryPageSaveablePart extends PageSaveablePart {
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageSaveablePart#getTitle()
*/
+ @Override
public String getTitle() {
return historyPage.getName();
}
@@ -94,6 +96,7 @@ public class HistoryPageSaveablePart extends PageSaveablePart {
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageSaveablePart#getTitleImage()
*/
+ @Override
public Image getTitleImage() {
return null;
}
@@ -101,12 +104,14 @@ public class HistoryPageSaveablePart extends PageSaveablePart {
/* (non-Javadoc)
* @see org.eclipse.compare.IContentChangeListener#contentChanged(org.eclipse.compare.IContentChangeNotifier)
*/
+ @Override
public void contentChanged(IContentChangeNotifier source) {
}
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageSaveablePart#createPage(org.eclipse.swt.widgets.Composite, org.eclipse.jface.action.ToolBarManager)
*/
+ @Override
protected Control createPage(Composite parent, ToolBarManager toolBarManager) {
site = new DialogHistoryPageSite(getShell());
historyPage = (IHistoryPage)pageSource.createPage(object);
@@ -124,6 +129,7 @@ public class HistoryPageSaveablePart extends PageSaveablePart {
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageSaveablePart#getPageSelectionProvider()
*/
+ @Override
protected final ISelectionProvider getSelectionProvider() {
return site.getSelectionProvider();
}
@@ -131,6 +137,7 @@ public class HistoryPageSaveablePart extends PageSaveablePart {
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageSaveablePart#getCompareInput(org.eclipse.jface.viewers.ISelection)
*/
+ @Override
protected ICompareInput getCompareInput(ISelection selection) {
ICompareInput compareInput = super.getCompareInput(selection);
if (compareInput != null)
@@ -151,6 +158,7 @@ public class HistoryPageSaveablePart extends PageSaveablePart {
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageSaveablePart#prepareInput(org.eclipse.compare.structuremergeviewer.ICompareInput, org.eclipse.compare.CompareConfiguration, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected void prepareInput(ICompareInput input, CompareConfiguration configuration, IProgressMonitor monitor) throws InvocationTargetException {
IHistoryCompareAdapter compareAdapter = (IHistoryCompareAdapter) Utils.getAdapter(historyPage, IHistoryCompareAdapter.class);
if (compareAdapter != null){
@@ -161,6 +169,7 @@ public class HistoryPageSaveablePart extends PageSaveablePart {
/* (non-Javadoc)
* @see org.eclipse.team.ui.SaveablePartAdapter#dispose()
*/
+ @Override
public void dispose() {
super.dispose();
if (historyPage != null)
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java
index 5d7a12aef..b31305344 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/history/RevisionAnnotationController.java
@@ -48,6 +48,7 @@ public abstract class RevisionAnnotationController {
private ISelectionProvider fRulerSelectionProvider;
private ISelectionProvider fHistoryListSelectionProvider;
private ISelectionChangedListener rulerListener = new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
ISelection selection= event.getSelection();
Revision selected= null;
@@ -61,6 +62,7 @@ public abstract class RevisionAnnotationController {
}
};
private ISelectionChangedListener historyListListener = new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
ISelection selection= event.getSelection();
if (selection instanceof IStructuredSelection) {
@@ -293,6 +295,7 @@ public abstract class RevisionAnnotationController {
fHistoryListSelectionProvider.addSelectionChangedListener(historyListListener);
((IRevisionRulerColumn)revisionRuler).getControl().addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
dispose();
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/ITeamStateDescription.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/ITeamStateDescription.java
index 51ded1781..8fdff21c4 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/ITeamStateDescription.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/ITeamStateDescription.java
@@ -85,6 +85,7 @@ public interface ITeamStateDescription {
* @param object the object
* @return whether this state description is equal the to given object
*/
+ @Override
public boolean equals(Object object);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeActionHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeActionHandler.java
index c586df1a1..e31159538 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeActionHandler.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/MergeActionHandler.java
@@ -37,6 +37,7 @@ public abstract class MergeActionHandler extends AbstractHandler {
private boolean enabled = false;
private IStructuredSelection selection;
private ISelectionChangedListener listener = new ISelectionChangedListener() {
+ @Override
public void selectionChanged(SelectionChangedEvent event) {
updatedEnablement(event);
}
@@ -81,6 +82,7 @@ public abstract class MergeActionHandler extends AbstractHandler {
/**
* Deregister this handler from selection change events.
*/
+ @Override
public void dispose() {
getConfiguration().getSite().getSelectionProvider().removeSelectionChangedListener(listener);
}
@@ -124,6 +126,7 @@ public abstract class MergeActionHandler extends AbstractHandler {
/* (non-Javadoc)
* @see org.eclipse.core.commands.AbstractHandler#isEnabled()
*/
+ @Override
public boolean isEnabled() {
return enabled;
}
@@ -142,6 +145,7 @@ public abstract class MergeActionHandler extends AbstractHandler {
/* (non-Javadoc)
* @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
*/
+ @Override
public Object execute(final ExecutionEvent event) throws ExecutionException {
try {
SynchronizationOperation operation = getOperation();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SaveableComparison.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SaveableComparison.java
index d1b0ede4f..40d4162b4 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SaveableComparison.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SaveableComparison.java
@@ -36,6 +36,7 @@ public abstract class SaveableComparison extends Saveable {
/**
* {@inheritDoc}
*/
+ @Override
public boolean isDirty() {
return dirty;
}
@@ -43,6 +44,7 @@ public abstract class SaveableComparison extends Saveable {
/**
* {@inheritDoc}
*/
+ @Override
public void doSave(IProgressMonitor monitor) throws CoreException {
if (!isDirty())
return;
@@ -102,9 +104,11 @@ public abstract class SaveableComparison extends Saveable {
for (int i = 0; i < allListeners.length; i++) {
final Object object = allListeners[i];
SafeRunner.run(new ISafeRunnable() {
+ @Override
public void run() throws Exception {
((IPropertyListener)object).propertyChanged(SaveableComparison.this, property);
}
+ @Override
public void handleException(Throwable exception) {
// handled by platform
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationActionProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationActionProvider.java
index 2a1e06ba7..496bdf993 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationActionProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationActionProvider.java
@@ -66,6 +66,7 @@ public class SynchronizationActionProvider extends CommonActionProvider {
private Map handlers = new HashMap();
private OpenWithActionGroup openWithActions;
+ @Override
public void init(ICommonActionExtensionSite site) {
super.init(site);
initialize();
@@ -149,6 +150,7 @@ public class SynchronizationActionProvider extends CommonActionProvider {
/* (non-Javadoc)
* @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager)
*/
+ @Override
public void fillContextMenu(IMenuManager menu) {
super.fillContextMenu(menu);
if (menu instanceof CommonMenuManager) {
@@ -167,16 +169,19 @@ public class SynchronizationActionProvider extends CommonActionProvider {
/* (non-Javadoc)
* @see org.eclipse.ui.actions.ActionGroup#fillActionBars(org.eclipse.ui.IActionBars)
*/
+ @Override
public void fillActionBars(IActionBars actionBars) {
super.fillActionBars(actionBars);
if (openWithActions != null) openWithActions.fillActionBars(actionBars);
}
+ @Override
public void updateActionBars() {
super.updateActionBars();
if (openWithActions != null) openWithActions.updateActionBars();
}
+ @Override
public void setContext(ActionContext context) {
super.setContext(context);
if (openWithActions != null) openWithActions.setContext(context);
@@ -185,6 +190,7 @@ public class SynchronizationActionProvider extends CommonActionProvider {
/* (non-Javadoc)
* @see org.eclipse.ui.actions.ActionGroup#dispose()
*/
+ @Override
public void dispose() {
super.dispose();
if (openWithActions != null) openWithActions.dispose();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationCompareAdapter.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationCompareAdapter.java
index 8898ffa64..48f44b7a6 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationCompareAdapter.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationCompareAdapter.java
@@ -42,6 +42,7 @@ public abstract class SynchronizationCompareAdapter implements ISynchronizationC
* available for other types of model elements.
* @see ISynchronizationCompareAdapter#asCompareInput(ISynchronizationContext, Object)
*/
+ @Override
public ICompareInput asCompareInput(ISynchronizationContext context, Object o) {
IResource resource = Utils.getResource(o);
if (resource != null) {
@@ -57,6 +58,7 @@ public abstract class SynchronizationCompareAdapter implements ISynchronizationC
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.ICompareAdapter#hasCompareInput(org.eclipse.team.core.mapping.ISynchronizationContext, java.lang.Object)
*/
+ @Override
public boolean hasCompareInput(ISynchronizationContext context, Object object) {
return asCompareInput(context, object) != null;
}
@@ -64,6 +66,7 @@ public abstract class SynchronizationCompareAdapter implements ISynchronizationC
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.IResourceMappingPersistenceAdapter#getName(org.eclipse.core.resources.mapping.ResourceMapping)
*/
+ @Override
public String getName(ResourceMapping mapping) {
Object object = mapping.getModelObject();
IWorkbenchAdapter adapter = (IWorkbenchAdapter) Utils.getAdapter(
@@ -89,6 +92,7 @@ public abstract class SynchronizationCompareAdapter implements ISynchronizationC
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.IResourceMappingPersistenceAdapter#getFullPath(org.eclipse.core.resources.mapping.ResourceMapping)
*/
+ @Override
public String getPathString(ResourceMapping mapping) {
Object object = mapping.getModelObject();
IWorkbenchAdapter adapter = (IWorkbenchAdapter) Utils.getAdapter(
@@ -117,6 +121,7 @@ public abstract class SynchronizationCompareAdapter implements ISynchronizationC
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.ISynchronizationCompareAdapter#getImageDescriptor(org.eclipse.core.resources.mapping.ResourceMapping)
*/
+ @Override
public ImageDescriptor getImageDescriptor(ResourceMapping mapping) {
Object object = mapping.getModelObject();
ImageDescriptor image = getImageDescriptorFromWorkbenchAdapter(object);
@@ -166,6 +171,7 @@ public abstract class SynchronizationCompareAdapter implements ISynchronizationC
*
* @since 3.3
*/
+ @Override
public int getSynchronizationState(ITeamStateProvider provider, ResourceMapping mapping, int stateMask, IProgressMonitor monitor) throws CoreException {
return -1;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java
index b6d9fa855..73b840070 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationContentProvider.java
@@ -45,6 +45,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
*/
+ @Override
public Object[] getChildren(Object parent) {
return internalGetChildren(parent, false);
}
@@ -52,6 +53,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
*/
+ @Override
public Object[] getElements(Object parent) {
return internalGetChildren(parent, true);
}
@@ -59,6 +61,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
*/
+ @Override
public Object getParent(Object element) {
element = internalGetElement(element);
if (element instanceof ModelProvider)
@@ -74,6 +77,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
*/
+ @Override
public boolean hasChildren(Object element) {
return internalHasChildren(element);
}
@@ -252,6 +256,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
*/
+ @Override
public void dispose() {
ICommonContentExtensionSite extensionSite = getExtensionSite();
if (extensionSite != null) {
@@ -268,6 +273,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
*/
+ @Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
this.viewer = viewer;
getDelegateContentProvider().inputChanged(viewer, oldInput, newInput);
@@ -276,6 +282,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.ICommonContentProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite)
*/
+ @Override
public void init(ICommonContentExtensionSite site) {
// Set the site
this.site = site;
@@ -296,6 +303,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr
/* (non-Javadoc)
* @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
// TODO: this could happen at the root as well
if (event.getProperty().equals(ISynchronizePageConfiguration.P_MODE)) {
@@ -377,6 +385,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IMementoAware#restoreState(org.eclipse.ui.IMemento)
*/
+ @Override
public void restoreState(IMemento aMemento) {
ITreeContentProvider provider = getDelegateContentProvider();
if (provider instanceof ICommonContentProvider) {
@@ -387,6 +396,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IMementoAware#saveState(org.eclipse.ui.IMemento)
*/
+ @Override
public void saveState(IMemento aMemento) {
ITreeContentProvider provider = getDelegateContentProvider();
if (provider instanceof ICommonContentProvider) {
@@ -397,6 +407,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr
/* (non-Javadoc)
* @see org.eclipse.team.core.delta.ISyncDeltaChangeListener#syncDeltaTreeChanged(org.eclipse.team.core.delta.ISyncDeltaChangeEvent, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void diffsChanged(IDiffChangeEvent event, IProgressMonitor monitor) {
refresh();
}
@@ -404,6 +415,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr
/* (non-Javadoc)
* @see org.eclipse.team.core.diff.IDiffChangeListener#propertyChanged(int, org.eclipse.core.runtime.IPath[])
*/
+ @Override
public void propertyChanged(IDiffTree tree, int property, IPath[] paths) {
// Property changes only affect labels
}
@@ -413,6 +425,7 @@ public abstract class SynchronizationContentProvider implements ICommonContentPr
*/
protected void refresh() {
Utils.syncExec(new Runnable() {
+ @Override
public void run() {
TreeViewer treeViewer = ((TreeViewer)getViewer());
// TODO: Need to know if the model root is present in order to refresh properly
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationLabelProvider.java
index 69900f040..b74cfcbf9 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationLabelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationLabelProvider.java
@@ -43,6 +43,7 @@ public abstract class SynchronizationLabelProvider extends AbstractSynchronizeLa
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.ICommonLabelProvider#init(org.eclipse.ui.navigator.ICommonContentExtensionSite)
*/
+ @Override
public void init(ICommonContentExtensionSite site) {
this.site = site;
contentProvider = site.getExtension().getContentProvider();
@@ -73,6 +74,7 @@ public abstract class SynchronizationLabelProvider extends AbstractSynchronizeLa
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IMementoAware#restoreState(org.eclipse.ui.IMemento)
*/
+ @Override
public void restoreState(IMemento aMemento) {
ILabelProvider provider = getDelegateLabelProvider();
if (provider instanceof ICommonLabelProvider) {
@@ -83,6 +85,7 @@ public abstract class SynchronizationLabelProvider extends AbstractSynchronizeLa
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IMementoAware#saveState(org.eclipse.ui.IMemento)
*/
+ @Override
public void saveState(IMemento aMemento) {
ILabelProvider provider = getDelegateLabelProvider();
if (provider instanceof ICommonLabelProvider) {
@@ -93,6 +96,7 @@ public abstract class SynchronizationLabelProvider extends AbstractSynchronizeLa
/* (non-Javadoc)
* @see org.eclipse.ui.navigator.IDescriptionProvider#getDescription(java.lang.Object)
*/
+ @Override
public String getDescription(Object anElement) {
ILabelProvider provider = getDelegateLabelProvider();
if (provider instanceof IDescriptionProvider) {
@@ -104,6 +108,7 @@ public abstract class SynchronizationLabelProvider extends AbstractSynchronizeLa
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.mapping.SynchronizationStateLabelProvider#isDecorationEnabled()
*/
+ @Override
protected boolean isDecorationEnabled() {
return getContext() != null;
}
@@ -111,6 +116,7 @@ public abstract class SynchronizationLabelProvider extends AbstractSynchronizeLa
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.mapping.SynchronizationStateLabelProvider#getImage(java.lang.Object)
*/
+ @Override
public Image getImage(Object element) {
Image image = super.getImage(element);
if (image == null && internalGetElement(element) instanceof ModelProvider) {
@@ -132,6 +138,7 @@ public abstract class SynchronizationLabelProvider extends AbstractSynchronizeLa
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.AbstractSynchronizeLabelProvider#getText(java.lang.Object)
*/
+ @Override
public String getText(Object element) {
String text = super.getText(element);
if (contentProvider instanceof SynchronizationContentProvider) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationOperation.java
index bb5cab5ee..86fbdee6d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationOperation.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/mapping/SynchronizationOperation.java
@@ -95,6 +95,7 @@ public abstract class SynchronizationOperation extends TeamOperation {
* Make <code>shouldRun</code> public so the result
* can be used to provide handler enablement
*/
+ @Override
public boolean shouldRun() {
return super.shouldRun();
}
@@ -114,6 +115,7 @@ public abstract class SynchronizationOperation extends TeamOperation {
/* (non-Javadoc)
* @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public final void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
try {
monitor.beginTask(null, 100);
@@ -130,6 +132,7 @@ public abstract class SynchronizationOperation extends TeamOperation {
// when there are no more jobs related to the context running
final IJobManager jobManager = Job.getJobManager();
final IJobChangeListener listener = new JobChangeAdapter() {
+ @Override
public void done(IJobChangeEvent event) {
Job[] jobs = jobManager.find(getContext());
if (jobs.length == 0) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeLabelProvider.java
index 3ef827f43..0b428935d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeLabelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeLabelProvider.java
@@ -45,6 +45,7 @@ public abstract class AbstractSynchronizeLabelProvider implements ILabelProvider
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
*/
+ @Override
public Image getImage(Object element) {
Image base = getDelegateImage(element);
if (isDecorationEnabled() && base != null) {
@@ -136,6 +137,7 @@ public abstract class AbstractSynchronizeLabelProvider implements ILabelProvider
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
*/
+ @Override
public String getText(Object element) {
String base = getDelegateText(element);
if (isSyncInfoInTextEnabled()) {
@@ -184,6 +186,7 @@ public abstract class AbstractSynchronizeLabelProvider implements ILabelProvider
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
*/
+ @Override
public void addListener(ILabelProviderListener listener) {
getDelegateLabelProvider().addListener(listener);
}
@@ -191,6 +194,7 @@ public abstract class AbstractSynchronizeLabelProvider implements ILabelProvider
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
*/
+ @Override
public void dispose() {
if (localImageManager != null)
localImageManager.dispose();
@@ -199,6 +203,7 @@ public abstract class AbstractSynchronizeLabelProvider implements ILabelProvider
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
*/
+ @Override
public boolean isLabelProperty(Object element, String property) {
return getDelegateLabelProvider().isLabelProperty(internalGetElement(element), property);
}
@@ -206,6 +211,7 @@ public abstract class AbstractSynchronizeLabelProvider implements ILabelProvider
/* (non-Javadoc)
* @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
*/
+ @Override
public void removeListener(ILabelProviderListener listener) {
getDelegateLabelProvider().removeListener(listener);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeParticipant.java
index e0ebb22f8..b2cd29166 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeParticipant.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeParticipant.java
@@ -75,6 +75,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#getName()
*/
+ @Override
public String getName() {
return fName;
}
@@ -82,6 +83,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#getImageDescriptor()
*/
+ @Override
public ImageDescriptor getImageDescriptor() {
return fImageDescriptor;
}
@@ -90,6 +92,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#getId()
*/
+ @Override
public String getId() {
return fId;
}
@@ -97,6 +100,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#getSecondaryId()
*/
+ @Override
public String getSecondaryId() {
return fSecondaryId;
}
@@ -112,6 +116,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
* @nooverride This method is not intended to be re-implemented or extended
* by clients.
*/
+ @Override
public String getHelpContextId() {
return fHelpContextId == null ? IHelpContextIds.SYNC_VIEW
: fHelpContextId;
@@ -120,6 +125,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#setPinned(boolean)
*/
+ @Override
public final void setPinned(boolean pinned) {
this.pinned = pinned;
pinned(pinned);
@@ -129,6 +135,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#isPinned()
*/
+ @Override
public final boolean isPinned() {
return pinned;
}
@@ -145,6 +152,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
/* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj) {
if(obj == this) return true;
if( ! (obj instanceof ISynchronizeParticipant)) return false;
@@ -155,6 +163,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
/* (non-Javadoc)
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode() {
return Utils.getKey(getId(), getSecondaryId()).hashCode();
}
@@ -174,6 +183,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
*/
+ @Override
public synchronized void addPropertyChangeListener(IPropertyChangeListener listener) {
if (fChangeHandler == null) {
fChangeHandler = new PropertyChangeHandler();
@@ -184,6 +194,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
*/
+ @Override
public void removePropertyChangeListener(IPropertyChangeListener listener) {
if (fChangeHandler != null) {
fChangeHandler.removePropertyChangeListener(listener);
@@ -208,6 +219,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
*/
+ @Override
public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
// Save config element.
configElement = config;
@@ -289,6 +301,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
* </p>
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#init(String, org.eclipse.ui.IMemento)
*/
+ @Override
public void init(String secondaryId, IMemento memento) throws PartInitException {
setSecondaryId(secondaryId);
pinned = Boolean.valueOf(memento.getString(CTX_PINNED)).booleanValue();
@@ -297,6 +310,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#saveState(org.eclipse.ui.IMemento)
*/
+ @Override
public void saveState(IMemento memento) {
memento.putString(CTX_PINNED, Boolean.toString(pinned));
}
@@ -304,6 +318,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#createPageConfiguration()
*/
+ @Override
public final ISynchronizePageConfiguration createPageConfiguration() {
SynchronizePageConfiguration configuration = new SynchronizePageConfiguration(this);
if (isViewerContributionsSupported()) {
@@ -337,6 +352,7 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
* @since 3.1
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#prepareCompareInput(org.eclipse.team.ui.synchronize.ISynchronizeModelElement, org.eclipse.compare.CompareConfiguration, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void prepareCompareInput(ISynchronizeModelElement element, CompareConfiguration config, IProgressMonitor monitor) throws TeamException {
SyncInfo sync = getSyncInfo(element);
if (sync != null)
@@ -363,7 +379,8 @@ public abstract class AbstractSynchronizeParticipant extends PlatformObject impl
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#getPreferencePages()
*/
- public PreferencePage[] getPreferencePages() {
+ @Override
+ public PreferencePage[] getPreferencePages() {
return new PreferencePage[] { new SyncViewerPreferencePage() };
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeScope.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeScope.java
index 0c6e18ba4..f010689b7 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeScope.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/AbstractSynchronizeScope.java
@@ -97,6 +97,7 @@ public abstract class AbstractSynchronizeScope implements ISynchronizeScope {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ScopableSubscriberParticipant.ISynchronizeScope#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
*/
+ @Override
public void addPropertyChangeListener(IPropertyChangeListener listener) {
synchronized(listeners) {
listeners.add(listener);
@@ -106,6 +107,7 @@ public abstract class AbstractSynchronizeScope implements ISynchronizeScope {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ScopableSubscriberParticipant.ISynchronizeScope#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
*/
+ @Override
public void removePropertyChangeListener(IPropertyChangeListener listener) {
synchronized(listeners) {
listeners.remove(listeners);
@@ -115,6 +117,7 @@ public abstract class AbstractSynchronizeScope implements ISynchronizeScope {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeScope#dispose()
*/
+ @Override
public void dispose() {
// Do nothing by default
}
@@ -132,6 +135,7 @@ public abstract class AbstractSynchronizeScope implements ISynchronizeScope {
for (int i = 0; i < allListeners.length; i++) {
final IPropertyChangeListener listener = (IPropertyChangeListener)allListeners[i];
SafeRunner.run(new SafeRunnable() {
+ @Override
public void run() throws Exception {
listener.propertyChange(event);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ISynchronizeView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ISynchronizeView.java
index 565b30a02..a467a784c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ISynchronizeView.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ISynchronizeView.java
@@ -38,6 +38,7 @@ public interface ISynchronizeView extends IViewPart {
* This id is no longer used.
* @deprecated not used, please use {@link #VIEW_ID} instead.
*/
+ @Deprecated
public static final String COMPARE_VIEW_ID = "org.eclipse.team.sync.views.CompareView"; //$NON-NLS-1$
/**
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java
index 25af17804..3cdf492a9 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java
@@ -118,6 +118,7 @@ public abstract class ModelMergeOperation extends ModelOperation {
*
* @param monitor a progress monitor
*/
+ @Override
protected void execute(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
try {
@@ -193,8 +194,10 @@ public abstract class ModelMergeOperation extends ModelOperation {
protected void handleValidationFailure(final IStatus status) {
final boolean[] result = new boolean[] { false };
Runnable runnable = new Runnable() {
+ @Override
public void run() {
ErrorDialog dialog = new ErrorDialog(getShell(), TeamUIMessages.ModelMergeOperation_0, TeamUIMessages.ModelMergeOperation_1, status, IStatus.ERROR | IStatus.WARNING | IStatus.INFO) {
+ @Override
protected void createButtonsForButtonBar(Composite parent) {
createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL,
false);
@@ -205,6 +208,7 @@ public abstract class ModelMergeOperation extends ModelOperation {
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.ErrorDialog#buttonPressed(int)
*/
+ @Override
protected void buttonPressed(int id) {
if (id == IDialogConstants.YES_ID)
super.buttonPressed(IDialogConstants.OK_ID);
@@ -230,6 +234,7 @@ public abstract class ModelMergeOperation extends ModelOperation {
*/
protected void handleMergeFailure(final IStatus status) {
Display.getDefault().syncExec(new Runnable() {
+ @Override
public void run() {
MessageDialog.openInformation(getShell(), TeamUIMessages.MergeIncomingChangesAction_0, status.getMessage());
};
@@ -244,6 +249,7 @@ public abstract class ModelMergeOperation extends ModelOperation {
*/
protected void handleNoChanges() {
Display.getDefault().syncExec(new Runnable() {
+ @Override
public void run() {
NoChangesDialog.open(getShell(), TeamUIMessages.ResourceMappingMergeOperation_0, TeamUIMessages.ResourceMappingMergeOperation_1, TeamUIMessages.ModelMergeOperation_3, getScope().asInputScope());
};
@@ -273,6 +279,7 @@ public abstract class ModelMergeOperation extends ModelOperation {
final ModelProvider[] providers = sortByExtension(context.getScope().getModelProviders());
final IStatus[] result = new IStatus[] { Status.OK_STATUS };
context.run(new IWorkspaceRunnable() {
+ @Override
public void run(IProgressMonitor monitor) throws CoreException {
try {
int ticks = 100;
@@ -355,6 +362,7 @@ public abstract class ModelMergeOperation extends ModelOperation {
private boolean hasIncomingChanges(IDiffTree tree) {
return tree.hasMatchingDiffs(ResourcesPlugin.getWorkspace().getRoot().getFullPath(), new FastDiffFilter() {
+ @Override
public boolean select(IDiff node) {
if (node instanceof IThreeWayDiff) {
IThreeWayDiff twd = (IThreeWayDiff) node;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelOperation.java
index 0794890df..20d3be9b4 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelOperation.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelOperation.java
@@ -98,6 +98,7 @@ public abstract class ModelOperation extends TeamOperation {
* @param monitor a progress monitor
* @see org.eclipse.jface.operation.IRunnableWithProgress#run(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public final void run(IProgressMonitor monitor) throws InvocationTargetException,
InterruptedException {
try {
@@ -385,7 +386,8 @@ public abstract class ModelOperation extends TeamOperation {
final boolean[] canceled = new boolean[] { false };
final boolean[] forcePreview = new boolean[] { false };
Display.getDefault().syncExec(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
AdditionalMappingsDialog dialog = new AdditionalMappingsDialog(getShell(), TeamUIMessages.ResourceMappingOperation_0, getScope(), getContext());
dialog.setPreviewMessage(requestPreviewMessage);
int result = dialog.open();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantAction.java
index 8fbc16964..95da4712f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantAction.java
@@ -52,6 +52,7 @@ public abstract class ModelParticipantAction extends BaseSelectionListenerAction
private void initialize(ISynchronizePageConfiguration configuration) {
configuration.getSite().getSelectionProvider().addSelectionChangedListener(this);
configuration.getPage().getViewer().getControl().addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
getConfiguration().getSite().getSelectionProvider().removeSelectionChangedListener(ModelParticipantAction.this);
}
@@ -83,6 +84,7 @@ public abstract class ModelParticipantAction extends BaseSelectionListenerAction
/* (non-Javadoc)
* @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
*/
+ @Override
protected boolean updateSelection(IStructuredSelection selection) {
super.updateSelection(selection);
return isEnabledForSelection(selection);
@@ -153,6 +155,7 @@ public abstract class ModelParticipantAction extends BaseSelectionListenerAction
final SaveableComparison activeSaveable = getActiveSaveable();
if (activeSaveable != null && activeSaveable.isDirty()) {
PlatformUI.getWorkbench().getProgressService().run(true, true, new IRunnableWithProgress() {
+ @Override
public void run(IProgressMonitor monitor) throws InvocationTargetException,
InterruptedException {
try {
@@ -200,6 +203,7 @@ public abstract class ModelParticipantAction extends BaseSelectionListenerAction
public static boolean promptToSaveChanges(final Shell shell, final SaveableComparison saveable, final boolean allowCancel) throws InterruptedException {
final int[] result = new int[] { 0 };
Runnable runnable = new Runnable() {
+ @Override
public void run() {
String[] options;
if (allowCancel) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantMergeOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantMergeOperation.java
index f7b8e9cf7..6cd339384 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantMergeOperation.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantMergeOperation.java
@@ -60,6 +60,7 @@ public abstract class ModelParticipantMergeOperation extends ModelMergeOperation
/* (non-Javadoc)
* @see org.eclipse.team.ui.operations.ModelMergeOperation#initializeContext(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected void initializeContext(IProgressMonitor monitor) throws CoreException {
if (participant == null) {
participant = createParticipant();
@@ -83,6 +84,7 @@ public abstract class ModelParticipantMergeOperation extends ModelMergeOperation
/* (non-Javadoc)
* @see org.eclipse.team.ui.operations.ModelMergeOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
try {
super.execute(monitor);
@@ -95,6 +97,7 @@ public abstract class ModelParticipantMergeOperation extends ModelMergeOperation
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.ModelMergeOperation#executeMerge(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected void executeMerge(IProgressMonitor monitor) throws CoreException {
if (!sentToSyncView)
super.executeMerge(monitor);
@@ -103,8 +106,10 @@ public abstract class ModelParticipantMergeOperation extends ModelMergeOperation
/* (non-Javadoc)
* @see org.eclipse.team.ui.operations.ModelMergeOperation#handlePreviewRequest()
*/
+ @Override
protected void handlePreviewRequest() {
Job job = new WorkbenchJob(getJobName()) {
+ @Override
public IStatus runInUIThread(IProgressMonitor monitor) {
if (isPreviewInDialog()) {
CompareConfiguration cc = new CompareConfiguration();
@@ -131,6 +136,7 @@ public abstract class ModelParticipantMergeOperation extends ModelMergeOperation
}
};
job.addJobChangeListener(new JobChangeAdapter() {
+ @Override
public void done(IJobChangeEvent event) {
// Ensure that the participant is disposed it it didn't go to the sync view
if (TeamUI.getSynchronizeManager().get(participant.getId(), participant.getSecondaryId()) == null)
@@ -142,6 +148,7 @@ public abstract class ModelParticipantMergeOperation extends ModelMergeOperation
job.schedule();
}
+ @Override
public boolean belongsTo(Object family) {
if (family == PARTICIPANT_MERGE_FAMILY) {
return true;
@@ -162,6 +169,7 @@ public abstract class ModelParticipantMergeOperation extends ModelMergeOperation
/* (non-Javadoc)
* @see org.eclipse.team.ui.operations.ResourceMappingOperation#getContext()
*/
+ @Override
protected ISynchronizationContext getContext() {
if (participant != null)
return participant.getContext();
@@ -171,6 +179,7 @@ public abstract class ModelParticipantMergeOperation extends ModelMergeOperation
/* (non-Javadoc)
* @see org.eclipse.team.ui.operations.ResourceMappingOperation#getPreviewRequestMessage()
*/
+ @Override
protected String getPreviewRequestMessage() {
if (!isPreviewRequested()) {
return TeamUIMessages.ResourceMappingMergeOperation_4;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantWizard.java
index 1714f3c44..7874cf403 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelParticipantWizard.java
@@ -35,6 +35,7 @@ public abstract class ModelParticipantWizard extends ParticipantSynchronizeWizar
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#createParticipant()
*/
+ @Override
protected final void createParticipant() {
ISynchronizeParticipant participant = createParticipant(selectionPage.getSelectedMappings());
TeamUI.getSynchronizeManager().addSynchronizeParticipants(new ISynchronizeParticipant[]{participant});
@@ -45,6 +46,7 @@ public abstract class ModelParticipantWizard extends ParticipantSynchronizeWizar
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#createScopeSelectionPage()
*/
+ @Override
protected final WizardPage createScopeSelectionPage() {
selectionPage = new ModelElementSelectionPage(getRootResources());
return selectionPage;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipant.java
index f0d609e02..d650b0e0a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipant.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipant.java
@@ -109,12 +109,14 @@ public class ModelSynchronizeParticipant extends
private String description;
private SaveableComparison activeSaveable;
private PreferenceStore preferences = new PreferenceStore() {
+ @Override
public void save() throws IOException {
// Nothing to do. Preference will be saved with participant.
}
};
private IPropertyListener dirtyListener = new IPropertyListener() {
+ @Override
public void propertyChanged(Object source, int propId) {
if (source instanceof SaveableComparison && propId == SaveableComparison.PROP_DIRTY) {
SaveableComparison scm = (SaveableComparison) source;
@@ -169,6 +171,7 @@ public class ModelSynchronizeParticipant extends
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#getName()
*/
+ @Override
public String getName() {
String name = super.getName();
if (description == null)
@@ -190,6 +193,7 @@ public class ModelSynchronizeParticipant extends
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#initializeConfiguration(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
*/
+ @Override
protected void initializeConfiguration(
ISynchronizePageConfiguration configuration) {
if (isMergingEnabled()) {
@@ -219,6 +223,7 @@ public class ModelSynchronizeParticipant extends
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#createPage(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
*/
+ @Override
public final IPageBookViewPage createPage(
ISynchronizePageConfiguration configuration) {
return new ModelSynchronizePage(configuration);
@@ -227,6 +232,7 @@ public class ModelSynchronizeParticipant extends
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#run(org.eclipse.ui.IWorkbenchPart)
*/
+ @Override
public void run(IWorkbenchPart part) {
refresh(part != null ? part.getSite() : null, context.getScope().getMappings());
}
@@ -249,6 +255,7 @@ public class ModelSynchronizeParticipant extends
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#dispose()
*/
+ @Override
public void dispose() {
context.dispose();
Job.getJobManager().cancel(this);
@@ -400,6 +407,7 @@ public class ModelSynchronizeParticipant extends
private IRefreshable createRefreshable() {
return new IRefreshable() {
+ @Override
public RefreshParticipantJob createJob(String interval) {
String jobName = NLS.bind(TeamUIMessages.RefreshSchedule_15, new String[] { ModelSynchronizeParticipant.this.getName(), interval });
return new RefreshModelParticipantJob(ModelSynchronizeParticipant.this,
@@ -408,12 +416,15 @@ public class ModelSynchronizeParticipant extends
context.getScope().getMappings(),
new RefreshUserNotificationPolicy(ModelSynchronizeParticipant.this));
}
+ @Override
public ISynchronizeParticipant getParticipant() {
return ModelSynchronizeParticipant.this;
}
+ @Override
public void setRefreshSchedule(SubscriberRefreshSchedule schedule) {
ModelSynchronizeParticipant.this.setRefreshSchedule(schedule);
}
+ @Override
public SubscriberRefreshSchedule getRefreshSchedule() {
return refreshSchedule;
}
@@ -424,6 +435,7 @@ public class ModelSynchronizeParticipant extends
/* (non-Javadoc)
* @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
*/
+ @Override
public Object getAdapter(Class adapter) {
if (adapter == IRefreshable.class && refreshSchedule != null) {
return refreshSchedule.getRefreshable();
@@ -438,6 +450,7 @@ public class ModelSynchronizeParticipant extends
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#saveState(org.eclipse.ui.IMemento)
*/
+ @Override
public void saveState(IMemento memento) {
super.saveState(memento);
IMemento settings = memento.createChild(CTX_PARTICIPANT_SETTINGS);
@@ -466,6 +479,7 @@ public class ModelSynchronizeParticipant extends
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#init(org.eclipse.ui.IMemento)
*/
+ @Override
public void init(String secondaryId, IMemento memento) throws PartInitException {
super.init(secondaryId, memento);
if(memento != null) {
@@ -632,6 +646,7 @@ public class ModelSynchronizeParticipant extends
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#getPreferencePages()
*/
+ @Override
public PreferencePage[] getPreferencePages() {
List pages = new ArrayList();
SyncViewerPreferencePage syncViewerPreferencePage = new SyncViewerPreferencePage();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java
index 4b3969183..fa3425d7c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelSynchronizeParticipantActionGroup.java
@@ -75,6 +75,7 @@ public class ModelSynchronizeParticipantActionGroup extends SynchronizePageActio
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#initialize(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
*/
+ @Override
public void initialize(ISynchronizePageConfiguration configuration) {
super.initialize(configuration);
@@ -99,6 +100,7 @@ public class ModelSynchronizeParticipantActionGroup extends SynchronizePageActio
showPreferences = new SyncViewerShowPreferencesAction(configuration);
openInCompareAction = new OpenInCompareAction(configuration);
configuration.setProperty(SynchronizePageConfiguration.P_OPEN_ACTION, new Action() {
+ @Override
public void run() {
openInCompareAction.run();
}
@@ -106,6 +108,7 @@ public class ModelSynchronizeParticipantActionGroup extends SynchronizePageActio
}
}
+ @Override
public void fillActionBars(IActionBars actionBars) {
super.fillActionBars(actionBars);
if (actionBars != null && showPreferences != null) {
@@ -117,6 +120,7 @@ public class ModelSynchronizeParticipantActionGroup extends SynchronizePageActio
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager)
*/
+ @Override
public void fillContextMenu(IMenuManager menu) {
super.fillContextMenu(menu);
if (menu instanceof CommonMenuManager) {
@@ -270,6 +274,7 @@ public class ModelSynchronizeParticipantActionGroup extends SynchronizePageActio
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#dispose()
*/
+ @Override
public void dispose() {
if (modelPicker != null)
modelPicker.dispose();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageCompareEditorInput.java
index 0164fcd1c..d40dd4841 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageCompareEditorInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageCompareEditorInput.java
@@ -77,6 +77,7 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#prepareInput(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected Object prepareInput(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
setTitle(Utils.shortenText(SynchronizeView.MAX_NAME_LENGTH, participant.getName()));
@@ -86,6 +87,7 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#getTitleImage()
*/
+ @Override
public Image getTitleImage() {
if(titleImage == null) {
titleImage = participant.getImageDescriptor().createImage();
@@ -96,6 +98,7 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageCompareEditorInput#handleDispose()
*/
+ @Override
protected void handleDispose() {
if(titleImage != null) {
titleImage.dispose();
@@ -111,9 +114,11 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageCompareEditorInput#createPage(org.eclipse.compare.CompareViewerPane, org.eclipse.jface.action.IToolBarManager)
*/
+ @Override
protected IPage createPage(CompareViewerPane parent,
IToolBarManager toolBarManager) {
listener = new IPropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().equals(ISynchronizePageConfiguration.P_PAGE_DESCRIPTION)) {
updateDescription();
@@ -149,10 +154,12 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageCompareEditorInput#getSelectionProvider()
*/
+ @Override
protected ISelectionProvider getSelectionProvider() {
return ((ISynchronizePage)page).getViewer();
}
+ @Override
protected ICompareInput asCompareInput(ISelection selection) {
ICompareInput compareInput = super.asCompareInput(selection);
if (compareInput != null)
@@ -174,6 +181,7 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageCompareEditorInput#prepareInput(org.eclipse.compare.structuremergeviewer.ICompareInput, org.eclipse.compare.CompareConfiguration, org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected void prepareInput(ICompareInput input,
CompareConfiguration configuration, IProgressMonitor monitor)
throws InvocationTargetException {
@@ -219,6 +227,7 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#isSaveNeeded()
*/
+ @Override
public boolean isSaveNeeded() {
if (participant instanceof ModelSynchronizeParticipant) {
ModelSynchronizeParticipant msp = (ModelSynchronizeParticipant) participant;
@@ -233,6 +242,7 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#saveChanges(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void saveChanges(IProgressMonitor monitor) throws CoreException {
super.saveChanges(monitor);
Object input = ((ISynchronizePage)page).getViewer().getInput();
@@ -268,6 +278,7 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageCompareEditorInput#contentChanged(org.eclipse.compare.IContentChangeNotifier)
*/
+ @Override
public void contentChanged(IContentChangeNotifier source) {
super.contentChanged(source);
try {
@@ -302,6 +313,7 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#createContents(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public Control createContents(Composite parent) {
if (shouldCreateRememberButton()) {
Composite composite = new Composite(parent, SWT.NONE);
@@ -351,6 +363,7 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#okPressed()
*/
+ @Override
public boolean okPressed() {
if (isEditable()) {
// If the CompareConfiguration is editable, then OK is Save and we want to leave the dialog open
@@ -366,6 +379,7 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#cancelPressed()
*/
+ @Override
public void cancelPressed() {
// If the CompareConfiguration is editable, then the CANCEL button is the done button
if (isEditable() && isRememberParticipant())
@@ -376,6 +390,7 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#getOKButtonLabel()
*/
+ @Override
public String getOKButtonLabel() {
if (isEditable())
return TeamUIMessages.ParticipantPageCompareEditorInput_0;
@@ -390,6 +405,7 @@ public class ParticipantPageCompareEditorInput extends PageCompareEditorInput {
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#getCancelButtonLabel()
*/
+ @Override
public String getCancelButtonLabel() {
return TeamUIMessages.ResourceMappingMergeOperation_2;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageDialog.java
index 526a20ba2..db1ea289c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageDialog.java
@@ -29,6 +29,7 @@ import org.eclipse.team.ui.*;
* @deprecated Clients should use {@link ParticipantPageCompareEditorInput}
* and {@link CompareUI#openCompareDialog(org.eclipse.compare.CompareEditorInput)}
*/
+@Deprecated
public class ParticipantPageDialog extends SaveablePartDialog {
private ISynchronizeParticipant participant;
@@ -50,6 +51,7 @@ public class ParticipantPageDialog extends SaveablePartDialog {
/* (non-Javadoc)
* Method declared on Dialog.
*/
+ @Override
protected Control createDialogArea(Composite parent2) {
Composite parent = (Composite) super.createDialogArea(parent2);
if (isOfferToRememberParticipant() && participant != null && ! particantRegisteredWithSynchronizeManager(participant)) {
@@ -63,6 +65,7 @@ public class ParticipantPageDialog extends SaveablePartDialog {
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
*/
+ @Override
protected void buttonPressed(int buttonId) {
if(buttonId == IDialogConstants.OK_ID && isRememberParticipant()) {
rememberParticipant();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java
index 570a3dcdc..43e82cb5b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantPageSaveablePart.java
@@ -40,6 +40,7 @@ import org.eclipse.ui.part.IPageBookViewPage;
* @deprecated Clients should use a subclass of {@link PageCompareEditorInput}
* and {@link CompareUI#openCompareDialog(org.eclipse.compare.CompareEditorInput)}
*/
+@Deprecated
public class ParticipantPageSaveablePart extends PageSaveablePart implements IContentChangeListener {
private ISynchronizeParticipant participant;
@@ -73,6 +74,7 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo
/* (non-Javadoc)
* @see org.eclipse.team.ui.SaveablePartAdapter#dispose()
*/
+ @Override
public void dispose() {
if(titleImage != null) {
titleImage.dispose();
@@ -88,6 +90,7 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#getTitleImage()
*/
+ @Override
public Image getTitleImage() {
if(titleImage == null) {
titleImage = participant.getImageDescriptor().createImage();
@@ -98,6 +101,7 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo
/* (non-Javadoc)
* @see org.eclipse.ui.IWorkbenchPart#getTitle()
*/
+ @Override
public String getTitle() {
return Utils.shortenText(SynchronizeView.MAX_NAME_LENGTH, participant.getName());
}
@@ -105,6 +109,7 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#isDirty()
*/
+ @Override
public boolean isDirty() {
if (participant instanceof ModelSynchronizeParticipant) {
ModelSynchronizeParticipant msp = (ModelSynchronizeParticipant) participant;
@@ -119,6 +124,7 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo
/* (non-Javadoc)
* @see org.eclipse.compare.IContentChangeListener#contentChanged(org.eclipse.compare.IContentChangeNotifier)
*/
+ @Override
public void contentChanged(IContentChangeNotifier source) {
try {
if (source instanceof DiffNode) {
@@ -134,6 +140,7 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public void doSave(IProgressMonitor pm) {
// TODO needs to work for models
super.doSave(pm);
@@ -155,8 +162,10 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageSaveablePart#createPage(org.eclipse.swt.widgets.Composite, org.eclipse.jface.action.ToolBarManager)
*/
+ @Override
protected Control createPage(Composite parent, ToolBarManager toolBarManager) {
listener = new IPropertyChangeListener() {
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().equals(ISynchronizePageConfiguration.P_PAGE_DESCRIPTION)) {
updateDescription();
@@ -190,6 +199,7 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo
/* (non-Javadoc)
* @see org.eclipse.team.ui.PageSaveablePart#getPageSelectionProvider()
*/
+ @Override
protected final ISelectionProvider getSelectionProvider() {
return ((ISynchronizePage)page).getViewer();
}
@@ -211,6 +221,7 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo
private void initializeDiffViewer(Viewer viewer) {
if (viewer instanceof StructuredViewer) {
((StructuredViewer) viewer).addOpenListener(new IOpenListener() {
+ @Override
public void open(OpenEvent event) {
ISelection s = event.getSelection();
final SyncInfoModelElement node = getElement(s);
@@ -231,6 +242,7 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo
* {@inheritDoc}
* @since 3.2
*/
+ @Override
protected void prepareInput(final ICompareInput input, CompareConfiguration configuration, IProgressMonitor monitor) throws InvocationTargetException {
monitor.beginTask(TeamUIMessages.SyncInfoCompareInput_3, 100);
monitor.setTaskName(TeamUIMessages.SyncInfoCompareInput_3);
@@ -316,6 +328,7 @@ public class ParticipantPageSaveablePart extends PageSaveablePart implements ICo
* {@inheritDoc}
* @since 3.2
*/
+ @Override
protected ICompareInput getCompareInput(ISelection selection) {
ICompareInput compareInput = super.getCompareInput(selection);
if (compareInput != null)
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantSynchronizeWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantSynchronizeWizard.java
index b6f7eb10a..5b119fcbf 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantSynchronizeWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ParticipantSynchronizeWizard.java
@@ -39,6 +39,7 @@ public abstract class ParticipantSynchronizeWizard extends Wizard {
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#getWindowTitle()
*/
+ @Override
public String getWindowTitle() {
return TeamUIMessages.GlobalRefreshSubscriberPage_0;
}
@@ -46,6 +47,7 @@ public abstract class ParticipantSynchronizeWizard extends Wizard {
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#addPages()
*/
+ @Override
public void addPages() {
if (getRootResources().length == 0) {
importWizard = getImportWizard();
@@ -69,6 +71,7 @@ public abstract class ParticipantSynchronizeWizard extends Wizard {
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizard#performFinish()
*/
+ @Override
public boolean performFinish() {
if (importWizard != null) {
return importWizard.performFinish();
@@ -81,6 +84,7 @@ public abstract class ParticipantSynchronizeWizard extends Wizard {
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
*/
+ @Override
public IWizardPage getNextPage(IWizardPage page) {
if(importWizard != null ) {
return importWizard.getNextPage(page);
@@ -91,6 +95,7 @@ public abstract class ParticipantSynchronizeWizard extends Wizard {
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#performCancel()
*/
+ @Override
public boolean performCancel() {
if(importWizard != null) {
return importWizard.performCancel();
@@ -101,6 +106,7 @@ public abstract class ParticipantSynchronizeWizard extends Wizard {
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#canFinish()
*/
+ @Override
public boolean canFinish() {
if(importWizard != null) {
return importWizard.canFinish();
@@ -111,6 +117,7 @@ public abstract class ParticipantSynchronizeWizard extends Wizard {
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#getStartingPage()
*/
+ @Override
public IWizardPage getStartingPage() {
if(importWizard != null) {
return importWizard.getStartingPage();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ResourceScope.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ResourceScope.java
index 06d4137c5..25d9de7c3 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ResourceScope.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ResourceScope.java
@@ -70,6 +70,7 @@ public class ResourceScope extends AbstractSynchronizeScope {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ScopableSubscriberParticipant.ISynchronizeScope#getName()
*/
+ @Override
public String getName() {
return Utils.convertSelection(resources);
}
@@ -77,6 +78,7 @@ public class ResourceScope extends AbstractSynchronizeScope {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ScopableSubscriberParticipant.ISynchronizeScope#getRoots()
*/
+ @Override
public IResource[] getRoots() {
return resources;
}
@@ -84,6 +86,7 @@ public class ResourceScope extends AbstractSynchronizeScope {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ScopableSubscriberParticipant.ISynchronizeScope#dispose()
*/
+ @Override
public void dispose() {
// Nothing to dispose
}
@@ -91,6 +94,7 @@ public class ResourceScope extends AbstractSynchronizeScope {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ScopableSubscriberParticipant.ISynchronizeScope#saveState(org.eclipse.ui.IMemento)
*/
+ @Override
public void saveState(IMemento memento) {
if (resources != null) {
for (int i = 0; i < resources.length; i++) {
@@ -104,6 +108,7 @@ public class ResourceScope extends AbstractSynchronizeScope {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.AbstractSynchronizeScope#init(org.eclipse.ui.IMemento)
*/
+ @Override
protected void init(IMemento memento) {
IMemento[] rootNodes = memento.getChildren(CTX_ROOT);
if(rootNodes != null) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java
index a1c689d00..e7fdca5dd 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SaveableCompareEditorInput.java
@@ -95,14 +95,17 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
}
}
}
+ @Override
protected void fireInputChange() {
SaveableCompareEditorInput.this.fireInputChange();
}
+ @Override
public void dispose() {
super.dispose();
if (lrte != null)
lrte.setSharedDocumentListener(null);
}
+ @Override
public void handleDocumentConnected() {
if (connected)
return;
@@ -128,15 +131,19 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
new SaveablesLifecycleEvent(part, SaveablesLifecycleEvent.POST_OPEN, new Saveable[] { this }, false));
}
}
+ @Override
public void handleDocumentDeleted() {
// Ignore
}
+ @Override
public void handleDocumentDisconnected() {
// Ignore
}
+ @Override
public void handleDocumentFlushed() {
// Ignore
}
+ @Override
public void handleDocumentSaved() {
// Ignore
}
@@ -161,6 +168,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#contentsCreated()
*/
+ @Override
protected void contentsCreated() {
super.contentsCreated();
if (Policy.DEBUG_COMPARE_EDITOR_INPUT) {
@@ -168,6 +176,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
logStackTrace();
}
compareInputChangeListener = new ICompareInputChangeListener() {
+ @Override
public void compareInputChanged(ICompareInput source) {
if (source == getCompareResult()) {
boolean closed = false;
@@ -188,6 +197,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
if (getSaveable() instanceof SaveableComparison) {
SaveableComparison scm = (SaveableComparison) saveable;
propertyListener = new IPropertyListener() {
+ @Override
public void propertyChanged(Object source, int propId) {
if (propId == SaveableComparison.PROP_DIRTY) {
setDirty(saveable.isDirty());
@@ -210,6 +220,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#handleDispose()
*/
+ @Override
protected void handleDispose() {
if (Policy.DEBUG_COMPARE_EDITOR_INPUT) {
logTrace("handleDispose()"); //$NON-NLS-1$
@@ -260,6 +271,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
* method which subclasses must implement.
* @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);
@@ -312,6 +324,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
return false;
Runnable runnable = new Runnable() {
+ @Override
public void run() {
Shell shell= page.getWorkbenchWindow().getShell();
if (shell == null)
@@ -346,9 +359,11 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
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((ICompareInput)SaveableCompareEditorInput.this.getCompareResult());
}
+ @Override
public void handleException(Throwable exception) {
// Logged by the safe runner
}
@@ -386,6 +401,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablesSource#getActiveSaveables()
*/
+ @Override
public Saveable[] getActiveSaveables() {
if (getCompareResult() == null)
return new Saveable[0];
@@ -395,6 +411,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
/* (non-Javadoc)
* @see org.eclipse.ui.ISaveablesSource#getSaveables()
*/
+ @Override
public Saveable[] getSaveables() {
return getActiveSaveables();
}
@@ -402,6 +419,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#addCompareInputChangeListener(org.eclipse.compare.structuremergeviewer.ICompareInput, org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener)
*/
+ @Override
public void addCompareInputChangeListener(ICompareInput input,
ICompareInputChangeListener listener) {
if (input == getCompareResult()) {
@@ -414,6 +432,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#removeCompareInputChangeListener(org.eclipse.compare.structuremergeviewer.ICompareInput, org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener)
*/
+ @Override
public void removeCompareInputChangeListener(ICompareInput input,
ICompareInputChangeListener listener) {
if (input == getCompareResult()) {
@@ -426,6 +445,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#getAdapter(java.lang.Class)
*/
+ @Override
public Object getAdapter(Class adapter) {
if (IFile.class.equals(adapter)) {
IResource resource = Utils.getResource(getCompareResult());
@@ -440,6 +460,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#getTitleImage()
*/
+ @Override
public Image getTitleImage() {
ImageRegistry reg = TeamUIPlugin.getPlugin().getImageRegistry();
Image image = reg.get(ITeamUIImages.IMG_SYNC_VIEW);
@@ -454,6 +475,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
* (non-Javadoc)
* @see org.eclipse.ui.IEditorInput#getImageDescriptor()
*/
+ @Override
public ImageDescriptor getImageDescriptor() {
return TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_SYNC_VIEW);
}
@@ -461,6 +483,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#findContentViewer(org.eclipse.jface.viewers.Viewer, org.eclipse.compare.structuremergeviewer.ICompareInput, org.eclipse.swt.widgets.Composite)
*/
+ @Override
public Viewer findContentViewer(Viewer oldViewer, ICompareInput input, Composite parent) {
Viewer newViewer = super.findContentViewer(oldViewer, input, parent);
boolean isNewViewer= newViewer != oldViewer;
@@ -472,6 +495,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
Control c= newViewer.getControl();
c.addDisposeListener(
new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
dsp.removePropertyChangeListener(pcl);
}
@@ -484,16 +508,19 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#canRunAsJob()
*/
+ @Override
public boolean canRunAsJob() {
return true;
}
+ @Override
public boolean isDirty() {
if (saveable != null)
return saveable.isDirty();
return super.isDirty();
}
+ @Override
public void registerContextMenu(final MenuManager menu,
final ISelectionProvider selectionProvider) {
super.registerContextMenu(menu, selectionProvider);
@@ -501,6 +528,7 @@ public abstract class SaveableCompareEditorInput extends CompareEditorInput impl
if (saveable instanceof LocalResourceSaveableComparison) {
final ITypedElement element= getFileElement(getCompareInput(), this);
menu.addMenuListener(new IMenuListener() {
+ @Override
public void menuAboutToShow(IMenuManager manager) {
SaveablesCompareEditorInput.handleMenuAboutToShow(manager, getContainer(), saveable, element, selectionProvider);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java
index 5e308799d..bcc2b0cd7 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java
@@ -87,18 +87,22 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
private IRefreshable createRefreshable() {
return new IRefreshable() {
+ @Override
public RefreshParticipantJob createJob(String interval) {
return new RefreshSubscriberParticipantJob(SubscriberParticipant.this,
TeamUIMessages.RefreshSchedule_14,
NLS.bind(TeamUIMessages.RefreshSchedule_15, new String[] { SubscriberParticipant.this.getName(), interval }), getResources(),
new RefreshUserNotificationPolicy(SubscriberParticipant.this));
}
+ @Override
public ISynchronizeParticipant getParticipant() {
return SubscriberParticipant.this;
}
+ @Override
public void setRefreshSchedule(SubscriberRefreshSchedule schedule) {
SubscriberParticipant.this.setRefreshSchedule(schedule);
}
+ @Override
public SubscriberRefreshSchedule getRefreshSchedule() {
return SubscriberParticipant.this.getRefreshSchedule();
}
@@ -121,6 +125,7 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
/* (non-Javadoc)
* @see org.eclipse.team.ui.sync.ISynchronizeViewPage#createPage(org.eclipse.team.ui.sync.ISynchronizeView)
*/
+ @Override
public final IPageBookViewPage createPage(ISynchronizePageConfiguration configuration) {
validateConfiguration(configuration);
return new SubscriberParticipantPage(configuration, getSubscriberSyncInfoCollector());
@@ -200,6 +205,7 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
/* (non-Javadoc)
* @see org.eclipse.team.ui.sync.AbstractSynchronizeViewPage#dispose()
*/
+ @Override
public void dispose() {
Job.getJobManager().cancel(this);
refreshSchedule.dispose();
@@ -211,6 +217,7 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#getName()
*/
+ @Override
public String getName() {
String name = super.getName();
return NLS.bind(TeamUIMessages.SubscriberParticipant_namePattern, new String[] { name, scope.getName() });
@@ -282,6 +289,7 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
/* (non-Javadoc)
* @see IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty().equals(TeamUI.GLOBAL_IGNORES_CHANGED)) {
collector.reset();
@@ -299,6 +307,7 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#init(org.eclipse.ui.IMemento)
*/
+ @Override
public void init(String secondaryId, IMemento memento) throws PartInitException {
super.init(secondaryId, memento);
if(memento != null) {
@@ -315,6 +324,7 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#saveState(org.eclipse.ui.IMemento)
*/
+ @Override
public void saveState(IMemento memento) {
super.saveState(memento);
IMemento settings = memento.createChild(CTX_SUBSCRIBER_PARTICIPANT_SETTINGS);
@@ -369,6 +379,7 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#initializeConfiguration(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
*/
+ @Override
protected void initializeConfiguration(ISynchronizePageConfiguration configuration) {
configuration.setProperty(SynchronizePageConfiguration.P_PARTICIPANT_SYNC_INFO_SET, collector.getSyncInfoSet());
}
@@ -376,6 +387,7 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#run(org.eclipse.ui.IWorkbenchPart)
*/
+ @Override
public void run(IWorkbenchPart part) {
refresh(getResources(), null, null, part != null ? part.getSite() : null);
}
@@ -399,6 +411,7 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
* @return the long task name
* @deprecated use <code>getLongTaskName(IResource[]) instead</code>
*/
+ @Deprecated
protected String getLongTaskName() {
return TeamUIMessages.Participant_synchronizing;
}
@@ -521,6 +534,7 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
/* (non-Javadoc)
* @see org.eclipse.core.runtime.PlatformObject#getAdapter(java.lang.Class)
*/
+ @Override
public Object getAdapter(Class adapter) {
if (adapter == IRefreshable.class && refreshSchedule != null) {
return refreshSchedule.getRefreshable();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipantWizard.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipantWizard.java
index bda9d726b..fb4a98a5b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipantWizard.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipantWizard.java
@@ -29,6 +29,7 @@ public abstract class SubscriberParticipantWizard extends ParticipantSynchronize
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#createScopeSelectionPage()
*/
+ @Override
protected final WizardPage createScopeSelectionPage() {
selectionPage = new GlobalRefreshResourceSelectionPage(getRootResources());
return selectionPage;
@@ -37,6 +38,7 @@ public abstract class SubscriberParticipantWizard extends ParticipantSynchronize
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ParticipantSynchronizeWizard#createParticipant()
*/
+ @Override
protected final void createParticipant() {
IResource[] resources = selectionPage.getRootResources();
if (resources != null && resources.length > 0) {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberTeamStateProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberTeamStateProvider.java
index 73871e337..3e4748f8b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberTeamStateProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberTeamStateProvider.java
@@ -50,6 +50,7 @@ public class SubscriberTeamStateProvider extends TeamStateProvider implements IS
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.DecoratedStateProvider#isDecorated(java.lang.Object)
*/
+ @Override
public boolean hasDecoratedState(Object element) throws CoreException {
ResourceMapping mapping = Utils.getResourceMapping(element);
if (mapping != null) {
@@ -116,6 +117,7 @@ public class SubscriberTeamStateProvider extends TeamStateProvider implements IS
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.ITeamStateProvider#getStateDescription(java.lang.Object, int, java.lang.String[], org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
public ITeamStateDescription getStateDescription(Object element, int stateMask,
String[] properties, IProgressMonitor monitor) throws CoreException {
monitor = Policy.monitorFor(monitor);
@@ -127,6 +129,7 @@ public class SubscriberTeamStateProvider extends TeamStateProvider implements IS
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.ITeamStateProvider#getResourceMappingContext(java.lang.Object)
*/
+ @Override
public ResourceMappingContext getResourceMappingContext(Object element) {
return new SubscriberResourceMappingContext(subscriber, false);
}
@@ -152,6 +155,7 @@ public class SubscriberTeamStateProvider extends TeamStateProvider implements IS
/* (non-Javadoc)
* @see org.eclipse.team.core.subscribers.ISubscriberChangeListener#subscriberResourceChanged(org.eclipse.team.core.subscribers.ISubscriberChangeEvent[])
*/
+ @Override
public void subscriberResourceChanged(ISubscriberChangeEvent[] deltas) {
fireStateChangeEvent(new TeamStateChangeEvent(deltas));
}
@@ -159,6 +163,7 @@ public class SubscriberTeamStateProvider extends TeamStateProvider implements IS
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.ITeamStateProvider#getDecoratedProperties(java.lang.Object)
*/
+ @Override
public String[] getDecoratedProperties(Object element) {
return new String[0];
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SyncInfoCompareInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SyncInfoCompareInput.java
index 5dcd7ec96..70bd4276c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SyncInfoCompareInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SyncInfoCompareInput.java
@@ -61,6 +61,7 @@ public final class SyncInfoCompareInput extends SaveableCompareEditorInput imple
public MyDiffNode(IDiffContainer parent, SyncInfo info) {
super(parent, info);
}
+ @Override
public void fireChange() {
super.fireChange();
}
@@ -107,12 +108,14 @@ public final class SyncInfoCompareInput extends SaveableCompareEditorInput imple
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#handleDispose()
*/
- protected void handleDispose() {
+ @Override
+ protected void handleDispose() {
super.handleDispose();
if (synchronizeConfiguration != null) {
ICompareNavigator navigator = (ICompareNavigator)synchronizeConfiguration.getProperty(SynchronizePageConfiguration.P_INPUT_NAVIGATOR);
if (navigator != null && navigator == super.getNavigator()) {
synchronizeConfiguration.setProperty(SynchronizePageConfiguration.P_INPUT_NAVIGATOR, new CompareNavigator() {
+ @Override
protected INavigatable[] getNavigatables() {
return new INavigatable[0];
}
@@ -123,6 +126,7 @@ public final class SyncInfoCompareInput extends SaveableCompareEditorInput imple
/* (non-Javadoc)
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @Override
public Object getAdapter(Class adapter) {
if (IFile.class.equals(adapter) && resource.getType() == IResource.FILE) {
return resource;
@@ -140,12 +144,14 @@ public final class SyncInfoCompareInput extends SaveableCompareEditorInput imple
* Note that until the compare editor inputs can be part of the compare editors lifecycle we
* can't register as a listener because there is no dispose() method to remove the listener.
*/
+ @Override
public void resourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
if (delta != null) {
IResourceDelta resourceDelta = delta.findMember(resource.getFullPath());
if (resourceDelta != null) {
UIJob job = new UIJob("") { //$NON-NLS-1$
+ @Override
public IStatus runInUIThread(IProgressMonitor monitor) {
if (!isSaveNeeded()) {
//updateNode();
@@ -162,6 +168,7 @@ public final class SyncInfoCompareInput extends SaveableCompareEditorInput imple
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SaveableCompareEditorInput#internalPrepareInput(org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected ICompareInput prepareCompareInput(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
// update the title now that the remote revision number as been fetched
@@ -188,6 +195,7 @@ public final class SyncInfoCompareInput extends SaveableCompareEditorInput imple
* (non-Javadoc)
* @see org.eclipse.ui.IEditorInput#getToolTipText()
*/
+ @Override
public String getToolTipText() {
return NLS.bind(TeamUIMessages.SyncInfoCompareInput_tooltip, new String[] { Utils.shortenText(30, description), node.getResource().getFullPath().toString() });
}
@@ -196,6 +204,7 @@ public final class SyncInfoCompareInput extends SaveableCompareEditorInput imple
* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object other) {
if (other == this)
return true;
@@ -215,6 +224,7 @@ public final class SyncInfoCompareInput extends SaveableCompareEditorInput imple
*
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode() {
return getSyncInfo().hashCode();
}
@@ -226,6 +236,7 @@ public final class SyncInfoCompareInput extends SaveableCompareEditorInput imple
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#canRunInBackground()
*/
+ @Override
public boolean canRunAsJob() {
return true;
}
@@ -233,6 +244,7 @@ public final class SyncInfoCompareInput extends SaveableCompareEditorInput imple
/* (non-Javadoc)
* @see org.eclipse.compare.CompareEditorInput#getNavigator()
*/
+ @Override
public synchronized ICompareNavigator getNavigator() {
if (synchronizeConfiguration != null && isSelectedInSynchronizeView()) {
ICompareNavigator nav = (ICompareNavigator)synchronizeConfiguration.getProperty(SynchronizePageConfiguration.P_NAVIGATOR);
@@ -260,6 +272,7 @@ public final class SyncInfoCompareInput extends SaveableCompareEditorInput imple
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SaveableCompareEditorInput#fireInputChange()
*/
+ @Override
protected void fireInputChange() {
node.fireChange();
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java
index 23ff5e1cb..e8ade4c6d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelAction.java
@@ -77,6 +77,7 @@ public abstract class SynchronizeModelAction extends BaseSelectionListenerAction
protected void initialize(final ISynchronizePageConfiguration configuration, final ISelectionProvider selectionProvider) {
selectionProvider.addSelectionChangedListener(this);
configuration.getPage().getViewer().getControl().addDisposeListener(new DisposeListener() {
+ @Override
public void widgetDisposed(DisposeEvent e) {
selectionProvider.removeSelectionChangedListener(SynchronizeModelAction.this);
}
@@ -86,6 +87,7 @@ public abstract class SynchronizeModelAction extends BaseSelectionListenerAction
/* (non-Javadoc)
* @see org.eclipse.jface.action.Action#run()
*/
+ @Override
public void run() {
if(needsToSaveDirtyEditors()) {
if(!saveAllEditors(confirmSaveOfDirtyEditor())) {
@@ -162,6 +164,7 @@ public abstract class SynchronizeModelAction extends BaseSelectionListenerAction
/* (non-Javadoc)
* @see org.eclipse.ui.actions.BaseSelectionListenerAction#updateSelection(org.eclipse.jface.viewers.IStructuredSelection)
*/
+ @Override
protected boolean updateSelection(IStructuredSelection selection) {
super.updateSelection(selection);
return isEnabledForSelection(selection);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelOperation.java
index c00a0c783..10bcc0616 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelOperation.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizeModelOperation.java
@@ -86,6 +86,7 @@ public abstract class SynchronizeModelOperation extends TeamOperation {
/* (non-Javadoc)
* @see org.eclipse.core.runtime.jobs.JobChangeAdapter#scheduled(org.eclipse.core.runtime.jobs.IJobChangeEvent)
*/
+ @Override
public void scheduled(IJobChangeEvent event) {
super.scheduled(event);
markBusy(elements, true);
@@ -94,6 +95,7 @@ public abstract class SynchronizeModelOperation extends TeamOperation {
/* (non-Javadoc)
* @see org.eclipse.core.runtime.jobs.JobChangeAdapter#done(org.eclipse.core.runtime.jobs.IJobChangeEvent)
*/
+ @Override
public void done(IJobChangeEvent event) {
markBusy(elements, false);
super.done(event);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizePageActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizePageActionGroup.java
index 2f296e21d..a2d8b7f93 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizePageActionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SynchronizePageActionGroup.java
@@ -81,6 +81,7 @@ public abstract class SynchronizePageActionGroup extends ActionGroup {
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#modelChanged(org.eclipse.team.ui.synchronize.ISynchronizeModelElement)
*/
+ @Override
public void modelChanged(ISynchronizeModelElement root) {
if (root == null) {
setSelection(StructuredSelection.EMPTY);
@@ -92,6 +93,7 @@ public abstract class SynchronizePageActionGroup extends ActionGroup {
/* (non-Javadoc)
* Method declared on ISelectionProvider.
*/
+ @Override
public void addSelectionChangedListener(ISelectionChangedListener listener) {
selectionChangedListeners.add(listener);
}
@@ -99,6 +101,7 @@ public abstract class SynchronizePageActionGroup extends ActionGroup {
/* (non-Javadoc)
* Method declared on ISelectionProvider.
*/
+ @Override
public void removeSelectionChangedListener(ISelectionChangedListener listener) {
selectionChangedListeners.remove(listener);
}
@@ -106,6 +109,7 @@ public abstract class SynchronizePageActionGroup extends ActionGroup {
/* (non-Javadoc)
* Method declared on ISelectionProvider.
*/
+ @Override
public ISelection getSelection() {
return selection;
}
@@ -113,6 +117,7 @@ public abstract class SynchronizePageActionGroup extends ActionGroup {
/* (non-Javadoc)
* Method declared on ISelectionProvider.
*/
+ @Override
public void setSelection(ISelection selection) {
this.selection = selection;
selectionChanged(new SelectionChangedEvent(this, getSelection()));
@@ -124,6 +129,7 @@ public abstract class SynchronizePageActionGroup extends ActionGroup {
for (int i = 0; i < listeners.length; ++i) {
final ISelectionChangedListener l = (ISelectionChangedListener)listeners[i];
SafeRunner.run(new SafeRunnable() {
+ @Override
public void run() {
l.selectionChanged(event);
}
@@ -166,6 +172,7 @@ public abstract class SynchronizePageActionGroup extends ActionGroup {
* Dispose of the action group. Subclasses may override but must
* invoke the overridden method.
*/
+ @Override
public void dispose() {
super.dispose();
if (configuration != null) {
@@ -318,6 +325,7 @@ public abstract class SynchronizePageActionGroup extends ActionGroup {
/* (non-Javadoc)
* @see org.eclipse.ui.actions.ActionGroup#fillContextMenu(org.eclipse.jface.action.IMenuManager)
*/
+ @Override
public void fillContextMenu(IMenuManager menu) {
super.fillContextMenu(menu);
fillMenu(menu, ISynchronizePageConfiguration.P_CONTEXT_MENU);
@@ -326,6 +334,7 @@ public abstract class SynchronizePageActionGroup extends ActionGroup {
/* (non-Javadoc)
* @see org.eclipse.ui.actions.ActionGroup#fillActionBars(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/ui/synchronize/TeamStateChangeEvent.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateChangeEvent.java
index 8e68cdd48..f7f2cbc71 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateChangeEvent.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateChangeEvent.java
@@ -83,6 +83,7 @@ public class TeamStateChangeEvent implements ITeamStateChangeEvent {
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.IDecoratedStateChangeEvent#getAddedRoots()
*/
+ @Override
public IResource[] getAddedRoots() {
return (IResource[]) addedRoots.toArray(new IResource[addedRoots.size()]);
}
@@ -90,6 +91,7 @@ public class TeamStateChangeEvent implements ITeamStateChangeEvent {
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.IDecoratedStateChangeEvent#getRemovedRoots()
*/
+ @Override
public IResource[] getRemovedRoots() {
return (IResource[]) removedRoots.toArray(new IResource[removedRoots.size()]);
}
@@ -97,6 +99,7 @@ public class TeamStateChangeEvent implements ITeamStateChangeEvent {
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.IDecoratedStateChangeEvent#getChangedResources()
*/
+ @Override
public IResource[] getChangedResources() {
return (IResource[]) changes.toArray(new IResource[changes.size()]);
}
@@ -104,6 +107,7 @@ public class TeamStateChangeEvent implements ITeamStateChangeEvent {
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.IDecoratedStateChangeEvent#hasChange(org.eclipse.core.resources.IResource)
*/
+ @Override
public boolean hasChange(IResource resource) {
if (changes.contains(resource))
return true;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateDescription.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateDescription.java
index 4a4f41c6f..ecdbaa480 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateDescription.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateDescription.java
@@ -39,6 +39,7 @@ public class TeamStateDescription implements ITeamStateDescription {
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.IDecoratedStateDescription#getStateFlags()
*/
+ @Override
public int getStateFlags() {
return state;
}
@@ -46,6 +47,7 @@ public class TeamStateDescription implements ITeamStateDescription {
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.IDecoratedStateDescription#getKind()
*/
+ @Override
public int getKind() {
return getStateFlags() & Diff.KIND_MASK;
}
@@ -53,6 +55,7 @@ public class TeamStateDescription implements ITeamStateDescription {
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.IDecoratedStateDescription#getDirection()
*/
+ @Override
public int getDirection() {
return getStateFlags() & IThreeWayDiff.DIRECTION_MASK;
}
@@ -60,6 +63,7 @@ public class TeamStateDescription implements ITeamStateDescription {
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.ITeamStateDescription#getProperties()
*/
+ @Override
public String[] getPropertyNames() {
return (String[]) properties.keySet().toArray(new String[properties.size()]);
}
@@ -67,6 +71,7 @@ public class TeamStateDescription implements ITeamStateDescription {
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.ITeamStateDescription#getProperty(java.lang.String)
*/
+ @Override
public Object getProperty(String property) {
return properties.get(property);
}
@@ -83,6 +88,7 @@ public class TeamStateDescription implements ITeamStateDescription {
/* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj) {
if (obj instanceof TeamStateDescription) {
TeamStateDescription dsd = (TeamStateDescription) obj;
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateProvider.java
index da3f93114..e90c45d6e 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamStateProvider.java
@@ -48,6 +48,7 @@ public abstract class TeamStateProvider implements ITeamStateProvider {
*
* @see org.eclipse.team.ui.mapping.ITeamStateProvider#isDecorationEnabled(java.lang.Object)
*/
+ @Override
public boolean isDecorationEnabled(Object element) {
ResourceMapping mapping = Utils.getResourceMapping(element);
if (mapping != null) {
@@ -65,6 +66,7 @@ public abstract class TeamStateProvider implements ITeamStateProvider {
*
* @see org.eclipse.team.ui.mapping.ITeamStateProvider#getDecoratedStateMask(java.lang.Object)
*/
+ @Override
public int getDecoratedStateMask(Object element) {
ResourceMapping mapping = Utils.getResourceMapping(element);
if (mapping != null) {
@@ -77,6 +79,7 @@ public abstract class TeamStateProvider implements ITeamStateProvider {
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.ITeamStateProvider#addDecoratedStateChangeListener(org.eclipse.team.ui.mapping.ITeamStateChangeListener)
*/
+ @Override
public void addDecoratedStateChangeListener(ITeamStateChangeListener listener) {
listeners.add(listener);
}
@@ -84,6 +87,7 @@ public abstract class TeamStateProvider implements ITeamStateProvider {
/* (non-Javadoc)
* @see org.eclipse.team.ui.mapping.ITeamStateProvider#removeDecoratedStateChangeListener(org.eclipse.team.ui.mapping.ITeamStateChangeListener)
*/
+ @Override
public void removeDecoratedStateChangeListener(ITeamStateChangeListener listener) {
listeners.remove(listener);
}
@@ -97,9 +101,11 @@ public abstract class TeamStateProvider implements ITeamStateProvider {
for (int i = 0; i < allListeners.length; i++) {
final ITeamStateChangeListener listener = (ITeamStateChangeListener)allListeners[i];
SafeRunner.run(new ISafeRunnable() {
+ @Override
public void run() throws Exception {
listener.teamStateChanged(event);
}
+ @Override
public void handleException(Throwable exception) {
// Logged by the runner
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkingSetScope.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkingSetScope.java
index 8ad7f0e8d..6c09fbd72 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkingSetScope.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkingSetScope.java
@@ -70,6 +70,7 @@ public class WorkingSetScope extends AbstractSynchronizeScope implements IProper
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeScope#getName()
*/
+ @Override
public String getName() {
if (sets.length == 0) {
return TeamUIMessages.WorkingSetScope_0;
@@ -88,6 +89,7 @@ public class WorkingSetScope extends AbstractSynchronizeScope implements IProper
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeScope#getRoots()
*/
+ @Override
public IResource[] getRoots() {
if (sets.length == 0) {
return null;
@@ -131,6 +133,7 @@ public class WorkingSetScope extends AbstractSynchronizeScope implements IProper
/* (non-Javadoc)
* @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent event) {
if (event.getProperty() == IWorkingSetManager.CHANGE_WORKING_SET_CONTENT_CHANGE) {
IWorkingSet newSet = (IWorkingSet) event.getNewValue();
@@ -149,6 +152,7 @@ public class WorkingSetScope extends AbstractSynchronizeScope implements IProper
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeScope#dispose()
*/
+ @Override
public void dispose() {
super.dispose();
if (PlatformUI.isWorkbenchRunning())
@@ -158,6 +162,7 @@ public class WorkingSetScope extends AbstractSynchronizeScope implements IProper
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.AbstractSynchronizeScope#saveState(org.eclipse.ui.IMemento)
*/
+ @Override
public void saveState(IMemento memento) {
super.saveState(memento);
for (int i = 0; i < sets.length; i++) {
@@ -171,6 +176,7 @@ public class WorkingSetScope extends AbstractSynchronizeScope implements IProper
* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.AbstractSynchronizeScope#init(org.eclipse.ui.IMemento)
*/
+ @Override
protected void init(IMemento memento) {
super.init(memento);
IMemento[] rootNodes = memento.getChildren(CTX_SETS);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkspaceScope.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkspaceScope.java
index fdfe019be..790ed3d89 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkspaceScope.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/WorkspaceScope.java
@@ -30,6 +30,7 @@ public class WorkspaceScope extends AbstractSynchronizeScope {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ScopableSubscriberParticipant.ISynchronizeScope#getName()
*/
+ @Override
public String getName() {
return TeamUIMessages.WorkspaceScope_0;
}
@@ -37,6 +38,7 @@ public class WorkspaceScope extends AbstractSynchronizeScope {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ui.synchronize.ScopableSubscriberParticipant.ISynchronizeScope#getRoots()
*/
+ @Override
public IResource[] getRoots() {
// Return null which indicates to use the subscriber roots
return null;

Back to the top