Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikaël Barbero2013-10-13 14:15:39 -0400
committerMikaël Barbero2013-10-18 13:47:53 -0400
commit97801f1d62cbfcacf4cf893436da7564ead0ebe7 (patch)
treed655cf306e32ab4e293ed31db284716bd1b22a56 /plugins/org.eclipse.emf.compare.ide.ui/src
parentfdfd1a68ca828887245e720a953ad8664c2d387b (diff)
downloadorg.eclipse.emf.compare-97801f1d62cbfcacf4cf893436da7564ead0ebe7.tar.gz
org.eclipse.emf.compare-97801f1d62cbfcacf4cf893436da7564ead0ebe7.tar.xz
org.eclipse.emf.compare-97801f1d62cbfcacf4cf893436da7564ead0ebe7.zip
Merge all actions has to be updated on editing domain change
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src')
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareToolBar.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareToolBar.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareToolBar.java
index 9501178ae..7b8b09588 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareToolBar.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareToolBar.java
@@ -34,6 +34,7 @@ import org.eclipse.emf.compare.rcp.EMFCompareRCPPlugin;
import org.eclipse.emf.compare.rcp.ui.EMFCompareRCPUIPlugin;
import org.eclipse.emf.compare.rcp.ui.internal.configuration.ICompareEditingDomainChange;
import org.eclipse.emf.compare.rcp.ui.internal.configuration.IComparisonAndScopeChange;
+import org.eclipse.emf.compare.rcp.ui.internal.configuration.IEMFCompareConfiguration;
import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.actions.FilterActionMenu;
import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.actions.GroupActionMenu;
import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.IDifferenceFilterChange;
@@ -130,7 +131,7 @@ public class CompareToolBar implements ISelectionChangedListener {
toolbarManager.update(true);
}
- private MergeAction createMergeAction(MergeMode mergeMode, EMFCompareConfiguration cc) {
+ private MergeAction createMergeAction(MergeMode mergeMode, IEMFCompareConfiguration cc) {
IMerger.Registry mergerRegistry = EMFCompareRCPPlugin.getDefault().getMergerRegistry();
MergeAction mergeAction = new MergeAction(cc.getEditingDomain(), mergerRegistry, mergeMode, cc
.isLeftEditable(), cc.isRightEditable());
@@ -138,7 +139,7 @@ public class CompareToolBar implements ISelectionChangedListener {
return mergeAction;
}
- private MergeAction createMergeAllNonConflictingAction(MergeMode mergeMode, EMFCompareConfiguration cc) {
+ private MergeAction createMergeAllNonConflictingAction(MergeMode mergeMode, IEMFCompareConfiguration cc) {
IMerger.Registry mergerRegistry = EMFCompareRCPPlugin.getDefault().getMergerRegistry();
MergeAllNonConflictingAction mergeAction = new MergeAllNonConflictingAction(cc.getEditingDomain(), cc
.getComparison(), mergerRegistry, mergeMode, cc.isLeftEditable(), cc.isRightEditable());
@@ -171,6 +172,9 @@ public class CompareToolBar implements ISelectionChangedListener {
for (MergeAction mergeAction : mergeActions) {
mergeAction.setEditingDomain(event.getNewValue());
}
+ for (MergeAction mergeAction : mergeAllNonConflictingActions) {
+ mergeAction.setEditingDomain(event.getNewValue());
+ }
}
@Subscribe

Back to the top