Merge lp:~yrke/tapaal/fix-1887512-SharedPlaceWithToken into lp:tapaal

[Kenneth Yrke Jørgensen]

[Peter Haahr Taankvist (ptaank)]

I cannot reproduce the error anymore.

review: Approve

=== modified file 'src/dk/aau/cs/io/TapnXmlLoader.java'
--- src/dk/aau/cs/io/TapnXmlLoader.java	2020-06-21 13:33:43 +0000
+++ src/dk/aau/cs/io/TapnXmlLoader.java	2020-07-14 11:27:23 +0000
@@ -162,8 +162,9 @@
 		}
 		
 		SharedPlace place = new SharedPlace(name, invariant);
-        place.addTokens(numberOfTokens);
-		place.setCurrentMarking(marking);
+        place.setCurrentMarking(marking);
+		place.addTokens(numberOfTokens);
+
 
 		return place;
 	}

=== modified file 'src/pipe/gui/GuiFrameController.java'
--- src/pipe/gui/GuiFrameController.java	2020-06-22 08:20:47 +0000
+++ src/pipe/gui/GuiFrameController.java	2020-07-14 11:27:23 +0000
@@ -304,6 +304,7 @@
                             e.getMessage(),
                             "Error loading file",
                             JOptionPane.ERROR_MESSAGE);
+                    e.printStackTrace();
                     return;
                 }finally {
                     CreateGui.getAppGui().setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));

=== modified file 'tests/dk/aau/cs/io/TapnXmlLoaderTest.kt'
--- tests/dk/aau/cs/io/TapnXmlLoaderTest.kt	2020-06-21 13:30:40 +0000
+++ tests/dk/aau/cs/io/TapnXmlLoaderTest.kt	2020-07-14 11:27:23 +0000
@@ -110,6 +110,27 @@
         }
 
         @Test
+        fun `SharedPlace has a token bug#1887512`() {
+            val net = """
+                <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+                <pnml xmlns="http://www.informatik.hu-berlin.de/top/pnml/ptNetb">
+                  <shared-place initialMarking="1" invariant="&lt; inf" name="P0"/>
+                  <net active="true" id="IntroExample" type="P/T net">
+                    <place displayName="true" id="P0" initialMarking="1" invariant="&lt; inf" name="P0" nameOffsetX="0" nameOffsetY="0" positionX="105" positionY="30"/>
+                  </net>
+                 </pnml>
+            """.trimIndent().asInpurtStream()
+
+            val tapnXmlLoader = TapnXmlLoader()
+
+            val model = tapnXmlLoader.load(net)
+            val place = model.templates().first().guiModel().getPlaceByName("P0") as TimedPlaceComponent
+
+            Assertions.assertEquals(1, place.numberOfTokens)
+            Assertions.assertEquals(BigDecimal.ZERO, place.underlyingPlace().tokens().first().age())
+        }
+
+        @Test
         fun `Place has 5 token`() {
             val net = xmlNet("""
                     <place displayName="true" id="Start" initialMarking="5" invariant="&lt; inf" name="Start" nameOffsetX="-5.0" nameOffsetY="35.0" positionX="135.0" positionY="30.0"/>