Bug 521319 - [BDD] default configuration of Block shown compartment - remove rule that displayed stereotype compartment for Block in BDD - refactor rules to regroup compartment with the same display options Change-Id: Id601c4a07e4fc59c0b3a388e403475fa5010633f Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/style/blockDefinitionDiagram.css b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/style/blockDefinitionDiagram.css index 754ee98..ee3f5d3 100644 --- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/style/blockDefinitionDiagram.css +++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/style/blockDefinitionDiagram.css
@@ -8,6 +8,7 @@ * * Contributors: * Benoit Maggi (CEA LIST) benoit.maggi@cea.fr + * Benoit Maggi (CEA LIST) benoit.maggi@cea.fr : #521319 *****************************************************************************/ /* * SHARED ELEMENTS @@ -72,19 +73,10 @@ showTitle:false; } -Class[appliedStereotypes~="ElementGroup"] > Compartment[type=StereotypeCompartment] > [property="name"]{ - visible:true; -} -Class[appliedStereotypes~="ElementGroup"] > Compartment[type=StereotypeCompartment] > [property="criterion"]{ - visible:true; -} -Class[appliedStereotypes~="ElementGroup"] > Compartment[type=StereotypeCompartment] > [property="size"]{ - visible:true; -} -Class[appliedStereotypes~="ElementGroup"] > Compartment[type=StereotypeCompartment] > [property="member"]{ - visible:true; -} - +Class[appliedStereotypes~="ElementGroup"] > Compartment[type=StereotypeCompartment] > [property="name"] +Class[appliedStereotypes~="ElementGroup"] > Compartment[type=StereotypeCompartment] > [property="criterion"], +Class[appliedStereotypes~="ElementGroup"] > Compartment[type=StereotypeCompartment] > [property="size"], +Class[appliedStereotypes~="ElementGroup"] > Compartment[type=StereotypeCompartment] > [property="member"], Class[appliedStereotypes~="ElementGroup"] > Compartment[type=StereotypeCompartment] > [property="orderedMember"]{ visible:true; } @@ -125,9 +117,7 @@ visible: true; } -Class[appliedStereotypes~="Stakeholder"] > Compartment[type=StereotypeCompartment] > [property="concernList"]{ - visible:true; -} +Class[appliedStereotypes~="Stakeholder"] > Compartment[type=StereotypeCompartment] > [property="concernList"], Class[appliedStereotypes~="Stakeholder"] > Compartment[type=StereotypeCompartment] > [property="concern"]{ visible:true; } @@ -151,10 +141,7 @@ showTitle:true; } -Class[appliedStereotypes~="View"] > Compartment[type=StereotypeCompartment] > [property="stakeholder"]{ - visible:true; -} - +Class[appliedStereotypes~="View"] > Compartment[type=StereotypeCompartment] > [property="stakeholder"], Class[appliedStereotypes~="View"] > Compartment[type=StereotypeCompartment] > [property="viewpoint"]{ visible:true; } @@ -173,36 +160,20 @@ } [appliedStereotypes~="Viewpoint"] > Compartment[kind="internal structure"], -[appliedStereotypes~="Viewpoint"] > Compartment[kind="symbol"] -{ +[appliedStereotypes~="Viewpoint"] > Compartment[kind="symbol"]{ visible:false; } -Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment] > [property="stakeholder"]{ - visible:true; -} - -Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment] > [property="purpose"]{ - visible:true; -} - -Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment] > [property="concernList"]{ - visible:true; -} - -Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment] > [property="language"]{ - visible:true; -} -Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment] > [property="method"]{ - visible:true; -} - -Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment] > [property="presentation"]{ - visible:true; -} +Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment] > [property="stakeholder"], +Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment] > [property="purpose"], +Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment] > [property="concernList"], +Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment] > [property="language"], +Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment] > [property="method"], +Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment] > [property="presentation"], Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment] > [property="concern"]{ visible:true; } + /* * SPECIFIC ELEMENTS */ @@ -242,12 +213,6 @@ showTitle:false; } -Class[appliedStereotypes~="Block"] > Compartment[type=StereotypeCompartment]{ - visible:true; - showTitle:true; -} - - /* * Stereotype ConstraintBlock */ @@ -260,16 +225,8 @@ showTitle:false; } -Class[appliedStereotypes~="ConstraintBlock"] > Compartment[kind=structure] { - visible:true; - showTitle:true; -} - -[appliedStereotypes~="ConstraintBlock"] > Compartment[kind=basiccompartment] { - visible:true; - showTitle:true; -} - +Class[appliedStereotypes~="ConstraintBlock"] > Compartment[kind=structure], +Class[appliedStereotypes~="ConstraintBlock"] > Compartment[kind=basiccompartment], Class[appliedStereotypes~="ConstraintBlock"] > Compartment[kind=Parameters], Class[appliedStereotypes~="ConstraintBlock"] > Compartment[kind=constraints]{ visible: true; @@ -298,30 +255,12 @@ showTitle:false; } -Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="derived"]{ - visible:false; -} - -Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="derivedFrom"]{ - visible:false; -} - -Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="satisfiedBy"]{ - visible:false; -} - -Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="refinedBy"]{ - visible:false; -} - -Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="tracedTo"]{ - visible:false; -} - -Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="verifiedBy"]{ - visible:false; -} - +Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="derived"], +Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="derivedFrom"], +Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="satisfiedBy"], +Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="refinedBy"], +Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="tracedTo"], +Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="verifiedBy"], Class[appliedStereotypes~="Requirement"] > Compartment[type=StereotypeCompartment] > [property="master"]{ visible:false; }