Commit 9ae24ef2 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ fixes for compnent names in TTCN-3 renderer, &27

parent d1482e1f

plugins/org.etsi.mts.tdl.rt.ui/src/org/etsi/mts/tdl/tools/rt/renderers/TTCN3Renderer.java

+5 −4
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ public class TTCN3Renderer { 
		output+=indent+this.indent+"type charstring SimpleDataType;"+LF;

		output+=indent+this.indent+"type charstring String;"+LF;

		output+=indent+this.indent+"type integer Integer;"+LF;

		output+=indent+this.indent+"type boolean Boolean;"+LF;

		output+=indent+this.indent+"altstep to_handle_deviations_from_TDL_description_AS () {"+LF

				+ indent+this.indent+this.indent+"[ ] any port.receive {"+LF

				+ indent+this.indent+this.indent+this.indent+"setverdict(fail);"+LF
@@ -351,15 +352,15 @@ public class TTCN3Renderer { 
			//TODO: multipoint

			var c1 = c.getEndPoint().getFirst();

			var c2 = c.getEndPoint().getLast();

			String c1name = ttcnName(c1.getComponent());

			String c2name = ttcnName(c2.getComponent());

			String c1name = "vc_"+ttcnName(c1.getComponent());

			String c2name = "vc_"+ttcnName(c2.getComponent());

			String operation = "connect";

			if (c1.getComponent().getRole() == ComponentInstanceRole.SUT || c2.getComponent().getRole() == ComponentInstanceRole.SUT) {

				if (c1.getComponent().getRole() == ComponentInstanceRole.SUT) {

					c1name = "System_"+ttcnName(e);

					c1name = "system";

				}

				if (c2.getComponent().getRole() == ComponentInstanceRole.SUT) {

					c2name = "System_"+ttcnName(e);

					c2name = "system";

				}

				operation = "map";

			}