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

[Kenneth Yrke Jørgensen]

Removed unused fields from XML/TAPN file format

Must test loading and saving of nets

[Jiri Srba (srba)]

Has conflicts with trunk that need to be resolved.

review: Needs Fixing

[lp:~yrke/tapaal/removedUnusedFieldsFromXML]

1032. By Kenneth Yrke Jørgensen on 2019-03-13

Merged with trunk

[Kenneth Yrke Jørgensen (yrke)]

Fixed merge conflicts with trunk

[Kenneth Yrke Jørgensen (yrke)]

review: Needs Resubmitting

[Jiri Srba (srba)]

Couldn't see any issues with loading/saving nets.

review: Approve

=== modified file 'src/dk/aau/cs/io/PNMLWriter.java'
--- src/dk/aau/cs/io/PNMLWriter.java	2018-05-13 19:54:55 +0000
+++ src/dk/aau/cs/io/PNMLWriter.java	2019-03-13 07:18:09 +0000
@@ -179,10 +179,6 @@
 		placeElement.appendChild(name);
 		Element initialMarkingGraphics = document.createElement("graphics");
 		initialMarking.appendChild(initialMarkingGraphics);
-		Element initialMarkingOffset = document.createElement("offset");
-		initialMarkingGraphics.appendChild(initialMarkingOffset);
-		initialMarkingOffset.setAttribute("x", (inputPlace.getMarkingOffsetXObject() != null ? String.valueOf(Math.round(inputPlace.getMarkingOffsetXObject())) : ""));
-		initialMarkingOffset.setAttribute("y", (inputPlace.getMarkingOffsetYObject() != null ? String.valueOf(Math.round(inputPlace.getMarkingOffsetYObject())) : ""));
 		Element initialMarkingText = document.createElement("text");
 		initialMarking.appendChild(initialMarkingText);
 		initialMarkingText.setTextContent(((Integer) inputPlace.getNumberOfTokens() != null ? String.valueOf((Integer) inputPlace.getNumberOfTokens()) : "0"));
 
=== modified file 'src/dk/aau/cs/io/PNMLoader.java'
--- src/dk/aau/cs/io/PNMLoader.java	2019-03-10 19:47:44 +0000
+++ src/dk/aau/cs/io/PNMLoader.java	2019-03-13 07:18:09 +0000
@@ -197,8 +197,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(),
-				marking.point.x, marking.point.y);
+			TimedPlaceComponent placeComponent = new TimedPlaceComponent(position.getX(), position.getY(), id, name.point.getX(), name.point.getY());
 			placeComponent.setUnderlyingPlace(place);
 			template.guiModel().addPetriNetObject(placeComponent);
 		}
 
=== modified file 'src/dk/aau/cs/io/TapnLegacyXmlLoader.java'
--- src/dk/aau/cs/io/TapnLegacyXmlLoader.java	2018-10-18 15:38:54 +0000
+++ src/dk/aau/cs/io/TapnLegacyXmlLoader.java	2019-03-13 07:18:09 +0000
@@ -568,9 +568,6 @@
 		double nameOffsetXInput = getNameOffsetAttribute(element, "x");
 		double nameOffsetYInput = getNameOffsetAttribute(element, "y");
 		int initialMarkingInput = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element, "initialMarking");
-		double markingOffsetXInput = getMarkingOffsetAttribute(element, "x");
-		double markingOffsetYInput = getMarkingOffsetAttribute(element, "y");
-		int capacityInput = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element,	"capacity");
 		String invariant = getChildNodesContentOfValueChildNodeAsString(element, "invariant");
 
 		positionXInput = Grid.getModifiedX(positionXInput);
@@ -602,9 +599,7 @@
 //
 //		} else {
 			place = new TimedPlaceComponent(positionXInput, positionYInput,
-					idInput, nameOffsetXInput, nameOffsetYInput,
-					markingOffsetXInput,
-					markingOffsetYInput);
+					idInput, nameOffsetXInput, nameOffsetYInput);
 
 			LocalTimedPlace p = new LocalTimedPlace(nameInput, TimeInvariant.parse(invariant, constants));
 			tapn.add(p);
 
