Bug 520126: [SysML 1.4] Add Package diagram in architecture
- create a new representation sysml.package
- add it in architecture
- add constant in SysML14chitectureUtil
- orangify the UML icon for Package diagram
- add missing representation ids in SysML14chitectureUtil
- add small readme to document color for icons
Change-Id: I35eaac3e357d7b694e83b42f4ec30c11d8ff098f
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=520126
Signed-off-by: Francois Le Fevre <francois.le-fevre@cea.fr>
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture.tests/test/org/eclipse/papyrus/sysml14/architecture/tests/util/SysML14chitectureUtilTest.java b/gui/org.eclipse.papyrus.sysml14.architecture.tests/test/org/eclipse/papyrus/sysml14/architecture/tests/util/SysML14chitectureUtilTest.java
index 36de942..b5155ce 100644
--- a/gui/org.eclipse.papyrus.sysml14.architecture.tests/test/org/eclipse/papyrus/sysml14/architecture/tests/util/SysML14chitectureUtilTest.java
+++ b/gui/org.eclipse.papyrus.sysml14.architecture.tests/test/org/eclipse/papyrus/sysml14/architecture/tests/util/SysML14chitectureUtilTest.java
@@ -42,10 +42,15 @@
@Parameters
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][] {
- {SysML14chitectureUtil.DIAGRAM_BLOCK_DEFINITION_ID},
+ {SysML14chitectureUtil.DIAGRAM_ACTIVITY_ID},
+ {SysML14chitectureUtil.DIAGRAM_BLOCK_DEFINITION_ID},
+ {SysML14chitectureUtil.DIAGRAM_INTERACTION_OVERVIEW_ID},
{SysML14chitectureUtil.DIAGRAM_INTERNAL_BLOCK_ID},
+ {SysML14chitectureUtil.DIAGRAM_PACKAGE_ID},
{SysML14chitectureUtil.DIAGRAM_PARAMETRIC_ID},
{SysML14chitectureUtil.DIAGRAM_REQUIREMENT_ID},
+ {SysML14chitectureUtil.DIAGRAM_STATE_MACHINE_ID},
+ {SysML14chitectureUtil.DIAGRAM_USE_CASE_ID},
{SysML14chitectureUtil.TABLE_REQUIREMENT_ID},
{SysML14chitectureUtil.TABLE_REQUIREMENT_TREE_ID},
{SysML14chitectureUtil.TABLE_ALLOCATION_ID},
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture/README.md b/gui/org.eclipse.papyrus.sysml14.architecture/README.md
new file mode 100644
index 0000000..b31823b
--- /dev/null
+++ b/gui/org.eclipse.papyrus.sysml14.architecture/README.md
@@ -0,0 +1,7 @@
+org.eclipse.papyrus.sysml14.architecture
+=======================================
+
+* SysML uses orange copies of UML icons
+** dark orange: f46800
+** light orange: f6b200
+
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture/resources/icons/obj16/Diagram_SysML_Package.gif b/gui/org.eclipse.papyrus.sysml14.architecture/resources/icons/obj16/Diagram_SysML_Package.gif
new file mode 100755
index 0000000..d97c69f
--- /dev/null
+++ b/gui/org.eclipse.papyrus.sysml14.architecture/resources/icons/obj16/Diagram_SysML_Package.gif
Binary files differ
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture b/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture
index 9bd7c61..fc04c83 100644
--- a/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture
+++ b/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<architecture:ArchitectureDomain xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:gmfdiagrepresentation="http://www.eclipse.org/papyrus/infra/gmfdiag/representation" xmlns:nattablerepresentation="http://www.eclipse.org/papyrus/infra/nattable/representation" xmi:id="org.eclipse.papyrus.sysml14.systemsEngineering" id="org.eclipse.papyrus.sysml14.systemsEngineering" name="Systems Engineering" description="The domain of developing software systems" icon="platform:/plugin/org.eclipse.papyrus.uml.architecture/icons/domain.gif">
- <stakeholders xmi:id="org.eclipse.papyrus.sysml14.stackholder.systemsEngineer" id="org.eclipse.papyrus.sysml14.stackholder.systemsEngineer" name="Systems Engineer" description="An engineer interested in system development">
- <concerns href="#org.eclipse.papyrus.sysml14.concern.requirements"/>
- <concerns href="#org.eclipse.papyrus.sysml14.concern.parametrics"/>
- </stakeholders>
+ <stakeholders xmi:id="org.eclipse.papyrus.sysml14.stackholder.systemsEngineer" id="org.eclipse.papyrus.sysml14.stackholder.systemsEngineer" name="Systems Engineer" description="An engineer interested in system development" concerns="org.eclipse.papyrus.sysml14.concern.requirements org.eclipse.papyrus.sysml14.concern.parametrics"/>
<concerns xmi:id="org.eclipse.papyrus.sysml14.concern.requirements" id="org.eclipse.papyrus.sysml14.concern.requirements" name="Requirements" description="The concern of developing the system's requirements"/>
<concerns xmi:id="org.eclipse.papyrus.sysml14.concern.parametrics" id="org.eclipse.papyrus.sysml14.concern.parametrics" name="Parametrics" description="The concern of developing the system's parametrics"/>
<contexts xsi:type="architecture:ArchitectureDescriptionLanguage" xmi:id="org.eclipse.papyrus.sysml.architecture.SysML14" id="org.eclipse.papyrus.sysml.architecture.SysML14" name="SysML 1.4" description="The Systems Modeling Language" icon="platform:/plugin/org.eclipse.papyrus.sysml14/resources/icons/SysML.gif" creationCommandClass="org.eclipse.papyrus.sysml14.architecture.CreateSysML14ModelCommand">
@@ -29,6 +26,7 @@
<representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#org.eclipse.papyrus.sysml14.diagram.interactionOverview"/>
<representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#org.eclipse.papyrus.sysml14.diagram.stateMachine"/>
<representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#org.eclipse.papyrus.sysml14.diagram.useCase"/>
+ <representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" href="#org.eclipse.papyrus.sysml14.diagram.package"/>
</viewpoints>
<elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.emf/model/infra-emf.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
<elementTypes href="platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.common/model/gmfdiag-common.elementtypesconfigurations#_rWI4YHPzEeSnGJwaJWHCSg"/>
@@ -173,6 +171,29 @@
<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.package" id="org.eclipse.papyrus.sysml14.diagram.package" name="SysML 1.4 Package Diagram" description="" icon="platform:/plugin/org.eclipse.papyrus.sysml14.architecture/resources/icons/obj16/Diagram_SysML_Package.gif" implementationID="PapyrusUMLClassDiagram" creationCommandClass="org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand">
+ <modelRules xmi:id="_CzSPoHHbEeeNP_yv2pPMxg">
+ <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+ </modelRules>
+ <owningRules xmi:id="_SXiAoHHbEeeNP_yv2pPMxg">
+ <element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>
+ </owningRules>
+ <childRules xmi:id="_YUXygHHbEeeNP_yv2pPMxg"/>
+ <paletteRules xmi:id="_cx8xEHHbEeeNP_yv2pPMxg" element="clazz.tool.comment"/>
+ <paletteRules xmi:id="_zt8LsHHbEeeNP_yv2pPMxg" element="clazz.tool.constraint"/>
+ <paletteRules xmi:id="_0P-hwHHbEeeNP_yv2pPMxg" element="clazz.tool.model"/>
+ <paletteRules xmi:id="_2UohIHHbEeeNP_yv2pPMxg" element="clazz.tool.package"/>
+ <paletteRules xmi:id="_2z7FMHHbEeeNP_yv2pPMxg" element="clazz.tool.abstraction"/>
+ <paletteRules xmi:id="_3IOhQHHbEeeNP_yv2pPMxg" element="clazz.tool.dependency"/>
+ <paletteRules xmi:id="_3fZEEHHbEeeNP_yv2pPMxg" element="clazz.tool.packageimport"/>
+ <paletteRules xmi:id="_30S9EHHbEeeNP_yv2pPMxg" element="clazz.tool.link"/>
+ <paletteRules xmi:id="_4KkvEHHbEeeNP_yv2pPMxg" element="clazz.tool.containmentlink"/>
+ <paletteRules xmi:id="_4jm6IHHbEeeNP_yv2pPMxg" permit="false" element="clazz.tool.*"/>
+ <paletteRules xmi:id="_46IjwHHbEeeNP_yv2pPMxg" permit="false" element="createTimeObservation22CreationTool"/>
+ <paletteRules xmi:id="_5gVoIHHbEeeNP_yv2pPMxg" permit="false" element="createDurationObservation7CreationTool"/>
+ <paletteRules xmi:id="_52Hq4HHbEeeNP_yv2pPMxg" element=""/>
+ <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.clazz/model/PapyrusUMLClassDiagram.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 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"/>
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture/src/org/eclipse/papyrus/sysml14/architecture/util/SysML14chitectureUtil.java b/gui/org.eclipse.papyrus.sysml14.architecture/src/org/eclipse/papyrus/sysml14/architecture/util/SysML14chitectureUtil.java
index f40665a..c0c2132 100644
--- a/gui/org.eclipse.papyrus.sysml14.architecture/src/org/eclipse/papyrus/sysml14/architecture/util/SysML14chitectureUtil.java
+++ b/gui/org.eclipse.papyrus.sysml14.architecture/src/org/eclipse/papyrus/sysml14/architecture/util/SysML14chitectureUtil.java
@@ -19,11 +19,17 @@
private SysML14chitectureUtil(){
}
-
+
+ public static final String DIAGRAM_ACTIVITY_ID = "org.eclipse.papyrus.sysml14.diagram.activity"; //$NON-NLS-1$
public static final String DIAGRAM_BLOCK_DEFINITION_ID = "org.eclipse.papyrus.sysml14.diagram.blockdefinition"; //$NON-NLS-1$
- public static final String DIAGRAM_INTERNAL_BLOCK_ID = "org.eclipse.papyrus.sysml14.diagram.internalblock"; //$NON-NLS-1$
+ public static final String DIAGRAM_INTERACTION_OVERVIEW_ID = "org.eclipse.papyrus.sysml14.diagram.interactionOverview"; //$NON-NLS-1$
+ public static final String DIAGRAM_INTERNAL_BLOCK_ID = "org.eclipse.papyrus.sysml14.diagram.internalblock"; //$NON-NLS-1$
+ public static final String DIAGRAM_PACKAGE_ID = "org.eclipse.papyrus.sysml14.diagram.package"; //$NON-NLS-1$
public static final String DIAGRAM_PARAMETRIC_ID = "org.eclipse.papyrus.sysml14.diagram.parametric"; //$NON-NLS-1$
- public static final String DIAGRAM_REQUIREMENT_ID = "org.eclipse.papyrus.sysml14.diagram.requirement"; //$NON-NLS-1$
+ public static final String DIAGRAM_REQUIREMENT_ID = "org.eclipse.papyrus.sysml14.diagram.requirement"; //$NON-NLS-1$
+ public static final String DIAGRAM_STATE_MACHINE_ID = "org.eclipse.papyrus.sysml14.diagram.stateMachine"; //$NON-NLS-1$
+ public static final String DIAGRAM_USE_CASE_ID = "org.eclipse.papyrus.sysml14.diagram.useCase"; //$NON-NLS-1$
+
public static final String TABLE_REQUIREMENT_ID = "org.eclipse.papyrus.sysml14.table.requirement"; //$NON-NLS-1$
public static final String TABLE_REQUIREMENT_TREE_ID = "org.eclipse.papyrus.sysml14.table.requirementTree"; //$NON-NLS-1$
public static final String TABLE_ALLOCATION_ID = "org.eclipse.papyrus.sysml14.table.allocation"; //$NON-NLS-1$
