Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2018-09-14 04:01:50 -0400
committerOlivier Constant2018-09-14 04:15:45 -0400
commita1b0662b86fd306164cbc61be4cf77ea9dc650ab (patch)
tree0db2ff50d74f6a03b9e4bb8a3dea70d6b34bed2f
parent7b0d16d99b5a230af0e14d2d15766faeb2dc482c (diff)
downloadorg.eclipse.emf.diffmerge.patch-a1b0662b86fd306164cbc61be4cf77ea9dc650ab.tar.gz
org.eclipse.emf.diffmerge.patch-a1b0662b86fd306164cbc61be4cf77ea9dc650ab.tar.xz
org.eclipse.emf.diffmerge.patch-a1b0662b86fd306164cbc61be4cf77ea9dc650ab.zip
Update due to "Merge ComparisonViewer and DirectedComparisonViewer"
Change-Id: I23bd6be9ff0753364cdff3f7b79de6ee933bb392 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
-rw-r--r--plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchEDMWizardPage.java8
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application filter test.test2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application test.test2
-rw-r--r--tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch reverse application test.test2
4 files changed, 9 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchEDMWizardPage.java b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchEDMWizardPage.java
index 87962cc..9e362f9 100644
--- a/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchEDMWizardPage.java
+++ b/plugins/org.eclipse.emf.diffmerge.patch.ui/src/org/eclipse/emf/diffmerge/patch/ui/wizards/pages/ModelpatchEDMWizardPage.java
@@ -12,10 +12,10 @@
package org.eclipse.emf.diffmerge.patch.ui.wizards.pages;
import org.eclipse.compare.CompareEditorInput;
+import org.eclipse.emf.diffmerge.api.Role;
import org.eclipse.emf.diffmerge.patch.ui.utils.ModelpatchApplicationDTO;
import org.eclipse.emf.diffmerge.ui.EMFDiffMergeUIPlugin;
import org.eclipse.emf.diffmerge.ui.viewers.ComparisonViewer;
-import org.eclipse.emf.diffmerge.ui.viewers.DirectedComparisonViewer;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.Viewer;
@@ -55,7 +55,7 @@ public class ModelpatchEDMWizardPage extends WizardPage {
// AbstractComparisonViewer runs into NPE otherwise (and causes WindowBuilder parse error)
if(EMFDiffMergeUIPlugin.getDefault() != null) {
- comp = new DirectedComparisonViewer(container) {
+ comp = new ComparisonViewer(container) {
@Override
protected void setupToolBars() {
super.setupToolBars();
@@ -91,6 +91,10 @@ public class ModelpatchEDMWizardPage extends WizardPage {
public void setVisible(boolean visible) {
if (visible) {
dto.prepareDiffNode();
+ // Represent comparison in a "left to right" fashion
+ Role rightRole = dto.diffNode.getRoleForSide(false);
+ dto.diffNode.setReferenceRole(rightRole);
+ dto.diffNode.setDrivingRole(rightRole);
dto.diffNode.updateDifferenceNumbers();
comp.setInput(dto.diffNode);
}
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application filter test.test b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application filter test.test
index 1086b6d..c9afb48 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application filter test.test
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application filter test.test
@@ -41,7 +41,7 @@ with [get-window "Modelpatch Application"] {
}
get-tree | get-property "getTopItem().getText()" | equals "Cyber Physical System testModel6504822858552 (4)" | verify-true
get-tree | select "Cyber Physical System testModel6504822858552 (4)"
- get-button "Copy to the right" | click
+ get-button "Transfer changes to the right" | click
get-window "Merge Operation" | get-button OK | click
}
get-window "Modelpatch Application" | get-window "Merge Operation" | get-group "Required changes" | get-tree
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application test.test b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application test.test
index dd78c68..c33e76f 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application test.test
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch application test.test
@@ -34,7 +34,7 @@ with [get-window "Modelpatch Application"] {
click
}
get-tree | select "Cyber Physical System testModel6504822858552 (10)"
- get-button "Copy to the right" | click
+ get-button "Transfer changes to the right" | click
get-window "Merge Operation" | get-button OK | click
get-button Finish | click
}
diff --git a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch reverse application test.test b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch reverse application test.test
index 689160e..0ac43ff 100644
--- a/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch reverse application test.test
+++ b/tests/org.eclipse.emf.diffmerge.patch.tests.ui/tests/Modelpatch reverse application test.test
@@ -35,7 +35,7 @@ with [get-window "Modelpatch Application"] {
click
}
get-tree | select "Cyber Physical System testModel6504822858552 (10)"
- get-button "Copy to the right" | click
+ get-button "Transfer changes to the right" | click
get-window "Merge Operation" | get-button OK | click
get-button Finish | click
}

Back to the top