Bug 535759 - [SysML 1.4] Migrate to photon
- update nattable configuration to get ids
- manually set ids for manager (referenced in notation)
- add import due to reexport removal in core
- fix deprecation issues
- Still an exception when architecture framework is unknown
https://bugs.eclipse.org/bugs/show_bug.cgi?id=535393
(opening a SysML 1.4 model with SysML 1.4 installed)
Change-Id: I9a30f491e7d2d904a2bc008063c26f4f49c85efb
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
diff --git a/README.md b/README.md
index e77d986..73ec18d 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@
### Building against a specific Eclipse Release ###
-By default SysML14 is build against Eclipse Neon.
+By default SysML14 is build against latest stable Eclipse Release Train (Photon).
### Building for Eclipser server ###
diff --git a/core/.settings/org.eclipse.core.resources.prefs b/core/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/core/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/core/org.eclipse.papyrus.sysml14.service.types.tests/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14.service.types.tests/META-INF/MANIFEST.MF
index 223e963..252461f 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14.service.types.tests/META-INF/MANIFEST.MF
@@ -1,6 +1,9 @@
Manifest-Version: 1.0
Fragment-Host: org.eclipse.papyrus.sysml14.service.types;bundle-version="1.0.0"
-Export-Package: org.eclipse.papyrus.sysml14.service.types.tests
+Export-Package: org.eclipse.papyrus.sysml14.service.types.tests,
+ org.eclipse.papyrus.sysml14.service.types.tests.advice,
+ org.eclipse.papyrus.sysml14.service.types.tests.command,
+ org.eclipse.papyrus.sysml14.service.types.tests.util
Bundle-Vendor: %Bundle-Vendor
Bundle-Version: 1.3.0.qualifier
Bundle-Name: %Bundle-Name
@@ -13,6 +16,7 @@
org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.interactionoverview;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[4.0.0,5.0.0)"
Automatic-Module-Name: org.eclipse.papyrus.sysml14.service.types.tests
diff --git a/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/advice/ConformCreationEditHelperAdviceTest.java b/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/advice/ConformCreationEditHelperAdviceTest.java
index 1ef7769..890c034 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/advice/ConformCreationEditHelperAdviceTest.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/advice/ConformCreationEditHelperAdviceTest.java
@@ -66,9 +66,9 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
StereotypeApplicationHelper stereotypeApplicationHelper = StereotypeApplicationHelper.getInstance(null);
classStereotypeViewpoint = model.createOwnedClass("classStereotypeViewpoint", false);
- stereotypeApplicationHelper.applyStereotype(classStereotypeViewpoint, ModelelementsPackage.eINSTANCE.getViewpoint());
+ stereotypeApplicationHelper.applyStereotype(classStereotypeViewpoint, ModelelementsPackage.eINSTANCE.getViewpoint(),null);
classStereotypeView = model.createOwnedClass("classStereotypeView", false);
- stereotypeApplicationHelper.applyStereotype(classStereotypeView, ModelelementsPackage.eINSTANCE.getView());
+ stereotypeApplicationHelper.applyStereotype(classStereotypeView, ModelelementsPackage.eINSTANCE.getView(),null);
}
diff --git a/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/advice/ConformReorientEditHelperAdviceTest.java b/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/advice/ConformReorientEditHelperAdviceTest.java
index 4011874..4f3fe75 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/advice/ConformReorientEditHelperAdviceTest.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/advice/ConformReorientEditHelperAdviceTest.java
@@ -89,11 +89,11 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
StereotypeApplicationHelper stereotypeApplicationHelper = StereotypeApplicationHelper.getInstance(null);
classStereotypeViewpoint = model.createOwnedClass("classStereotypeViewpoint", false);
- stereotypeApplicationHelper.applyStereotype(classStereotypeViewpoint, ModelelementsPackage.eINSTANCE.getViewpoint());
+ stereotypeApplicationHelper.applyStereotype(classStereotypeViewpoint, ModelelementsPackage.eINSTANCE.getViewpoint(),null);
classStereotypeView = model.createOwnedClass("classStereotypeView", false);
- stereotypeApplicationHelper.applyStereotype(classStereotypeView, ModelelementsPackage.eINSTANCE.getView());
+ stereotypeApplicationHelper.applyStereotype(classStereotypeView, ModelelementsPackage.eINSTANCE.getView(),null);
- // class not sterotyped
+ // class not stereotyped
notStereotypeClass = model.createOwnedClass("notStereotypeClass", false);
// creation of the conform link
@@ -101,15 +101,15 @@
model.getPackagedElements().add(conformLink);
conformLink.getClients().add(classStereotypeView);
conformLink.getSuppliers().add(classStereotypeViewpoint);
- stereotypeApplicationHelper.applyStereotype(conformLink, ModelelementsPackage.eINSTANCE.getConform());
+ stereotypeApplicationHelper.applyStereotype(conformLink, ModelelementsPackage.eINSTANCE.getConform(),null);
classStereotypeView2 = model.createOwnedClass("classStereotypeView2", false);
- stereotypeApplicationHelper.applyStereotype(classStereotypeView2, ModelelementsPackage.eINSTANCE.getView());
+ stereotypeApplicationHelper.applyStereotype(classStereotypeView2, ModelelementsPackage.eINSTANCE.getView(),null);
classStereotypeViewpoint2 = model.createOwnedClass("classStereotypeViewpoint2", false);
- stereotypeApplicationHelper.applyStereotype(classStereotypeViewpoint2, ModelelementsPackage.eINSTANCE.getViewpoint());
+ stereotypeApplicationHelper.applyStereotype(classStereotypeViewpoint2, ModelelementsPackage.eINSTANCE.getViewpoint(),null);
}
diff --git a/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/command/UpdateNestedPathConnectorEndTest.java b/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/command/UpdateNestedPathConnectorEndTest.java
index 251326f..bb33d6f 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/command/UpdateNestedPathConnectorEndTest.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types.tests/src/org/eclipse/papyrus/sysml14/service/types/tests/command/UpdateNestedPathConnectorEndTest.java
@@ -89,7 +89,7 @@
// Data structure
StereotypeApplicationHelper stereotypeApplicationHelper = StereotypeApplicationHelper.getInstance(null);
blockRoot = model.createOwnedClass("blockClass", false);
- stereotypeApplicationHelper.applyStereotype(blockRoot, BlocksPackage.eINSTANCE.getBlock());
+ stereotypeApplicationHelper.applyStereotype(blockRoot, BlocksPackage.eINSTANCE.getBlock(),null);
Class classType = model.createOwnedClass("classType", false);
p1 = blockRoot.createOwnedAttribute("p1", classType);
p2 = blockRoot.createOwnedAttribute("p2", classType);
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14.service.types/META-INF/MANIFEST.MF
index e3092d6..f673b6c 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14.service.types/META-INF/MANIFEST.MF
@@ -6,11 +6,11 @@
Bundle-Activator: org.eclipse.papyrus.sysml14.service.types.Activator
Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.types.core;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.sysml14;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/command/UpdateNestedPathConnectorEnd.java b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/command/UpdateNestedPathConnectorEnd.java
index ca9cc2c..38457ed 100644
--- a/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/command/UpdateNestedPathConnectorEnd.java
+++ b/core/org.eclipse.papyrus.sysml14.service.types/src/org/eclipse/papyrus/sysml14/service/types/command/UpdateNestedPathConnectorEnd.java
@@ -116,7 +116,7 @@
}
} else {
if (nestedConnectorEnd == null) {
- nestedConnectorEnd = (NestedConnectorEnd) StereotypeApplicationHelper.getInstance(null).applyStereotype(connectorEnd, BlocksPackage.eINSTANCE.getNestedConnectorEnd());
+ nestedConnectorEnd = (NestedConnectorEnd) StereotypeApplicationHelper.getInstance(null).applyStereotype(connectorEnd, BlocksPackage.eINSTANCE.getNestedConnectorEnd(),null);
}
// set new path if different from existing
if (!nestedConnectorEnd.getPropertyPath().equals(nestedPath)) {
diff --git a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/blocks/BlockTest.java b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/blocks/BlockTest.java
index 3e9f2c6..9309b89 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/blocks/BlockTest.java
+++ b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/blocks/BlockTest.java
@@ -64,10 +64,10 @@
* create an association
*/
Class owningAgregationBlockClass1=model.createOwnedClass("Block1", false);
- owningAgregationBlock = (Block) stereotypeApplicationHelper.applyStereotype(owningAgregationBlockClass1, BlocksPackage.eINSTANCE.getBlock());
+ owningAgregationBlock = (Block) stereotypeApplicationHelper.applyStereotype(owningAgregationBlockClass1, BlocksPackage.eINSTANCE.getBlock(),null);
Class ownedBlockClass2=model.createOwnedClass("Block2", false);
- stereotypeApplicationHelper.applyStereotype(ownedBlockClass2, BlocksPackage.eINSTANCE.getBlock());
+ stereotypeApplicationHelper.applyStereotype(ownedBlockClass2, BlocksPackage.eINSTANCE.getBlock(),null);
Property p1Inblock1 = owningAgregationBlockClass1.createOwnedAttribute("P1", ownedBlockClass2);
@@ -85,7 +85,7 @@
* create a composition
*/
Class owningCompositionBlockClass3 = model.createOwnedClass("Block3", false);
- owningCompositionBlock = (Block) stereotypeApplicationHelper.applyStereotype(owningCompositionBlockClass3, BlocksPackage.eINSTANCE.getBlock());
+ owningCompositionBlock = (Block) stereotypeApplicationHelper.applyStereotype(owningCompositionBlockClass3, BlocksPackage.eINSTANCE.getBlock(),null);
Property p1Inblock3 = owningCompositionBlockClass3.createOwnedAttribute("P1", ownedBlockClass2);
@@ -103,9 +103,9 @@
* create a flow property and add it to the Block
*/
Class flowPropertyClass = model.createOwnedClass("FPClass1", false);
- flowPropertiesBlock = (Block) stereotypeApplicationHelper.applyStereotype(flowPropertyClass, BlocksPackage.eINSTANCE.getBlock());
+ flowPropertiesBlock = (Block) stereotypeApplicationHelper.applyStereotype(flowPropertyClass, BlocksPackage.eINSTANCE.getBlock(),null);
Property p0 = flowPropertyClass.createOwnedAttribute("p0", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(p0, PortsandflowsPackage.eINSTANCE.getFlowProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(p0, PortsandflowsPackage.eINSTANCE.getFlowProperty(),null);
}
/**
diff --git a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/blocks/BoundReferenceTest.java b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/blocks/BoundReferenceTest.java
index d4051e1..0d87b38 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/blocks/BoundReferenceTest.java
+++ b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/blocks/BoundReferenceTest.java
@@ -58,23 +58,23 @@
Class composite=model.createOwnedClass("mainComposite", false);
- stereotypeApplicationHelper.applyStereotype(composite, BlocksPackage.eINSTANCE.getBlock());
+ stereotypeApplicationHelper.applyStereotype(composite, BlocksPackage.eINSTANCE.getBlock(),null);
Class block1=model.createOwnedClass("Block1", false);
- stereotypeApplicationHelper.applyStereotype(block1, BlocksPackage.eINSTANCE.getBlock());
+ stereotypeApplicationHelper.applyStereotype(block1, BlocksPackage.eINSTANCE.getBlock(),null);
Class block2=model.createOwnedClass("Block2", false);
- stereotypeApplicationHelper.applyStereotype(block2, BlocksPackage.eINSTANCE.getBlock());
+ stereotypeApplicationHelper.applyStereotype(block2, BlocksPackage.eINSTANCE.getBlock(),null);
p1 = composite.createOwnedAttribute("P1", block1);
Property p2=composite.createOwnedAttribute("P2", block2);
- defaultBoundReference = (BoundReference)stereotypeApplicationHelper.applyStereotype(p2, BlocksPackage.eINSTANCE.getBoundReference());
+ defaultBoundReference = (BoundReference)stereotypeApplicationHelper.applyStereotype(p2, BlocksPackage.eINSTANCE.getBoundReference(),null);
Connector connector=composite.createOwnedConnector("connector");
- stereotypeApplicationHelper.applyStereotype(connector, BlocksPackage.eINSTANCE.getBindingConnector());
+ stereotypeApplicationHelper.applyStereotype(connector, BlocksPackage.eINSTANCE.getBindingConnector(),null);
ConnectorEnd connectorEnd1= connector.createEnd();
connectorEnd1.setRole(p1);
- stereotypeApplicationHelper.applyStereotype(connector, BlocksPackage.eINSTANCE.getNestedConnectorEnd());
+ stereotypeApplicationHelper.applyStereotype(connector, BlocksPackage.eINSTANCE.getNestedConnectorEnd(),null);
ConnectorEnd connectorEnd2= connector.createEnd();
connectorEnd2.setRole(p2);
diff --git a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/constraintblocks/ConstraintBlockTest.java b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/constraintblocks/ConstraintBlockTest.java
index 2d344a9..b4c5450 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/constraintblocks/ConstraintBlockTest.java
+++ b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/constraintblocks/ConstraintBlockTest.java
@@ -57,14 +57,14 @@
*/
Class ownedBlockClass3=model.createOwnedClass("Block3", false);
- stereotypeApplicationHelper.applyStereotype(ownedBlockClass3, BlocksPackage.eINSTANCE.getBlock());
+ stereotypeApplicationHelper.applyStereotype(ownedBlockClass3, BlocksPackage.eINSTANCE.getBlock(),null);
//The root constraintBlock
Class constraintBlockClass = model.createOwnedClass("ConstraintBlock", false);
- constraintBlock = (ConstraintBlock) stereotypeApplicationHelper.applyStereotype(constraintBlockClass, ConstraintblocksPackage.eINSTANCE.getConstraintBlock());
+ constraintBlock = (ConstraintBlock) stereotypeApplicationHelper.applyStereotype(constraintBlockClass, ConstraintblocksPackage.eINSTANCE.getConstraintBlock(),null);
Class ownedBlockClass2=model.createOwnedClass("Block2", false);
- stereotypeApplicationHelper.applyStereotype(ownedBlockClass2, BlocksPackage.eINSTANCE.getBlock());
+ stereotypeApplicationHelper.applyStereotype(ownedBlockClass2, BlocksPackage.eINSTANCE.getBlock(),null);
//create a owned property type by a ConstraintBlock
constraintBlockClass.createOwnedAttribute("cbProperty", constraintBlockClass);
diff --git a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/deprecatedelements/FlowPortTest.java b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/deprecatedelements/FlowPortTest.java
index 8157c13..7cea172 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/deprecatedelements/FlowPortTest.java
+++ b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/deprecatedelements/FlowPortTest.java
@@ -86,19 +86,19 @@
// Add FlowPort stereotypes
StereotypeApplicationHelper stereotypeApplicationHelper = StereotypeApplicationHelper.getInstance(null);
fpDefault = (FlowPort) stereotypeApplicationHelper.applyStereotype(p0,
- DeprecatedelementsPackage.eINSTANCE.getFlowPort());
+ DeprecatedelementsPackage.eINSTANCE.getFlowPort(),null);
fpOut = (FlowPort) stereotypeApplicationHelper.applyStereotype(p1,
- DeprecatedelementsPackage.eINSTANCE.getFlowPort());
+ DeprecatedelementsPackage.eINSTANCE.getFlowPort(),null);
fpOut.setDirection(FlowDirection.OUT);
fpIn = (FlowPort) stereotypeApplicationHelper.applyStereotype(p2,
- DeprecatedelementsPackage.eINSTANCE.getFlowPort());
+ DeprecatedelementsPackage.eINSTANCE.getFlowPort(),null);
fpIn.setDirection(FlowDirection.IN);
p2.setIsConjugated(true);
// Add FlowSpecification
- stereotypeApplicationHelper.applyStereotype(i2, DeprecatedelementsPackage.eINSTANCE.getFlowSpecification());
+ stereotypeApplicationHelper.applyStereotype(i2, DeprecatedelementsPackage.eINSTANCE.getFlowSpecification(),null);
}
/**
diff --git a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/deprecatedelements/FlowSpecificationTest.java b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/deprecatedelements/FlowSpecificationTest.java
index c51d43e..0dccbdf 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/deprecatedelements/FlowSpecificationTest.java
+++ b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/deprecatedelements/FlowSpecificationTest.java
@@ -55,13 +55,13 @@
* create a FlowSpecification
*/
Interface flowSpecificationInterface=model.createOwnedInterface("FlowSpecification1");
- flowSpecification = (FlowSpecification) stereotypeApplicationHelper.applyStereotype(flowSpecificationInterface, DeprecatedelementsPackage.eINSTANCE.getFlowSpecification());
+ flowSpecification = (FlowSpecification) stereotypeApplicationHelper.applyStereotype(flowSpecificationInterface, DeprecatedelementsPackage.eINSTANCE.getFlowSpecification(),null);
/*
* create a flow property and add it to the FlowSpecification
*/
Property property1 = flowSpecificationInterface.createOwnedAttribute("property1", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(property1, PortsandflowsPackage.eINSTANCE.getFlowProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(property1, PortsandflowsPackage.eINSTANCE.getFlowProperty(),null);
}
diff --git a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/ElementGroupTest.java b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/ElementGroupTest.java
index 214e065..eeeda0d 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/ElementGroupTest.java
+++ b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/ElementGroupTest.java
@@ -61,7 +61,7 @@
// Create comments & class
Comment defaultComment= model.createOwnedComment();
- defaultElementgroup = (ElementGroup)StereotypeApplicationHelper.getInstance(null).applyStereotype(defaultComment, ModelelementsPackage.eINSTANCE.getElementGroup());
+ defaultElementgroup = (ElementGroup)StereotypeApplicationHelper.getInstance(null).applyStereotype(defaultComment, ModelelementsPackage.eINSTANCE.getElementGroup(),null);
defaultComment.setBody(CRITERION);
class1 = model.createOwnedClass("Class1", false);
class2 = model.createOwnedClass("Class2", false);
diff --git a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/StakeholderTest.java b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/StakeholderTest.java
index 46cd931..a2ffff9 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/StakeholderTest.java
+++ b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/StakeholderTest.java
@@ -61,7 +61,7 @@
Class defaultClass = model.createOwnedClass("defaultClass", false);
// Add stakeholder stereotypes
- defaultStakeholder = (Stakeholder)StereotypeApplicationHelper.getInstance(null).applyStereotype(defaultClass, ModelelementsPackage.eINSTANCE.getStakeholder());
+ defaultStakeholder = (Stakeholder)StereotypeApplicationHelper.getInstance(null).applyStereotype(defaultClass, ModelelementsPackage.eINSTANCE.getStakeholder(),null);
Comment comment1=UMLFactory.eINSTANCE.createComment();
comment1.setBody(THIS_IS_THE_BODY_OF_COMMENT1);
model.getOwnedComments().add(comment1);
diff --git a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/ViewPointTest.java b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/ViewPointTest.java
index 18d2948..994bb23 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/ViewPointTest.java
+++ b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/ViewPointTest.java
@@ -68,7 +68,7 @@
// Add viewPoint stereotypes
StereotypeApplicationHelper stereotypeApplicationHelper = StereotypeApplicationHelper.getInstance(null);
- defaultViewpoint = (Viewpoint)stereotypeApplicationHelper.applyStereotype(defaultClass, ModelelementsPackage.eINSTANCE.getViewpoint());
+ defaultViewpoint = (Viewpoint)stereotypeApplicationHelper.applyStereotype(defaultClass, ModelelementsPackage.eINSTANCE.getViewpoint(),null);
Comment comment1=UMLFactory.eINSTANCE.createComment();
comment1.setBody(THIS_IS_THE_BODY_OF_COMMENT1);
model.getOwnedComments().add(comment1);
@@ -82,7 +82,7 @@
defaultClass.getOwnedOperations().add(createOperation);
ownedBehavior = defaultClass.createOwnedBehavior("aBehavior", UMLPackage.eINSTANCE.getActivity());
createOperation.getMethods().add(ownedBehavior);
- stereotypeApplicationHelper.applyStereotype(createOperation, StandardPackage.eINSTANCE.getCreate());
+ stereotypeApplicationHelper.applyStereotype(createOperation, StandardPackage.eINSTANCE.getCreate(),null);
}
/**
diff --git a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/ViewTest.java b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/ViewTest.java
index 5b31115..b931ca0 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/ViewTest.java
+++ b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/modelelements/ViewTest.java
@@ -65,16 +65,16 @@
// Add View stereotype
- defaultView = (View)StereotypeApplicationHelper.getInstance(null).applyStereotype(defaultClass, ModelelementsPackage.eINSTANCE.getView());
+ defaultView = (View)StereotypeApplicationHelper.getInstance(null).applyStereotype(defaultClass, ModelelementsPackage.eINSTANCE.getView(),null);
// Add ViewPoint stereotype
- viewpoint = (Viewpoint)StereotypeApplicationHelper.getInstance(null).applyStereotype(class1, ModelelementsPackage.eINSTANCE.getViewpoint());
- stakeholder = (Stakeholder)StereotypeApplicationHelper.getInstance(null).applyStereotype(class2, ModelelementsPackage.eINSTANCE.getStakeholder());
+ viewpoint = (Viewpoint)StereotypeApplicationHelper.getInstance(null).applyStereotype(class1, ModelelementsPackage.eINSTANCE.getViewpoint(),null);
+ stakeholder = (Stakeholder)StereotypeApplicationHelper.getInstance(null).applyStereotype(class2, ModelelementsPackage.eINSTANCE.getStakeholder(),null);
// create conform link based on Generalization
Generalization generalization=defaultClass.createGeneralization(class1);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(generalization, ModelelementsPackage.eINSTANCE.getConform());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(generalization, ModelelementsPackage.eINSTANCE.getConform(),null);
//add stakeholder to the viewpoint
viewpoint.getStakeholder().add(stakeholder);
diff --git a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/portsandflows/FlowPropertyTest.java b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/portsandflows/FlowPropertyTest.java
index 60d92aa..9042d50 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/portsandflows/FlowPropertyTest.java
+++ b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/portsandflows/FlowPropertyTest.java
@@ -72,13 +72,13 @@
Property p2 = i.createOwnedAttribute("p2", null);
// Add FlowPort stereotypes
- fpIn = (FlowProperty)StereotypeApplicationHelper.getInstance(null).applyStereotype(p0, PortsandflowsPackage.eINSTANCE.getFlowProperty());
+ fpIn = (FlowProperty)StereotypeApplicationHelper.getInstance(null).applyStereotype(p0, PortsandflowsPackage.eINSTANCE.getFlowProperty(),null);
fpIn.setDirection(FlowDirection.IN);
- fpOut = (FlowProperty)StereotypeApplicationHelper.getInstance(null).applyStereotype(p1, PortsandflowsPackage.eINSTANCE.getFlowProperty());
+ fpOut = (FlowProperty)StereotypeApplicationHelper.getInstance(null).applyStereotype(p1, PortsandflowsPackage.eINSTANCE.getFlowProperty(),null);
fpOut.setDirection(FlowDirection.OUT);
- fpInOut = (FlowProperty)StereotypeApplicationHelper.getInstance(null).applyStereotype(p2, PortsandflowsPackage.eINSTANCE.getFlowProperty());
+ fpInOut = (FlowProperty)StereotypeApplicationHelper.getInstance(null).applyStereotype(p2, PortsandflowsPackage.eINSTANCE.getFlowProperty(),null);
fpInOut.setDirection(FlowDirection.INOUT);
}
diff --git a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/requirements/RequirementTest.java b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/requirements/RequirementTest.java
index dadf50c..55df2f3 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/requirements/RequirementTest.java
+++ b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/requirements/RequirementTest.java
@@ -113,16 +113,16 @@
Class defaultClass = model.createOwnedClass("defaultClass", false);
// Add Requirement stereotypes
- defaultReq = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(defaultClass, RequirementsPackage.eINSTANCE.getRequirement());
+ defaultReq = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(defaultClass, RequirementsPackage.eINSTANCE.getRequirement(),null);
// ////////////////////////////////////////////////////////////////////
// Prepare getMaster test elements
// ////////////////////////////////////////////////////////////////////
Class master = model.createOwnedClass("master", false);
- masterReq = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(master, RequirementsPackage.eINSTANCE.getRequirement());
+ masterReq = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(master, RequirementsPackage.eINSTANCE.getRequirement(),null);
copy = model.createOwnedClass("copy", false);
- copyReq = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(copy, RequirementsPackage.eINSTANCE.getRequirement());
+ copyReq = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(copy, RequirementsPackage.eINSTANCE.getRequirement(),null);
// Add "copy" (Abstraction) between master and copy
// copy -> master
@@ -130,7 +130,7 @@
copy2Master.getClients().add(copy);
copy2Master.getSuppliers().add(master);
model.getPackagedElements().add(copy2Master);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(copy2Master, RequirementsPackage.eINSTANCE.getCopy());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(copy2Master, RequirementsPackage.eINSTANCE.getCopy(),null);
// ////////////////////////////////////////////////////////////////////
@@ -139,16 +139,16 @@
// ////////////////////////////////////////////////////////////////////
Class derive1 = model.createOwnedClass("d1", false);
- derive1Req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(derive1, RequirementsPackage.eINSTANCE.getRequirement());
+ derive1Req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(derive1, RequirementsPackage.eINSTANCE.getRequirement(),null);
Class derive2 = model.createOwnedClass("d2", false);
- derive2Req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(derive2, RequirementsPackage.eINSTANCE.getRequirement());
+ derive2Req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(derive2, RequirementsPackage.eINSTANCE.getRequirement(),null);
derived1 = model.createOwnedClass("dd1", false);
- derived1Req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(derived1, RequirementsPackage.eINSTANCE.getRequirement());
+ derived1Req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(derived1, RequirementsPackage.eINSTANCE.getRequirement(),null);
derived2 = model.createOwnedClass("dd2", false);
- derived2Req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(derived2, RequirementsPackage.eINSTANCE.getRequirement());
+ derived2Req = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(derived2, RequirementsPackage.eINSTANCE.getRequirement(),null);
// Add "DeriveReqt" (Abstraction) between derive and derived
// derived1 -> derive1, derive2
@@ -157,19 +157,19 @@
d11.getClients().add(derived1);
d11.getSuppliers().add(derive1);
model.getPackagedElements().add(d11);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(d11, RequirementsPackage.eINSTANCE.getDeriveReqt());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(d11, RequirementsPackage.eINSTANCE.getDeriveReqt(),null);
Abstraction d12 = UMLFactory.eINSTANCE.createAbstraction();
d12.getClients().add(derived1);
d12.getSuppliers().add(derive2);
model.getPackagedElements().add(d12);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(d12, RequirementsPackage.eINSTANCE.getDeriveReqt());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(d12, RequirementsPackage.eINSTANCE.getDeriveReqt(),null);
Abstraction d22 = UMLFactory.eINSTANCE.createAbstraction();
d22.getClients().add(derived2);
d22.getSuppliers().add(derive2);
model.getPackagedElements().add(d22);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(d22, RequirementsPackage.eINSTANCE.getDeriveReqt());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(d22, RequirementsPackage.eINSTANCE.getDeriveReqt(),null);
// ////////////////////////////////////////////////////////////////////
@@ -178,7 +178,7 @@
// ////////////////////////////////////////////////////////////////////
Class satisfied = model.createOwnedClass("satisfied", false);
- satisfiedReq = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(satisfied, RequirementsPackage.eINSTANCE.getRequirement());
+ satisfiedReq = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(satisfied, RequirementsPackage.eINSTANCE.getRequirement(),null);
satisfyingNE1 = model.createOwnedClass("sNE1", false);
satisfyingNE2 = model.createOwnedClass("sNE2", false);
@@ -190,13 +190,13 @@
ne12S1.getClients().add(satisfyingNE1);
ne12S1.getSuppliers().add(satisfied);
model.getPackagedElements().add(ne12S1);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(ne12S1, RequirementsPackage.eINSTANCE.getSatisfy());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(ne12S1, RequirementsPackage.eINSTANCE.getSatisfy(),null);
Realization ne22S1 = UMLFactory.eINSTANCE.createRealization();
ne22S1.getClients().add(satisfyingNE2);
ne22S1.getSuppliers().add(satisfied);
model.getPackagedElements().add(ne22S1);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(ne22S1, RequirementsPackage.eINSTANCE.getSatisfy());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(ne22S1, RequirementsPackage.eINSTANCE.getSatisfy(),null);
// ////////////////////////////////////////////////////////////////////
@@ -205,7 +205,7 @@
// ////////////////////////////////////////////////////////////////////
Class refined = model.createOwnedClass("refined", false);
- refinedReq = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(refined, RequirementsPackage.eINSTANCE.getRequirement());
+ refinedReq = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(refined, RequirementsPackage.eINSTANCE.getRequirement(),null);
refiningNE1 = model.createOwnedClass("rNE1", false);
refiningNE2 = model.createOwnedClass("rNE2", false);
@@ -217,13 +217,13 @@
rne12S1.getClients().add(refiningNE1);
rne12S1.getSuppliers().add(refined);
model.getPackagedElements().add(rne12S1);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(rne12S1, RequirementsPackage.eINSTANCE.getRefine());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(rne12S1, RequirementsPackage.eINSTANCE.getRefine(),null);
Abstraction rne22S1 = UMLFactory.eINSTANCE.createAbstraction();
rne22S1.getClients().add(refiningNE2);
rne22S1.getSuppliers().add(refined);
model.getPackagedElements().add(rne22S1);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(rne22S1, RequirementsPackage.eINSTANCE.getRefine());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(rne22S1, RequirementsPackage.eINSTANCE.getRefine(),null);
// ////////////////////////////////////////////////////////////////////
@@ -232,13 +232,13 @@
// ////////////////////////////////////////////////////////////////////
traced1 = model.createOwnedClass("traced1", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(traced1, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(traced1, RequirementsPackage.eINSTANCE.getRequirement(),null);
traced2 = model.createOwnedClass("traced2", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(traced2, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(traced2, RequirementsPackage.eINSTANCE.getRequirement(),null);
Class trace = model.createOwnedClass("trace", false);
- traceReq = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(trace, RequirementsPackage.eINSTANCE.getRequirement());
+ traceReq = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(trace, RequirementsPackage.eINSTANCE.getRequirement(),null);
// Add "Trace" (Abstraction)
// [traced1, traced2] -> trace
@@ -246,13 +246,13 @@
t11.getClients().add(traced1);
t11.getSuppliers().add(trace);
model.getPackagedElements().add(t11);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(t11, RequirementsPackage.eINSTANCE.getTrace());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(t11, RequirementsPackage.eINSTANCE.getTrace(),null);
Abstraction t12 = UMLFactory.eINSTANCE.createAbstraction();
t12.getClients().add(traced2);
t12.getSuppliers().add(trace);
model.getPackagedElements().add(t12);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(t12, RequirementsPackage.eINSTANCE.getTrace());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(t12, RequirementsPackage.eINSTANCE.getTrace(),null);
// ////////////////////////////////////////////////////////////////////
@@ -263,14 +263,14 @@
verifierNamedElement = model.createOwnedClass("verifierNamedElement", false);
Class verified = model.createOwnedClass("verified", false);
- verifiedReq = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(verified, RequirementsPackage.eINSTANCE.getRequirement());
+ verifiedReq = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(verified, RequirementsPackage.eINSTANCE.getRequirement(),null);
Class testClass = model.createOwnedClass("testClass", false);
Operation op1 = testClass.createOwnedOperation("op1", null, null, null);
Operation op2 = testClass.createOwnedOperation("op2", null, null, null);
- testCase1 = (org.eclipse.papyrus.sysml14.requirements.TestCase)StereotypeApplicationHelper.getInstance(null).applyStereotype(op1, RequirementsPackage.eINSTANCE.getTestCase());
- testCase2 = (org.eclipse.papyrus.sysml14.requirements.TestCase)StereotypeApplicationHelper.getInstance(null).applyStereotype(op2, RequirementsPackage.eINSTANCE.getTestCase());
+ testCase1 = (org.eclipse.papyrus.sysml14.requirements.TestCase)StereotypeApplicationHelper.getInstance(null).applyStereotype(op1, RequirementsPackage.eINSTANCE.getTestCase(),null);
+ testCase2 = (org.eclipse.papyrus.sysml14.requirements.TestCase)StereotypeApplicationHelper.getInstance(null).applyStereotype(op2, RequirementsPackage.eINSTANCE.getTestCase(),null);
// Add "Verify" (Abstraction)
// testCase1, testCase2 -> verified
@@ -278,13 +278,13 @@
t12V.getClients().add(op1);
t12V.getSuppliers().add(verified);
model.getPackagedElements().add(t12V);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(t12V, RequirementsPackage.eINSTANCE.getVerify());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(t12V, RequirementsPackage.eINSTANCE.getVerify(),null);
Abstraction t22V = UMLFactory.eINSTANCE.createAbstraction();
t22V.getClients().add(op2);
t22V.getSuppliers().add(verified);
model.getPackagedElements().add(t22V);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(t22V, RequirementsPackage.eINSTANCE.getVerify());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(t22V, RequirementsPackage.eINSTANCE.getVerify(),null);
// Add "Verify" (Abstraction)
// verifierNamedElement -> verified
@@ -292,7 +292,7 @@
t32V.getClients().add(verifierNamedElement);
t32V.getSuppliers().add(verified);
model.getPackagedElements().add(t32V);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(t32V, RequirementsPackage.eINSTANCE.getVerify());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(t32V, RequirementsPackage.eINSTANCE.getVerify(),null);
// ////////////////////////////////////////////////////////////////////
}
diff --git a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/util/DeprecatedElementUtilTest.java b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/util/DeprecatedElementUtilTest.java
index 2ecf9bd..f715cf1 100644
--- a/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/util/DeprecatedElementUtilTest.java
+++ b/core/org.eclipse.papyrus.sysml14.tests/src/org/eclipse/papyrus/sysml14/tests/util/DeprecatedElementUtilTest.java
@@ -52,18 +52,18 @@
Port port = c0.createOwnedPort("port", null);
FlowPort fpDefault = (FlowPort) stereotypeApplicationHelper.applyStereotype(port,
- DeprecatedelementsPackage.eINSTANCE.getFlowPort());
+ DeprecatedelementsPackage.eINSTANCE.getFlowPort(),null);
Assert.assertTrue("FlowPort should be deprecated", DeprecatedElementUtil.isDeprecatedElement(fpDefault));
Assert.assertTrue("FlowPort should be deprecated", DeprecatedElementUtil.isDeprecatedElement(port));
Interface flowSpecificationInterface=model.createOwnedInterface("FlowSpecification1");
- FlowSpecification flowSpecification = (FlowSpecification) stereotypeApplicationHelper.applyStereotype(flowSpecificationInterface, DeprecatedelementsPackage.eINSTANCE.getFlowSpecification());
+ FlowSpecification flowSpecification = (FlowSpecification) stereotypeApplicationHelper.applyStereotype(flowSpecificationInterface, DeprecatedelementsPackage.eINSTANCE.getFlowSpecification(),null);
Assert.assertTrue("FlowSpecification should be deprecated", DeprecatedElementUtil.isDeprecatedElement(flowSpecificationInterface));
Assert.assertTrue("FlowSpecification should be deprecated", DeprecatedElementUtil.isDeprecatedElement(flowSpecification));
Class blockClass=model.createOwnedClass("Block1", false);
- Block block = (Block) stereotypeApplicationHelper.applyStereotype(blockClass, BlocksPackage.eINSTANCE.getBlock());
+ Block block = (Block) stereotypeApplicationHelper.applyStereotype(blockClass, BlocksPackage.eINSTANCE.getBlock(),null);
Assert.assertFalse("Class should not be deprecated", DeprecatedElementUtil.isDeprecatedElement(blockClass));
Assert.assertFalse("Block should not be deprecated", DeprecatedElementUtil.isDeprecatedElement(block));
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/ocl/RequirementIdTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/ocl/RequirementIdTest.java
index c267797..813b012 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/ocl/RequirementIdTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/ocl/RequirementIdTest.java
@@ -60,10 +60,10 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class valid = model.createOwnedClass("valid", false);
- Requirement req1 = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement());
+ Requirement req1 = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement(),null);
req1.setId("1");
Class invalid = model.createOwnedClass("invalid", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/ocl/RequirementTextTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/ocl/RequirementTextTest.java
index 8a94d71..c80f968 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/ocl/RequirementTextTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/ocl/RequirementTextTest.java
@@ -60,10 +60,10 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class valid = model.createOwnedClass("valid", false);
- Requirement req1 = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement());
+ Requirement req1 = (Requirement)StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement(),null);
req1.setText("1");
Class invalid = model.createOwnedClass("invalid", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/DiscreteNoContinuousModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/DiscreteNoContinuousModelConstraintTest.java
index d84c95d..14688bd 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/DiscreteNoContinuousModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/DiscreteNoContinuousModelConstraintTest.java
@@ -62,11 +62,11 @@
Activity activity = UMLFactory.eINSTANCE.createActivity();
activity.setPackage(model);
Parameter validParameter = activity.createOwnedParameter("validParameter", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validParameter, ActivitiesPackage.eINSTANCE.getDiscrete());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validParameter, ActivitiesPackage.eINSTANCE.getDiscrete(),null);
Parameter invalidParameter = activity.createOwnedParameter("invalidParameter", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidParameter, ActivitiesPackage.eINSTANCE.getDiscrete());
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidParameter, ActivitiesPackage.eINSTANCE.getContinuous());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidParameter, ActivitiesPackage.eINSTANCE.getDiscrete(),null);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidParameter, ActivitiesPackage.eINSTANCE.getContinuous(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/NoBufferNoOverwriteModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/NoBufferNoOverwriteModelConstraintTest.java
index b197558..562aca8 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/NoBufferNoOverwriteModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/NoBufferNoOverwriteModelConstraintTest.java
@@ -64,11 +64,11 @@
activity.setPackage(model);
StructuredActivityNode structuredNode = activity.createStructuredNode("StructuredNode");
InputPin validStructuredNodeInput = structuredNode.createStructuredNodeInput("validStructuredNodeInput", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validStructuredNodeInput, ActivitiesPackage.eINSTANCE.getNoBuffer());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validStructuredNodeInput, ActivitiesPackage.eINSTANCE.getNoBuffer(),null);
InputPin invalidStructuredNodeInput = structuredNode.createStructuredNodeInput("invalidStructuredNodeInput", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidStructuredNodeInput, ActivitiesPackage.eINSTANCE.getNoBuffer());
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidStructuredNodeInput, ActivitiesPackage.eINSTANCE.getOverwrite());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidStructuredNodeInput, ActivitiesPackage.eINSTANCE.getNoBuffer(),null);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidStructuredNodeInput, ActivitiesPackage.eINSTANCE.getOverwrite(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/OptionalMultiplicityModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/OptionalMultiplicityModelConstraintTest.java
index 05c1c04..53f7b19 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/OptionalMultiplicityModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/OptionalMultiplicityModelConstraintTest.java
@@ -63,11 +63,11 @@
activity.setPackage(model);
Parameter validParameter = activity.createOwnedParameter("validParameter", null);
validParameter.setLower(0);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validParameter, ActivitiesPackage.eINSTANCE.getOptional());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validParameter, ActivitiesPackage.eINSTANCE.getOptional(),null);
Parameter invalidParameter = activity.createOwnedParameter("invalidParameter", null);
invalidParameter.setLower(1);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidParameter, ActivitiesPackage.eINSTANCE.getOptional());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidParameter, ActivitiesPackage.eINSTANCE.getOptional(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/OverwriteNoNoBufferModelConstraintModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/OverwriteNoNoBufferModelConstraintModelConstraintTest.java
index 2d434b0..70ed646 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/OverwriteNoNoBufferModelConstraintModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/OverwriteNoNoBufferModelConstraintModelConstraintTest.java
@@ -64,11 +64,11 @@
activity.setPackage(model);
StructuredActivityNode structuredNode = activity.createStructuredNode("StructuredNode");
InputPin validStructuredNodeInput = structuredNode.createStructuredNodeInput("validStructuredNodeInput", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validStructuredNodeInput, ActivitiesPackage.eINSTANCE.getOverwrite());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validStructuredNodeInput, ActivitiesPackage.eINSTANCE.getOverwrite(),null);
InputPin invalidStructuredNodeInput = structuredNode.createStructuredNodeInput("invalidStructuredNodeInput", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidStructuredNodeInput, ActivitiesPackage.eINSTANCE.getOverwrite());
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidStructuredNodeInput, ActivitiesPackage.eINSTANCE.getNoBuffer());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidStructuredNodeInput, ActivitiesPackage.eINSTANCE.getOverwrite(),null);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidStructuredNodeInput, ActivitiesPackage.eINSTANCE.getNoBuffer(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/RateParameterIsStreamModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/RateParameterIsStreamModelConstraintTest.java
index 7d1c758..ea43ac8 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/RateParameterIsStreamModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/activities/RateParameterIsStreamModelConstraintTest.java
@@ -63,11 +63,11 @@
activity.setPackage(model);
Parameter validParameter = activity.createOwnedParameter("validParameter", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validParameter, ActivitiesPackage.eINSTANCE.getRate());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validParameter, ActivitiesPackage.eINSTANCE.getRate(),null);
validParameter.setIsStream(true);
Parameter invalidParameter = activity.createOwnedParameter("invalidParameter", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidParameter, ActivitiesPackage.eINSTANCE.getRate());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidParameter, ActivitiesPackage.eINSTANCE.getRate(),null);
invalidParameter.setIsStream(false);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/allocations/AllocateOneClientSupplierModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/allocations/AllocateOneClientSupplierModelConstraintTest.java
index d86debb..27c506b 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/allocations/AllocateOneClientSupplierModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/allocations/AllocateOneClientSupplierModelConstraintTest.java
@@ -66,7 +66,7 @@
validAbstraction.getSuppliers().add(class1);
validAbstraction.getClients().add(class1);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validAbstraction, AllocationsPackage.eINSTANCE.getAllocate());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validAbstraction, AllocationsPackage.eINSTANCE.getAllocate(),null);
Abstraction invalidAbstraction = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(invalidAbstraction);
@@ -75,7 +75,7 @@
invalidAbstraction.getSuppliers().add(class2);
invalidAbstraction.getClients().add(class1);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidAbstraction, AllocationsPackage.eINSTANCE.getAllocate());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidAbstraction, AllocationsPackage.eINSTANCE.getAllocate(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/allocations/AllocateOnlyAbstractionModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/allocations/AllocateOnlyAbstractionModelConstraintTest.java
index d7a36ff..7c423f2 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/allocations/AllocateOnlyAbstractionModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/allocations/AllocateOnlyAbstractionModelConstraintTest.java
@@ -63,13 +63,13 @@
Abstraction validAllocate = UMLFactory.eINSTANCE.createAbstraction();
validAllocate.setName("validAllocate");
model.getPackagedElements().add(validAllocate);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validAllocate, AllocationsPackage.eINSTANCE.getAllocate());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validAllocate, AllocationsPackage.eINSTANCE.getAllocate(),null);
Realization invalidAllocate = UMLFactory.eINSTANCE.createRealization();
invalidAllocate.setName("invalidAllocate");
model.getPackagedElements().add(invalidAllocate);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidAllocate, AllocationsPackage.eINSTANCE.getAllocate());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidAllocate, AllocationsPackage.eINSTANCE.getAllocate(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/AssociationBlockModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/AssociationBlockModelConstraintTest.java
index 4f7fee8..1f5fb03 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/AssociationBlockModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/AssociationBlockModelConstraintTest.java
@@ -64,12 +64,12 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class validBlock = model.createOwnedClass("validBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validBlock, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validBlock, BlocksPackage.eINSTANCE.getBlock(),null);
Association validassociation = validBlock.createAssociation(true, AggregationKind.NONE_LITERAL, "", 0, 0, validBlock, true, AggregationKind.NONE_LITERAL, "", 0, 0);
validassociation.setPackage(model);
Class invalidBlock = model.createOwnedClass("invalidBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidBlock, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidBlock, BlocksPackage.eINSTANCE.getBlock(),null);
Association invalidassociation = invalidBlock.createAssociation(true, AggregationKind.NONE_LITERAL, "", 0, 0, invalidBlock, true, AggregationKind.NONE_LITERAL, "", 0, 0);
Property invalidAttribute = invalidBlock.createOwnedAttribute("invalidAttribute", null);
invalidassociation.getMemberEnds().add(invalidAttribute);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BindingConnectorSameEndsTypeModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BindingConnectorSameEndsTypeModelConstraintTest.java
index 5c929ae..7ad7f6e 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BindingConnectorSameEndsTypeModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BindingConnectorSameEndsTypeModelConstraintTest.java
@@ -69,7 +69,7 @@
Property differentType = clazz.createOwnedAttribute("differentType", clazz2);
Connector validBindingConnector = clazz.createOwnedConnector("validBindingConnector");
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validBindingConnector, BlocksPackage.eINSTANCE.getBindingConnector());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validBindingConnector, BlocksPackage.eINSTANCE.getBindingConnector(),null);
// Add source connector end
ConnectorEnd connectorEndSameType1 = UMLFactory.eINSTANCE.createConnectorEnd();
@@ -80,7 +80,7 @@
validBindingConnector.getEnds().add(connectorEndSameType2);
Connector invalidBindingConnector = clazz.createOwnedConnector("invalidBindingConnector");
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidBindingConnector, BlocksPackage.eINSTANCE.getBindingConnector());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidBindingConnector, BlocksPackage.eINSTANCE.getBindingConnector(),null);
ConnectorEnd connectorEndDifferentType = UMLFactory.eINSTANCE.createConnectorEnd();
connectorEndDifferentType.setRole(differentType);
invalidBindingConnector.getEnds().add(connectorEndSameType1);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BlockPropertyCompositeModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BlockPropertyCompositeModelConstraintTest.java
index abcdf69..141c95a 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BlockPropertyCompositeModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BlockPropertyCompositeModelConstraintTest.java
@@ -63,15 +63,15 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
DataType valueType = UMLFactory.eINSTANCE.createDataType();
valueType.setPackage(model);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(valueType, BlocksPackage.eINSTANCE.getValueType());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(valueType, BlocksPackage.eINSTANCE.getValueType(),null);
Class validBlock = model.createOwnedClass("validBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validBlock, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validBlock, BlocksPackage.eINSTANCE.getBlock(),null);
Property validAttribute = validBlock.createOwnedAttribute("validAttribute", valueType);
validAttribute.setAggregation(AggregationKind.COMPOSITE_LITERAL);
Class invalidBlock = model.createOwnedClass("invalidBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidBlock, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidBlock, BlocksPackage.eINSTANCE.getBlock(),null);
Property invalidAttribute = invalidBlock.createOwnedAttribute("invalidAttribute", valueType);
invalidAttribute.setAggregation(AggregationKind.NONE_LITERAL);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BlockPropertyNoNameModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BlockPropertyNoNameModelConstraintTest.java
index aad4495..e81e38a 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BlockPropertyNoNameModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BlockPropertyNoNameModelConstraintTest.java
@@ -62,14 +62,14 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class validBlock = model.createOwnedClass("validBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validBlock, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validBlock, BlocksPackage.eINSTANCE.getBlock(),null);
Property validAttribute = validBlock.createOwnedAttribute("", validBlock);
Association validassociation = validBlock.createAssociation(true, AggregationKind.NONE_LITERAL, "", 0, 0, validBlock, true, AggregationKind.NONE_LITERAL, "", 0, 0);
validAttribute.setOwningAssociation(validassociation);
validassociation.getMemberEnds().add(validAttribute);
Class invalidBlock = model.createOwnedClass("invalidBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidBlock, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidBlock, BlocksPackage.eINSTANCE.getBlock(),null);
Property invalidAttribute = invalidBlock.createOwnedAttribute("invalidAttribute", invalidBlock);
Association invalidassociation = validBlock.createAssociation(true, AggregationKind.NONE_LITERAL, "", 0, 0, validBlock, true, AggregationKind.NONE_LITERAL, "", 0, 0);
invalidAttribute.setOwningAssociation(invalidassociation);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BlockSpecializationModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BlockSpecializationModelConstraintTest.java
index 5b84d4a..f8a0343 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BlockSpecializationModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/BlockSpecializationModelConstraintTest.java
@@ -59,14 +59,14 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class validBlock = model.createOwnedClass("validBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validBlock, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validBlock, BlocksPackage.eINSTANCE.getBlock(),null);
Class parentValidBlock = model.createOwnedClass("parentValidBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(parentValidBlock, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(parentValidBlock, BlocksPackage.eINSTANCE.getBlock(),null);
validBlock.createGeneralization(parentValidBlock);
Class invalidBlock = model.createOwnedClass("invalidBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidBlock, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidBlock, BlocksPackage.eINSTANCE.getBlock(),null);
Class invalidClass = model.createOwnedClass("invalidClass", false);
invalidClass.createGeneralization(invalidBlock);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ClassifierBehaviorPropertyIsCompositeModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ClassifierBehaviorPropertyIsCompositeModelConstraintTest.java
index fb070f3..74c2f79 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ClassifierBehaviorPropertyIsCompositeModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ClassifierBehaviorPropertyIsCompositeModelConstraintTest.java
@@ -63,11 +63,11 @@
Class clazz = model.createOwnedClass("Class", false);
Property validClassifierBehaviorProperty = clazz.createOwnedAttribute("validClassifierBehaviorProperty", clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validClassifierBehaviorProperty, BlocksPackage.eINSTANCE.getClassifierBehaviorProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validClassifierBehaviorProperty, BlocksPackage.eINSTANCE.getClassifierBehaviorProperty(),null);
validClassifierBehaviorProperty.setAggregation(AggregationKind.COMPOSITE_LITERAL);
Property invalidClassifierBehaviorProperty = clazz.createOwnedAttribute("invalidClassifierBehaviorProperty", clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidClassifierBehaviorProperty, BlocksPackage.eINSTANCE.getClassifierBehaviorProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidClassifierBehaviorProperty, BlocksPackage.eINSTANCE.getClassifierBehaviorProperty(),null);
invalidClassifierBehaviorProperty.setAggregation(AggregationKind.NONE_LITERAL);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ClassifierBehaviorPropertyOnBlockModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ClassifierBehaviorPropertyOnBlockModelConstraintTest.java
index 256c047..d41a689 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ClassifierBehaviorPropertyOnBlockModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ClassifierBehaviorPropertyOnBlockModelConstraintTest.java
@@ -61,16 +61,16 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class validBlock = model.createOwnedClass("validBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validBlock, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validBlock, BlocksPackage.eINSTANCE.getBlock(),null);
validBlock.createClassifierBehavior("validClassifierBehavior", UMLPackage.eINSTANCE.getActivity());
Property validClassifierBehaviorProperty = validBlock.createOwnedAttribute("validClassifierBehaviorProperty", validBlock);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validClassifierBehaviorProperty, BlocksPackage.eINSTANCE.getClassifierBehaviorProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validClassifierBehaviorProperty, BlocksPackage.eINSTANCE.getClassifierBehaviorProperty(),null);
Class invalidBlock = model.createOwnedClass("invalidBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidBlock, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidBlock, BlocksPackage.eINSTANCE.getBlock(),null);
Property invalidClassifierBehaviorProperty = invalidBlock.createOwnedAttribute("invalidClassifierBehaviorProperty", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidClassifierBehaviorProperty, BlocksPackage.eINSTANCE.getClassifierBehaviorProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidClassifierBehaviorProperty, BlocksPackage.eINSTANCE.getClassifierBehaviorProperty(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ClassifierBehaviorPropertyTypedByModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ClassifierBehaviorPropertyTypedByModelConstraintTest.java
index 403b3eb..c9a838c 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ClassifierBehaviorPropertyTypedByModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ClassifierBehaviorPropertyTypedByModelConstraintTest.java
@@ -62,17 +62,17 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class validBlock = model.createOwnedClass("validBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validBlock, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validBlock, BlocksPackage.eINSTANCE.getBlock(),null);
Behavior createClassifierBehavior = validBlock.createClassifierBehavior("validClassifierBehavior", UMLPackage.eINSTANCE.getActivity());
Property validClassifierBehaviorProperty = validBlock.createOwnedAttribute("validClassifierBehaviorProperty", validBlock);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validClassifierBehaviorProperty, BlocksPackage.eINSTANCE.getClassifierBehaviorProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validClassifierBehaviorProperty, BlocksPackage.eINSTANCE.getClassifierBehaviorProperty(),null);
validClassifierBehaviorProperty.setType(createClassifierBehavior);
Class invalidBlock = model.createOwnedClass("invalidBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidBlock, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidBlock, BlocksPackage.eINSTANCE.getBlock(),null);
Property invalidClassifierBehaviorProperty = invalidBlock.createOwnedAttribute("invalidClassifierBehaviorProperty", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidClassifierBehaviorProperty, BlocksPackage.eINSTANCE.getClassifierBehaviorProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidClassifierBehaviorProperty, BlocksPackage.eINSTANCE.getClassifierBehaviorProperty(),null);
invalidClassifierBehaviorProperty.setType(validBlock);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyOnlyCompositeModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyOnlyCompositeModelConstraintTest.java
index d89762d..6af4632 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyOnlyCompositeModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyOnlyCompositeModelConstraintTest.java
@@ -62,12 +62,12 @@
Class clazz = model.createOwnedClass("Class", false);
Property validConnectorProperty = clazz.createOwnedAttribute("validConnectorProperty", clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validConnectorProperty, BlocksPackage.eINSTANCE.getConnectorProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validConnectorProperty, BlocksPackage.eINSTANCE.getConnectorProperty(),null);
validConnectorProperty.setIsComposite(true);
Property invalidConnectorProperty = clazz.createOwnedAttribute("invalidConnectorProperty", clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidConnectorProperty, BlocksPackage.eINSTANCE.getConnectorProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidConnectorProperty, BlocksPackage.eINSTANCE.getConnectorProperty(),null);
invalidConnectorProperty.setIsComposite(false);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyOnlyOnBlockModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyOnlyOnBlockModelConstraintTest.java
index f461670..6b49964 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyOnlyOnBlockModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyOnlyOnBlockModelConstraintTest.java
@@ -61,13 +61,13 @@
Class clazz = model.createOwnedClass("Class", false);
Class block = model.createOwnedClass("Block", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(block, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(block, BlocksPackage.eINSTANCE.getBlock(),null);
Property validConnectorProperty = block.createOwnedAttribute("validConnectorProperty", block);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validConnectorProperty, BlocksPackage.eINSTANCE.getConnectorProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validConnectorProperty, BlocksPackage.eINSTANCE.getConnectorProperty(),null);
Property invalidConnectorProperty = clazz.createOwnedAttribute("invalidConnectorProperty", clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidConnectorProperty, BlocksPackage.eINSTANCE.getConnectorProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidConnectorProperty, BlocksPackage.eINSTANCE.getConnectorProperty(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyReferOwnedConnectorModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyReferOwnedConnectorModelConstraintTest.java
index 5c9bc1e..c94c6e1 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyReferOwnedConnectorModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyReferOwnedConnectorModelConstraintTest.java
@@ -63,15 +63,15 @@
Class clazz = model.createOwnedClass("Class", false);
Class block = model.createOwnedClass("Block", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(block, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(block, BlocksPackage.eINSTANCE.getBlock(),null);
Property validProperty = block.createOwnedAttribute("validProperty", block);
- ConnectorProperty validConnectorProperty = (ConnectorProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getConnectorProperty());
+ ConnectorProperty validConnectorProperty = (ConnectorProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getConnectorProperty(),null);
Connector ownedConnector = block.createOwnedConnector("ownedConnector");
validConnectorProperty.setConnector(ownedConnector);
Property invalidProperty = clazz.createOwnedAttribute("invalidProperty", clazz);
- ConnectorProperty invalidConnectorProperty = (ConnectorProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getConnectorProperty());
+ ConnectorProperty invalidConnectorProperty = (ConnectorProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getConnectorProperty(),null);
invalidConnectorProperty.setConnector(ownedConnector);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertySameNameModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertySameNameModelConstraintTest.java
index 2c7ff78..834527a 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertySameNameModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertySameNameModelConstraintTest.java
@@ -68,18 +68,18 @@
Association association = clazz.createAssociation(true, AggregationKind.NONE_LITERAL, "", 0, 0, clazz, true, AggregationKind.NONE_LITERAL, "", 0, 0);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(block, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(block, BlocksPackage.eINSTANCE.getBlock(),null);
Property validProperty = block.createOwnedAttribute("validProperty", block);
validProperty.setType(association);
- ConnectorProperty validConnectorProperty = (ConnectorProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getConnectorProperty());
+ ConnectorProperty validConnectorProperty = (ConnectorProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getConnectorProperty(),null);
Connector ownedConnector = block.createOwnedConnector("ownedConnector");
validConnectorProperty.setConnector(ownedConnector);
ownedConnector.setName("validProperty");
ownedConnector.setType(association);
Property invalidProperty = clazz.createOwnedAttribute("invalidProperty", clazz);
- ConnectorProperty invalidConnectorProperty = (ConnectorProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getConnectorProperty());
+ ConnectorProperty invalidConnectorProperty = (ConnectorProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getConnectorProperty(),null);
invalidConnectorProperty.setConnector(ownedConnector);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyTypedByAssociationBlockModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyTypedByAssociationBlockModelConstraintTest.java
index eead8f4..74f543f 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyTypedByAssociationBlockModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ConnectorPropertyTypedByAssociationBlockModelConstraintTest.java
@@ -67,20 +67,20 @@
Class clazz = model.createOwnedClass("Class", false);
Class block = model.createOwnedClass("Block", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(block, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(block, BlocksPackage.eINSTANCE.getBlock(),null);
AssociationClass createAssociationClass = UMLFactory.eINSTANCE.createAssociationClass();
createAssociationClass.setPackage(model);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(createAssociationClass, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(createAssociationClass, BlocksPackage.eINSTANCE.getBlock(),null);
Property validProperty = block.createOwnedAttribute("validProperty", block);
- ConnectorProperty validConnectorProperty = (ConnectorProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getConnectorProperty());
+ ConnectorProperty validConnectorProperty = (ConnectorProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getConnectorProperty(),null);
Connector validOwnedConnector = block.createOwnedConnector("validOwnedConnector");
validConnectorProperty.setConnector(validOwnedConnector);
validOwnedConnector.setType(createAssociationClass);
Property invalidProperty = clazz.createOwnedAttribute("invalidProperty", clazz);
- ConnectorProperty invalidConnectorProperty = (ConnectorProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getConnectorProperty());
+ ConnectorProperty invalidConnectorProperty = (ConnectorProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getConnectorProperty(),null);
Connector invalidOwnedConnector = block.createOwnedConnector("invalidOwnedConnector");
invalidConnectorProperty.setConnector(invalidOwnedConnector);
Association association = clazz.createAssociation(true, AggregationKind.NONE_LITERAL, "", 0, 0, clazz, true, AggregationKind.NONE_LITERAL, "", 0, 0);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/DistributedPropertyTypedByModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/DistributedPropertyTypedByModelConstraintTest.java
index e241e40..1dae2c2 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/DistributedPropertyTypedByModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/DistributedPropertyTypedByModelConstraintTest.java
@@ -61,13 +61,13 @@
Class clazz = model.createOwnedClass("Class", false);
Class block = model.createOwnedClass("Block", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(block, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(block, BlocksPackage.eINSTANCE.getBlock(),null);
Property validDistributedProperty = block.createOwnedAttribute("validDistributedProperty", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validDistributedProperty, BlocksPackage.eINSTANCE.getDistributedProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validDistributedProperty, BlocksPackage.eINSTANCE.getDistributedProperty(),null);
Property invalidDistributedProperty = clazz.createOwnedAttribute("invalidDistributedProperty", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidDistributedProperty, BlocksPackage.eINSTANCE.getDistributedProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidDistributedProperty, BlocksPackage.eINSTANCE.getDistributedProperty(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/EndPathMultiplicityNotNegativeModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/EndPathMultiplicityNotNegativeModelConstraintTest.java
index 61fa58f..52dab7a 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/EndPathMultiplicityNotNegativeModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/EndPathMultiplicityNotNegativeModelConstraintTest.java
@@ -63,11 +63,11 @@
Class clazz = model.createOwnedClass("Class", false);
Property validEndPathMultiplicity = clazz.createOwnedAttribute("validEndPathMultiplicity", clazz);
- EndPathMultiplicity validEndPathMultiplicityStereotype= (EndPathMultiplicity) StereotypeApplicationHelper.getInstance(null).applyStereotype(validEndPathMultiplicity, BlocksPackage.eINSTANCE.getEndPathMultiplicity());
+ EndPathMultiplicity validEndPathMultiplicityStereotype= (EndPathMultiplicity) StereotypeApplicationHelper.getInstance(null).applyStereotype(validEndPathMultiplicity, BlocksPackage.eINSTANCE.getEndPathMultiplicity(),null);
validEndPathMultiplicityStereotype.setLower(1);
Property invalidEndPathMultiplicity = clazz.createOwnedAttribute("invalidEndPathMultiplicity", clazz);
- EndPathMultiplicity invalidEndPathMultiplicityStereotype= (EndPathMultiplicity) StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidEndPathMultiplicity, BlocksPackage.eINSTANCE.getEndPathMultiplicity());
+ EndPathMultiplicity invalidEndPathMultiplicityStereotype= (EndPathMultiplicity) StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidEndPathMultiplicity, BlocksPackage.eINSTANCE.getEndPathMultiplicity(),null);
invalidEndPathMultiplicityStereotype.setLower(-1);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyEndMultiplicityModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyEndMultiplicityModelConstraintTest.java
index 86d02a8..0469780 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyEndMultiplicityModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyEndMultiplicityModelConstraintTest.java
@@ -64,10 +64,10 @@
Property validProperty = clazz.createOwnedAttribute("validProperty", clazz);
validProperty.setUpper(1);
validProperty.setLower(1);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getParticipantProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getParticipantProperty(),null);
Property invalidProperty = clazz.createOwnedAttribute("invalidProperty", clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getParticipantProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getParticipantProperty(),null);
invalidProperty.setUpper(2);
invalidProperty.setLower(0);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyNoAssociationMemberEndsModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyNoAssociationMemberEndsModelConstraintTest.java
index 6e589f4..ff9cb4d 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyNoAssociationMemberEndsModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyNoAssociationMemberEndsModelConstraintTest.java
@@ -65,10 +65,10 @@
Property validProperty = clazz.createOwnedAttribute("validProperty", clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getParticipantProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getParticipantProperty(),null);
Property invalidProperty = clazz.createOwnedAttribute("invalidProperty", clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getParticipantProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getParticipantProperty(),null);
Association association = clazz.createAssociation(true, AggregationKind.NONE_LITERAL, "", 0, 0, clazz, true, AggregationKind.NONE_LITERAL, "", 0, 0);
invalidProperty.setAssociation(association);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyOnlyAssociationBlockModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyOnlyAssociationBlockModelConstraintTest.java
index df289b3..31e1ddd 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyOnlyAssociationBlockModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyOnlyAssociationBlockModelConstraintTest.java
@@ -65,13 +65,13 @@
AssociationClass createAssociationClass = UMLFactory.eINSTANCE.createAssociationClass();
createAssociationClass.setPackage(model);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(createAssociationClass, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(createAssociationClass, BlocksPackage.eINSTANCE.getBlock(),null);
Property validProperty = createAssociationClass.createOwnedAttribute("validProperty", clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getParticipantProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getParticipantProperty(),null);
Property invalidProperty = clazz.createOwnedAttribute("invalidProperty", clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getParticipantProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getParticipantProperty(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyOnlyNoneAggregationModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyOnlyNoneAggregationModelConstraintTest.java
index 222c712..b78b382 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyOnlyNoneAggregationModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertyOnlyNoneAggregationModelConstraintTest.java
@@ -63,11 +63,11 @@
Class clazz = model.createOwnedClass("Class", false);
Property validProperty = clazz.createOwnedAttribute("validProperty", clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getParticipantProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getParticipantProperty(),null);
validProperty.setAggregation(AggregationKind.NONE_LITERAL);
Property invalidProperty = clazz.createOwnedAttribute("invalidProperty", clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getParticipantProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getParticipantProperty(),null);
invalidProperty.setAggregation(AggregationKind.COMPOSITE_LITERAL);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertySameEndModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertySameEndModelConstraintTest.java
index 8ace369..9ecfaa2 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertySameEndModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertySameEndModelConstraintTest.java
@@ -74,14 +74,14 @@
createAssociationClass.getMemberEnds().add(endSameType);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(createAssociationClass, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(createAssociationClass, BlocksPackage.eINSTANCE.getBlock(),null);
Property validProperty = createAssociationClass.createOwnedAttribute("validProperty", clazz);
- ParticipantProperty validParticipantProperty = (ParticipantProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getParticipantProperty());
+ ParticipantProperty validParticipantProperty = (ParticipantProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getParticipantProperty(),null);
validParticipantProperty.setEnd(endSameType);
Property invalidProperty = createAssociationClass.createOwnedAttribute("invalidProperty", clazz);
- ParticipantProperty invalidParticipantProperty = (ParticipantProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getParticipantProperty());
+ ParticipantProperty invalidParticipantProperty = (ParticipantProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getParticipantProperty(),null);
invalidParticipantProperty.setEnd(endDiffType);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertySameTypeModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertySameTypeModelConstraintTest.java
index e129826..1eb9f55 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertySameTypeModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/ParticipantPropertySameTypeModelConstraintTest.java
@@ -66,11 +66,11 @@
Property endDiffType = clazz.createOwnedAttribute("validProperty", clazz2);
Property validProperty = clazz.createOwnedAttribute("validProperty", clazz);
- ParticipantProperty validParticipantProperty = (ParticipantProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getParticipantProperty());
+ ParticipantProperty validParticipantProperty = (ParticipantProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(validProperty, BlocksPackage.eINSTANCE.getParticipantProperty(),null);
validParticipantProperty.setEnd(endSameType);
Property invalidProperty = clazz.createOwnedAttribute("invalidProperty", clazz);
- ParticipantProperty invalidParticipantProperty = (ParticipantProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getParticipantProperty());
+ ParticipantProperty invalidParticipantProperty = (ParticipantProperty) StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidProperty, BlocksPackage.eINSTANCE.getParticipantProperty(),null);
invalidParticipantProperty.setEnd(endDiffType);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/PropertySpecificTypeMissingNameModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/PropertySpecificTypeMissingNameModelConstraintTest.java
index e9e486f..ebeb438 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/PropertySpecificTypeMissingNameModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/PropertySpecificTypeMissingNameModelConstraintTest.java
@@ -59,10 +59,10 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class validClass = model.createOwnedClass(null, false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validClass, BlocksPackage.eINSTANCE.getPropertySpecificType());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validClass, BlocksPackage.eINSTANCE.getPropertySpecificType(),null);
Class invalidClass = model.createOwnedClass("invalidClass", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidClass, BlocksPackage.eINSTANCE.getPropertySpecificType());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidClass, BlocksPackage.eINSTANCE.getPropertySpecificType(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/PropertySpecificTypeUniquePropertyModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/PropertySpecificTypeUniquePropertyModelConstraintTest.java
index 3708a5f..a94ca1b 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/PropertySpecificTypeUniquePropertyModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/blocks/PropertySpecificTypeUniquePropertyModelConstraintTest.java
@@ -59,11 +59,11 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class validClass = model.createOwnedClass("validClass", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validClass, BlocksPackage.eINSTANCE.getPropertySpecificType());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validClass, BlocksPackage.eINSTANCE.getPropertySpecificType(),null);
validClass.createOwnedAttribute("typeUniqueAttribute", validClass);
Class invalidClass = model.createOwnedClass("invalidClass", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidClass, BlocksPackage.eINSTANCE.getPropertySpecificType());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidClass, BlocksPackage.eINSTANCE.getPropertySpecificType(),null);
invalidClass.createOwnedAttribute("typeDoubleAttribute", invalidClass);
invalidClass.createOwnedAttribute("typeDoubleAttribute2", invalidClass);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ConformGeneralClassifierViewpointModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ConformGeneralClassifierViewpointModelConstraintTest.java
index 55cd1a5..c9541b4 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ConformGeneralClassifierViewpointModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ConformGeneralClassifierViewpointModelConstraintTest.java
@@ -61,13 +61,13 @@
Class clazz = model.createOwnedClass("Class", false);
Class viewpoint = model.createOwnedClass("Viewpoint", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(viewpoint, ModelelementsPackage.eINSTANCE.getViewpoint());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(viewpoint, ModelelementsPackage.eINSTANCE.getViewpoint(),null);
Generalization validConform = clazz.createGeneralization(viewpoint);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validConform, ModelelementsPackage.eINSTANCE.getConform());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validConform, ModelelementsPackage.eINSTANCE.getConform(),null);
Generalization invalidConform = clazz.createGeneralization(clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidConform, ModelelementsPackage.eINSTANCE.getConform());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidConform, ModelelementsPackage.eINSTANCE.getConform(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ConformSpecificClassifierViewModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ConformSpecificClassifierViewModelConstraintTest.java
index 9bd884f..7dd9edf 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ConformSpecificClassifierViewModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ConformSpecificClassifierViewModelConstraintTest.java
@@ -61,13 +61,13 @@
Class clazz = model.createOwnedClass("Class", false);
Class view = model.createOwnedClass("View", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(view, ModelelementsPackage.eINSTANCE.getView());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(view, ModelelementsPackage.eINSTANCE.getView(),null);
Generalization validConform = view.createGeneralization(clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validConform, ModelelementsPackage.eINSTANCE.getConform());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validConform, ModelelementsPackage.eINSTANCE.getConform(),null);
Generalization invalidConform = clazz.createGeneralization(clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidConform, ModelelementsPackage.eINSTANCE.getConform());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidConform, ModelelementsPackage.eINSTANCE.getConform(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ExposeClientStereotypedByViewModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ExposeClientStereotypedByViewModelConstraintTest.java
index 4b95151..d060e02 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ExposeClientStereotypedByViewModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ExposeClientStereotypedByViewModelConstraintTest.java
@@ -61,13 +61,13 @@
Class clazz = model.createOwnedClass("Class", false);
Class view = model.createOwnedClass("View", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(view, ModelelementsPackage.eINSTANCE.getView());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(view, ModelelementsPackage.eINSTANCE.getView(),null);
Dependency validExpose = view.createDependency(clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validExpose, ModelelementsPackage.eINSTANCE.getExpose());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validExpose, ModelelementsPackage.eINSTANCE.getExpose(),null);
Dependency invalidExpose = clazz.createDependency(clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidExpose, ModelelementsPackage.eINSTANCE.getExpose());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidExpose, ModelelementsPackage.eINSTANCE.getExpose(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ViewSingleViewpointModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ViewSingleViewpointModelConstraintTest.java
index da95be3..77dbf5d 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ViewSingleViewpointModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ViewSingleViewpointModelConstraintTest.java
@@ -60,21 +60,21 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class viewpoint = model.createOwnedClass("viewpoint", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(viewpoint, ModelelementsPackage.eINSTANCE.getViewpoint());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(viewpoint, ModelelementsPackage.eINSTANCE.getViewpoint(),null);
Class validView = model.createOwnedClass("validView", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validView, ModelelementsPackage.eINSTANCE.getView());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validView, ModelelementsPackage.eINSTANCE.getView(),null);
Generalization validConform = validView.createGeneralization(viewpoint);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validConform, ModelelementsPackage.eINSTANCE.getConform());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validConform, ModelelementsPackage.eINSTANCE.getConform(),null);
Class invalidView = model.createOwnedClass("invalidView", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidView, ModelelementsPackage.eINSTANCE.getView());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidView, ModelelementsPackage.eINSTANCE.getView(),null);
Generalization invalidConform1 = invalidView.createGeneralization(viewpoint);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidConform1, ModelelementsPackage.eINSTANCE.getConform());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidConform1, ModelelementsPackage.eINSTANCE.getConform(),null);
Generalization invalidConform2 = invalidView.createGeneralization(viewpoint);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidConform2, ModelelementsPackage.eINSTANCE.getConform());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidConform2, ModelelementsPackage.eINSTANCE.getConform(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ViewpointOwnedViewModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ViewpointOwnedViewModelConstraintTest.java
index 24e750e..33b67b8 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ViewpointOwnedViewModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/modelelements/ViewpointOwnedViewModelConstraintTest.java
@@ -61,13 +61,13 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class validViewpoint = model.createOwnedClass("validViewpoint", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validViewpoint, ModelelementsPackage.eINSTANCE.getViewpoint());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validViewpoint, ModelelementsPackage.eINSTANCE.getViewpoint(),null);
Operation validOwnedOperation = validViewpoint.createOwnedOperation("View", null, null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validOwnedOperation,StandardPackage.eINSTANCE.getCreate());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validOwnedOperation,StandardPackage.eINSTANCE.getCreate(),null);
Class invalidViewpoint = model.createOwnedClass("invalidViewpoint", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidViewpoint, ModelelementsPackage.eINSTANCE.getViewpoint());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidViewpoint, ModelelementsPackage.eINSTANCE.getViewpoint(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FlowPropertyTypedByModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FlowPropertyTypedByModelConstraintTest.java
index 28d72e8..9f0a041 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FlowPropertyTypedByModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FlowPropertyTypedByModelConstraintTest.java
@@ -62,14 +62,14 @@
Class clazz = model.createOwnedClass("Class", false);
Class block = model.createOwnedClass("Block", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(block, BlocksPackage.eINSTANCE.getBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(block, BlocksPackage.eINSTANCE.getBlock(),null);
Property validFlowProperty = clazz.createOwnedAttribute("validFlowProperty", block);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validFlowProperty, PortsandflowsPackage.eINSTANCE.getFlowProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validFlowProperty, PortsandflowsPackage.eINSTANCE.getFlowProperty(),null);
Property invalidFlowProperty = clazz.createOwnedAttribute("invalidFlowProperty", clazz);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidFlowProperty, PortsandflowsPackage.eINSTANCE.getFlowProperty());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidFlowProperty, PortsandflowsPackage.eINSTANCE.getFlowProperty(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FullPortNotBehavioralModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FullPortNotBehavioralModelConstraintTest.java
index 1078ff4..351002c 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FullPortNotBehavioralModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FullPortNotBehavioralModelConstraintTest.java
@@ -62,11 +62,11 @@
Class clazz = model.createOwnedClass("Class", false);
Port validPort = clazz.createOwnedPort("validPort", null);
validPort.setIsBehavior(false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validPort, PortsandflowsPackage.eINSTANCE.getFullPort());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validPort, PortsandflowsPackage.eINSTANCE.getFullPort(),null);
Port invalidPort = clazz.createOwnedPort("invalidPort", null);
invalidPort.setIsBehavior(true);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getFullPort());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getFullPort(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FullPortNotConjugatedModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FullPortNotConjugatedModelConstraintTest.java
index 3c31136..e85e724 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FullPortNotConjugatedModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FullPortNotConjugatedModelConstraintTest.java
@@ -62,10 +62,10 @@
Class clazz = model.createOwnedClass("Class", false);
Port validPort = clazz.createOwnedPort("validPort", null);
validPort.setIsConjugated(false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validPort, PortsandflowsPackage.eINSTANCE.getFullPort());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validPort, PortsandflowsPackage.eINSTANCE.getFullPort(),null);
Port invalidPort = clazz.createOwnedPort("invalidPort", null);
invalidPort.setIsConjugated(true);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getFullPort());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getFullPort(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FullPortNotProxyPortModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FullPortNotProxyPortModelConstraintTest.java
index 4cdeff7..4f285f8 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FullPortNotProxyPortModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/FullPortNotProxyPortModelConstraintTest.java
@@ -61,10 +61,10 @@
Class clazz = model.createOwnedClass("Class", false);
Port validPort = clazz.createOwnedPort("validPort", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validPort, PortsandflowsPackage.eINSTANCE.getFullPort());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validPort, PortsandflowsPackage.eINSTANCE.getFullPort(),null);
Port invalidPort = clazz.createOwnedPort("invalidPort", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getFullPort());
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getProxyPort());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getFullPort(),null);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getProxyPort(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/InterfaceBlockNoBehaviorConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/InterfaceBlockNoBehaviorConstraintTest.java
index 342042b..c82e49e 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/InterfaceBlockNoBehaviorConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/InterfaceBlockNoBehaviorConstraintTest.java
@@ -60,10 +60,10 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class validInterfaceBlock = model.createOwnedClass("validInterfaceBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validInterfaceBlock, PortsandflowsPackage.eINSTANCE.getInterfaceBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validInterfaceBlock, PortsandflowsPackage.eINSTANCE.getInterfaceBlock(),null);
Class invalidInterfaceBlock = model.createOwnedClass("invalidInterfaceBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidInterfaceBlock, PortsandflowsPackage.eINSTANCE.getInterfaceBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidInterfaceBlock, PortsandflowsPackage.eINSTANCE.getInterfaceBlock(),null);
invalidInterfaceBlock.createClassifierBehavior("invalidClassifierBehavior", UMLPackage.eINSTANCE.getActivity());
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/InterfaceBlockNoCompositePropertyModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/InterfaceBlockNoCompositePropertyModelConstraintTest.java
index 6c48fe8..a1b7416 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/InterfaceBlockNoCompositePropertyModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/InterfaceBlockNoCompositePropertyModelConstraintTest.java
@@ -61,11 +61,11 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class validInterfaceBlock = model.createOwnedClass("validInterfaceBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validInterfaceBlock, PortsandflowsPackage.eINSTANCE.getInterfaceBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validInterfaceBlock, PortsandflowsPackage.eINSTANCE.getInterfaceBlock(),null);
validInterfaceBlock.createOwnedAttribute("valideProperty", null);
Class invalidInterfaceBlock = model.createOwnedClass("invalidInterfaceBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidInterfaceBlock, PortsandflowsPackage.eINSTANCE.getInterfaceBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidInterfaceBlock, PortsandflowsPackage.eINSTANCE.getInterfaceBlock(),null);
Property invalideProperty = invalidInterfaceBlock.createOwnedAttribute("invalideProperty", null);
invalideProperty.setAggregation(AggregationKind.COMPOSITE_LITERAL);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/InterfaceBlockPortTypeModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/InterfaceBlockPortTypeModelConstraintTest.java
index 90058fc..c58da83 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/InterfaceBlockPortTypeModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/InterfaceBlockPortTypeModelConstraintTest.java
@@ -61,12 +61,12 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class validInterfaceBlock = model.createOwnedClass("validInterfaceBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validInterfaceBlock, PortsandflowsPackage.eINSTANCE.getInterfaceBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validInterfaceBlock, PortsandflowsPackage.eINSTANCE.getInterfaceBlock(),null);
Port validePort = validInterfaceBlock.createOwnedPort("validePort", null);
validePort.setType(validInterfaceBlock);
Class invalidInterfaceBlock = model.createOwnedClass("invalidInterfaceBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidInterfaceBlock, PortsandflowsPackage.eINSTANCE.getInterfaceBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidInterfaceBlock, PortsandflowsPackage.eINSTANCE.getInterfaceBlock(),null);
Property invalidePort = invalidInterfaceBlock.createOwnedPort("invalidePort", null);
invalidePort.setType(model.createOwnedClass("Class", false));
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/ProxyPortForceInnerProxyPortModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/ProxyPortForceInnerProxyPortModelConstraintTest.java
index 0d30bf3..9759b1a 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/ProxyPortForceInnerProxyPortModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/ProxyPortForceInnerProxyPortModelConstraintTest.java
@@ -61,15 +61,15 @@
Class clazz = model.createOwnedClass("Class", false);
Port validPort = clazz.createOwnedPort("validPort", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validPort, PortsandflowsPackage.eINSTANCE.getProxyPort());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validPort, PortsandflowsPackage.eINSTANCE.getProxyPort(),null);
Class clazzWithOnlyProxyPort = model.createOwnedClass("clazzWithOnlyProxyPort", false);
Port innerProxyPort = clazzWithOnlyProxyPort.createOwnedPort("innerProxyPort", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(innerProxyPort, PortsandflowsPackage.eINSTANCE.getProxyPort());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(innerProxyPort, PortsandflowsPackage.eINSTANCE.getProxyPort(),null);
validPort.setType(clazzWithOnlyProxyPort);
Port invalidPort = clazz.createOwnedPort("invalidPort", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getProxyPort());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getProxyPort(),null);
Class clazzWithStandardPort = model.createOwnedClass("clazzWithStandardPort", false);
clazzWithStandardPort.createOwnedPort("innerProxyPort", null);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/ProxyPortNotFullPortModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/ProxyPortNotFullPortModelConstraintTest.java
index fe0d03f..7bc653a 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/ProxyPortNotFullPortModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/ProxyPortNotFullPortModelConstraintTest.java
@@ -61,10 +61,10 @@
Class clazz = model.createOwnedClass("Class", false);
Port validPort = clazz.createOwnedPort("validPort", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validPort, PortsandflowsPackage.eINSTANCE.getProxyPort());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validPort, PortsandflowsPackage.eINSTANCE.getProxyPort(),null);
Port invalidPort = clazz.createOwnedPort("invalidPort", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getProxyPort());
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getFullPort());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getProxyPort(),null);
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getFullPort(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/ProxyPortTypedByInterfaceBlockModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/ProxyPortTypedByInterfaceBlockModelConstraintTest.java
index 29e11c0..3b336ce 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/ProxyPortTypedByInterfaceBlockModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/portsandflows/ProxyPortTypedByInterfaceBlockModelConstraintTest.java
@@ -61,14 +61,14 @@
Class clazz = model.createOwnedClass("Class", false);
Port validPort = clazz.createOwnedPort("validPort", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validPort, PortsandflowsPackage.eINSTANCE.getProxyPort());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validPort, PortsandflowsPackage.eINSTANCE.getProxyPort(),null);
Class interfaceBlock = model.createOwnedClass("interfaceBlock", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(interfaceBlock, PortsandflowsPackage.eINSTANCE.getInterfaceBlock());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(interfaceBlock, PortsandflowsPackage.eINSTANCE.getInterfaceBlock(),null);
validPort.setType(interfaceBlock);
Port invalidPort = clazz.createOwnedPort("invalidPort", null);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getProxyPort());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalidPort, PortsandflowsPackage.eINSTANCE.getProxyPort(),null);
Class noStereotypeClazz = model.createOwnedClass("noStereotypeClazz", false);
invalidPort.setType(noStereotypeClazz);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/CopyBetweenRequirementsModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/CopyBetweenRequirementsModelConstraintTest.java
index dd5768a..74dc3f8 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/CopyBetweenRequirementsModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/CopyBetweenRequirementsModelConstraintTest.java
@@ -63,18 +63,18 @@
Abstraction copyValid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(copyValid);
Class requirementSupplier = model.createOwnedClass("requirementSupplier", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementSupplier, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementSupplier, RequirementsPackage.eINSTANCE.getRequirement(),null);
copyValid.getSuppliers().add(requirementSupplier);
Class requirementClient = model.createOwnedClass("requirementClient", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementClient, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementClient, RequirementsPackage.eINSTANCE.getRequirement(),null);
copyValid.getClients().add(requirementClient);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(copyValid, RequirementsPackage.eINSTANCE.getCopy());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(copyValid, RequirementsPackage.eINSTANCE.getCopy(),null);
Abstraction copyInvalid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(copyInvalid);
copyInvalid.getSuppliers().add(model.createOwnedClass("classsupplier", false));
copyInvalid.getClients().add(model.createOwnedClass("classclien", false));
- StereotypeApplicationHelper.getInstance(null).applyStereotype(copyInvalid, RequirementsPackage.eINSTANCE.getCopy());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(copyInvalid, RequirementsPackage.eINSTANCE.getCopy(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/CopyReadOnlyModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/CopyReadOnlyModelConstraintTest.java
index 0adf51e..d0935fc 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/CopyReadOnlyModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/CopyReadOnlyModelConstraintTest.java
@@ -64,26 +64,26 @@
Abstraction copyValid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(copyValid);
Class requirementSupplier = model.createOwnedClass("requirementSupplier", false);
- Requirement requirementSupplierStereotypeplication = (Requirement) StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementSupplier, RequirementsPackage.eINSTANCE.getRequirement());
+ Requirement requirementSupplierStereotypeplication = (Requirement) StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementSupplier, RequirementsPackage.eINSTANCE.getRequirement(),null);
requirementSupplierStereotypeplication.setText("Copied text");
copyValid.getSuppliers().add(requirementSupplier);
Class requirementClient = model.createOwnedClass("requirementClient", false);
- Requirement requirementSupplierStereotypeplication2 = (Requirement) StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementClient, RequirementsPackage.eINSTANCE.getRequirement());
+ Requirement requirementSupplierStereotypeplication2 = (Requirement) StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementClient, RequirementsPackage.eINSTANCE.getRequirement(),null);
requirementSupplierStereotypeplication2.setText("Copied text");
copyValid.getClients().add(requirementClient);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(copyValid, RequirementsPackage.eINSTANCE.getCopy());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(copyValid, RequirementsPackage.eINSTANCE.getCopy(),null);
Abstraction copyInvalid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(copyInvalid);
Class requirementSupplierInvalid = model.createOwnedClass("requirementSupplier", false);
- Requirement requirementSupplierStereotypeplication3 = (Requirement) StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementSupplierInvalid, RequirementsPackage.eINSTANCE.getRequirement());
+ Requirement requirementSupplierStereotypeplication3 = (Requirement) StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementSupplierInvalid, RequirementsPackage.eINSTANCE.getRequirement(),null);
requirementSupplierStereotypeplication3.setText("Copied text");
copyInvalid.getSuppliers().add(requirementSupplierInvalid);
Class requirementClientInvalid = model.createOwnedClass("requirementClient", false);
- Requirement requirementSupplierStereotypeplication4 = (Requirement) StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementClientInvalid, RequirementsPackage.eINSTANCE.getRequirement());
+ Requirement requirementSupplierStereotypeplication4 = (Requirement) StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementClientInvalid, RequirementsPackage.eINSTANCE.getRequirement(),null);
requirementSupplierStereotypeplication4.setText("Different Copied text");
copyInvalid.getClients().add(requirementClientInvalid);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(copyInvalid, RequirementsPackage.eINSTANCE.getCopy());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(copyInvalid, RequirementsPackage.eINSTANCE.getCopy(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/DeriveReqtClientModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/DeriveReqtClientModelConstraintTest.java
index 542d28e..31e9cef 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/DeriveReqtClientModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/DeriveReqtClientModelConstraintTest.java
@@ -61,19 +61,19 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class clientRequirement = model.createOwnedClass("ClientRequirement", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(clientRequirement, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(clientRequirement, RequirementsPackage.eINSTANCE.getRequirement(),null);
Abstraction deriveReqtValid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(deriveReqtValid);
deriveReqtValid.getClients().add(clientRequirement);
deriveReqtValid.getSuppliers().add(model.createOwnedClass("uselessSupplier1", false));
- StereotypeApplicationHelper.getInstance(null).applyStereotype(deriveReqtValid, RequirementsPackage.eINSTANCE.getDeriveReqt());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(deriveReqtValid, RequirementsPackage.eINSTANCE.getDeriveReqt(),null);
Class clientClass = model.createOwnedClass("ClientClass", false);
Abstraction deriveReqtInvalid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(deriveReqtInvalid);
deriveReqtInvalid.getClients().add(clientClass);
deriveReqtInvalid.getSuppliers().add(model.createOwnedClass("uselessSupplier2", false));
- StereotypeApplicationHelper.getInstance(null).applyStereotype(deriveReqtInvalid, RequirementsPackage.eINSTANCE.getDeriveReqt());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(deriveReqtInvalid, RequirementsPackage.eINSTANCE.getDeriveReqt(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/DeriveReqtSupplierModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/DeriveReqtSupplierModelConstraintTest.java
index a211a8b..dde7b4b 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/DeriveReqtSupplierModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/DeriveReqtSupplierModelConstraintTest.java
@@ -61,19 +61,19 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class supplierRequirement = model.createOwnedClass("SupplierRequirement", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(supplierRequirement, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(supplierRequirement, RequirementsPackage.eINSTANCE.getRequirement(),null);
Abstraction deriveReqtValid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(deriveReqtValid);
deriveReqtValid.getSuppliers().add(supplierRequirement);
deriveReqtValid.getClients().add(model.createOwnedClass("uselessClient1", false));
- StereotypeApplicationHelper.getInstance(null).applyStereotype(deriveReqtValid, RequirementsPackage.eINSTANCE.getDeriveReqt());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(deriveReqtValid, RequirementsPackage.eINSTANCE.getDeriveReqt(),null);
Class supplierClass = model.createOwnedClass("SupplierClass", false);
Abstraction deriveReqtInvalid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(deriveReqtInvalid);
deriveReqtInvalid.getSuppliers().add(supplierClass);
deriveReqtInvalid.getClients().add(model.createOwnedClass("uselessClient2", false));
- StereotypeApplicationHelper.getInstance(null).applyStereotype(deriveReqtInvalid, RequirementsPackage.eINSTANCE.getDeriveReqt());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(deriveReqtInvalid, RequirementsPackage.eINSTANCE.getDeriveReqt(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RefineDependencyModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RefineDependencyModelConstraintTest.java
index 13f214f..58de238 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RefineDependencyModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RefineDependencyModelConstraintTest.java
@@ -62,10 +62,10 @@
Abstraction refineValid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(refineValid);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(refineValid, RequirementsPackage.eINSTANCE.getRefine());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(refineValid, RequirementsPackage.eINSTANCE.getRefine(),null);
Generalization refineInvalid = model.createOwnedClass("Child", false).createGeneralization(model.createOwnedClass("Parent", false));
- StereotypeApplicationHelper.getInstance(null).applyStereotype(refineInvalid, RequirementsPackage.eINSTANCE.getRefine());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(refineInvalid, RequirementsPackage.eINSTANCE.getRefine(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RefineOneClientSupplierModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RefineOneClientSupplierModelConstraintTest.java
index 2d022df..e3bd6e7 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RefineOneClientSupplierModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RefineOneClientSupplierModelConstraintTest.java
@@ -63,11 +63,11 @@
model.getPackagedElements().add(refineValid);
refineValid.getClients().add(model.createOwnedClass("client", false));
refineValid.getSuppliers().add(model.createOwnedClass("supplier", false));
- StereotypeApplicationHelper.getInstance(null).applyStereotype(refineValid, RequirementsPackage.eINSTANCE.getRefine());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(refineValid, RequirementsPackage.eINSTANCE.getRefine(),null);
Abstraction refineInvalid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(refineInvalid);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(refineInvalid, RequirementsPackage.eINSTANCE.getRefine());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(refineInvalid, RequirementsPackage.eINSTANCE.getRefine(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementEmptyOwnedAttributeModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementEmptyOwnedAttributeModelConstraintTest.java
index 9f28b95..55fafaa 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementEmptyOwnedAttributeModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementEmptyOwnedAttributeModelConstraintTest.java
@@ -59,10 +59,10 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class valid = model.createOwnedClass("valid", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement(),null);
Class invalid = model.createOwnedClass("invalid", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement(),null);
invalid.createOwnedAttribute("invalidAttribute", null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementEmptyOwnedOperationModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementEmptyOwnedOperationModelConstraintTest.java
index 63eaf2b..3aa0ec9 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementEmptyOwnedOperationModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementEmptyOwnedOperationModelConstraintTest.java
@@ -59,10 +59,10 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class valid = model.createOwnedClass("valid", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement(),null);
Class invalid = model.createOwnedClass("invalid", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement(),null);
invalid.createOwnedOperation("invalidOperation", null, null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNestedRequirementModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNestedRequirementModelConstraintTest.java
index d17eb76..09e7c06 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNestedRequirementModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNestedRequirementModelConstraintTest.java
@@ -60,12 +60,12 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class valid = model.createOwnedClass("valid", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement(),null);
Classifier validNestedRequirement = valid.createNestedClassifier("validNestedClassifier", valid.eClass());
- StereotypeApplicationHelper.getInstance(null).applyStereotype(validNestedRequirement, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(validNestedRequirement, RequirementsPackage.eINSTANCE.getRequirement(),null);
Class invalid = model.createOwnedClass("invalid", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement(),null);
invalid.createNestedClassifier("invalidNestedClassifier", invalid.eClass());
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNoAssociationModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNoAssociationModelConstraintTest.java
index 79b6c79..10d70c4 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNoAssociationModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNoAssociationModelConstraintTest.java
@@ -60,10 +60,10 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class valid = model.createOwnedClass("valid", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement(),null);
Class invalid = model.createOwnedClass("invalid", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement(),null);
invalid.createAssociation(true, AggregationKind.NONE_LITERAL, "", 0, 0, invalid, true, AggregationKind.NONE_LITERAL, "", 0, 0);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNoGeneralizationModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNoGeneralizationModelConstraintTest.java
index 81799f6..16b1b44 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNoGeneralizationModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNoGeneralizationModelConstraintTest.java
@@ -59,10 +59,10 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class valid = model.createOwnedClass("valid", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement(),null);
Class invalid = model.createOwnedClass("invalid", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement(),null);
invalid.createGeneralization(invalid);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNotTypeModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNotTypeModelConstraintTest.java
index a548852..bfa8f16 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNotTypeModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/RequirementNotTypeModelConstraintTest.java
@@ -59,10 +59,10 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty());
Class valid = model.createOwnedClass("valid", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(valid, RequirementsPackage.eINSTANCE.getRequirement(),null);
Class invalid = model.createOwnedClass("invalid", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(invalid, RequirementsPackage.eINSTANCE.getRequirement(),null);
invalid.createOwnedAttribute("invalidrequirementType", invalid);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/SatisfySupplierModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/SatisfySupplierModelConstraintTest.java
index 0e6087d..d172cec 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/SatisfySupplierModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/SatisfySupplierModelConstraintTest.java
@@ -63,14 +63,14 @@
Abstraction satisfyValid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(satisfyValid);
Class requirementSupplier = model.createOwnedClass("supplier", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementSupplier, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementSupplier, RequirementsPackage.eINSTANCE.getRequirement(),null);
satisfyValid.getSuppliers().add(requirementSupplier);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(satisfyValid, RequirementsPackage.eINSTANCE.getSatisfy());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(satisfyValid, RequirementsPackage.eINSTANCE.getSatisfy(),null);
Abstraction satisfyInvalid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(satisfyInvalid);
satisfyInvalid.getSuppliers().add(model.createOwnedClass("fakesupplier", false));
- StereotypeApplicationHelper.getInstance(null).applyStereotype(satisfyInvalid, RequirementsPackage.eINSTANCE.getSatisfy());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(satisfyInvalid, RequirementsPackage.eINSTANCE.getSatisfy(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/TestCaseParameterVerdictKindModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/TestCaseParameterVerdictKindModelConstraintTest.java
index f156dc1..d6b5937 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/TestCaseParameterVerdictKindModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/TestCaseParameterVerdictKindModelConstraintTest.java
@@ -63,12 +63,12 @@
Class testCaseValid = model.createOwnedClass("Class", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(testCaseValid, RequirementsPackage.eINSTANCE.getTestCase());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(testCaseValid, RequirementsPackage.eINSTANCE.getTestCase(),null);
Type returnType = model.createOwnedType("VerdictKind", testCaseValid.eClass());
testCaseValid.createOwnedOperation("operation", null, null, returnType);
Class testCaseInvalid = model.createOwnedClass("testCaseInvalid", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(testCaseInvalid, RequirementsPackage.eINSTANCE.getTestCase());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(testCaseInvalid, RequirementsPackage.eINSTANCE.getTestCase(),null);
Type returnTypeInvalid = model.createOwnedType("NotVerdictKind", testCaseInvalid.eClass());
testCaseInvalid.createOwnedOperation("operation", null, null, returnTypeInvalid);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/TraceDependencyModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/TraceDependencyModelConstraintTest.java
index b0a4384..d6eca2e 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/TraceDependencyModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/TraceDependencyModelConstraintTest.java
@@ -62,10 +62,10 @@
Abstraction traceValid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(traceValid);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(traceValid, RequirementsPackage.eINSTANCE.getTrace());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(traceValid, RequirementsPackage.eINSTANCE.getTrace(),null);
Generalization traceInvalid = model.createOwnedClass("Child", false).createGeneralization(model.createOwnedClass("Parent", false));
- StereotypeApplicationHelper.getInstance(null).applyStereotype(traceInvalid, RequirementsPackage.eINSTANCE.getTrace());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(traceInvalid, RequirementsPackage.eINSTANCE.getTrace(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/TraceOneClientSupplierModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/TraceOneClientSupplierModelConstraintTest.java
index 2c878cf..a6f7b50 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/TraceOneClientSupplierModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/TraceOneClientSupplierModelConstraintTest.java
@@ -63,11 +63,11 @@
model.getPackagedElements().add(traceValid);
traceValid.getClients().add(model.createOwnedClass("client", false));
traceValid.getSuppliers().add(model.createOwnedClass("supplier", false));
- StereotypeApplicationHelper.getInstance(null).applyStereotype(traceValid, RequirementsPackage.eINSTANCE.getTrace());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(traceValid, RequirementsPackage.eINSTANCE.getTrace(),null);
Abstraction traceInvalid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(traceInvalid);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(traceInvalid, RequirementsPackage.eINSTANCE.getTrace());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(traceInvalid, RequirementsPackage.eINSTANCE.getTrace(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/VerifySupplierModelConstraintTest.java b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/VerifySupplierModelConstraintTest.java
index 0955ef4..37e64eb 100644
--- a/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/VerifySupplierModelConstraintTest.java
+++ b/core/org.eclipse.papyrus.sysml14.validation.tests/src/org/eclipse/papyrus/sysml14/validation/tests/rules/requirements/VerifySupplierModelConstraintTest.java
@@ -63,14 +63,14 @@
Abstraction verifyValid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(verifyValid);
Class requirementSupplier = model.createOwnedClass("supplier", false);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementSupplier, RequirementsPackage.eINSTANCE.getRequirement());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(requirementSupplier, RequirementsPackage.eINSTANCE.getRequirement(),null);
verifyValid.getSuppliers().add(requirementSupplier);
- StereotypeApplicationHelper.getInstance(null).applyStereotype(verifyValid, RequirementsPackage.eINSTANCE.getVerify());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(verifyValid, RequirementsPackage.eINSTANCE.getVerify(),null);
Abstraction verifyInvalid = UMLFactory.eINSTANCE.createAbstraction();
model.getPackagedElements().add(verifyInvalid);
verifyInvalid.getSuppliers().add(model.createOwnedClass("fakesupplier", false));
- StereotypeApplicationHelper.getInstance(null).applyStereotype(verifyInvalid, RequirementsPackage.eINSTANCE.getVerify());
+ StereotypeApplicationHelper.getInstance(null).applyStereotype(verifyInvalid, RequirementsPackage.eINSTANCE.getVerify(),null);
TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain(resourceSet);
InternalTransactionalEditingDomain editingDomain = (InternalTransactionalEditingDomain) TransactionUtil.getEditingDomain(model);
diff --git a/core/org.eclipse.papyrus.sysml14.validation/META-INF/MANIFEST.MF b/core/org.eclipse.papyrus.sysml14.validation/META-INF/MANIFEST.MF
index e837831..8bcd1cd 100644
--- a/core/org.eclipse.papyrus.sysml14.validation/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.papyrus.sysml14.validation/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@
org.eclipse.papyrus.infra.services.validation;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.uml.oclconstraintevaluation;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.uml.xtext.integration.validation;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext;bundle-version="[1.2.0,2.0.0)",
diff --git a/diagram/.settings/org.eclipse.core.resources.prefs b/diagram/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/diagram/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF
index cff3d21..90d8926 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.blockdefinition/META-INF/MANIFEST.MF
@@ -11,9 +11,9 @@
org.eclipse.uml2.uml;bundle-version="[5.1.0,6.0.0)",
org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.sysml14.diagram.common;bundle-version="1.0.0"
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF
index 4b37a22..dfee020 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.uml.diagram.component;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[3.0.0,4.0.0)",
@@ -17,7 +17,7 @@
org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)"
Export-Package: org.eclipse.papyrus.sysml14.diagram.common.tests.resources,
org.eclipse.papyrus.sysml14.diagram.common.tests.util
Automatic-Module-Name: org.eclipse.papyrus.sysml14.diagram.common.tests
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF
index 182678c..4994e4e 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/META-INF/MANIFEST.MF
@@ -13,21 +13,23 @@
org.eclipse.uml2.uml;bundle-version="[5.1.0,6.0.0)",
org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[2.0.0,3.0.0]",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.types.core;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.sysml14;bundle-version="1.0.0",
org.eclipse.papyrus.sysml14.service.types;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/ActorPartGraphicalEditHelperAdvice.java b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/ActorPartGraphicalEditHelperAdvice.java
index 31b8ec1..b5e3693 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/ActorPartGraphicalEditHelperAdvice.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/ActorPartGraphicalEditHelperAdvice.java
@@ -71,7 +71,7 @@
if (dialog.getReturnCode() == Window.OK) {
final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
- final String newTypeName = dialog.getSavedNewTypeName();
+ final String newTypeName = dialog.getSavedNewTypeNameText();
final Type partType = (Type) dialog.getExistingType();
// Abort if type creation command exists but is not executable
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/ConstraintPropertyGraphicalEditHelperAdvice.java b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/ConstraintPropertyGraphicalEditHelperAdvice.java
index 0e1a6ce..a825c21 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/ConstraintPropertyGraphicalEditHelperAdvice.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/ConstraintPropertyGraphicalEditHelperAdvice.java
@@ -71,7 +71,7 @@
if (dialog.getReturnCode() == Window.OK) {
final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
- final String newTypeName = dialog.getSavedNewTypeName();
+ final String newTypeName = dialog.getSavedNewTypeNameText();
final Type partType = (Type) dialog.getExistingType();
// Abort if type creation command exists but is not executable
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/CreateOrSelectBlockPropertyTypeEditHelperAdvice.java b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/CreateOrSelectBlockPropertyTypeEditHelperAdvice.java
index 843c623..5ee8723 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/CreateOrSelectBlockPropertyTypeEditHelperAdvice.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/CreateOrSelectBlockPropertyTypeEditHelperAdvice.java
@@ -70,7 +70,7 @@
if (dialog.getReturnCode() == Window.OK) {
final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
- final String newTypeName = dialog.getSavedNewTypeName();
+ final String newTypeName = dialog.getSavedNewTypeNameText();
final Type partType = (Type) dialog.getExistingType();
// Abort if type creation command exists but is not executable
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/ValueEditHelperAdvice.java b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/ValueEditHelperAdvice.java
index 0e0a441..d08f0d6 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/ValueEditHelperAdvice.java
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.common/src/org/eclipse/papyrus/sysml14/diagram/common/advices/ValueEditHelperAdvice.java
@@ -71,7 +71,7 @@
if (dialog.getReturnCode() == Window.OK) {
final ICommand typeCreationCommand = dialog.getNewTypeCreateCommand();
- final String newTypeName = dialog.getSavedNewTypeName();
+ final String newTypeName = dialog.getSavedNewTypeNameText();
final Type partType = (Type) dialog.getExistingType();
// Abort if type creation command exists but is not executable
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF
index 9772553..3f5da1d 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.internalblock/META-INF/MANIFEST.MF
@@ -10,9 +10,9 @@
org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
org.eclipse.uml2.uml;bundle-version="[5.1.0,6.0.0)",
org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.sysml14.diagram.common;bundle-version="1.0.0"
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF
index 9d1333f..904ae5f 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.parametric/META-INF/MANIFEST.MF
@@ -10,12 +10,12 @@
org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
org.eclipse.uml2.uml;bundle-version="[5.1.0,6.0.0)",
org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.1.0,2.0.0)",
org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
diff --git a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF
index 0b98dff..ea91b67 100644
--- a/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF
+++ b/diagram/org.eclipse.papyrus.sysml14.diagram.requirement/META-INF/MANIFEST.MF
@@ -9,9 +9,10 @@
org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)",
org.eclipse.ui.workbench;bundle-version="[3.107.0,4.0.0)",
org.eclipse.jface;bundle-version="[3.11.0,4.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.sysml14.diagram.common;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor
Automatic-Module-Name: org.eclipse.papyrus.sysml14.diagram.requirement
+Export-Package: org.eclipse.papyrus.sysml14.diagram.requirement
diff --git a/gui/.settings/org.eclipse.core.resources.prefs b/gui/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/gui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture.tests/META-INF/MANIFEST.MF b/gui/org.eclipse.papyrus.sysml14.architecture.tests/META-INF/MANIFEST.MF
index c122228..b2fcf17 100644
--- a/gui/org.eclipse.papyrus.sysml14.architecture.tests/META-INF/MANIFEST.MF
+++ b/gui/org.eclipse.papyrus.sysml14.architecture.tests/META-INF/MANIFEST.MF
@@ -9,6 +9,9 @@
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.sysml14.architecture.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)"
+Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="4.0.0"
Automatic-Module-Name: org.eclipse.papyrus.sysml14.architecture.tests
+Export-Package: org.eclipse.papyrus.sysml14.architecture.tests.resources,
+ org.eclipse.papyrus.sysml14.architecture.tests.util
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture.tests/test/org/eclipse/papyrus/sysml14/architecture/tests/resources/ModelValidationTest.java b/gui/org.eclipse.papyrus.sysml14.architecture.tests/test/org/eclipse/papyrus/sysml14/architecture/tests/resources/ModelValidationTest.java
index c4c6eaf..ff0d026 100644
--- a/gui/org.eclipse.papyrus.sysml14.architecture.tests/test/org/eclipse/papyrus/sysml14/architecture/tests/resources/ModelValidationTest.java
+++ b/gui/org.eclipse.papyrus.sysml14.architecture.tests/test/org/eclipse/papyrus/sysml14/architecture/tests/resources/ModelValidationTest.java
@@ -15,6 +15,7 @@
import java.util.Arrays;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.URI;
@@ -72,7 +73,17 @@
URI modelPlatformURI = URI.createPlatformPluginURI(fullPath, true);
Resource resource = new ResourceSetImpl().getResource(modelPlatformURI, true);
Diagnostic diagnostic = Diagnostician.INSTANCE.validate(resource.getContents().get(0));
- Assert.assertEquals("The "+modelPath+" model is invalid ", Diagnostic.OK, diagnostic.getSeverity());
+ Assert.assertEquals("The "+modelPath+" model is invalid "+print(diagnostic), Diagnostic.OK, diagnostic.getSeverity());
}
+ // FIXME : Something should exist in API to do that
+ private String print(Diagnostic diagnostic) {
+ List<Diagnostic> children = diagnostic.getChildren();
+ StringBuilder stringBuilder = new StringBuilder(diagnostic.getMessage());
+ for (Diagnostic diagnosticChildren : children) {
+ stringBuilder.append("\n"); //$NON-NLS-1$
+ stringBuilder.append(diagnosticChildren.getMessage());
+ }
+ return stringBuilder.toString();
+ }
}
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture/META-INF/MANIFEST.MF b/gui/org.eclipse.papyrus.sysml14.architecture/META-INF/MANIFEST.MF
index 45741c6..1edc00c 100644
--- a/gui/org.eclipse.papyrus.sysml14.architecture/META-INF/MANIFEST.MF
+++ b/gui/org.eclipse.papyrus.sysml14.architecture/META-INF/MANIFEST.MF
@@ -7,28 +7,38 @@
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.gmf.runtime.emf.core;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.sysml14.nattable.requirement;bundle-version="1.0.0",
org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)",
- org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.architecture;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.nattable.representation;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.nattable.common;bundle-version="3.0.0",
org.eclipse.papyrus.uml.architecture;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.1.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.1.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.1.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[5.0.0,6.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.sysml14;bundle-version="1.0.0",
+ org.eclipse.papyrus.sysml14.edit;bundle-version="1.0.0",
+ org.eclipse.papyrus.sysml14.service.types;bundle-version="1.0.0",
org.eclipse.papyrus.sysml14.diagram.blockdefinition;bundle-version="1.0.0",
org.eclipse.papyrus.sysml14.diagram.common;bundle-version="1.0.0",
org.eclipse.papyrus.sysml14.diagram.internalblock;bundle-version="1.0.0",
org.eclipse.papyrus.sysml14.diagram.parametric;bundle-version="1.0.0",
org.eclipse.papyrus.sysml14.diagram.requirement;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.edit;bundle-version="1.0.0",
org.eclipse.papyrus.sysml14.nattable.allocation;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.nattable.common;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.nattable.requirement;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.nattable.ui;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.service.types;bundle-version="1.0.0"
+ org.eclipse.papyrus.sysml14.nattable.common;bundle-version="1.0.0",
+ org.eclipse.papyrus.sysml14.nattable.ui;bundle-version="1.0.0"
Export-Package: org.eclipse.papyrus.sysml14.architecture,
org.eclipse.papyrus.sysml14.architecture.internal;x-internal:=true,
org.eclipse.papyrus.sysml14.architecture.internal.migration;x-internal:=true,
diff --git a/gui/org.eclipse.papyrus.sysml14.architecture/src/org/eclipse/papyrus/sysml14/architecture/CreateSysML14ModelCommand.java b/gui/org.eclipse.papyrus.sysml14.architecture/src/org/eclipse/papyrus/sysml14/architecture/CreateSysML14ModelCommand.java
index 91b4818..91e574e 100644
--- a/gui/org.eclipse.papyrus.sysml14.architecture/src/org/eclipse/papyrus/sysml14/architecture/CreateSysML14ModelCommand.java
+++ b/gui/org.eclipse.papyrus.sysml14.architecture/src/org/eclipse/papyrus/sysml14/architecture/CreateSysML14ModelCommand.java
@@ -14,6 +14,7 @@
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.infra.architecture.commands.IModelCreationCommand;
import org.eclipse.papyrus.sysml14.util.SysMLResource;
import org.eclipse.papyrus.uml.diagram.common.commands.ModelCreationCommandBase;
import org.eclipse.papyrus.uml.tools.utils.PackageUtil;
@@ -23,11 +24,10 @@
import org.eclipse.uml2.uml.UMLFactory;
import org.eclipse.uml2.uml.resource.UMLResource;
-
/**
* The Class CreateSysMLModelCommand.
*/
-public class CreateSysML14ModelCommand extends ModelCreationCommandBase {
+public class CreateSysML14ModelCommand extends ModelCreationCommandBase implements IModelCreationCommand{
/**
* @see org.eclipse.papyrus.infra.core.extension.commands.ModelCreationCommandBase#createRootElement()
diff --git a/gui/org.eclipse.papyrus.sysml14.ui.tests/META-INF/MANIFEST.MF b/gui/org.eclipse.papyrus.sysml14.ui.tests/META-INF/MANIFEST.MF
index 5203f23..770d523 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui.tests/META-INF/MANIFEST.MF
+++ b/gui/org.eclipse.papyrus.sysml14.ui.tests/META-INF/MANIFEST.MF
@@ -9,16 +9,17 @@
org.eclipse.uml2.uml;bundle-version="[5.0.0,6.0.0)",
org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.core.log;bundle-version="[1.1.0,2.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.newchild;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.newchild;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.uml.diagram.component;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[3.0.0,4.0.0)",
@@ -26,9 +27,9 @@
org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.sysml14;bundle-version="1.0.0",
- org.eclipse.papyrus.sysml14.edit;bundle-version="1.0.0",
+ org.eclipse.papyrus.sysml14.edit;bundle-version="1.0.0",
org.eclipse.papyrus.sysml14.service.types;bundle-version="1.0.0",
org.eclipse.papyrus.sysml14.diagram.common;bundle-version="1.0.0",
org.eclipse.papyrus.sysml14.diagram.blockdefinition;bundle-version="1.0.0",
@@ -48,4 +49,6 @@
Bundle-SymbolicName: org.eclipse.papyrus.sysml14.ui.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.papyrus.sysml14.ui.tests
+Export-Package: org.eclipse.papyrus.sysml14.ui.tests.images,
+ org.eclipse.papyrus.sysml14.ui.tests.resources
diff --git a/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/ModelValidationTest.java b/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/ModelValidationTest.java
index 90ac052..57fa59d 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/ModelValidationTest.java
+++ b/gui/org.eclipse.papyrus.sysml14.ui.tests/test/org/eclipse/papyrus/sysml14/ui/tests/resources/ModelValidationTest.java
@@ -15,6 +15,7 @@
import java.util.Arrays;
import java.util.Collection;
+import java.util.List;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.URI;
@@ -74,7 +75,19 @@
URI modelPlatformURI = URI.createPlatformPluginURI(fullPath, true);
Resource resource = new ResourceSetImpl().getResource(modelPlatformURI, true);
Diagnostic diagnostic = Diagnostician.INSTANCE.validate(resource.getContents().get(0));
- Assert.assertEquals("The "+modelPath+" model is invalid ", Diagnostic.OK, diagnostic.getSeverity());
+ Assert.assertEquals("The "+modelPath+" model is invalid "+print(diagnostic), Diagnostic.OK, diagnostic.getSeverity());
}
+ // FIXME : Something should exist in API to do that
+ private String print(Diagnostic diagnostic) {
+ List<Diagnostic> children = diagnostic.getChildren();
+ StringBuilder stringBuilder = new StringBuilder(diagnostic.getMessage());
+ for (Diagnostic diagnosticChildren : children) {
+ stringBuilder.append("\n"); //$NON-NLS-1$
+ stringBuilder.append(diagnosticChildren.getMessage());
+ }
+ return stringBuilder.toString();
+ }
+
+
}
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/META-INF/MANIFEST.MF b/gui/org.eclipse.papyrus.sysml14.ui/META-INF/MANIFEST.MF
index 19bab7e..5c3074c 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/META-INF/MANIFEST.MF
+++ b/gui/org.eclipse.papyrus.sysml14.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@
org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.newchild;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.newchild;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.views.properties;bundle-version="[4.0.0,5.0.0)",
@@ -28,7 +28,7 @@
org.eclipse.papyrus.uml.modelexplorer;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.properties;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.templaterepository;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.sysml14;bundle-version="1.0.0",
org.eclipse.papyrus.sysml14.architecture;bundle-version="1.0.0"
diff --git a/pom.xml b/pom.xml
index a11298c..2347122 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,12 +35,12 @@
<component.rcp.name>org.eclipse.papyrus.sysml14.rcp</component.rcp.name>
<component.apibaseline.url>http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/0.8.0_papyrus-sysml-mars_190/</component.apibaseline.url>
<component.servicetype>org.eclipse.papyrus.sysml14.service.types</component.servicetype>
- <eclipse.targetrelease>oxygen</eclipse.targetrelease>
+ <eclipse.targetrelease>photon</eclipse.targetrelease>
<target.version>${project.version}</target.version>
<sonar.exclusions>**/src-gen/**</sonar.exclusions>
<!-- Override Components properties -->
- <rcptt-runner-version>2.2.0</rcptt-runner-version>
+ <rcptt-runner-version>2.3.0-M6c</rcptt-runner-version>
</properties>
<mailingLists>
diff --git a/releng/.settings/org.eclipse.core.resources.prefs b/releng/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/releng/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/releng/org.eclipse.papyrus.sysml14.feature/feature.xml b/releng/org.eclipse.papyrus.sysml14.feature/feature.xml
index 93f19d5..5bf2c06 100644
--- a/releng/org.eclipse.papyrus.sysml14.feature/feature.xml
+++ b/releng/org.eclipse.papyrus.sysml14.feature/feature.xml
@@ -24,7 +24,7 @@
</license>
<requires>
- <import feature="org.eclipse.papyrus.sdk.feature" version="3.0.0" match="compatible"/>
+ <import feature="org.eclipse.papyrus.sdk.feature" version="4.0.0" match="compatible"/>
</requires>
<plugin
diff --git a/releng/org.eclipse.papyrus.sysml14.p2/category.xml b/releng/org.eclipse.papyrus.sysml14.p2/category.xml
index d276796..4ae5ceb 100644
--- a/releng/org.eclipse.papyrus.sysml14.p2/category.xml
+++ b/releng/org.eclipse.papyrus.sysml14.p2/category.xml
@@ -11,5 +11,5 @@
Papyrus SysML Category
</description>
</category-def>
- <repository-reference location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/" enabled="true" />
+ <repository-reference location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/photon/" enabled="true" />
</site>
diff --git a/releng/org.eclipse.papyrus.sysml14.p2/pom.xml b/releng/org.eclipse.papyrus.sysml14.p2/pom.xml
index 006241e..17500a7 100644
--- a/releng/org.eclipse.papyrus.sysml14.p2/pom.xml
+++ b/releng/org.eclipse.papyrus.sysml14.p2/pom.xml
@@ -31,10 +31,10 @@
<project.website>https://www.eclipse.org/papyrus/components/sysml</project.website>
<project.issues>${project.issueManagement.url}</project.issues>
<eclipse.target>${eclipse.targetrelease}</eclipse.target>
- <update.site.nightly>https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml-oxygen/ws/releng/org.eclipse.papyrus.sysml14.p2/target/repository/</update.site.nightly>
+ <update.site.nightly>https://hudson.eclipse.org/papyrus/view/Sysml/job/papyrus-sysml-photon/ws/releng/org.eclipse.papyrus.sysml14.p2/target/repository/</update.site.nightly>
</symbols>
<associateSites>
- <site>http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen</site>
+ <site>http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/photon</site>
</associateSites>
<siteTemplateFolder>siteTemplate</siteTemplateFolder>
<p2StatsUrl>http://download.eclipse.org/stats</p2StatsUrl>
diff --git a/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product b/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product
index fab2296..316925d 100644
--- a/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product
+++ b/releng/org.eclipse.papyrus.sysml14.product/papyrusSysml.product
@@ -218,7 +218,7 @@
<repositories>
<repository location="http://download.eclipse.org/modeling/mdt/papyrus/components/sysml14/" enabled="true" />
- <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen" enabled="true" />
+ <repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/photon" enabled="true" />
</repositories>
<preferencesInfo>
diff --git a/releng/org.eclipse.papyrus.sysml14.rcp/plugin.xml b/releng/org.eclipse.papyrus.sysml14.rcp/plugin.xml
index 2c19eb0..774c781 100644
--- a/releng/org.eclipse.papyrus.sysml14.rcp/plugin.xml
+++ b/releng/org.eclipse.papyrus.sysml14.rcp/plugin.xml
@@ -6,7 +6,7 @@
point="org.eclipse.core.runtime.products">
<product
application="org.eclipse.ui.ide.workbench"
- description="Papyrus

Version: 1.0.0

(c) Copyright Eclipse contributors and others 2000, 2015. All rights reserved.
Visit http://www.eclipse.org/platform

This product includes software developed by the
Apache Software Foundation http://www.apache.org/"
+ description="Papyrus

Version: 1.3.0

(c) Copyright Eclipse contributors and others 2000, 2015. All rights reserved.
Visit http://www.eclipse.org/platform

This product includes software developed by the
Apache Software Foundation http://www.apache.org/"
name="Papyrus">
<property name="windowImages" value="icons/papyrus16.png,icons/papyrus32.png,icons/papyrus48.png,icons/papyrus64.png,icons/papyrus128.png"/>
<property name="aboutImage" value="icons/papyrus_lg.png"/>
@@ -51,7 +51,7 @@
</property>
<property
name="aboutText"
- value="Papyrus

Version: 1.0.0

(c) Copyright Eclipse contributors and others 2000, 2015. All rights reserved.
Visit http://www.eclipse.org/platform

This product includes software developed by the
Apache Software Foundation http://www.apache.org/">
+ value="Papyrus

Version: 1.3.0

(c) Copyright Eclipse contributors and others 2000, 2015. All rights reserved.
Visit http://www.eclipse.org/platform

This product includes software developed by the
Apache Software Foundation http://www.apache.org/">
</property>
</product>
</extension>
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/META-INF/MANIFEST.MF b/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/META-INF/MANIFEST.MF
index cc4c8f9..86a0bf8 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/META-INF/MANIFEST.MF
+++ b/table/org.eclipse.papyrus.sysml14.nattable.allocation.tests/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@
org.eclipse.ocl.xtext.essentialocl;bundle-version="[1.0.1,2.0.0)",
org.eclipse.emf.validation.ocl;bundle-version="[1.4.0,2.0.0)",
org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.uml.diagram.component;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[3.0.0,4.0.0)",
@@ -16,7 +16,7 @@
org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)",
org.eclipse.ocl.xtext.essentialocl.ui;bundle-version="[1.0.0,2.0.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.allocation/resources/allocation.nattableconfiguration b/table/org.eclipse.papyrus.sysml14.nattable.allocation/resources/allocation.nattableconfiguration
index f240afa..bc653f4 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.allocation/resources/allocation.nattableconfiguration
+++ b/table/org.eclipse.papyrus.sysml14.nattable.allocation/resources/allocation.nattableconfiguration
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
-<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="This table is used to display SysML Allocation" name="AllocationTable" type="PapyrusSysML14AllocationTable" iconPath="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.allocation/icons/table_SysML_Allocation.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">
- <styles xsi:type="nattablestyle:StringListValueStyle" name="dragRegions">
+<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" xmi:id="_Tn9sgF9WEeibbMBxjCBt2w" description="This table is used to display SysML Allocation" name="AllocationTable" type="PapyrusSysML14AllocationTable" iconPath="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.allocation/icons/table_SysML_Allocation.png" cellEditorDeclaration="COLUMN" defaultRowAxisProvider="_Tn9slF9WEeibbMBxjCBt2w" defaultColumnAxisProvider="_Tn9skF9WEeibbMBxjCBt2w">
+ <styles xmi:type="nattablestyle:StringListValueStyle" xmi:id="_Tn9sgV9WEeibbMBxjCBt2w" name="dragRegions">
<stringListValue>ROW_HEADER</stringListValue>
</styles>
- <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.sysml14.nattable.allocation.config.allocationtablecreationtester"/>
- <rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC" displayIndex="false">
- <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>
- <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration" displayType="false" displayMultiplicity="false"/>
- <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration">
- <listenFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>
+ <creationTester xmi:type="nattabletester:JavaTableTester" xmi:id="_Tn9sgl9WEeibbMBxjCBt2w" tester="org.eclipse.papyrus.sysml14.nattable.allocation.config.allocationtablecreationtester"/>
+ <rowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" xmi:id="_Tn9sg19WEeibbMBxjCBt2w" indexStyle="NUMERIC" displayLabel="true" displayFilter="false" displayIndex="false">
+ <ownedLabelConfigurations xmi:type="nattablelabelprovider:ObjectLabelProviderConfiguration" xmi:id="_Tn9shF9WEeibbMBxjCBt2w" displayIcon="true" displayLabel="true"/>
+ <ownedLabelConfigurations xmi:type="nattablelabelprovider:OperationLabelProviderConfiguration" xmi:id="_Tn9shV9WEeibbMBxjCBt2w" displayIcon="true" displayLabel="true" displayType="false" displayMultiplicity="false" displayName="true"/>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration" xmi:id="_Tn9shl9WEeibbMBxjCBt2w">
+ <listenFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>
</ownedAxisConfigurations>
- <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:PasteEObjectConfiguration" pastedElementId="org.eclipse.papyrus.SysML14.Allocate_Abstraction">
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_Tn9sh19WEeibbMBxjCBt2w" detachedMode="true" pastedElementId="org.eclipse.papyrus.SysML14.Allocate_Abstraction">
<postActions>applyStereotype:/SysML::Allocations::Allocate</postActions>
- <pasteElementContainementFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
- <axisIdentifier xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">
- <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/supplier"/>
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+ <axisIdentifier xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Tn9siF9WEeibbMBxjCBt2w" manager="org.eclipse.papyrus.sysml14.nattable.allocation.feature.axis.manager">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/supplier"/>
</axisIdentifier>
</ownedAxisConfigurations>
- <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.sysml14.nattable.allocate.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" specificAxisConfigurations="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.0"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_Tn9siV9WEeibbMBxjCBt2w" axisManagerId="org.eclipse.papyrus.sysml14.nattable.allocate.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="_Tn9shF9WEeibbMBxjCBt2w" specificAxisConfigurations="_Tn9shl9WEeibbMBxjCBt2w"/>
</rowHeaderAxisConfiguration>
- <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" displayIndex="false">
- <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" displayType="false" displayMultiplicity="false"/>
- <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration"/>
- <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>
- <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>
- <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ <columnHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" xmi:id="_Tn9sil9WEeibbMBxjCBt2w" displayLabel="true" displayFilter="false" displayIndex="false">
+ <ownedLabelConfigurations xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" xmi:id="_Tn9si19WEeibbMBxjCBt2w" displayIcon="true" displayLabel="true" displayIsDerived="true" displayType="false" displayMultiplicity="false" displayName="true"/>
+ <ownedLabelConfigurations xmi:type="nattablelabelprovider:OperationLabelProviderConfiguration" xmi:id="_Tn9sjF9WEeibbMBxjCBt2w" displayIcon="true" displayLabel="true" displayType="true" displayMultiplicity="true" displayName="true"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="org.eclipse.papyrus.sysml14.nattable.allocation.feature.axis.manager" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="_Tn9si19WEeibbMBxjCBt2w"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="org.eclipse.papyrus.sysml14.nattable.allocation.stereotype.property.axis.manager" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="_Tn9si19WEeibbMBxjCBt2w"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="org.eclipse.papyrus.sysml14.nattable.allocation.operation.axis.manager" axisManagerId="org.eclipse.papyrus.uml.nattable.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="_Tn9sjF9WEeibbMBxjCBt2w"/>
</columnHeaderAxisConfiguration>
- <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="This provider provides the default columns for the SysML Allocation Table" name="SysMLAllocationFeatureProvider">
- <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">
- <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+ <columnAxisProviders xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_Tn9skF9WEeibbMBxjCBt2w" description="This provider provides the default columns for the SysML Allocation Table" name="SysMLAllocationFeatureProvider">
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Tn9skV9WEeibbMBxjCBt2w" manager="org.eclipse.papyrus.sysml14.nattable.allocation.feature.axis.manager">
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
</axis>
- <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">
- <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/client"/>
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Tn9skl9WEeibbMBxjCBt2w" manager="org.eclipse.papyrus.sysml14.nattable.allocation.feature.axis.manager">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/client"/>
</axis>
- <axis xsi:type="nattableaxis:EStructuralFeatureAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.0">
- <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/supplier"/>
+ <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Tn9sk19WEeibbMBxjCBt2w" manager="org.eclipse.papyrus.sysml14.nattable.allocation.feature.axis.manager">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Dependency/supplier"/>
</axis>
</columnAxisProviders>
- <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="This row providers allows to display all Allocation in a Table" name="SysMLAllocationProvider" disconnectSlave="true"/>
+ <rowAxisProviders xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_Tn9slF9WEeibbMBxjCBt2w" description="This row providers allows to display all Allocation in a Table" name="SysMLAllocationProvider" disconnectSlave="true"/>
</nattableconfiguration:TableConfiguration>
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/META-INF/MANIFEST.MF b/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/META-INF/MANIFEST.MF
index 127f525..b3f28ec 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/META-INF/MANIFEST.MF
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@
org.eclipse.ocl.xtext.essentialocl.ui;bundle-version="[1.0.0,2.0.0)",
org.eclipse.uml2.uml.resources;bundle-version="[5.1.0,6.0.0)",
org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types.core;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.communication;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.uml.diagram.component;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[3.0.0,4.0.0)",
@@ -18,7 +18,7 @@
org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.statemachine;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.3.0.qualifier
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/src/org/eclipse/papyrus/sysml14/nattable/requirement/tests/tester/RequirementTableTesterTest.java b/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/src/org/eclipse/papyrus/sysml14/nattable/requirement/tests/tester/RequirementTableTesterTest.java
index 639cf62..d03b6ca 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/src/org/eclipse/papyrus/sysml14/nattable/requirement/tests/tester/RequirementTableTesterTest.java
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement.tests/src/org/eclipse/papyrus/sysml14/nattable/requirement/tests/tester/RequirementTableTesterTest.java
@@ -70,7 +70,7 @@
Assert.assertFalse("the SysML profil must be applied.", model.getAppliedProfiles().isEmpty()); //$NON-NLS-1$
Class requirement = model.createOwnedClass("requirement", false);//$NON-NLS-1$
StereotypeApplicationHelper stereotypeApplicationHelper = StereotypeApplicationHelper.getInstance(null);
- stereotypeApplicationHelper.applyStereotype(requirement, RequirementsPackage.eINSTANCE.getRequirement());
+ stereotypeApplicationHelper.applyStereotype(requirement, RequirementsPackage.eINSTANCE.getRequirement(),null);
IStatus missingStereotypeNotAllowed = tableRequirementTester.isAllowed(requirement);
Assert.assertEquals("The tester should work on a requirement", IStatus.OK, missingStereotypeNotAllowed.getSeverity()); //$NON-NLS-1$
}
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement/META-INF/MANIFEST.MF b/table/org.eclipse.papyrus.sysml14.nattable.requirement/META-INF/MANIFEST.MF
index ea2a7ec..d02452a 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement/META-INF/MANIFEST.MF
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement/META-INF/MANIFEST.MF
@@ -22,6 +22,7 @@
Bundle-SymbolicName: org.eclipse.papyrus.sysml14.nattable.requirement;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.papyrus.sysml14.nattable.requirement,
+ org.eclipse.papyrus.sysml14.nattable.requirement.config,
org.eclipse.papyrus.sysml14.nattable.requirement.tester
Bundle-Description: %Bundle-Description
Automatic-Module-Name: org.eclipse.papyrus.sysml14.nattable.requirement
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirement.nattableconfiguration b/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirement.nattableconfiguration
index da6e9c6..15ad050 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirement.nattableconfiguration
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirement.nattableconfiguration
@@ -1,35 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="A synchronized table for SysML Requirements" name="RequirementTable" type="PapyrusSysML14RequirementTable" iconPath="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/icons/table_SysML_Requirement.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">
- <styles xsi:type="nattablestyle:StringListValueStyle" name="dragRegions">
+<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" xmi:id="__qulcG1gEeijMr8XjU8gCg" description="A synchronized table for SysML Requirements " name="RequirementTable" type="PapyrusSysML14RequirementTable" iconPath="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/icons/table_SysML_Requirement.png" cellEditorDeclaration="COLUMN" defaultRowAxisProvider="__q8A0W1gEeijMr8XjU8gCg" defaultColumnAxisProvider="__q6ysG1gEeijMr8XjU8gCg">
+ <styles xmi:type="nattablestyle:StringListValueStyle" xmi:id="__qvzkG1gEeijMr8XjU8gCg" name="dragRegions">
<stringListValue>ROW_HEADER</stringListValue>
</styles>
- <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.sysml14.nattable.config.canCreateRequirementTable"/>
- <rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC" displayIndex="false">
- <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>
- <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration" displayType="false" displayMultiplicity="false"/>
- <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration">
- <listenFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>
+ <creationTester xmi:type="nattabletester:JavaTableTester" xmi:id="__qxBsG1gEeijMr8XjU8gCg" tester="org.eclipse.papyrus.sysml14.nattable.config.canCreateRequirementTable"/>
+ <rowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" xmi:id="__qyP0G1gEeijMr8XjU8gCg" indexStyle="NUMERIC" displayLabel="true" displayFilter="false" displayIndex="false">
+ <ownedLabelConfigurations xmi:type="nattablelabelprovider:ObjectLabelProviderConfiguration" xmi:id="__qy24G1gEeijMr8XjU8gCg" displayIcon="true" displayLabel="true"/>
+ <ownedLabelConfigurations xmi:type="nattablelabelprovider:OperationLabelProviderConfiguration" xmi:id="__qzd8G1gEeijMr8XjU8gCg" displayIcon="true" displayLabel="true" displayType="false" displayMultiplicity="false" displayName="true"/>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:EStructuralFeatureValueFillingConfiguration" xmi:id="__q0FAG1gEeijMr8XjU8gCg">
+ <listenFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Namespace/ownedMember"/>
</ownedAxisConfigurations>
- <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:PasteEObjectConfiguration" pastedElementId="org.eclipse.papyrus.SysML14.Requirement">
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="__q0sEG1gEeijMr8XjU8gCg" detachedMode="true" pastedElementId="org.eclipse.papyrus.SysML14.Requirement">
<postActions>applyStereotype:/SysML::Requirements::Requirement</postActions>
- <pasteElementContainementFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
- <axisIdentifier xsi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_OgydQXmoEeWVZIGG1XbiFw">
- <manager xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirement.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
- <element xsi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+ <axisIdentifier xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_OgydQXmoEeWVZIGG1XbiFw" manager="org.eclipse.papyrus.sysml14.nattable.requirement.feature.axis.manager">
+ <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/5.0.0/UML#//NamedElement/name"/>
</axisIdentifier>
</ownedAxisConfigurations>
- <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.sysml14.nattable.requirement.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" specificAxisConfigurations="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.0"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="__q4WcG1gEeijMr8XjU8gCg" axisManagerId="org.eclipse.papyrus.sysml14.nattable.requirement.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="__qy24G1gEeijMr8XjU8gCg" specificAxisConfigurations="__q0FAG1gEeijMr8XjU8gCg"/>
</rowHeaderAxisConfiguration>
- <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" displayIndex="false">
- <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" displayType="false" displayMultiplicity="false"/>
- <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration"/>
- <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>
- <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>
- <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ <columnHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" xmi:id="__q49gG1gEeijMr8XjU8gCg" displayLabel="true" displayFilter="false" displayIndex="false">
+ <ownedLabelConfigurations xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" xmi:id="__q5kkG1gEeijMr8XjU8gCg" displayIcon="true" displayLabel="true" displayIsDerived="true" displayType="false" displayMultiplicity="false" displayName="true"/>
+ <ownedLabelConfigurations xmi:type="nattablelabelprovider:OperationLabelProviderConfiguration" xmi:id="__q5kkW1gEeijMr8XjU8gCg" displayIcon="true" displayLabel="true" displayType="true" displayMultiplicity="true" displayName="true"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="org.eclipse.papyrus.sysml14.nattable.requirement.feature.axis.manager" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="__q5kkG1gEeijMr8XjU8gCg"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="org.eclipse.papyrus.sysml14.nattable.requirement.stereotype.property.axis.manager" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="__q5kkG1gEeijMr8XjU8gCg"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="org.eclipse.papyrus.sysml14.nattable.requirement.operation.axis.manager" axisManagerId="org.eclipse.papyrus.uml.nattable.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="__q5kkW1gEeijMr8XjU8gCg"/>
</columnHeaderAxisConfiguration>
- <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
- <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::id"/>
- <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>
+ <columnAxisProviders xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="__q6ysG1gEeijMr8XjU8gCg" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="__q7ZwG1gEeijMr8XjU8gCg" manager="org.eclipse.papyrus.sysml14.nattable.requirement.stereotype.property.axis.manager" element="property_of_stereotype:/SysML::Requirements::Requirement::id"/>
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="__q8A0G1gEeijMr8XjU8gCg" manager="org.eclipse.papyrus.sysml14.nattable.requirement.stereotype.property.axis.manager" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>
</columnAxisProviders>
- <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
+ <rowAxisProviders xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="__q8A0W1gEeijMr8XjU8gCg" description="Provides the requirements directly owned by the context of the table" name="Requirement Axis Provider" disconnectSlave="true"/>
</nattableconfiguration:TableConfiguration>
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirementTree.nattableconfiguration b/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirementTree.nattableconfiguration
index c02de9d..7811caa 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirementTree.nattableconfiguration
+++ b/table/org.eclipse.papyrus.sysml14.nattable.requirement/resources/requirementTree.nattableconfiguration
@@ -1,71 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
-<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" description="This table allows to display owned requirements of the context of the table as tree" name="RequirementTreeTable" type="PapyrusSysML14RequirementTreeTable" iconPath="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/icons/table_SysML_Tree_Requirement.png" defaultRowAxisProvider="//@rowAxisProviders.0" defaultColumnAxisProvider="//@columnAxisProviders.0">
- <styles xsi:type="nattablestyle:TableDisplayStyle" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
- <styles xsi:type="nattablestyle:StringListValueStyle" name="dragRegions">
+<nattableconfiguration:TableConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:nattablelabelprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattablecontentprovider" xmlns:nattablestyle="http://www.eclipse.org/papyrus/nattable/model/table/nattablestyle" xmlns:nattabletester="http://www.eclipse.org/papyrus/nattable/model/table/nattabletester" xmi:id="_QpaQsF9WEeibbMBxjCBt2w" description="This table allows to display owned requirements of the context of the table as tree" name="RequirementTreeTable" type="PapyrusSysML14RequirementTreeTable" iconPath="platform:/plugin/org.eclipse.papyrus.sysml14.nattable.requirement/icons/table_SysML_Tree_Requirement.png" cellEditorDeclaration="COLUMN" defaultRowAxisProvider="_QpaQ1F9WEeibbMBxjCBt2w" defaultColumnAxisProvider="_QpaQ0V9WEeibbMBxjCBt2w">
+ <styles xmi:type="nattablestyle:TableDisplayStyle" xmi:id="_QpaQsV9WEeibbMBxjCBt2w" displayStyle="HIERARCHIC_SINGLE_TREE_COLUMN"/>
+ <styles xmi:type="nattablestyle:StringListValueStyle" xmi:id="_QpaQsl9WEeibbMBxjCBt2w" name="dragRegions">
<stringListValue>ROW_HEADER</stringListValue>
</styles>
- <styles xsi:type="nattablestyle:BooleanValueStyle" name="expandAll" booleanValue="true"/>
- <styles xsi:type="nattablestyle:IntListValueStyle" name="hiddenCategoriesByDepth">
+ <styles xmi:type="nattablestyle:BooleanValueStyle" xmi:id="_QpaQs19WEeibbMBxjCBt2w" name="expandAll" booleanValue="true"/>
+ <styles xmi:type="nattablestyle:IntListValueStyle" xmi:id="_QpaQtF9WEeibbMBxjCBt2w" name="hiddenCategoriesByDepth">
<intListValue>0</intListValue>
<intListValue>1</intListValue>
<intListValue>2</intListValue>
<intListValue>3</intListValue>
<intListValue>4</intListValue>
</styles>
- <creationTester xsi:type="nattabletester:JavaTableTester" tester="org.eclipse.papyrus.sysml14.nattable.config.canCreateRequirementTable"/>
- <rowHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" indexStyle="NUMERIC" displayIndex="false">
- <ownedLabelConfigurations xsi:type="nattablelabelprovider:ObjectLabelProviderConfiguration"/>
- <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" displayType="false" displayMultiplicity="false"/>
- <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration" displayType="false" displayMultiplicity="false"/>
- <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:TreeFillingConfiguration" pasteConfiguration="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.5" labelProvider="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
- <axisUsedAsAxisProvider xsi:type="nattableaxis:EStructuralFeatureAxis" alias="nestedRequirements">
- <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>
+ <creationTester xmi:type="nattabletester:JavaTableTester" xmi:id="_QpaQtV9WEeibbMBxjCBt2w" tester="org.eclipse.papyrus.sysml14.nattable.config.canCreateRequirementTable"/>
+ <rowHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" xmi:id="_QpaQtl9WEeibbMBxjCBt2w" indexStyle="NUMERIC" displayLabel="true" displayFilter="false" displayIndex="false">
+ <ownedLabelConfigurations xmi:type="nattablelabelprovider:ObjectLabelProviderConfiguration" xmi:id="_QpaQt19WEeibbMBxjCBt2w" displayIcon="true" displayLabel="true"/>
+ <ownedLabelConfigurations xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" xmi:id="_QpaQuF9WEeibbMBxjCBt2w" displayIcon="true" displayLabel="true" displayIsDerived="true" displayType="false" displayMultiplicity="false" displayName="true"/>
+ <ownedLabelConfigurations xmi:type="nattablelabelprovider:OperationLabelProviderConfiguration" xmi:id="_QpaQuV9WEeibbMBxjCBt2w" displayIcon="true" displayLabel="true" displayType="false" displayMultiplicity="false" displayName="true"/>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_QpaQul9WEeibbMBxjCBt2w" pasteConfiguration="_QpaQxF9WEeibbMBxjCBt2w" labelProvider="_QpaQuF9WEeibbMBxjCBt2w" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_QpaQu19WEeibbMBxjCBt2w" alias="nestedRequirements">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Element/ownedElement"/>
</axisUsedAsAxisProvider>
</ownedAxisConfigurations>
- <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:TreeFillingConfiguration" pasteConfiguration="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.6" depth="1" labelProvider="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
- <axisUsedAsAxisProvider xsi:type="nattableaxis:EStructuralFeatureAxis" alias="nestedRequirements">
- <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_QpaQvF9WEeibbMBxjCBt2w" pasteConfiguration="_QpaQxl9WEeibbMBxjCBt2w" depth="1" labelProvider="_QpaQuF9WEeibbMBxjCBt2w" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_QpaQvV9WEeibbMBxjCBt2w" alias="nestedRequirements">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
</axisUsedAsAxisProvider>
</ownedAxisConfigurations>
- <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:TreeFillingConfiguration" pasteConfiguration="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.7" depth="2" labelProvider="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
- <axisUsedAsAxisProvider xsi:type="nattableaxis:EStructuralFeatureAxis" alias="nestedRequirements">
- <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_QpaQvl9WEeibbMBxjCBt2w" pasteConfiguration="_QpaQyF9WEeibbMBxjCBt2w" depth="2" labelProvider="_QpaQuF9WEeibbMBxjCBt2w" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_QpaQv19WEeibbMBxjCBt2w" alias="nestedRequirements">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
</axisUsedAsAxisProvider>
</ownedAxisConfigurations>
- <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:TreeFillingConfiguration" pasteConfiguration="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.7" depth="3" labelProvider="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
- <axisUsedAsAxisProvider xsi:type="nattableaxis:EStructuralFeatureAxis" alias="nestedRequirements">
- <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_QpaQwF9WEeibbMBxjCBt2w" pasteConfiguration="_QpaQyF9WEeibbMBxjCBt2w" depth="3" labelProvider="_QpaQuF9WEeibbMBxjCBt2w" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_QpaQwV9WEeibbMBxjCBt2w" alias="nestedRequirements">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
</axisUsedAsAxisProvider>
</ownedAxisConfigurations>
- <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:TreeFillingConfiguration" pasteConfiguration="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.7" depth="4" labelProvider="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.1" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
- <axisUsedAsAxisProvider xsi:type="nattableaxis:EStructuralFeatureAxis" alias="nestedRequirements">
- <element xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:TreeFillingConfiguration" xmi:id="_QpaQwl9WEeibbMBxjCBt2w" pasteConfiguration="_QpaQyF9WEeibbMBxjCBt2w" depth="4" labelProvider="_QpaQuF9WEeibbMBxjCBt2w" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.treefilling.feature.labelprovider">
+ <axisUsedAsAxisProvider xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_QpaQw19WEeibbMBxjCBt2w" alias="nestedRequirements">
+ <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
</axisUsedAsAxisProvider>
</ownedAxisConfigurations>
- <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" pastedElementId="org.eclipse.papyrus.SysML14.Requirement">
- <pasteElementContainementFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
- <axisIdentifier xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_QpaQxF9WEeibbMBxjCBt2w" detachedMode="false" pastedElementId="org.eclipse.papyrus.SysML14.Requirement">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package/packagedElement"/>
+ <axisIdentifier xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_QpaQxV9WEeibbMBxjCBt2w" manager="org.eclipse.papyrus.sysml14.nattable.requirementtree.stereotype.property.axis.manager" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>
</ownedAxisConfigurations>
- <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" pastedElementId="org.eclipse.papyrus.SysML14.Requirement">
- <pasteElementContainementFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
- <axisIdentifier xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_QpaQxl9WEeibbMBxjCBt2w" detachedMode="false" pastedElementId="org.eclipse.papyrus.SysML14.Requirement">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+ <axisIdentifier xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_QpaQx19WEeibbMBxjCBt2w" manager="org.eclipse.papyrus.sysml14.nattable.requirementtree.stereotype.property.axis.manager" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>
</ownedAxisConfigurations>
- <ownedAxisConfigurations xsi:type="nattableaxisconfiguration:PasteEObjectConfiguration" detachedMode="false" pastedElementId="org.eclipse.papyrus.SysML14.Requirement">
- <pasteElementContainementFeature xsi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
- <axisIdentifier xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>
+ <ownedAxisConfigurations xmi:type="nattableaxisconfiguration:PasteEObjectConfiguration" xmi:id="_QpaQyF9WEeibbMBxjCBt2w" detachedMode="false" pastedElementId="org.eclipse.papyrus.SysML14.Requirement">
+ <pasteElementContainementFeature xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/5.0.0/UML#//Class/nestedClassifier"/>
+ <axisIdentifier xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_QpaQyV9WEeibbMBxjCBt2w" manager="org.eclipse.papyrus.sysml14.nattable.requirementtree.stereotype.property.axis.manager" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>
</ownedAxisConfigurations>
- <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.sysml14.nattable.requirement.tree.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="//@rowHeaderAxisConfiguration/@ownedLabelConfigurations.0" specificAxisConfigurations="//@rowHeaderAxisConfiguration/@ownedAxisConfigurations.0 //@rowHeaderAxisConfiguration/@ownedAxisConfigurations.1 //@rowHeaderAxisConfiguration/@ownedAxisConfigurations.2 //@rowHeaderAxisConfiguration/@ownedAxisConfigurations.3 //@rowHeaderAxisConfiguration/@ownedAxisConfigurations.4"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_QpaQyl9WEeibbMBxjCBt2w" axisManagerId="org.eclipse.papyrus.sysml14.nattable.requirement.tree.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.labelprovider" headerLabelConfiguration="_QpaQt19WEeibbMBxjCBt2w" specificAxisConfigurations="_QpaQul9WEeibbMBxjCBt2w _QpaQvF9WEeibbMBxjCBt2w _QpaQvl9WEeibbMBxjCBt2w _QpaQwF9WEeibbMBxjCBt2w _QpaQwl9WEeibbMBxjCBt2w"/>
</rowHeaderAxisConfiguration>
- <columnHeaderAxisConfiguration xsi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" displayIndex="false">
- <ownedLabelConfigurations xsi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" displayType="false" displayMultiplicity="false"/>
- <ownedLabelConfigurations xsi:type="nattablelabelprovider:OperationLabelProviderConfiguration"/>
- <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>
- <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.0"/>
- <axisManagers xsi:type="nattableaxisconfiguration:AxisManagerRepresentation" axisManagerId="org.eclipse.papyrus.uml.nattable.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="//@columnHeaderAxisConfiguration/@ownedLabelConfigurations.1"/>
+ <columnHeaderAxisConfiguration xmi:type="nattableaxisconfiguration:TableHeaderAxisConfiguration" xmi:id="_QpaQy19WEeibbMBxjCBt2w" displayLabel="true" displayFilter="false" displayIndex="false">
+ <ownedLabelConfigurations xmi:type="nattablelabelprovider:FeatureLabelProviderConfiguration" xmi:id="_QpaQzF9WEeibbMBxjCBt2w" displayIcon="true" displayLabel="true" displayIsDerived="true" displayType="false" displayMultiplicity="false" displayName="true"/>
+ <ownedLabelConfigurations xmi:type="nattablelabelprovider:OperationLabelProviderConfiguration" xmi:id="_QpaQzV9WEeibbMBxjCBt2w" displayIcon="true" displayLabel="true" displayType="true" displayMultiplicity="true" displayName="true"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="org.eclipse.papyrus.sysml14.nattable.requirementtree.feature.axis.manager" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="_QpaQzF9WEeibbMBxjCBt2w"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="org.eclipse.papyrus.sysml14.nattable.requirementtree.stereotype.property.axis.manager" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="_QpaQzF9WEeibbMBxjCBt2w"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="org.eclipse.papyrus.sysml14.nattable.requirementtree.operation.axis.manager" axisManagerId="org.eclipse.papyrus.uml.nattable.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="_QpaQzV9WEeibbMBxjCBt2w"/>
</columnHeaderAxisConfiguration>
- <columnAxisProviders xsi:type="nattableaxisprovider:SlaveObjectAxisProvider" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
- <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::id"/>
- <axis xsi:type="nattableaxis:FeatureIdAxis" manager="//@columnHeaderAxisConfiguration/@axisManagers.1" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>
+ <columnAxisProviders xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_QpaQ0V9WEeibbMBxjCBt2w" description="Provides the columns of the tables with a default configuration" name="Requirements Feature Columns Provider">
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_QpaQ0l9WEeibbMBxjCBt2w" manager="org.eclipse.papyrus.sysml14.nattable.requirementtree.stereotype.property.axis.manager" element="property_of_stereotype:/SysML::Requirements::Requirement::id"/>
+ <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_QpaQ019WEeibbMBxjCBt2w" manager="org.eclipse.papyrus.sysml14.nattable.requirementtree.stereotype.property.axis.manager" element="property_of_stereotype:/SysML::Requirements::Requirement::text"/>
</columnAxisProviders>
- <rowAxisProviders xsi:type="nattableaxisprovider:MasterObjectAxisProvider" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true"/>
+ <rowAxisProviders xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_QpaQ1F9WEeibbMBxjCBt2w" description="This axis provider manages the rows, according to the wanted hierarchy" name="HierarchicalRowAxisManager" disconnectSlave="true"/>
</nattableconfiguration:TableConfiguration>
diff --git a/table/org.eclipse.papyrus.sysml14.nattable.ui/META-INF/MANIFEST.MF b/table/org.eclipse.papyrus.sysml14.nattable.ui/META-INF/MANIFEST.MF
index dcc6445..5d2c07e 100644
--- a/table/org.eclipse.papyrus.sysml14.nattable.ui/META-INF/MANIFEST.MF
+++ b/table/org.eclipse.papyrus.sysml14.nattable.ui/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@
org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.1.0",
org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.sysml14.diagram.common;bundle-version="1.0.0",
org.eclipse.papyrus.sysml14.service.types;bundle-version="1.0.0"
diff --git a/targetplatform/.settings/org.eclipse.core.resources.prefs b/targetplatform/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/targetplatform/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.photon/.project b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.photon/.project
new file mode 100644
index 0000000..08708c2
--- /dev/null
+++ b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.photon/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.sysml14.targetplatform.photon</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
diff --git a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.photon/.settings/org.eclipse.core.resources.prefs b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.photon/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.photon/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.oxygen/org.eclipse.papyrus.sysml14.targetplatform.oxygen.target b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.photon/org.eclipse.papyrus.sysml14.targetplatform.photon.target
similarity index 79%
rename from targetplatform/org.eclipse.papyrus.sysml14.targetplatform.oxygen/org.eclipse.papyrus.sysml14.targetplatform.oxygen.target
rename to targetplatform/org.eclipse.papyrus.sysml14.targetplatform.photon/org.eclipse.papyrus.sysml14.targetplatform.photon.target
index 6e349a4..11d119b 100644
--- a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.oxygen/org.eclipse.papyrus.sysml14.targetplatform.oxygen.target
+++ b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.photon/org.eclipse.papyrus.sysml14.targetplatform.photon.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Oxygen" sequenceNumber="1527061785">
+<target name="Papyrus Photon" sequenceNumber="1527753234">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -10,12 +10,12 @@
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
- <repository id="eclipse-oxygen" location="http://download.eclipse.org/releases/oxygen/"/>
+ <repository id="eclipse-photon" location="http://download.eclipse.org/releases/photon/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.papyrus.views.properties.model.xwt" version="0.0.0"/>
- <repository id="papyrus-oxygen" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/"/>
+ <repository id="papyrus-photon" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/photon/"/>
</location>
</locations>
</target>
diff --git a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.oxygen/org.eclipse.papyrus.sysml14.targetplatform.oxygen.tpd b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.photon/org.eclipse.papyrus.sysml14.targetplatform.photon.tpd
similarity index 63%
rename from targetplatform/org.eclipse.papyrus.sysml14.targetplatform.oxygen/org.eclipse.papyrus.sysml14.targetplatform.oxygen.tpd
rename to targetplatform/org.eclipse.papyrus.sysml14.targetplatform.photon/org.eclipse.papyrus.sysml14.targetplatform.photon.tpd
index df18bfc..cc52cf1 100644
--- a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.oxygen/org.eclipse.papyrus.sysml14.targetplatform.oxygen.tpd
+++ b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.photon/org.eclipse.papyrus.sysml14.targetplatform.photon.tpd
@@ -1,6 +1,6 @@
-target "Papyrus Oxygen" with source requirements
+target "Papyrus Photon" with source requirements
-location "http://download.eclipse.org/releases/oxygen/" eclipse-oxygen {
+location "http://download.eclipse.org/releases/photon/" eclipse-photon {
org.eclipse.platform.feature.group lazy
org.eclipse.rcp.feature.group lazy
org.eclipse.jdt.feature.group lazy
@@ -9,7 +9,7 @@
org.eclipse.ocl.uml.feature.group lazy
}
-location "http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen/" papyrus-oxygen {
+location "http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/photon/" papyrus-photon {
org.eclipse.papyrus.sdk.feature.feature.group lazy
- org.eclipse.papyrus.views.properties.model.xwt lazy
-}
\ No newline at end of file
+ org.eclipse.papyrus.views.properties.model.xwt lazy
+}
diff --git a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.oxygen/pom.xml b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.photon/pom.xml
similarity index 78%
rename from targetplatform/org.eclipse.papyrus.sysml14.targetplatform.oxygen/pom.xml
rename to targetplatform/org.eclipse.papyrus.sysml14.targetplatform.photon/pom.xml
index 79ee370..38c6386 100644
--- a/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.oxygen/pom.xml
+++ b/targetplatform/org.eclipse.papyrus.sysml14.targetplatform.photon/pom.xml
@@ -6,8 +6,8 @@
<groupId>org.eclipse.papyrus.sysml</groupId>
<version>1.3.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.papyrus.sysml14.targetplatform.oxygen</artifactId>
+ <artifactId>org.eclipse.papyrus.sysml14.targetplatform.photon</artifactId>
<packaging>eclipse-target-definition</packaging>
- <name>org.eclipse.papyrus.sysml14.targetplatform.oxygen</name>
- <description>This plug-in contains the target definition for Papyrus SysML in Oxygen.</description>
+ <name>org.eclipse.papyrus.sysml14.targetplatform.photon</name>
+ <description>This plug-in contains the target definition for Papyrus SysML in Photon.</description>
</project>
\ No newline at end of file
diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml
index 0987b74..5cec1ae 100644
--- a/targetplatform/pom.xml
+++ b/targetplatform/pom.xml
@@ -13,12 +13,12 @@
<description>This module contains the different Eclipse target platform definitions.</description>
<profiles>
<profile>
- <id>oxygen</id>
+ <id>photon</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>org.eclipse.papyrus.sysml14.targetplatform.oxygen</module>
+ <module>org.eclipse.papyrus.sysml14.targetplatform.photon</module>
</modules>
</profile>
</profiles>
