Bug 521569 - [SysML 1.4] Refactor all palette
- add abstraction to annotation palette
- add norm description to annotation palette
- fix failing RcpTT test
Change-Id: I639ec75b167b29317c3228f076ca90485efcaa55
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture/resources/SysMLAnnotation.paletteconfiguration b/gui/org.eclipse.papyrus.sysml14.architecture/resources/SysMLAnnotation.paletteconfiguration
index 76d993b..258a867 100644
--- a/gui/org.eclipse.papyrus.sysml14.architecture/resources/SysMLAnnotation.paletteconfiguration
+++ b/gui/org.eclipse.papyrus.sysml14.architecture/resources/SysMLAnnotation.paletteconfiguration
@@ -2,7 +2,13 @@
<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.commonmodel" label="SysML REQ Palette">
<drawerConfigurations id="org.eclipse.papyrus.sysML.palette.annotations.nodes" label="Annotations" description="Annotations listed in SysML 1.4 chapter 7.2 Diagram Elements">
<icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
- <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.Comment" label="Comment" description="Create a comment">
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.abstraction" label="Abstraction" description="An Abstraction is a Relationship that relates two Elements or sets of Elements that represent the same concept at different levels of abstraction or from different viewpoints." kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Abstraction.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Abstraction_Edge"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.Comment" label="Comment" description="A Comment is a textual annotation that can be attached to a set of Elements.">
<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Comment.gif"/>
<elementDescriptors>
<elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape"/>
@@ -11,7 +17,7 @@
<elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Comment_Shape_CN"/>
</elementDescriptors>
</ownedConfigurations>
- <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.Constraint" label="Constraint" description="Create a constraint">
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.Constraint" label="Constraint" description="A Constraint is a condition or restriction expressed in natural language text or in a machine readable language for the purpose of declaring some of the semantics of an Element or set of Elements.">
<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Constraint.gif"/>
<elementDescriptors>
<elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Constraint_Shape"/>
@@ -32,13 +38,13 @@
<elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.common/resources/SysML14Di-extension.elementtypesconfigurations#org.eclipse.papyrus.sysmldi.Constraint_Label"/>
</elementDescriptors>
</ownedConfigurations>
- <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.Dependency" label="Dependency" description="Create a dependency" kind="ConnectionTool">
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.Dependency" label="Dependency" description="A Dependency is a Relationship that signifies that a single model Element or a set of model Elements requires other model Elements for their specification or implementation. This means that the complete semantics of the client Element(s) are either semantically or structurally dependent on the definition of the supplier Element(s)." kind="ConnectionTool">
<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
<elementDescriptors>
<elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Dependency_Edge"/>
</elementDescriptors>
</ownedConfigurations>
- <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.ElementGroup" label="ElementGroup" description="Create a ElementGroup">
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.ElementGroup" label="ElementGroup" description="The ElementGroup stereotype provides a lightweight mechanism for grouping various and possibly heterogeneous model">
<icon pluginID="org.eclipse.papyrus.sysml14.edit" iconPath="icons/full/obj16/ElementGroup.gif"/>
<elementDescriptors>
<elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.common/resources/SysMLDiUML.elementtypesconfigurations#org.eclipse.papyrus.sysmldi.ElementGroup_Comment_Shape"/>
@@ -47,7 +53,7 @@
<elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.common/resources/SysMLDiUML.elementtypesconfigurations#org.eclipse.papyrus.sysmldi.ElementGroup_Comment_Shape_CN"/>
</elementDescriptors>
</ownedConfigurations>
- <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.Problem" label="Problem" description="Create a Problem">
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.Problem" label="Problem" description="A Problem documents a deficiency, limitation, or failure of one or more model elements to satisfy a requirement or need,">
<icon pluginID="org.eclipse.papyrus.sysml14.edit" iconPath="icons/full/obj16/Problem.gif"/>
<elementDescriptors>
<elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.common/resources/SysMLDiUML.elementtypesconfigurations#org.eclipse.papyrus.sysmldi.Problem_Comment_Shape"/>
@@ -56,7 +62,7 @@
<elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.common/resources/SysMLDiUML.elementtypesconfigurations#org.eclipse.papyrus.sysmldi.Problem_Comment_Shape_CN"/>
</elementDescriptors>
</ownedConfigurations>
- <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.Rationale" label="Rationale" description="Create a Rationale">
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.Rationale" label="Rationale" description="A Rationale documents the justification for decisions and the requirements, design, and other decisions.">
<icon pluginID="org.eclipse.papyrus.sysml14.edit" iconPath="icons/full/obj16/Rationale.gif"/>
<elementDescriptors>
<elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.common/resources/SysMLDiUML.elementtypesconfigurations#org.eclipse.papyrus.sysmldi.Rationale_Comment_Shape"/>
@@ -65,13 +71,13 @@
<elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.common/resources/SysMLDiUML.elementtypesconfigurations#org.eclipse.papyrus.sysmldi.Rationale_Comment_Shape_CN"/>
</elementDescriptors>
</ownedConfigurations>
- <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.Realization" label="Realization" description="Create a Realization" kind="ConnectionTool">
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.Realization" label="Realization" description="Realization is a specialized Abstraction relationship between two sets of model Elements, one representing a" kind="ConnectionTool">
<icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Realization.gif"/>
<elementDescriptors>
<elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#org.eclipse.papyrus.umldi.Realization_Edge"/>
</elementDescriptors>
</ownedConfigurations>
- <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.Refine_Abstraction" label="Refine" description="Create a Refine" kind="ConnectionTool">
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="org.eclipse.papyrus.sysML.palette.annotations.Refine_Abstraction" label="Refine" description="The Refine stereotype specializes UML4SysML Refine and DirectedRelationshipPropertyPath to enable refinements to" kind="ConnectionTool">
<icon pluginID="org.eclipse.papyrus.sysml14.edit" iconPath="icons/full/obj16/Refine.gif"/>
<elementDescriptors>
<elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml14.diagram.common/resources/SysMLDiUML.elementtypesconfigurations#org.eclipse.papyrus.sysmldi.Refine_Abstraction_Abstraction_Edge"/>
diff --git a/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/menuExplorer/TC-ME-Property.test b/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/menuExplorer/TC-ME-Property.test
index dd09976..4e150c5 100644
--- a/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/menuExplorer/TC-ME-Property.test
+++ b/releng/org.eclipse.papyrus.sysml14.rcptt.tests/testcases/menuExplorer/TC-ME-Property.test
@@ -198,11 +198,6 @@
get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block2" | get-property childCount | equals 1
| verify-true
with [get-editor "AAA.di"] {
- get-palette | get-palette-entry Conform | mouse-move 41 19 -height 24 -width 125
- with [get-diagram -index 1 | get-edit-part -name Block1] {
- mouse-move 256 302 -height 342 -width 656
- mouse-move 616 156 -height 342 -width 656
- }
get-palette | get-palette-entry ActorPart | mouse-move 66 4 -height 24 -width 234
}
get-view "Model Explorer" | get-tree | get-item "AAA/«Block» Block3" | get-property childCount | equals 1
