diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java')
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java index a8c685ad8..7f8838521 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/patch/ApplyPatchSynchronizationActionProvider.java @@ -24,12 +24,14 @@ public class ApplyPatchSynchronizationActionProvider extends super(); } + @Override protected void initialize() { super.initialize(); final ISynchronizePageConfiguration configuration = getSynchronizePageConfiguration(); // Use custom handlers, disabled for hunks. registerHandler(MERGE_ACTION_ID, new ResourceMergeHandler( configuration, false) { + @Override public void updateEnablement(IStructuredSelection selection) { super.updateEnablement(selection); // disable merge for hunks @@ -44,6 +46,7 @@ public class ApplyPatchSynchronizationActionProvider extends }); registerHandler(MARK_AS_MERGE_ACTION_ID, new ResourceMarkAsMergedHandler(configuration) { + @Override public void updateEnablement(IStructuredSelection selection) { super.updateEnablement(selection); // disable mark as merged for hunks |