From 35b3ca774fc6ecb9c3269c6e845a8c94b72c6fdd Mon Sep 17 00:00:00 2001 From: maysam zoor <maysam_zoor@hotmail.com> Date: Thu, 14 Jan 2021 14:53:51 +0100 Subject: [PATCH] update sentence --- .../DirectedGraphTranslator.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/ui/simulationtraceanalysis/DirectedGraphTranslator.java b/src/main/java/ui/simulationtraceanalysis/DirectedGraphTranslator.java index ee780f3d73..a9d6e72da2 100644 --- a/src/main/java/ui/simulationtraceanalysis/DirectedGraphTranslator.java +++ b/src/main/java/ui/simulationtraceanalysis/DirectedGraphTranslator.java @@ -899,18 +899,19 @@ public class DirectedGraphTranslator extends JApplet { // in case an end was encountered , the previous activities should be checked: // in // case it is an end for a loop or sequence speavial edges should be added - if (currentElement.getReferenceObject() instanceof TMLADStopState) { + if (currentElement.getReferenceObject() != null && currentElement.getReferenceObject() instanceof TMLADStopState) { addStopVertex(taskName); } // start activity is added as a vertex - else if (currentElement.getReferenceObject() instanceof TMLADStartState) { + else if (currentElement.getReferenceObject() != null && currentElement.getReferenceObject() instanceof TMLADStartState) { addStartVertex(taskName); } // the below activities are added as vertex with the required edges // these activities can be used to check later for latency - else if (currentElement.getReferenceObject() instanceof TADComponentWithoutSubcomponents - || currentElement.getReferenceObject() instanceof TADComponentWithSubcomponents - || currentElement.getReferenceObject() instanceof TMLADActionState) { + else if (currentElement.getReferenceObject() != null + && (currentElement.getReferenceObject() instanceof TADComponentWithoutSubcomponents + || currentElement.getReferenceObject() instanceof TADComponentWithSubcomponents + || currentElement.getReferenceObject() instanceof TMLADActionState)) { addcurrentElementVertex(taskName, taskStartName); } // check if the next activity :add to an array: @@ -1128,6 +1129,7 @@ public class DirectedGraphTranslator extends JApplet { String sendingPortparams = null; if (waitEvent.getEvent().getOriginPort().getName().contains(FORK_PORT_ORIGIN)) { checkchannel = waitEvent.getEvent().getOriginPort().getName().split(S_LABEL); + warnings.add("Graph Doesn not support FORK for events. Analysis may fail."); if (checkchannel.length > 2) { sendingDataPortdetails = waitEvent.getEvent().getOriginPort().getName().replace(FORK_PORT_ORIGIN, FORK_EVENT); sendingPortparams = waitEvent.getEvent().getParams().toString(); @@ -1162,6 +1164,7 @@ public class DirectedGraphTranslator extends JApplet { } } else if (waitEvent.getEvent().getDestinationPort().getName().contains(JOIN_PORT_DESTINATION)) { checkchannel = waitEvent.getEvent().getDestinationPort().getName().split(S_LABEL); + warnings.add("Graph Doesn not support JOIN for events. Analysis may fail."); if (checkchannel.length > 2) { receiveDataPortdetails = waitEvent.getEvent().getDestinationPort().getName().replace(JOIN_PORT_DESTINATION, JOIN_EVENT); } else if (checkchannel.length <= 2) { -- GitLab