Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2016-05-17 06:41:16 -0400
committerEd Willink2016-05-18 09:18:00 -0400
commitcc486ae865bc5e9b9751c98acc06b192ad16fc85 (patch)
tree5c682b3a7054b22142b957097db6e5f5db7fdf76
parent17328a3e4895d6fa5b4007fe7c1fd7dece30597e (diff)
downloadorg.eclipse.qvtd-cc486ae865bc5e9b9751c98acc06b192ad16fc85.tar.gz
org.eclipse.qvtd-cc486ae865bc5e9b9751c98acc06b192ad16fc85.tar.xz
org.eclipse.qvtd-cc486ae865bc5e9b9751c98acc06b192ad16fc85.zip
[unrelated] use "upper" EAnnotation detail rather than "oppositeUpper"
source
-rw-r--r--tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/Edge2Edge.java6
-rw-r--r--tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/Graph2Graph.java6
-rw-r--r--tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/Node2Node.java6
-rw-r--r--tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java70
-rw-r--r--tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/UpperToLower/SimpleGraph2Graph.ecore24
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SourceFactoryImpl.java1
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/util/SourceAdapterFactory.java1
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/util/SourceSwitch.java1
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TargetFactoryImpl.java1
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/EnvironmentFactoryImpl.java1
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/EnvironmentAdapterFactory.java1
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/EnvironmentSwitch.java1
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetAdapterFactory.java1
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetExportedLookupVisitor.java4
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetQualifiedBLookupVisitor.java8
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetQualifiedCLookupVisitor.java8
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetSwitch.java1
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedA1LookupVisitor.java8
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedA2LookupVisitor.java8
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedBLookupVisitor.java13
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedCLookupVisitor.java13
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/EnvironmentFactoryImpl.java1
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/util/OperationFilter.java11
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesExportedOperationLookupVisitor.java8
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesExportedPropertyLookupVisitor.java8
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedClassLookupVisitor.java8
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedOperationLookupVisitor.java8
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedPackageLookupVisitor.java7
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedPropertyLookupVisitor.java8
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedClassLookupVisitor.java8
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedOperationLookupVisitor.java9
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedPackageLookupVisitor.java8
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedPropertyLookupVisitor.java9
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassescstracesFactoryImpl.java1
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/util/ClassescstracesAdapterFactory.java1
-rw-r--r--tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/util/ClassescstracesSwitch.java1
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/MemberToPerson.java6
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/Families2PersonsPackageImpl.java34
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/HSVNode2HLSNode.java6
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSV2HLSPackageImpl.java34
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/AssociationToForeignKey.java6
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/ClassToTable.java9
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/FromAttribute.java3
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/PackageToSchema.java6
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/PrimitiveToName.java3
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/ToColumn.java3
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/Simpleuml2rdbmsPackageImpl.java103
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/Edge2Edge.java6
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/Graph2Graph.java6
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/Node2Node.java6
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java70
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons.ecore8
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS.ecore8
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/SimpleUML2RDBMS.ecore39
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/SimpleGraph2Graph.ecore24
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/AssociationToForeignKey.java6
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/ClassToTable.java9
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/FromAttribute.java3
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/PackageToSchema.java6
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/PrimitiveToName.java3
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/ToColumn.java3
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UML2RDBMSPackageImpl.java106
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/SimpleUML2RDBMS/SimpleUML2RDBMS.ecore40
63 files changed, 309 insertions, 526 deletions
diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/Edge2Edge.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/Edge2Edge.java
index bc83bdf4f..877b2726b 100644
--- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/Edge2Edge.java
+++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/Edge2Edge.java
@@ -35,8 +35,7 @@ public interface Edge2Edge extends Element2Element {
* @return the value of the '<em>Edge1</em>' reference.
* @see #setEdge1(Edge)
* @see build.upper2lower.simplegraph2graph.Simplegraph2graphPackage#getEdge2Edge_Edge1()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle1'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle1' upper='1'"
* annotation="http://www.eclipse.org/qvt#Domains referredDomain='upperGraph'"
* @generated
*/
@@ -63,8 +62,7 @@ public interface Edge2Edge extends Element2Element {
* @return the value of the '<em>Edge2</em>' reference.
* @see #setEdge2(Edge)
* @see build.upper2lower.simplegraph2graph.Simplegraph2graphPackage#getEdge2Edge_Edge2()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle2'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle2' upper='1'"
* annotation="http://www.eclipse.org/qvt#Domains referredDomain='lowerGraph'"
* @generated
*/
diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/Graph2Graph.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/Graph2Graph.java
index 9b8414fd8..48c3979a2 100644
--- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/Graph2Graph.java
+++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/Graph2Graph.java
@@ -39,8 +39,7 @@ public interface Graph2Graph extends EObject {
* @return the value of the '<em>Graph1</em>' reference.
* @see #setGraph1(Graph)
* @see build.upper2lower.simplegraph2graph.Simplegraph2graphPackage#getGraph2Graph_Graph1()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle1'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle1' upper='1'"
* annotation="http://www.eclipse.org/qvt#Domains referredDomain='upperGraph'"
* @generated
*/
@@ -67,8 +66,7 @@ public interface Graph2Graph extends EObject {
* @return the value of the '<em>Graph2</em>' reference.
* @see #setGraph2(Graph)
* @see build.upper2lower.simplegraph2graph.Simplegraph2graphPackage#getGraph2Graph_Graph2()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle2'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle2' upper='1'"
* annotation="http://www.eclipse.org/qvt#Domains referredDomain='lowerGraph'"
* @generated
*/
diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/Node2Node.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/Node2Node.java
index 3f8a938ce..73d3738db 100644
--- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/Node2Node.java
+++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/Node2Node.java
@@ -34,8 +34,7 @@ public interface Node2Node extends Element2Element {
* @return the value of the '<em>Node1</em>' reference.
* @see #setNode1(Node)
* @see build.upper2lower.simplegraph2graph.Simplegraph2graphPackage#getNode2Node_Node1()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle1'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle1' upper='1'"
* annotation="http://www.eclipse.org/qvt#Domains referredDomain='upperGraph'"
* @generated
*/
@@ -62,8 +61,7 @@ public interface Node2Node extends Element2Element {
* @return the value of the '<em>Node2</em>' reference.
* @see #setNode2(Node)
* @see build.upper2lower.simplegraph2graph.Simplegraph2graphPackage#getNode2Node_Node2()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle2'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle2' upper='1'"
* annotation="http://www.eclipse.org/qvt#Domains referredDomain='lowerGraph'"
* @generated
*/
diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java
index c092a1233..b46877c37 100644
--- a/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java
+++ b/tests/org.eclipse.qvtd.build.etl.tests/src-gen/build/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java
@@ -374,103 +374,61 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple
createResource(eNS_URI);
// Create annotations
- // http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper
- createEmofAnnotations();
// http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName
- createEmof_1Annotations();
+ createEmofAnnotations();
// http://www.eclipse.org/qvt#Domains
createQvtDomainsAnnotations();
}
/**
- * Initializes the annotations for <b>http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createEmofAnnotations() {
- String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper";
- addAnnotation
- (getGraph2Graph_Graph1(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getGraph2Graph_Graph2(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getEdge2Edge_Edge1(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getEdge2Edge_Edge2(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getNode2Node_Node1(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getNode2Node_Node2(),
- source,
- new String[] {
- "body", "1"
- });
- }
-
- /**
* Initializes the annotations for <b>http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName</b>.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void createEmof_1Annotations() {
+ protected void createEmofAnnotations() {
String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName";
addAnnotation
(getGraph2Graph_Graph1(),
source,
new String[] {
- "body", "middle1"
+ "body", "middle1",
+ "upper", "1"
});
addAnnotation
(getGraph2Graph_Graph2(),
source,
new String[] {
- "body", "middle2"
+ "body", "middle2",
+ "upper", "1"
});
addAnnotation
(getEdge2Edge_Edge1(),
source,
new String[] {
- "body", "middle1"
+ "body", "middle1",
+ "upper", "1"
});
addAnnotation
(getEdge2Edge_Edge2(),
source,
new String[] {
- "body", "middle2"
+ "body", "middle2",
+ "upper", "1"
});
addAnnotation
(getNode2Node_Node1(),
source,
new String[] {
- "body", "middle1"
+ "body", "middle1",
+ "upper", "1"
});
addAnnotation
(getNode2Node_Node2(),
source,
new String[] {
- "body", "middle2"
+ "body", "middle2",
+ "upper", "1"
});
}
diff --git a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/UpperToLower/SimpleGraph2Graph.ecore b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/UpperToLower/SimpleGraph2Graph.ecore
index ae1780d18..dacb6961d 100644
--- a/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/UpperToLower/SimpleGraph2Graph.ecore
+++ b/tests/org.eclipse.qvtd.build.etl.tests/src/org/eclipse/qvtd/build/etl/tests/UpperToLower/SimpleGraph2Graph.ecore
@@ -4,22 +4,18 @@
nsPrefix="simplegraph2graph">
<eClassifiers xsi:type="ecore:EClass" name="Graph2Graph">
<eStructuralFeatures xsi:type="ecore:EReference" name="graph1" eType="ecore:EClass SimpleGraph.ecore#//Graph">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle1"/>
+ <details key="upper" value="1"/>
</eAnnotations>
<eAnnotations source="http://www.eclipse.org/qvt#Domains">
<details key="referredDomain" value="upperGraph"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="graph2" eType="ecore:EClass SimpleGraph.ecore#//Graph">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle2"/>
+ <details key="upper" value="1"/>
</eAnnotations>
<eAnnotations source="http://www.eclipse.org/qvt#Domains">
<details key="referredDomain" value="lowerGraph"/>
@@ -35,22 +31,18 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Edge2Edge" eSuperTypes="#//Element2Element">
<eStructuralFeatures xsi:type="ecore:EReference" name="edge1" eType="ecore:EClass SimpleGraph.ecore#//Edge">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle1"/>
+ <details key="upper" value="1"/>
</eAnnotations>
<eAnnotations source="http://www.eclipse.org/qvt#Domains">
<details key="referredDomain" value="upperGraph"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="edge2" eType="ecore:EClass SimpleGraph.ecore#//Edge">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle2"/>
+ <details key="upper" value="1"/>
</eAnnotations>
<eAnnotations source="http://www.eclipse.org/qvt#Domains">
<details key="referredDomain" value="lowerGraph"/>
@@ -61,22 +53,18 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Node2Node" eSuperTypes="#//Element2Element">
<eStructuralFeatures xsi:type="ecore:EReference" name="node1" eType="ecore:EClass SimpleGraph.ecore#//Node">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle1"/>
+ <details key="upper" value="1"/>
</eAnnotations>
<eAnnotations source="http://www.eclipse.org/qvt#Domains">
<details key="referredDomain" value="upperGraph"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="node2" eType="ecore:EClass SimpleGraph.ecore#//Node">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle2"/>
+ <details key="upper" value="1"/>
</eAnnotations>
<eAnnotations source="http://www.eclipse.org/qvt#Domains">
<details key="referredDomain" value="lowerGraph"/>
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SourceFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SourceFactoryImpl.java
index f89246e7f..83b07c01b 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SourceFactoryImpl.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/impl/SourceFactoryImpl.java
@@ -12,6 +12,7 @@
*/
package example1.source.impl;
+import example1.source.*;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/util/SourceAdapterFactory.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/util/SourceAdapterFactory.java
index 9020b1d65..70d69faca 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/util/SourceAdapterFactory.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/util/SourceAdapterFactory.java
@@ -12,6 +12,7 @@
*/
package example1.source.util;
+import example1.source.*;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/util/SourceSwitch.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/util/SourceSwitch.java
index 6b36879f5..af94f9991 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/util/SourceSwitch.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/source/util/SourceSwitch.java
@@ -12,6 +12,7 @@
*/
package example1.source.util;
+import example1.source.*;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TargetFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TargetFactoryImpl.java
index d9eaaa41d..66c77e211 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TargetFactoryImpl.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/impl/TargetFactoryImpl.java
@@ -12,6 +12,7 @@
*/
package example1.target.impl;
+import example1.target.*;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/EnvironmentFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/EnvironmentFactoryImpl.java
index 6fb27f7af..9712bce32 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/EnvironmentFactoryImpl.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/impl/EnvironmentFactoryImpl.java
@@ -2,6 +2,7 @@
*/
package example1.target.lookup.impl;
+import example1.target.lookup.*;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/EnvironmentAdapterFactory.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/EnvironmentAdapterFactory.java
index 9edfc18f4..da2115f5d 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/EnvironmentAdapterFactory.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/EnvironmentAdapterFactory.java
@@ -2,6 +2,7 @@
*/
package example1.target.lookup.util;
+import example1.target.lookup.*;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/EnvironmentSwitch.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/EnvironmentSwitch.java
index 80d3e1f15..f95c3f86f 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/EnvironmentSwitch.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/lookup/util/EnvironmentSwitch.java
@@ -2,6 +2,7 @@
*/
package example1.target.lookup.util;
+import example1.target.lookup.*;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetAdapterFactory.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetAdapterFactory.java
index 181a1ac2a..080bb6627 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetAdapterFactory.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetAdapterFactory.java
@@ -12,6 +12,7 @@
*/
package example1.target.util;
+import example1.target.*;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetExportedLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetExportedLookupVisitor.java
index 71e4490f5..974f4101f 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetExportedLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetExportedLookupVisitor.java
@@ -14,7 +14,11 @@ import example1.target.util.AbstractTargetCommonLookupVisitor;
import example1.target.util.Visitable;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
import org.eclipse.ocl.pivot.ids.IdManager;
+import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
public class TargetExportedLookupVisitor
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetQualifiedBLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetQualifiedBLookupVisitor.java
index 58bb4f635..4cdcb0a2e 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetQualifiedBLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetQualifiedBLookupVisitor.java
@@ -9,15 +9,23 @@
package example1.target.util;
+import example1.target.A1;
import example1.target.B;
import example1.target.TargetPackage;
import example1.target.lookup.EnvironmentPackage;
import example1.target.lookup.LookupEnvironment;
import example1.target.util.AbstractTargetCommonLookupVisitor;
import example1.target.util.Visitable;
+import java.util.List;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
+import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetQualifiedCLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetQualifiedCLookupVisitor.java
index 888895850..0fdce474d 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetQualifiedCLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetQualifiedCLookupVisitor.java
@@ -9,15 +9,23 @@
package example1.target.util;
+import example1.target.A2;
import example1.target.C;
import example1.target.TargetPackage;
import example1.target.lookup.EnvironmentPackage;
import example1.target.lookup.LookupEnvironment;
import example1.target.util.AbstractTargetCommonLookupVisitor;
import example1.target.util.Visitable;
+import java.util.List;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
+import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetSwitch.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetSwitch.java
index 4901c9aad..c3b1d6823 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetSwitch.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetSwitch.java
@@ -12,6 +12,7 @@
*/
package example1.target.util;
+import example1.target.*;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedA1LookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedA1LookupVisitor.java
index 82b41b5cf..3e5c77520 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedA1LookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedA1LookupVisitor.java
@@ -10,15 +10,23 @@
package example1.target.util;
import example1.target.A;
+import example1.target.TRoot;
import example1.target.TargetPackage;
import example1.target.lookup.EnvironmentPackage;
import example1.target.lookup.LookupEnvironment;
import example1.target.util.AbstractTargetCommonLookupVisitor;
import example1.target.util.Visitable;
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
+import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
import org.eclipse.ocl.pivot.values.InvalidValueException;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedA2LookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedA2LookupVisitor.java
index 9b1080736..72c38eee3 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedA2LookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedA2LookupVisitor.java
@@ -10,15 +10,23 @@
package example1.target.util;
import example1.target.A;
+import example1.target.TRoot;
import example1.target.TargetPackage;
import example1.target.lookup.EnvironmentPackage;
import example1.target.lookup.LookupEnvironment;
import example1.target.util.AbstractTargetCommonLookupVisitor;
import example1.target.util.Visitable;
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
+import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
import org.eclipse.ocl.pivot.values.InvalidValueException;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedBLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedBLookupVisitor.java
index a777312a7..8f9bb0859 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedBLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedBLookupVisitor.java
@@ -9,6 +9,7 @@
package example1.target.util;
+import example1.target.A1;
import example1.target.B;
import example1.target.TargetPackage;
import example1.target.lookup.EnvironmentPackage;
@@ -16,17 +17,24 @@ import example1.target.lookup.LookupEnvironment;
import example1.target.util.AbstractTargetCommonLookupVisitor;
import example1.target.util.Visitable;
import java.util.Iterator;
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.library.collection.CollectionIncludesOperation;
import org.eclipse.ocl.pivot.library.collection.OrderedCollectionIndexOfOperation;
import org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanOperation;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
import org.eclipse.ocl.pivot.utilities.ValueUtil;
+import org.eclipse.ocl.pivot.values.IntegerValue;
import org.eclipse.ocl.pivot.values.OrderedSetValue;
public class TargetUnqualifiedBLookupVisitor
@@ -90,14 +98,15 @@ public class TargetUnqualifiedBLookupVisitor
/*@Thrown*/ example1.target.lookup.@org.eclipse.jdt.annotation.Nullable LookupEnvironment symbol_1;
if (includes) {
/*@Thrown*/ OrderedSetValue.@org.eclipse.jdt.annotation.NonNull Accumulator accumulator = ValueUtil.createOrderedSetAccumulatorValue(ORD_CLSSid_B);
- @Nullable Iterator<Object> ITERATOR_x = BOXED_ownsB.iterator();
+ @NonNull Iterator<Object> ITERATOR_x = BOXED_ownsB.iterator();
/*@Thrown*/ org.eclipse.ocl.pivot.values.@org.eclipse.jdt.annotation.NonNull OrderedSetValue select;
while (true) {
if (!ITERATOR_x.hasNext()) {
select = accumulator;
break;
}
- /*@NonInvalid*/ example1.target.@org.eclipse.jdt.annotation.Nullable B x = (B)ITERATOR_x.next();
+ @SuppressWarnings("null")
+ /*@NonInvalid*/ example1.target.@org.eclipse.jdt.annotation.NonNull B x = (B)ITERATOR_x.next();
/**
* _'<' : Boolean[1]
*/
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedCLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedCLookupVisitor.java
index 94ffdcd64..4e3e54214 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedCLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example1/target/util/TargetUnqualifiedCLookupVisitor.java
@@ -9,6 +9,7 @@
package example1.target.util;
+import example1.target.A2;
import example1.target.C;
import example1.target.TargetPackage;
import example1.target.lookup.EnvironmentPackage;
@@ -16,17 +17,24 @@ import example1.target.lookup.LookupEnvironment;
import example1.target.util.AbstractTargetCommonLookupVisitor;
import example1.target.util.Visitable;
import java.util.Iterator;
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.library.collection.CollectionIncludesOperation;
import org.eclipse.ocl.pivot.library.collection.OrderedCollectionIndexOfOperation;
import org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanOperation;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
import org.eclipse.ocl.pivot.utilities.ValueUtil;
+import org.eclipse.ocl.pivot.values.IntegerValue;
import org.eclipse.ocl.pivot.values.OrderedSetValue;
public class TargetUnqualifiedCLookupVisitor
@@ -90,14 +98,15 @@ public class TargetUnqualifiedCLookupVisitor
/*@Thrown*/ example1.target.lookup.@org.eclipse.jdt.annotation.Nullable LookupEnvironment symbol_1;
if (includes) {
/*@Thrown*/ OrderedSetValue.@org.eclipse.jdt.annotation.NonNull Accumulator accumulator = ValueUtil.createOrderedSetAccumulatorValue(ORD_CLSSid_C);
- @Nullable Iterator<Object> ITERATOR_x = BOXED_ownsC.iterator();
+ @NonNull Iterator<Object> ITERATOR_x = BOXED_ownsC.iterator();
/*@Thrown*/ org.eclipse.ocl.pivot.values.@org.eclipse.jdt.annotation.NonNull OrderedSetValue select;
while (true) {
if (!ITERATOR_x.hasNext()) {
select = accumulator;
break;
}
- /*@NonInvalid*/ example1.target.@org.eclipse.jdt.annotation.Nullable C x = (C)ITERATOR_x.next();
+ @SuppressWarnings("null")
+ /*@NonInvalid*/ example1.target.@org.eclipse.jdt.annotation.NonNull C x = (C)ITERATOR_x.next();
/**
* _'<' : Boolean[1]
*/
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/EnvironmentFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/EnvironmentFactoryImpl.java
index e9e15e513..01cea3619 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/EnvironmentFactoryImpl.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/impl/EnvironmentFactoryImpl.java
@@ -2,6 +2,7 @@
*/
package example2.classes.lookup.impl;
+import example2.classes.lookup.*;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/util/OperationFilter.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/util/OperationFilter.java
index 417dfcb60..bd80eca3f 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/util/OperationFilter.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/lookup/util/OperationFilter.java
@@ -9,13 +9,9 @@
package example2.classes.lookup.util;
-import example2.classes.Argument;
-import example2.classes.ClassesPackage;
-import example2.classes.Operation;
-import example2.classes.Parameter;
-import example2.classes.lookup.util.AbstractClassesLookupFilter;
import java.util.Iterator;
import java.util.List;
+
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.ocl.pivot.evaluation.Executor;
@@ -30,6 +26,11 @@ import org.eclipse.ocl.pivot.utilities.ValueUtil;
import org.eclipse.ocl.pivot.values.InvalidValueException;
import org.eclipse.ocl.pivot.values.OrderedSetValue;
+import example2.classes.Argument;
+import example2.classes.ClassesPackage;
+import example2.classes.Operation;
+import example2.classes.Parameter;
+
public class OperationFilter
extends AbstractClassesLookupFilter<Operation>
{
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesExportedOperationLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesExportedOperationLookupVisitor.java
index 9743c02ef..2da34611f 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesExportedOperationLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesExportedOperationLookupVisitor.java
@@ -9,15 +9,23 @@
package example2.classes.util;
+import example2.classes.Class;
import example2.classes.ClassesPackage;
import example2.classes.Operation;
import example2.classes.lookup.EnvironmentPackage;
import example2.classes.lookup.LookupEnvironment;
import example2.classes.util.AbstractClassesCommonLookupVisitor;
import example2.classes.util.Visitable;
+import java.util.List;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
+import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesExportedPropertyLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesExportedPropertyLookupVisitor.java
index 904ca2ce4..83d5a181b 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesExportedPropertyLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesExportedPropertyLookupVisitor.java
@@ -9,15 +9,23 @@
package example2.classes.util;
+import example2.classes.Class;
import example2.classes.ClassesPackage;
import example2.classes.Property;
import example2.classes.lookup.EnvironmentPackage;
import example2.classes.lookup.LookupEnvironment;
import example2.classes.util.AbstractClassesCommonLookupVisitor;
import example2.classes.util.Visitable;
+import java.util.List;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
+import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedClassLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedClassLookupVisitor.java
index 9fa2054f5..3f8563c5a 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedClassLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedClassLookupVisitor.java
@@ -11,13 +11,21 @@ package example2.classes.util;
import example2.classes.Class;
import example2.classes.ClassesPackage;
+import example2.classes.Package;
import example2.classes.lookup.EnvironmentPackage;
import example2.classes.lookup.LookupEnvironment;
import example2.classes.util.AbstractClassesCommonLookupVisitor;
import example2.classes.util.Visitable;
+import java.util.List;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
+import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedOperationLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedOperationLookupVisitor.java
index cc4fb0baa..9e634d441 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedOperationLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedOperationLookupVisitor.java
@@ -9,15 +9,23 @@
package example2.classes.util;
+import example2.classes.Class;
import example2.classes.ClassesPackage;
import example2.classes.Operation;
import example2.classes.lookup.EnvironmentPackage;
import example2.classes.lookup.LookupEnvironment;
import example2.classes.util.AbstractClassesCommonLookupVisitor;
import example2.classes.util.Visitable;
+import java.util.List;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
+import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedPackageLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedPackageLookupVisitor.java
index cfc273f5b..e249dd585 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedPackageLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedPackageLookupVisitor.java
@@ -15,9 +15,16 @@ import example2.classes.lookup.EnvironmentPackage;
import example2.classes.lookup.LookupEnvironment;
import example2.classes.util.AbstractClassesCommonLookupVisitor;
import example2.classes.util.Visitable;
+import java.util.List;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
+import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedPropertyLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedPropertyLookupVisitor.java
index 8688b58a8..776fc77b0 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedPropertyLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesQualifiedPropertyLookupVisitor.java
@@ -9,15 +9,23 @@
package example2.classes.util;
+import example2.classes.Class;
import example2.classes.ClassesPackage;
import example2.classes.Property;
import example2.classes.lookup.EnvironmentPackage;
import example2.classes.lookup.LookupEnvironment;
import example2.classes.util.AbstractClassesCommonLookupVisitor;
import example2.classes.util.Visitable;
+import java.util.List;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
+import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedClassLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedClassLookupVisitor.java
index d3edc2cbe..bc3d49060 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedClassLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedClassLookupVisitor.java
@@ -11,14 +11,22 @@ package example2.classes.util;
import example2.classes.Class;
import example2.classes.ClassesPackage;
+import example2.classes.Package;
import example2.classes.lookup.EnvironmentPackage;
import example2.classes.lookup.LookupEnvironment;
import example2.classes.util.AbstractClassesCommonLookupVisitor;
import example2.classes.util.Visitable;
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
+import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedOperationLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedOperationLookupVisitor.java
index 501bcdebf..db4313420 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedOperationLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedOperationLookupVisitor.java
@@ -16,12 +16,18 @@ import example2.classes.lookup.LookupEnvironment;
import example2.classes.util.AbstractClassesCommonLookupVisitor;
import example2.classes.util.Visitable;
import java.util.Iterator;
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.StandardLibrary;
import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.internal.library.executor.ExecutorSingleIterationManager;
import org.eclipse.ocl.pivot.library.AbstractBinaryOperation;
@@ -32,6 +38,7 @@ import org.eclipse.ocl.pivot.utilities.ClassUtil;
import org.eclipse.ocl.pivot.utilities.ValueUtil;
import org.eclipse.ocl.pivot.values.BagValue;
import org.eclipse.ocl.pivot.values.InvalidValueException;
+import org.eclipse.ocl.pivot.values.OrderedSetValue;
import org.eclipse.ocl.pivot.values.SetValue;
public class ClassesUnqualifiedOperationLookupVisitor
@@ -136,7 +143,7 @@ public class ClassesUnqualifiedOperationLookupVisitor
}
/*@NonInvalid*/ example2.classes.@org.eclipse.jdt.annotation.Nullable Class _1_0 = (example2.classes.Class)ITERATOR__1_0.next();
/**
- * _'null' : OrderedSet(classes::Operation)
+ * _'null' : OrderedSet(classes::Operation)[*|1]
*/
if (_1_0 == null) {
throw new InvalidValueException("Null source for \'\'http://cs2as/tests/example2/classes/1.0\'::Class::ownedOperations\'");
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedPackageLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedPackageLookupVisitor.java
index 6a8846144..900a85322 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedPackageLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedPackageLookupVisitor.java
@@ -11,14 +11,22 @@ package example2.classes.util;
import example2.classes.ClassesPackage;
import example2.classes.Package;
+import example2.classes.Root;
import example2.classes.lookup.EnvironmentPackage;
import example2.classes.lookup.LookupEnvironment;
import example2.classes.util.AbstractClassesCommonLookupVisitor;
import example2.classes.util.Visitable;
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
+import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.utilities.ClassUtil;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedPropertyLookupVisitor.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedPropertyLookupVisitor.java
index c4625ba85..2231a60fe 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedPropertyLookupVisitor.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classes/util/ClassesUnqualifiedPropertyLookupVisitor.java
@@ -16,12 +16,18 @@ import example2.classes.lookup.LookupEnvironment;
import example2.classes.util.AbstractClassesCommonLookupVisitor;
import example2.classes.util.Visitable;
import java.util.Iterator;
+import java.util.List;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.ocl.pivot.StandardLibrary;
import org.eclipse.ocl.pivot.evaluation.Executor;
+import org.eclipse.ocl.pivot.ids.ClassId;
+import org.eclipse.ocl.pivot.ids.CollectionTypeId;
import org.eclipse.ocl.pivot.ids.IdManager;
import org.eclipse.ocl.pivot.ids.IdResolver;
+import org.eclipse.ocl.pivot.ids.NsURIPackageId;
+import org.eclipse.ocl.pivot.ids.RootPackageId;
import org.eclipse.ocl.pivot.ids.TypeId;
import org.eclipse.ocl.pivot.internal.library.executor.ExecutorSingleIterationManager;
import org.eclipse.ocl.pivot.library.AbstractBinaryOperation;
@@ -32,6 +38,7 @@ import org.eclipse.ocl.pivot.utilities.ClassUtil;
import org.eclipse.ocl.pivot.utilities.ValueUtil;
import org.eclipse.ocl.pivot.values.BagValue;
import org.eclipse.ocl.pivot.values.InvalidValueException;
+import org.eclipse.ocl.pivot.values.OrderedSetValue;
import org.eclipse.ocl.pivot.values.SetValue;
public class ClassesUnqualifiedPropertyLookupVisitor
@@ -136,7 +143,7 @@ public class ClassesUnqualifiedPropertyLookupVisitor
}
/*@NonInvalid*/ example2.classes.@org.eclipse.jdt.annotation.Nullable Class _1_0 = (example2.classes.Class)ITERATOR__1_0.next();
/**
- * _'null' : OrderedSet(classes::Property)
+ * _'null' : OrderedSet(classes::Property)[*|1]
*/
if (_1_0 == null) {
throw new InvalidValueException("Null source for \'\'http://cs2as/tests/example2/classes/1.0\'::Class::ownedProperties\'");
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassescstracesFactoryImpl.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassescstracesFactoryImpl.java
index c1b922c2e..3c071ec61 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassescstracesFactoryImpl.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/impl/ClassescstracesFactoryImpl.java
@@ -12,6 +12,7 @@
*/
package example2.classescstraces.impl;
+import example2.classescstraces.*;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/util/ClassescstracesAdapterFactory.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/util/ClassescstracesAdapterFactory.java
index f8b5d54ca..768038d8a 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/util/ClassescstracesAdapterFactory.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/util/ClassescstracesAdapterFactory.java
@@ -12,6 +12,7 @@
*/
package example2.classescstraces.util;
+import example2.classescstraces.*;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
diff --git a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/util/ClassescstracesSwitch.java b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/util/ClassescstracesSwitch.java
index 670fb5807..945f76814 100644
--- a/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/util/ClassescstracesSwitch.java
+++ b/tests/org.eclipse.qvtd.cs2as.compiler.tests/tests-gen/example2/classescstraces/util/ClassescstracesSwitch.java
@@ -12,6 +12,7 @@
*/
package example2.classescstraces.util;
+import example2.classescstraces.*;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.util.Switch;
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/MemberToPerson.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/MemberToPerson.java
index fdf6a29e1..f5c75b6d8 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/MemberToPerson.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/MemberToPerson.java
@@ -47,8 +47,7 @@ public interface MemberToPerson extends EObject {
* @return the value of the '<em>Member</em>' reference.
* @see #setMember(Member)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.families2persons.Families2Persons.Families2PersonsPackage#getMemberToPerson_Member()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
Member getMember();
@@ -74,8 +73,7 @@ public interface MemberToPerson extends EObject {
* @return the value of the '<em>Person</em>' reference.
* @see #setPerson(Person)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.families2persons.Families2Persons.Families2PersonsPackage#getMemberToPerson_Person()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
Person getPerson();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/Families2PersonsPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/Families2PersonsPackageImpl.java
index 795f55582..43ed398e2 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/Families2PersonsPackageImpl.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons/impl/Families2PersonsPackageImpl.java
@@ -281,32 +281,8 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie
createResource(eNS_URI);
// Create annotations
- // http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper
- createEmofAnnotations();
// http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName
- createEmof_1Annotations();
- }
-
- /**
- * Initializes the annotations for <b>http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createEmofAnnotations() {
- String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper";
- addAnnotation
- (getMemberToPerson_Member(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getMemberToPerson_Person(),
- source,
- new String[] {
- "body", "1"
- });
+ createEmofAnnotations();
}
/**
@@ -315,19 +291,21 @@ public class Families2PersonsPackageImpl extends EPackageImpl implements Familie
* <!-- end-user-doc -->
* @generated
*/
- protected void createEmof_1Annotations() {
+ protected void createEmofAnnotations() {
String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName";
addAnnotation
(getMemberToPerson_Member(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getMemberToPerson_Person(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
}
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/HSVNode2HLSNode.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/HSVNode2HLSNode.java
index f162366e9..0569ef02e 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/HSVNode2HLSNode.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/HSVNode2HLSNode.java
@@ -98,8 +98,7 @@ public interface HSVNode2HLSNode extends EObject {
* @see #setHsv(HSVNode)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.hsv2hls.HSV2HLS.HSV2HLSPackage#getHSVNode2HLSNode_Hsv()
* @model required="true"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
HSVNode getHsv();
@@ -126,8 +125,7 @@ public interface HSVNode2HLSNode extends EObject {
* @see #setHls(HLSNode)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.hsv2hls.HSV2HLS.HSV2HLSPackage#getHSVNode2HLSNode_Hls()
* @model required="true"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
HLSNode getHls();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSV2HLSPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSV2HLSPackageImpl.java
index 08e6373cf..bfc632c22 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSV2HLSPackageImpl.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS/impl/HSV2HLSPackageImpl.java
@@ -282,32 +282,8 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage {
createResource(eNS_URI);
// Create annotations
- // http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper
- createEmofAnnotations();
// http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName
- createEmof_1Annotations();
- }
-
- /**
- * Initializes the annotations for <b>http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createEmofAnnotations() {
- String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper";
- addAnnotation
- (getHSVNode2HLSNode_Hsv(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getHSVNode2HLSNode_Hls(),
- source,
- new String[] {
- "body", "1"
- });
+ createEmofAnnotations();
}
/**
@@ -316,19 +292,21 @@ public class HSV2HLSPackageImpl extends EPackageImpl implements HSV2HLSPackage {
* <!-- end-user-doc -->
* @generated
*/
- protected void createEmof_1Annotations() {
+ protected void createEmofAnnotations() {
String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName";
addAnnotation
(getHSVNode2HLSNode_Hsv(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getHSVNode2HLSNode_Hls(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
}
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/AssociationToForeignKey.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/AssociationToForeignKey.java
index 33ce9a5b2..84b2adcf6 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/AssociationToForeignKey.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/AssociationToForeignKey.java
@@ -45,8 +45,7 @@ public interface AssociationToForeignKey extends ToColumn, UmlToRdbmsModelElemen
* @return the value of the '<em>Association</em>' reference.
* @see #setAssociation(Association)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml2rdbms.Simpleuml2rdbmsPackage#getAssociationToForeignKey_Association()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
Association getAssociation();
@@ -72,8 +71,7 @@ public interface AssociationToForeignKey extends ToColumn, UmlToRdbmsModelElemen
* @return the value of the '<em>Foreign Key</em>' reference.
* @see #setForeignKey(ForeignKey)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml2rdbms.Simpleuml2rdbmsPackage#getAssociationToForeignKey_ForeignKey()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
ForeignKey getForeignKey();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/ClassToTable.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/ClassToTable.java
index 7a67ae275..a6a2d9cf6 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/ClassToTable.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/ClassToTable.java
@@ -93,8 +93,7 @@ public interface ClassToTable extends FromAttributeOwner, ToColumn, UmlToRdbmsMo
* @return the value of the '<em>Primary Key</em>' reference.
* @see #setPrimaryKey(Key)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml2rdbms.Simpleuml2rdbmsPackage#getClassToTable_PrimaryKey()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
Key getPrimaryKey();
@@ -120,8 +119,7 @@ public interface ClassToTable extends FromAttributeOwner, ToColumn, UmlToRdbmsMo
* @return the value of the '<em>Table</em>' reference.
* @see #setTable(Table)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml2rdbms.Simpleuml2rdbmsPackage#getClassToTable_Table()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
* @generated
*/
Table getTable();
@@ -147,8 +145,7 @@ public interface ClassToTable extends FromAttributeOwner, ToColumn, UmlToRdbmsMo
* @return the value of the '<em>Uml Class</em>' reference.
* @see #setUmlClass(org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml2rdbms.Simpleuml2rdbmsPackage#getClassToTable_UmlClass()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Class getUmlClass();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/FromAttribute.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/FromAttribute.java
index e202d38e0..f45083d94 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/FromAttribute.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/FromAttribute.java
@@ -71,8 +71,7 @@ public interface FromAttribute extends UmlToRdbmsModelElement {
* @return the value of the '<em>Attribute</em>' reference.
* @see #setAttribute(Attribute)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml2rdbms.Simpleuml2rdbmsPackage#getFromAttribute_Attribute()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
Attribute getAttribute();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/PackageToSchema.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/PackageToSchema.java
index effca30f7..2f170a1ff 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/PackageToSchema.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/PackageToSchema.java
@@ -82,8 +82,7 @@ public interface PackageToSchema extends UmlToRdbmsModelElement {
* @see #setSchema(Schema)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml2rdbms.Simpleuml2rdbmsPackage#getPackageToSchema_Schema()
* @model required="true"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
Schema getSchema();
@@ -110,8 +109,7 @@ public interface PackageToSchema extends UmlToRdbmsModelElement {
* @see #setUmlPackage(org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Package)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml2rdbms.Simpleuml2rdbmsPackage#getPackageToSchema_UmlPackage()
* @model required="true"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml.Package getUmlPackage();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/PrimitiveToName.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/PrimitiveToName.java
index 29048542f..7050767d2 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/PrimitiveToName.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/PrimitiveToName.java
@@ -97,8 +97,7 @@ public interface PrimitiveToName extends UmlToRdbmsModelElement {
* @see #setPrimitive(PrimitiveDataType)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml2rdbms.Simpleuml2rdbmsPackage#getPrimitiveToName_Primitive()
* @model required="true"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
PrimitiveDataType getPrimitive();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/ToColumn.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/ToColumn.java
index 724c7c365..613ebcb0d 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/ToColumn.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/ToColumn.java
@@ -43,8 +43,7 @@ public interface ToColumn extends EObject {
* @see #setColumn(Column)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.uml2rdbms.simpleuml2rdbms.Simpleuml2rdbmsPackage#getToColumn_Column()
* @model required="true"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
Column getColumn();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/Simpleuml2rdbmsPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/Simpleuml2rdbmsPackageImpl.java
index 892b1b521..71f4ec91a 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/Simpleuml2rdbmsPackageImpl.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/simpleuml2rdbms/impl/Simpleuml2rdbmsPackageImpl.java
@@ -724,80 +724,8 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum
createResource(eNS_URI);
// Create annotations
- // http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper
- createEmofAnnotations();
// http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName
- createEmof_1Annotations();
- }
-
- /**
- * Initializes the annotations for <b>http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createEmofAnnotations() {
- String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper";
- addAnnotation
- (getAssociationToForeignKey_Association(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getAssociationToForeignKey_ForeignKey(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getClassToTable_PrimaryKey(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getClassToTable_Table(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getClassToTable_UmlClass(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getFromAttribute_Attribute(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getPackageToSchema_Schema(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getPackageToSchema_UmlPackage(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getPrimitiveToName_Primitive(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getToColumn_Column(),
- source,
- new String[] {
- "body", "1"
- });
+ createEmofAnnotations();
}
/**
@@ -806,25 +734,28 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum
* <!-- end-user-doc -->
* @generated
*/
- protected void createEmof_1Annotations() {
+ protected void createEmofAnnotations() {
String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName";
addAnnotation
(getAssociationToForeignKey_Association(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getAssociationToForeignKey_ForeignKey(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getClassToTable_PrimaryKey(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getClassToTable_Table(),
@@ -836,37 +767,43 @@ public class Simpleuml2rdbmsPackageImpl extends EPackageImpl implements Simpleum
(getClassToTable_UmlClass(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getFromAttribute_Attribute(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getPackageToSchema_Schema(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getPackageToSchema_UmlPackage(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getPrimitiveToName_Primitive(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getToColumn_Column(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
}
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/Edge2Edge.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/Edge2Edge.java
index 7d94393c8..1f27f06b1 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/Edge2Edge.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/Edge2Edge.java
@@ -43,8 +43,7 @@ public interface Edge2Edge extends Element2Element {
* @return the value of the '<em>Edge1</em>' reference.
* @see #setEdge1(Edge)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.upper2lower.simplegraph2graph.Simplegraph2graphPackage#getEdge2Edge_Edge1()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle1'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle1' upper='1'"
* annotation="http://www.eclipse.org/qvt#Domains referredDomain='upperGraph'"
* @generated
*/
@@ -71,8 +70,7 @@ public interface Edge2Edge extends Element2Element {
* @return the value of the '<em>Edge2</em>' reference.
* @see #setEdge2(Edge)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.upper2lower.simplegraph2graph.Simplegraph2graphPackage#getEdge2Edge_Edge2()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle2'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle2' upper='1'"
* annotation="http://www.eclipse.org/qvt#Domains referredDomain='lowerGraph'"
* @generated
*/
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/Graph2Graph.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/Graph2Graph.java
index 503e241ab..d14c0e05f 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/Graph2Graph.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/Graph2Graph.java
@@ -47,8 +47,7 @@ public interface Graph2Graph extends EObject {
* @return the value of the '<em>Graph1</em>' reference.
* @see #setGraph1(Graph)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.upper2lower.simplegraph2graph.Simplegraph2graphPackage#getGraph2Graph_Graph1()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle1'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle1' upper='1'"
* annotation="http://www.eclipse.org/qvt#Domains referredDomain='upperGraph'"
* @generated
*/
@@ -75,8 +74,7 @@ public interface Graph2Graph extends EObject {
* @return the value of the '<em>Graph2</em>' reference.
* @see #setGraph2(Graph)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.upper2lower.simplegraph2graph.Simplegraph2graphPackage#getGraph2Graph_Graph2()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle2'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle2' upper='1'"
* annotation="http://www.eclipse.org/qvt#Domains referredDomain='lowerGraph'"
* @generated
*/
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/Node2Node.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/Node2Node.java
index c7059d7ab..cf2f0081c 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/Node2Node.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/Node2Node.java
@@ -42,8 +42,7 @@ public interface Node2Node extends Element2Element {
* @return the value of the '<em>Node1</em>' reference.
* @see #setNode1(Node)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.upper2lower.simplegraph2graph.Simplegraph2graphPackage#getNode2Node_Node1()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle1'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle1' upper='1'"
* annotation="http://www.eclipse.org/qvt#Domains referredDomain='upperGraph'"
* @generated
*/
@@ -70,8 +69,7 @@ public interface Node2Node extends Element2Element {
* @return the value of the '<em>Node2</em>' reference.
* @see #setNode2(Node)
* @see org.eclipse.qvtd.xtext.qvtcore.tests.upper2lower.simplegraph2graph.Simplegraph2graphPackage#getNode2Node_Node2()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle2'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle2' upper='1'"
* annotation="http://www.eclipse.org/qvt#Domains referredDomain='lowerGraph'"
* @generated
*/
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java
index 5cbeed667..088a32d53 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src-gen/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/simplegraph2graph/impl/Simplegraph2graphPackageImpl.java
@@ -382,103 +382,61 @@ public class Simplegraph2graphPackageImpl extends EPackageImpl implements Simple
createResource(eNS_URI);
// Create annotations
- // http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper
- createEmofAnnotations();
// http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName
- createEmof_1Annotations();
+ createEmofAnnotations();
// http://www.eclipse.org/qvt#Domains
createQvtDomainsAnnotations();
}
/**
- * Initializes the annotations for <b>http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createEmofAnnotations() {
- String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper";
- addAnnotation
- (getGraph2Graph_Graph1(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getGraph2Graph_Graph2(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getEdge2Edge_Edge1(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getEdge2Edge_Edge2(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getNode2Node_Node1(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getNode2Node_Node2(),
- source,
- new String[] {
- "body", "1"
- });
- }
-
- /**
* Initializes the annotations for <b>http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName</b>.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void createEmof_1Annotations() {
+ protected void createEmofAnnotations() {
String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName";
addAnnotation
(getGraph2Graph_Graph1(),
source,
new String[] {
- "body", "middle1"
+ "body", "middle1",
+ "upper", "1"
});
addAnnotation
(getGraph2Graph_Graph2(),
source,
new String[] {
- "body", "middle2"
+ "body", "middle2",
+ "upper", "1"
});
addAnnotation
(getEdge2Edge_Edge1(),
source,
new String[] {
- "body", "middle1"
+ "body", "middle1",
+ "upper", "1"
});
addAnnotation
(getEdge2Edge_Edge2(),
source,
new String[] {
- "body", "middle2"
+ "body", "middle2",
+ "upper", "1"
});
addAnnotation
(getNode2Node_Node1(),
source,
new String[] {
- "body", "middle1"
+ "body", "middle1",
+ "upper", "1"
});
addAnnotation
(getNode2Node_Node2(),
source,
new String[] {
- "body", "middle2"
+ "body", "middle2",
+ "upper", "1"
});
}
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons.ecore b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons.ecore
index b07785391..b6f534abb 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons.ecore
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/families2persons/Families2Persons.ecore
@@ -4,19 +4,15 @@
nsPrefix="families2Persons">
<eClassifiers xsi:type="ecore:EClass" name="MemberToPerson" abstract="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="member" eType="ecore:EClass Families.ecore#//Member">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="person" eType="ecore:EClass Persons.ecore#//Person">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="firstName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS.ecore b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS.ecore
index 1a9662770..3a28aa5ce 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS.ecore
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/hsv2hls/HSV2HLS.ecore
@@ -9,19 +9,15 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
eType="#//HSVNode2HLSNode" containment="true" eOpposite="#//HSVNode2HLSNode/parent"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="hsv" lowerBound="1" eType="ecore:EClass HSVTree.ecore#//HSVNode">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="hls" lowerBound="1" eType="ecore:EClass HLSTree.ecore#//HLSNode">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="rgb" lowerBound="1" eType="#//RGB"/>
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/SimpleUML2RDBMS.ecore b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/SimpleUML2RDBMS.ecore
index c35b1d4d1..dbeed3bbc 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/SimpleUML2RDBMS.ecore
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/uml2rdbms/SimpleUML2RDBMS.ecore
@@ -7,19 +7,15 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AssociationToForeignKey" eSuperTypes="#//ToColumn #//UmlToRdbmsModelElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="association" eType="ecore:EClass SimpleUML.ecore#//Association">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="ecore:EClass SimpleRDBMS.ecore#//ForeignKey">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="#//ClassToTable"
@@ -33,38 +29,29 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="#//PackageToSchema"
eOpposite="#//PackageToSchema/classesToTables"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="primaryKey" eType="ecore:EClass SimpleRDBMS.ecore#//Key">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="table" eType="ecore:EClass SimpleRDBMS.ecore#//Table">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="umlClass" eType="ecore:EClass SimpleUML.ecore#//Class">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FromAttribute" abstract="true" eSuperTypes="#//UmlToRdbmsModelElement">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="attribute" eType="ecore:EClass SimpleUML.ecore#//Attribute">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="leafs" ordered="false"
@@ -86,20 +73,16 @@
upperBound="-1" eType="#//PrimitiveToName" containment="true" eOpposite="#//PrimitiveToName/owner"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="schema" lowerBound="1"
eType="ecore:EClass SimpleRDBMS.ecore#//Schema">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="umlPackage" lowerBound="1"
eType="ecore:EClass SimpleUML.ecore#//Package">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
@@ -110,11 +93,9 @@
eOpposite="#//PackageToSchema/primitivesToNames"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="primitive" lowerBound="1"
eType="ecore:EClass SimpleUML.ecore#//PrimitiveDataType">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
@@ -122,11 +103,9 @@
<eClassifiers xsi:type="ecore:EClass" name="ToColumn" abstract="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="column" lowerBound="1"
eType="ecore:EClass SimpleRDBMS.ecore#//Column">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
diff --git a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/SimpleGraph2Graph.ecore b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/SimpleGraph2Graph.ecore
index 2dd3f6f41..5308a90d7 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/SimpleGraph2Graph.ecore
+++ b/tests/org.eclipse.qvtd.xtext.qvtcore.tests/src/org/eclipse/qvtd/xtext/qvtcore/tests/upper2lower/SimpleGraph2Graph.ecore
@@ -4,22 +4,18 @@
nsPrefix="simplegraph2graph">
<eClassifiers xsi:type="ecore:EClass" name="Graph2Graph">
<eStructuralFeatures xsi:type="ecore:EReference" name="graph1" eType="ecore:EClass SimpleGraph.ecore#//Graph">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle1"/>
+ <details key="upper" value="1"/>
</eAnnotations>
<eAnnotations source="http://www.eclipse.org/qvt#Domains">
<details key="referredDomain" value="upperGraph"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="graph2" eType="ecore:EClass SimpleGraph.ecore#//Graph">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle2"/>
+ <details key="upper" value="1"/>
</eAnnotations>
<eAnnotations source="http://www.eclipse.org/qvt#Domains">
<details key="referredDomain" value="lowerGraph"/>
@@ -35,22 +31,18 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Edge2Edge" eSuperTypes="#//Element2Element">
<eStructuralFeatures xsi:type="ecore:EReference" name="edge1" eType="ecore:EClass SimpleGraph.ecore#//Edge">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle1"/>
+ <details key="upper" value="1"/>
</eAnnotations>
<eAnnotations source="http://www.eclipse.org/qvt#Domains">
<details key="referredDomain" value="upperGraph"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="edge2" eType="ecore:EClass SimpleGraph.ecore#//Edge">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle2"/>
+ <details key="upper" value="1"/>
</eAnnotations>
<eAnnotations source="http://www.eclipse.org/qvt#Domains">
<details key="referredDomain" value="lowerGraph"/>
@@ -61,22 +53,18 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Node2Node" eSuperTypes="#//Element2Element">
<eStructuralFeatures xsi:type="ecore:EReference" name="node1" eType="ecore:EClass SimpleGraph.ecore#//Node">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle1"/>
+ <details key="upper" value="1"/>
</eAnnotations>
<eAnnotations source="http://www.eclipse.org/qvt#Domains">
<details key="referredDomain" value="upperGraph"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="node2" eType="ecore:EClass SimpleGraph.ecore#//Node">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle2"/>
+ <details key="upper" value="1"/>
</eAnnotations>
<eAnnotations source="http://www.eclipse.org/qvt#Domains">
<details key="referredDomain" value="lowerGraph"/>
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/AssociationToForeignKey.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/AssociationToForeignKey.java
index 559411b33..13fc269b6 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/AssociationToForeignKey.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/AssociationToForeignKey.java
@@ -47,8 +47,7 @@ public interface AssociationToForeignKey extends ToColumn, UmlToRdbmsModelElemen
* @return the value of the '<em>Association</em>' reference.
* @see #setAssociation(Association)
* @see simpleuml2rdbms.uml2rdbms.UML2RDBMSPackage#getAssociationToForeignKey_Association()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
Association getAssociation();
@@ -74,8 +73,7 @@ public interface AssociationToForeignKey extends ToColumn, UmlToRdbmsModelElemen
* @return the value of the '<em>Foreign Key</em>' reference.
* @see #setForeignKey(ForeignKey)
* @see simpleuml2rdbms.uml2rdbms.UML2RDBMSPackage#getAssociationToForeignKey_ForeignKey()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
ForeignKey getForeignKey();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/ClassToTable.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/ClassToTable.java
index 6f6bb8252..0ffb4afc0 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/ClassToTable.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/ClassToTable.java
@@ -95,8 +95,7 @@ public interface ClassToTable extends FromAttributeOwner, ToColumn, UmlToRdbmsMo
* @return the value of the '<em>Primary Key</em>' reference.
* @see #setPrimaryKey(Key)
* @see simpleuml2rdbms.uml2rdbms.UML2RDBMSPackage#getClassToTable_PrimaryKey()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
Key getPrimaryKey();
@@ -122,8 +121,7 @@ public interface ClassToTable extends FromAttributeOwner, ToColumn, UmlToRdbmsMo
* @return the value of the '<em>Table</em>' reference.
* @see #setTable(Table)
* @see simpleuml2rdbms.uml2rdbms.UML2RDBMSPackage#getClassToTable_Table()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
Table getTable();
@@ -149,8 +147,7 @@ public interface ClassToTable extends FromAttributeOwner, ToColumn, UmlToRdbmsMo
* @return the value of the '<em>Uml Class</em>' reference.
* @see #setUmlClass(simpleuml2rdbms.uml.Class)
* @see simpleuml2rdbms.uml2rdbms.UML2RDBMSPackage#getClassToTable_UmlClass()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
simpleuml2rdbms.uml.Class getUmlClass();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/FromAttribute.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/FromAttribute.java
index 13b258d63..19fff206d 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/FromAttribute.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/FromAttribute.java
@@ -73,8 +73,7 @@ public interface FromAttribute extends UmlToRdbmsModelElement {
* @return the value of the '<em>Attribute</em>' reference.
* @see #setAttribute(Attribute)
* @see simpleuml2rdbms.uml2rdbms.UML2RDBMSPackage#getFromAttribute_Attribute()
- * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * @model annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
Attribute getAttribute();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/PackageToSchema.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/PackageToSchema.java
index 155540905..31b0a042a 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/PackageToSchema.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/PackageToSchema.java
@@ -84,8 +84,7 @@ public interface PackageToSchema extends UmlToRdbmsModelElement {
* @see #setSchema(Schema)
* @see simpleuml2rdbms.uml2rdbms.UML2RDBMSPackage#getPackageToSchema_Schema()
* @model required="true"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
Schema getSchema();
@@ -112,8 +111,7 @@ public interface PackageToSchema extends UmlToRdbmsModelElement {
* @see #setUmlPackage(simpleuml2rdbms.uml.Package)
* @see simpleuml2rdbms.uml2rdbms.UML2RDBMSPackage#getPackageToSchema_UmlPackage()
* @model required="true"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
simpleuml2rdbms.uml.Package getUmlPackage();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/PrimitiveToName.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/PrimitiveToName.java
index 0d87bb3d9..d22b5943a 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/PrimitiveToName.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/PrimitiveToName.java
@@ -99,8 +99,7 @@ public interface PrimitiveToName extends UmlToRdbmsModelElement {
* @see #setPrimitive(PrimitiveDataType)
* @see simpleuml2rdbms.uml2rdbms.UML2RDBMSPackage#getPrimitiveToName_Primitive()
* @model required="true"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
PrimitiveDataType getPrimitive();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/ToColumn.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/ToColumn.java
index d256d355a..f873e497f 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/ToColumn.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/ToColumn.java
@@ -45,8 +45,7 @@ public interface ToColumn extends EObject {
* @see #setColumn(Column)
* @see simpleuml2rdbms.uml2rdbms.UML2RDBMSPackage#getToColumn_Column()
* @model required="true"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper body='1'"
- * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle'"
+ * annotation="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName body='middle' upper='1'"
* @generated
*/
Column getColumn();
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UML2RDBMSPackageImpl.java b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UML2RDBMSPackageImpl.java
index fd514cf77..71b06cc40 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UML2RDBMSPackageImpl.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src-gen/simpleuml2rdbms/uml2rdbms/impl/UML2RDBMSPackageImpl.java
@@ -726,80 +726,8 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka
createResource(eNS_URI);
// Create annotations
- // http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper
- createEmofAnnotations();
// http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName
- createEmof_1Annotations();
- }
-
- /**
- * Initializes the annotations for <b>http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void createEmofAnnotations() {
- String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper";
- addAnnotation
- (getAssociationToForeignKey_Association(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getAssociationToForeignKey_ForeignKey(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getClassToTable_PrimaryKey(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getClassToTable_Table(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getClassToTable_UmlClass(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getFromAttribute_Attribute(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getPackageToSchema_Schema(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getPackageToSchema_UmlPackage(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getPrimitiveToName_Primitive(),
- source,
- new String[] {
- "body", "1"
- });
- addAnnotation
- (getToColumn_Column(),
- source,
- new String[] {
- "body", "1"
- });
+ createEmofAnnotations();
}
/**
@@ -808,67 +736,77 @@ public class UML2RDBMSPackageImpl extends EPackageImpl implements UML2RDBMSPacka
* <!-- end-user-doc -->
* @generated
*/
- protected void createEmof_1Annotations() {
+ protected void createEmofAnnotations() {
String source = "http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName";
addAnnotation
(getAssociationToForeignKey_Association(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getAssociationToForeignKey_ForeignKey(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getClassToTable_PrimaryKey(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getClassToTable_Table(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getClassToTable_UmlClass(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getFromAttribute_Attribute(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getPackageToSchema_Schema(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getPackageToSchema_UmlPackage(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getPrimitiveToName_Primitive(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
addAnnotation
(getToColumn_Column(),
source,
new String[] {
- "body", "middle"
+ "body", "middle",
+ "upper", "1"
});
}
diff --git a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/SimpleUML2RDBMS/SimpleUML2RDBMS.ecore b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/SimpleUML2RDBMS/SimpleUML2RDBMS.ecore
index 3fe95a1ff..582ab2c44 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/SimpleUML2RDBMS/SimpleUML2RDBMS.ecore
+++ b/tests/org.eclipse.qvtd.xtext.qvtimperative.tests/src/org/eclipse/qvtd/xtext/qvtimperative/tests/SimpleUML2RDBMS/SimpleUML2RDBMS.ecore
@@ -7,19 +7,15 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AssociationToForeignKey" eSuperTypes="#//ToColumn #//UmlToRdbmsModelElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="association" eType="ecore:EClass SimpleUML.ecore#//Association">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="foreignKey" eType="ecore:EClass SimpleRDBMS.ecore#//ForeignKey">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="#//ClassToTable"
@@ -33,38 +29,30 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="#//PackageToSchema"
eOpposite="#//PackageToSchema/classesToTables"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="primaryKey" eType="ecore:EClass SimpleRDBMS.ecore#//Key">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="table" eType="ecore:EClass SimpleRDBMS.ecore#//Table">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="umlClass" eType="ecore:EClass SimpleUML.ecore#//Class">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="FromAttribute" abstract="true" eSuperTypes="#//UmlToRdbmsModelElement">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="attribute" eType="ecore:EClass SimpleUML.ecore#//Attribute">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="leafs" ordered="false"
@@ -86,20 +74,16 @@
upperBound="-1" eType="#//PrimitiveToName" containment="true" eOpposite="#//PrimitiveToName/owner"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="schema" lowerBound="1"
eType="ecore:EClass SimpleRDBMS.ecore#//Schema">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EReference" name="umlPackage" lowerBound="1"
eType="ecore:EClass SimpleUML.ecore#//Package">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
@@ -110,11 +94,9 @@
eOpposite="#//PackageToSchema/primitivesToNames"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="primitive" lowerBound="1"
eType="ecore:EClass SimpleUML.ecore#//PrimitiveDataType">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
@@ -122,11 +104,9 @@
<eClassifiers xsi:type="ecore:EClass" name="ToColumn" abstract="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="column" lowerBound="1"
eType="ecore:EClass SimpleRDBMS.ecore#//Column">
- <eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeUpper">
- <details key="body" value="1"/>
- </eAnnotations>
<eAnnotations source="http://schema.omg.org/spec/MOF/2.0/emof.xml#Property.oppositeRoleName">
<details key="body" value="middle"/>
+ <details key="upper" value="1"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>

Back to the top