Bug 477453 - [SysML 1.4][diagram][BDD]|Block] make visible the

compartment properties

Change-Id: Ie58ade9545716584086c0680e93f8992c7d42901
Signed-off-by: Francois Le Fevre - CEA <francois.le-fevre@cea.fr>

6 files changed, 33 insertions, 29 deletions

diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/doc/org.eclipse.papyrus.sysml.14.diagram.blockdefinition.uml b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/doc/org.eclipse.papyrus.sysml.14.diagram.blockdefinition.uml
index c4419295..1f61d561 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/doc/org.eclipse.papyrus.sysml.14.diagram.blockdefinition.uml
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/resources/doc/org.eclipse.papyrus.sysml.14.diagram.blockdefinition.uml
@@ -61,6 +61,8 @@
       <packagedElement xmi:type="uml:Abstraction" xmi:id="_3etN0FCLEeWVDv-g61eepg" client="_a0GrwOLIEeSv5dwvZ9NSDw">
         <supplier xmi:type="uml:Class" href="../../org.eclipse.papyrus-sysml/core/org.eclipse.papyrus.sysml14/doc/omg.sysml.uml#_66Gknzq8EeW79ofuztDyTA"/>
       </packagedElement>
+      <packagedElement xmi:type="uml:Class" xmi:id="_uPHlAGAyEeWhfPUqbhxdNA" name="REQ_001"/>
+      <packagedElement xmi:type="uml:Abstraction" xmi:id="_uRFT4GAyEeWhfPUqbhxdNA" name="DeriveFrom_Block display" client="_uPHlAGAyEeWhfPUqbhxdNA" supplier="_a0GrwOLIEeSv5dwvZ9NSDw"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Model" xmi:id="_OFsfc-LIEeSv5dwvZ9NSDw" name="UseCases">
       <packagedElement xmi:type="uml:Abstraction" xmi:id="_OFsfdOLIEeSv5dwvZ9NSDw" name="useCasesAbstraction" client="_OFsfc-LIEeSv5dwvZ9NSDw" supplier="_OFsfcuLIEeSv5dwvZ9NSDw"/>
@@ -127,4 +129,6 @@
   <Requirements:DeriveReqt xmi:id="__CrVkFCLEeWVDv-g61eepg" base_Abstraction="_3etN0FCLEeWVDv-g61eepg"/>
   <Requirements:Requirement xmi:id="_Zvo4QF1BEeWKmvPTA9gEyw" text="The UML4SysML include this element.&#xD;&#xA;This element in SysML is needed to describe flows at highlevel.&#xD;&#xA;see figure9.5 itemFlow Stereotype inside 9.3.2 Stereotypes (p81)&#xD;&#xA;in UML2.5 you can see an example in hte chapter 20.1.5 Examples" id="Req004.042" base_Class="_ZvegMF1BEeWKmvPTA9gEyw"/>
   <Requirements:Requirement xmi:id="_Pz3ZYF1GEeWKmvPTA9gEyw" text="The UML4SysML include this element.&#xD;&#xA;This element in SysML is needed to describe flows at highlevel.&#xD;&#xA;see figure9.5 itemFlow Stereotype inside 9.3.2 Stereotypes (p81)&#xD;&#xA;in UML2.5 you can see an example in hte chapter 20.1.5 Examples" id="Req004.041" base_Class="_Pz0WEF1GEeWKmvPTA9gEyw"/>
+  <Requirements:Requirement xmi:id="_uREs0GAyEeWhfPUqbhxdNA" text="The block can display properties compartments.&#xA;It will be named Attributes compartment.&#xA;@pap.norm norm.uri#55&#xA;" id="REQ_001" base_Class="_uPHlAGAyEeWhfPUqbhxdNA"/>
+  <Requirements:DeriveReqt xmi:id="_uRGiAGAyEeWhfPUqbhxdNA" base_Abstraction="_uRFT4GAyEeWhfPUqbhxdNA"/>
 </xmi:XMI>
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 68db807f..09164b49 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
@@ -41,7 +41,7 @@ Model > Compartment[kind="packagedelements"]{
 	visible: true;
 }
 
