Merge lp:~yrke/tapaal/positionAsInt into lp:tapaal

[Kenneth Yrke Jørgensen]

Refactored element (places/transition, arcs and arcpath point) to save posisiotn as integers insted of float/doubles. Adds tests for parsing xml.

The internal api always used ints for x,y position. We now mirror this in the which removes a lot of converting from double to int. The change also rounds numbers insted of sealed when dividing.

Test that we are not seing any unexpected drawing of nets.

[Peter Haahr Taankvist (ptaank)]

Seems to work as intended.

Tested open/save, import/export pnml and drawing of all things.

review: Approve

[Jiri Srba (srba)]

Automatic layout is broken.

Open Fischer's protocol, zoom in to 200% and run Automatic Layout, now the anchor points are not removed and it looks weird. The causes the problem in Peter's branch based on this one as well.

review: Needs Fixing

[lp:~yrke/tapaal/positionAsInt]

1383. By Kenneth Yrke Jørgensen on 2020-05-12

Fixed an issue where smartdraw placed arcpathpoint wrongly

[Kenneth Yrke Jørgensen (yrke)]

I created a fix for the automatic layout, it was mixing coordinates zoomed and unzoomed. I'm not sure how this was not broken in trunk

[Kenneth Yrke Jørgensen (yrke)]

interesting, a bug in how new elements was handles made the code work (the position should not be unzoomed):

- public void setPointLocation(double x, double y) {
- double realX = Zoomer.getUnzoomedValue(x, myArcPath.getArc().getZoom());
- double realY = Zoomer.getUnzoomedValue(y, myArcPath.getArc().getZoom());
- getRealPoint().setLocation(realX, realY);
- point.setLocation(x, y);
- }

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/dk/aau/cs/gui/TabContent.java'
--- src/dk/aau/cs/gui/TabContent.java	2020-04-30 12:51:14 +0000
+++ src/dk/aau/cs/gui/TabContent.java	2020-05-12 11:42:36 +0000
@@ -1444,12 +1444,12 @@
 				if(obj instanceof Transition){
 					for(Arc arc : ((PlaceTransitionObject) obj).getPreset()){
 						for(ArcPathPoint point : arc.getArcPath().getArcPathPoints()){
-							point.setPointLocation(Math.max(point.getPoint().x*factor, point.getWidth()), Math.max(point.getPoint().y*factor, point.getHeight()));
+							point.setPointLocation((int)Math.max(point.getPoint().x*factor, point.getWidth()), (int)Math.max(point.getPoint().y*factor, point.getHeight()));
 						}
 					}
 					for(Arc arc : ((PlaceTransitionObject) obj).getPostset()){
 						for(ArcPathPoint point : arc.getArcPath().getArcPathPoints()){
-							point.setPointLocation(Math.max(point.getPoint().x*factor, point.getWidth()), Math.max(point.getPoint().y*factor, point.getHeight()));
+							point.setPointLocation((int)Math.max(point.getPoint().x*factor, point.getWidth()), (int)Math.max(point.getPoint().y*factor, point.getHeight()));
 						}
 					}
 				}

=== modified file 'src/dk/aau/cs/gui/TabTransformer.java'
--- src/dk/aau/cs/gui/TabTransformer.java	2020-04-19 13:48:30 +0000
+++ src/dk/aau/cs/gui/TabTransformer.java	2020-05-12 11:42:36 +0000
@@ -52,15 +52,10 @@
                     Place guiSource = guiModel.getPlaceByName(arc.getSource().getName());
                     Transition guiTarget = guiModel.getTransitionByName(arc.getTarget().getName());
                     Arc newArc = new TimedInputArcComponent(new TimedOutputArcComponent(
-                            0d,
-                            0d,
-                            0d,
-                            0d,
-                            guiSource,
+                        guiSource,
                             guiTarget,
                             arc.getWeight().value(),
-                            arc.getSource().getName() + "_to_" + arc.getTarget().getName(),
-                            false
+                            arc.getSource().getName() + "_to_" + arc.getTarget().getName()
                     ));
 
                     // Build ArcPath
@@ -110,15 +105,10 @@
         Place guiTarget = guiModel.getPlaceByName(arc.getTarget().getName());
         Transition guiSource = guiModel.getTransitionByName(arc.getSource().getName());
         TimedOutputArcComponent newArc = new TimedOutputArcComponent(
-                0d,
-                0d,
-                0d,
-                0d,
-                guiSource,
+            guiSource,
                 guiTarget,
                 arc.getWeight().value(),
-                arc.getSource().getName() + "_to_" + arc.getTarget().getName(),
-                false
+                arc.getSource().getName() + "_to_" + arc.getTarget().getName()
         );
 
         // Build ArcPath

=== modified file 'src/dk/aau/cs/gui/smartDraw/SmartDrawWorker.java'
--- src/dk/aau/cs/gui/smartDraw/SmartDrawWorker.java	2020-04-18 16:13:35 +0000
+++ src/dk/aau/cs/gui/smartDraw/SmartDrawWorker.java	2020-05-12 11:42:36 +0000
@@ -13,6 +13,7 @@
 import dk.aau.cs.gui.undo.MovePlaceTransitionObject;
 import dk.aau.cs.util.Require;
 import pipe.gui.CreateGui;
+import pipe.gui.Zoomer;
 import pipe.gui.canvas.DrawingSurfaceImpl;
 import pipe.gui.graphicElements.*;
 import pipe.gui.undo.DeleteArcPathPointEdit;
@@ -426,7 +427,13 @@
 			}
 		}
 	}
