Commit 12154704 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ improved string escaping, added gate swapping when event name contains "receiv"

parent 0261512d

plugins/org.etsi.mts.tdl.to2tdl/src/org/etsi/mts/tdl/to2tdl/TO2TDLTranslator.java

+7 −2
Original line number Diff line number Diff line
@@ -151,10 +151,15 @@ public class TO2TDLTranslator extends AbstractTranslator { 
		message.getTarget().add(targets);

		targets.setTargetGate(tg);



		if (eo.getEventReference().getEvent().getName().contains("receiv")) {

			message.setSourceGate(tg);

			targets.setTargetGate(sg);

		}

		

		//TODO: resolve arguments properly

		LiteralValueUse du = tdlFactory.eINSTANCE.createLiteralValueUse();

		if (eo.getEventArgument()!=null) {

			du.setValue("\""+NodeModelUtils.getNode(eo.getEventArgument()).getText().replaceAll("\"", "\\\"")+"\"");

			du.setValue("\""+NodeModelUtils.getNode(eo.getEventArgument()).getText().replaceAll("\"", "\\\\\"")+"\"");

		} else {

			du.setValue("\"TODO: Empty argument?\"");

		}
@@ -162,7 +167,7 @@ public class TO2TDLTranslator extends AbstractTranslator { 
		

		//TODO: for debugging

		Comment debug = tdlFactory.eINSTANCE.createComment();

		debug.setBody("\"Event: "+NodeModelUtils.getNode(eo).getText().replaceAll("\"", "\\\"")+"\"");

		debug.setBody("\"Event: "+NodeModelUtils.getNode(eo).getText().replaceAll("\"", "\\\\\"")+"\"");

		message.getComment().add(debug);

		

		return message;