diff options
| author | lgoubet | 2019-07-16 14:50:21 +0000 |
|---|---|---|
| committer | lgoubet | 2019-07-16 14:58:46 +0000 |
| commit | c6921d7e119909e179b5920e97739a3666110b07 (patch) | |
| tree | c0ae63b0c2ca9c8e17e9d987dc543d1187a93a41 | |
| parent | 42be4e873ad5afc43bcf124d49a30a4bbb9152d0 (diff) | |
| download | org.eclipse.emf.compare-c6921d7e119909e179b5920e97739a3666110b07.tar.gz org.eclipse.emf.compare-c6921d7e119909e179b5920e97739a3666110b07.tar.xz org.eclipse.emf.compare-c6921d7e119909e179b5920e97739a3666110b07.zip | |
Regression on the group/match right-click actions in SMW
Commit df841999 allowed "accept" and "reject" actions to be shown on
multiple differences selections... but at the same time prevented all
other actions from showing in the SMV.
Change-Id: I9ec9b2e4e216a8985dd5ee7eb9d11aa22d1f09ab
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java index ffdf465ff..0f3f2a2e3 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java @@ -761,14 +761,14 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap */ private boolean isDiffSelected() { final ISelection selection = getSelection(); - if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() > 1) { + if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() > 0) { for (Object element : ((IStructuredSelection)selection).toList()) { if (!(getDataOfTreeNodeOfAdapter(element) instanceof Diff)) { return false; } } } - return true; + return false; } /** |