Bug 578531 - [Sirius] wrong Color for Comment on the Sirius Sequence
diagram and wrong font size for Constraint for Sirius diagrams
(Sequence/State Machine)
Change-Id: I3f0ab923d1c8ec18f8d7c9f91a4cc84066da8349
Signed-off-by: Ibtihel Khemir <ibtihel.khemir@cea.fr>
diff --git a/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.clazz.diagram/description/papyrus_class.odesign b/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.clazz.diagram/description/papyrus_class.odesign
index 7b411b4..9a86d79 100755
--- a/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.clazz.diagram/description/papyrus_class.odesign
+++ b/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.clazz.diagram/description/papyrus_class.odesign
@@ -15,7 +15,7 @@
</style>
</nodeMappings>
<nodeMappings name="CD_Constraint" deletionDescription="//@ownedViewpoints[name='ClassDiagram']/@ownedRepresentations[name='ClassDiagram']/@additionalLayers[name='Common']/@toolSections.0/@ownedTools[name='PapyrusDelete']" labelDirectEdit="//@ownedViewpoints[name='ClassDiagram']/@ownedRepresentations[name='ClassDiagram']/@additionalLayers[name='Common']/@toolSections.0/@ownedTools[name='ConstraintEdit']" semanticCandidatesExpression="feature:ownedRule" createElements="false" domainClass="uml.Constraint">
- <style xsi:type="style:NoteDescription" labelSize="9" labelExpression="service:getConstraintLabel()" sizeComputationExpression="9" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name=null]/@entries[name='CustomGreen']">
+ <style xsi:type="style:NoteDescription" labelSize="9" labelExpression="service:getConstraintLabel()" sizeComputationExpression="9" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name=null]/@entries[name='ConstraintColor']">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
</style>
@@ -2047,7 +2047,7 @@
</additionalLayers>
<additionalLayers name="Comment" activeByDefault="true">
<nodeMappings name="CD_Comment" deletionDescription="//@ownedViewpoints[name='ClassDiagram']/@ownedRepresentations[name='ClassDiagram']/@additionalLayers[name='Common']/@toolSections.0/@ownedTools[name='PapyrusDelete']" labelDirectEdit="//@ownedViewpoints[name='ClassDiagram']/@ownedRepresentations[name='ClassDiagram']/@additionalLayers[name='Common']/@toolSections.0/@ownedTools[name='CommentEdit']" semanticCandidatesExpression="feature:ownedComment" createElements="false" domainClass="uml.Comment">
- <style xsi:type="style:NoteDescription" labelSize="9" showIcon="false" labelExpression="feature:body" sizeComputationExpression="9" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name=null]/@entries[name='CustomYellow']">
+ <style xsi:type="style:NoteDescription" labelSize="9" showIcon="false" labelExpression="feature:body" sizeComputationExpression="9" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name=null]/@entries[name='CommentColor']">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
</style>
@@ -2074,7 +2074,7 @@
<userColorsPalettes>
<entries xsi:type="description:UserFixedColor" red="195" green="209" blue="213" name="CustomGris"/>
<entries xsi:type="description:UserFixedColor" red="195" green="215" blue="221" name="CustomBlue"/>
- <entries xsi:type="description:UserFixedColor" red="255" green="255" blue="204" name="CustomYellow"/>
- <entries xsi:type="description:UserFixedColor" red="200" green="255" blue="230" name="CustomGreen"/>
+ <entries xsi:type="description:UserFixedColor" red="255" green="255" blue="204" name="CommentColor"/>
+ <entries xsi:type="description:UserFixedColor" red="200" green="255" blue="230" name="ConstraintColor"/>
</userColorsPalettes>
</description:Group>
diff --git a/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.sequence.diagram/description/papyrus_sequence.odesign b/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.sequence.diagram/description/papyrus_sequence.odesign
index 4257ca0..864d611 100755
--- a/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.sequence.diagram/description/papyrus_sequence.odesign
+++ b/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.sequence.diagram/description/papyrus_sequence.odesign
@@ -85,7 +85,7 @@
</style>
</nodeMappings>
<nodeMappings name="Constraint" preconditionExpression="aql:not self.oclIsTypeOf(uml::InteractionConstraint)" deletionDescription="//@ownedViewpoints[name='SequenceDiagram']/@ownedRepresentations[name='SequenceDiagram']/@additionalLayers[name='Common']/@toolSections.0/@ownedTools[name='PapyrusDelete']" labelDirectEdit="//@ownedViewpoints[name='SequenceDiagram']/@ownedRepresentations[name='SequenceDiagram']/@additionalLayers[name='Common']/@toolSections.0/@ownedTools[name='ConstraintEdit']" createElements="false" domainClass="Constraint">
- <style xsi:type="style:NoteDescription" labelSize="12" labelExpression="service:getConstraintLabel()" sizeComputationExpression="9" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='UMLPalette']/@entries[name='ConstrainedColor']">
+ <style xsi:type="style:NoteDescription" labelSize="9" labelExpression="service:getConstraintLabel()" sizeComputationExpression="9" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='UMLPalette']/@entries[name='ConstraintColor']">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
</style>
@@ -871,10 +871,9 @@
</additionalLayers>
<additionalLayers name="Comment" activeByDefault="true">
<nodeMappings name="Comment" deletionDescription="//@ownedViewpoints[name='SequenceDiagram']/@ownedRepresentations[name='SequenceDiagram']/@additionalLayers[name='Common']/@toolSections.0/@ownedTools[name='PapyrusDelete']" labelDirectEdit="//@ownedViewpoints[name='SequenceDiagram']/@ownedRepresentations[name='SequenceDiagram']/@additionalLayers[name='Common']/@toolSections.0/@ownedTools[name='CommentEdit']" createElements="false" domainClass="uml.Comment">
- <style xsi:type="style:NoteDescription" labelSize="9" showIcon="false" labelExpression="feature:body" sizeComputationExpression="9" labelPosition="node" resizeKind="NSEW">
+ <style xsi:type="style:NoteDescription" labelSize="9" showIcon="false" labelExpression="feature:body" sizeComputationExpression="9" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name='UMLPalette']/@entries[name='CommentColor']">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
- <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/>
</style>
</nodeMappings>
<toolSections name="Nodes">
@@ -921,6 +920,7 @@
<entries xsi:type="description:UserFixedColor" red="254" green="238" blue="214" name="lighter orange"/>
<entries xsi:type="description:UserFixedColor" red="255" green="249" blue="218" name="lighter yellow"/>
<entries xsi:type="description:UserFixedColor" red="228" green="249" blue="239" name="lagune"/>
+ <entries xsi:type="description:UserFixedColor" red="255" green="255" blue="204" name="CommentColor"/>
<entries xsi:type="description:UserFixedColor" red="110" green="132" blue="132" name="dark lagune"/>
<entries xsi:type="description:UserFixedColor" red="238" green="249" blue="244" name="light lagune"/>
<entries xsi:type="description:UserFixedColor" red="246" green="253" blue="255" name="InformationBackground"/>
@@ -936,6 +936,6 @@
<entries xsi:type="description:UserFixedColor" red="180" green="200" blue="210" name="Description"/>
<entries xsi:type="description:UserFixedColor" red="241" green="243" blue="254" name="QualifierBackground"/>
<entries xsi:type="description:UserFixedColor" red="195" green="209" blue="213" name="Execution Color"/>
- <entries xsi:type="description:UserFixedColor" red="200" green="255" blue="230" name="ConstrainedColor"/>
+ <entries xsi:type="description:UserFixedColor" red="200" green="255" blue="230" name="ConstraintColor"/>
</userColorsPalettes>
</description:Group>
diff --git a/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.statemachine.diagram/description/papyrus_statemachine.odesign b/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.statemachine.diagram/description/papyrus_statemachine.odesign
index eeda890..04923d4 100755
--- a/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.statemachine.diagram/description/papyrus_statemachine.odesign
+++ b/plugins/uml/sirius/org.eclipse.papyrus.uml.sirius.statemachine.diagram/description/papyrus_statemachine.odesign
@@ -50,15 +50,14 @@
</firstModelOperations>
</diagramInitialisation>
<defaultLayer name="State Machine">
- <nodeMappings name="Comment" deletionDescription="//@ownedViewpoints[name='StateMachineDiagram']/@ownedRepresentations[name='StateMachineDiagram']/@additionalLayers[name='Common']/@toolSections.0/@ownedTools[name='PapyrusDelete']" labelDirectEdit="//@ownedViewpoints[name='StateMachineDiagram']/@ownedRepresentations[name='StateMachineDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='CommentEdit']" createElements="false" domainClass="Comment">
- <style xsi:type="style:NoteDescription" labelSize="12" labelExpression="feature:body" sizeComputationExpression="9" labelPosition="node" resizeKind="NSEW">
- <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='yellow']"/>
+ <nodeMappings name="Comment" deletionDescription="//@ownedViewpoints[name='StateMachineDiagram']/@ownedRepresentations[name='StateMachineDiagram']/@additionalLayers[name='Common']/@toolSections.0/@ownedTools[name='PapyrusDelete']" labelDirectEdit="//@ownedViewpoints[name='StateMachineDiagram']/@ownedRepresentations[name='StateMachineDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='CommentEdit']" createElements="false" domainClass="uml.Comment">
+ <style xsi:type="style:NoteDescription" labelSize="9" showIcon="false" labelExpression="feature:body" sizeComputationExpression="9" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name=null]/@entries[name='CommentColor']">
+ <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
- <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
</style>
</nodeMappings>
<nodeMappings name="Constraint" deletionDescription="//@ownedViewpoints[name='StateMachineDiagram']/@ownedRepresentations[name='StateMachineDiagram']/@additionalLayers[name='Common']/@toolSections.0/@ownedTools[name='PapyrusDelete']" labelDirectEdit="//@ownedViewpoints[name='StateMachineDiagram']/@ownedRepresentations[name='StateMachineDiagram']/@defaultLayer/@toolSections.0/@ownedTools[name='ConstraintEdit']" createElements="false" domainClass="Constraint">
- <style xsi:type="style:NoteDescription" labelSize="12" labelExpression="service:getConstraintLabel()" sizeComputationExpression="9" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name=null]/@entries[name='ConstrainedColor']">
+ <style xsi:type="style:NoteDescription" labelSize="9" labelExpression="service:getConstraintLabel()" sizeComputationExpression="9" labelPosition="node" resizeKind="NSEW" color="//@userColorsPalettes[name=null]/@entries[name='ConstraintColor']">
<borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
<labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
</style>
@@ -980,7 +979,8 @@
</ownedViewpoints>
<userColorsPalettes>
<entries xsi:type="description:UserFixedColor" red="239" green="239" blue="239" name="StateMachine_Gray_Min"/>
+ <entries xsi:type="description:UserFixedColor" red="255" green="255" blue="204" name="CommentColor"/>
<entries xsi:type="description:UserFixedColor" red="195" green="209" blue="213" name="StateMachine_Gray"/>
- <entries xsi:type="description:UserFixedColor" red="200" green="255" blue="230" name="ConstrainedColor"/>
+ <entries xsi:type="description:UserFixedColor" red="200" green="255" blue="230" name="ConstraintColor"/>
</userColorsPalettes>
</description:Group>