-	
+
+
+    //XXX: out bad handeling of zoom bleads over we need to adjust point relative to zoom
+    // midpoint is at current zoom level, but when creaing a new point its coords is at 100% zoom
+	private double unzoom(double pos) {
+	    return Zoomer.getUnzoomedValue(pos,(int)CreateGui.getDrawingSurface().getZoom());
+    }
 	/*
 	 * Add arcPathPoints for arcs where
 	 * A---> B --> A so they do not overlap
@@ -435,16 +442,17 @@
 	private void offsetArcPointsFromMiddlepoint(Arc arcOne, Arc arcTwo, Place place, Transition transition) {
 		Point.Double pointForArcOne;
 		Point.Double pointForArcTwo;
+
 		if(transition.getPositionX() == place.getPositionX()) {
-			pointForArcOne = new Point.Double(arcOne.getArcPath().midPoint.x+30, (arcOne.getArcPath().midPoint.y));
-			pointForArcTwo = new Point.Double(arcTwo.getArcPath().midPoint.x-30, (arcTwo.getArcPath().midPoint.y));
+			pointForArcOne = new Point.Double(unzoom(arcOne.getArcPath().midPoint.x+30), unzoom((arcOne.getArcPath().midPoint.y)));
+			pointForArcTwo = new Point.Double(unzoom(arcTwo.getArcPath().midPoint.x-30), unzoom((arcTwo.getArcPath().midPoint.y)));
 		} 
 		else if(transition.getPositionY() == place.getPositionY()) {
-			pointForArcOne = new Point.Double((arcOne.getArcPath().midPoint.x), arcOne.getArcPath().midPoint.y+30);
-			pointForArcTwo = new Point.Double((arcTwo.getArcPath().midPoint.x), arcTwo.getArcPath().midPoint.y-30);
+			pointForArcOne = new Point.Double(unzoom(arcOne.getArcPath().midPoint.x), unzoom(arcOne.getArcPath().midPoint.y+30));
+			pointForArcTwo = new Point.Double(unzoom(arcTwo.getArcPath().midPoint.x), unzoom(arcTwo.getArcPath().midPoint.y-30));
 		} else {
-			pointForArcOne = new Point.Double((arcOne.getArcPath().midPoint.x+15), arcOne.getArcPath().midPoint.y+15);
-			pointForArcTwo = new Point.Double((arcTwo.getArcPath().midPoint.x-15), arcTwo.getArcPath().midPoint.y-15);
+			pointForArcOne = new Point.Double(unzoom(arcOne.getArcPath().midPoint.x+15), unzoom(arcOne.getArcPath().midPoint.y+15));
+			pointForArcTwo = new Point.Double(unzoom(arcTwo.getArcPath().midPoint.x-15), unzoom(arcTwo.getArcPath().midPoint.y-15));
 		}
 		
 		undoManager.addEdit(arcOne.getArcPath().insertPoint(pointForArcOne, false));

=== modified file 'src/dk/aau/cs/gui/undo/MovePlaceTransitionObject.java'
--- src/dk/aau/cs/gui/undo/MovePlaceTransitionObject.java	2020-03-29 12:40:43 +0000
+++ src/dk/aau/cs/gui/undo/MovePlaceTransitionObject.java	2020-05-12 11:42:36 +0000
@@ -7,19 +7,18 @@
 
 public class MovePlaceTransitionObject extends Command {
 	
-	private double newY;
-	private double newX;
+	private int newY;
+	private int newX;
 	private PlaceTransitionObject objectToBeMoved;
-	private double oldY;
-	private double oldX;
+	private int oldY;
+	private int oldX;
 	private boolean doUpdate = false;
 	
 	
 	public MovePlaceTransitionObject(PlaceTransitionObject object, Point point) {
 		objectToBeMoved = object;
-		this.newX = point.getX();
-		this.newY = point.getY();
-		
+		this.newX = point.x;
+		this.newY = point.y;
 	}
 
 	@Override

=== modified file 'src/dk/aau/cs/gui/undo/UpdateNameLabelOffsetCommand.java'
--- src/dk/aau/cs/gui/undo/UpdateNameLabelOffsetCommand.java	2020-04-18 13:49:06 +0000
+++ src/dk/aau/cs/gui/undo/UpdateNameLabelOffsetCommand.java	2020-05-12 11:42:36 +0000
@@ -3,10 +3,10 @@
 import pipe.gui.graphicElements.PetriNetObjectWithLabel;
 
 public class UpdateNameLabelOffsetCommand extends Command {
-	double newXOffset, newYOffset, oldXOffset, oldYOffset;
+	int newXOffset, newYOffset, oldXOffset, oldYOffset;
 	PetriNetObjectWithLabel obj;
 	
-	public UpdateNameLabelOffsetCommand(double newXOffset, double newYOffset, double oldXOffset, double oldYOffset, PetriNetObjectWithLabel obj) {
+	public UpdateNameLabelOffsetCommand(int newXOffset, int newYOffset, int oldXOffset, int oldYOffset, PetriNetObjectWithLabel obj) {
 		this.obj = obj;
 		this.newXOffset = newXOffset;
 		this.newYOffset = newYOffset;

=== modified file 'src/dk/aau/cs/io/PNMLWriter.java'
--- src/dk/aau/cs/io/PNMLWriter.java	2019-12-11 15:03:39 +0000
+++ src/dk/aau/cs/io/PNMLWriter.java	2020-05-12 11:42:36 +0000
@@ -162,8 +162,8 @@
 		name.appendChild(nameGraphics);
 		Element nameOffset = document.createElement("offset");
 		nameGraphics.appendChild(nameOffset);
-		nameOffset.setAttribute("x", (inputPlace.getNameOffsetXObject() != null ? String.valueOf(Math.round(inputPlace.getNameOffsetXObject())) : ""));
-		nameOffset.setAttribute("y", (inputPlace.getNameOffsetYObject() != null ? String.valueOf(Math.round(inputPlace.getNameOffsetYObject())) : ""));
+		nameOffset.setAttribute("x", String.valueOf(Math.round(inputPlace.getNameOffsetX())));
+		nameOffset.setAttribute("y", String.valueOf(Math.round(inputPlace.getNameOffsetY())));
 		Element nameText = document.createElement("text");
 		name.appendChild(nameText);
 		nameText.setTextContent(inputPlace.underlyingPlace().name());
@@ -172,8 +172,8 @@
 		placeElement.appendChild(graphics);
 		Element offset = document.createElement("position");
 		graphics.appendChild(offset);
-		offset.setAttribute("x", (inputPlace.getPositionXObject() != null ? String.valueOf(Math.round(inputPlace.getPositionXObject())) : ""));
-		offset.setAttribute("y", (inputPlace.getPositionYObject() != null ? String.valueOf(Math.round(inputPlace.getPositionYObject()))	: ""));
+		offset.setAttribute("x", String.valueOf(Math.round(inputPlace.getPositionX())));
+		offset.setAttribute("y", String.valueOf(Math.round(inputPlace.getPositionY())));
 		
 		Element initialMarking = document.createElement("initialMarking"); //Name
 		placeElement.appendChild(name);
@@ -201,8 +201,8 @@
 		name.appendChild(nameGraphics);
 		Element nameOffset = document.createElement("offset");
 		nameGraphics.appendChild(nameOffset);
-		nameOffset.setAttribute("x", (inputTransition.getNameOffsetXObject() != null ? String.valueOf(Math.round(inputTransition.getNameOffsetXObject())) : ""));
-		nameOffset.setAttribute("y", (inputTransition.getNameOffsetYObject() != null ? String.valueOf(Math.round(inputTransition.getNameOffsetYObject())) : ""));
+		nameOffset.setAttribute("x", String.valueOf(Math.round(inputTransition.getNameOffsetX())));
+		nameOffset.setAttribute("y", String.valueOf(Math.round(inputTransition.getNameOffsetY())));
 		Element nameText = document.createElement("text");
 		name.appendChild(nameText);
 		nameText.setTextContent(inputTransition.underlyingTransition().name());
@@ -211,8 +211,8 @@
 		transitionElement.appendChild(graphics);
 		Element offset = document.createElement("position");
 		graphics.appendChild(offset);
-		offset.setAttribute("x", (inputTransition.getPositionXObject() != null ? String.valueOf(Math.round(inputTransition.getPositionXObject())) : ""));
-		offset.setAttribute("y", (inputTransition.getPositionYObject() != null ? String.valueOf(Math.round(inputTransition.getPositionYObject())) : ""));
+		offset.setAttribute("x", String.valueOf(Math.round(inputTransition.getPositionX())));
+		offset.setAttribute("y", String.valueOf(Math.round(inputTransition.getPositionY())));
 
 		return transitionElement;
 	}

=== modified file 'src/dk/aau/cs/io/PNMLoader.java'
--- src/dk/aau/cs/io/PNMLoader.java	2020-04-18 16:08:44 +0000
+++ src/dk/aau/cs/io/PNMLoader.java	2020-05-12 11:42:36 +0000
@@ -192,7 +192,7 @@
 		
 		if(isNetDrawable()){
 			//We parse the id as both the name and id as in tapaal name = id, and name/id has to be unique 
-			TimedPlaceComponent placeComponent = new TimedPlaceComponent(position.getX(), position.getY(), id, name.point.getX(), name.point.getY());
+			TimedPlaceComponent placeComponent = new TimedPlaceComponent(position.x, position.y, id, name.point.x, name.point.y);
 			placeComponent.setUnderlyingPlace(place);
 			template.guiModel().addPetriNetObject(placeComponent);
 		}
@@ -236,7 +236,7 @@
 		if(isNetDrawable()){
 			TimedTransitionComponent transitionComponent = 
 				//We parse the id as both the name and id as in tapaal name = id, and name/id has to be unique 
-				new TimedTransitionComponent(position.getX(), position.getY(), id, name.point.getX(), name.point.getY(),
+				new TimedTransitionComponent(position.x, position.y, id, name.point.x, name.point.y,
 						true, false, 0, 0);
 			transitionComponent.setUnderlyingTransition(transition);
 			template.guiModel().addPetriNetObject(transitionComponent);
@@ -296,11 +296,11 @@
 		Arc tempArc;
 		
 		if(type != null && type.equals("inhibitor")) {
-			tempArc = parseAndAddTimedInhibitorArc(id, sourcePlace, targetTransition, source, target, weight, _startx, _starty, _endx, _endy, template);
+			tempArc = parseAndAddTimedInhibitorArc(id, sourcePlace, targetTransition, source, target, weight, _endx, _endy, template);
 		} else if(sourcePlace != null && targetTransition != null) {
-			tempArc = parseInputArc(id, sourcePlace, targetTransition, source, target, weight, _startx, _starty, _endx, _endy, template);
+			tempArc = parseInputArc(id, sourcePlace, targetTransition, source, target, weight, _endx, _endy, template);
 		} else if(sourceTransition != null && targetPlace != null) {
-			tempArc = parseOutputArc(id,  sourceTransition, targetPlace, source, target, weight, _startx, _starty, _endx, _endy, template);
+			tempArc = parseOutputArc(id,  sourceTransition, targetPlace, source, target, weight, _endx, _endy, template);
 		} else {
 			throw new FormatException("Arcs must be only between places and transitions");
 		}
@@ -410,8 +410,8 @@
 	}
 	
 	private TimedInputArcComponent parseInputArc(String arcId, TimedPlace place, TimedTransition transition, PlaceTransitionObject source,
-			PlaceTransitionObject target, int weight, int _startx, int _starty, int _endx,
-			int _endy, Template template) throws FormatException {
+                                                 PlaceTransitionObject target, int weight, int _endx,
+                                                 int _endy, Template template) throws FormatException {
 
 		TimedInputArc inputArc = new TimedInputArc(place, transition, TimeInterval.ZERO_INF, new IntWeight(weight));
 		
@@ -424,9 +424,7 @@
 		TimedInputArcComponent arc = null;
 		
 		if(isNetDrawable()){
-			arc = new TimedInputArcComponent(new TimedOutputArcComponent(
-				_startx, _starty, _endx, _endy, source, target, weight, arcId,
-				false));
+			arc = new TimedInputArcComponent(new TimedOutputArcComponent(source, target, weight, arcId));
 			arc.setUnderlyingArc(inputArc);
 
 			template.guiModel().addPetriNetObject(arc);
@@ -440,8 +438,8 @@
 	}
 	
 	private Arc parseOutputArc(String arcId, TimedTransition transition, TimedPlace place, PlaceTransitionObject source,
-			PlaceTransitionObject target, int weight, int _startx, int _starty, int _endx,
-			int _endy, Template template) throws FormatException {
+                               PlaceTransitionObject target, int weight, int _endx,
+                               int _endy, Template template) throws FormatException {
 		
 		TimedOutputArc outputArc = new TimedOutputArc(transition, place, new IntWeight(weight));
 		
@@ -454,8 +452,8 @@
 		TimedOutputArcComponent arc = null;
 		
 		if(isNetDrawable()){
-			arc = new TimedOutputArcComponent(_startx, _starty, _endx, _endy, 
-				source, target, weight,	arcId, false);
+			arc = new TimedOutputArcComponent(
+                source, target, weight,	arcId);
 			arc.setUnderlyingArc(outputArc);
 
 			template.guiModel().addPetriNetObject(arc);
@@ -467,11 +465,11 @@
 	}
 	
 	private Arc parseAndAddTimedInhibitorArc(String arcId, TimedPlace place, TimedTransition transition, PlaceTransitionObject source,
-			PlaceTransitionObject target, int weight, int _startx, int _starty, int _endx,
-			int _endy, Template template) {
+                                             PlaceTransitionObject target, int weight, int _endx,
+                                             int _endy, Template template) {
 		TimedInhibitorArcComponent tempArc = new TimedInhibitorArcComponent(
 				new TimedInputArcComponent(
-						new TimedOutputArcComponent(_startx, _starty, _endx, _endy,	source, target, weight, arcId, false)
+						new TimedOutputArcComponent(source, target, weight, arcId)
 				),
 				(""));
 		

=== modified file 'src/dk/aau/cs/io/TapnLegacyXmlLoader.java'
--- src/dk/aau/cs/io/TapnLegacyXmlLoader.java	2020-04-18 16:13:35 +0000
+++ src/dk/aau/cs/io/TapnLegacyXmlLoader.java	2020-05-12 11:42:36 +0000
@@ -183,13 +183,13 @@
 	}
 
 	private Arc parseAndAddTimedOutputArc(String idInput, boolean taggedArc,
-			String inscriptionTempStorage, PlaceTransitionObject sourceIn,
-			PlaceTransitionObject targetIn, double _startx, double _starty,
-			double _endx, double _endy) throws FormatException {
+                                          String inscriptionTempStorage, PlaceTransitionObject sourceIn,
+                                          PlaceTransitionObject targetIn,
+                                          int _endx, int _endy) throws FormatException {
 		
 		Arc tempArc;
-		tempArc = new TimedOutputArcComponent(_startx, _starty, _endx, _endy, 
-				sourceIn, targetIn,	Integer.valueOf(inscriptionTempStorage), idInput, taggedArc);
+		tempArc = new TimedOutputArcComponent(
+            sourceIn, targetIn,	Integer.valueOf(inscriptionTempStorage), idInput);
 
 		TimedPlace place = tapn.getPlaceByName(targetIn.getName());
 		TimedTransition transition = tapn.getTransitionByName(sourceIn.getName());
@@ -208,9 +208,9 @@
 	}
 
 	private Arc parseAndAddTransportArc(String idInput, boolean taggedArc,
-			String inscriptionTempStorage, PlaceTransitionObject sourceIn,
-			PlaceTransitionObject targetIn, double _startx, double _starty,
-			double _endx, double _endy) {
+                                        String inscriptionTempStorage, PlaceTransitionObject sourceIn,
+                                        PlaceTransitionObject targetIn,
+                                        int _endx, int _endy) {
 		
 		Arc tempArc;
 		String[] inscriptionSplit = {};
@@ -221,9 +221,7 @@
 		if (sourceIn instanceof Place) {
 			isInPreSet = true;
 		}
-		tempArc = new TimedTransportArcComponent(new TimedInputArcComponent(
-						new TimedOutputArcComponent(_startx, _starty, _endx, _endy,	sourceIn, targetIn, 1, idInput, taggedArc),
-						inscriptionSplit[0]), Integer.parseInt(inscriptionSplit[1]), isInPreSet);
+		tempArc = new TimedTransportArcComponent(new TimedInputArcComponent(new TimedOutputArcComponent(sourceIn, targetIn, 1, idInput)), Integer.parseInt(inscriptionSplit[1]), isInPreSet);
 
 
 		if (isInPreSet) {
@@ -282,14 +280,11 @@
 	}
 
 	private Arc parseAndAddTimedInputArc(String idInput, boolean taggedArc,
-			String inscriptionTempStorage, PlaceTransitionObject sourceIn,
-			PlaceTransitionObject targetIn, double _startx, double _starty,
-			double _endx, double _endy) throws FormatException {
+                                         String inscriptionTempStorage, PlaceTransitionObject sourceIn,
+                                         PlaceTransitionObject targetIn,
+                                         int _endx, int _endy) throws FormatException {
 		Arc tempArc;
-		tempArc = new TimedInputArcComponent(new TimedOutputArcComponent(
-				_startx, _starty, _endx, _endy, sourceIn, targetIn, 1, idInput,
-				taggedArc),
-				(inscriptionTempStorage != null ? inscriptionTempStorage : ""));
+		tempArc = new TimedInputArcComponent(new TimedOutputArcComponent(sourceIn, targetIn, 1, idInput));
 
 		TimedPlace place = tapn.getPlaceByName(sourceIn.getName());
 		TimedTransition transition = tapn.getTransitionByName(targetIn.getName());
@@ -309,13 +304,13 @@
 	}
 
 	private Arc parseAndAddTimedInhibitorArc(String idInput, boolean taggedArc,
-			String inscriptionTempStorage, PlaceTransitionObject sourceIn,
-			PlaceTransitionObject targetIn, double _startx, double _starty,
-			double _endx, double _endy) {
+                                             String inscriptionTempStorage, PlaceTransitionObject sourceIn,
+                                             PlaceTransitionObject targetIn,
+                                             int _endx, int _endy) {
 		Arc tempArc;
 		tempArc = new TimedInhibitorArcComponent(
 					new TimedInputArcComponent(
-						new TimedOutputArcComponent(_startx, _starty, _endx, _endy,	sourceIn, targetIn, 1, idInput, taggedArc)
+						new TimedOutputArcComponent(sourceIn, targetIn, 1, idInput)
 					),
 				(inscriptionTempStorage != null ? inscriptionTempStorage : ""));
 		TimedPlace place = tapn.getPlaceByName(sourceIn.getName());
@@ -508,12 +503,12 @@
 	}
 
 	private void parseAndAddTransitionAsOldFormat(Element element) throws FormatException {
-		double positionXInput = getPositionAttribute(element, "x");
-		double positionYInput = getPositionAttribute(element, "y");
+		int positionXInput = (int)getPositionAttribute(element, "x");
+		int positionYInput = (int)getPositionAttribute(element, "y");
 		String idInput = element.getAttribute("id");
 		String nameInput = getChildNodesContentOfValueChildNodeAsString(element, "name");
-		double nameOffsetXInput = getNameOffsetAttribute(element, "x");
-		double nameOffsetYInput = getNameOffsetAttribute(element, "y");
+		int nameOffsetXInput = (int)getNameOffsetAttribute(element, "x");
+		int nameOffsetYInput = (int)getNameOffsetAttribute(element, "y");
 		boolean timedTransition = getContentOfFirstSpecificChildNodesValueChildNodeAsBoolean(element, "timed");
 		boolean infiniteServer = getContentOfFirstSpecificChildNodesValueChildNodeAsBoolean(element, "infiniteServer");
 		int angle = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element,"orientation");
@@ -541,12 +536,12 @@
 	}
 
 	private void parseAndAddPlaceAsOldFormat(Element element, TimedMarking marking) throws FormatException {
-		double positionXInput = getPositionAttribute(element, "x");
-		double positionYInput = getPositionAttribute(element, "y");
+		int positionXInput = (int)getPositionAttribute(element, "x");
+		int positionYInput = (int)getPositionAttribute(element, "y");
 		String idInput = element.getAttribute("id");
 		String nameInput = getChildNodesContentOfValueChildNodeAsString(element, "name");
-		double nameOffsetXInput = getNameOffsetAttribute(element, "x");
-		double nameOffsetYInput = getNameOffsetAttribute(element, "y");
+		int nameOffsetXInput = (int)getNameOffsetAttribute(element, "x");
+		int nameOffsetYInput = (int)getNameOffsetAttribute(element, "y");
 		int initialMarkingInput = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element, "initialMarking");
 		String invariant = getChildNodesContentOfValueChildNodeAsString(element, "invariant");
 		
@@ -576,8 +571,7 @@
 //					markingOffsetYInput, capacityInput);
 //
 //		} else {
-			place = new TimedPlaceComponent(positionXInput, positionYInput,
-					idInput, nameOffsetXInput, nameOffsetYInput);
+			place = new TimedPlaceComponent(positionXInput, positionYInput, idInput, nameOffsetXInput, nameOffsetYInput);
 			
 			LocalTimedPlace p = new LocalTimedPlace(nameInput, TimeInvariant.parse(invariant, constants));
 			tapn.add(p);
@@ -597,13 +591,15 @@
 		String targetInput = inputArcElement.getAttribute("target");
 		boolean taggedArc = getContentOfFirstSpecificChildNodesValueChildNodeAsBoolean(inputArcElement, "tagged");
 		String inscriptionTempStorage = getChildNodesContentOfValueChildNodeAsString(inputArcElement, "inscription");
-		double nameOffsetXInput;
-		double nameOffsetYInput;
+		int nameOffsetXInput;
+		int nameOffsetYInput;
 		
 		//This check is done, as arcs in nets saved before this change do not have a nameOffset
+
 		if(!inputArcElement.getAttribute("nameOffsetX").equals("") && !inputArcElement.getAttribute("nameOffsetY").equals("")) {
-			nameOffsetXInput = Double.parseDouble(inputArcElement.getAttribute("nameOffsetX"));
-			nameOffsetYInput = Double.parseDouble(inputArcElement.getAttribute("nameOffsetY"));
+			nameOffsetXInput = (int) Double.parseDouble(inputArcElement.getAttribute("nameOffsetX"));
+			nameOffsetYInput = (int) Double.parseDouble(inputArcElement.getAttribute("nameOffsetY"));
+
 		} else {
 			nameOffsetXInput = 0;
 			nameOffsetYInput = 0;
@@ -630,24 +626,24 @@
 		if (type.equals("tapnInhibitor")) {
 
 			tempArc = parseAndAddTimedInhibitorArc(idInput, taggedArc,
-					inscriptionTempStorage, sourceIn, targetIn, aStartx,
-                aStarty, aEndx, aEndy);
+					inscriptionTempStorage, sourceIn, targetIn,
+                aEndx, aEndy);
 
 		} else {
 			if (type.equals("timed")) {
 				tempArc = parseAndAddTimedInputArc(idInput, taggedArc,
-						inscriptionTempStorage, sourceIn, targetIn, aStartx,
-                    aStarty, aEndx, aEndy);
+						inscriptionTempStorage, sourceIn, targetIn,
+                    aEndx, aEndy);
 
 			} else if (type.equals("transport")) {
 				tempArc = parseAndAddTransportArc(idInput, taggedArc,
-						inscriptionTempStorage, sourceIn, targetIn, aStartx,
-                    aStarty, aEndx, aEndy);
+						inscriptionTempStorage, sourceIn, targetIn,
+                    aEndx, aEndy);
 
 			} else {
 				tempArc = parseAndAddTimedOutputArc(idInput, taggedArc,
-						inscriptionTempStorage, sourceIn, targetIn, aStartx,
-                    aStarty, aEndx, aEndy);
+						inscriptionTempStorage, sourceIn, targetIn,
+                    aEndx, aEndy);
 			}
 
 		}

=== modified file 'src/dk/aau/cs/io/TapnXmlLoader.java'
--- src/dk/aau/cs/io/TapnXmlLoader.java	2020-04-18 16:13:35 +0000
+++ src/dk/aau/cs/io/TapnXmlLoader.java	2020-05-12 11:42:36 +0000
@@ -338,16 +338,16 @@
 	}
 
 	private TimedTransitionComponent parseTransition(Element transition, TimedArcPetriNetNetwork network, TimedArcPetriNet tapn) {
-		double positionXInput = Double.parseDouble(transition.getAttribute("positionX"));
-		double positionYInput = Double.parseDouble(transition.getAttribute("positionY"));
+		int positionXInput = (int)Double.parseDouble(transition.getAttribute("positionX"));
+		int positionYInput = (int)Double.parseDouble(transition.getAttribute("positionY"));
 		String idInput = transition.getAttribute("id");
 		String nameInput = transition.getAttribute("name");
 		boolean isUrgent = Boolean.parseBoolean(transition.getAttribute("urgent"));
 		
 		idResolver.add(tapn.name(), idInput, nameInput);
 		
-		double nameOffsetXInput = Double.parseDouble(transition.getAttribute("nameOffsetX"));
-		double nameOffsetYInput = Double.parseDouble(transition.getAttribute("nameOffsetY"));
+		int nameOffsetXInput = (int)Double.parseDouble(transition.getAttribute("nameOffsetX"));
+		int nameOffsetYInput = (int)Double.parseDouble(transition.getAttribute("nameOffsetY"));
 		boolean infiniteServer = transition.getAttribute("infiniteServer").equals("true");
 		int angle = Integer.parseInt(transition.getAttribute("angle"));
 		int priority = Integer.parseInt(transition.getAttribute("priority"));
@@ -386,12 +386,12 @@
 	}
 
 	private TimedPlaceComponent parsePlace(Element place, TimedArcPetriNetNetwork network, TimedArcPetriNet tapn, ConstantStore constants) {
-		double positionXInput = Double.parseDouble(place.getAttribute("positionX"));
-		double positionYInput = Double.parseDouble(place.getAttribute("positionY"));
+		int positionXInput = (int)Double.parseDouble(place.getAttribute("positionX"));
+		int positionYInput = (int)Double.parseDouble(place.getAttribute("positionY"));
 		String idInput = place.getAttribute("id");
 		String nameInput = place.getAttribute("name");
-		double nameOffsetXInput = Double.parseDouble(place.getAttribute("nameOffsetX"));
-		double nameOffsetYInput = Double.parseDouble(place.getAttribute("nameOffsetY"));
+		int nameOffsetXInput = (int)Double.parseDouble(place.getAttribute("nameOffsetX"));
+		int nameOffsetYInput = (int)Double.parseDouble(place.getAttribute("nameOffsetY"));
 		int initialMarkingInput = Integer.parseInt(place.getAttribute("initialMarking"));
 		String invariant = place.getAttribute("invariant");
 		boolean displayName = place.getAttribute("displayName").equals("false") ? false : true;
@@ -444,13 +444,13 @@
 		boolean taggedArc = arc.getAttribute("tagged").equals("true") ? true : false;
 		String inscriptionTempStorage = arc.getAttribute("inscription");
 		String type = arc.getAttribute("type");
-		double nameOffsetXInput;
-		double nameOffsetYInput;
+		int nameOffsetXInput;
+		int nameOffsetYInput;
 		
 		//This check is done, as arcs in nets saved before this change do not have a nameOffset
 		if(!arc.getAttribute("nameOffsetX").equals("") && !arc.getAttribute("nameOffsetY").equals("")) {
-			nameOffsetXInput = Double.parseDouble(arc.getAttribute("nameOffsetX"));
-			nameOffsetYInput = Double.parseDouble(arc.getAttribute("nameOffsetY"));
+			nameOffsetXInput = (int) Double.parseDouble(arc.getAttribute("nameOffsetX"));
+			nameOffsetYInput = (int) Double.parseDouble(arc.getAttribute("nameOffsetY"));
 		} else {
 			nameOffsetXInput = 0;
 			nameOffsetYInput = 0;
@@ -480,24 +480,24 @@
 		if (type.equals("tapnInhibitor")) {
 
 			tempArc = parseAndAddTimedInhibitorArc(idInput, taggedArc,
-					inscriptionTempStorage, sourceIn, targetIn, _startx,
-					_starty, _endx, _endy,template, constants, weight);
+					inscriptionTempStorage, sourceIn, targetIn,
+                _endx, _endy,template, constants, weight);
 
 		} else {
 			if (type.equals("timed")) {
 				tempArc = parseAndAddTimedInputArc(idInput, taggedArc,
-						inscriptionTempStorage, sourceIn, targetIn, _startx,
-						_starty, _endx, _endy, template, constants, weight);
+						inscriptionTempStorage, sourceIn, targetIn,
+                    _endx, _endy, template, constants, weight);
 
 			} else if (type.equals("transport")) {
 				tempArc = parseAndAddTransportArc(idInput, taggedArc,
-						inscriptionTempStorage, sourceIn, targetIn, _startx,
-						_starty, _endx, _endy, template, constants, weight);
+						inscriptionTempStorage, sourceIn, targetIn,
+                    _endx, _endy, template, constants, weight);
 
 			} else {
 				tempArc = parseAndAddTimedOutputArc(idInput, taggedArc,
-						inscriptionTempStorage, sourceIn, targetIn, _startx,
-						_starty, _endx, _endy, template, weight);
+						inscriptionTempStorage, sourceIn, targetIn,
+                    _endx, _endy, template, weight);
 			}
 
 		}
@@ -508,12 +508,12 @@
 	}
 
 	private TimedOutputArcComponent parseAndAddTimedOutputArc(String idInput, boolean taggedArc,
-			String inscriptionTempStorage, PlaceTransitionObject sourceIn,
-			PlaceTransitionObject targetIn, double _startx, double _starty,
-			double _endx, double _endy, Template template, Weight weight) throws FormatException {
+                                                              String inscriptionTempStorage, PlaceTransitionObject sourceIn,
+                                                              PlaceTransitionObject targetIn,
+                                                              int _endx, int _endy, Template template, Weight weight) throws FormatException {
 
-		TimedOutputArcComponent tempArc = new TimedOutputArcComponent(_startx, _starty, _endx, _endy, 
-				sourceIn, targetIn,	(!inscriptionTempStorage.equals("") ? Integer.valueOf(inscriptionTempStorage) : 1), idInput, taggedArc);
+		TimedOutputArcComponent tempArc = new TimedOutputArcComponent(
+            sourceIn, targetIn,	(!inscriptionTempStorage.equals("") ? Integer.valueOf(inscriptionTempStorage) : 1), idInput);
 
 		TimedPlace place = template.model().getPlaceByName(targetIn.getName());
 		TimedTransition transition = template.model().getTransitionByName(sourceIn.getName());
@@ -532,9 +532,9 @@
 	}
 
 	private TimedTransportArcComponent parseAndAddTransportArc(String idInput, boolean taggedArc,
-			String inscriptionTempStorage, PlaceTransitionObject sourceIn,
-			PlaceTransitionObject targetIn, double _startx, double _starty,
-			double _endx, double _endy, Template template, ConstantStore constants, Weight weight) {
+                                                               String inscriptionTempStorage, PlaceTransitionObject sourceIn,
+                                                               PlaceTransitionObject targetIn,
+                                                               int _endx, int _endy, Template template, ConstantStore constants, Weight weight) {
 
 		
 		String[] inscriptionSplit = {};
@@ -545,9 +545,7 @@
 		if (sourceIn instanceof Place) {
 			isInPreSet = true;
 		}
-		TimedTransportArcComponent tempArc = new TimedTransportArcComponent(new TimedInputArcComponent(
-				new TimedOutputArcComponent(_startx, _starty, _endx, _endy,	sourceIn, targetIn, 1, idInput, taggedArc),
-				inscriptionSplit[0]), Integer.parseInt(inscriptionSplit[1]), isInPreSet);
+		TimedTransportArcComponent tempArc = new TimedTransportArcComponent(new TimedInputArcComponent(new TimedOutputArcComponent(sourceIn, targetIn, 1, idInput)), Integer.parseInt(inscriptionSplit[1]), isInPreSet);
 
 
 		if (isInPreSet) {
@@ -605,14 +603,11 @@
 	}
 
 	private Arc parseAndAddTimedInputArc(String idInput, boolean taggedArc,
-			String inscriptionTempStorage, PlaceTransitionObject sourceIn,
-			PlaceTransitionObject targetIn, double _startx, double _starty,
-			double _endx, double _endy, Template template, ConstantStore constants, Weight weight) throws FormatException {
+                                         String inscriptionTempStorage, PlaceTransitionObject sourceIn,
+                                         PlaceTransitionObject targetIn,
+                                         int _endx, int _endy, Template template, ConstantStore constants, Weight weight) throws FormatException {
 		Arc tempArc;
-		tempArc = new TimedInputArcComponent(new TimedOutputArcComponent(
-				_startx, _starty, _endx, _endy, sourceIn, targetIn, 1, idInput,
-				taggedArc),
-				(inscriptionTempStorage != null ? inscriptionTempStorage : ""));
+		tempArc = new TimedInputArcComponent(new TimedOutputArcComponent(sourceIn, targetIn, 1, idInput));
 
 		TimedPlace place = template.model().getPlaceByName(sourceIn.getName());
 		TimedTransition transition = template.model().getTransitionByName(targetIn.getName());
@@ -632,12 +627,12 @@
 	}
 
 	private Arc parseAndAddTimedInhibitorArc(String idInput, boolean taggedArc,
-			String inscriptionTempStorage, PlaceTransitionObject sourceIn,
-			PlaceTransitionObject targetIn, double _startx, double _starty,
-			double _endx, double _endy, Template template, ConstantStore constants, Weight weight) {
+                                             String inscriptionTempStorage, PlaceTransitionObject sourceIn,
+                                             PlaceTransitionObject targetIn,
+                                             int _endx, int _endy, Template template, ConstantStore constants, Weight weight) {
 		TimedInhibitorArcComponent tempArc = new TimedInhibitorArcComponent(
 				new TimedInputArcComponent(
-						new TimedOutputArcComponent(_startx, _starty, _endx, _endy,	sourceIn, targetIn, 1, idInput, taggedArc)
+						new TimedOutputArcComponent(sourceIn, targetIn, 1, idInput)
 				),
 				(inscriptionTempStorage != null ? inscriptionTempStorage : ""));
 		TimedPlace place = template.model().getPlaceByName(sourceIn.getName());

=== modified file 'src/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java'
--- src/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java	2020-04-18 15:50:17 +0000
+++ src/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java	2020-05-12 11:42:36 +0000
@@ -368,13 +368,13 @@
 		
 		Element placeElement = document.createElement("place");
 
-		placeElement.setAttribute("positionX", (inputPlace.getPositionXObject() != null ? String.valueOf(inputPlace.getPositionXObject()) : ""));
-		placeElement.setAttribute("positionY", (inputPlace.getPositionYObject() != null ? String.valueOf(inputPlace.getPositionYObject())	: ""));
+		placeElement.setAttribute("positionX", String.valueOf(inputPlace.getPositionX()));
+		placeElement.setAttribute("positionY", String.valueOf(inputPlace.getPositionY()));
 		placeElement.setAttribute("name", inputPlace.underlyingPlace().name());
 		placeElement.setAttribute("displayName", (inputPlace.getAttributesVisible() ? "true" : "false"));
 		placeElement.setAttribute("id", (inputPlace.getId() != null ? inputPlace.getId() : "error"));
-		placeElement.setAttribute("nameOffsetX", (inputPlace.getNameOffsetXObject() != null ? String.valueOf(inputPlace.getNameOffsetXObject()) : ""));
-		placeElement.setAttribute("nameOffsetY", (inputPlace.getNameOffsetYObject() != null ? String.valueOf(inputPlace.getNameOffsetYObject()) : ""));
+		placeElement.setAttribute("nameOffsetX", String.valueOf(inputPlace.getNameOffsetX()));
+		placeElement.setAttribute("nameOffsetY", String.valueOf(inputPlace.getNameOffsetY()));
 		placeElement.setAttribute("initialMarking", ((Integer) inputPlace.getNumberOfTokens() != null ? String.valueOf((Integer) inputPlace.getNumberOfTokens()) : "0"));
 		placeElement.setAttribute("invariant", inputPlace.underlyingPlace().invariant().toString());
 
@@ -406,10 +406,10 @@
 		
 		Element transitionElement = document.createElement("transition");
 
-		transitionElement.setAttribute("positionX", (inputTransition.getPositionXObject() != null ? String.valueOf(inputTransition.getPositionXObject()) : ""));
-		transitionElement.setAttribute("positionY",	(inputTransition.getPositionYObject() != null ? String.valueOf(inputTransition.getPositionYObject()) : ""));
-		transitionElement.setAttribute("nameOffsetX", (inputTransition.getNameOffsetXObject() != null ? String.valueOf(inputTransition.getNameOffsetXObject()) : ""));
-		transitionElement.setAttribute("nameOffsetY", (inputTransition.getNameOffsetYObject() != null ? String.valueOf(inputTransition.getNameOffsetYObject()) : ""));
+		transitionElement.setAttribute("positionX", String.valueOf(inputTransition.getPositionX()));
+		transitionElement.setAttribute("positionY",	String.valueOf(inputTransition.getPositionY()));
+		transitionElement.setAttribute("nameOffsetX", String.valueOf(inputTransition.getNameOffsetX()));
+		transitionElement.setAttribute("nameOffsetY", String.valueOf(inputTransition.getNameOffsetY()));
 		transitionElement.setAttribute("name", inputTransition.underlyingTransition().name());
 		transitionElement.setAttribute("displayName", (inputTransition.getAttributesVisible() ? "true" : "false"));
 		transitionElement.setAttribute("id", (inputTransition.getId() != null ? inputTransition.getId()	: "error"));
@@ -431,8 +431,8 @@
 		arcElement.setAttribute("id", (inputArc.getId() != null ? inputArc.getId() : "error"));
 		arcElement.setAttribute("source", (inputArc.getSource().getId() != null ? inputArc.getSource().getId() : ""));
 		arcElement.setAttribute("target", (inputArc.getTarget().getId() != null ? inputArc.getTarget().getId() : ""));
-		arcElement.setAttribute("nameOffsetX", (inputArc.getNameOffsetXObject() != null ? String.valueOf(inputArc.getNameOffsetXObject()) : ""));
-		arcElement.setAttribute("nameOffsetY", (inputArc.getNameOffsetYObject() != null ? String.valueOf(inputArc.getNameOffsetYObject()) : ""));
+		arcElement.setAttribute("nameOffsetX", String.valueOf(inputArc.getNameOffsetX()));
+		arcElement.setAttribute("nameOffsetY", String.valueOf(inputArc.getNameOffsetY()));
 		
 		if (inputArc instanceof TimedOutputArcComponent) {
 			if (inputArc instanceof TimedInputArcComponent) {

=== modified file 'src/dk/aau/cs/verification/TAPNComposer.java'
--- src/dk/aau/cs/verification/TAPNComposer.java	2020-04-18 15:50:17 +0000
+++ src/dk/aau/cs/verification/TAPNComposer.java	2020-05-12 11:42:36 +0000
@@ -70,7 +70,7 @@
 		hasShownMessage = false;
 
 		
-		double greatestWidth = 0,
+		int greatestWidth = 0,
 			   greatestHeight = 0;
 		if (this.guiModels != null) {
 			for (TimedArcPetriNet tapn1 : model.activeTemplates()) {
@@ -195,7 +195,7 @@
 		}
 	}
 
-	private void createPlaces(TimedArcPetriNetNetwork model, TimedArcPetriNet constructedModel, NameMapping mapping, DataLayer guiModel, double greatestWidth, double greatestHeight) {
+	private void createPlaces(TimedArcPetriNetNetwork model, TimedArcPetriNet constructedModel, NameMapping mapping, DataLayer guiModel, int greatestWidth, int greatestHeight) {
 		int i = 0;
 		for (TimedArcPetriNet tapn : model.activeTemplates()) {
 			DataLayer currentGuiModel = null;
@@ -246,7 +246,7 @@
 		}
 	}
 
-	private void createTransitions(TimedArcPetriNetNetwork model, TimedArcPetriNet constructedModel, NameMapping mapping, DataLayer guiModel, double greatestWidth, double greatestHeight) {
+	private void createTransitions(TimedArcPetriNetNetwork model, TimedArcPetriNet constructedModel, NameMapping mapping, DataLayer guiModel, int greatestWidth, int greatestHeight) {
 		int i = 0;
 		for (TimedArcPetriNet tapn : model.activeTemplates()) {
                         
@@ -318,7 +318,7 @@
 		}
 	}
 	
-	private ArcPath createArcPath(DataLayer currentGuiModel, PlaceTransitionObject source, PlaceTransitionObject target, Arc arc, double offsetX, double offsetY) {
+	private ArcPath createArcPath(DataLayer currentGuiModel, PlaceTransitionObject source, PlaceTransitionObject target, Arc arc, int offsetX, int offsetY) {
 		Arc guiArc = currentGuiModel.getArcByEndpoints(source, target);
 		ArcPath arcPath = guiArc.getArcPath();
 		int arcPathPointsNum = arcPath.getNumPoints();
@@ -338,7 +338,7 @@
 		return newArcPath;
 	}
 
-	private void createInputArcs(TimedArcPetriNetNetwork model, TimedArcPetriNet constructedModel, NameMapping mapping, DataLayer guiModel, double greatestWidth, double greatestHeight) {
+	private void createInputArcs(TimedArcPetriNetNetwork model, TimedArcPetriNet constructedModel, NameMapping mapping, DataLayer guiModel, int greatestWidth, int greatestHeight) {
 		int i = 0;
 		for (TimedArcPetriNet tapn : model.activeTemplates()) {
                         
@@ -375,15 +375,11 @@
 					Transition guiTarget = guiModel.getTransitionByName(mapping.map(targetTemplate, arc.destination().name()));
 					
 					Arc newArc = new TimedInputArcComponent(new TimedOutputArcComponent(
-							0d,
-							0d,
-							0d,
-							0d,
-							guiSource,
+                        guiSource,
 							guiTarget,
 							arc.getWeight().value(),
-							mapping.map(sourceTemplate, arc.source().name()) + "_to_" + mapping.map(targetTemplate, arc.destination().name()),
-							false)
+							mapping.map(sourceTemplate, arc.source().name()) + "_to_" + mapping.map(targetTemplate, arc.destination().name())
+                    )
 					);
 					
 					// Build ArcPath
@@ -402,7 +398,7 @@
 		}
 	}
 
-	private void createOutputArcs(TimedArcPetriNetNetwork model, TimedArcPetriNet constructedModel, NameMapping mapping, DataLayer guiModel, double greatestWidth, double greatestHeight) {
+	private void createOutputArcs(TimedArcPetriNetNetwork model, TimedArcPetriNet constructedModel, NameMapping mapping, DataLayer guiModel, int greatestWidth, int greatestHeight) {
 		int i = 0;
 		for (TimedArcPetriNet tapn : model.activeTemplates()) {
 			DataLayer currentGuiModel = null;
@@ -430,16 +426,11 @@
 					Place guiTarget = guiModel.getPlaceByName(mapping.map(destinationTemplate, arc.destination().name()));
 					
 					TimedOutputArcComponent newArc = new TimedOutputArcComponent(
-							0d,
-							0d,
-							0d,
-							0d,
-							guiModel.getTransitionByName(mapping.map(sourceTemplate, arc.source().name())),
+                        guiModel.getTransitionByName(mapping.map(sourceTemplate, arc.source().name())),
 							guiModel.getPlaceByName(mapping.map(destinationTemplate, arc.destination().name())),
 							arc.getWeight().value(),
-							mapping.map(sourceTemplate, arc.source().name()) + "_to_" + mapping.map(destinationTemplate, arc.destination().name()),
-							false
-					);
+							mapping.map(sourceTemplate, arc.source().name()) + "_to_" + mapping.map(destinationTemplate, arc.destination().name())
+                    );
 					
 					// Build ArcPath
 					Transition oldGuiSource = currentGuiModel.getTransitionByName(arc.source().name());
@@ -457,7 +448,7 @@
 		}
 	}
 
-	private void createTransportArcs(TimedArcPetriNetNetwork model, TimedArcPetriNet constructedModel, NameMapping mapping, DataLayer guiModel, double greatestWidth, double greatestHeight) {
+	private void createTransportArcs(TimedArcPetriNetNetwork model, TimedArcPetriNet constructedModel, NameMapping mapping, DataLayer guiModel, int greatestWidth, int greatestHeight) {
 		int i = 0;
 		int nextGroupNr = 0;
 		for (TimedArcPetriNet tapn : model.activeTemplates()) {
@@ -498,16 +489,11 @@
 									
 					TimedTransportArcComponent newInArc = new TimedTransportArcComponent(
 							new TimedInputArcComponent(new TimedOutputArcComponent(
-								0d,
-								0d,
-								0d,
-								0d,
-								guiSourceIn,
+                                guiSourceIn,
 								guiTargetIn,
 								arc.getWeight().value(),
-								mapping.map(sourceTemplate, arc.source().name()) + "_to_" + mapping.map(transitionTemplate, arc.transition().name()),
-								false
-								)
+								mapping.map(sourceTemplate, arc.source().name()) + "_to_" + mapping.map(transitionTemplate, arc.transition().name())
+                            )
 							),
 							nextGroupNr, 
 							true
@@ -542,15 +528,11 @@
 					
 					TimedTransportArcComponent newOutArc = new TimedTransportArcComponent(
 							new TimedInputArcComponent(new TimedOutputArcComponent(
-								0d,
-								0d,
-								0d,
-								0d,
-								guiSourceOut,
+                                guiSourceOut,
 								guiTargetOut,
 								1,
-								mapping.map(transitionTemplate, arc.transition().name()) + "_to_" + mapping.map(destinationTemplate, arc.destination().name()),
-								false)
+								mapping.map(transitionTemplate, arc.transition().name()) + "_to_" + mapping.map(destinationTemplate, arc.destination().name())
+                            )
 							),
 							nextGroupNr + 1, 
 							false
@@ -574,7 +556,7 @@
 
 	
 	
-	private void createInhibitorArcs(TimedArcPetriNetNetwork model, TimedArcPetriNet constructedModel, NameMapping mapping, DataLayer guiModel, double greatestWidth, double greatestHeight) {
+	private void createInhibitorArcs(TimedArcPetriNetNetwork model, TimedArcPetriNet constructedModel, NameMapping mapping, DataLayer guiModel, int greatestWidth, int greatestHeight) {
 		int i = 0;
 		for (TimedArcPetriNet tapn : model.activeTemplates()) {
                         
@@ -609,16 +591,11 @@
 					Place guiSource = guiModel.getPlaceByName(mapping.map(sourceTemplate, arc.source().name()));
 					Transition guiTarget = guiModel.getTransitionByName(mapping.map(destinationTemplate, arc.destination().name()));
 					Arc newArc = new TimedInhibitorArcComponent(new TimedOutputArcComponent(
-							0d,
-							0d,
-							0d,
-							0d,
-							guiSource,
+                        guiSource,
 							guiTarget,
 							arc.getWeight().value(),
-							mapping.map(sourceTemplate, arc.source().name()) + "_to_" + mapping.map(destinationTemplate, arc.destination().name()),
-							false
-							), "");
+							mapping.map(sourceTemplate, arc.source().name()) + "_to_" + mapping.map(destinationTemplate, arc.destination().name())
+                    ), "");
 					
 					// Build ArcPath
 					Place oldGuiSource = currentGuiModel.getPlaceByName(arc.source().name());

=== modified file 'src/pipe/gui/CreateGui.java'
--- src/pipe/gui/CreateGui.java	2020-04-18 13:49:06 +0000
+++ src/pipe/gui/CreateGui.java	2020-05-12 11:42:36 +0000
@@ -39,6 +39,7 @@
 
 	@Deprecated
 	public static DataLayer getModel() {
+	    if (appGui==null) return null;
 		return getModel(appGui.getSelectedTabIndex());
 	}
 

=== modified file 'src/pipe/gui/Zoomer.java'
--- src/pipe/gui/Zoomer.java	2020-04-18 13:28:36 +0000
+++ src/pipe/gui/Zoomer.java	2020-05-12 11:42:36 +0000
@@ -46,32 +46,36 @@
 		return setPercent(newPercent);
 	}
 
+    public static AffineTransform getTransform(int zoom) {
+        return AffineTransform.getScaleInstance(zoom * 0.01, zoom * 0.01);
+    }
+
+    public static double getScaleFactor(int zoom) {
+        return zoom * 0.01;
+    }
+
 	public static int getZoomedValue(int x, int zoom) {
-		return (int) (x * zoom * 0.01);
-	}
-
-	public static double getZoomedValue(double x, int zoom) {
-		return x * zoom * 0.01;
-	}
-
-	public static AffineTransform getTransform(int zoom) {
-		return AffineTransform.getScaleInstance(zoom * 0.01, zoom * 0.01);
-	}
-
-	public static double getScaleFactor(int zoom) {
-		return zoom * 0.01;
+		return (int) Math.round((x * zoom * 0.01));
+	}
+
+    /**
+     * @deprecated use int getUnzoomedValue(int x, int zoom)
+     */
+    @Deprecated
+	public static int getZoomedValue(double x, int zoom) {
+        return (int) Math.round((x * zoom * 0.01));
 	}
 
 	public static int getUnzoomedValue(int x, int zoom) {
-		return (int) (x / (zoom * 0.01));
+		return (int) Math.round((x / (zoom * 0.01)));
 	}
 
     /**
      * @deprecated use int getUnzoomedValue(int x, int zoom)
      */
 	@Deprecated
