From a07c402973c17a0b33cc4eec37daa6cbe4f40820 Mon Sep 17 00:00:00 2001 From: Vincent Lorenzo Date: Fri, 13 Jan 2017 15:56:52 +0100 Subject: Bug 510444 : [Importer Rhapsody] Minor enhancements for QVTo transformation Do the work described in the bug : remove useless cast and set visibility only when != from public Change-Id: I1ac36d280766f3dae548a7fd568c1e018edd0dd0 Signed-off-by: Vincent Lorenzo --- .../transform/Rhapsody2PapyrusSemanticElements.qvto | 11 +++++++++-- .../transform/SysML11BlockDefinitionDiagram.qvto | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'extraplugins') diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/transform/Rhapsody2PapyrusSemanticElements.qvto b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/transform/Rhapsody2PapyrusSemanticElements.qvto index c762f6dc4f3..94d9ebf7cea 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/transform/Rhapsody2PapyrusSemanticElements.qvto +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/transform/Rhapsody2PapyrusSemanticElements.qvto @@ -1023,7 +1023,11 @@ mapping umlrhapsody::IPrimitiveOperation::toOperations(): uml::Operation }; ownedParameter+=return_param; }; - visibility:=getVisibility(self.protection); + var desiredVisibility := getVisibility(self.protection); + if (desiredVisibility != VisibilityKind::public) { //to avoid green + in UML editor + visibility:= desiredVisibility + }; + } @@ -1052,7 +1056,10 @@ mapping umlrhapsody::IAttribute::iAttributeToUMLElement(): uml::Property when {s }else{ type := self.typeOf [IType]->any(true).oclAsType(IType).map iTypeToUMLElement().oclAsType(Type); }; - visibility:=getVisibility(self.protection); + var desiredVisibility := getVisibility(self.protection); + if (desiredVisibility != VisibilityKind::public) { //to avoid green + in UML editor + visibility:= desiredVisibility + }; var lower:String; var upper:String; //a multiplicity has been defined diff --git a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/transform/SysML11BlockDefinitionDiagram.qvto b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/transform/SysML11BlockDefinitionDiagram.qvto index 5ec7772586b..7e616e6890b 100644 --- a/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/transform/SysML11BlockDefinitionDiagram.qvto +++ b/extraplugins/migration/rhapsody/org.eclipse.papyrus.migration.rhapsody/transform/SysML11BlockDefinitionDiagram.qvto @@ -51,8 +51,8 @@ mapping rhapsodymetamodel::IDiagram::iDiagramToSysML11BlockDefinitionDiagram(rpy result:=self.map createAndInitDiagram(rpyProject,getPapyrusDiagramType(), owner, owner); } - children:= self[IDiagram].graphicChart.graphElements[GraphElementsType].map toSysML11BlockDefinitionDiagramShape(); - edges:=self[IDiagram].graphicChart.graphElements[GraphElementsType].map toSysML11BlockDefinitionDiagramEdge(); + children:= self.graphicChart.graphElements.map toSysML11BlockDefinitionDiagramShape(); + edges:=self.graphicChart.graphElements.map toSysML11BlockDefinitionDiagramEdge(); } -- cgit v1.2.3