Bug 511094
work on update change FormalPart -> Part
also FormalBlock -> Block
Change-Id: I954fcbfc7338f38c1c52419246b8498ee3b0ff88
Signed-off-by: Erwan Mahe <erwan.mahe@cea.fr>
diff --git a/codegen/org.eclipse.efm.formalml.concretesyntax.m2t/src/org/eclipse/efm/formalml/concretesyntax/m2t/factory/ClassCodeGenerator.java b/codegen/org.eclipse.efm.formalml.concretesyntax.m2t/src/org/eclipse/efm/formalml/concretesyntax/m2t/factory/ClassCodeGenerator.java
index ddea1ef..4596055 100644
--- a/codegen/org.eclipse.efm.formalml.concretesyntax.m2t/src/org/eclipse/efm/formalml/concretesyntax/m2t/factory/ClassCodeGenerator.java
+++ b/codegen/org.eclipse.efm.formalml.concretesyntax.m2t/src/org/eclipse/efm/formalml/concretesyntax/m2t/factory/ClassCodeGenerator.java
@@ -305,7 +305,7 @@
if( ! blockInstances.isEmpty() ) {
writer.appendEolTab_Eol("@instance:");
for( Property instance : blockInstances ) {
- transformPropertyFormalPart(instance, writer2);
+ transformPropertyPart(instance, writer2);
}
}
@@ -408,7 +408,7 @@
//
writer.appendEolTab_Eol("@instance:");
for( Property instance : blockInstances ) {
- transformPropertyFormalPart(instance, writer2);
+ transformPropertyPart(instance, writer2);
}
// Section moe
@@ -601,7 +601,7 @@
if( ! blockInstances.isEmpty() ) {
writer.appendEolTab_Eol("@instance:");
for( Property instance : blockInstances ) {
- transformPropertyFormalPart(instance, writer2);
+ transformPropertyPart(instance, writer2);
}
}
@@ -632,18 +632,18 @@
* @param writer
*/
public void transformClassMoeDefinition(
- FormalBlock block, ArrayList<Behavior> behaviors,
+ FormalBlock formalBlock, ArrayList<Behavior> behaviors,
List<Property> blockInstances, PrettyPrintWriter writer) {
int blockInstancesCount = blockInstances.size();
int behaviorCount = behaviors.size();
- Part formalPart;
+ Part Part;
if( behaviorCount > 0 ) {
- if( block.getBaseClass().getClassifierBehavior() == null ) {
+ if( formalBlock.getBaseClass().getClassifierBehavior() == null ) {
LOGGER.error( ( new StringBuffer(this.getClass().getSimpleName()) )
.append( ":> unexpected Block Class " )
- .append( block.getBaseClass().getQualifiedName() )
+ .append( formalBlock.getBaseClass().getQualifiedName() )
.append( " with ownedBehavior, without classifierBehavior" )
.toString() );
}
@@ -664,9 +664,9 @@
writer.appendEol( ((blockInstancesCount > 1) ? " |and|" : "") );
for( Property inst : blockInstances ) {
- formalPart = StereotypeUtil.getPart(inst);
- if( formalPart != null ) {
- for( InstanceSpecification instance : formalPart.getInstance() ) {
+ Part = StereotypeUtil.getPart(inst);
+ if( Part != null ) {
+ for( InstanceSpecification instance : Part.getInstance() ) {
writer.appendTab3("init ")
.append(instance.getName())
.appendEol(";");
@@ -710,7 +710,7 @@
//
writer.appendTab("@schedule{");
- Class block_base_Class = block.getBaseClass();
+ Class block_base_Class = formalBlock.getBaseClass();
if (block_base_Class !=null){
Behavior scheduleBehavior = block_base_Class.getClassifierBehavior();
@@ -739,9 +739,9 @@
if( isLibrarybehavior ) {
if( blockInstancesCount > 0 ) {
for( Property inst : blockInstances ) {
- formalPart = StereotypeUtil.getPart(inst);
- if( formalPart != null ) {
- for( InstanceSpecification instance : formalPart.getInstance() ) {
+ Part = StereotypeUtil.getPart(inst);
+ if( Part != null ) {
+ for( InstanceSpecification instance : Part.getInstance() ) {
writer.appendTab3("run ")
.append(instance.getName())
.appendEol(";");
@@ -824,7 +824,7 @@
//
writer.appendEolTab_Eol("@moe:");
- Part formalPart;
+ Part Part;
// Section init
//
@@ -832,9 +832,9 @@
if( blockInstancesCount > 0 ) {
writer.appendEol( ((blockInstancesCount > 1) ? " |and|" : "") );
for( Property inst : blockInstances ) {
- formalPart = StereotypeUtil.getPart(inst);
- if( formalPart != null ) {
- for( InstanceSpecification instance : formalPart.getInstance() ) {
+ Part = StereotypeUtil.getPart(inst);
+ if( Part != null ) {
+ for( InstanceSpecification instance : Part.getInstance() ) {
writer.appendTab3("init ")
.append(instance.getName())
.appendEol(";");
@@ -868,9 +868,9 @@
if( blockInstancesCount > 0 ) {
writer.appendEol( ((blockInstancesCount > 1) ? " |i|" : "") );
for( Property inst : blockInstances ) {
- formalPart = StereotypeUtil.getPart(inst);
- if( formalPart != null ) {
- for( InstanceSpecification instance : formalPart.getInstance() ) {
+ Part = StereotypeUtil.getPart(inst);
+ if( Part != null ) {
+ for( InstanceSpecification instance : Part.getInstance() ) {
writer.appendTab3("run ")
.append(instance.getName())
.appendEol(";");
@@ -909,14 +909,14 @@
* @param element
* @param writer
*/
- public void transformPropertyFormalPart(
+ public void transformPropertyPart(
Property element, PrettyPrintWriter writer) {
writer.appendTabEol("//!!FML:gen< Part >");
- Part formalPart = StereotypeUtil.getPart(element);
+ Part Part = StereotypeUtil.getPart(element);
- if( formalPart != null ) {
+ if( Part != null ) {
Configuration parent_context = StereotypeUtil.getConfiguration(element);
@@ -928,11 +928,11 @@
}
String comment_on_part = "";
- if (environmental_properties.contains(formalPart.getBaseProperty())) {
+ if (environmental_properties.contains(Part.getBaseProperty())) {
comment_on_part = " /* in formal context 'environment' */";
}
- if( formalPart.getInstance().isEmpty() ) {
+ if( Part.getInstance().isEmpty() ) {
writer.appendTab( element.getVisibility().toString() )
.append(" instance machine< ")
.append(element.getType().getName());
@@ -962,7 +962,7 @@
.appendEol(comment_on_part);
}
else {
- for( InstanceSpecification instance : formalPart.getInstance() ) {
+ for( InstanceSpecification instance : Part.getInstance() ) {
writer.appendTab( element.getVisibility().toString() )
.append(" instance machine< ")
.append(element.getType().getName())
diff --git a/codegen/org.eclipse.efm.formalml.concretesyntax.m2t/src/org/eclipse/efm/formalml/concretesyntax/m2t/factory/MainCodeGenerator.java b/codegen/org.eclipse.efm.formalml.concretesyntax.m2t/src/org/eclipse/efm/formalml/concretesyntax/m2t/factory/MainCodeGenerator.java
index e7ed0d4..34e2193 100644
--- a/codegen/org.eclipse.efm.formalml.concretesyntax.m2t/src/org/eclipse/efm/formalml/concretesyntax/m2t/factory/MainCodeGenerator.java
+++ b/codegen/org.eclipse.efm.formalml.concretesyntax.m2t/src/org/eclipse/efm/formalml/concretesyntax/m2t/factory/MainCodeGenerator.java
@@ -419,10 +419,9 @@
else {
writer.appendTabEol( "/* Unexpected property typed by <class> HERE */" );
- fClassFactory.transformPropertyFormalPart(element, writer);
+ fClassFactory.transformPropertyPart(element, writer);
}
}
-// else if( StereotypeUtil.getFormalEnvironment(element) != null ) {
else if( (element.getType() != null)
&& element.getType().getName().equals(STD_ENV_TYPE_NAME) ) {
fClassFactory.transformPropertyEnvironment(element, writer);
@@ -702,7 +701,7 @@
/**
* performTransform an environmental Connector element to a writer
* @param element
- * @param port_connectorEnd i.e. prt of the formalPart that isn't the environment
+ * @param port_connectorEnd i.e. prt of the Part that isn't the environment
* @param writer
*/
private void transformEnvironmentConnector(Connector element, ConnectorEnd port_connectorEnd, PrettyPrintWriter writer) {
@@ -730,7 +729,7 @@
/**
* performTransform an environmental Connector element to a writer
* @param element
- * @param port_connectorEnd i.e. prt of the formalPart that isn't the environment
+ * @param port_connectorEnd i.e. prt of the Part that isn't the environment
* @param writer
*/
private void transformRelationshipConnector(Connector element, PrettyPrintWriter writer) {
diff --git a/core/org.eclipse.efm.formalml/resources/library/FormalML-Standard-Library.notation b/core/org.eclipse.efm.formalml/resources/library/FormalML-Standard-Library.notation
index fed8222..187e060 100644
--- a/core/org.eclipse.efm.formalml/resources/library/FormalML-Standard-Library.notation
+++ b/core/org.eclipse.efm.formalml/resources/library/FormalML-Standard-Library.notation
@@ -15,11 +15,31 @@
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_zbi_8KGtEeao9M8nBNrVQw" type="Package_NameLabel_CN"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_zbi_8aGtEeao9M8nBNrVQw" type="Package_PackagedElementCompartment_CN">
+ <children xmi:type="notation:Shape" xmi:id="_ZeCicO-IEeaWHe1FUDLuKA" type="DataType_Shape_CN">
+ <children xmi:type="notation:DecorationNode" xmi:id="_ZeDJgO-IEeaWHe1FUDLuKA" type="DataType_NameLabel_CN"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_ZeDJge-IEeaWHe1FUDLuKA" type="DataType_FloatingNameLabel_CN">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_ZeDJgu-IEeaWHe1FUDLuKA" y="5"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_ZeDwkO-IEeaWHe1FUDLuKA" type="DataType_AttributeCompartment_CN">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_ZeDwke-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_ZeDwku-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_ZeDwk--IEeaWHe1FUDLuKA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZeDwlO-IEeaWHe1FUDLuKA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_ZeDwle-IEeaWHe1FUDLuKA" type="DataType_OperationCompartment_CN">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_ZeDwlu-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_ZeDwl--IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_ZeDwmO-IEeaWHe1FUDLuKA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZeDwme-IEeaWHe1FUDLuKA"/>
+ </children>
+ <element xmi:type="uml:DataType" href="FormalML-Standard-Library.uml#_CqJXEJeoEeaN6eM4hBtwog"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZeCice-IEeaWHe1FUDLuKA" x="83" y="118"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_zbi_8qGtEeao9M8nBNrVQw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_zbi_86GtEeao9M8nBNrVQw"/>
</children>
<element xmi:type="uml:Package" href="FormalML-Standard-Library.uml#_M5sUQJeoEeaN6eM4hBtwog"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zbhx0aGtEeao9M8nBNrVQw" width="256" height="102"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zbhx0aGtEeao9M8nBNrVQw" width="256" height="361"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_zbkOEKGtEeao9M8nBNrVQw" type="Package_Shape_CN">
<eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_znH90qGtEeao9M8nBNrVQw" source="PapyrusCSSForceValue">
@@ -27,27 +47,105 @@
</eAnnotations>
<children xmi:type="notation:DecorationNode" xmi:id="_zbkOEqGtEeao9M8nBNrVQw" type="Package_NameLabel_CN"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_zbkOE6GtEeao9M8nBNrVQw" type="Package_PackagedElementCompartment_CN">
+ <children xmi:type="notation:Shape" xmi:id="_W8o8sO-IEeaWHe1FUDLuKA" type="Class_Shape_CN">
+ <children xmi:type="notation:DecorationNode" xmi:id="_W8sAAO-IEeaWHe1FUDLuKA" type="Class_NameLabel_CN"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_W8snEO-IEeaWHe1FUDLuKA" type="Class_FloatingNameLabel_CN">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_W8snEe-IEeaWHe1FUDLuKA" y="5"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_W8tOIO-IEeaWHe1FUDLuKA" type="Class_AttributeCompartment_CN">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_W8tOIe-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_W8tOIu-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_W8tOI--IEeaWHe1FUDLuKA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W8tOJO-IEeaWHe1FUDLuKA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_W8tOJe-IEeaWHe1FUDLuKA" type="Class_OperationCompartment_CN">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_W8tOJu-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_W8tOJ--IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_W8tOKO-IEeaWHe1FUDLuKA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W8tOKe-IEeaWHe1FUDLuKA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_W8tOKu-IEeaWHe1FUDLuKA" type="Class_NestedClassifierCompartment_CN">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_W8tOK--IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_W8tOLO-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_W8tOLe-IEeaWHe1FUDLuKA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W8tOLu-IEeaWHe1FUDLuKA"/>
+ </children>
+ <element xmi:type="uml:Class" href="FormalML-Standard-Library.uml#_wuK5sJenEeaN6eM4hBtwog"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W8o8se-IEeaWHe1FUDLuKA" x="79" y="27"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_zbkOFKGtEeao9M8nBNrVQw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_zbkOFaGtEeao9M8nBNrVQw"/>
</children>
<element xmi:type="uml:Package" href="FormalML-Standard-Library.uml#_qbxukJenEeaN6eM4hBtwog"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zbkOEaGtEeao9M8nBNrVQw" x="260" width="256" height="102"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zbkOEaGtEeao9M8nBNrVQw" x="260" width="256" height="359"/>
</children>
<children xmi:type="notation:Shape" xmi:id="_eMWwoOPgEeag-YFRc8zsgw" type="Package_Shape_CN">
<children xmi:type="notation:DecorationNode" xmi:id="_eMX-wOPgEeag-YFRc8zsgw" type="Package_NameLabel_CN"/>
<children xmi:type="notation:BasicCompartment" xmi:id="_eMYl0OPgEeag-YFRc8zsgw" type="Package_PackagedElementCompartment_CN">
+ <children xmi:type="notation:Shape" xmi:id="_ZurmgO-IEeaWHe1FUDLuKA" type="Class_Shape_CN">
+ <children xmi:type="notation:DecorationNode" xmi:id="_Zus0oO-IEeaWHe1FUDLuKA" type="Class_NameLabel_CN"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Zus0oe-IEeaWHe1FUDLuKA" type="Class_FloatingNameLabel_CN">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Zus0ou-IEeaWHe1FUDLuKA" y="5"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_Zus0o--IEeaWHe1FUDLuKA" type="Class_AttributeCompartment_CN">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Zus0pO-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_Zus0pe-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_Zus0pu-IEeaWHe1FUDLuKA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zus0p--IEeaWHe1FUDLuKA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_Zus0qO-IEeaWHe1FUDLuKA" type="Class_OperationCompartment_CN">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Zus0qe-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_Zus0qu-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_Zus0q--IEeaWHe1FUDLuKA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zus0rO-IEeaWHe1FUDLuKA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_ZutbsO-IEeaWHe1FUDLuKA" type="Class_NestedClassifierCompartment_CN">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Zutbse-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_Zutbsu-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_Zutbs--IEeaWHe1FUDLuKA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZutbtO-IEeaWHe1FUDLuKA"/>
+ </children>
+ <element xmi:type="uml:OpaqueBehavior" href="FormalML-Standard-Library.uml#_hFGfYOPgEeag-YFRc8zsgw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZusNkO-IEeaWHe1FUDLuKA" x="76" y="43"/>
+ </children>
+ <children xmi:type="notation:Shape" xmi:id="_Z_JrcO-IEeaWHe1FUDLuKA" type="Class_Shape_CN">
+ <children xmi:type="notation:DecorationNode" xmi:id="_Z_KSgO-IEeaWHe1FUDLuKA" type="Class_NameLabel_CN"/>
+ <children xmi:type="notation:DecorationNode" xmi:id="_Z_KSge-IEeaWHe1FUDLuKA" type="Class_FloatingNameLabel_CN">
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_Z_KSgu-IEeaWHe1FUDLuKA" y="5"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_Z_K5kO-IEeaWHe1FUDLuKA" type="Class_AttributeCompartment_CN">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Z_K5ke-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_Z_K5ku-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_Z_K5k--IEeaWHe1FUDLuKA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z_K5lO-IEeaWHe1FUDLuKA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_Z_K5le-IEeaWHe1FUDLuKA" type="Class_OperationCompartment_CN">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Z_K5lu-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_Z_K5l--IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_Z_K5mO-IEeaWHe1FUDLuKA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z_K5me-IEeaWHe1FUDLuKA"/>
+ </children>
+ <children xmi:type="notation:BasicCompartment" xmi:id="_Z_K5mu-IEeaWHe1FUDLuKA" type="Class_NestedClassifierCompartment_CN">
+ <styles xmi:type="notation:TitleStyle" xmi:id="_Z_K5m--IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_Z_K5nO-IEeaWHe1FUDLuKA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_Z_K5ne-IEeaWHe1FUDLuKA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z_K5nu-IEeaWHe1FUDLuKA"/>
+ </children>
+ <element xmi:type="uml:OpaqueBehavior" href="FormalML-Standard-Library.uml#_nA2FEOPgEeag-YFRc8zsgw"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z_Jrce-IEeaWHe1FUDLuKA" x="79" y="183"/>
+ </children>
<styles xmi:type="notation:TitleStyle" xmi:id="_eMYl0ePgEeag-YFRc8zsgw"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_eMYl0uPgEeag-YFRc8zsgw"/>
</children>
<element xmi:type="uml:Package" href="FormalML-Standard-Library.uml#_eMLKcOPgEeag-YFRc8zsgw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eMWwoePgEeag-YFRc8zsgw" x="524" y="2" width="256" height="102"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eMWwoePgEeag-YFRc8zsgw" x="524" y="2" width="256" height="357"/>
</children>
<styles xmi:type="notation:TitleStyle" xmi:id="_QIz8ceohEeWVSqbNzcM85A"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_QIz8cuohEeWVSqbNzcM85A"/>
</children>
<styles xmi:type="notation:CanonicalStyle" xmi:id="_RYXf0OohEeWVSqbNzcM85A"/>
<element xmi:type="uml:Model" href="FormalML-Standard-Library.uml#_XfuxkOeuEeWhBfCNf_PCVQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QIyuUeohEeWVSqbNzcM85A" x="9" y="16" width="838" height="169"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QIyuUeohEeWVSqbNzcM85A" x="9" y="16" width="863" height="405"/>
</children>
<styles xmi:type="notation:StringValueStyle" xmi:id="_OHj2YeohEeWVSqbNzcM85A" name="diagram_compatibility_version" stringValue="1.2.0"/>
<styles xmi:type="notation:DiagramStyle" xmi:id="_OHj2YuohEeWVSqbNzcM85A"/>
diff --git a/core/org.eclipse.efm.papyrus.service.types/resources/elementtype/FormalML.elementtypesconfigurations b/core/org.eclipse.efm.papyrus.service.types/resources/elementtype/FormalML.elementtypesconfigurations
index 0293a61..5278f8d 100644
--- a/core/org.eclipse.efm.papyrus.service.types/resources/elementtype/FormalML.elementtypesconfigurations
+++ b/core/org.eclipse.efm.papyrus.service.types/resources/elementtype/FormalML.elementtypesconfigurations
@@ -49,11 +49,11 @@
<stereotypesQualifiedNames>fml::FormalModel</stereotypesQualifiedNames>
</matcherConfiguration>
</elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_uHg4Bu90EeaWHe1FUDLuKA" identifier="org.eclipse.efm.fml.FormalPart" name="FormalPart" hint="UML::Property">
+ <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_uHg4Bu90EeaWHe1FUDLuKA" identifier="org.eclipse.efm.fml.Part" name="Part" hint="UML::Property">
<iconEntry xmi:id="_uHg4B-90EeaWHe1FUDLuKA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
<specializedTypesID>org.eclipse.papyrus.uml.Property</specializedTypesID>
<matcherConfiguration xsi:type="stereotypematcher:StereotypeApplicationMatcherConfiguration" xmi:id="_uHg4CO90EeaWHe1FUDLuKA">
- <stereotypesQualifiedNames>fml::FormalPart</stereotypesQualifiedNames>
+ <stereotypesQualifiedNames>fml::Part</stereotypesQualifiedNames>
</matcherConfiguration>
</elementTypeConfigurations>
<elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_uHg4Ce90EeaWHe1FUDLuKA" identifier="org.eclipse.efm.fml.RdvBehavior" name="RdvBehavior" hint="UML::OpaqueBehavior">
@@ -119,8 +119,8 @@
<requiredProfiles>fml</requiredProfiles>
</stereotypesToApply>
</adviceBindingsConfigurations>
- <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_uHmXju90EeaWHe1FUDLuKA" identifier="org.eclipse.efm.fml.formalPart" description="formal part" target="_uHg4Bu90EeaWHe1FUDLuKA">
- <stereotypesToApply xmi:id="_uHmXj-90EeaWHe1FUDLuKA" stereotypeQualifiedName="fml::FormalPart" updateName="true">
+ <adviceBindingsConfigurations xsi:type="applystereotypeadvice:ApplyStereotypeAdviceConfiguration" xmi:id="_uHmXju90EeaWHe1FUDLuKA" identifier="org.eclipse.efm.fml.Part" description="formal part" target="_uHg4Bu90EeaWHe1FUDLuKA">
+ <stereotypesToApply xmi:id="_uHmXj-90EeaWHe1FUDLuKA" stereotypeQualifiedName="fml::Part" updateName="true">
<requiredProfiles>fml</requiredProfiles>
</stereotypesToApply>
</adviceBindingsConfigurations>
diff --git a/core/org.eclipse.efm.papyrus.service.types/resources/elementtype/FormalMLDI.elementtypesconfigurations b/core/org.eclipse.efm.papyrus.service.types/resources/elementtype/FormalMLDI.elementtypesconfigurations
index 56caa11..9aae8c4 100644
--- a/core/org.eclipse.efm.papyrus.service.types/resources/elementtype/FormalMLDI.elementtypesconfigurations
+++ b/core/org.eclipse.efm.papyrus.service.types/resources/elementtype/FormalMLDI.elementtypesconfigurations
@@ -170,24 +170,24 @@
<specializedTypesID>org.eclipse.efm.fml.FormalModel</specializedTypesID>
<specializedTypesID>org.eclipse.papyrus.umldi.Model_Shape_CN</specializedTypesID>
</elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Gjbile93EeaWHe1FUDLuKA" identifier="org.eclipse.efm.fmldi.FormalPart_Property_AttributeLabel" name="FormalPart (Property_AttributeLabel)" hint="Property_AttributeLabel">
+ <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Gjbile93EeaWHe1FUDLuKA" identifier="org.eclipse.efm.fmldi.Part_Property_AttributeLabel" name="Part (Property_AttributeLabel)" hint="Property_AttributeLabel">
<iconEntry xmi:id="_Gjbilu93EeaWHe1FUDLuKA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <specializedTypesID>org.eclipse.efm.fml.FormalPart</specializedTypesID>
+ <specializedTypesID>org.eclipse.efm.fml.Part</specializedTypesID>
<specializedTypesID>org.eclipse.papyrus.umldi.Property_AttributeLabel</specializedTypesID>
</elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Gjbil-93EeaWHe1FUDLuKA" identifier="org.eclipse.efm.fmldi.FormalPart_Property_Edge" name="FormalPart (Property_Edge)" hint="Property_Edge">
+ <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Gjbil-93EeaWHe1FUDLuKA" identifier="org.eclipse.efm.fmldi.Part_Property_Edge" name="Part (Property_Edge)" hint="Property_Edge">
<iconEntry xmi:id="_GjbimO93EeaWHe1FUDLuKA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <specializedTypesID>org.eclipse.efm.fml.FormalPart</specializedTypesID>
+ <specializedTypesID>org.eclipse.efm.fml.Part</specializedTypesID>
<specializedTypesID>org.eclipse.papyrus.umldi.Property_Edge</specializedTypesID>
</elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Gjbime93EeaWHe1FUDLuKA" identifier="org.eclipse.efm.fmldi.FormalPart_Property_Shape" name="FormalPart (Property_Shape)" hint="Property_Shape">
+ <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Gjbime93EeaWHe1FUDLuKA" identifier="org.eclipse.efm.fmldi.Part_Property_Shape" name="Part (Property_Shape)" hint="Property_Shape">
<iconEntry xmi:id="_Gjbimu93EeaWHe1FUDLuKA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <specializedTypesID>org.eclipse.efm.fml.FormalPart</specializedTypesID>
+ <specializedTypesID>org.eclipse.efm.fml.Part</specializedTypesID>
<specializedTypesID>org.eclipse.papyrus.umldi.Property_Shape</specializedTypesID>
</elementTypeConfigurations>
- <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Gjbim-93EeaWHe1FUDLuKA" identifier="org.eclipse.efm.fmldi.FormalPart_Property_Shape_CN" name="FormalPart (Property_Shape_CN)" hint="Property_Shape_CN">
+ <elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Gjbim-93EeaWHe1FUDLuKA" identifier="org.eclipse.efm.fmldi.Part_Property_Shape_CN" name="Part (Property_Shape_CN)" hint="Property_Shape_CN">
<iconEntry xmi:id="_GjbinO93EeaWHe1FUDLuKA" iconPath="/icons/full/obj16/Property.gif" bundleId="org.eclipse.uml2.uml.edit"/>
- <specializedTypesID>org.eclipse.efm.fml.FormalPart</specializedTypesID>
+ <specializedTypesID>org.eclipse.efm.fml.Part</specializedTypesID>
<specializedTypesID>org.eclipse.papyrus.umldi.Property_Shape_CN</specializedTypesID>
</elementTypeConfigurations>
<elementTypeConfigurations xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" xmi:id="_Gjbine93EeaWHe1FUDLuKA" identifier="org.eclipse.efm.fmldi.RdvBehavior_OpaqueBehavior_NestedClassifierLabel" name="RdvBehavior (OpaqueBehavior_NestedClassifierLabel)" hint="OpaqueBehavior_NestedClassifierLabel">
diff --git a/diagram/org.eclipse.efm.papyrus.diagram.internalblock/resources/style/internalblock.css b/diagram/org.eclipse.efm.papyrus.diagram.internalblock/resources/style/internalblock.css
index 9f198b6..44eb762 100644
--- a/diagram/org.eclipse.efm.papyrus.diagram.internalblock/resources/style/internalblock.css
+++ b/diagram/org.eclipse.efm.papyrus.diagram.internalblock/resources/style/internalblock.css
@@ -7,7 +7,7 @@
* TestContext style
*/
-[appliedStereotypes~="Configuration"]{
+[appliedStereotypes~="fml::Configuration"]{
fillColor:orange;
}
@@ -16,12 +16,12 @@
* Block Instance style
*/
-Property[appliedStereotypes~="FormalPart"] Compartment{
+Property[appliedStereotypes~="fml::Part"] Compartment{
visible:false;
}
-Property[appliedStereotypes~="FormalPart"]{
- masklabel:name type multiplicity;
+Property[appliedStereotypes~="fml::Part"]{
+ /*masklabel:name type multiplicity;*/
elementIcon:false;
fillColor:lightGreen;
}
@@ -31,15 +31,17 @@
*/
-Property[appliedStereotypes~="FormalEnvironment"]{
+/*Property[appliedStereotypes~="FormalEnvironment"]{*/
+Property[type="FormalML-Standard-Library::Class::Env"]{
fillColor:red;
masklabel:name;
elementIcon:false;
}
+/*
Property[appliedStereotypes~="FormalEnvironment"] Compartment{
visible:false;
-}
+} */
/*
* Connector style
@@ -70,6 +72,6 @@
masklabel : name type;
}
-[appliedStereotypes~="FormalPart"] Port{
+[appliedStereotypes~="fml::Part"] Port{
masklabel : name;
}
diff --git a/diagram/org.eclipse.efm.papyrus.diagram.statemachine/resources/style/statemachine.css b/diagram/org.eclipse.efm.papyrus.diagram.statemachine/resources/style/statemachine.css
index c577206..0f61dba 100644
--- a/diagram/org.eclipse.efm.papyrus.diagram.statemachine/resources/style/statemachine.css
+++ b/diagram/org.eclipse.efm.papyrus.diagram.statemachine/resources/style/statemachine.css
@@ -16,11 +16,11 @@
* Block Instance style
*/
-Property[appliedStereotypes~="FormalPart"] Compartment{
+Property[appliedStereotypes~="fml::Part"] Compartment{
visible:false;
}
-Property[appliedStereotypes~="FormalPart"]{
+Property[appliedStereotypes~="fml::Part"]{
masklabel:name type multiplicity;
elementIcon:false;
fillColor:lightGreen;
@@ -70,6 +70,6 @@
masklabel : name type;
}
-[appliedStereotypes~="FormalPart"] Port{
+[appliedStereotypes~="fml::Part"] Port{
masklabel : name;
}
