#254 Fixed exception on deletion of elements.

Cooperate-Project · Mar 15, 2018 · 5076b4e · 5076b4e
1 parent c9c43db
commit 5076b4e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.../modeling/textual/common/issues/CommonUMLReferencingElementMissingElementResolution.xtend b/.../modeling/textual/common/issues/CommonUMLReferencingElementMissingElementResolution.xtend
@@ -6,6 +6,7 @@ import de.cooperateproject.modeling.textual.xtext.runtime.issues.automatedfixing
 import de.cooperateproject.modeling.textual.xtext.runtime.issues.automatedfixing.IResolvableChecker
 import org.eclipse.uml2.uml.Element
 import de.cooperateproject.modeling.textual.common.metamodel.textualCommons.PackageImport
+import org.eclipse.emf.ecore.util.EcoreUtil
 
 class CommonUMLReferencingElementMissingElementResolution extends AutomatedIssueResolutionBase<UMLReferencingElement<Element>> {
 
@@ -27,9 +28,14 @@ class CommonUMLReferencingElementMissingElementResolution extends AutomatedIssue
 		if(!resolvePossible) return Void
 		val commentedElement = element.commentedElement
 		val Element umlCommentedElement = commentedElement.referencedElement
-		val umlComment = umlCommentedElement.nearestPackage.createOwnedComment()
+
+		var umlComment = EcoreUtil.getAllContents(umlCommentedElement.eResource, true).filter(org.eclipse.uml2.uml.Comment).findFirst[c | c.annotatedElements.contains(umlCommentedElement)]
+		if (umlComment === null) {
+			umlComment = umlCommentedElement.nearestPackage.createOwnedComment()
+			umlComment.annotatedElements.add(umlCommentedElement)
+		}
+
 		umlComment.body = element.body
-		umlComment.annotatedElements.add(umlCommentedElement)
 		element.referencedElement = umlComment
 	}
 

diff --git a/...operateproject.modeling.transformation.cls/transforms/Textual_to_Graphical_for_Class.qvto b/...operateproject.modeling.transformation.cls/transforms/Textual_to_Graphical_for_Class.qvto
@@ -25,7 +25,7 @@ mapping cls::ClassDiagram::diagramToDiagram() : notation::Diagram {
     var allConnectors := self.getAllTransitiveConnectors();
     var allPackages := self.getAllTransitivePackages();
 
-    children := self.rootPackage.packages.oclAsType(cls::Package)->map packageToShape();
+    children += self.rootPackage.packages.oclAsType(cls::Package)->map packageToShape();
     children += self.rootPackage.classifiers->map classifierToShape();
     children += allConnectors->selectByKind(cls::Association)->select(memberEnds->size() > 2)->map multiAssociationToShape(); // all nested in root
     children += self.rootPackage.connectors->select(isCommented())->selectByKind(textualCommons::Commentable).comments->map commentToShape();