- Cleanup - removed "System.err.println" and moved images into "figs" sub-folders

- Some preparation for "C" language support

2 files changed, 5 insertions, 6 deletions

diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/CallEventConfigurator.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/CallEventConfigurator.java
index 8b29d06e227..147ab53e11b 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/CallEventConfigurator.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/CallEventConfigurator.java
@@ -53,10 +53,10 @@ public class CallEventConfigurator implements IInstanceConfigurator {
 		if(context != null) {
 			// make sure that there is an enum par port
 			String literalName = "port_" + UMLTool.varName(context.port);
-			literalName = "0";
+			// literalName = "0";
 			// the associated enumeration is declared by the statemachine (which is included by the bootloader as well)
 
-			DepPlanUtils.configureProperty(instance, portAttribute, literalName);
+			DepPlanUtils.configureProperty(instance, portAttribute, 0);
 		}
 	}
 
diff --git a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort.java b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort.java
index 82f689457c2..7227b1bdcc7 100644
--- a/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort.java
+++ b/extraplugins/qompass-designer/org.eclipse.papyrus.qompass.modellibs.core/src/org/eclipse/papyrus/qompass/modellibs/core/mappingrules/ExtendedPort.java
@@ -84,9 +84,8 @@ public class ExtendedPort implements IMappingRule {
 			try {
 				TemplateBinding binding =
 					TemplateUtils.fixedBinding(model, extendedPort, (Classifier)type);
-				Copy sat = new Copy(model, model, false);
-				System.err.println(model.getQualifiedName());
-				TemplateInstantiation ti = new TemplateInstantiation(sat, binding);
+				Copy copy = new Copy(model, model, false);
+				TemplateInstantiation ti = new TemplateInstantiation(copy, binding);
 				// create a bound element of the extended port. Add bound class to derived interface class
 				Class boundClass = ti.bindNamedElement(extendedPort);
 				derivedInterface.getNearestPackage().getPackagedElements().add(boundClass);
@@ -105,7 +104,7 @@ public class ExtendedPort implements IMappingRule {
 
 			if(derivedIntf != null) {
 				for(Operation op : derivedIntf.getAllOperations()) {
-					String name = port.getName() + "_" + op.getName();
+					String name = port.getName() + "_" + op.getName(); //$NON-NLS-1$
 
 					// check whether operation already exists. Create, if not
 					Operation derivedOperation = derivedInterface.getOperation(name, null, null);