-[appliedStereotypes~="ValueType"] > Compartment[kind=properties],
+[appliedStereotypes~="ValueType"] > Compartment[kind=attributes],
 [appliedStereotypes~="ValueType"] > Compartment[kind=operations],
 [appliedStereotypes~="ValueType"] > Compartment[type=StereotypeCompartment]{
 	visible: true;
@@ -69,7 +69,7 @@ Class[appliedStereotypes~="ElementGroup"] > Compartment[type=StereotypeCompartme
     showTitle:false;
 }
  
-[appliedStereotypes~="ElementGroup"] > Compartment[kind=properties],
+[appliedStereotypes~="ElementGroup"] > Compartment[kind=attributes],
 [appliedStereotypes~="ElementGroup"] > Compartment[kind=operations],
 [appliedStereotypes~="ElementGroup"] > Compartment[kind=constraints]{
 	visible: true;
@@ -117,7 +117,7 @@ Class[appliedStereotypes~="Stakeholder"] > Compartment[type=StereotypeCompartmen
     showTitle:false;
 } 
  
-[appliedStereotypes~="Stakeholder"] > Compartment[kind=properties],
+[appliedStereotypes~="Stakeholder"] > Compartment[kind=attributes],
 [appliedStereotypes~="Stakeholder"] > Compartment[kind=operations],
 [appliedStereotypes~="Stakeholder"] > Compartment[kind=constraints]{
 	visible: true;
@@ -134,7 +134,7 @@ Class[appliedStereotypes~="Stakeholder"] > Compartment[type=StereotypeCompartmen
 /*
  * Stereotype View
  */
-Class[appliedStereotypes~="View"] > Compartment[kind=properties],
+Class[appliedStereotypes~="View"] > Compartment[kind=attributes],
 Class[appliedStereotypes~="View"] > Compartment[kind=operations]{
     visible:true;
     showTitle:false;
@@ -166,7 +166,7 @@ Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment]
     showTitle:false;
 } 
  
-[appliedStereotypes~="Viewpoint"] > Compartment[kind=properties],
+[appliedStereotypes~="Viewpoint"] > Compartment[kind=attributes],
 [appliedStereotypes~="Viewpoint"] > Compartment[kind=operations]{
 	visible:true;
 }
@@ -216,10 +216,10 @@ BlockDefinitionDiagram Property > Compartment[kind=structure]{
 	visible: true;
 }
 
-BlockDefinitionDiagram DataType > Compartment[kind=properties],
+BlockDefinitionDiagram DataType > Compartment[kind=attributes],
 BlockDefinitionDiagram Enumeration > Compartment[kind=EnumerationLiteralCompartment],
 BlockDefinitionDiagram InstanceSpecification > Compartment[kind=slots],
-BlockDefinitionDiagram Interface > Compartment[kind=properties],
+BlockDefinitionDiagram Interface > Compartment[kind=attributes],
 BlockDefinitionDiagram Interface > Compartment[kind=operations]{
 	visible: true;
 }
@@ -227,7 +227,7 @@ BlockDefinitionDiagram Interface > Compartment[kind=operations]{
 /*
  * Stereotype Block
  */
-[appliedStereotypes~="Block"] > Compartment[kind=properties],
+[appliedStereotypes~="Block"] > Compartment[kind=attributes],
 [appliedStereotypes~="Block"] > Compartment[kind=operations],
 [appliedStereotypes~="Block"] > Compartment[kind=constraints],
 [appliedStereotypes~="Block"] > Compartment[kind="parts"]{
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/resources/style/sysmlDiagram.css b/diagram/org.eclipse.papyrus.sysml14.diagram.common/resources/style/sysmlDiagram.css
index 25e85134..839e0d35 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/resources/style/sysmlDiagram.css
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/resources/style/sysmlDiagram.css
@@ -37,7 +37,7 @@ Model > Compartment[kind="packagedelements"]{
 	visible: true;
 }
 
-[appliedStereotypes~="ValueType"] > Compartment[kind=properties],
+[appliedStereotypes~="ValueType"] > Compartment[kind=attributes],
 [appliedStereotypes~="ValueType"] > Compartment[kind=operations]{
 	visible: true;
 }
@@ -63,7 +63,7 @@ Class[appliedStereotypes~="ElementGroup"] > Compartment[type=StereotypeCompartme
     showTitle:false;
 }
  
-[appliedStereotypes~="ElementGroup"] > Compartment[kind=properties],
+[appliedStereotypes~="ElementGroup"] > Compartment[kind=attributes],
 [appliedStereotypes~="ElementGroup"] > Compartment[kind=operations],
 [appliedStereotypes~="ElementGroup"] > Compartment[kind=constraints]{
 	visible: true;
@@ -111,7 +111,7 @@ Class[appliedStereotypes~="Stakeholder"] > Compartment[type=StereotypeCompartmen
     showTitle:false;
 } 
  
-[appliedStereotypes~="Stakeholder"] > Compartment[kind=properties],
+[appliedStereotypes~="Stakeholder"] > Compartment[kind=attributes],
 [appliedStereotypes~="Stakeholder"] > Compartment[kind=operations],
 [appliedStereotypes~="Stakeholder"] > Compartment[kind=constraints]{
 	visible: true;
@@ -128,7 +128,7 @@ Class[appliedStereotypes~="Stakeholder"] > Compartment[type=StereotypeCompartmen
 /*
  * Stereotype View
  */
-Class[appliedStereotypes~="View"] > Compartment[kind=properties],
+Class[appliedStereotypes~="View"] > Compartment[kind=attributes],
 Class[appliedStereotypes~="View"] > Compartment[kind=operations]{
     visible:true;
     showTitle:false;
@@ -160,7 +160,7 @@ Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment]
     showTitle:false;
 } 
  
-[appliedStereotypes~="Viewpoint"] > Compartment[kind=properties],
+[appliedStereotypes~="Viewpoint"] > Compartment[kind=attributes],
 [appliedStereotypes~="Viewpoint"] > Compartment[kind=operations]{
 	visible:true;
 }
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/style/internalBlockDiagram.css b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/style/internalBlockDiagram.css
index e382595b..9ecd99bb 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/style/internalBlockDiagram.css
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/resources/style/internalBlockDiagram.css
@@ -46,7 +46,7 @@ Model > Compartment[kind="packagedelements"]{
 	visible: true;
 }
 
-[appliedStereotypes~="ValueType"] > Compartment[kind=properties],
+[appliedStereotypes~="ValueType"] > Compartment[kind=attributes],
 [appliedStereotypes~="ValueType"] > Compartment[kind=operations]{
 	visible: true;
 }
@@ -72,7 +72,7 @@ Class[appliedStereotypes~="ElementGroup"] > Compartment[type=StereotypeCompartme
     showTitle:false;
 }
  
-[appliedStereotypes~="ElementGroup"] > Compartment[kind=properties],
+[appliedStereotypes~="ElementGroup"] > Compartment[kind=attributes],
 [appliedStereotypes~="ElementGroup"] > Compartment[kind=operations],
 [appliedStereotypes~="ElementGroup"] > Compartment[kind=constraints]{
 	visible: true;
@@ -120,7 +120,7 @@ Class[appliedStereotypes~="Stakeholder"] > Compartment[type=StereotypeCompartmen
     showTitle:false;
 } 
  
-[appliedStereotypes~="Stakeholder"] > Compartment[kind=properties],
+[appliedStereotypes~="Stakeholder"] > Compartment[kind=attributes],
 [appliedStereotypes~="Stakeholder"] > Compartment[kind=operations],
 [appliedStereotypes~="Stakeholder"] > Compartment[kind=constraints]{
 	visible: true;
@@ -137,7 +137,7 @@ Class[appliedStereotypes~="Stakeholder"] > Compartment[type=StereotypeCompartmen
 /*
  * Stereotype View
  */
-Class[appliedStereotypes~="View"] > Compartment[kind=properties],
+Class[appliedStereotypes~="View"] > Compartment[kind=attributes],
 Class[appliedStereotypes~="View"] > Compartment[kind=operations]{
     visible:true;
     showTitle:false;
@@ -169,7 +169,7 @@ Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment]
     showTitle:false;
 } 
  
-[appliedStereotypes~="Viewpoint"] > Compartment[kind=properties],
+[appliedStereotypes~="Viewpoint"] > Compartment[kind=attributes],
 [appliedStereotypes~="Viewpoint"] > Compartment[kind=operations]{
 	visible:true;
 }
@@ -230,7 +230,7 @@ Class[appliedStereotypes~="Block"] > Compartment[kind=internalstructure]{
 } 
 
 Class[appliedStereotypes~="Block"] > Compartment[kind="nestedparts"],
-Class[appliedStereotypes~="Block"] > Compartment[kind=properties],
+Class[appliedStereotypes~="Block"] > Compartment[kind=attributes],
 Class[appliedStereotypes~="Block"] > Compartment[kind=operations],
 Class[appliedStereotypes~="Block"] > Compartment[kind=constraints] 
 Class[appliedStereotypes~="Block"] > Compartment[kind=nestedclassifiers],
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/resources/style/parametricDiagram.css b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/resources/style/parametricDiagram.css
index f3295292..7cf24399 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/resources/style/parametricDiagram.css
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/resources/style/parametricDiagram.css
@@ -46,7 +46,7 @@ Model > Compartment[kind="packagedelements"]{
 	visible: true;
 }
 
-[appliedStereotypes~="ValueType"] > Compartment[kind=properties],
+[appliedStereotypes~="ValueType"] > Compartment[kind=attributes],
 [appliedStereotypes~="ValueType"] > Compartment[kind=operations]{
 	visible: true;
 }
@@ -72,7 +72,7 @@ Class[appliedStereotypes~="ElementGroup"] > Compartment[type=StereotypeCompartme
     showTitle:false;
 }
  
-[appliedStereotypes~="ElementGroup"] > Compartment[kind=properties],
+[appliedStereotypes~="ElementGroup"] > Compartment[kind=attributes],
 [appliedStereotypes~="ElementGroup"] > Compartment[kind=operations],
 [appliedStereotypes~="ElementGroup"] > Compartment[kind=constraints]{
 	visible: true;
@@ -120,7 +120,7 @@ Class[appliedStereotypes~="Stakeholder"] > Compartment[type=StereotypeCompartmen
     showTitle:false;
 } 
  
-[appliedStereotypes~="Stakeholder"] > Compartment[kind=properties],
+[appliedStereotypes~="Stakeholder"] > Compartment[kind=attributes],
 [appliedStereotypes~="Stakeholder"] > Compartment[kind=operations],
 [appliedStereotypes~="Stakeholder"] > Compartment[kind=constraints]{
 	visible: true;
@@ -137,7 +137,7 @@ Class[appliedStereotypes~="Stakeholder"] > Compartment[type=StereotypeCompartmen
 /*
  * Stereotype View
  */
-Class[appliedStereotypes~="View"] > Compartment[kind=properties],
+Class[appliedStereotypes~="View"] > Compartment[kind=attributes],
 Class[appliedStereotypes~="View"] > Compartment[kind=operations]{
     visible:true;
     showTitle:false;
@@ -169,7 +169,7 @@ Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment]
     showTitle:false;
 } 
  
-[appliedStereotypes~="Viewpoint"] > Compartment[kind=properties],
+[appliedStereotypes~="Viewpoint"] > Compartment[kind=attributes],
 [appliedStereotypes~="Viewpoint"] > Compartment[kind=operations]{
 	visible:true;
 }
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/resources/style/requirementDiagram.css b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/resources/style/requirementDiagram.css
index 37b42c79..02bff870 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/resources/style/requirementDiagram.css
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/resources/style/requirementDiagram.css
@@ -46,7 +46,7 @@ Model > Compartment[kind="packagedelements"]{
 	visible: true;
 }
 
-[appliedStereotypes~="ValueType"] > Compartment[kind=properties],
+[appliedStereotypes~="ValueType"] > Compartment[kind=attributes],
 [appliedStereotypes~="ValueType"] > Compartment[kind=operations]{
 	visible: true;
 }
@@ -72,7 +72,7 @@ Class[appliedStereotypes~="ElementGroup"] > Compartment[type=StereotypeCompartme
     showTitle:false;
 }
  
-[appliedStereotypes~="ElementGroup"] > Compartment[kind=properties],
+[appliedStereotypes~="ElementGroup"] > Compartment[kind=attributes],
 [appliedStereotypes~="ElementGroup"] > Compartment[kind=operations],
 [appliedStereotypes~="ElementGroup"] > Compartment[kind=constraints]{
 	visible: true;
@@ -120,7 +120,7 @@ Class[appliedStereotypes~="Stakeholder"] > Compartment[type=StereotypeCompartmen
     showTitle:false;
 } 
  
-[appliedStereotypes~="Stakeholder"] > Compartment[kind=properties],
+[appliedStereotypes~="Stakeholder"] > Compartment[kind=attributes],
 [appliedStereotypes~="Stakeholder"] > Compartment[kind=operations],
 [appliedStereotypes~="Stakeholder"] > Compartment[kind=constraints]{
 	visible: true;
@@ -137,7 +137,7 @@ Class[appliedStereotypes~="Stakeholder"] > Compartment[type=StereotypeCompartmen
 /*
  * Stereotype View
  */
-Class[appliedStereotypes~="View"] > Compartment[kind=properties],
+Class[appliedStereotypes~="View"] > Compartment[kind=attributes],
 Class[appliedStereotypes~="View"] > Compartment[kind=operations]{
     visible:true;
     showTitle:false;
@@ -169,7 +169,7 @@ Class[appliedStereotypes~="Viewpoint"] > Compartment[type=StereotypeCompartment]
     showTitle:false;
 } 
  
-[appliedStereotypes~="Viewpoint"] > Compartment[kind=properties],
+[appliedStereotypes~="Viewpoint"] > Compartment[kind=attributes],
 [appliedStereotypes~="Viewpoint"] > Compartment[kind=operations]{
 	visible:true;
 }