diff options
| author | Ed Seidewitz | 2015-05-18 05:59:10 +0000 |
|---|---|---|
| committer | Ed Seidewitz | 2015-05-18 05:59:10 +0000 |
| commit | 1f943e0fd4eacdd3178dc754bddf1a528ca620e6 (patch) | |
| tree | 21baa9ce8ab4cfc0add08e1ce73d1ff55a49a339 /plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf | |
| parent | 168c8727295ffe733716ec274aeae94a79c822ae (diff) | |
| download | org.eclipse.papyrus-1f943e0fd4eacdd3178dc754bddf1a528ca620e6.tar.gz org.eclipse.papyrus-1f943e0fd4eacdd3178dc754bddf1a528ca620e6.tar.xz org.eclipse.papyrus-1f943e0fd4eacdd3178dc754bddf1a528ca620e6.zip | |
to handle a classifier behavior subunit.
Change-Id: Ic22033efdd8d91e7e355d3cfb37d1385de1ea82f
Signed-off-by: Ed Seidewitz <ed-s@modeldriven.com>
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/ModelMerge.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/ModelMerge.java b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/ModelMerge.java index 972519d85e8..a5e16eed424 100644 --- a/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/ModelMerge.java +++ b/plugins/uml/alf/org.eclipse.papyrus.uml.alf/src/org/eclipse/papyrus/uml/alf/ModelMerge.java @@ -86,7 +86,8 @@ public class ModelMerge { targetActivity.getNodes().clear(); targetActivity.getEdges().clear(); /*2. Create them from the mapped specification*/ - this.updateCollection(targetActivity.getOwnedNodes(), sourceActivity.getNodes()); + this.updateCollection(targetActivity.getOwnedNodes(), sourceActivity.getOwnedNodes()); + this.updateCollection(targetActivity.getStructuredNodes(), sourceActivity.getStructuredNodes()); this.updateCollection(targetActivity.getEdges(), sourceActivity.getEdges()); } } else if (source instanceof Class && target instanceof Class) { |