Merge remote branch 'refs/remotes/origin/master'

Conflicts:
	plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
	plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
	plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java

6 files changed, 399 insertions, 466 deletions

diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaExtensions.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaExtensions.xtend
index 51a8bd24d..f37afe00c 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaExtensions.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaExtensions.xtend
@@ -23,8 +23,8 @@ import org.eclipse.etrice.core.room.RoomClass
 import org.eclipse.etrice.core.room.Message

 import org.eclipse.etrice.generator.etricegen.ExpandedActorClass
 import org.eclipse.etrice.generator.etricegen.TransitionChain
-import org.eclipse.etrice.generator.generic.LanguageGenerator

 import org.eclipse.etrice.generator.generic.ILanguageExtension

+import org.eclipse.etrice.generator.generic.AbstractLanguageGenerator

 import java.util.List

 import org.eclipse.xtext.util.Pair

 

@@ -32,7 +32,7 @@ import org.eclipse.xtext.util.Pair
 @Singleton

 class JavaExtensions implements ILanguageExtension {

 

-	@Inject LanguageGenerator languageGen

+	@Inject AbstractLanguageGenerator languageGen

 	

 

 	override String getTypedDataDefinition(Message m) {

@@ -86,4 +86,8 @@ class JavaExtensions implements ILanguageExtension {
 	def String getExecuteChainCode(ExpandedActorClass ac, TransitionChain tc) {

 		return languageGen.getExecuteChain(ac, tc)

 	}

-}
\ No newline at end of file
+

+	override String arrayDeclaration(String type, int size, String name) {

+		type+" "+name+"[]";

+	}

+}

diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaLanguageGenerator.java b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaLanguageGenerator.java
new file mode 100644
index 000000000..02feb7c0b
--- /dev/null
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/JavaLanguageGenerator.java
@@ -0,0 +1,30 @@
+package org.eclipse.etrice.generator.java.gen;

+

+import org.eclipse.etrice.core.room.PrimitiveType;

+import org.eclipse.etrice.core.room.VarDecl;

+import org.eclipse.etrice.generator.generic.AbstractLanguageGenerator;

+

+public class JavaLanguageGenerator extends AbstractLanguageGenerator {

+

+	@Override

+	public String[] getArglistAndTypedData(VarDecl data) {

+		if (data==null)

+			return new String[] {"", "", ""};

+		

+		String typeName = data.getRefType().getType().getName();

+		String castTypeName = typeName;

+		if (data.getRefType().getType() instanceof PrimitiveType) {

+			typeName = ((PrimitiveType)data.getRefType().getType()).getTargetName();

+			String ct = ((PrimitiveType)data.getRefType().getType()).getCastName();

+			if (ct!=null && !ct.isEmpty())

+				castTypeName = ct;

+		}

+

+		String typedData = typeName+" "+data.getName() + " = ("+castTypeName+") generic_data;\n";

+		String dataArg = ", "+data.getName();

+		String typedArgList = ", "+typeName+" "+data.getName();

+		

+		return new String[]{dataArg, typedData, typedArgList};

+	}

+

+}

diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend
index ded007498..e0d3f981a 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.xtend
@@ -88,21 +88,23 @@ class ProtocolClassGen extends GenericProtocolClassGenerator {
 	'''

 	}

 	

-	def portClass(ProtocolClass pc, Boolean conj) {'''

-		«var name = pc.getPortClassName(conj)»

-		«var pclass = pc.getPortClass(conj)»

+	def portClass(ProtocolClass pc, Boolean conj) {

+		var pclass = pc.getPortClass(conj)

+		var portClassName = pc.getPortClassName(conj)

+		var replPortClassName = pc.getPortClassName(conj, true)

+	'''

 		

 		// port class

-		static public class «name» extends PortBase {

+		static public class «portClassName» extends PortBase {

 			«IF pclass!=null»

 				«helpers.userCode(pclass.userCode)»

 			«ENDIF»

 			// constructors

-			public «name»(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {

+			public «portClassName»(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {

 				super(actor, name, localId, 0, addr, peerAddress);

 				DebuggingService.getInstance().addPortInstance(this);

 			}

-			public «name»(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {

+			public «portClassName»(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {

 				super(actor, name, localId, idx, addr, peerAddress);

 				DebuggingService.getInstance().addPortInstance(this);

 			}

@@ -144,7 +146,7 @@ class ProtocolClassGen extends GenericProtocolClassGenerator {
 		

 			«IF pclass!=null»

 				«helpers.attributes(pclass.attributes)»

-				«helpers.operationsImplementation(pclass.operations, name)»

+				«helpers.operationsImplementation(pclass.operations, portClassName)»

 			«ENDIF»

 			

 			// sent messages

@@ -154,16 +156,16 @@ class ProtocolClassGen extends GenericProtocolClassGenerator {
 		}

 		

 		// replicated port class

-		static public class «name»Repl {

-			private ArrayList<«name»> ports;

+		static public class «replPortClassName» {

+			private ArrayList<«portClassName»> ports;

 			private int replication;

 		

-			public «name»Repl(IEventReceiver actor, String name, int localId, Address[] addr,

+			public «replPortClassName»(IEventReceiver actor, String name, int localId, Address[] addr,

 					Address[] peerAddress) {

 				replication = addr.length;

-				ports = new ArrayList<«pc.name».«name»>(replication);

+				ports = new ArrayList<«pc.name».«portClassName»>(replication);

 				for (int i=0; i<replication; ++i) {

-					ports.add(new «name»(

+					ports.add(new «portClassName»(

 							actor, name+i, localId, i, addr[i], peerAddress[i]));

 				}

 			}

@@ -176,7 +178,7 @@ class ProtocolClassGen extends GenericProtocolClassGenerator {
 					return ifitem.getIdx();

 				}

 			

-			public «name» get(int i) {

+			public «portClassName» get(int i) {

 				return ports.get(i);

 			}

 			

diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/setup/GeneratorModule.java b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/setup/GeneratorModule.java
index b5518d6d8..4c604f41e 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/setup/GeneratorModule.java
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/setup/GeneratorModule.java
@@ -17,9 +17,11 @@ import org.eclipse.etrice.generator.base.DefaultTranslationProvider;
 import org.eclipse.etrice.generator.base.GeneratorBaseModule;

 import org.eclipse.etrice.generator.base.ITranslationProvider;

 import org.eclipse.etrice.generator.java.Main;

+import org.eclipse.etrice.generator.java.gen.JavaLanguageGenerator;

 import org.eclipse.etrice.generator.java.gen.MainGen;

 import org.eclipse.xtext.generator.IGenerator;

 import org.eclipse.etrice.generator.generic.ILanguageExtension;

+import org.eclipse.etrice.generator.generic.AbstractLanguageGenerator;

 import org.eclipse.etrice.generator.java.gen.JavaExtensions;

 

 

@@ -39,6 +41,7 @@ public class GeneratorModule extends GeneratorBaseModule {
 

 		// bind language specific code to generic Interfaces

 		binder.bind(ILanguageExtension.class).to(JavaExtensions.class);

+		binder.bind(AbstractLanguageGenerator.class).to(JavaLanguageGenerator.class);

 	}

 

 }

diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java
deleted file mode 100644
index 04905d5dd..000000000
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/JavaExtensions.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.eclipse.etrice.generator.java.gen;

-

-import com.google.inject.Inject;

-import com.google.inject.Singleton;

-import java.util.List;

-import org.eclipse.etrice.core.room.Message;

-import org.eclipse.etrice.core.room.RoomClass;

-import org.eclipse.etrice.generator.etricegen.ExpandedActorClass;

-import org.eclipse.etrice.generator.etricegen.TransitionChain;

-import org.eclipse.etrice.generator.generic.ILanguageExtension;

-import org.eclipse.etrice.generator.generic.LanguageGenerator;

-import org.eclipse.xtext.util.Pair;

-import org.eclipse.xtext.xbase.lib.StringExtensions;

-import org.eclipse.xtext.xtend2.lib.StringConcatenation;

-

-@SuppressWarnings("all")

-@Singleton

-public class JavaExtensions implements ILanguageExtension {

-  @Inject

-  private LanguageGenerator languageGen;

-  

-  public String getTypedDataDefinition(final Message m) {

-    String _typedData = this.languageGen.getTypedData(m);

-    return _typedData;

-  }

-  

-  public String getJavaFileName(final RoomClass rc) {

-    String _name = rc.getName();

-    String _operator_plus = StringExtensions.operator_plus(_name, ".java");

-    return _operator_plus;

-  }

-  

-  public String accessLevelPrivate() {

-    return "private ";

-  }

-  

-  public String accessLevelProtected() {

-    return "protected ";

-  }

-  

-  public String accessLevelPublic() {

-    return "public ";

-  }

-  

-  public String memberAccess() {

-    return "this.";

-  }

-  

-  public String selfPointer(final String classname, final boolean hasArgs) {

-    return "";

-  }

-  

-  public String selfPointer(final boolean hasArgs) {

-    return "";

-  }

-  

-  public String operationScope(final String classname, final boolean isDeclaration) {

-    return "";

-  }

-  

-  public String memberInDeclaration(final String namespace, final String member) {

-    return member;

-  }

-  

-  public String memberInUse(final String namespace, final String member) {

-    String _operator_plus = StringExtensions.operator_plus(namespace, ".");

-    String _operator_plus_1 = StringExtensions.operator_plus(_operator_plus, member);

-    return _operator_plus_1;

-  }

-  

-  public boolean usesInheritance() {

-    return true;

-  }

-  

-  public String genEnumeration(final String name, final List<Pair<String,String>> entries) {

-    StringConcatenation _builder = new StringConcatenation();

-    {

-      for(final Pair<String,String> entry : entries) {

-        _builder.append("public static final int ");

-        String _first = entry.getFirst();

-        _builder.append(_first, "");

-        _builder.append(" = ");

-        String _second = entry.getSecond();

-        _builder.append(_second, "");

-        _builder.append(";");

-        _builder.newLineIfNotEmpty();

-      }

-    }

-    String _string = _builder.toString();

-    return _string;

-  }

-  

-  public String booleanConstant(final boolean b) {

-    String _string = ((Boolean)b).toString();

-    return _string;

-  }

-  

-  public String nullPointer() {

-    return "null";

-  }

-  

-  public String voidPointer() {

-    return "Object";

-  }

-  

-  public String getExecuteChainCode(final ExpandedActorClass ac, final TransitionChain tc) {

-    String _executeChain = this.languageGen.getExecuteChain(ac, tc);

-    return _executeChain;

-  }

-}

diff --git a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java
index a7e5011a1..2e108a505 100644
--- a/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ProtocolClassGen.java
@@ -197,361 +197,365 @@ public class ProtocolClassGen extends GenericProtocolClassGenerator {
   }

   

   public StringConcatenation portClass(final ProtocolClass pc, final Boolean conj) {

-    StringConcatenation _builder = new StringConcatenation();

-    String _portClassName = this.roomExt.getPortClassName(pc, conj);

-    String name = _portClassName;

-    _builder.newLineIfNotEmpty();

-    PortClass _portClass = this.roomExt.getPortClass(pc, conj);

-    PortClass pclass = _portClass;

-    _builder.newLineIfNotEmpty();

-    _builder.newLine();

-    _builder.append("// port class");

-    _builder.newLine();

-    _builder.append("static public class ");

-    _builder.append(name, "");

-    _builder.append(" extends PortBase {");

-    _builder.newLineIfNotEmpty();

+    StringConcatenation _xblockexpression = null;

     {

-      boolean _operator_notEquals = ObjectExtensions.operator_notEquals(pclass, null);

-      if (_operator_notEquals) {

-        _builder.append("\t");

-        DetailCode _userCode = pclass.getUserCode();

-        StringConcatenation _userCode_1 = this.helpers.userCode(_userCode);

-        _builder.append(_userCode_1, "	");

-        _builder.newLineIfNotEmpty();

+      PortClass _portClass = this.roomExt.getPortClass(pc, conj);

+      PortClass pclass = _portClass;

+      String _portClassName = this.roomExt.getPortClassName(pc, conj);

+      String portClassName = _portClassName;

+      String _portClassName_1 = this.roomExt.getPortClassName(pc, conj, true);

+      String replPortClassName = _portClassName_1;

+      StringConcatenation _builder = new StringConcatenation();

+      _builder.newLine();

+      _builder.append("// port class");

+      _builder.newLine();

+      _builder.append("static public class ");

+      _builder.append(portClassName, "");

+      _builder.append(" extends PortBase {");

+      _builder.newLineIfNotEmpty();

+      {

+        boolean _operator_notEquals = ObjectExtensions.operator_notEquals(pclass, null);

+        if (_operator_notEquals) {

+          _builder.append("\t");

+          DetailCode _userCode = pclass.getUserCode();

+          StringConcatenation _userCode_1 = this.helpers.userCode(_userCode);

+          _builder.append(_userCode_1, "	");

+          _builder.newLineIfNotEmpty();

+        }

       }

-    }

-    _builder.append("\t");

-    _builder.append("// constructors");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("public ");

-    _builder.append(name, "	");

-    _builder.append("(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t\t");

-    _builder.append("super(actor, name, localId, 0, addr, peerAddress);");

-    _builder.newLine();

-    _builder.append("\t\t");

-    _builder.append("DebuggingService.getInstance().addPortInstance(this);");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("}");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("public ");

-    _builder.append(name, "	");

-    _builder.append("(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t\t");

-    _builder.append("super(actor, name, localId, idx, addr, peerAddress);");

-    _builder.newLine();

-    _builder.append("\t\t");

-    _builder.append("DebuggingService.getInstance().addPortInstance(this);");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("}");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("@Override");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("public void receive(Message m) {");

-    _builder.newLine();

-    _builder.append("\t\t\t");

-    _builder.append("if (!(m instanceof EventMessage))");

-    _builder.newLine();

-    _builder.append("\t\t\t\t");

-    _builder.append("return;");

-    _builder.newLine();

-    _builder.append("\t\t\t");

-    _builder.append("EventMessage msg = (EventMessage) m;");

-    _builder.newLine();

-    _builder.append("\t\t\t");

-    _builder.append("if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)");

-    _builder.newLine();

-    _builder.append("\t\t\t\t");

-    _builder.append("System.out.println(\"unknown\");");

-    _builder.newLine();

-    _builder.append("\t\t\t");

-    _builder.append("else {");

-    _builder.newLine();

-    _builder.append("\t\t\t\t");

-    _builder.append("if (messageStrings[msg.getEvtId()] != \"timerTick\"){");

-    _builder.newLine();

-    _builder.append("\t\t\t\t\t");

-    _builder.append("DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);");

-    _builder.newLine();

-    _builder.append("\t\t\t\t");

-    _builder.append("}");

-    _builder.newLine();

-    {

-      boolean _handlesReceive = this.roomExt.handlesReceive(pc, conj);

-      if (_handlesReceive) {

-        _builder.append("\t\t\t\t");

-        _builder.append("switch (msg.getEvtId()) {");

-        _builder.newLine();

-        {

-          List<MessageHandler> _receiveHandlers = this.roomExt.getReceiveHandlers(pc, conj);

-          for(final MessageHandler hdlr : _receiveHandlers) {

-            _builder.append("\t\t\t\t");

-            _builder.append("\t");

-            _builder.append("case ");

-            Message _msg = hdlr.getMsg();

-            String _codeName = this.roomExt.getCodeName(_msg);

-            _builder.append(_codeName, "					");

-            _builder.append(":");

-            _builder.newLineIfNotEmpty();

-            _builder.append("\t\t\t\t");

-            _builder.append("\t");

-            _builder.append("{");

-            _builder.newLine();

-            {

-              DetailCode _detailCode = hdlr.getDetailCode();

-              EList<String> _commands = _detailCode.getCommands();

-              for(final String command : _commands) {

-                _builder.append("\t\t\t\t");

-                _builder.append("\t");

-                _builder.append("\t");

-                _builder.append(command, "						");

-                _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("// constructors");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("public ");

+      _builder.append(portClassName, "	");

+      _builder.append("(IEventReceiver actor, String name, int localId, Address addr, Address peerAddress) {");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t\t");

+      _builder.append("super(actor, name, localId, 0, addr, peerAddress);");

+      _builder.newLine();

+      _builder.append("\t\t");

+      _builder.append("DebuggingService.getInstance().addPortInstance(this);");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("}");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("public ");

+      _builder.append(portClassName, "	");

+      _builder.append("(IEventReceiver actor, String name, int localId, int idx, Address addr, Address peerAddress) {");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t\t");

+      _builder.append("super(actor, name, localId, idx, addr, peerAddress);");

+      _builder.newLine();

+      _builder.append("\t\t");

+      _builder.append("DebuggingService.getInstance().addPortInstance(this);");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("}");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("@Override");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("public void receive(Message m) {");

+      _builder.newLine();

+      _builder.append("\t\t\t");

+      _builder.append("if (!(m instanceof EventMessage))");

+      _builder.newLine();

+      _builder.append("\t\t\t\t");

+      _builder.append("return;");

+      _builder.newLine();

+      _builder.append("\t\t\t");

+      _builder.append("EventMessage msg = (EventMessage) m;");

+      _builder.newLine();

+      _builder.append("\t\t\t");

+      _builder.append("if (msg.getEvtId() <= 0 || msg.getEvtId() >= MSG_MAX)");

+      _builder.newLine();

+      _builder.append("\t\t\t\t");

+      _builder.append("System.out.println(\"unknown\");");

+      _builder.newLine();

+      _builder.append("\t\t\t");

+      _builder.append("else {");

+      _builder.newLine();

+      _builder.append("\t\t\t\t");

+      _builder.append("if (messageStrings[msg.getEvtId()] != \"timerTick\"){");

+      _builder.newLine();

+      _builder.append("\t\t\t\t\t");

+      _builder.append("DebuggingService.getInstance().addMessageAsyncIn(getPeerAddress(), getAddress(), messageStrings[msg.getEvtId()]);");

+      _builder.newLine();

+      _builder.append("\t\t\t\t");

+      _builder.append("}");

+      _builder.newLine();

+      {

+        boolean _handlesReceive = this.roomExt.handlesReceive(pc, conj);

+        if (_handlesReceive) {

+          _builder.append("\t\t\t\t");

+          _builder.append("switch (msg.getEvtId()) {");

+          _builder.newLine();

+          {

+            List<MessageHandler> _receiveHandlers = this.roomExt.getReceiveHandlers(pc, conj);

+            for(final MessageHandler hdlr : _receiveHandlers) {

+              _builder.append("\t\t\t\t");

+              _builder.append("\t");

+              _builder.append("case ");

+              Message _msg = hdlr.getMsg();

+              String _codeName = this.roomExt.getCodeName(_msg);

+              _builder.append(_codeName, "					");

+              _builder.append(":");

+              _builder.newLineIfNotEmpty();

+              _builder.append("\t\t\t\t");

+              _builder.append("\t");

+              _builder.append("{");

+              _builder.newLine();

+              {

+                DetailCode _detailCode = hdlr.getDetailCode();

+                EList<String> _commands = _detailCode.getCommands();

+                for(final String command : _commands) {

+                  _builder.append("\t\t\t\t");

+                  _builder.append("\t");

+                  _builder.append("\t");

+                  _builder.append(command, "						");

+                  _builder.newLineIfNotEmpty();

+                }

               }

+              _builder.append("\t\t\t\t");

+              _builder.append("\t");

+              _builder.append("}");

+              _builder.newLine();

+              _builder.append("\t\t\t\t");

+              _builder.append("\t");

+              _builder.append("break;");

+              _builder.newLine();

             }

-            _builder.append("\t\t\t\t");

-            _builder.append("\t");

-            _builder.append("}");

-            _builder.newLine();

-            _builder.append("\t\t\t\t");

-            _builder.append("\t");

-            _builder.append("break;");

-            _builder.newLine();

           }

+          _builder.append("\t\t\t\t");

+          _builder.append("\t");

+          _builder.append("default:");

+          _builder.newLine();

         }

-        _builder.append("\t\t\t\t");

-        _builder.append("\t");

-        _builder.append("default:");

-        _builder.newLine();

       }

-    }

-    _builder.append("\t\t\t\t\t");

-    _builder.append("if (msg instanceof EventWithDataMessage)");

-    _builder.newLine();

-    _builder.append("\t\t\t\t\t\t");

-    _builder.append("getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());");

-    _builder.newLine();

-    _builder.append("\t\t\t\t\t");

-    _builder.append("else");

-    _builder.newLine();

-    _builder.append("\t\t\t\t\t\t");

-    _builder.append("getActor().receiveEvent(this, msg.getEvtId(), null);");

-    _builder.newLine();

-    {

-      boolean _handlesReceive_1 = this.roomExt.handlesReceive(pc, conj);

-      if (_handlesReceive_1) {

-        _builder.append("\t\t\t\t");

-        _builder.append("}");

-        _builder.newLine();

+      _builder.append("\t\t\t\t\t");

+      _builder.append("if (msg instanceof EventWithDataMessage)");

+      _builder.newLine();

+      _builder.append("\t\t\t\t\t\t");

+      _builder.append("getActor().receiveEvent(this, msg.getEvtId(), ((EventWithDataMessage)msg).getData());");

+      _builder.newLine();

+      _builder.append("\t\t\t\t\t");

+      _builder.append("else");

+      _builder.newLine();

+      _builder.append("\t\t\t\t\t\t");

+      _builder.append("getActor().receiveEvent(this, msg.getEvtId(), null);");

+      _builder.newLine();

+      {

+        boolean _handlesReceive_1 = this.roomExt.handlesReceive(pc, conj);

+        if (_handlesReceive_1) {

+          _builder.append("\t\t\t\t");

+          _builder.append("}");

+          _builder.newLine();

+        }

       }

-    }

-    _builder.append("\t\t\t");

-    _builder.append("}");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("}");

-    _builder.newLine();

-    _builder.newLine();

-    {

-      boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(pclass, null);

-      if (_operator_notEquals_1) {

-        _builder.append("\t");

-        EList<Attribute> _attributes = pclass.getAttributes();

-        StringConcatenation _attributes_1 = this.helpers.attributes(_attributes);

-        _builder.append(_attributes_1, "	");

-        _builder.newLineIfNotEmpty();

-        _builder.append("\t");

-        EList<PortOperation> _operations = pclass.getOperations();

-        StringConcatenation _operationsImplementation = this.helpers.operationsImplementation(_operations, name);

-        _builder.append(_operationsImplementation, "	");

-        _builder.newLineIfNotEmpty();

+      _builder.append("\t\t\t");

+      _builder.append("}");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("}");

+      _builder.newLine();

+      _builder.newLine();

+      {

+        boolean _operator_notEquals_1 = ObjectExtensions.operator_notEquals(pclass, null);

+        if (_operator_notEquals_1) {

+          _builder.append("\t");

+          EList<Attribute> _attributes = pclass.getAttributes();

+          StringConcatenation _attributes_1 = this.helpers.attributes(_attributes);

+          _builder.append(_attributes_1, "	");

+          _builder.newLineIfNotEmpty();

+          _builder.append("\t");

+          EList<PortOperation> _operations = pclass.getOperations();

+          StringConcatenation _operationsImplementation = this.helpers.operationsImplementation(_operations, portClassName);

+          _builder.append(_operationsImplementation, "	");

+          _builder.newLineIfNotEmpty();

+        }

       }

-    }

-    _builder.append("\t");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("// sent messages");

-    _builder.newLine();

-    {

-      List<Message> _outgoing = this.roomExt.getOutgoing(pc, conj);

-      for(final Message m : _outgoing) {

-        _builder.append("\t");

-        StringConcatenation _sendMessage = this.sendMessage(m, conj);

-        _builder.append(_sendMessage, "	");

-        _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("// sent messages");

+      _builder.newLine();

+      {

+        List<Message> _outgoing = this.roomExt.getOutgoing(pc, conj);

+        for(final Message m : _outgoing) {

+          _builder.append("\t");

+          StringConcatenation _sendMessage = this.sendMessage(m, conj);

+          _builder.append(_sendMessage, "	");

+          _builder.newLineIfNotEmpty();

+        }

       }

-    }

-    _builder.append("}");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("// replicated port class");

-    _builder.newLine();

-    _builder.append("static public class ");

-    _builder.append(name, "");

-    _builder.append("Repl {");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.append("private ArrayList<");

-    _builder.append(name, "	");

-    _builder.append("> ports;");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t");

-    _builder.append("private int replication;");

-    _builder.newLine();

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("public ");

-    _builder.append(name, "	");

-    _builder.append("Repl(IEventReceiver actor, String name, int localId, Address[] addr,");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t\t\t");

-    _builder.append("Address[] peerAddress) {");

-    _builder.newLine();

-    _builder.append("\t\t");

-    _builder.append("replication = addr.length;");

-    _builder.newLine();

-    _builder.append("\t\t");

-    _builder.append("ports = new ArrayList<");

-    String _name = pc.getName();

-    _builder.append(_name, "		");

-    _builder.append(".");

-    _builder.append(name, "		");

-    _builder.append(">(replication);");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t\t");

-    _builder.append("for (int i=0; i<replication; ++i) {");

-    _builder.newLine();

-    _builder.append("\t\t\t");

-    _builder.append("ports.add(new ");

-    _builder.append(name, "			");

-    _builder.append("(");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t\t\t\t\t");

-    _builder.append("actor, name+i, localId, i, addr[i], peerAddress[i]));");

-    _builder.newLine();

-    _builder.append("\t\t");

-    _builder.append("}");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("}");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("public int getReplication() {");

-    _builder.newLine();

-    _builder.append("\t\t");

-    _builder.append("return replication;");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("}");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("public int getIndexOf(InterfaceItemBase ifitem){");

-    _builder.newLine();

-    _builder.append("\t\t\t");

-    _builder.append("return ifitem.getIdx();");

-    _builder.newLine();

-    _builder.append("\t\t");

-    _builder.append("}");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("public ");

-    _builder.append(name, "	");

-    _builder.append(" get(int i) {");

-    _builder.newLineIfNotEmpty();

-    _builder.append("\t\t");

-    _builder.append("return ports.get(i);");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.append("}");

-    _builder.newLine();

-    _builder.append("\t");

-    _builder.newLine();

-    {

-      if (conj) {

-        _builder.append("\t");

-        _builder.append("// incoming messages");

-        _builder.newLine();

-        {

-          List<Message> _allIncomingMessages = this.roomExt.getAllIncomingMessages(pc);

-          for(final Message m_1 : _allIncomingMessages) {

-            _builder.append("\t");

-            StringConcatenation _messageSignature = this.messageSignature(m_1);

-            _builder.append(_messageSignature, "	");

-            _builder.append("{");

-            _builder.newLineIfNotEmpty();

-            _builder.append("\t");

-            _builder.append("\t");

-            _builder.append("for (int i=0; i<replication; ++i) {");

-            _builder.newLine();

-            _builder.append("\t");

-            _builder.append("\t\t");

-            _builder.append("ports.get(i).");

-            StringConcatenation _messageCall = this.messageCall(m_1);

-            _builder.append(_messageCall, "			");

-            _builder.append(";");

-            _builder.newLineIfNotEmpty();

-            _builder.append("\t");

-            _builder.append("\t");

-            _builder.append("}");

-            _builder.newLine();

-            _builder.append("\t");

-            _builder.append("}");

-            _builder.newLine();

+      _builder.append("}");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("// replicated port class");

+      _builder.newLine();

+      _builder.append("static public class ");

+      _builder.append(replPortClassName, "");

+      _builder.append(" {");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("private ArrayList<");

+      _builder.append(portClassName, "	");

+      _builder.append("> ports;");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("private int replication;");

+      _builder.newLine();

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("public ");

+      _builder.append(replPortClassName, "	");

+      _builder.append("(IEventReceiver actor, String name, int localId, Address[] addr,");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t\t\t");

+      _builder.append("Address[] peerAddress) {");

+      _builder.newLine();

+      _builder.append("\t\t");

+      _builder.append("replication = addr.length;");

+      _builder.newLine();

+      _builder.append("\t\t");

+      _builder.append("ports = new ArrayList<");

+      String _name = pc.getName();

+      _builder.append(_name, "		");

+      _builder.append(".");

+      _builder.append(portClassName, "		");

+      _builder.append(">(replication);");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t\t");

+      _builder.append("for (int i=0; i<replication; ++i) {");

+      _builder.newLine();

+      _builder.append("\t\t\t");

+      _builder.append("ports.add(new ");

+      _builder.append(portClassName, "			");

+      _builder.append("(");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t\t\t\t\t");

+      _builder.append("actor, name+i, localId, i, addr[i], peerAddress[i]));");

+      _builder.newLine();

+      _builder.append("\t\t");

+      _builder.append("}");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("}");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("public int getReplication() {");

+      _builder.newLine();

+      _builder.append("\t\t");

+      _builder.append("return replication;");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("}");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("public int getIndexOf(InterfaceItemBase ifitem){");

+      _builder.newLine();

+      _builder.append("\t\t\t");

+      _builder.append("return ifitem.getIdx();");

+      _builder.newLine();

+      _builder.append("\t\t");

+      _builder.append("}");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("public ");

+      _builder.append(portClassName, "	");

+      _builder.append(" get(int i) {");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t\t");

+      _builder.append("return ports.get(i);");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.append("}");

+      _builder.newLine();

+      _builder.append("\t");

+      _builder.newLine();

+      {

+        if (conj) {

+          _builder.append("\t");

+          _builder.append("// incoming messages");

+          _builder.newLine();

+          {

+            List<Message> _allIncomingMessages = this.roomExt.getAllIncomingMessages(pc);

+            for(final Message m_1 : _allIncomingMessages) {

+              _builder.append("\t");

+              StringConcatenation _messageSignature = this.messageSignature(m_1);

+              _builder.append(_messageSignature, "	");

+              _builder.append("{");

+              _builder.newLineIfNotEmpty();

+              _builder.append("\t");

+              _builder.append("\t");

+              _builder.append("for (int i=0; i<replication; ++i) {");

+              _builder.newLine();

+              _builder.append("\t");

+              _builder.append("\t\t");

+              _builder.append("ports.get(i).");

+              StringConcatenation _messageCall = this.messageCall(m_1);

+              _builder.append(_messageCall, "			");

+              _builder.append(";");

+              _builder.newLineIfNotEmpty();

+              _builder.append("\t");

+              _builder.append("\t");

+              _builder.append("}");

+              _builder.newLine();

+              _builder.append("\t");

+              _builder.append("}");

+              _builder.newLine();

+            }

           }

-        }

-      } else {

-        _builder.append("\t");

-        _builder.append("// outgoing messages");

-        _builder.newLine();

-        {

-          List<Message> _allOutgoingMessages = this.roomExt.getAllOutgoingMessages(pc);

-          for(final Message m_2 : _allOutgoingMessages) {

-            _builder.append("\t");

-            StringConcatenation _messageSignature_1 = this.messageSignature(m_2);

-            _builder.append(_messageSignature_1, "	");

-            _builder.append("{");

-            _builder.newLineIfNotEmpty();

-            _builder.append("\t");

-            _builder.append("\t");

-            _builder.append("for (int i=0; i<replication; ++i) {");

-            _builder.newLine();

-            _builder.append("\t");

-            _builder.append("\t\t");

-            _builder.append("ports.get(i).");

-            StringConcatenation _messageCall_1 = this.messageCall(m_2);

-            _builder.append(_messageCall_1, "			");

-            _builder.append(";");

-            _builder.newLineIfNotEmpty();

-            _builder.append("\t");

-            _builder.append("\t");

-            _builder.append("}");

-            _builder.newLine();

-            _builder.append("\t");

-            _builder.append("}");

-            _builder.newLine();

+        } else {

+          _builder.append("\t");

+          _builder.append("// outgoing messages");

+          _builder.newLine();

+          {

+            List<Message> _allOutgoingMessages = this.roomExt.getAllOutgoingMessages(pc);

+            for(final Message m_2 : _allOutgoingMessages) {

+              _builder.append("\t");

+              StringConcatenation _messageSignature_1 = this.messageSignature(m_2);

+              _builder.append(_messageSignature_1, "	");

+              _builder.append("{");

+              _builder.newLineIfNotEmpty();

+              _builder.append("\t");

+              _builder.append("\t");

+              _builder.append("for (int i=0; i<replication; ++i) {");

+              _builder.newLine();

+              _builder.append("\t");

+              _builder.append("\t\t");

+              _builder.append("ports.get(i).");

+              StringConcatenation _messageCall_1 = this.messageCall(m_2);

+              _builder.append(_messageCall_1, "			");

+              _builder.append(";");

+              _builder.newLineIfNotEmpty();

+              _builder.append("\t");

+              _builder.append("\t");

+              _builder.append("}");

+              _builder.newLine();

+              _builder.append("\t");

+              _builder.append("}");

+              _builder.newLine();

+            }

           }

         }

       }

+      _builder.append("}");

+      _builder.newLine();

+      _builder.newLine();

+      _xblockexpression = (_builder);

     }

-    _builder.append("}");

-    _builder.newLine();

-    _builder.newLine();

-    return _builder;

+    return _xblockexpression;

   }

   

   public StringConcatenation messageSignature(final Message m) {