Bug 521581 - [SysML 1.4] Add a specific StateMachine Palette
- add common palette to SysML 1.4 StateMachine Diagram
- add a palette using element from SysML 1.4 chapter 13.2.1 State
Machine Diagram
- /!\ RecieveSignalAction, SendSignalAction, Action are missing
(non working with the current Papyrus version Oxygen.O 3.0.0)
Change-Id: Ib5202f920ae249fa0fd0518c9185bed26371f1f6
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14Di-extension.elementtypesconfigurations b/diagram/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14Di-extension.elementtypesconfigurations
index 16a7c09..9c00d1b 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14Di-extension.elementtypesconfigurations
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14Di-extension.elementtypesconfigurations
@@ -450,6 +450,7 @@
<specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.AssociationClass_Edge"/>
</elementTypeConfigurations>
<elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="org.eclipse.papyrus.sysmldi.Stakeholder_NamedElement_Shape" identifier="org.eclipse.papyrus.sysmldi.Stakeholder_NamedElement_Shape" name="Stakeholder (NamedElement_Shape)" hint="NamedElement_DefaultShape">
+ <matcherConfiguration xsi:type="elementtypesconfigurations:MatcherConfiguration" xmi:id="_uowzTJzxEeWe1L0yBJDEDA" matcherClassName="org.eclipse.papyrus.sysml14.service.types.matcher.internal.SysML14ProfileMatcher"/>
<iconEntry xmi:id="_BFy7HTvNEeeIn_UJiGU5aQ" iconPath="/resources/icons/full/obj16/Stakeholder.gif" bundleId="org.eclipse.papyrus.sysml14.edit"/>
<specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml14.service.types/model/SysML14-extension.elementtypesconfigurations#org.eclipse.papyrus.SysML14.StakeholderClass"/>
<specializedTypes xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.NamedElement_DefaultShape"/>
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture/resources/SysMLStateMachine.paletteconfiguration b/gui/org.eclipse.papyrus.sysml14.architecture/resources/SysMLStateMachine.paletteconfiguration
new file mode 100644
index 0000000..00e7618
--- /dev/null
+++ b/gui/org.eclipse.papyrus.sysml14.architecture/resources/SysMLStateMachine.paletteconfiguration
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<paletteconfiguration:PaletteConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.sysML.palette.stateMachine" label="SysML 1.4 StateMachine Palette" description="This is the SysML 1.4 version of the StateMachine palette ">
+ <drawerConfigurations id="org.eclipse.papyrus.sysML.palette.stateMachine" label="State Machine" description="Elements from SysML 1.4 chapter 13.2.1 State Machine Diagram">
+ <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.stateMachine.choice" label="Choice" description="Choice">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_choice.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_ChoiceShape"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.stateMachine.connectionpointreference" label="ConnectionPointReference" description="ConnectionPointReference">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/ConnectionPointReference.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.ConnectionPointReference_Shape"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.stateMachine.deephistory" label="DeepHistory" description="DeepHistory">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_deepHistory.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_DeepHistoryShape"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.stateMachine.entrypoint" label="EntryPoint" description="EntryPoint">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_entryPoint.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_EntryPointShape"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.stateMachine.exitpoint" label="ExitPoint" description="ExitPoint">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_exitPoint.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_ExitPointShape"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.stateMachine.finalstate" label="FinalState" description="FinalState">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/FinalState.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.FinalState_Shape"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.stateMachine.initial" label="Initial" description="Initial">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_initial.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_InitialShape"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.stateMachine.junction" label="Junction" description="Junction">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_junction.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_JunctionShape"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.stateMachine.region" label="Region" description="Region">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Region.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Region_Shape"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.stateMachine.shallowhistory" label="ShallowHistory" description="ShallowHistory">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_shallowHistory.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_ShallowHistoryShape"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.stateMachine.state" label="State" description="State">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/State.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.State_Shape"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.stateMachine.statemachine" label="StateMachine">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/StateMachine.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.StateMachine_Shape"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.stateMachine.terminate" label="Terminate" description="Terminate">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Pseudostate_terminate.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Pseudostate_TerminateShape"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.stateMachine.transition" label="Transition" description="Transition" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Transition_local.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Transition_Edge"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ </drawerConfigurations>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture b/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture
index 06d6895..e918f75 100644
--- a/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture
+++ b/gui/org.eclipse.papyrus.sysml14.architecture/resources/sysml14.architecture
@@ -298,7 +298,8 @@
<element href="http://www.eclipse.org/uml2/5.0.0/UML#//State"/>
</owningRules>
<childRules xmi:id="_KParoWuwEeeQz9CX7wZ3ZQ"/>
- <palettes href="platform:/plugin/org.eclipse.papyrus.uml.diagram.statemachine/model/PapyrusUMLStateMachineDiagram.paletteconfiguration#/"/>
+ <palettes href="platform:/plugin/org.eclipse.papyrus.sysml14.architecture/resources/SysMLCommon.paletteconfiguration#/"/>
+ <palettes href="platform:/plugin/org.eclipse.papyrus.sysml14.architecture/resources/SysMLStateMachine.paletteconfiguration#/"/>
</representationKinds>
<representationKinds xsi:type="gmfdiagrepresentation:PapyrusDiagram" xmi:id="org.eclipse.papyrus.sysml14.diagram.useCase" id="org.eclipse.papyrus.sysml14.diagram.useCase" name="SysML 1.4 Use Case Diagram" icon="platform:/plugin/org.eclipse.papyrus.sysml14.architecture/resources/icons/obj16/Diagram_SysML_UseCase.gif" implementationID="UseCase" customStyle="platform:/plugin/org.eclipse.papyrus.uml.diagram.usecase/models/usecase.css" creationCommandClass="org.eclipse.papyrus.uml.diagram.usecase.CreateUseCaseDiagramCommand">
<modelRules xmi:id="_KParo2uwEeeQz9CX7wZ3ZQ">
