[486722] Introduce VariablesAnalysis

1 files changed, 10 insertions, 9 deletions

diff --git a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtc/RelationalTransformationToMappingTransformation.java b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtc/RelationalTransformationToMappingTransformation.java
index 1466f52b6..94e89720e 100644
--- a/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtc/RelationalTransformationToMappingTransformation.java
+++ b/plugins/org.eclipse.qvtd.compiler/src/org/eclipse/qvtd/compiler/internal/qvtr2qvtc/RelationalTransformationToMappingTransformation.java
@@ -28,6 +28,14 @@ import org.eclipse.qvtd.pivot.qvtrelation.RelationalTransformation;
 	public RelationalTransformationToMappingTransformation(@NonNull QVTrToQVTc qvtr2qvtc) {
 		this.qvtr2qvtc = qvtr2qvtc;
 	}
+
+	private @NonNull TypedModel createTypedModel(@NonNull Transformation coreTransformation, @Nullable String name, @NonNull List<org.eclipse.ocl.pivot.@NonNull Package> usedPackages) {
+		TypedModel coreTypedModel =  QVTbaseFactory.eINSTANCE.createTypedModel();
+		coreTypedModel.setName(name);
+		coreTypedModel.getUsedPackage().addAll(usedPackages);
+		coreTransformation.getModelParameter().add(coreTypedModel);
+		return coreTypedModel;
+	}
 	
 	public @NonNull Transformation doRelationalTransformationToMappingTransformation(@NonNull RelationalTransformation relationalTransformation) {
 		//
@@ -45,16 +53,9 @@ import org.eclipse.qvtd.pivot.qvtrelation.RelationalTransformation;
 		//	Create a non-middle TypedModel per model parameter
 		//
 		for (@NonNull TypedModel relationTypedModel : ClassUtil.nullFree(relationalTransformation.getModelParameter())) {
-			createTypedModel(coreTransformation, relationTypedModel.getName(), ClassUtil.nullFree(relationTypedModel.getUsedPackage()));
+			TypedModel coreTypedModel = createTypedModel(coreTransformation, relationTypedModel.getName(), ClassUtil.nullFree(relationTypedModel.getUsedPackage()));
+			qvtr2qvtc.putTypedModel(relationTypedModel, coreTypedModel);
 		}
 		return coreTransformation;
 	}
-
-	private @NonNull TypedModel createTypedModel(@NonNull Transformation coreTransformation, @Nullable String name, @NonNull List<org.eclipse.ocl.pivot.@NonNull Package> usedPackages) {
-		TypedModel coreTypedModel =  QVTbaseFactory.eINSTANCE.createTypedModel();
-		coreTypedModel.setName(name);
-		coreTypedModel.getUsedPackage().addAll(usedPackages);
-		coreTransformation.getModelParameter().add(coreTypedModel);
-		return coreTypedModel;
-	}
 }