Commit c17eb903 authored by predusi's avatar predusi
Browse files

-- changed the name of the components, ports, timer etc from obu to rsu and from rsu to obu.

parent 097191ee

javasrc/org/etsi/its/adapter/TraceParser.java

+2 −2
Original line number Diff line number Diff line
@@ -74,10 +74,10 @@ public class TraceParser { 
							switch (i) {

							case 0:

								if (token.equals("UL")) { //UL

									transaction.setDirection(TransactionStructure.RSU); 

									transaction.setDirection(TransactionStructure.OBU); 

								}

								else if(token.equals("DL")) { //DL

									transaction.setDirection(TransactionStructure.OBU); 

									transaction.setDirection(TransactionStructure.RSU); 

								}

								else {

									//TODO error!

javasrc/org/etsi/its/adapter/TracePortPlugin.java

+16 −17
Original line number Diff line number Diff line
@@ -46,11 +46,10 @@ public class TracePortPlugin extends AbstractPlugin implements ISAPlugin { 
	private RB RB;

	private PluginIdentifier pluginId;

	private TraceParser traceParse;

	private TriComponentId rsuComponent;



	private TriPortId rsuTsiPortId;

	private TriComponentId obuComponent;

	private TriPortId obuTsiPortId;

	private TriComponentId rsuComponent;

	private TriPortId rsuTsiPortId;

	

	public TracePortPlugin(PluginIdentifier pluginId){

		this.pluginId = pluginId;
@@ -182,14 +181,14 @@ public class TracePortPlugin extends AbstractPlugin implements ISAPlugin { 
		TriComponentId componentId = null;

		

		for (TransactionStructure transaction : transactions) {

			if (transaction.getDirection() == TransactionStructure.RSU) { //UL

				tsiPortId = rsuTsiPortId;

				componentId = rsuComponent;

			}

			if (transaction.getDirection() == TransactionStructure.OBU) { //DL

			if (transaction.getDirection() == TransactionStructure.OBU) { //UL

				tsiPortId = obuTsiPortId;

				componentId = obuComponent;

			}

			if (transaction.getDirection() == TransactionStructure.RSU) { //DL

				tsiPortId = rsuTsiPortId;

				componentId = rsuComponent;

			}

			IntegerValue iv = (IntegerValue) RB.getTciCDRequired().getInteger().newInstance();

			iv.setBigInt(transaction.getTimeStamp());

			TriMessage address = RB.TestAdapter.getCodec(MSG_ENCODING).encode(iv);
@@ -261,14 +260,14 @@ public class TracePortPlugin extends AbstractPlugin implements ISAPlugin { 




	public TriStatus triMap(TriPortId compPortId, TriPortId tsiPortId) {

		if (compPortId.getPortName().equals("rsuPort")) {

			rsuComponent = compPortId.getComponent();

			rsuTsiPortId = tsiPortId;

		}

		else if (compPortId.getPortName().equals("obuPort")) {

		if (compPortId.getPortName().equals("obuPort")) {

			obuComponent = compPortId.getComponent();

			obuTsiPortId = tsiPortId;

		}

		else if (compPortId.getPortName().equals("rsuPort")) {

			rsuComponent = compPortId.getComponent();

			rsuTsiPortId = tsiPortId;

		}

		else if (compPortId.getPortName().equals("controlPort")) {

			

		}
@@ -351,10 +350,10 @@ public class TracePortPlugin extends AbstractPlugin implements ISAPlugin { 




	public TriStatus triUnmap(TriPortId portId, TriPortId portId1) {

		rsuComponent = null;

		rsuTsiPortId = null;

		obuComponent = null;

		obuTsiPortId = null;

		rsuComponent = null;

		rsuTsiPortId = null;

		return new TriStatusImpl();

	}