Merge lp:~tapaal-contributor/tapaal/fixApprox-trunk into lp:tapaal

[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:37:53 +0000
@@ -140,13 +140,16 @@
 
     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());
+
         Transition guiTransition = null;
-
-        for(DataLayer guiModel : guiModels){
-	        guiTransition = guiModel.getTransitionById(transitionName);
-	        if(guiTransition != null){
-	            break;
+        if (m != null) {
+            String transitionName = m.value2();
+            for(DataLayer guiModel : guiModels){
+                guiTransition = guiModel.getTransitionById(transitionName);
+                if(guiTransition != null){
+                    break;
+                }
             }
         }
 
@@ -157,7 +160,10 @@
 		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");
 	}