-	public static double getUnzoomedValue(double x, int zoom) {
-		return x / (zoom * 0.01);
+	public static int getUnzoomedValue(double x, int zoom) {
+		return (int) Math.round(x / (zoom * 0.01));
 	}
 
 }

=== modified file 'src/pipe/gui/graphicElements/ArcPath.java'
--- src/pipe/gui/graphicElements/ArcPath.java	2020-04-18 15:59:30 +0000
+++ src/pipe/gui/graphicElements/ArcPath.java	2020-05-12 11:42:36 +0000
@@ -367,7 +367,7 @@
 
 	public void setPointLocation(int index, double x, double y) {
 		if (index < pathPoints.size() && index >= 0) {
-			(pathPoints.get(index)).setPointLocation(x, y);
+			(pathPoints.get(index)).setPointLocation((int)x,(int) y);
 		}
 	}
 

=== modified file 'src/pipe/gui/graphicElements/ArcPathPoint.java'
--- src/pipe/gui/graphicElements/ArcPathPoint.java	2020-04-18 13:28:36 +0000
+++ src/pipe/gui/graphicElements/ArcPathPoint.java	2020-05-12 11:42:36 +0000
@@ -32,8 +32,6 @@
 	private final int DELTA = 10;
 
     private ArcPath myArcPath;