=== modified file 'src/dk/aau/cs/io/TapnXmlLoader.java'
--- src/dk/aau/cs/io/TapnXmlLoader.java	2018-10-18 15:38:54 +0000
+++ src/dk/aau/cs/io/TapnXmlLoader.java	2019-03-13 07:18:09 +0000
@@ -408,8 +408,6 @@
 		double nameOffsetXInput = Double.parseDouble(place.getAttribute("nameOffsetX"));
 		double nameOffsetYInput = Double.parseDouble(place.getAttribute("nameOffsetY"));
 		int initialMarkingInput = Integer.parseInt(place.getAttribute("initialMarking"));
-		double markingOffsetXInput = Double.parseDouble(place.getAttribute("markingOffsetX"));
-		double markingOffsetYInput = Double.parseDouble(place.getAttribute("markingOffsetY"));
 		String invariant = place.getAttribute("invariant");
 		boolean displayName = place.getAttribute("displayName").equals("false") ? false : true;
 		
@@ -446,7 +444,7 @@
 			}
 		}
 		nameGenerator.updateIndicesForAllModels(nameInput);
-		TimedPlaceComponent placeComponent = new TimedPlaceComponent(positionXInput, positionYInput, idInput, nameOffsetXInput, nameOffsetYInput, markingOffsetXInput, markingOffsetYInput);
+		TimedPlaceComponent placeComponent = new TimedPlaceComponent(positionXInput, positionYInput, idInput, nameOffsetXInput, nameOffsetYInput);
 		placeComponent.setUnderlyingPlace(p);
 		
 		if (!displayName){
 
=== modified file 'src/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java'
--- src/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java	2018-08-05 22:13:16 +0000
+++ src/dk/aau/cs/io/TimedArcPetriNetNetworkWriter.java	2019-03-13 07:18:09 +0000
@@ -384,9 +384,7 @@
 		placeElement.setAttribute("nameOffsetX", (inputPlace.getNameOffsetXObject() != null ? String.valueOf(inputPlace.getNameOffsetXObject()) : ""));
 		placeElement.setAttribute("nameOffsetY", (inputPlace.getNameOffsetYObject() != null ? String.valueOf(inputPlace.getNameOffsetYObject()) : ""));
 		placeElement.setAttribute("initialMarking", ((Integer) inputPlace.getNumberOfTokens() != null ? String.valueOf((Integer) inputPlace.getNumberOfTokens()) : "0"));
-		placeElement.setAttribute("markingOffsetX",	(inputPlace.getMarkingOffsetXObject() != null ? String.valueOf(inputPlace.getMarkingOffsetXObject()) : ""));
-		placeElement.setAttribute("markingOffsetY",	(inputPlace.getMarkingOffsetYObject() != null ? String.valueOf(inputPlace.getMarkingOffsetYObject()) : ""));
-		placeElement.setAttribute("invariant", inputPlace.underlyingPlace().invariant().toString());	
+		placeElement.setAttribute("invariant", inputPlace.underlyingPlace().invariant().toString());
 
 		return placeElement;
 	}
 
=== modified file 'src/dk/aau/cs/verification/TAPNComposer.java'
--- src/dk/aau/cs/verification/TAPNComposer.java	2018-10-18 15:02:41 +0000
+++ src/dk/aau/cs/verification/TAPNComposer.java	2019-03-13 07:18:09 +0000
@@ -186,9 +186,7 @@
 						oldPlace.getPositionY(),
 						oldPlace.getId(),
 						oldPlace.getNameOffsetX(),
-						oldPlace.getNameOffsetY(),
-						oldPlace.getMarkingOffsetXObject().doubleValue(),
-						oldPlace.getMarkingOffsetYObject().doubleValue()
+						oldPlace.getNameOffsetY()
 						);
 					newPlace.setUnderlyingPlace(constructedPlace);
 					newPlace.setName(uniquePlaceName);
@@ -235,10 +233,10 @@
 								oldPlace.getPositionY() + offset.value2() * greatestHeight,
 								oldPlace.getId(),
 								oldPlace.getNameOffsetX(),
