Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Willink2016-05-05 09:14:52 -0400
committerEd Willink2016-05-05 09:32:36 -0400
commit05eee7d13e06f3a7a984bec968b201668e129ec6 (patch)
tree8d93d74a4779703a40cf7394a6c30c731b0a51a2
parent3d43a309b549ad527a96f122d9e6415aed30797b (diff)
downloadorg.eclipse.qvtd-05eee7d13e06f3a7a984bec968b201668e129ec6.tar.gz
org.eclipse.qvtd-05eee7d13e06f3a7a984bec968b201668e129ec6.tar.xz
org.eclipse.qvtd-05eee7d13e06f3a7a984bec968b201668e129ec6.zip
[486722] Rel2Core URIs work
-rw-r--r--plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtc/QVTrToQVTc.java4
-rw-r--r--plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtc/RelationalTransformationToTracePackage.java8
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java5
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/PivotNormalizer.java48
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/RelToCore.qvtr9
-rw-r--r--tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/samples/Rel2Core_expected.oclas51
6 files changed, 84 insertions, 41 deletions
diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtc/QVTrToQVTc.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtc/QVTrToQVTc.java
index da3f0a2ba..cd3871d57 100644
--- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtc/QVTrToQVTc.java
+++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtc/QVTrToQVTc.java
@@ -832,7 +832,7 @@ public class QVTrToQVTc
/**
* Lazily create the name Property for a traceClass with a type.
*/
- /*public*/ @NonNull Property whenTraceProperty(org.eclipse.ocl.pivot.@NonNull Class traceClass, @NonNull String name, @NonNull Type type) {
+ /*public*/ @NonNull Property whenTraceProperty(org.eclipse.ocl.pivot.@NonNull Class traceClass, @NonNull String name, @NonNull Type type, boolean isRequired) {
Map<@NonNull String, @NonNull Property> name2traceProperty = traceClass2name2traceProperty.get(traceClass);
if (name2traceProperty == null) {
name2traceProperty = new HashMap<@NonNull String, @NonNull Property>();
@@ -843,7 +843,7 @@ public class QVTrToQVTc
traceProperty = PivotFactory.eINSTANCE.createProperty();
traceProperty.setName(name);
traceProperty.setType(type);
- traceProperty.setIsRequired(true);
+ traceProperty.setIsRequired(isRequired);
name2traceProperty.put(name, traceProperty);
traceProperty.setOwningClass(traceClass);
if (!(type instanceof DataType)) {
diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtc/RelationalTransformationToTracePackage.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtc/RelationalTransformationToTracePackage.java
index 364cc14eb..24977a84e 100644
--- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtc/RelationalTransformationToTracePackage.java
+++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtc/RelationalTransformationToTracePackage.java
@@ -86,7 +86,7 @@ import org.eclipse.qvtd.pivot.qvttemplate.TemplateExp;
doSubTemplateToTraceClassProps((TemplateExp)m, rc);
}
else {
- createTraceProperty(rc, collectionVariable.getName() + "_" + argIndex, elementType);
+ createTraceProperty(rc, collectionVariable.getName() + "_" + argIndex, elementType, collectionType.isIsNullFree());
}
argIndex++;
}
@@ -110,10 +110,10 @@ import org.eclipse.qvtd.pivot.qvttemplate.TemplateExp;
private void createTraceProperty(org.eclipse.ocl.pivot.@NonNull Class rc, @NonNull Variable tv) {
String vn = ClassUtil.nonNullState(tv.getName());
Type c = ClassUtil.nonNullState(tv.getType());
- qvtr2qvtc.whenTraceProperty(rc, vn, c);
+ qvtr2qvtc.whenTraceProperty(rc, vn, c, tv.isIsRequired());
}
- private void createTraceProperty(org.eclipse.ocl.pivot.@NonNull Class rc, @NonNull String name, @NonNull Type type) {
- qvtr2qvtc.whenTraceProperty(rc, name, type);
+ private void createTraceProperty(org.eclipse.ocl.pivot.@NonNull Class rc, @NonNull String name, @NonNull Type type, boolean isRequired) {
+ qvtr2qvtc.whenTraceProperty(rc, name, type, isRequired);
}
}
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
index 9b89b018c..e65655e9c 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/QVTrCompilerTests.java
@@ -50,6 +50,7 @@ import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiIncrementalExecutor;
import org.eclipse.qvtd.pivot.qvtimperative.evaluation.QVTiTransformationExecutor;
import org.eclipse.qvtd.pivot.qvtimperative.utilities.QVTimperative;
import org.eclipse.qvtd.pivot.qvtimperative.utilities.QVTimperativeUtil;
+import org.eclipse.qvtd.runtime.evaluation.AbstractTransformer;
import org.eclipse.qvtd.runtime.evaluation.Transformer;
import org.eclipse.qvtd.xtext.qvtbase.tests.LoadTestCase;
import org.eclipse.qvtd.xtext.qvtbase.tests.utilities.JavaSourceFileObject;
@@ -387,8 +388,8 @@ public class QVTrCompilerTests extends LoadTestCase
@Test
public void testQVTrCompiler_SimplerRel2Core_CG() throws Exception {
-// AbstractTransformer.EXCEPTIONS.setState(true);
-// AbstractTransformer.INVOCATIONS.setState(true);
+ AbstractTransformer.EXCEPTIONS.setState(true);
+ AbstractTransformer.INVOCATIONS.setState(true);
// QVTm2QVTp.PARTITIONING.setState(true);
MyQVT myQVT = new MyQVT("rel2core");
try {
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/PivotNormalizer.java b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/PivotNormalizer.java
index 482b9f8ee..ca8e3ba96 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/PivotNormalizer.java
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/PivotNormalizer.java
@@ -11,6 +11,7 @@
package org.eclipse.qvtd.xtext.qvtrelation.tests.rel2core;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import org.eclipse.emf.common.util.ECollections;
@@ -20,14 +21,30 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.ocl.examples.xtext.tests.XtextTestCase.Normalizer;
+import org.eclipse.ocl.pivot.Model;
import org.eclipse.ocl.pivot.NamedElement;
+import org.eclipse.ocl.pivot.utilities.ClassUtil;
import org.eclipse.ocl.pivot.utilities.NameUtil;
+import org.eclipse.ocl.pivot.utilities.Nameable;
+import org.eclipse.ocl.pivot.utilities.NameUtil.NameableComparator;
import org.eclipse.qvtd.xtext.qvtimperative.tests.ModelNormalizer;
public class PivotNormalizer implements ModelNormalizer
{
public static final @NonNull PivotNormalizer INSTANCE = new PivotNormalizer();
+ public static final class ToStringComparator implements Comparator<Nameable>
+ {
+ public static final @NonNull ToStringComparator INSTANCE = new ToStringComparator();
+
+ @Override
+ public int compare(Nameable o1, Nameable o2) {
+ String n1 = String.valueOf(o1);
+ String n2 = String.valueOf(o2);
+ return ClassUtil.safeCompareTo(n1, n2);
+ }
+ }
+
protected class ClassNormalizer implements Normalizer
{
protected final org.eclipse.ocl.pivot.@NonNull Class asClass;
@@ -48,6 +65,25 @@ public class PivotNormalizer implements ModelNormalizer
}
}
+ protected class ModelNormalizer implements Normalizer
+ {
+ protected final @NonNull Model asModel;
+
+ public ModelNormalizer(@NonNull Model asModel) {
+ this.asModel = asModel;
+ }
+
+ @Override
+ public void denormalize() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void normalize() {
+ ECollections.sort((EList<NamedElement>)(Object)asModel.getOwnedPackages(), NameUtil.NAMEABLE_COMPARATOR);
+ }
+ }
+
protected class PackageNormalizer implements Normalizer
{
protected final org.eclipse.ocl.pivot.@NonNull Package asPackage;
@@ -63,7 +99,7 @@ public class PivotNormalizer implements ModelNormalizer
@Override
public void normalize() {
- ECollections.sort((EList<NamedElement>)(Object)asPackage.getOwnedClasses(), NameUtil.NAMEABLE_COMPARATOR);
+ ECollections.sort((EList<NamedElement>)(Object)asPackage.getOwnedClasses(), ToStringComparator.INSTANCE);
ECollections.sort((EList<NamedElement>)(Object)asPackage.getOwnedPackages(), NameUtil.NAMEABLE_COMPARATOR);
}
}
@@ -72,15 +108,19 @@ public class PivotNormalizer implements ModelNormalizer
List<Normalizer> normalizers = new ArrayList<Normalizer>();
for (TreeIterator<EObject> tit = resource.getAllContents(); tit.hasNext(); ) {
EObject eObject = tit.next();
- if (eObject instanceof org.eclipse.ocl.pivot.Package) {
+ if (eObject instanceof Model) {
+ normalizers.add(new ModelNormalizer((Model)eObject));
+ }
+ else if (eObject instanceof org.eclipse.ocl.pivot.Package) {
normalizers.add(new PackageNormalizer((org.eclipse.ocl.pivot.Package)eObject));
}
else if (eObject instanceof org.eclipse.ocl.pivot.Class) {
+ ((org.eclipse.ocl.pivot.Class)eObject).setUnspecializedElement(null); // Suppress transient value
normalizers.add(new ClassNormalizer((org.eclipse.ocl.pivot.Class)eObject));
}
}
- EList<NamedElement> contents = (EList<NamedElement>)(Object)resource.getContents();
- ECollections.sort(contents, NameUtil.NAMEABLE_COMPARATOR);
+// EList<NamedElement> contents = (EList<NamedElement>)(Object)resource.getContents();
+// ECollections.sort(contents, ToStringComparator.INSTANCE);
for (Normalizer normalizer : normalizers) {
normalizer.normalize();
}
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/RelToCore.qvtr b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/RelToCore.qvtr
index b85c190e8..eec9ae153 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/RelToCore.qvtr
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/RelToCore.qvtr
@@ -44,14 +44,17 @@ transformation org::eclipse::qvtd::xtext::qvtrelation2::tests::rel2core::relToCo
top relation PackageToTracePackage
{
- packageName:String;
+ packageName:String[?];
+ packageURI:String[?];
domain relations
relationsPackage:Package {
- name = packageName
+ name = packageName,
+ URI = packageURI
};
enforce domain core
tracePackage:Package {
- name = packageName
+ name = packageName,
+ URI = packageURI
};
}
diff --git a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/samples/Rel2Core_expected.oclas b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/samples/Rel2Core_expected.oclas
index 6031a6f3d..8bb2bc045 100644
--- a/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/samples/Rel2Core_expected.oclas
+++ b/tests/org.eclipse.qvtd.xtext.qvtrelation.tests/src/org/eclipse/qvtd/xtext/qvtrelation/tests/rel2core/samples/Rel2Core_expected.oclas
@@ -9,14 +9,14 @@
<ownedPackages xmi:id="P.org.eclipse.qvtd.compiler.qvtr" name="qvtr">
<ownedPackages xmi:id="P.org.eclipse.qvtd.compiler.qvtr.TrelToCore" name="TrelToCore">
<ownedClasses xmi:id="T.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TDomainBottomUnSharedVarsToDbVars" name="TDomainBottomUnSharedVarsToDbVars">
- <ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TDomainBottomUnSharedVarsToDbVars.domainBottomUnSharedVars"
- name="domainBottomUnSharedVars" type="#//@ownedPackages.2/@ownedClasses.6"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TDomainBottomUnSharedVarsToDbVars.db" name="db" type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore.oclas#T.qvtcorebase.BottomPattern"/>
+ <ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TDomainBottomUnSharedVarsToDbVars.domainBottomUnSharedVars"
+ name="domainBottomUnSharedVars" type="#//@ownedPackages.1/@ownedClasses.6"/>
</ownedClasses>
<ownedClasses xmi:id="T.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TDomainVarsSharedWithWhenToDgVars" name="TDomainVarsSharedWithWhenToDgVars">
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TDomainVarsSharedWithWhenToDgVars.dg" name="dg" type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore.oclas#T.qvtcorebase.GuardPattern"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TDomainVarsSharedWithWhenToDgVars.domainVarsSharedWithWhen"
- name="domainVarsSharedWithWhen" type="#//@ownedPackages.2/@ownedClasses.6"/>
+ name="domainVarsSharedWithWhen" type="#//@ownedPackages.1/@ownedClasses.6"/>
</ownedClasses>
<ownedClasses xmi:id="T.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TIROppositeDomainsToMappingForEnforcement" name="TIROppositeDomainsToMappingForEnforcement">
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TIROppositeDomainsToMappingForEnforcement.ir" name="ir"
@@ -127,7 +127,7 @@
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMBottomPredicateForEnforcement.mb" name="mb"
type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore.oclas#T.qvtcorebase.BottomPattern"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMBottomPredicateForEnforcement.predicatesWithoutVarBindings"
- name="predicatesWithoutVarBindings" type="#//@ownedPackages.2/@ownedClasses.7"/>
+ name="predicatesWithoutVarBindings" type="#//@ownedPackages.1/@ownedClasses.7"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMBottomPredicateForEnforcement.r" name="r"
type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.ecore.oclas#T.qvtrelation.Relation"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMBottomPredicateForEnforcement.rd" name="rd"
@@ -135,7 +135,7 @@
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMBottomPredicateForEnforcement.te" name="te"
type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.ecore.oclas#T.qvttemplate.ObjectTemplateExp"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMBottomPredicateForEnforcement.unboundDomainVars"
- name="unboundDomainVars" type="#//@ownedPackages.2/@ownedClasses.6"/>
+ name="unboundDomainVars" type="#//@ownedPackages.1/@ownedClasses.6"/>
</ownedClasses>
<ownedClasses xmi:id="T.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMComposedMappingGuard" name="TRDomainToMComposedMappingGuard">
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMComposedMappingGuard.cm" name="cm" type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore.oclas#T.qvtcore.Mapping"/>
@@ -147,12 +147,12 @@
<ownedClasses xmi:id="T.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcement" name="TRDomainToMDBottomForEnforcement">
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcement.db" name="db" type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore.oclas#T.qvtcorebase.BottomPattern"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcement.predicatesWithoutVarBindings"
- name="predicatesWithoutVarBindings" type="#//@ownedPackages.2/@ownedClasses.7"/>
+ name="predicatesWithoutVarBindings" type="#//@ownedPackages.1/@ownedClasses.7"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcement.r" name="r" type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.ecore.oclas#T.qvtrelation.Relation"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcement.rd" name="rd" type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.ecore.oclas#T.qvtrelation.RelationDomain"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcement.te" name="te" type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.ecore.oclas#T.qvttemplate.ObjectTemplateExp"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcement.unboundDomainVars"
- name="unboundDomainVars" type="#//@ownedPackages.2/@ownedClasses.6"/>
+ name="unboundDomainVars" type="#//@ownedPackages.1/@ownedClasses.6"/>
</ownedClasses>
<ownedClasses xmi:id="T.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcementOfIdentityProp" name="TRDomainToMDBottomForEnforcementOfIdentityProp">
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcementOfIdentityProp.db"
@@ -178,7 +178,7 @@
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcementOfNonIdentityPropObject.m"
name="m" type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtcore/model/QVTcore.ecore.oclas#T.qvtcore.Mapping"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcementOfNonIdentityPropObject.predicatesWithoutVarBindings"
- name="predicatesWithoutVarBindings" type="#//@ownedPackages.2/@ownedClasses.7"/>
+ name="predicatesWithoutVarBindings" type="#//@ownedPackages.1/@ownedClasses.7"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcementOfNonIdentityPropObject.r"
name="r" type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtrelation/model/QVTrelation.ecore.oclas#T.qvtrelation.Relation"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcementOfNonIdentityPropObject.rd"
@@ -186,7 +186,7 @@
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcementOfNonIdentityPropObject.te"
name="te" type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvttemplate/model/QVTtemplate.ecore.oclas#T.qvttemplate.ObjectTemplateExp"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcementOfNonIdentityPropObject.unboundDomainVars"
- name="unboundDomainVars" type="#//@ownedPackages.2/@ownedClasses.6"/>
+ name="unboundDomainVars" type="#//@ownedPackages.1/@ownedClasses.6"/>
</ownedClasses>
<ownedClasses xmi:id="T.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRDomainToMDBottomForEnforcementOfNonIdentityPropPrimitive"
name="TRDomainToMDBottomForEnforcementOfNonIdentityPropPrimitive">
@@ -235,7 +235,7 @@
</ownedClasses>
<ownedClasses xmi:id="T.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TROppositeDomainVarsToTraceClassProps" name="TROppositeDomainVarsToTraceClassProps">
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TROppositeDomainVarsToTraceClassProps.domainVars"
- name="domainVars" type="#//@ownedPackages.2/@ownedClasses.6"/>
+ name="domainVars" type="#//@ownedPackages.1/@ownedClasses.6"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TROppositeDomainVarsToTraceClassProps.mb" name="mb"
type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore.oclas#T.qvtcorebase.BottomPattern"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TROppositeDomainVarsToTraceClassProps.r" name="r"
@@ -246,7 +246,7 @@
<ownedClasses xmi:id="T.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRPredicateSetToMBPredicateSet" name="TRPredicateSetToMBPredicateSet">
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRPredicateSetToMBPredicateSet.mb" name="mb" type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore.oclas#T.qvtcorebase.BottomPattern"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRPredicateSetToMBPredicateSet.predSeq" name="predSeq"
- type="#//@ownedPackages.2/@ownedClasses.5"/>
+ type="#//@ownedPackages.1/@ownedClasses.5"/>
</ownedClasses>
<ownedClasses xmi:id="T.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRRelDomainsToMOpCallArg" name="TRRelDomainsToMOpCallArg">
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRRelDomainsToMOpCallArg.oce" name="oce" type="pivot:Class ../../../../../../../../../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.OperationCallExp"/>
@@ -266,15 +266,15 @@
</ownedClasses>
<ownedClasses xmi:id="T.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRVarSetToDGVarSet" name="TRVarSetToDGVarSet">
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRVarSetToDGVarSet.dg" name="dg" type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore.oclas#T.qvtcorebase.GuardPattern"/>
- <ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRVarSetToDGVarSet.rvSeq" name="rvSeq" type="#//@ownedPackages.2/@ownedClasses.4"/>
+ <ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRVarSetToDGVarSet.rvSeq" name="rvSeq" type="#//@ownedPackages.1/@ownedClasses.4"/>
</ownedClasses>
<ownedClasses xmi:id="T.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRVarSetToMBVarSet" name="TRVarSetToMBVarSet">
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRVarSetToMBVarSet.mb" name="mb" type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore.oclas#T.qvtcorebase.BottomPattern"/>
- <ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRVarSetToMBVarSet.rvSeq" name="rvSeq" type="#//@ownedPackages.2/@ownedClasses.4"/>
+ <ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRVarSetToMBVarSet.rvSeq" name="rvSeq" type="#//@ownedPackages.1/@ownedClasses.4"/>
</ownedClasses>
<ownedClasses xmi:id="T.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRVarSetToMVarSet" name="TRVarSetToMVarSet">
- <ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRVarSetToMVarSet.mvSet" name="mvSet" type="#//@ownedPackages.2/@ownedClasses.6"/>
- <ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRVarSetToMVarSet.rvSeq" name="rvSeq" type="#//@ownedPackages.2/@ownedClasses.4"/>
+ <ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRVarSetToMVarSet.mvSet" name="mvSet" type="#//@ownedPackages.1/@ownedClasses.6"/>
+ <ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRVarSetToMVarSet.rvSeq" name="rvSeq" type="#//@ownedPackages.1/@ownedClasses.4"/>
</ownedClasses>
<ownedClasses xmi:id="T.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRVarToMRealizedVar" name="TRVarToMRealizedVar">
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TRVarToMRealizedVar.mv" name="mv" type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore.oclas#T.qvtcorebase.RealizedVariable"/>
@@ -348,7 +348,7 @@
<ownedClasses xmi:id="T.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TUnsharedWhenVarsToMgVars" name="TUnsharedWhenVarsToMgVars">
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TUnsharedWhenVarsToMgVars.mg" name="mg" type="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtcorebase/model/QVTcoreBase.ecore.oclas#T.qvtcorebase.GuardPattern"/>
<ownedProperties xmi:id="p.org.eclipse.qvtd.compiler.qvtr.TrelToCore.TUnsharedWhenVarsToMgVars.unsharedWhenVars" name="unsharedWhenVars"
- type="#//@ownedPackages.2/@ownedClasses.6"/>
+ type="#//@ownedPackages.1/@ownedClasses.6"/>
</ownedClasses>
</ownedPackages>
</ownedPackages>
@@ -356,8 +356,7 @@
</ownedPackages>
</ownedPackages>
</ownedPackages>
- <ownedPackages xmi:id="P.$$" name="$$"/>
- <ownedPackages xmi:id="_3gMPgBKyEeay29n01ZeJcw" URI="http://www.eclipse.org/ocl/2015/Orphanage" name="$$" nsPrefix="orphanage">
+ <ownedPackages xmi:id="P.$$" URI="http://www.eclipse.org/ocl/2015/Orphanage" name="$$">
<ownedClasses xsi:type="pivot:CollectionType" elementType="pivot:Class ../../../../../../../../../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Variable"
name="Collection" superClasses="http://www.eclipse.org/ocl/2015/Library.oclas#T.ocl.OclAny">
<ownedBindings>
@@ -373,56 +372,56 @@
</ownedBindings>
</ownedClasses>
<ownedClasses xsi:type="pivot:CollectionType" elementType="pivot:Class ../../../../../../../../../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Variable"
- name="OrderedCollection" superClasses="#//@ownedPackages.2/@ownedClasses.0">
+ name="OrderedCollection" superClasses="#//@ownedPackages.1/@ownedClasses.0">
<ownedBindings>
<ownedSubstitutions actual="pivot:Class ../../../../../../../../../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Variable"
formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..OrderedCollectionT"/>
</ownedBindings>
</ownedClasses>
<ownedClasses xsi:type="pivot:CollectionType" elementType="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore.oclas#T.qvtbase.Predicate"
- name="OrderedCollection" superClasses="#//@ownedPackages.2/@ownedClasses.1">
+ name="OrderedCollection" superClasses="#//@ownedPackages.1/@ownedClasses.1">
<ownedBindings>
<ownedSubstitutions actual="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore.oclas#T.qvtbase.Predicate"
formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..OrderedCollectionT"/>
</ownedBindings>
</ownedClasses>
<ownedClasses xsi:type="pivot:SequenceType" elementType="pivot:Class ../../../../../../../../../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Variable"
- name="Sequence" superClasses="#//@ownedPackages.2/@ownedClasses.2">
+ name="Sequence" superClasses="#//@ownedPackages.1/@ownedClasses.2">
<ownedBindings>
<ownedSubstitutions actual="pivot:Class ../../../../../../../../../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Variable"
formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..SequenceT"/>
</ownedBindings>
</ownedClasses>
<ownedClasses xsi:type="pivot:SequenceType" elementType="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore.oclas#T.qvtbase.Predicate"
- name="Sequence" superClasses="#//@ownedPackages.2/@ownedClasses.3">
+ name="Sequence" superClasses="#//@ownedPackages.1/@ownedClasses.3">
<ownedBindings>
<ownedSubstitutions actual="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore.oclas#T.qvtbase.Predicate"
formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..SequenceT"/>
</ownedBindings>
</ownedClasses>
<ownedClasses xsi:type="pivot:SetType" elementType="pivot:Class ../../../../../../../../../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Variable"
- name="Set" superClasses="#//@ownedPackages.2/@ownedClasses.8">
+ name="Set" superClasses="#//@ownedPackages.1/@ownedClasses.8">
<ownedBindings>
<ownedSubstitutions actual="pivot:Class ../../../../../../../../../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Variable"
formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..SetT"/>
</ownedBindings>
</ownedClasses>
<ownedClasses xsi:type="pivot:SetType" elementType="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore.oclas#T.qvtbase.Predicate"
- name="Set" superClasses="#//@ownedPackages.2/@ownedClasses.9">
+ name="Set" superClasses="#//@ownedPackages.1/@ownedClasses.9">
<ownedBindings>
<ownedSubstitutions actual="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore.oclas#T.qvtbase.Predicate"
formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..SetT"/>
</ownedBindings>
</ownedClasses>
<ownedClasses xsi:type="pivot:CollectionType" elementType="pivot:Class ../../../../../../../../../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Variable"
- name="UniqueCollection" superClasses="#//@ownedPackages.2/@ownedClasses.0">
+ name="UniqueCollection" superClasses="#//@ownedPackages.1/@ownedClasses.0">
<ownedBindings>
<ownedSubstitutions actual="pivot:Class ../../../../../../../../../../org.eclipse.ocl.pivot/model/Pivot.ecore.oclas#T.pivot.Variable"
formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..UniqueCollectionT"/>
</ownedBindings>
</ownedClasses>
<ownedClasses xsi:type="pivot:CollectionType" elementType="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore.oclas#T.qvtbase.Predicate"
- name="UniqueCollection" superClasses="#//@ownedPackages.2/@ownedClasses.1">
+ name="UniqueCollection" superClasses="#//@ownedPackages.1/@ownedClasses.1">
<ownedBindings>
<ownedSubstitutions actual="pivot:Class ../../../../../../../../../../org.eclipse.qvtd.pivot.qvtbase/model/QVTbase.ecore.oclas#T.qvtbase.Predicate"
formal="http://www.eclipse.org/ocl/2015/Library.oclas#t.ocl..UniqueCollectionT"/>

Back to the top