'ok' ClassCallingConvention

2 files changed, 5 insertions, 9 deletions

diff --git a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/analyzer/QVTiAS2CGVisitor.java b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/analyzer/QVTiAS2CGVisitor.java
index 38a4bf9d1..227aeb9e1 100644
--- a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/analyzer/QVTiAS2CGVisitor.java
+++ b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/analyzer/QVTiAS2CGVisitor.java
@@ -452,9 +452,9 @@ public class QVTiAS2CGVisitor extends AS2CGVisitor implements QVTimperativeVisit
 			QVTiAnalyzer analyzer = getAnalyzer();
 			CGFunction cgFunction = analyzer.basicGetCGFunction(asFunction);
 			if (cgFunction == null) {
-				CGClass cgClass = analyzer.getCGClass(PivotUtil.getOwningClass(asOperation));
-				pushClassNameManager(cgClass);
 				FunctionOperationCallingConvention callingConvention = (FunctionOperationCallingConvention)context.getCallingConvention(asFunction, true);
+				CGClass cgClass = generateClassDeclaration(PivotUtil.getOwningClass(asOperation), callingConvention.getClassCallingConvention());
+				pushClassNameManager(cgClass);
 				cgFunction = callingConvention.createCGOperation(this, asSourceType, asFunction);
 				assert cgFunction.getAst() != null;
 				assert cgFunction.getCallingConvention() == callingConvention;
@@ -1131,7 +1131,7 @@ public class QVTiAS2CGVisitor extends AS2CGVisitor implements QVTimperativeVisit
 		CGTransformation cgTransformation = QVTiCGModelFactory.eINSTANCE.createCGTransformation();
 		cgTransformation.setAst(asTransformation);
 		globalNameManager.declareGlobalName(cgTransformation, asTransformation.getName());
-		analyzer.setCGRootClass(cgTransformation);
+		analyzer.setCGRootClass(cgTransformation);			// set TransformationCallingConvention
 		pushClassNameManager(cgTransformation);
 		List<CGTypedModel> cgTypedModels = cgTransformation.getOwnedTypedModels();
 		for (@NonNull TypedModel asTypedModel : QVTimperativeUtil.getModelParameters(asTransformation)) {
diff --git a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/InternalFunctionOperationCallingConvention.java b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/InternalFunctionOperationCallingConvention.java
index 1589cf361..d6b7abcc5 100644
--- a/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/InternalFunctionOperationCallingConvention.java
+++ b/plugins/org.eclipse.qvtd.codegen/src/org/eclipse/qvtd/codegen/qvti/java/InternalFunctionOperationCallingConvention.java
@@ -17,13 +17,9 @@ import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.ocl.examples.codegen.analyzer.AS2CGVisitor;
 import org.eclipse.ocl.examples.codegen.analyzer.BoxingAnalyzer;
 import org.eclipse.ocl.examples.codegen.analyzer.CodeGenAnalyzer;
-import org.eclipse.ocl.examples.codegen.calling.CachePropertyCallingConvention;
-import org.eclipse.ocl.examples.codegen.calling.PropertyCallingConvention;
-import org.eclipse.ocl.examples.codegen.cgmodel.CGClass;
 import org.eclipse.ocl.examples.codegen.cgmodel.CGOperation;
 import org.eclipse.ocl.examples.codegen.cgmodel.CGOperationCallExp;
 import org.eclipse.ocl.examples.codegen.cgmodel.CGParameter;
-import org.eclipse.ocl.examples.codegen.cgmodel.CGProperty;
 import org.eclipse.ocl.examples.codegen.cgmodel.CGValuedElement;
 import org.eclipse.ocl.examples.codegen.java.CG2JavaVisitor;
 import org.eclipse.ocl.examples.codegen.java.JavaStream;
@@ -86,7 +82,7 @@ public class InternalFunctionOperationCallingConvention extends FunctionOperatio
 		CGFunction cgFunction = QVTiCGModelFactory.eINSTANCE.createCGFunction();
 		analyzer.installOperation(asOperation, cgFunction, this);
 
-		CGClass cgNestedClass = analyzer.createNestedCGClass(asOperation);
+		/*XXX	CGClass cgNestedClass = analyzer.createNestedCGClass(as2cgVisitor, asOperation);
 		for (@NonNull Parameter asParameter : PivotUtil.getOwnedParameters(asOperation)) {
 			PropertyCallingConvention propertyCallingConventon = CachePropertyCallingConvention.INSTANCE;
 			CGProperty cgProperty = propertyCallingConventon.createCGProperty(analyzer, asParameter);
@@ -98,7 +94,7 @@ public class InternalFunctionOperationCallingConvention extends FunctionOperatio
 			cgNestedClass.getProperties().add(cgProperty);
 			as2cgVisitor.pushNestedNameManager(cgProperty);
 			as2cgVisitor.popNestedNameManager();
-		}
+		} */
 		return cgFunction;
 	}