-								oldPlace.getNameOffsetY(),
-								oldPlace.getMarkingOffsetXObject().doubleValue(),
-								oldPlace.getMarkingOffsetYObject().doubleValue()
-								);
+								oldPlace.getNameOffsetY()
+						);
+						newPlace.setGuiModel(guiModel);
+
 						newPlace.setUnderlyingPlace(place);
 						newPlace.setName(uniquePlaceName);
 						guiModel.addPetriNetObject(newPlace);
 
=== modified file 'src/pipe/gui/graphicElements/Place.java'
--- src/pipe/gui/graphicElements/Place.java	2018-10-21 18:14:13 +0000
+++ src/pipe/gui/graphicElements/Place.java	2019-03-13 07:18:09 +0000
@@ -19,11 +19,9 @@
 
 	private static final long serialVersionUID = -5155964364065651381L;
 
-	// Initial Marking X-axis Offset 
-	protected Double markingOffsetX = 0d;
 
-	// Initial Marking Y-axis Offset 
-	protected Double markingOffsetY = 0d;
+	// Value of the capacity restriction; 0 means no capacity restriction 
+	protected Integer capacity = 0;
 
 	protected static final int DIAMETER = Pipe.PLACE_TRANSITION_HEIGHT;
 
@@ -44,12 +42,8 @@
 	protected static Shape proximityPlace = (new BasicStroke(Pipe.PLACE_TRANSITION_PROXIMITY_RADIUS)).createStrokedShape(placeEllipse);
 
 	public Place(double positionXInput, double positionYInput, String idInput,
-			Double nameOffsetXInput, Double nameOffsetYInput,
-			double markingOffsetXInput,
-			double markingOffsetYInput) {
+			Double nameOffsetXInput, Double nameOffsetYInput) {
 		super(positionXInput, positionYInput, idInput,	nameOffsetXInput, nameOffsetYInput);
-		markingOffsetX = new Double(markingOffsetXInput);
-		markingOffsetY = new Double(markingOffsetYInput);
 		componentWidth = DIAMETER;
 		componentHeight = DIAMETER;
 		setCentre((int) positionX, (int) positionY);
@@ -92,24 +86,6 @@
 	}
 
 	/**
-	 * Get X-axis offset for initial marking
-	 * 
-	 * @return Double value for X-axis offset of initial marking
-	 */
-	public Double getMarkingOffsetXObject() {
-		return markingOffsetX;
-	}
-
-	/**
-	 * Get Y-axis offset for initial marking
-	 * 
-	 * @return Double value for X-axis offset of initial marking
-	 */
-	public Double getMarkingOffsetYObject() {
-		return markingOffsetY;
-	}
-
-	/**
 	 * Returns the diameter of this Place at the current zoom
 	 */
 	private int getDiameter() {
 
=== modified file 'src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java	2018-10-18 15:08:44 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java	2019-03-13 07:18:09 +0000
@@ -66,12 +66,10 @@
 
 	public TimedPlaceComponent(double positionXInput, double positionYInput,
 			String idInput, Double nameOffsetXInput,
-			Double nameOffsetYInput,
-			double markingOffsetXInput, double markingOffsetYInput) {
+			Double nameOffsetYInput) {
 
 		super(positionXInput, positionYInput, idInput,
-				nameOffsetXInput, nameOffsetYInput,
-				markingOffsetXInput, markingOffsetYInput);
+				nameOffsetXInput, nameOffsetYInput);
 		listener = timedPlaceListener();
 		attributesVisible = true;
 		ageOfTokensWindow = new Window(new Frame());
@@ -432,7 +430,7 @@
 	}
 
 	public TimedPlaceComponent copy(TimedArcPetriNet tapn) {
-		TimedPlaceComponent placeComponent = new TimedPlaceComponent(getPositionXObject(), getPositionYObject(), id, nameOffsetX, nameOffsetY, markingOffsetX, markingOffsetY);
+		TimedPlaceComponent placeComponent = new TimedPlaceComponent(getPositionXObject(), getPositionYObject(), id, nameOffsetX, nameOffsetY);
 		placeComponent.setUnderlyingPlace(tapn.getPlaceByName(place.name()));
 
 		return placeComponent;