diff options
| author | Axel Richard | 2013-07-24 08:53:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2013-07-24 13:53:09 +0000 |
| commit | db0851ff848bf5be462eb86889b058fbe23222b3 (patch) | |
| tree | 1bbb30dc17509645425929e110381dac9eff9f03 /plugins/org.eclipse.emf.compare.ide.ui/src | |
| parent | ac327e08adec64c7015e8ed6652d5fae85b18535 (diff) | |
| download | org.eclipse.emf.compare-db0851ff848bf5be462eb86889b058fbe23222b3.tar.gz org.eclipse.emf.compare-db0851ff848bf5be462eb86889b058fbe23222b3.tar.xz org.eclipse.emf.compare-db0851ff848bf5be462eb86889b058fbe23222b3.zip | |
[413608] Merge a diff already merged raises an exception
Fix: doesn't allow (disable merge buttons) to merge a diff already
merged.
Bug: 413608
Change-Id: Ia2e691bc0de7b258d3165d9aca2edd1460780def
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/handler/propertytester/DiffSelectedPropertyTester.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/DiffSelectedPropertyTester.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/DiffSelectedPropertyTester.java index 196385c31..609a4bbad 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/DiffSelectedPropertyTester.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/propertytester/DiffSelectedPropertyTester.java @@ -16,6 +16,7 @@ import org.eclipse.core.expressions.PropertyTester; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.compare.Diff; +import org.eclipse.emf.compare.DifferenceState; import org.eclipse.emf.compare.rcp.ui.internal.EMFCompareConstants; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.tree.TreeNode; @@ -52,7 +53,9 @@ public class DiffSelectedPropertyTester extends PropertyTester { if (target instanceof TreeNode) { EObject data = ((TreeNode)target).getData(); if (data instanceof Diff) { - return true; + if (DifferenceState.MERGED != ((Diff)data).getState()) { + return true; + } } } } |