Merge lp:~tapaal-contributor/tapaal/fixApprox-39 into lp:tapaal/3.9

[Kenneth Yrke Jørgensen]

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNExporter.java'
--- src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNExporter.java	2021-10-21 10:21:25 +0000
+++ src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNExporter.java	2021-12-27 08:19:22 +0000
@@ -1,33 +1,21 @@
 package dk.aau.cs.verification.VerifyTAPN;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Collection;
-import java.util.List;
-
+import dk.aau.cs.TCTL.visitors.CTLQueryVisitor;
 import dk.aau.cs.TCTL.visitors.LTLQueryVisitor;
 import dk.aau.cs.gui.TabContent;
+import dk.aau.cs.model.tapn.*;
 import dk.aau.cs.verification.NameMapping;
 import pipe.dataLayer.DataLayer;
 import pipe.dataLayer.TAPNQuery.QueryCategory;
-
-import dk.aau.cs.model.tapn.TAPNQuery;
-import dk.aau.cs.model.tapn.TimedArcPetriNet;
-import dk.aau.cs.model.tapn.TimedInhibitorArc;
-import dk.aau.cs.model.tapn.TimedInputArc;
-import dk.aau.cs.model.tapn.TimedOutputArc;
-import dk.aau.cs.model.tapn.TimedPlace;
-import dk.aau.cs.model.tapn.TimedTransition;
-import dk.aau.cs.model.tapn.TransportArc;
-
-import dk.aau.cs.TCTL.visitors.CTLQueryVisitor;
 import pipe.gui.CreateGui;
 import pipe.gui.graphicElements.Place;
 import pipe.gui.graphicElements.Transition;
 
-import javax.xml.crypto.Data;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.Collection;
 
 public class VerifyTAPNExporter {
 	public ExportedVerifyTAPNModel export(TimedArcPetriNet model, TAPNQuery query, TabContent.TAPNLens lens, NameMapping mapping) {
@@ -140,24 +128,29 @@
 
     private void outputTransition(TimedTransition t, PrintStream modelStream, Collection<DataLayer> guiModels, NameMapping mapping) {
         //remove the net prefix from the transition name
-	    String transitionName = mapping.map(t.name()).value2();
+        var m = mapping.map(t.name());
+        String transitionName;
         Transition guiTransition = null;
-
-        for(DataLayer guiModel : guiModels){
-	        guiTransition = guiModel.getTransitionById(transitionName);
-	        if(guiTransition != null){
-	            break;
+        if (m != null) {
+            transitionName = m.value2();
+            for (DataLayer guiModel : guiModels) {
+                guiTransition = guiModel.getTransitionById(transitionName);
+                if (guiTransition != null) {
+                    break;
+                }
             }
         }
 
 		modelStream.append("<transition ");
-
         modelStream.append("player=\"" + (t.isUncontrollable() ? "1" : "0") + "\" ");
         modelStream.append("id=\"" + t.name() + "\" ");
 		modelStream.append("name=\"" + t.name() + "\" ");
         modelStream.append("urgent=\"" + (t.isUrgent()? "true":"false") + "\"");
         modelStream.append(">\n");
-        outputPosition(modelStream, guiTransition.getPositionX(), guiTransition.getPositionY());
+
+        if (guiTransition != null) {
+            outputPosition(modelStream, guiTransition.getPositionX(), guiTransition.getPositionY());
+        }
 
         modelStream.append("</transition>\n");
 	}