Merge lp:~tapaal-contributor/tapaal/fix1987383 into lp:tapaal/3.9

[Kenneth Yrke Jørgensen]

[Jiri Srba (srba)]

tested and works

review: Approve

=== modified file 'src/pipe/gui/KBoundAnalyzer.java'
--- src/pipe/gui/KBoundAnalyzer.java	2023-02-06 11:16:11 +0000
+++ src/pipe/gui/KBoundAnalyzer.java	2023-02-10 10:51:21 +0000
@@ -118,14 +118,23 @@
 
     private TimedArcPetriNet mergeNetComponents() {
         HashMap<TimedArcPetriNet, DataLayer> guiModels = CreateGui.getCurrentTab().getGuiModels();
+        HashMap<TimedArcPetriNet, DataLayer> updatedModels = new HashMap<>();
+
+        // FIXME: Fixed issue #1987383, error due to changes to collection while iterating iteration over it.
+        //  however, this code seem way out of place and wrong, the way the the update is done is wired.
+        //  I guess the  update is done due to a de-sync between the tapnNetwork and gui model, but fixing it this way seems
+        //  crazy. Better would be to make sure the correct gui model is passed.
+        //  The loop lookes even weirder now, but for the bugfix I just rewrote the loop to keep the same behaviour as before
+        //  -- kyrke 2023-02-09
         for (TimedArcPetriNet net : guiModels.keySet()) {
             if (tapnNetwork.getTAPNByName(net.name()) != null) {
                 DataLayer dl = guiModels.get(net);
-                guiModels.remove(net);
-                guiModels.put(tapnNetwork.getTAPNByName(net.name()), dl);
+                updatedModels.put(tapnNetwork.getTAPNByName(net.name()), dl);
+            } else {
+                updatedModels.put(net, guiModels.get(net));
             }
         }
-        TAPNComposer composer = new TAPNComposer(new MessengerImpl(), guiModels, true, true);
+        TAPNComposer composer = new TAPNComposer(new MessengerImpl(), updatedModels, true, true);
         Tuple<TimedArcPetriNet, NameMapping> transformedModel = composer.transformModel(tapnNetwork);
 
         return transformedModel.value1();