diff options
| author | Ed Seidewitz | 2015-06-04 19:34:53 +0000 |
|---|---|---|
| committer | Arnaud Cuccuru | 2015-06-09 07:32:13 +0000 |
| commit | bd036f879b9746918692c35be23aff39dd1a11c1 (patch) | |
| tree | 2b106f24c686139e5be2b68fddeb46dbeef903f5 /plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf | |
| parent | e55067610d83065dd56432eb069959e25b997eba (diff) | |
| download | org.eclipse.papyrus-bd036f879b9746918692c35be23aff39dd1a11c1.tar.gz org.eclipse.papyrus-bd036f879b9746918692c35be23aff39dd1a11c1.tar.xz org.eclipse.papyrus-bd036f879b9746918692c35be23aff39dd1a11c1.zip | |
Corrected mapping to a context element
When finding the member from which to update the context element,
accounted for the possiblity that there might be events or literal
specifications at the top level.
Change-Id: I6acfe529965f1fcc3ec06c4b9de3cebf28c316c3
Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com>
Reviewed-on: https://git.eclipse.org/r/49473
Tested-by: Hudson CI
Reviewed-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
Tested-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>
Diffstat (limited to 'plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf')
| -rw-r--r-- | plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/AlfMapper.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/AlfMapper.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/AlfMapper.java index 784262c8bc5..6748aab6b27 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/AlfMapper.java +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/AlfMapper.java @@ -36,6 +36,7 @@ import org.eclipse.m2m.qvt.oml.ModelExtent; import org.eclipse.m2m.qvt.oml.TransformationExecutor; import org.eclipse.m2m.qvt.oml.util.WriterLog; import org.eclipse.uml2.uml.NamedElement; +import org.eclipse.uml2.uml.Namespace; import org.eclipse.uml2.uml.Package; import org.eclipse.uml2.uml.PackageableElement; import org.eclipse.uml2.uml.Profile; @@ -186,7 +187,7 @@ public class AlfMapper { new BasicEList<PackageableElement>(model.getPackagedElements()); for (PackageableElement member : elements) { String name = member.getName(); - if (name != null && (name.length() < 3 || !name.substring(0, 2).equals("$$"))) { + if (member instanceof Namespace && name != null && (name.length() < 3 || !name.substring(0, 2).equals("$$"))) { merge.update(contextElement, member); elements.remove(member); break; |