454729 - [C++ codegen] refactoring after xtend migration

4 files changed, 16 insertions, 6 deletions

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplatePortImpl.java b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplatePortImpl.java
index 74ced69fd4f..9dd91abb412 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplatePortImpl.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.fcm.profile/src/org/eclipse/papyrus/FCM/impl/TemplatePortImpl.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.papyrus.FCM.FCMPackage;
 import org.eclipse.papyrus.FCM.PortKind;
 import org.eclipse.papyrus.FCM.TemplatePort;
+import org.eclipse.papyrus.FCM.util.MapUtil;
 
 /**
  * <!-- begin-user-doc -->
@@ -69,13 +70,19 @@ public class TemplatePortImpl extends PortImpl implements TemplatePort {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
-	 * @generated
+	 * @generated NOT
 	 */
 	public PortKind basicGetBoundType() {
-		// TODO: implement this method to return the 'Bound Type' reference
-		// -> do not perform proxy resolution
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
+	       if(base_Port == null) {
+               return null;
+       }
+       if(base_Port.isConjugated()) {
+               return MapUtil.getBoundType(this);
+       }
+       else {
+               return MapUtil.getBoundType(this);
+       }
+
 	}
 
 	/**
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java
index 8d255af96f3..bb75b869a10 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/PortUtils.java
@@ -161,7 +161,7 @@ public class PortUtils {
 			if (isTemplatePort(port)) {
 				TemplatePort tp = UMLUtil.getStereotypeApplication(port, TemplatePort.class);
 				if (tp.getBoundType() == null) {
-					System.err.println("Problems, problems"); //$NON-NLS-1$
+					Activator.log.debug("Bound type of template port is null, choosing base class of kind instead"); //$NON-NLS-1$
 					cl = fcmPort.getKind().getBase_Class();
 				}
 				else {
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PreTemplateInstantiationListener.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PreTemplateInstantiationListener.java
index 2190d5cb46d..09712e4175d 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PreTemplateInstantiationListener.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.designer.core/src/org/eclipse/papyrus/qompass/designer/core/templates/PreTemplateInstantiationListener.java
@@ -43,6 +43,7 @@ public class PreTemplateInstantiationListener implements PreCopyListener {
 
 	public void init(LazyCopier copy, TemplateBinding binding, Object[] args) {
 		this.binding = binding;
+		preTemplateInstantiationListener.treatTemplate = false;
 	}
 
 	private TemplateBinding binding;
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java
index e4dd3ebb7fd..096e6255b29 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/TemplatePort.java
@@ -23,6 +23,7 @@ import org.eclipse.papyrus.qompass.designer.core.templates.TemplateUtils;
 import org.eclipse.papyrus.qompass.designer.core.transformations.LazyCopier;
 import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationException;
 import org.eclipse.papyrus.qompass.designer.core.transformations.filters.FixTemplateSync;
+import org.eclipse.papyrus.qompass.modellibs.core.Activator;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Interface;
@@ -139,6 +140,7 @@ public class TemplatePort implements ITemplateMappingRule {
 				// create a bound element of the extended port. Add bound class to derived interface class
 				ti.bindNamedElement(extendedPort);
 			} catch (TransformationException e) {
+				Activator.log.error("Could not create template binding", e);
 			}
 		}
 	}