Bug 520082: [SysML 1.4][diagrams] uniformize the label of diagrams
Actions
-changing architecture model to add a conformed name
Tests
-rcptt test
-executing Eclipse application, checking the names
Change-Id: If1c903071d92c0b3148890a3c1bb6597db152b94
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=520082
Signed-off-by: Francois Le Fevre <francois.le-fevre@cea.fr>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/configuration/blockDefinitionDiagramConfig.expansionmodel b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/configuration/blockDefinitionDiagramConfig.expansionmodel
index e5e1cd0..249a655 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/configuration/blockDefinitionDiagramConfig.expansionmodel
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/configuration/blockDefinitionDiagramConfig.expansionmodel
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<expansionmodel:DiagramExpansion xmlns:expansionmodel="http:///expansionmodel.ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="SysML 1.4 BDD" xmi:id="org.eclipse.papyrus.sysml14.bbd.expansionmodel" xmi:version="2.0">
- <usages diagramType="SysML 1.4 Block Definition" name="SysML 1.4 BDD Context" representations="_rC19oNnoEeSqwOe5_frWm2 _CvN1kFVqEeW77p7V_ZuW3Q _dq31kGdDEeW5JrLha2pcnA" xmi:id="_rC19oNnoEeSqwOe5_frWm1">
+ <usages diagramType="SysML 1.4 Block Definition Diagram" name="SysML 1.4 BDD Context" representations="_rC19oNnoEeSqwOe5_frWm2 _CvN1kFVqEeW77p7V_ZuW3Q _dq31kGdDEeW5JrLha2pcnA" xmi:id="_rC19oNnoEeSqwOe5_frWm1">
<gmftRepresentations editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassEditPart" inducedRepresentations="_rC19oNnoEeSqwOe5_frWm6 _CvPDslVqEeW77p7V_ZuW3Q _rC19oNnoEeSqwOe5_frWm7 _CvPDs1VqEeW77p7V_ZuW3Q _CvPDtFVqEeW77p7V_ZuW3Q _CvPDtVVqEeW77p7V_ZuW3Q _CSMSEGFBEeWbSMDuSXx8SQ _59LCcACiEeabH6-I0dvpUQ" name="Block based on Class representation of class diagram" reusedID="Class_Shape" subRepresentations="_CvN1kVVqEeW77p7V_ZuW3Q _CvOcoVVqEeW77p7V_ZuW3Q _CvOcolVqEeW77p7V_ZuW3Q _CvOco1VqEeW77p7V_ZuW3Q" viewFactory="org.eclipse.papyrus.sysml14.diagram.blockdefinition.internal.factory.BlockClassifierViewFactory" xmi:id="_rC19oNnoEeSqwOe5_frWm2"/>
<gmftRepresentations editPartQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.edit.parts.InterfaceEditPart" inducedRepresentations="_CSMSEGFBEeWbSMDuSXx8SQ" name="FlowSpecification based on Interface representation of class diagram" reusedID="Interface_Shape" subRepresentations="_CvN1kVVqEeW77p7V_ZuW3Q" viewFactory="org.eclipse.papyrus.sysml14.diagram.blockdefinition.internal.factory.FlowSpecificationClassifierViewFactory" xmi:id="_dq31kGdDEeW5JrLha2pcnA"/>
</usages>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/configuration/internaBlockDiagramConfig.expansionmodel b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/configuration/internaBlockDiagramConfig.expansionmodel
index 333fd7d..5eab4c5 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/configuration/internaBlockDiagramConfig.expansionmodel
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/configuration/internaBlockDiagramConfig.expansionmodel
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<expansionmodel:DiagramExpansion xmlns:expansionmodel="http:///expansionmodel.ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="SysML 1.4 IBD" xmi:id="org.eclipse.papyrus.sysml14.ibd.expansionmodel" xmi:version="2.0">
- <usages diagramType="SysML 1.4 Internal Block" name="SysML 1.4 IBD Context" representations="_x0QaAFLcEeWce8tK71CTcg _j7dP0HytEeWustL01XNGSA" xmi:id="_rC19oNnoEeSqwOe5_frWm1">
+ <usages diagramType="SysML 1.4 Internal Block Diagram" name="SysML 1.4 IBD Context" representations="_x0QaAFLcEeWce8tK71CTcg _j7dP0HytEeWustL01XNGSA" xmi:id="_rC19oNnoEeSqwOe5_frWm1">
<gmftRepresentations editPartQualifiedName="org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeEditPart" name="Block based on Class representation of composite diagram" reusedID="Class_Shape" subRepresentations="" viewFactory="org.eclipse.papyrus.sysml14.diagram.internalblock.internal.factory.BlockCompositeViewFactory" xmi:id="_x0QaAFLcEeWce8tK71CTcg"/>
<gmftRepresentations editPartQualifiedName="org.eclipse.papyrus.sysml14.diagram.common.edit.parts.SysMLConnectorEditPart" name="SysmlConnector based on Composite Connector @papyrus.req org.eclipse.papyrus.sysml14.diagram.internalblock#Req_004" reusedID="Connector_Edge" subRepresentations="_EDXlcHzEEeWVMv-LGO6tZw" viewFactory="org.eclipse.papyrus.sysml14.diagram.common.internal.factory.SysMLConnectorViewFactory" xmi:id="_j7dP0HytEeWustL01XNGSA"/>
<gmftRepresentations editPartQualifiedName="org.eclipse.papyrus.sysml14.diagram.common.edit.parts.SysMLConnectorAppliedStereotypeEditPart" name="Applied Stereotype label for a connector @papyrus.req org.eclipse.papyrus.sysml14.diagram.internalblock#Req_004" reusedID="6025" viewFactory="org.eclipse.gmf.runtime.diagram.ui.view.factories.optimal.DecorationNodeViewFactory" xmi:id="_EDXlcHzEEeWVMv-LGO6tZw"/>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/resources/configuration/ParametricDiagramConfig.expansionmodel b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/resources/configuration/ParametricDiagramConfig.expansionmodel
index be18941..3d65f0f 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/resources/configuration/ParametricDiagramConfig.expansionmodel
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/resources/configuration/ParametricDiagramConfig.expansionmodel
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<expansionmodel:DiagramExpansion xmlns:expansionmodel="http:///expansionmodel.ecore" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="SysML 1.4 Parametric" xmi:id="org.eclipse.papyrus.sysml14.parametric.expansionmodel" xmi:version="2.0">
- <usages diagramType="SysML 1.4 Parametric" name="SysML 1.4 Parametric Context" representations="_mUSiYILiEeW6xruev4cRfQ" xmi:id="_rC19oNnoEeSqwOe5_frWm1">
+ <usages diagramType="SysML 1.4 Parametric Diagram" name="SysML 1.4 Parametric Context" representations="_mUSiYILiEeW6xruev4cRfQ" xmi:id="_rC19oNnoEeSqwOe5_frWm1">
<gmftRepresentations editPartQualifiedName="org.eclipse.papyrus.uml.diagram.composite.edit.parts.ClassCompositeEditPart" inducedRepresentations="_U9-hYILjEeW6xruev4cRfQ _ZMHeQPRlEeakH_jG3IBwLw" name="Block based on Class representation of composite diagram" reusedID="Class_Shape" subRepresentations="_Zs7FQPRlEeakH_jG3IBwLw" viewFactory="org.eclipse.papyrus.sysml14.diagram.parametric.internal.factory.BlockCompositeViewFactory" xmi:id="_mUSiYILiEeW6xruev4cRfQ"/>
</usages>
<libraries name="Overload existing compartment of the composite diagram" xmi:id="_T4rGMILjEeW6xruev4cRfQ">
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture b/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture
index 54d6ef4..c60e06c 100644
--- a/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture
+++ b/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture
@@ -56,7 +56,7 @@
<elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14ClassDiagram-extension.elementtypesconfigurations#org.eclipse.papyrus.sysml14di.elementTypeSet.class.extension"/>
<elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14CompositeDiagram-extension.elementtypesconfigurations#org.eclipse.papyrus.sysml14di.elementTypeSet.composite.extension"/>
<elementTypes href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.common/resources/SysMLDiUML.elementtypesconfigurations#org.eclipse.papyrus.sysml14di.elementTypes"/>
- <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="org.eclipse.papyrus.sysml14.diagram.blockdefinition" id="org.eclipse.papyrus.sysml14.diagram.blockdefinition" name="SysML 1.4 Block Definition" description="BDD diagram" icon="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/icons/obj16/Diagram_BlockDefinition.gif" implementationID="PapyrusUMLClassDiagram" customStyle="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/style/blockDefinitionDiagram.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
+ <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="org.eclipse.papyrus.sysml14.diagram.blockdefinition" id="org.eclipse.papyrus.sysml14.diagram.blockdefinition" name="SysML 1.4 Block Definition Diagram" description="BDD diagram" icon="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/icons/obj16/Diagram_BlockDefinition.gif" implementationID="PapyrusUMLClassDiagram" customStyle="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/style/blockDefinitionDiagram.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
<modelRules xmi:id="_ZrBf4ZaBEeS8eNvSwD0lgA">
<element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
</modelRules>
@@ -82,7 +82,7 @@
<paletteRules xmi:id="_05AncA8REeeVg9dxz074Ng" permit="false" element="clazz.group.*"/>
<palettes href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/palette/blockDefinitionDiagram.paletteconfiguration#/"/>
</representationKinds>
- <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="org.eclipse.papyrus.sysml14.diagram.requirement" id="org.eclipse.papyrus.sysml14.diagram.requirement" name="SysML 1.4 Requirement" description="SysML 1.4 Requirement" icon="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.requirement/resources/icons/obj16/Diagram_Requirement.gif" implementationID="PapyrusUMLClassDiagram" customStyle="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.requirement/resources/style/requirementDiagram.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
+ <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="org.eclipse.papyrus.sysml14.diagram.requirement" id="org.eclipse.papyrus.sysml14.diagram.requirement" name="SysML 1.4 Requirement Diagram" description="SysML 1.4 Requirement" icon="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.requirement/resources/icons/obj16/Diagram_Requirement.gif" implementationID="PapyrusUMLClassDiagram" customStyle="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.requirement/resources/style/requirementDiagram.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
<modelRules xmi:id="_SErQIDEtEeWJxc-KaJbwrw">
<element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
<stereotypes href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//requirements/Requirement"/>
@@ -100,7 +100,7 @@
<paletteRules xmi:id="_MISqJw8VEeeVg9dxz074Ng" permit="false" element="clazz.group.*"/>
<palettes href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.requirement/resources/palette/requirementDiagram.paletteconfiguration#/"/>
</representationKinds>
- <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="org.eclipse.papyrus.sysml14.diagram.internalblock" id="org.eclipse.papyrus.sysml14.diagram.internalblock" name="SysML 1.4 Internal Block" description="SysML 1.4 Internal Block" icon="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/icons/obj16/Diagram_InternalBlock.gif" implementationID="CompositeStructure" customStyle="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/style/internalBlockDiagram.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">
+ <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="org.eclipse.papyrus.sysml14.diagram.internalblock" id="org.eclipse.papyrus.sysml14.diagram.internalblock" name="SysML 1.4 Internal Block Diagram" description="SysML 1.4 Internal Block" icon="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/icons/obj16/Diagram_InternalBlock.gif" implementationID="CompositeStructure" customStyle="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/style/internalBlockDiagram.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">
<modelRules xmi:id="_ZrBf4ZaBEeS8eNvSwD0lgA">
<element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
<stereotypes href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//blocks/Block"/>
@@ -126,7 +126,7 @@
<paletteRules xmi:id="_LYpV5w8VEeeVg9dxz074Ng" permit="false" element="composite.group.*"/>
<palettes href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/palette/internalBlockDiagram.paletteconfiguration#/"/>
</representationKinds>
- <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="org.eclipse.papyrus.sysml14.diagram.parametric" id="org.eclipse.papyrus.sysml14.diagram.parametric" name="SysML 1.4 Parametric" description="SysML 1.4 Parametric diagram" icon="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.parametric/resources/icons/obj16/Diagram_Parametric.png" implementationID="CompositeStructure" customStyle="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.parametric/resources/style/parametricDiagram.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">
+ <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="org.eclipse.papyrus.sysml14.diagram.parametric" id="org.eclipse.papyrus.sysml14.diagram.parametric" name="SysML 1.4 Parametric Diagram" description="SysML 1.4 Parametric diagram" icon="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.parametric/resources/icons/obj16/Diagram_Parametric.png" implementationID="CompositeStructure" customStyle="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.parametric/resources/style/parametricDiagram.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.composite.CreateCompositeDiagramCommand">
<modelRules xmi:id="_SUm70TEoEeWu9rf11ohCng">
<element href="http://www.eclipse.org/uml2/5.0.0/UML#//Class"/>
<stereotypes href="http://www.eclipse.org/papyrus/sysml/1.4/SysML#//blocks/Block"/>
