Bug 527241 - Improve Release Dialog
* Element/Target is not limited to EClasses (Structural Feature, Enums),
so go up containment hierarchy.
* Fix RCPTT tests
Change-Id: If31fabf8d226374eca1990a2cb36fbd9dcaf612c
Signed-off-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>
diff --git a/plugins/org.eclipse.emf.edapt.history.editor/src/org/eclipse/emf/edapt/history/instantiation/ui/ReleaseHandler.java b/plugins/org.eclipse.emf.edapt.history.editor/src/org/eclipse/emf/edapt/history/instantiation/ui/ReleaseHandler.java
index 2f86abb..591e465 100644
--- a/plugins/org.eclipse.emf.edapt.history.editor/src/org/eclipse/emf/edapt/history/instantiation/ui/ReleaseHandler.java
+++ b/plugins/org.eclipse.emf.edapt.history.editor/src/org/eclipse/emf/edapt/history/instantiation/ui/ReleaseHandler.java
@@ -131,8 +131,15 @@
} else if (ValueChange.class.isInstance(change)) {
target = ValueChange.class.cast(change).getElement();
}
- if (target != null && EPackage.class.isInstance(target.eContainer())) {
- packages.add((EPackage) target.eContainer());
+ if (target != null) {
+ EObject eP = target.eContainer();
+ while (eP != null) {
+ if (EPackage.class.isInstance(eP)) {
+ packages.add((EPackage) eP);
+ break;
+ }
+ eP = eP.eContainer();
+ }
}
if (CompositeChange.class.isInstance(change)) {
final List<Change> childChanges = new ArrayList<Change>(
diff --git a/tests/org.eclipse.emf.edapt.rcptt/operation_browser/Use Operation And Release.test b/tests/org.eclipse.emf.edapt.rcptt/operation_browser/Use Operation And Release.test
index b078b0e..adcbab9 100644
--- a/tests/org.eclipse.emf.edapt.rcptt/operation_browser/Use Operation And Release.test
+++ b/tests/org.eclipse.emf.edapt.rcptt/operation_browser/Use Operation And Release.test
@@ -7,7 +7,7 @@
External-Reference:
Id: _x_NzcAkHEeWg38ag0nnchw
Runtime-Version: 2.2.0.201706152316
-Save-Time: 11/15/17 2:23 PM
+Save-Time: 11/21/17 12:51 PM
Testcase-Type: ecl
------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac
@@ -90,6 +90,7 @@
get-view Properties | get-tree | get-item "Ns URI" | get-property "values['Value']"
| equals "http://eclipse/org/emf/ecp/makeithappen/model/task" | verify-true
get-view "Operation Browser - task.ecore" | get-button Release | click
+get-window "Create Release" | get-button "Whether to update the NS-URI at all." | check
get-window "Create Release" | get-editbox -after [get-label "http://eclipse/org/emf/ecp/makeithappen/model/task"] -index 1 | type-text "task"
with [get-window "Create Release"] {
get-editbox -after [get-label "Update namespace URI of package(s)"] | get-property text
