diff options
| author | Tomasz Zarna | 2010-02-01 10:56:02 +0000 |
|---|---|---|
| committer | Tomasz Zarna | 2010-02-01 10:56:02 +0000 |
| commit | f7313f478d345fa2a110946a7e334792da66ed1b (patch) | |
| tree | 52c9c20deee6a81e29b0b8dd5a4f9a0fcd131f16 /bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping | |
| parent | 4932d5a6ad19a5f6a0681e7fb7f19d3797503703 (diff) | |
| download | eclipse.platform.team-f7313f478d345fa2a110946a7e334792da66ed1b.tar.gz eclipse.platform.team-f7313f478d345fa2a110946a7e334792da66ed1b.tar.xz eclipse.platform.team-f7313f478d345fa2a110946a7e334792da66ed1b.zip | |
bug 300694: Setting enablement for Mark as Merged and Overwrite actions in ModelCompareEditorInput is copy-pasted
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping')
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java index 54ea848a6..2474bf0c3 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ModelCompareEditorInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2009 IBM Corporation and others. + * Copyright (c) 2006, 2010 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -218,7 +218,7 @@ public class ModelCompareEditorInput extends SaveableCompareEditorInput implemen }; Utils.initAction(mergeAction, "action.merge."); //$NON-NLS-1$ - mergeAction.setEnabled(markAsMergedAction.isEnabled()); + mergeAction.setEnabled(mergeAction.isEnabled()); final ResourceMergeHandler overwriteHandler = new ResourceMergeHandler(getSynchronizeConfiguration(), true); overwriteHandler.updateEnablement(selection); @@ -233,7 +233,7 @@ public class ModelCompareEditorInput extends SaveableCompareEditorInput implemen }; Utils.initAction(overwriteAction, "action.overwrite."); //$NON-NLS-1$ - overwriteAction.setEnabled(markAsMergedAction.isEnabled()); + overwriteAction.setEnabled(overwriteAction.isEnabled()); manager.insertAfter(IWorkbenchActionConstants.MB_ADDITIONS, new Separator("merge")); //$NON-NLS-1$ manager.insertAfter("merge", new Separator("overwrite")); //$NON-NLS-1$ //$NON-NLS-2$ |