-	private Point2D.Double point = new Point2D.Double();
-	private Point2D.Double realPoint = new Point2D.Double();
 
 	private Point2D.Double control1 = new Point2D.Double();
 	private Point2D.Double control2 = new Point2D.Double();
@@ -53,7 +51,8 @@
 	public ArcPathPoint(double x, double y, boolean _pointType, ArcPath a) {
 		this();
 		myArcPath = a;
-		setPointLocation(x, y);
+		setPositionX((int)x);
+		setPositionY((int)y);
 		pointType = _pointType;
 	}
 
@@ -72,14 +71,12 @@
 	}
 
 	public Point2D.Double getPoint() {
-		return point;
+		return new Point2D.Double(getPositionX(), getPositionY());
 	}
 
-	public void setPointLocation(double x, double y) {
-		double realX = Zoomer.getUnzoomedValue(x, myArcPath.getArc().getZoom());
-		double realY = Zoomer.getUnzoomedValue(y, myArcPath.getArc().getZoom());
-		getRealPoint().setLocation(realX, realY);
-		point.setLocation(x, y);
+	public void setPointLocation(int x, int y) {
+		setPositionX(x);
+		setPositionY(y);
 		setBounds((int) x - SIZE, (int) y - SIZE, 2 * SIZE + SIZE_OFFSET, 2
 				* SIZE + SIZE_OFFSET);
 	}
@@ -89,7 +86,8 @@
 	}
 
 	public void updatePointLocation() {
-		setPointLocation(point.x, point.y);
+	    //XXX
+		//setPointLocation(point.x, point.y);
 	}
 
 	public void setPointType(boolean type) {
@@ -114,16 +112,12 @@
 	public double getAngle(Point2D.Double p2) {
 		double angle;
 
-		if (point.y <= p2.y) {
-			angle = Math.atan((point.x - p2.x) / (p2.y - point.y));
+		if (getPositionY() <= p2.y) {
+			angle = Math.atan((getPositionX() - p2.x) / (p2.y - getPositionY()));
 		} else {
-			angle = Math.atan((point.x - p2.x) / (p2.y - point.y)) + Math.PI;
+			angle = Math.atan((getPositionX() - p2.x) / (p2.y - getPositionY())) + Math.PI;
 		}
 
-		// Needed to eliminate an exception on Windows
-		if (point.equals(p2)) {
-			angle = 0;
-		}
 		return angle;
 	}
 
@@ -178,8 +172,7 @@
 	public Command splitPoint() {
 		int i = getIndex(); // Get the index of this point
 
-		ArcPathPoint newPoint = new ArcPathPoint(point.x + DELTA, point.y,
-				pointType, myArcPath);
+		ArcPathPoint newPoint = new ArcPathPoint(getPositionX() + DELTA, getPositionY(), pointType, myArcPath);
 		myArcPath.insertPoint(i + 1, newPoint);
 		myArcPath.getArc().updateArcPosition();
 		return new AddArcPathPointEdit(myArcPath.getArc(), newPoint, myArcPath.getArc().getGuiModel());
@@ -187,8 +180,8 @@
 
 	public Point2D.Double getMidPoint(ArcPathPoint target) {
 		return new Point2D.Double(
-		    (target.point.x + point.x) / 2,
-            (target.point.y + point.y) / 2
+		    (target.getPositionX() + getPositionX()) / 2,
+            (target.getPositionY() + getPositionY()) / 2
         );
 	}
 
@@ -240,7 +233,7 @@
 	}
 
 	public void translate(int x, int y) {
-		this.setPointLocation(point.x + x, point.y + y);
+		this.setPointLocation(getPositionX() + x, getPositionY() + y);
 		myArcPath.updateArc();
 	}
 
@@ -260,23 +253,21 @@
 		} else {
 			SIZE = 3;
 		}
-		double x = Zoomer.getZoomedValue(getRealPoint().x, zoom);
-		double y = Zoomer.getZoomedValue(getRealPoint().y, zoom);
-		point.setLocation(x, y);
+		int x = (int)Zoomer.getZoomedValue(getRealPoint().x, zoom);
+		int y = (int)Zoomer.getZoomedValue(getRealPoint().y, zoom);
+		setPositionX(x);
+		setPositionY(y);
 		setBounds((int) x - SIZE, (int) y - SIZE, 2 * SIZE + SIZE_OFFSET, 2
 				* SIZE + SIZE_OFFSET);
 	}
 
 	public Point2D.Double getRealPoint() {
-		return realPoint;
+		return new Point2D.Double(getOriginalX(), getOriginalY());
 	}
 
