diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeActionHandler.java')
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeActionHandler.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeActionHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeActionHandler.java index b1b29a55b..e6cfd5def 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeActionHandler.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeActionHandler.java @@ -115,12 +115,15 @@ public abstract class ResourceMergeActionHandler extends MergeActionHandler impl return (ISynchronizationContext)getConfiguration().getProperty(ITeamContentProviderManager.P_SYNCHRONIZATION_CONTEXT); } + @Override public void propertyChanged(IDiffTree tree, int property, IPath[] paths) { // Nothing to do } + @Override public void diffsChanged(IDiffChangeEvent event, IProgressMonitor monitor) { Utils.syncExec(new Runnable() { + @Override public void run() { updateEnablement(getStructuredSelection()); } @@ -128,9 +131,11 @@ public abstract class ResourceMergeActionHandler extends MergeActionHandler impl } + @Override public void propertyChange(PropertyChangeEvent event) { if (event.getProperty() == ISynchronizePageConfiguration.P_MODE) { Utils.syncExec(new Runnable() { + @Override public void run() { updateEnablement(getStructuredSelection()); } |