-	public void setRealPoint(Point2D.Double realPoint) {
-		this.realPoint = realPoint;
-	}
-	
 	public boolean isEndPoint() {
         return this.getIndex() == 0 || this.getIndex() == myArcPath.getEndIndex();
 	}
 
+
 }

=== modified file 'src/pipe/gui/graphicElements/NameLabel.java'
--- src/pipe/gui/graphicElements/NameLabel.java	2020-04-18 13:49:06 +0000
+++ src/pipe/gui/graphicElements/NameLabel.java	2020-05-12 11:42:36 +0000
@@ -24,19 +24,15 @@
 
 	private Font font = new Font(Pipe.LABEL_FONT, Font.BOLD, Pipe.LABEL_DEFAULT_FONT_SIZE);
 
-	public NameLabel(int zoom) {
+	public NameLabel() {
 		this("");
-
-        //Kind of important to know about deriveFont: --kyrke 2020-04-02
-        // deriveFont(int) - sets text style
-        // deriveFont(float) - sets text size
-		setFont(getFont().deriveFont((float)Zoomer.getZoomedValue(Pipe.LABEL_DEFAULT_FONT_SIZE, zoom)));
 	}
 
 	public NameLabel(String nameInput) {
 		super(nameInput);
 		name = nameInput;
 		setFont(font);
+
 		setCursor(new java.awt.Cursor(java.awt.Cursor.CROSSHAIR_CURSOR));
 		setEditable(false);
 		setFocusable(false);
@@ -109,10 +105,11 @@
 	}
 
 	public void zoomUpdate(int value) {
+
         //Kind of important to know about deriveFont: --kyrke 2020-04-02
         // deriveFont(int) - sets text style
         // deriveFont(float) - sets text size
-        setFont(getFont().deriveFont((float)Zoomer.getZoomedValue(Pipe.LABEL_DEFAULT_FONT_SIZE, value)));
+		setFont(getFont().deriveFont((float)Zoomer.getZoomedValue(Pipe.LABEL_DEFAULT_FONT_SIZE, value)));
 
 		updateSize();
 	}

=== modified file 'src/pipe/gui/graphicElements/PetriNetObject.java'
--- src/pipe/gui/graphicElements/PetriNetObject.java	2020-04-18 12:27:02 +0000
+++ src/pipe/gui/graphicElements/PetriNetObject.java	2020-05-12 11:42:36 +0000
@@ -22,8 +22,8 @@
 
 	protected static final int COMPONENT_DRAW_OFFSET= 5;
 	/** x/y position position on screen (zoomed) */
-	protected double positionX;
-	protected double positionY;
+	protected int positionX;
+	protected int positionY;
 
 	// The x/y coordinate of object at 100% zoom.
 	//XXX: pushed down from PlaceTransitionObject and consolidated from note, need further refactoring and rename, //kyrke 2019-08-23
@@ -274,27 +274,6 @@
 	public int getOriginalY() {
 		return originalY;
 	}
-    /**
-     * Get X-axis position, returns null if value not yet entered
-     *
-     * @return Double value for X-axis position
-	 * @deprecated use getOriginalX
-     */
-    @Deprecated
-    public Double getPositionXObject() {
-        return (double) originalX;
-    }
-
-    /**
-     * Get Y-axis position, returns null if value not yet entered
-     *
-     * @return Double value for Y-axis position
-	 * @deprecated use getOriginalY
-     */
-    @Deprecated
-    public Double getPositionYObject() {
-        return (double) originalY;
-    }
 
 	@Override
 	public void zoomUpdate(int zoom) {
@@ -314,9 +293,9 @@
 	 * @param positionXInput
 	 *            Double value for X-axis position
 	 */
-	public void setPositionX(double positionXInput) {
+	public void setPositionX(int positionXInput) {
 		positionX = positionXInput;
-		originalX = (int)Zoomer.getUnzoomedValue(positionX, getZoom());
+		originalX = Zoomer.getUnzoomedValue(positionX, getZoom());
 	}
 
 	//XXX: pushed down from Placetransition object, might be dublicated //kyrke 2019-09-20
@@ -326,9 +305,9 @@
 	 * @param positionYInput
 	 *            Double value for Y-axis position
 	 */
-	public void setPositionY(double positionYInput) {
+	public void setPositionY(int positionYInput) {
 		positionY = positionYInput;
-		originalY = (int)Zoomer.getUnzoomedValue(positionY, getZoom());
+		originalY = Zoomer.getUnzoomedValue(positionY, getZoom());
 	}
 
 	//XXX: pushed down from Placetransition object, might be dublicated //kyrke 2019-09-20
@@ -337,7 +316,7 @@
 	 *
 	 * @return Double value for X-axis position
 	 */
-	public double getPositionX() {
+	public int getPositionX() {
 		return positionX;
 	}
 
@@ -347,7 +326,7 @@
 	 *
 	 * @return Double value for Y-axis position
 	 */
-	public double getPositionY() {
+	public int getPositionY() {
 		return positionY;
 	}
 }

=== modified file 'src/pipe/gui/graphicElements/PetriNetObjectWithLabel.java'
--- src/pipe/gui/graphicElements/PetriNetObjectWithLabel.java	2020-04-06 07:46:34 +0000
+++ src/pipe/gui/graphicElements/PetriNetObjectWithLabel.java	2020-05-12 11:42:36 +0000
@@ -10,10 +10,10 @@
 
 
     /* Name Label for displaying name */
-    protected NameLabel pnName = new NameLabel(Pipe.ZOOM_DEFAULT);
+    protected NameLabel pnName = new NameLabel();
     /** X/Y-axis Position on screen */
-    private double nameOffsetX;
-    private double nameOffsetY;
+    private int nameOffsetX;
+    private int nameOffsetY;
 
     PetriNetObjectWithLabel(int nameOffsetX, int nameOffsetY) {
         super();
@@ -42,13 +42,14 @@
     protected void updateLabelLocation(boolean alignToGrid) {
         if(alignToGrid) {
             this.getNameLabel().setPosition(
-                    Grid.getModifiedX((int) (positionX + Zoomer.getZoomedValue(nameOffsetX, getZoom()))),
-                    Grid.getModifiedY((int) (positionY + Zoomer.getZoomedValue(nameOffsetY, getZoom())))
+                    Grid.getModifiedX(positionX + Zoomer.getZoomedValue(nameOffsetX, getZoom())),
+                    Grid.getModifiedY(positionY + Zoomer.getZoomedValue(nameOffsetY, getZoom()))
             );
         } else {
             this.getNameLabel().setPosition(
-                    ((int)(positionX + Zoomer.getZoomedValue(nameOffsetX, getZoom()))),
-                    ((int)(positionY + Zoomer.getZoomedValue(nameOffsetY, getZoom()))));
+                positionX + Zoomer.getZoomedValue(nameOffsetX, getZoom()),
+                positionY + Zoomer.getZoomedValue(nameOffsetY, getZoom())
+            );
         }
     }
 
@@ -72,7 +73,7 @@
      * @param nameOffsetXInput
      *            Double value for name X-axis offset
      */
-    public void setNameOffsetX(double nameOffsetXInput) {
+    public void setNameOffsetX(int nameOffsetXInput) {
         nameOffsetX = Zoomer.getUnzoomedValue(nameOffsetXInput, getZoom());
     }
 
@@ -82,42 +83,24 @@
      * @param nameOffsetYInput
      *            Double value for name Y-axis offset
      */
-    public void setNameOffsetY(double nameOffsetYInput) {
+    public void setNameOffsetY(int nameOffsetYInput) {
         nameOffsetY = Zoomer.getUnzoomedValue(nameOffsetYInput, getZoom());
     }
 
-    public void updateNameOffsetX(double nameOffsetXInput) {
+    public void updateNameOffsetX(int nameOffsetXInput) {
         nameOffsetX += Zoomer.getUnzoomedValue(nameOffsetXInput, getZoom());
 
     }
 
-    public void updateNameOffsetY(double nameOffsetYInput) {
+    public void updateNameOffsetY(int nameOffsetYInput) {
         nameOffsetY += Zoomer.getUnzoomedValue(nameOffsetYInput, getZoom());
     }
 
-    /**
-     * Get X-axis offset for ...
-     *
-     * @return Double value for X-axis offset of ...
-     */
-    public Double getNameOffsetXObject() {
-        return nameOffsetX;
-    }
-
-    /**
-     * Moved to PetriNetObject Get Y-axis offset for ...
-     *
-     * @return Double value for Y-axis offset of ...
-     */
-    public Double getNameOffsetYObject() {
-        return nameOffsetY;
-    }
-
     //XXX pushed up from PlaceTransitionObject while refactorings, dublicates getNameOffsetXObject? //kyrke 2019-09-17
-    public double getNameOffsetX() {
+    public int getNameOffsetX() {
         return nameOffsetX;
     }
-    public double getNameOffsetY() {
+    public int getNameOffsetY() {
         return nameOffsetY;
     }
 

=== modified file 'src/pipe/gui/graphicElements/Place.java'
--- src/pipe/gui/graphicElements/Place.java	2020-04-18 12:27:02 +0000
+++ src/pipe/gui/graphicElements/Place.java	2020-05-12 11:42:36 +0000
@@ -47,17 +47,6 @@
 		componentHeight = DIAMETER;
 	}
 
-	@Deprecated
-	public Place(double positionXInput, double positionYInput, String idInput,
-			double nameOffsetXInput, double nameOffsetYInput) {
-		this((int)positionXInput, (int)positionYInput, idInput, (int)nameOffsetXInput, (int)nameOffsetYInput);
-	}
-
-	@Deprecated
-	public Place(double positionXInput, double positionYInput) {
-		this((int)positionXInput, (int)positionYInput, null, 0,0);
-	}
-
 	public Place(int positionXInput, int positionYInput) {
 		this(positionXInput, positionYInput, null, 0,0);
 	}

=== modified file 'src/pipe/gui/graphicElements/PlaceTransitionObject.java'
--- src/pipe/gui/graphicElements/PlaceTransitionObject.java	2020-04-18 13:49:06 +0000
+++ src/pipe/gui/graphicElements/PlaceTransitionObject.java	2020-05-12 11:42:36 +0000
@@ -1,13 +1,13 @@
 package pipe.gui.graphicElements;
 
+import pipe.gui.Pipe;
+import pipe.gui.Zoomer;
+
 import java.awt.*;
 import java.awt.geom.Point2D;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import pipe.gui.Pipe;
-import pipe.gui.Zoomer;
-
 /**
  * Petri-Net Place or Transition SuperClass
  * 
@@ -42,24 +42,6 @@
 		this(positionXInput, positionYInput, null, Pipe.DEFAULT_OFFSET_X, Pipe.DEFAULT_OFFSET_Y);
 	}
 
-	@Deprecated
-	public PlaceTransitionObject(
-			double positionXInput,
-			double positionYInput,
-			String idInput,
-			double nameOffsetXInput,
-			double nameOffsetYInput
-	) {
-		this((int)positionXInput, (int) positionYInput, idInput, (int)nameOffsetXInput, (int)nameOffsetYInput);
-	}
-
-	@Deprecated
-	public PlaceTransitionObject(double positionXInput, double positionYInput) {
-		this(positionXInput, positionYInput, null, Pipe.DEFAULT_OFFSET_X, Pipe.DEFAULT_OFFSET_Y);
-	}
-
-
-
 	/**
 	 * Set name
 	 * 
@@ -147,12 +129,13 @@
 	/** Calculates the BoundsOffsets used for setBounds() method */
 	public void updateBounds() {
 		double scaleFactor = Zoomer.getScaleFactor(getZoom());
-		positionX = originalX * scaleFactor;
-		positionY = originalY * scaleFactor;
-		Rectangle bounds = new Rectangle();
-		bounds.setBounds((int) positionX, (int) positionY,
-				(int) (componentWidth * scaleFactor),
-				(int) (componentHeight * scaleFactor));
+		positionX = (int)Math.round(originalX * scaleFactor);
+		positionY = (int)Math.round(originalY * scaleFactor);
+
+		int width = (int) Math.round(componentWidth * scaleFactor);
+		int height = (int) Math.round(componentHeight * scaleFactor);
+
+		Rectangle bounds = new Rectangle(positionX, positionY, width, height);
 		bounds.grow(COMPONENT_DRAW_OFFSET, COMPONENT_DRAW_OFFSET);
 		setBounds(bounds);
 	}
@@ -196,9 +179,9 @@
 	}
 
 	/** Sets the center of the component to position x, y */
-	public void setCentre(double x, double y) {
-		setPositionX(x - (getWidth() / 2.0));
-		setPositionY(y - (getHeight() / 2.0));
+	public void setCentre(int x, int y) {
+		setPositionX((int) Math.round(x - (getWidth() / 2.0)));
+		setPositionY((int) Math.round(y - (getHeight() / 2.0)));
 		update(true);
 	}
 

=== modified file 'src/pipe/gui/graphicElements/Transition.java'
--- src/pipe/gui/graphicElements/Transition.java	2020-04-18 12:27:02 +0000
+++ src/pipe/gui/graphicElements/Transition.java	2020-05-12 11:42:36 +0000
@@ -51,11 +51,11 @@
 	/**
 	 * Create Petri-Net Transition object
 	 */
-	public Transition(double positionXInput, double positionYInput,
-			String idInput, double nameOffsetXInput,
-			double nameOffsetYInput,
+	public Transition(int positionXInput, int positionYInput,
+			String idInput, int nameOffsetXInput,
+			int nameOffsetYInput,
 			boolean infServer, int angleInput, int priority) {
-		this((int)positionXInput, (int)positionYInput, idInput, (int)nameOffsetXInput, (int)nameOffsetYInput, angleInput);
+		this(positionXInput, positionYInput, idInput, nameOffsetXInput, nameOffsetYInput, angleInput);
 	}
 
 	/**
@@ -86,8 +86,8 @@
 	 * @param positionYInput
 	 *            Y-axis Position
 	 */
-	public Transition(double positionXInput, double positionYInput) {
-		this((int)positionXInput, (int)positionYInput,null, 0,0, 0);
+	public Transition(int positionXInput, int positionYInput) {
+		this(positionXInput, positionYInput,null, 0,0, 0);
 	}
 
 	@Override

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java	2020-04-18 12:27:02 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java	2020-05-12 11:42:36 +0000
@@ -30,13 +30,7 @@
 		updateLabel(true);
 	}
 
-	/** @deprecated */
-	@Deprecated
-	public TimedInputArcComponent(TimedOutputArcComponent arc, String guard) {
-		this(arc);
-	}
-
-	@Override
+    @Override
 	protected void addMouseHandler() {
 		//XXX: kyrke 2018-09-06, this is bad as we leak "this", think its ok for now, as it alwas constructed when
 		//XXX: handler is called. Make static constructor and add handler from there, to make it safe.

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java	2020-04-18 12:27:02 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java	2020-05-12 11:42:36 +0000
@@ -29,16 +29,6 @@
 		super(sourceInput, targetInput, weightInput, idInput);
 	}
 
-	/** @deprecated */
-	@Deprecated
-	public TimedOutputArcComponent(double startPositionXInput,
-			double startPositionYInput, double endPositionXInput,
-			double endPositionYInput, PlaceTransitionObject sourceInput,
-			PlaceTransitionObject targetInput, int weightInput, String idInput,
-			boolean taggedInput) {
-		this(sourceInput, targetInput, weightInput, idInput);
-	}
-
 	/**
 	 * Create Petri-Net Arc object
 	 */
@@ -56,11 +46,12 @@
 		id = arc.id;
 		this.setSource(arc.getSource());
 		this.setTarget(arc.getTarget());
-		this.setNameOffsetX(arc.getNameOffsetXObject());
-		this.setNameOffsetY(arc.getNameOffsetYObject());
+		this.setNameOffsetX(arc.getNameOffsetX());
+		this.setNameOffsetY(arc.getNameOffsetY());
 		this.getNameLabel().setPosition(
 				Grid.getModifiedX((int) (arc.getNameLabel().getXPosition() + Zoomer.getZoomedValue(getNameOffsetX(), getZoom()))),
-				Grid.getModifiedY((int) (arc.getNameLabel().getYPosition() + Zoomer.getZoomedValue(getNameOffsetY(), getZoom()))));
+				Grid.getModifiedY((int) (arc.getNameLabel().getYPosition() + Zoomer.getZoomedValue(getNameOffsetY(), getZoom())))
+        );
 
 	}
 

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java	2020-04-18 12:27:02 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java	2020-05-12 11:42:36 +0000
@@ -51,7 +51,7 @@
 	private Window ageOfTokensWindow;
 	private Shape dashedOutline = createDashedOutline();
 
-	public TimedPlaceComponent(double positionXInput, double positionYInput, dk.aau.cs.model.tapn.TimedPlace place) {
+	public TimedPlaceComponent(int positionXInput, int positionYInput, dk.aau.cs.model.tapn.TimedPlace place) {
 		super(positionXInput, positionYInput);
 		this.place = place;
 		listener = timedPlaceListener();		
@@ -62,12 +62,15 @@
 
 	}
 
-	public TimedPlaceComponent(double positionXInput, double positionYInput,
-			String idInput, double nameOffsetXInput,
-			double nameOffsetYInput) {
+	public TimedPlaceComponent(
+	    int positionXInput,
+        int positionYInput,
+        String idInput,
+        int nameOffsetXInput,
+        int nameOffsetYInput
+    ) {
 
-		super(positionXInput, positionYInput, idInput,
-				nameOffsetXInput, nameOffsetYInput);
+		super(positionXInput, positionYInput, idInput, nameOffsetXInput, nameOffsetYInput);
 		listener = timedPlaceListener();
 		attributesVisible = true;
 		ageOfTokensWindow = new Window(new Frame());
@@ -427,7 +430,7 @@
 	}
 
 	public TimedPlaceComponent copy(TimedArcPetriNet tapn) {
-		TimedPlaceComponent placeComponent = new TimedPlaceComponent(getPositionXObject(), getPositionYObject(), id, getNameOffsetX(), getNameOffsetY());
+		TimedPlaceComponent placeComponent = new TimedPlaceComponent(getOriginalX(), getOriginalY(), id, getNameOffsetX(), getNameOffsetY());
 		placeComponent.setUnderlyingPlace(tapn.getPlaceByName(place.name()));
 
 		return placeComponent;

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedTransitionComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedTransitionComponent.java	2020-05-06 14:58:56 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedTransitionComponent.java	2020-05-12 11:42:36 +0000
@@ -36,7 +36,7 @@
 	private dk.aau.cs.model.tapn.event.TimedTransitionListener listener;
 	private GeneralPath dashedOutline;
 
-	public TimedTransitionComponent(double positionXInput, double positionYInput,
+	public TimedTransitionComponent(int positionXInput, int positionYInput,
 			dk.aau.cs.model.tapn.TimedTransition transition) {
 		super(positionXInput, positionYInput);
 		this.transition = transition;
@@ -46,9 +46,9 @@
 
 	}
 
-	public TimedTransitionComponent(double positionXInput,
-			double positionYInput, String idInput,
-			double nameOffsetXInput, double nameOffsetYInput,
+	public TimedTransitionComponent(int positionXInput,
+			int positionYInput, String idInput,
+			int nameOffsetXInput, int nameOffsetYInput,
 			boolean timedTransition, boolean infServer, int angleInput,
 			int priority) {
 		super(positionXInput, positionYInput, idInput,
@@ -202,7 +202,7 @@
 	}
 
 	public TimedTransitionComponent copy(TimedArcPetriNet tapn) {
-		TimedTransitionComponent transitionComponent = new TimedTransitionComponent(getPositionXObject(), getPositionYObject(), id, getNameOffsetX(), getNameOffsetY(), true, false, getAngle(), 0);
+		TimedTransitionComponent transitionComponent = new TimedTransitionComponent(getOriginalX(), getOriginalY(), id, getNameOffsetX(), getNameOffsetY(), true, false, getAngle(), 0);
 		transitionComponent.setUnderlyingTransition(tapn.getTransitionByName(transition.name()));
 
 		return transitionComponent;

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java	2020-04-18 13:18:51 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java	2020-05-12 11:42:36 +0000
@@ -34,7 +34,7 @@
 	}
 
 	public TimedTransportArcComponent(TimedInputArcComponent timedArc, int group, boolean isInPreSet) {
-		super(timedArc, "");
+		super(timedArc);
 		this.isInPreSet = isInPreSet;
 
 		this.setGroup(group);
@@ -80,7 +80,7 @@
 	@Override
 	public void updateLabel(boolean displayConstantNames) {
 		if (isInPreSet && underlyingTransportArc != null) {
-			if (CreateGui.getApp().showZeroToInfinityIntervals()){
+			if (CreateGui.getApp() != null && CreateGui.getApp().showZeroToInfinityIntervals()){
 				getNameLabel().setText(underlyingTransportArc.interval().toString(
 						displayConstantNames)
 						+ " : " + getGroup());

=== modified file 'src/pipe/gui/handler/LabelHandler.java'
--- src/pipe/gui/handler/LabelHandler.java	2020-04-02 09:44:05 +0000
+++ src/pipe/gui/handler/LabelHandler.java	2020-05-12 11:42:36 +0000
@@ -21,7 +21,7 @@
 	private NameLabel nl;
 
 	protected Point dragInit = new Point();
-	private double originalOffsetX, originalOffsetY;
+	private int originalOffsetX, originalOffsetY;
 
 	public LabelHandler(NameLabel _nl, PetriNetObjectWithLabel _obj) {
 		obj = _obj;
@@ -53,8 +53,8 @@
 		dragInit = e.getPoint(); //
 
 		dragInit = javax.swing.SwingUtilities.convertPoint(nl, dragInit, obj);
-		originalOffsetX = obj.getNameOffsetXObject();
-		originalOffsetY = obj.getNameOffsetYObject();
+		originalOffsetX = obj.getNameOffsetX();
+		originalOffsetY = obj.getNameOffsetY();
 	}
 
 	@Override
@@ -77,7 +77,7 @@
 		Point p = javax.swing.SwingUtilities.convertPoint(nl, e.getPoint(), obj);
 		
 		CreateGui.getCurrentTab().getUndoManager().addNewEdit(
-		    new UpdateNameLabelOffsetCommand(obj.getNameOffsetXObject(), obj.getNameOffsetYObject(), originalOffsetX, originalOffsetY, obj)
+		    new UpdateNameLabelOffsetCommand(obj.getNameOffsetX(), obj.getNameOffsetY(), originalOffsetX, originalOffsetY, obj)
         );
 		
 	}

=== modified file 'src/pipe/gui/handler/PlaceHandler.java'
--- src/pipe/gui/handler/PlaceHandler.java	2020-04-02 09:44:05 +0000
+++ src/pipe/gui/handler/PlaceHandler.java	2020-05-12 11:42:36 +0000
@@ -90,8 +90,8 @@
 				if (m != null) {
 
 					if (myObject instanceof PetriNetObjectWithLabel) {
-						int x = Zoomer.getZoomedValue(((PetriNetObjectWithLabel)myObject).getNameOffsetXObject().intValue(), myObject.getZoom());
-						int y = Zoomer.getZoomedValue(((PetriNetObjectWithLabel)myObject).getNameOffsetYObject().intValue(), myObject.getZoom());
+						int x = Zoomer.getZoomedValue(((PetriNetObjectWithLabel)myObject).getNameOffsetX(), myObject.getZoom());
+						int y = Zoomer.getZoomedValue(((PetriNetObjectWithLabel)myObject).getNameOffsetY(), myObject.getZoom());
 						m.show(myObject, x, y);
 					}
 				}

=== modified file 'src/pipe/gui/handler/TransitionHandler.java'
--- src/pipe/gui/handler/TransitionHandler.java	2020-04-18 13:49:06 +0000
+++ src/pipe/gui/handler/TransitionHandler.java	2020-05-12 11:42:36 +0000
@@ -82,11 +82,11 @@
 				JPopupMenu m = getPopup(e);
 				if (m != null) {
 					int x = Zoomer.getZoomedValue(
-					    ((Transition) myObject).getNameOffsetXObject().intValue(),
+					    ((Transition) myObject).getNameOffsetX(),
                         myObject.getZoom()
                     );
 					int y = Zoomer.getZoomedValue(
-					    ((Transition) myObject).getNameOffsetYObject().intValue(),
+					    ((Transition) myObject).getNameOffsetY(),
                         myObject.getZoom()
                     );
 					m.show(myObject, x, y);

=== added directory 'tests/dk'
=== added directory 'tests/dk/aau'
=== added directory 'tests/dk/aau/cs'
=== added directory 'tests/dk/aau/cs/io'
=== added file 'tests/dk/aau/cs/io/TapnXmlLoaderTest.kt'
--- tests/dk/aau/cs/io/TapnXmlLoaderTest.kt	1970-01-01 00:00:00 +0000
+++ tests/dk/aau/cs/io/TapnXmlLoaderTest.kt	2020-05-12 11:42:36 +0000
@@ -0,0 +1,313 @@
+package dk.aau.cs.io
+
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.function.ThrowingSupplier
+
+
+
+internal class TapnXmlLoaderTest {
+
+    internal class MalformedXML {
+        @Test @Disabled
+        fun `Malformed XML should throw an exception`() {
+            val tapnXmlLoader = TapnXmlLoader();
+            Assertions.assertThrows(Exception::class.java) {
+                tapnXmlLoader.load("hello".asInpurtStream())
+            }
+        }
+    }
+
+    class Place {
+
+        @Test
+        fun `Parse place`() {
+            val net = xmlNet(
+                """
+                    <place displayName="true" id="Start" initialMarking="1" invariant="&lt; inf" name="Start" nameOffsetX="-5" nameOffsetY="35" positionX="135" positionY="30"/>
+                """
+            ).asInpurtStream()
+            val tapnXmlLoader = TapnXmlLoader();
+
+            val r = Assertions.assertDoesNotThrow(ThrowingSupplier {
+                tapnXmlLoader.load(net)
+            })
+
+            Assertions.assertEquals(1, r.templates().first().guiModel().places.size)
+
+            val place = r.templates().first().guiModel().places[0]
+            Assertions.assertEquals("Start", place.name)
+            Assertions.assertEquals(135, place.positionX)
+            Assertions.assertEquals(30, place.positionY)
+
+            Assertions.assertEquals(-5, place.nameOffsetX)
+            Assertions.assertEquals(35, place.nameOffsetY)
+
+        }
+
+        @Test
+        //Older version of TAPAAL saved the positionX/Y and nameOffsetX/Y in double format eg. 35.0
+        fun `Place positions can be double formatted`(){
+
+            val net = xmlNet(
+                """
+                    <place displayName="true" id="Start" initialMarking="1" invariant="&lt; inf" name="Start" nameOffsetX="-5.0" nameOffsetY="35.0" positionX="135.0" positionY="30.0"/>
+                """
+            ).asInpurtStream()
+            val tapnXmlLoader = TapnXmlLoader();
+
+            val r = Assertions.assertDoesNotThrow(ThrowingSupplier {
+                tapnXmlLoader.load(net)
+            })
+
+            val place = r.templates().first().guiModel().places[0]
+
+            Assertions.assertEquals(135, place.positionX)
+            Assertions.assertEquals(30, place.positionY)
+
+            Assertions.assertEquals(-5, place.nameOffsetX)
+            Assertions.assertEquals(35, place.nameOffsetY)
+
+        }
+
+        @Test
+        fun `Empty place`() {
+            val net = xmlNet("<place></place>").asInpurtStream()
+            val tapnXmlLoader = TapnXmlLoader()
+
+            Assertions.assertThrows(Exception::class.java){
+                tapnXmlLoader.load(net)
+            }
+        }
+
+
+    }
+
+    class Transition {
+        @Test
+        fun `Parse Transition`() {
+            val net = xmlNet(
+                """
+                     <transition angle="90" displayName="true" id="T1" infiniteServer="false" name="T1" nameOffsetX="-5" nameOffsetY="35" positionX="360" positionY="300" priority="0" urgent="false"/>
+                """
+            ).asInpurtStream()
+            val tapnXmlLoader = TapnXmlLoader();
+
+            val r = Assertions.assertDoesNotThrow(ThrowingSupplier {
+                tapnXmlLoader.load(net)
+            })
+
+            Assertions.assertEquals(1, r.templates().first().guiModel().transitions.size)
+
+            val transition = r.templates().first().guiModel().transitions[0]
+            Assertions.assertEquals("T1", transition.name)
+            Assertions.assertEquals(360, transition.positionX)
+            Assertions.assertEquals(300, transition.positionY)
+
+            Assertions.assertEquals(-5, transition.nameOffsetX)
+            Assertions.assertEquals(35, transition.nameOffsetY)
+
+        }
+
+        @Test
+        //Older version of TAPAAL saved the positionX/Y and nameOffsetX/Y in double format eg. 35.0
+        fun `Transiton positions can be double formatted`(){
+            val net = xmlNet(
+                """
+                     <transition angle="90" displayName="true" id="T1" infiniteServer="false" name="T1" nameOffsetX="-5" nameOffsetY="35" positionX="360" positionY="300" priority="0" urgent="false"/>
+                """
+            ).asInpurtStream()
+            val tapnXmlLoader = TapnXmlLoader();
+
+            val r = Assertions.assertDoesNotThrow(ThrowingSupplier {
+                tapnXmlLoader.load(net)
+            })
+
+            val transition = r.templates().first().guiModel().transitions[0]
+            Assertions.assertEquals(360, transition.positionX)
+            Assertions.assertEquals(300, transition.positionY)
+
+            Assertions.assertEquals(-5, transition.nameOffsetX)
+            Assertions.assertEquals(35, transition.nameOffsetY)
+
+        }
+
+        @Test
+        fun `Empty Transition`() {
+            val net = xmlNet("<transition></transition>").asInpurtStream()
+            val tapnXmlLoader = TapnXmlLoader()
+
+            Assertions.assertThrows(Exception::class.java){
+                tapnXmlLoader.load(net)
+            }
+        }
+
+        @Test
+        fun `if urgent not defined, default value is false`() {
+            val net = xmlNet("""
+                     <transition angle="0" displayName="true" id="T1" infiniteServer="false" name="T1" nameOffsetX="-5" nameOffsetY="35" positionX="360" positionY="300" priority="0"/>
+                """).asInpurtStream()
+            val tapnXmlLoader = TapnXmlLoader()
+
+            val r = Assertions.assertDoesNotThrow(ThrowingSupplier {
+                tapnXmlLoader.load(net)
+            })
+
+            Assertions.assertFalse( r.network().allTemplates().first().getTransitionByName("T1").isUrgent )
+
+
+        }
+    }
+
+    class InputArc {
+        @Test
+        fun `Parse Input Arc`() {
+            val net = xmlNet(
+                """
+                        <place displayName="true" id="P0" initialMarking="0" invariant="&lt; inf" name="P0" nameOffsetX="0" nameOffsetY="0" positionX="60" positionY="60"/>
+                        <transition angle="0" displayName="true" id="T0" infiniteServer="false" name="T0" nameOffsetX="0" nameOffsetY="0" positionX="240" positionY="60" priority="0" urgent="false"/>
+                        <arc id="P0 to T0" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="P0" target="T0" type="timed" weight="1"></arc>
+                """
+            ).asInpurtStream()
+
+            val tapnXmlLoader = TapnXmlLoader()
+
+            val r = Assertions.assertDoesNotThrow(ThrowingSupplier {
+                tapnXmlLoader.load(net)
+            })
+        }
+    }
+
+    class OutputArc {
+        @Test
+        fun `Parse Output Arc`() {
+            val net = xmlNet(
+                """
+                        <place displayName="true" id="P0" initialMarking="0" invariant="&lt; inf" name="P0" nameOffsetX="0" nameOffsetY="0" positionX="60" positionY="60"/>
+                        <transition angle="0" displayName="true" id="T0" infiniteServer="false" name="T0" nameOffsetX="0" nameOffsetY="0" positionX="240" positionY="60" priority="0" urgent="false"/>
+                        <arc id="T0 to P0" inscription="1" nameOffsetX="0" nameOffsetY="0" source="T0" target="P0" type="normal" weight="1"></arc>
+                """
+            ).asInpurtStream()
+
+            val tapnXmlLoader = TapnXmlLoader()
+
+            val r = Assertions.assertDoesNotThrow(ThrowingSupplier {
+                tapnXmlLoader.load(net)
+            })
+        }
+    }
+
+    class InhibitorArc {
+        @Test
+        fun `Inhibitor Arc`() {
+            val net = xmlNet(
+                """
+                        <place displayName="true" id="P0" initialMarking="0" invariant="&lt; inf" name="P0" nameOffsetX="0" nameOffsetY="0" positionX="60" positionY="60"/>
+                        <transition angle="0" displayName="true" id="T0" infiniteServer="false" name="T0" nameOffsetX="0" nameOffsetY="0" positionX="240" positionY="60" priority="0" urgent="false"/>
+                        <arc id="P0 to T0" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="P0" target="T0" type="tapnInhibitor" weight="1"></arc>
+                """
+            ).asInpurtStream()
+
+            val tapnXmlLoader = TapnXmlLoader()
+
+            val r = Assertions.assertDoesNotThrow(ThrowingSupplier {
+                tapnXmlLoader.load(net)
+            })
+        }
+    }
+
+    class TransportArc {
+        @Test
+        fun `Transport Arc`() {
+            val net = xmlNet(
+                """
+                        <place displayName="true" id="P0" initialMarking="0" invariant="&lt; inf" name="P0" nameOffsetX="0" nameOffsetY="0" positionX="60" positionY="60"/>
+                        <place displayName="true" id="P1" initialMarking="0" invariant="&lt; inf" name="P1" nameOffsetX="0" nameOffsetY="0" positionX="60" positionY="60"/>
+                        <transition angle="0" displayName="true" id="T0" infiniteServer="false" name="T0" nameOffsetX="0" nameOffsetY="0" positionX="240" positionY="60" priority="0" urgent="false"/>
+                        <arc id="T0 to P1" inscription="[0,inf):1" nameOffsetX="0" nameOffsetY="0" source="T0" target="P1" type="transport" weight="1"></arc>
+                        <arc id="P0 to T0" inscription="[0,inf):1" nameOffsetX="0" nameOffsetY="0" source="P0" target="T0" type="transport" weight="1"></arc>
+                """
+            ).asInpurtStream()
+
+            val tapnXmlLoader = TapnXmlLoader()
+
+            val r = Assertions.assertDoesNotThrow(ThrowingSupplier {
+                tapnXmlLoader.load(net)
+            })
+        }
+
+        @Test @Disabled
+        fun `Transport missing parter, gives error`() {
+            val net = xmlNet(
+                """
+                        <place displayName="true" id="P0" initialMarking="0" invariant="&lt; inf" name="P0" nameOffsetX="0" nameOffsetY="0" positionX="60" positionY="60"/>
+                        <place displayName="true" id="P1" initialMarking="0" invariant="&lt; inf" name="P1" nameOffsetX="0" nameOffsetY="0" positionX="60" positionY="60"/>
+                        <transition angle="0" displayName="true" id="T0" infiniteServer="false" name="T0" nameOffsetX="0" nameOffsetY="0" positionX="240" positionY="60" priority="0" urgent="false"/>
+                        <arc id="P0 to T0" inscription="[0,inf):1" nameOffsetX="0" nameOffsetY="0" source="P0" target="T0" type="transport" weight="1"></arc>
+                """
+            ).asInpurtStream()
+
+            val tapnXmlLoader = TapnXmlLoader()
+
+            Assertions.assertThrows(java.lang.Exception::class.java) {
+                tapnXmlLoader.load(net)
+            }
+        }
+    }
+
+    class ArcPathPoints {
+        @Test
+        fun `Parse Arc without arcpathpoints`() {
+            val net = xmlNet(
+                """
+                        <place displayName="true" id="P0" initialMarking="0" invariant="&lt; inf" name="P0" nameOffsetX="0" nameOffsetY="0" positionX="60" positionY="60"/>
+                        <transition angle="0" displayName="true" id="T0" infiniteServer="false" name="T0" nameOffsetX="0" nameOffsetY="0" positionX="240" positionY="60" priority="0" urgent="false"/>
+                        <arc id="P0 to T0" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="P0" target="T0" type="timed" weight="1">
+                        </arc>
+                """
+            ).asInpurtStream()
+
+            val tapnXmlLoader = TapnXmlLoader()
+
+            val r = Assertions.assertDoesNotThrow(ThrowingSupplier {
+                tapnXmlLoader.load(net)
+            })
+        }
+
+        @Test @Disabled
+        fun `Parse Arc with only one arcpathpoint should fail`() {
+            val net = xmlNet(
+                """
+                        <place displayName="true" id="P0" initialMarking="0" invariant="&lt; inf" name="P0" nameOffsetX="0" nameOffsetY="0" positionX="60" positionY="60"/>
+                        <transition angle="0" displayName="true" id="T0" infiniteServer="false" name="T0" nameOffsetX="0" nameOffsetY="0" positionX="240" positionY="60" priority="0" urgent="false"/>
+                        <arc id="P0 to T0" inscription="[0,inf)" nameOffsetX="0" nameOffsetY="0" source="P0" target="T0" type="timed" weight="1">
+                            <arcpath arcPointType="false" id="0" xCoord="87" yCoord="72"/>
+                        </arc>
+                """
+            ).asInpurtStream()
+
+            val tapnXmlLoader = TapnXmlLoader()
+
+            Assertions.assertThrows(java.lang.Exception::class.java) {
+                tapnXmlLoader.load(net)
+            }
+        }
+    }
+}
+
+
+fun  String.asInpurtStream() : java.io.InputStream {
+    return java.io.StringBufferInputStream(this)
+}
+
+fun xmlNet(s:String) : String {
+    return """
+                <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+                <pnml xmlns="http://www.informatik.hu-berlin.de/top/pnml/ptNetb">
+                  <net active="true" id="IntroExample" type="P/T net">
+                    $s
+                  </net>
+                 </pnml>
+            """.trimIndent()
+}
\ No newline at end of file