Merge lp:~yrke/tapaal/placetransitionobjecthandler-refactor into lp:tapaal

[Kenneth Yrke Jørgensen]

Cleanup of the placetranistions object and handling of Mouse Events

Test needed: general drawing of elements and arc
Special attention to creating of transport arcs, and error handeling of this.

[Kenneth Yrke Jørgensen (yrke)]

Branch is now ready to be merged.

=== modified file 'src/dk/aau/cs/io/PNMLoader.java'
--- src/dk/aau/cs/io/PNMLoader.java	2018-10-09 12:50:41 +0000
+++ src/dk/aau/cs/io/PNMLoader.java	2018-10-18 13:14:57 +0000
@@ -44,29 +44,14 @@
 import pipe.gui.DrawingSurfaceImpl;
 import pipe.gui.Pipe;
 import pipe.gui.Zoomer;
-import pipe.gui.graphicElements.ArcPathPoint;
-import pipe.gui.graphicElements.AnnotationNote;
 import pipe.gui.graphicElements.Arc;
-import pipe.gui.graphicElements.Note;
 import pipe.gui.graphicElements.PetriNetObject;
-import pipe.gui.graphicElements.Place;
 import pipe.gui.graphicElements.PlaceTransitionObject;
-import pipe.gui.graphicElements.Transition;
 import pipe.gui.graphicElements.tapn.TimedInhibitorArcComponent;
 import pipe.gui.graphicElements.tapn.TimedInputArcComponent;
 import pipe.gui.graphicElements.tapn.TimedOutputArcComponent;
 import pipe.gui.graphicElements.tapn.TimedPlaceComponent;
 import pipe.gui.graphicElements.tapn.TimedTransitionComponent;
-import pipe.gui.graphicElements.tapn.TimedTransportArcComponent;
-import pipe.gui.handler.AnimationHandler;
-import pipe.gui.handler.AnnotationNoteHandler;
-import pipe.gui.handler.ArcHandler;
-import pipe.gui.handler.LabelHandler;
-import pipe.gui.handler.PlaceHandler;
-import pipe.gui.handler.TAPNTransitionHandler;
-import pipe.gui.handler.TimedArcHandler;
-import pipe.gui.handler.TransitionHandler;
-import pipe.gui.handler.TransportArcHandler;
 
 public class PNMLoader {
 	
@@ -214,8 +199,8 @@
 		
 		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, id, name.point.getX(), name.point.getY(),
-				marking.marking, marking.point.x, marking.point.y, 0);
+			TimedPlaceComponent placeComponent = new TimedPlaceComponent(position.getX(), position.getY(), id, name.point.getX(), name.point.getY(),
+				marking.point.x, marking.point.y);
 			placeComponent.setUnderlyingPlace(place);
 			template.guiModel().addPetriNetObject(placeComponent);
 			addListeners(placeComponent, template);
@@ -260,7 +245,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, id, name.point.getX(), name.point.getY(), 
+				new TimedTransitionComponent(position.getX(), position.getY(), id, name.point.getX(), name.point.getY(),
 						true, false, 0, 0);
 			transitionComponent.setUnderlyingTransition(transition);
 			template.guiModel().addPetriNetObject(transitionComponent);
@@ -533,90 +518,6 @@
 	}
 	
 	private void addListeners(PetriNetObject newObject, Template template) {
-		if (newObject != null) {
-			if (newObject.getMouseListeners().length == 0) {
-				if (newObject instanceof Place) {
-					// XXX - kyrke
-					if (newObject instanceof TimedPlaceComponent) {
-
-						LabelHandler labelHandler = new LabelHandler(((Place) newObject).getNameLabel(), (Place) newObject);
-						((Place) newObject).getNameLabel().addMouseListener(labelHandler);
-						((Place) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-						((Place) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-
-						PlaceHandler placeHandler = new PlaceHandler(drawingSurface, (Place) newObject, template.guiModel(), template.model());
-						newObject.addMouseListener(placeHandler);
-						newObject.addMouseWheelListener(placeHandler);
-						newObject.addMouseMotionListener(placeHandler);
-					} else {
-
-						LabelHandler labelHandler = new LabelHandler(((Place) newObject).getNameLabel(), (Place) newObject);
-						((Place) newObject).getNameLabel().addMouseListener(labelHandler);
-						((Place) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-						//((Place) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-
-						PlaceHandler placeHandler = new PlaceHandler(drawingSurface, (Place) newObject);
-						newObject.addMouseListener(placeHandler);
-						//newObject.addMouseWheelListener(placeHandler);
-						newObject.addMouseMotionListener(placeHandler);
-
-					}
-				} else if (newObject instanceof Transition) {
-					TransitionHandler transitionHandler;
-					if (newObject instanceof TimedTransitionComponent) {
-						transitionHandler = new TAPNTransitionHandler(drawingSurface, (Transition) newObject, template.guiModel(), template.model());
-					} else {
-						transitionHandler = new TransitionHandler(drawingSurface, (Transition) newObject);
-					}
-
-					LabelHandler labelHandler = new LabelHandler(((Transition) newObject).getNameLabel(), (Transition) newObject);
-					((Transition) newObject).getNameLabel().addMouseListener(labelHandler);
-					((Transition) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-					((Transition) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-
-					newObject.addMouseListener(transitionHandler);
-					newObject.addMouseMotionListener(transitionHandler);
-					newObject.addMouseWheelListener(transitionHandler);
-
-					newObject.addMouseListener(new AnimationHandler());
-
-				} else if (newObject instanceof Arc) {
-					LabelHandler labelHandler = new LabelHandler(((Arc) newObject).getNameLabel(), (Arc) newObject);
-					((Arc) newObject).getNameLabel().addMouseListener(labelHandler);
-					((Arc) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-					((Arc) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-					/* CB - Joakim Byg add timed arcs */
-					if (newObject instanceof TimedInputArcComponent) {
-						if (newObject instanceof TimedTransportArcComponent) {
-							TransportArcHandler transportArcHandler = new TransportArcHandler(drawingSurface, (Arc) newObject);
-							newObject.addMouseListener(transportArcHandler);
-							//newObject.addMouseWheelListener(transportArcHandler);
-							newObject.addMouseMotionListener(transportArcHandler);
-						} else {
-							TimedArcHandler timedArcHandler = new TimedArcHandler(drawingSurface, (Arc) newObject);
-							newObject.addMouseListener(timedArcHandler);
-							//newObject.addMouseWheelListener(timedArcHandler);
-							newObject.addMouseMotionListener(timedArcHandler);
-						}
-					} else {
-						/* EOC */
-						ArcHandler arcHandler = new ArcHandler(drawingSurface,(Arc) newObject);
-						newObject.addMouseListener(arcHandler);
-						//newObject.addMouseWheelListener(arcHandler);
-						newObject.addMouseMotionListener(arcHandler);
-					}
-				} else if (newObject instanceof AnnotationNote) {
-					AnnotationNoteHandler noteHandler = new AnnotationNoteHandler(drawingSurface, (AnnotationNote) newObject);
-					newObject.addMouseListener(noteHandler);
-					newObject.addMouseMotionListener(noteHandler);
-					((Note) newObject).getNote().addMouseListener(noteHandler);
-					((Note) newObject).getNote().addMouseMotionListener(noteHandler);
-				}
-				
-				newObject.zoomUpdate(drawingSurface.getZoom());
-				
-			}
-			newObject.setGuiModel(template.guiModel());
-		}
+		drawingSurface.addPNListeners(newObject, drawingSurface, template.guiModel());
 	}
 }

=== modified file 'src/dk/aau/cs/io/TapnLegacyXmlLoader.java'
--- src/dk/aau/cs/io/TapnLegacyXmlLoader.java	2018-08-05 22:13:16 +0000
+++ src/dk/aau/cs/io/TapnLegacyXmlLoader.java	2018-10-18 13:14:57 +0000
@@ -6,9 +6,7 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 
 import javax.swing.JOptionPane;
 import javax.xml.parsers.DocumentBuilder;
@@ -35,26 +33,15 @@
 import pipe.gui.Zoomer;
 import pipe.gui.graphicElements.AnnotationNote;
 import pipe.gui.graphicElements.Arc;
-import pipe.gui.graphicElements.Note;
 import pipe.gui.graphicElements.PetriNetObject;
 import pipe.gui.graphicElements.Place;
 import pipe.gui.graphicElements.PlaceTransitionObject;
-import pipe.gui.graphicElements.Transition;
 import pipe.gui.graphicElements.tapn.TimedInhibitorArcComponent;
 import pipe.gui.graphicElements.tapn.TimedInputArcComponent;
 import pipe.gui.graphicElements.tapn.TimedOutputArcComponent;
 import pipe.gui.graphicElements.tapn.TimedPlaceComponent;
 import pipe.gui.graphicElements.tapn.TimedTransitionComponent;
 import pipe.gui.graphicElements.tapn.TimedTransportArcComponent;
-import pipe.gui.handler.AnimationHandler;
-import pipe.gui.handler.AnnotationNoteHandler;
-import pipe.gui.handler.ArcHandler;
-import pipe.gui.handler.LabelHandler;
-import pipe.gui.handler.PlaceHandler;
-import pipe.gui.handler.TAPNTransitionHandler;
-import pipe.gui.handler.TimedArcHandler;
-import pipe.gui.handler.TransitionHandler;
-import pipe.gui.handler.TransportArcHandler;
 import pipe.gui.widgets.InclusionPlaces;
 import dk.aau.cs.TCTL.TCTLAbstractProperty;
 import dk.aau.cs.TCTL.Parsing.TAPAALQueryParser;
@@ -575,7 +562,7 @@
 		TimedTransition t = new TimedTransition(nameInput);
 
 		TimedTransitionComponent transition = new TimedTransitionComponent(
-				positionXInput, positionYInput, idInput, nameInput,
+				positionXInput, positionYInput, idInput,
 				nameOffsetXInput, nameOffsetYInput, timedTransition,
 				infiniteServer, angle, priority);
 		transition.setUnderlyingTransition(t);
@@ -618,17 +605,17 @@
 
 		Place place = null;
 
-		if (invariant == null || invariant.equals("")) {
-			place = new Place(positionXInput, positionYInput, idInput,
-					nameInput, nameOffsetXInput, nameOffsetYInput,
-					initialMarkingInput, markingOffsetXInput,
-					markingOffsetYInput, capacityInput);
-
-		} else {
+//		if (invariant == null || invariant.equals("")) {
+//			place = new Place(positionXInput, positionYInput, idInput,
+//					nameInput, nameOffsetXInput, nameOffsetYInput,
+//					initialMarkingInput, markingOffsetXInput,
+//					markingOffsetYInput, capacityInput);
+//
+//		} else {
 			place = new TimedPlaceComponent(positionXInput, positionYInput,
-					idInput, nameInput, nameOffsetXInput, nameOffsetYInput,
-					initialMarkingInput, markingOffsetXInput,
-					markingOffsetYInput, capacityInput);
+					idInput, nameOffsetXInput, nameOffsetYInput,
+					markingOffsetXInput,
+					markingOffsetYInput);
 
 			LocalTimedPlace p = new LocalTimedPlace(nameInput, TimeInvariant.parse(invariant, constants));
 			tapn.add(p);
@@ -641,7 +628,7 @@
 				marking.add(new TimedToken(p, new BigDecimal(0.0)));
 			}
 		}
-	}
+//	}
 
 	private void parseAndAddArcAsOldFormat(Element inputArcElement) throws FormatException {
 		String idInput = inputArcElement.getAttribute("id");
@@ -895,90 +882,6 @@
 	}
 
 	private void addListeners(PetriNetObject newObject) {
-		if (newObject != null) {
-			if (newObject.getMouseListeners().length == 0) {
-				if (newObject instanceof Place) {
-					// XXX - kyrke
-					if (newObject instanceof TimedPlaceComponent) {
-
-						LabelHandler labelHandler = new LabelHandler(((Place) newObject).getNameLabel(), (Place) newObject);
-						((Place) newObject).getNameLabel().addMouseListener(labelHandler);
-						((Place) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-						((Place) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-
-						PlaceHandler placeHandler = new PlaceHandler(drawingSurface, (Place) newObject, guiModel, tapn);
-						newObject.addMouseListener(placeHandler);
-						newObject.addMouseWheelListener(placeHandler);
-						newObject.addMouseMotionListener(placeHandler);
-					} else {
-
-						LabelHandler labelHandler = new LabelHandler(((Place) newObject).getNameLabel(), (Place) newObject);
-						((Place) newObject).getNameLabel().addMouseListener(labelHandler);
-						((Place) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-						//((Place) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-
-						PlaceHandler placeHandler = new PlaceHandler(drawingSurface, (Place) newObject);
-						newObject.addMouseListener(placeHandler);
-						//newObject.addMouseWheelListener(placeHandler);
-						newObject.addMouseMotionListener(placeHandler);
-
-					}
-				} else if (newObject instanceof Transition) {
-					TransitionHandler transitionHandler;
-					if (newObject instanceof TimedTransitionComponent) {
-						transitionHandler = new TAPNTransitionHandler(drawingSurface, (Transition) newObject, guiModel, tapn);
-					} else {
-						transitionHandler = new TransitionHandler(drawingSurface, (Transition) newObject);
-					}
-
-					LabelHandler labelHandler = new LabelHandler(((Transition) newObject).getNameLabel(), (Transition) newObject);
-					((Transition) newObject).getNameLabel().addMouseListener(labelHandler);
-					((Transition) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-					((Transition) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-
-					newObject.addMouseListener(transitionHandler);
-					newObject.addMouseMotionListener(transitionHandler);
-					newObject.addMouseWheelListener(transitionHandler);
-
-					newObject.addMouseListener(new AnimationHandler());
-
-				} else if (newObject instanceof Arc) {
-					LabelHandler labelHandler = new LabelHandler(((Arc) newObject).getNameLabel(), (Arc) newObject);
-					((Arc) newObject).getNameLabel().addMouseListener(labelHandler);
-					((Arc) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-					((Arc) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-					/* CB - Joakim Byg add timed arcs */
-					if (newObject instanceof TimedInputArcComponent) {
-						if (newObject instanceof TimedTransportArcComponent) {
-							TransportArcHandler transportArcHandler = new TransportArcHandler(drawingSurface, (Arc) newObject);
-							newObject.addMouseListener(transportArcHandler);
-							//newObject.addMouseWheelListener(transportArcHandler);
-							newObject.addMouseMotionListener(transportArcHandler);
-						} else {
-							TimedArcHandler timedArcHandler = new TimedArcHandler(drawingSurface, (Arc) newObject);
-							newObject.addMouseListener(timedArcHandler);
-							//newObject.addMouseWheelListener(timedArcHandler);
-							newObject.addMouseMotionListener(timedArcHandler);
-						}
-					} else {
-						/* EOC */
-						ArcHandler arcHandler = new ArcHandler(drawingSurface,(Arc) newObject);
-						newObject.addMouseListener(arcHandler);
-						//newObject.addMouseWheelListener(arcHandler);
-						newObject.addMouseMotionListener(arcHandler);
-					}
-				} else if (newObject instanceof AnnotationNote) {
-					AnnotationNoteHandler noteHandler = new AnnotationNoteHandler(drawingSurface, (AnnotationNote) newObject);
-					newObject.addMouseListener(noteHandler);
-					newObject.addMouseMotionListener(noteHandler);
-					((Note) newObject).getNote().addMouseListener(noteHandler);
-					((Note) newObject).getNote().addMouseMotionListener(noteHandler);
-				}
-				
-				newObject.zoomUpdate(drawingSurface.getZoom());
-				
-			}
-			newObject.setGuiModel(guiModel);
-		}
+		drawingSurface.addPNListeners(newObject, drawingSurface, guiModel);
 	}
 }

=== modified file 'src/dk/aau/cs/io/TapnXmlLoader.java'
--- src/dk/aau/cs/io/TapnXmlLoader.java	2018-08-05 22:13:16 +0000
+++ src/dk/aau/cs/io/TapnXmlLoader.java	2018-10-18 13:14:57 +0000
@@ -29,26 +29,15 @@
 import pipe.gui.Zoomer;
 import pipe.gui.graphicElements.AnnotationNote;
 import pipe.gui.graphicElements.Arc;
-import pipe.gui.graphicElements.Note;
 import pipe.gui.graphicElements.PetriNetObject;
 import pipe.gui.graphicElements.Place;
 import pipe.gui.graphicElements.PlaceTransitionObject;
-import pipe.gui.graphicElements.Transition;
 import pipe.gui.graphicElements.tapn.TimedInhibitorArcComponent;
 import pipe.gui.graphicElements.tapn.TimedInputArcComponent;
 import pipe.gui.graphicElements.tapn.TimedOutputArcComponent;
 import pipe.gui.graphicElements.tapn.TimedPlaceComponent;
 import pipe.gui.graphicElements.tapn.TimedTransitionComponent;
 import pipe.gui.graphicElements.tapn.TimedTransportArcComponent;
-import pipe.gui.handler.AnimationHandler;
-import pipe.gui.handler.AnnotationNoteHandler;
-import pipe.gui.handler.ArcHandler;
-import pipe.gui.handler.LabelHandler;
-import pipe.gui.handler.PlaceHandler;
-import pipe.gui.handler.TAPNTransitionHandler;
-import pipe.gui.handler.TimedArcHandler;
-import pipe.gui.handler.TransitionHandler;
-import pipe.gui.handler.TransportArcHandler;
 import dk.aau.cs.gui.NameGenerator;
 import dk.aau.cs.io.queries.TAPNQueryLoader;
 import dk.aau.cs.model.tapn.Constant;
@@ -405,7 +394,7 @@
 		}
 		nameGenerator.updateIndicesForAllModels(nameInput);
 		TimedTransitionComponent transitionComponent = new TimedTransitionComponent(
-				positionXInput, positionYInput, idInput, nameInput,
+				positionXInput, positionYInput, idInput,
 				nameOffsetXInput, nameOffsetYInput, true,
 				infiniteServer, angle, priority);
 		transitionComponent.setUnderlyingTransition(t);
@@ -462,7 +451,7 @@
 			}
 		}
 		nameGenerator.updateIndicesForAllModels(nameInput);
-		TimedPlaceComponent placeComponent = new TimedPlaceComponent(positionXInput, positionYInput, idInput, nameInput, nameOffsetXInput, nameOffsetYInput, initialMarkingInput, markingOffsetXInput, markingOffsetYInput, 0);
+		TimedPlaceComponent placeComponent = new TimedPlaceComponent(positionXInput, positionYInput, idInput, nameOffsetXInput, nameOffsetYInput, markingOffsetXInput, markingOffsetYInput);
 		placeComponent.setUnderlyingPlace(p);
 		
 		if (!displayName){
@@ -743,90 +732,6 @@
 	}
 
 	private void addListeners(PetriNetObject newObject, Template template) {
-		if (newObject != null) {
-			if (newObject.getMouseListeners().length == 0) {
-				if (newObject instanceof Place) {
-					// XXX - kyrke
-					if (newObject instanceof TimedPlaceComponent) {
-
-						LabelHandler labelHandler = new LabelHandler(((Place) newObject).getNameLabel(), (Place) newObject);
-						((Place) newObject).getNameLabel().addMouseListener(labelHandler);
-						((Place) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-						((Place) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-
-						PlaceHandler placeHandler = new PlaceHandler(drawingSurface, (Place) newObject, template.guiModel(), template.model());
-						newObject.addMouseListener(placeHandler);
-						newObject.addMouseWheelListener(placeHandler);
-						newObject.addMouseMotionListener(placeHandler);
-					} else {
-
-						LabelHandler labelHandler = new LabelHandler(((Place) newObject).getNameLabel(), (Place) newObject);
-						((Place) newObject).getNameLabel().addMouseListener(labelHandler);
-						((Place) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-						//((Place) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-
-						PlaceHandler placeHandler = new PlaceHandler(drawingSurface, (Place) newObject);
-						newObject.addMouseListener(placeHandler);
-						//newObject.addMouseWheelListener(placeHandler);
-						newObject.addMouseMotionListener(placeHandler);
-
-					}
-				} else if (newObject instanceof Transition) {
-					TransitionHandler transitionHandler;
-					if (newObject instanceof TimedTransitionComponent) {
-						transitionHandler = new TAPNTransitionHandler(drawingSurface, (Transition) newObject, template.guiModel(), template.model());
-					} else {
-						transitionHandler = new TransitionHandler(drawingSurface, (Transition) newObject);
-					}
-
-					LabelHandler labelHandler = new LabelHandler(((Transition) newObject).getNameLabel(), (Transition) newObject);
-					((Transition) newObject).getNameLabel().addMouseListener(labelHandler);
-					((Transition) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-					((Transition) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-
-					newObject.addMouseListener(transitionHandler);
-					newObject.addMouseMotionListener(transitionHandler);
-					newObject.addMouseWheelListener(transitionHandler);
-
-					newObject.addMouseListener(new AnimationHandler());
-
-				} else if (newObject instanceof Arc) {
-					LabelHandler labelHandler = new LabelHandler(((Arc) newObject).getNameLabel(), (Arc) newObject);
-					((Arc) newObject).getNameLabel().addMouseListener(labelHandler);
-					((Arc) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-					((Arc) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-					/* CB - Joakim Byg add timed arcs */
-					if (newObject instanceof TimedInputArcComponent) {
-						if (newObject instanceof TimedTransportArcComponent) {
-							TransportArcHandler transportArcHandler = new TransportArcHandler(drawingSurface, (Arc) newObject);
-							newObject.addMouseListener(transportArcHandler);
-							//newObject.addMouseWheelListener(transportArcHandler);
-							newObject.addMouseMotionListener(transportArcHandler);
-						} else {
-							TimedArcHandler timedArcHandler = new TimedArcHandler(drawingSurface, (Arc) newObject);
-							newObject.addMouseListener(timedArcHandler);
-							//newObject.addMouseWheelListener(timedArcHandler);
-							newObject.addMouseMotionListener(timedArcHandler);
-						}
-					} else {
-						/* EOC */
-						ArcHandler arcHandler = new ArcHandler(drawingSurface,(Arc) newObject);
-						newObject.addMouseListener(arcHandler);
-						//newObject.addMouseWheelListener(arcHandler);
-						newObject.addMouseMotionListener(arcHandler);
-					}
-				} else if (newObject instanceof AnnotationNote) {
-					AnnotationNoteHandler noteHandler = new AnnotationNoteHandler(drawingSurface, (AnnotationNote) newObject);
-					newObject.addMouseListener(noteHandler);
-					newObject.addMouseMotionListener(noteHandler);
-					((Note) newObject).getNote().addMouseListener(noteHandler);
-					((Note) newObject).getNote().addMouseMotionListener(noteHandler);
-				}
-				
-				newObject.zoomUpdate(drawingSurface.getZoom());
-				
-			}
-			newObject.setGuiModel(template.guiModel());
-		}
+		drawingSurface.addPNListeners(newObject, drawingSurface, template.guiModel());
 	}
 }

=== modified file 'src/dk/aau/cs/verification/TAPNComposer.java'
--- src/dk/aau/cs/verification/TAPNComposer.java	2018-05-13 19:54:55 +0000
+++ src/dk/aau/cs/verification/TAPNComposer.java	2018-10-18 13:14:57 +0000
@@ -185,13 +185,10 @@
 						oldPlace.getPositionX(),
 						oldPlace.getPositionY(),
 						oldPlace.getId(),
-						uniquePlaceName,
 						oldPlace.getNameOffsetX(),
 						oldPlace.getNameOffsetY(),
-						0,
 						oldPlace.getMarkingOffsetXObject().doubleValue(),
-						oldPlace.getMarkingOffsetYObject().doubleValue(),
-						0
+						oldPlace.getMarkingOffsetYObject().doubleValue()
 						);
 					newPlace.setGuiModel(guiModel);
 					newPlace.setUnderlyingPlace(constructedPlace);
@@ -238,13 +235,10 @@
 								oldPlace.getPositionX() + offset.value1() * greatestWidth,
 								oldPlace.getPositionY() + offset.value2() * greatestHeight,
 								oldPlace.getId(),
-								uniquePlaceName,
 								oldPlace.getNameOffsetX(),
 								oldPlace.getNameOffsetY(),
-								0,
 								oldPlace.getMarkingOffsetXObject().doubleValue(),
-								oldPlace.getMarkingOffsetYObject().doubleValue(),
-								0
+								oldPlace.getMarkingOffsetYObject().doubleValue()
 								);
 						newPlace.setGuiModel(guiModel);
 						newPlace.setUnderlyingPlace(place);
@@ -295,7 +289,6 @@
 									oldTransition.getPositionX() + offset.value1() * greatestWidth,
 									oldTransition.getPositionY() + offset.value2() * greatestHeight,
 									oldTransition.getId(),
-									uniqueTransitionName,
 									oldTransition.getNameOffsetX(),
 									oldTransition.getNameOffsetY(),
 									true,

=== modified file 'src/pipe/dataLayer/DataLayer.java'
--- src/pipe/dataLayer/DataLayer.java	2018-08-05 16:25:47 +0000
+++ src/pipe/dataLayer/DataLayer.java	2018-10-18 13:14:57 +0000
@@ -23,7 +23,7 @@
 import dk.aau.cs.util.Require;
 
 
-public class DataLayer implements Cloneable {
+public class DataLayer {
 
 	/** PNML File Name */
 	public String pnmlName = null;

=== modified file 'src/pipe/gui/DrawingSurfaceImpl.java'
--- src/pipe/gui/DrawingSurfaceImpl.java	2018-08-13 09:38:20 +0000
+++ src/pipe/gui/DrawingSurfaceImpl.java	2018-10-18 13:14:57 +0000
@@ -48,8 +48,6 @@
 	
 	private static final int DRAWING_SURFACE_GROW = 100;
 
-	private AnimationHandler animationHandler = new AnimationHandler();
-
 	private SelectionManager selection;
 	private UndoManager undoManager;
 	private ArrayList<PetriNetObject> petriNetObjects = new ArrayList<PetriNetObject>();
@@ -129,98 +127,99 @@
 
 	}
 
+
+	//XXX: KYRKE 2018-09-06: Code moved here, as duplicated several places in net loaders, tmp solution, untill
+	//XXX handlers are handled better.
+	public static void addPNListeners(PetriNetObject newObject, DrawingSurfaceImpl drawingSurface, DataLayer guiModel) {
+
+		if (newObject != null) {
+
+			//XXX 2018-09-06 temp solution while we are moving creation of handlers to the objects
+			if(newObject.getMouseHandler() != null) {
+				drawingSurface.add(newObject);
+			}else {
+				throw new RuntimeException("This code should never be called");
+
+//				//if (newObject.getMouseListeners().length == 0) {
+//					if (newObject instanceof Place) {
+//						// XXX - kyrke
+//						if (newObject instanceof TimedPlaceComponent) {
+//
+//							PlaceHandler placeHandler = new PlaceHandler((Place) newObject);
+//							newObject.addMouseListener(placeHandler);
+//							newObject.addMouseWheelListener(placeHandler);
+//							newObject.addMouseMotionListener(placeHandler);
+//							drawingSurface.add(newObject);
+//
+//						} else {
+//
+//							PlaceHandler placeHandler = new PlaceHandler((Place) newObject);
+//							newObject.addMouseListener(placeHandler);
+//							newObject.addMouseWheelListener(placeHandler);
+//							newObject.addMouseMotionListener(placeHandler);
+//							drawingSurface.add(newObject);
+//
+//						}
+//					} else if (newObject instanceof Transition) {
+//						TransitionHandler transitionHandler;
+//						if (newObject instanceof TimedTransitionComponent) {
+//							transitionHandler = new TAPNTransitionHandler((Transition) newObject);
+//						} else {
+//							transitionHandler = new TransitionHandler((Transition) newObject);
+//						}
+//
+//						newObject.addMouseListener(transitionHandler);
+//						newObject.addMouseMotionListener(transitionHandler);
+//						newObject.addMouseWheelListener(transitionHandler);
+//
+//						newObject.addMouseListener(new AnimationHandler());
+//
+//						drawingSurface.add(newObject);
+//					} else if (newObject instanceof Arc) {
+//						drawingSurface.add(newObject);
+//
+//						/* CB - Joakim Byg add timed arcs */
+//						if (newObject instanceof TimedInputArcComponent) {
+//							if (newObject instanceof TimedTransportArcComponent) {
+//								TransportArcHandler transportArcHandler = new TransportArcHandler((Arc) newObject);
+//								newObject.addMouseListener(transportArcHandler);
+//								newObject.addMouseWheelListener(transportArcHandler);
+//								newObject.addMouseMotionListener(transportArcHandler);
+//							} else {
+//								TimedArcHandler timedArcHandler = new TimedArcHandler((Arc) newObject);
+//								newObject.addMouseListener(timedArcHandler);
+//								newObject.addMouseWheelListener(timedArcHandler);
+//								newObject.addMouseMotionListener(timedArcHandler);
+//							}
+//						} else {
+//							/* EOC */
+//							ArcHandler arcHandler = new ArcHandler((Arc) newObject);
+//							newObject.addMouseListener(arcHandler);
+//							newObject.addMouseWheelListener(arcHandler);
+//							newObject.addMouseMotionListener(arcHandler);
+//						}
+//					} else if (newObject instanceof AnnotationNote) {
+//						drawingSurface.add(newObject);
+//						AnnotationNoteHandler noteHandler = new AnnotationNoteHandler((AnnotationNote) newObject);
+//						newObject.addMouseListener(noteHandler);
+//						newObject.addMouseMotionListener(noteHandler);
+//						((Note) newObject).getNote().addMouseListener(noteHandler);
+//						((Note) newObject).getNote().addMouseMotionListener(noteHandler);
+//					}
+//
+//					newObject.zoomUpdate(drawingSurface.getZoom());
+
+				}
+
+				newObject.setGuiModel(guiModel);
+			//}
+		}
+
+
+	}
+
 	public void addNewPetriNetObject(PetriNetObject newObject) {
-		if (newObject != null) {
-			if (newObject.getMouseListeners().length == 0) {
-				if (newObject instanceof Place) {
-					// XXX - kyrke
-					if (newObject instanceof TimedPlaceComponent) {
-
-						LabelHandler labelHandler = new LabelHandler(((Place) newObject).getNameLabel(), (Place) newObject);
-						((Place) newObject).getNameLabel().addMouseListener(labelHandler);
-						((Place) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-						((Place) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-
-						PlaceHandler placeHandler = new PlaceHandler(this,(Place) newObject, this.guiModel, this.model);
-						newObject.addMouseListener(placeHandler);
-						newObject.addMouseWheelListener(placeHandler);
-						newObject.addMouseMotionListener(placeHandler);
-						add(newObject);
-
-					} else {
-
-						LabelHandler labelHandler = new LabelHandler(((Place) newObject).getNameLabel(), (Place) newObject);
-						((Place) newObject).getNameLabel().addMouseListener(labelHandler);
-						((Place) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-						//((Place) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-
-						PlaceHandler placeHandler = new PlaceHandler(this, (Place) newObject);
-						newObject.addMouseListener(placeHandler);
-						//newObject.addMouseWheelListener(placeHandler);
-						newObject.addMouseMotionListener(placeHandler);
-						add(newObject);
-
-					}
-				} else if (newObject instanceof Transition) {
-					TransitionHandler transitionHandler;
-					if (newObject instanceof TimedTransitionComponent) {
-						transitionHandler = new TAPNTransitionHandler(this,	(Transition) newObject, guiModel, model);
-					} else {
-						transitionHandler = new TransitionHandler(this,	(Transition) newObject);
-					}
-
-					LabelHandler labelHandler = new LabelHandler(((Transition) newObject).getNameLabel(),(Transition) newObject);
-					((Transition) newObject).getNameLabel().addMouseListener(labelHandler);
-					((Transition) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-					((Transition) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-
-					newObject.addMouseListener(transitionHandler);
-					newObject.addMouseMotionListener(transitionHandler);
-					newObject.addMouseWheelListener(transitionHandler);
-
-					newObject.addMouseListener(animationHandler);
-
-					add(newObject);
-				} else if (newObject instanceof Arc) {
-					add(newObject);
-					LabelHandler labelHandler = new LabelHandler(((Arc) newObject).getNameLabel(), (Arc) newObject);
-					((Arc) newObject).getNameLabel().addMouseListener(labelHandler);
-					((Arc) newObject).getNameLabel().addMouseMotionListener(labelHandler);
-					((Arc) newObject).getNameLabel().addMouseWheelListener(labelHandler);
-					/* CB - Joakim Byg add timed arcs */
-					if (newObject instanceof TimedInputArcComponent) {
-						if (newObject instanceof TimedTransportArcComponent) {
-							TransportArcHandler transportArcHandler = new TransportArcHandler(this, (Arc) newObject);
-							newObject.addMouseListener(transportArcHandler);
-							//newObject.addMouseWheelListener(transportArcHandler);
-							newObject.addMouseMotionListener(transportArcHandler);
-						} else {
-							TimedArcHandler timedArcHandler = new TimedArcHandler(this, (Arc) newObject);
-							newObject.addMouseListener(timedArcHandler);
-							//newObject.addMouseWheelListener(timedArcHandler);
-							newObject.addMouseMotionListener(timedArcHandler);
-						}
-					} else {
-						/* EOC */
-						ArcHandler arcHandler = new ArcHandler(this,(Arc) newObject);
-						newObject.addMouseListener(arcHandler);
-						//newObject.addMouseWheelListener(arcHandler);
-						newObject.addMouseMotionListener(arcHandler);
-					}
-				} else if (newObject instanceof AnnotationNote) {
-					add(newObject);
-					AnnotationNoteHandler noteHandler = new AnnotationNoteHandler(this, (AnnotationNote) newObject);
-					newObject.addMouseListener(noteHandler);
-					newObject.addMouseMotionListener(noteHandler);
-					((Note) newObject).getNote().addMouseListener(noteHandler);
-					((Note) newObject).getNote().addMouseMotionListener(noteHandler);
-				}
-
-				newObject.zoomUpdate(getZoom());
-				
-			}
-			newObject.setGuiModel(guiModel);
-		}
+		addPNListeners(newObject, this, guiModel);
 		validate();
 		repaint();
 	}
@@ -531,14 +530,14 @@
 			return p;
 		}
 
-		private PlaceTransitionObject newPlace(Point p) {
-			p = adjustPoint(p, view.getZoom());
-
-			pnObject = new Place(Grid.getModifiedX(p.x), Grid.getModifiedY(p.y));
-			guiModel.addPetriNetObject(pnObject);
-			view.addNewPetriNetObject(pnObject);
-			return (PlaceTransitionObject) pnObject;
-		}
+//		private PlaceTransitionObject newPlace(Point p) {
+//			p = adjustPoint(p, view.getZoom());
+//
+//			pnObject = new Place(Grid.getModifiedX(p.x), Grid.getModifiedY(p.y));
+//			guiModel.addPetriNetObject(pnObject);
+//			view.addNewPetriNetObject(pnObject);
+//			return (PlaceTransitionObject) pnObject;
+//		}
 
 		private PlaceTransitionObject newTimedPlace(Point p) {
 			p = adjustPoint(p, view.getZoom());
@@ -551,7 +550,7 @@
 			return (PlaceTransitionObject) pnObject;
 		}
 
-		private PlaceTransitionObject newTransition(Point p, boolean timed) {
+/*		private PlaceTransitionObject newTransition(Point p, boolean timed) {
 			p = adjustPoint(p, view.getZoom());
 
 			pnObject = new Transition(Grid.getModifiedX(p.x), Grid
@@ -560,7 +559,7 @@
 			guiModel.addPetriNetObject(pnObject);
 			view.addNewPetriNetObject(pnObject);
 			return (PlaceTransitionObject) pnObject;
-		}
+		}*/
 
 		private PlaceTransitionObject newTAPNTransition(Point p, boolean timed) {
 			p = adjustPoint(p, view.getZoom());
@@ -591,16 +590,17 @@
 			if (SwingUtilities.isLeftMouseButton(e)) {
 
 				Pipe.ElementType mode = app.getMode();
+				PlaceTransitionObject pto;
 				switch (mode) {
-				case PLACE:
-					PlaceTransitionObject pto = newPlace(e.getPoint());
-					getUndoManager().addNewEdit(
-							new AddPetriNetObjectEdit(pto, view, guiModel));
-					if (e.isControlDown()) {
-						app.setMode(ElementType.FAST_TRANSITION);
-						pnObject.dispatchEvent(e);
-					}
-					break;
+//				case PLACE:
+//					PlaceTransitionObject pto = newPlace(e.getPoint());
+//					getUndoManager().addNewEdit(
+//							new AddPetriNetObjectEdit(pto, view, guiModel));
+//					if (e.isControlDown()) {
+//						app.setMode(ElementType.FAST_TRANSITION);
+//						pnObject.dispatchEvent(e);
+//					}
+//					break;
 
 				case TAPNPLACE:
 					// create place
@@ -612,25 +612,24 @@
 					if (e.isControlDown()) {
 						// connect arc
 						app.setMode(ElementType.TAPNARC);
-						getPlaceTransitionObjectHandlerOf(pto2).mousePressed(e);
-						getPlaceTransitionObjectHandlerOf(pto2).mouseReleased(e);
+						pto2.getMouseHandler().mousePressed(e);
+						pto2.getMouseHandler().mouseReleased(e);
 						app.setMode(ElementType.FAST_TRANSITION);
 						// enter fast mode
 						pnObject.dispatchEvent(e);
 					}
 					break;
 
-				case IMMTRANS:
-				case TIMEDTRANS:
-					boolean timed = (mode == ElementType.TIMEDTRANS);
-					pto = newTransition(e.getPoint(), timed);
-					getUndoManager().addNewEdit(
-							new AddPetriNetObjectEdit(pto, view, guiModel));
-					if (e.isControlDown()) {
-						app.setMode(ElementType.FAST_PLACE);
-						pnObject.dispatchEvent(e);
-					}
-					break;
+//				case IMMTRANS:
+//				case TIMEDTRANS:
+//					boolean timed = (mode == ElementType.TIMEDTRANS);
+//					pto = newTransition(e.getPoint(), timed);
+//					getUndoManager().addNewEdit(new AddPetriNetObjectEdit(pto, view, guiModel));
+//					if (e.isControlDown()) {
+//						app.setMode(ElementType.FAST_PLACE);
+//						pnObject.dispatchEvent(e);
+//					}
+//					break;
 				case TAPNTRANS:
 					// create transition
 					pto = newTAPNTransition(e.getPoint());
@@ -641,8 +640,8 @@
 					if (e.isControlDown()) {
 						// connect arc
 						app.setMode(ElementType.TAPNARC);
-						getPlaceTransitionObjectHandlerOf(pto).mousePressed(e);
-						getPlaceTransitionObjectHandlerOf(pto).mouseReleased(e);
+						pto.getMouseHandler().mousePressed(e);
+						pto.getMouseHandler().mouseReleased(e);
 						// enter fast mode
 						app.setMode(ElementType.FAST_PLACE);
 						pnObject.dispatchEvent(e);
@@ -690,14 +689,14 @@
 					pto = newTAPNTransition(e.getPoint());
 					getUndoManager().addNewEdit(new AddTimedTransitionCommand((TimedTransitionComponent) pto, model, guiModel, view));
 					app.setMode(ElementType.TAPNARC);
-					getPlaceTransitionObjectHandlerOf(pto).mouseReleased(e);
+					pto.getMouseHandler().mouseReleased(e);
 
 					if (e.isControlDown()) {
 						// connect arc
 						pnObject.dispatchEvent(e);
 						app.setMode(ElementType.TAPNARC);
-						getPlaceTransitionObjectHandlerOf(pto).mousePressed(e);
-						getPlaceTransitionObjectHandlerOf(pto).mouseReleased(e);
+						pto.getMouseHandler().mousePressed(e);
+						pto.getMouseHandler().mouseReleased(e);
 						// enter fast mode
 						app.setMode(ElementType.FAST_PLACE);
 					} else{
@@ -709,14 +708,14 @@
 					PlaceTransitionObject pto3 = newTimedPlace(e.getPoint());
 					getUndoManager().addNewEdit(new AddTimedPlaceCommand((TimedPlaceComponent) pto3, model, guiModel, view));
 					app.setMode(ElementType.TAPNARC);
-					getPlaceTransitionObjectHandlerOf(pto3).mouseReleased(e);
+					pto3.getMouseHandler().mouseReleased(e);
 
 					if (e.isControlDown()) {
 						// connect arc
 						pnObject.dispatchEvent(e);
 						app.setMode(ElementType.TAPNARC);
-						getPlaceTransitionObjectHandlerOf(pto3).mousePressed(e);
-						getPlaceTransitionObjectHandlerOf(pto3).mouseReleased(e);
+						pto3.getMouseHandler().mousePressed(e);
+						pto3.getMouseHandler().mouseReleased(e);
 						// enter fast mode
 						app.setMode(ElementType.FAST_TRANSITION);
 					} else{
@@ -733,14 +732,6 @@
 			updatePreferredSize();
 		}
 
-		private MouseListener getPlaceTransitionObjectHandlerOf(PlaceTransitionObject obj){
-			for (MouseListener listener : obj.getMouseListeners()) {
-				if (listener instanceof PlaceTransitionObjectHandler)
-					return listener;
-			}
-			return null;
-		}
-
 		private void addPoint(final Arc createArc, final MouseEvent e) {
 			int x = Grid.getModifiedX(e.getX());
 			int y = Grid.getModifiedY(e.getY());

=== modified file 'src/pipe/gui/graphicElements/AnnotationNote.java'
--- src/pipe/gui/graphicElements/AnnotationNote.java	2018-05-13 14:57:15 +0000
+++ src/pipe/gui/graphicElements/AnnotationNote.java	2018-10-18 13:14:57 +0000
@@ -39,20 +39,34 @@
 		super(x, y);
 		setDragPoints();
 		this.isNew = isNew;
-	}
-
-	public AnnotationNote(String id, String text, int x, int y, boolean isNew) {
-		super(id, text, x, y);
-		this.isNew = isNew;
-		setDragPoints();
-	}
-
-	public AnnotationNote(String text, int x, int y, int w, int h,
-			boolean border, boolean isNew) {
+
+		//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.
+		addMouseHandler();
+	}
+
+	public AnnotationNote(String text, int x, int y, int w, int h, boolean border, boolean isNew) {
 		super(text, x, y, w, h, border);
 		this.isNew = isNew;
 		setDragPoints();
-	}
+
+		//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.
+		addMouseHandler();
+	}
+
+	private 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.
+
+		AnnotationNoteHandler h = new AnnotationNoteHandler(this);
+		mouseHandler = h;
+
+		getNote().addMouseListener(h);
+		getNote().addMouseMotionListener(h);
+
+	}
+
 
 	private void setDragPoints() {
 		dragPoints[0] = new ResizePoint(this, ResizePoint.TOP
@@ -332,11 +346,6 @@
 	
 	public AnnotationNote copy() {
 		AnnotationNote annotation = new AnnotationNote(note.getText(), getOriginalX(), getOriginalY(),	note.getWidth(), note.getHeight(), this.isShowingBorder(), isNew);
-		AnnotationNoteHandler noteHandler = new AnnotationNoteHandler((DrawingSurfaceImpl)getParent(), annotation);
-		annotation.addMouseListener(noteHandler);
-		annotation.addMouseMotionListener(noteHandler);
-		annotation.getNote().addMouseListener(noteHandler);
-		annotation.getNote().addMouseMotionListener(noteHandler);
 		
 		return annotation;
 	}

=== modified file 'src/pipe/gui/graphicElements/Arc.java'
--- src/pipe/gui/graphicElements/Arc.java	2018-08-05 22:20:35 +0000
+++ src/pipe/gui/graphicElements/Arc.java	2018-10-18 13:14:57 +0000
@@ -11,6 +11,7 @@
 import pipe.gui.Grid;
 import pipe.gui.Pipe;
 import pipe.gui.Zoomer;
+import pipe.gui.handler.LabelHandler;
 import pipe.gui.undo.AddArcPathPointEdit;
 import dk.aau.cs.gui.undo.Command;
 import dk.aau.cs.model.tapn.Weight;
@@ -18,7 +19,7 @@
 /**
    Implementation of Element for drawing an arc
  */
-public abstract class Arc extends PetriNetObject implements Cloneable {
+public abstract class Arc extends PetriNetObject {
 
 	private static final long serialVersionUID = 6527845538091358791L;
 
@@ -53,10 +54,11 @@
 		id = idInput;
 		setSource(sourceInput);
 		setTarget(targetInput);
+
+		//XXX see comment in function
+		setLableHandler();
 	}
-	
-	abstract public void setWeight(Weight weight);
-	abstract public Weight getWeight();
+
 
 	/**
 	 * Create Petri-Net Arc object
@@ -67,11 +69,34 @@
 		myPath.addPoint();
 		myPath.addPoint();
 		myPath.createPath();
+
+		//XXX see comment in function
+		setLableHandler();
 	}
 
 	public Arc() {
 		super();
-	}
+
+		label = new NameLabel(zoom);
+		//XXX see comment in function
+		setLableHandler();
+	}
+
+
+	private void setLableHandler() {
+
+		//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.
+		LabelHandler labelHandler = new LabelHandler(this.getNameLabel(), this);
+
+		getNameLabel().addMouseListener(labelHandler);
+		getNameLabel().addMouseMotionListener(labelHandler);
+		getNameLabel().addMouseWheelListener(labelHandler);
+
+	}
+
+	abstract public void setWeight(Weight weight);
+	abstract public Weight getWeight();
 
 	/**
 	 * Set source
@@ -238,13 +263,9 @@
 	public void addedToGui() {
 		// called by GuiView / State viewer when adding component.
 		deleted = false;
-		markedAsDeleted = false;
-
-		if (getParent() instanceof DrawingSurfaceImpl) {
-			myPath.addPointsToGui((DrawingSurfaceImpl) getParent());
-		} else {
-			myPath.addPointsToGui((JLayeredPane) getParent());
-		}
+
+		myPath.addPointsToGui((DrawingSurfaceImpl) getParent());
+
 		updateArcPosition();
 		if (getParent() != null && label.getParent() == null) {
 			getParent().add(label);
@@ -343,13 +364,6 @@
 		}
 	}
 
-	/**
-	 * Method to clone an Arc object
-	 */
-	@Override
-	public PetriNetObject clone() {
-		return super.clone();
-	}
 
 	/**
 	 * Handles keyboard input when drawing arcs in the GUI. Keys are bound to action names,

=== modified file 'src/pipe/gui/graphicElements/ArcPath.java'
--- src/pipe/gui/graphicElements/ArcPath.java	2015-11-23 17:12:41 +0000
+++ src/pipe/gui/graphicElements/ArcPath.java	2018-10-18 13:14:57 +0000
@@ -29,7 +29,7 @@
  * 
  * @author Pere Bonet: modified the weight label placement
  */
-public class ArcPath implements Shape, Cloneable {
+public class ArcPath implements Shape {
 
 	private GeneralPath path = new GeneralPath();
 	private List<ArcPathPoint> pathPoints = new ArrayList<ArcPathPoint>();
@@ -616,61 +616,12 @@
 			// Nadeem 21/06/2005
 			if (editWindow.getIndexOf(pathPoint) < 0) {
 				editWindow.add(pathPoint);
-
-				pointHandler = new ArcPathPointHandler(editWindow, pathPoint);
-
-				if (pathPoint.getMouseListeners().length == 0) {
-					pathPoint.addMouseListener(pointHandler);
-				}
-
-				if (pathPoint.getMouseMotionListeners().length == 0) {
-					pathPoint.addMouseMotionListener(pointHandler);
-				}
-
-//				if (pathPoint.getMouseWheelListeners().length == 0) {
-//					pathPoint.addMouseWheelListener(pointHandler);
-//				}
-				pathPoint.updatePointLocation();
-			}
-		}
-	}
-
-	public void addPointsToGui(JLayeredPane editWindow) {
-		ArcPathPoint pathPoint;
-		ArcPathPointHandler pointHandler;
-
-		(pathPoints.get(0)).setDraggable(false);
-		(pathPoints.get(pathPoints.size() - 1)).setDraggable(false);
-
-		for (int i = 0; i < pathPoints.size(); i++) {
-			pathPoint = pathPoints.get(i);
-			pathPoint.setVisible(false);
-
-			// Check whether the point has already been added to the gui
-			// as addPointsToGui() may have been called after the user
-			// split an existing point. If this is the case, we don't want
-			// to add all the points again along with new action listeners,
-			// we just want to add the new point.
-			// Nadeem 21/06/2005
-			if (editWindow.getIndexOf(pathPoint) < 0) {
-				editWindow.add(pathPoint);
-				pointHandler = new ArcPathPointHandler(editWindow, pathPoint);
-
-				if (pathPoint.getMouseListeners().length == 0) {
-					pathPoint.addMouseListener(pointHandler);
-				}
-
-				if (pathPoint.getMouseMotionListeners().length == 0) {
-					pathPoint.addMouseMotionListener(pointHandler);
-				}
-
-//				if (pathPoint.getMouseWheelListeners().length == 0) {
-//					pathPoint.addMouseWheelListener(pointHandler);
-//				}
-				pathPoint.updatePointLocation();
-			}
-		}
-	}
+				pathPoint.updatePointLocation();
+			}
+		}
+	}
+
+
 
 	public void delete() { // Michael: Tells the arc points to remove themselves
 		while (!pathPoints.isEmpty()) {
@@ -714,11 +665,9 @@
 	 */
 	public void insertPoint(int index, ArcPathPoint newpoint) {
 		pathPoints.add(index, newpoint);
-		if (myArc.getParent() instanceof DrawingSurfaceImpl) {
-			addPointsToGui((DrawingSurfaceImpl) myArc.getParent());
-		} else {
-			addPointsToGui((JLayeredPane) myArc.getParent());
-		}
+
+		addPointsToGui((DrawingSurfaceImpl) myArc.getParent());
+
 	}
 
 	/**

=== modified file 'src/pipe/gui/graphicElements/ArcPathPoint.java'
--- src/pipe/gui/graphicElements/ArcPathPoint.java	2017-07-02 18:03:21 +0000
+++ src/pipe/gui/graphicElements/ArcPathPoint.java	2018-10-18 13:14:57 +0000
@@ -17,6 +17,8 @@
 import pipe.gui.DrawingSurfaceImpl;
 import pipe.gui.Pipe;
 import pipe.gui.Zoomer;
+import pipe.gui.handler.ArcPathPointHandler;
+import pipe.gui.handler.TimedArcHandler;
 import pipe.gui.undo.AddArcPathPointEdit;
 import pipe.gui.undo.ArcPathPointTypeEdit;
 import dk.aau.cs.gui.undo.Command;
@@ -43,14 +45,19 @@
 	private boolean pointType; // STRAIGHT or CURVED
 
 	private ArcPathPoint() {
-		copyPasteable = false; // we can't copy & paste indivial arc points!
 		zoom = Pipe.ZOOM_DEFAULT;
+
+		//XXX: see note in function
+		addMouseHandler();
 	}
 
 	public ArcPathPoint(ArcPath a) {
 		this();
 		myArcPath = a;
 		setPointLocation(0, 0);
+
+		//XXX: see note in function
+		addMouseHandler();
 	}
 
 	public ArcPathPoint(float x, float y, boolean _pointType, ArcPath a) {
@@ -58,11 +65,23 @@
 		myArcPath = a;
 		setPointLocation(x, y);
 		pointType = _pointType;
+
+		//XXX: see note in function
+		addMouseHandler();
 	}
 	
 	public ArcPathPoint(float x, float y, boolean _pointType, ArcPath a, int zoomLevel) {
 		this(x,y,_pointType,a);
 		zoom = zoomLevel;
+
+		//XXX: see note in function
+		addMouseHandler();
+	}
+
+	private 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.
+		mouseHandler = new ArcPathPointHandler(this);
 	}
 
 	/**

=== modified file 'src/pipe/gui/graphicElements/NameLabel.java'
--- src/pipe/gui/graphicElements/NameLabel.java	2015-11-15 20:31:13 +0000
+++ src/pipe/gui/graphicElements/NameLabel.java	2018-10-18 13:14:57 +0000
@@ -16,7 +16,7 @@
  * @version 1.0
  * @author Camilla Clifford
  */
-public class NameLabel extends JTextArea implements Cloneable, Translatable,
+public class NameLabel extends JTextArea implements Translatable,
 		Zoomable {
 
 	private static final long serialVersionUID = 5167510420195429773L;
@@ -28,10 +28,6 @@
 	private Font font = new Font(Pipe.LABEL_FONT, Font.BOLD,
 			Pipe.LABEL_DEFAULT_FONT_SIZE);
 
-	public NameLabel() {
-		this("");
-	}
-
 	public NameLabel(int zoom) {
 		this("");
 		setFont(getFont().deriveFont(Zoomer.getZoomedValue((float) Pipe.LABEL_DEFAULT_FONT_SIZE, zoom)));
@@ -111,16 +107,6 @@
 		setFont(getFont().deriveFont(Zoomer.getZoomedValue((float) Pipe.LABEL_DEFAULT_FONT_SIZE, value)));
 		updateSize();
 	}
-
-	@Override
-	public Object clone() {
-		try {
-			return super.clone();
-		} catch (CloneNotSupportedException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
 	
 	public void displayName(boolean display){
 		if(display && name != null && text != null){

=== modified file 'src/pipe/gui/graphicElements/Note.java'
--- src/pipe/gui/graphicElements/Note.java	2018-05-13 14:57:15 +0000
+++ src/pipe/gui/graphicElements/Note.java	2018-10-18 13:14:57 +0000
@@ -182,7 +182,6 @@
 	@Override
 	public void addedToGui() {
 		if (CreateGui.getDrawingSurface() != null) {
-			markedAsDeleted = false;
 			deleted = false;
 			updateBounds();
 			// CreateGui.getDrawingSurface().setNetChanged(true);

=== modified file 'src/pipe/gui/graphicElements/PetriNetObject.java'
--- src/pipe/gui/graphicElements/PetriNetObject.java	2018-08-05 22:13:16 +0000
+++ src/pipe/gui/graphicElements/PetriNetObject.java	2018-10-18 13:14:57 +0000
@@ -4,12 +4,12 @@
 import java.awt.Container;
 import java.awt.Graphics;
 import java.awt.Rectangle;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
+import java.awt.event.*;
 import java.util.EventListener;
 
 import javax.swing.JComponent;
 
+import dk.aau.cs.debug.Logger;
 import pipe.dataLayer.DataLayer;
 import pipe.gui.DrawingSurfaceImpl;
 import pipe.gui.Grid;
@@ -17,13 +17,13 @@
 import pipe.gui.Translatable;
 import pipe.gui.Zoomable;
 import pipe.gui.Zoomer;
+import pipe.gui.handler.PetriNetObjectHandler;
 
 /**
  * Petri-Net Object Class 
  * Implements things in common between all types of objects
  */
-public abstract class PetriNetObject extends JComponent implements Zoomable,
-		Cloneable, Translatable {
+public abstract class PetriNetObject extends JComponent implements Zoomable, Translatable {
 
 	private static final long serialVersionUID = 2693171860021066729L;
 
@@ -48,25 +48,91 @@
 	protected boolean selected = false; // True if part of the current selection.
 	protected boolean selectable = true; // True if object can be selected.
 	protected boolean draggable = true; // True if object can be dragged.
-	protected boolean copyPasteable = true; // True if object can be cloned.
 	protected static boolean ignoreSelection = false;
 	protected Rectangle bounds = new Rectangle();
 
 	protected boolean deleted = false;
-	protected boolean markedAsDeleted = false;
 
 	// Integer value which represents a zoom percentage
 	protected int zoom = Pipe.ZOOM_DEFAULT;
 	private DataLayer guiModel;
 
+	public PetriNetObjectHandler getMouseHandler() {
+		return mouseHandler;
+	}
+
+	protected PetriNetObjectHandler mouseHandler;
+
+	PetriNetObject() {
+
+		addMouseListener(new MouseListener() {
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				if (mouseHandler != null) {
+					mouseHandler.mouseClicked(e);
+				}
+			}
+
+			@Override
+			public void mousePressed(MouseEvent e) {
+				if (mouseHandler != null) {
+					mouseHandler.mousePressed(e);
+				}
+			}
+
+			@Override
+			public void mouseReleased(MouseEvent e) {
+				if (mouseHandler != null) {
+					mouseHandler.mouseReleased(e);
+				}
+			}
+
+			@Override
+			public void mouseEntered(MouseEvent e) {
+				if (mouseHandler != null) {
+					mouseHandler.mouseEntered(e);
+				}
+			}
+
+			@Override
+			public void mouseExited(MouseEvent e) {
+				if (mouseHandler != null) {
+					mouseHandler.mouseExited(e);
+				}
+			}
+		});
+
+		addMouseWheelListener(new MouseWheelListener() {
+			@Override
+			public void mouseWheelMoved(MouseWheelEvent e) {
+				if (mouseHandler != null) {
+					mouseHandler.mouseWheelMoved(e);
+				}
+			}
+		});
+
+		addMouseMotionListener(new MouseMotionListener() {
+			@Override
+			public void mouseDragged(MouseEvent e) {
+				if (mouseHandler != null) {
+					mouseHandler.mouseDragged(e);
+				}
+			}
+
+			@Override
+			public void mouseMoved(MouseEvent e) {
+				if (mouseHandler != null) {
+					mouseHandler.mouseMoved(e);
+				}
+			}
+		});
+
+	}
+
 	public void setGuiModel(DataLayer guiModel) {
 		this.guiModel = guiModel;
 	}
 
-	public DataLayer getGuiModel() {
-		return guiModel;
-	}
-
 	public void setId(String idInput) {
 		id = idInput;
 		setName(idInput);
@@ -224,11 +290,7 @@
 
 
 	public boolean isDeleted() {
-		return deleted || markedAsDeleted;
-	}
-
-	public void markAsDeleted() {
-		markedAsDeleted = true;
+		return deleted;
 	}
 
 	public void select(Rectangle selectionRectangle) {
@@ -248,28 +310,9 @@
 		return zoom;
 	}
 
-	@Override
-	public PetriNetObject clone() {
-		try {
-			PetriNetObject pnObjectCopy = (PetriNetObject) super.clone();
-
-			// Remove all mouse listeners on the new object
-			EventListener[] mouseListeners = pnObjectCopy
-					.getListeners(MouseListener.class);
-			for (int i = 0; i < mouseListeners.length; i++) {
-				pnObjectCopy.removeMouseListener((MouseListener) mouseListeners[i]);
-			}
-
-			mouseListeners = pnObjectCopy.getListeners(MouseMotionListener.class);
-
-			for (int i = 0; i < mouseListeners.length; i++) {
-				pnObjectCopy.removeMouseMotionListener((MouseMotionListener) mouseListeners[i]);
-			}
-
-			return pnObjectCopy;
-		} catch (CloneNotSupportedException e) {
-			throw new Error(e);
-		}
+	public DrawingSurfaceImpl getParent() {
+		return (DrawingSurfaceImpl) super.getParent();
 	}
 
+
 }

=== modified file 'src/pipe/gui/graphicElements/Place.java'
--- src/pipe/gui/graphicElements/Place.java	2018-08-14 07:52:41 +0000
+++ src/pipe/gui/graphicElements/Place.java	2018-10-18 13:14:57 +0000
@@ -15,7 +15,7 @@
 /**
   * Class for drawing a Place
  */
-public class Place extends PlaceTransitionObject {
+public abstract class Place extends PlaceTransitionObject {
 
 	private static final long serialVersionUID = -5155964364065651381L;
 
@@ -28,30 +28,29 @@
 	// Value of the capacity restriction; 0 means no capacity restriction 
 	protected Integer capacity = 0;
 
-	public static final int DIAMETER = Pipe.PLACE_TRANSITION_HEIGHT;
+	protected static final int DIAMETER = Pipe.PLACE_TRANSITION_HEIGHT;
 
 	// Token Width and Height
-	public static int tWidth = 5;
-	public static int tHeight = 5;
+	protected static int tWidth = 5;
+	protected static int tHeight = 5;
 
 	// Token dot position offsets
-	public static int tLeftX = 7;
-	public static int tRightX = 19;
-	public static int tTopY = 7;
-	public static int tBotY = 19;
-	public static int tMiddleX = 13;
-	public static int tMiddleY = 13;
+	protected static int tLeftX = 7;
+	protected static int tRightX = 19;
+	protected static int tTopY = 7;
+	protected static int tBotY = 19;
+	protected static int tMiddleX = 13;
+	protected static int tMiddleY = 13;
 
 	// Ellipse2D.Double place
 	protected static Ellipse2D.Double placeEllipse = new Ellipse2D.Double(0, 0,	DIAMETER, DIAMETER);
 	protected static Shape proximityPlace = (new BasicStroke(Pipe.PLACE_TRANSITION_PROXIMITY_RADIUS)).createStrokedShape(placeEllipse);
 
 	public Place(double positionXInput, double positionYInput, String idInput,
-			String nameInput, Double nameOffsetXInput, Double nameOffsetYInput,
-			int initialMarkingInput, double markingOffsetXInput,
-			double markingOffsetYInput, int capacityInput) {
-		super(positionXInput, positionYInput, idInput, nameInput,
-				nameOffsetXInput, nameOffsetYInput);
+			Double nameOffsetXInput, Double nameOffsetYInput,
+			double markingOffsetXInput,
+			double markingOffsetYInput) {
+		super(positionXInput, positionYInput, idInput,	nameOffsetXInput, nameOffsetYInput);
 		markingOffsetX = new Double(markingOffsetXInput);
 		markingOffsetY = new Double(markingOffsetYInput);
 		componentWidth = DIAMETER;
@@ -67,36 +66,6 @@
 		setCentre((int) positionX, (int) positionY);
 	}
 
-
-	public Place paste(double x, double y, boolean fromAnotherView) {
-		this.incrementCopyNumber();
-		Place copy = new Place(Grid.getModifiedX(x + this.getX()+ Pipe.PLACE_TRANSITION_HEIGHT / 2), 
-				Grid.getModifiedY(y	+ this.getY() + Pipe.PLACE_TRANSITION_HEIGHT / 2));
-		copy.pnName.setName(pnName.getName() + "(" + this.getCopyNumber()	+ ")");
-		this.newCopy(copy);
-		copy.nameOffsetX = nameOffsetX;
-		copy.nameOffsetY = nameOffsetY;
-		copy.capacity = capacity;
-		copy.attributesVisible = attributesVisible;
-		copy.markingOffsetX = markingOffsetX;
-		copy.markingOffsetY = markingOffsetY;
-		copy.update(true);
-		return copy;
-	}
-
-	public Place copy() {
-		Place copy = new Place(Zoomer.getUnzoomedValue(this.getX(), zoom), Zoomer.getUnzoomedValue(this.getY(), zoom));
-		copy.pnName.setName(this.getName());
-		copy.nameOffsetX = nameOffsetX;
-		copy.nameOffsetY = nameOffsetY;
-		copy.capacity = capacity;
-		copy.attributesVisible = attributesVisible;
-		copy.markingOffsetX = markingOffsetX;
-		copy.markingOffsetY = markingOffsetY;
-		copy.setOriginal(this);
-		return copy;
-	}
-
 	@Override
 	public void paintComponent(Graphics g) {
 		super.paintComponent(g);
@@ -155,7 +124,7 @@
 		double unZoomedX = Zoomer.getUnzoomedValue(x - COMPONENT_DRAW_OFFSET, zoom);
 		double unZoomedY = Zoomer.getUnzoomedValue(y - COMPONENT_DRAW_OFFSET, zoom);
 
-		someArc = CreateGui.getDrawingSurface().createArc;
+		Arc someArc = CreateGui.getDrawingSurface().createArc;
 		if (someArc != null) { // Must be drawing a new Arc if non-NULL.
 			if ((proximityPlace.contains((int) unZoomedX, (int) unZoomedY) || placeEllipse
 					.contains((int) unZoomedX, (int) unZoomedY))
@@ -216,11 +185,6 @@
 	}
 
 	@Override
-	public void showEditor() {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
 	public void update(boolean displayConstantNames) {
 		if (attributesVisible) {
 			pnName.setText("\nk=" + (capacity > 0 ? capacity : "\u221E"));
@@ -232,18 +196,5 @@
 		repaint();
 	}
 
-	@Override
-	public Place clone() {
-
-		Place toReturn = (Place) super.clone();
-
-		toReturn.markingOffsetX = markingOffsetX;
-		toReturn.markingOffsetY = markingOffsetY;
-		toReturn.componentWidth = componentWidth;
-		toReturn.componentHeight = componentHeight;
-		toReturn.setCentre((int) positionX, (int) positionY);
-
-		return toReturn;
-
-	}
+
 }

=== modified file 'src/pipe/gui/graphicElements/PlaceTransitionObject.java'
--- src/pipe/gui/graphicElements/PlaceTransitionObject.java	2018-08-14 07:52:41 +0000
+++ src/pipe/gui/graphicElements/PlaceTransitionObject.java	2018-10-18 13:14:57 +0000
@@ -9,13 +9,13 @@
 import pipe.gui.Grid;
 import pipe.gui.Pipe;
 import pipe.gui.Zoomer;
+import pipe.gui.handler.LabelHandler;
 
 /**
  * Petri-Net Place or Transition SuperClass
  * 
  */
-public abstract class PlaceTransitionObject extends PetriNetObject implements
-Cloneable {
+public abstract class PlaceTransitionObject extends PetriNetObject {
 
 	private static final long serialVersionUID = -6629006415467929184L;
 
@@ -24,20 +24,12 @@
 
 	private LinkedList<Arc> connectTo = new LinkedList<Arc>();
 	private LinkedList<Arc> connectFrom = new LinkedList<Arc>();
-	protected static Arc someArc;
-
-	private PlaceTransitionObject lastCopy = null;
-	private PlaceTransitionObject original = null;
-	private int copyNumber = 0;
 
 	protected boolean attributesVisible = false;
 
-	// The "real" x coordinate of this place or transition in the net.
+	// The "real" x/y coordinate of this place or transition in the net.
 	// i.e. the x position at 100% zoom.
 	private double locationX;
-
-	// The "real" y coordinate of this place or transition in the net.
-	// i.e. the y position at 100% zoom.
 	private double locationY;
 
 	/**
@@ -49,15 +41,13 @@
 	 *            Y-axis Position
 	 * @param idInput
 	 *            Place id
-	 * @param nameInput
-	 *            Name
 	 * @param nameOffsetXInput
 	 *            Name X-axis Position
 	 * @param nameOffsetYInput
 	 *            Name Y-axis Position
 	 */
 	public PlaceTransitionObject(double positionXInput, double positionYInput,
-			String idInput, String nameInput, double nameOffsetXInput,
+			String idInput, double nameOffsetXInput,
 			double nameOffsetYInput) {
 		this(positionXInput, positionYInput);
 		id = idInput;
@@ -86,6 +76,10 @@
 
 		// sets up Namelabel for each PN object
 		pnName = new NameLabel(zoom);
+		LabelHandler labelHandler = new LabelHandler(pnName, this);
+		getNameLabel().addMouseListener(labelHandler);
+		getNameLabel().addMouseMotionListener(labelHandler);
+		getNameLabel().addMouseWheelListener(labelHandler);
 	}
 
 	/**
@@ -277,6 +271,7 @@
 	public void updateConnected() {
 		Iterator<Arc> arcsFrom = connectFrom.iterator();
 
+		Arc someArc;
 		while (arcsFrom.hasNext()) {
 			someArc = (arcsFrom.next());
 			updateEndPoint(someArc);
@@ -350,7 +345,6 @@
 	@Override
 	public void addedToGui() {
 		deleted = false;
-		markedAsDeleted = false;
 		addLabelToContainer();
 		update(true);
 		updateOnMoveOrZoom();
@@ -389,42 +383,6 @@
 
 	public abstract void updateEndPoint(Arc arc);
 
-	public int getCopyNumber() {
-		if (original != null) {
-			return original.copyNumber;
-		} else {
-			return 0;
-		}
-	}
-
-	public void incrementCopyNumber() {
-		if (original != null) {
-			original.copyNumber++;
-		}
-	}
-
-	public void newCopy(PlaceTransitionObject ptObject) {
-		if (original != null) {
-			original.lastCopy = ptObject;
-		}
-	}
-
-	public PlaceTransitionObject getLastCopy() {
-		return lastCopy;
-	}
-
-	public void resetLastCopy() {
-		lastCopy = null;
-	}
-
-	public void setOriginal(PlaceTransitionObject ptObject) {
-		original = ptObject;
-	}
-
-	public PlaceTransitionObject getOriginal() {
-		return original;
-	}
-
 	public abstract void showEditor();
 
 	public void setAttributesVisible(boolean flag) {
@@ -447,16 +405,4 @@
 		update(true);
 	}
 
-	// XXX - kyrke now also clones arcs
-	// Clone object and deep copy the pnNames
-	@Override
-	public PlaceTransitionObject clone() {
-		PlaceTransitionObject toReturn = (PlaceTransitionObject) super.clone();
-		toReturn.pnName = (NameLabel) pnName.clone();
-
-		toReturn.connectFrom = connectFrom;
-		toReturn.connectTo = connectTo;
-
-		return toReturn;
-	}
 }

=== modified file 'src/pipe/gui/graphicElements/Transition.java'
--- src/pipe/gui/graphicElements/Transition.java	2018-08-14 07:52:41 +0000
+++ src/pipe/gui/graphicElements/Transition.java	2018-10-18 13:14:57 +0000
@@ -27,7 +27,7 @@
 /**
  * Petri-Net Transition Class for Drawing Transitions
  */
-public class Transition extends PlaceTransitionObject {
+public abstract class Transition extends PlaceTransitionObject {
 
 	private static final long serialVersionUID = 942116302162925121L;
 	
@@ -36,15 +36,15 @@
 	private Shape proximityTransition;
 
 	// Transition Size
-	public static final int TRANSITION_HEIGHT = Pipe.PLACE_TRANSITION_HEIGHT;
-	public static final int TRANSITION_WIDTH = TRANSITION_HEIGHT / 3;
+	protected static final int TRANSITION_HEIGHT = Pipe.PLACE_TRANSITION_HEIGHT;
+	protected static final int TRANSITION_WIDTH = TRANSITION_HEIGHT / 3;
 	
 	protected int angle;
 	
 	// Animation Suff
 	protected boolean enabled = false;
-	public boolean delayEnabled = false;
-	public boolean highlighted = false;
+	protected boolean delayEnabled = false;
+	protected boolean highlighted = false;
 	private Timer blinkTimer;
 	private int blinkCount;
 
@@ -56,11 +56,10 @@
 	 * Create Petri-Net Transition object
 	 */
 	public Transition(double positionXInput, double positionYInput,
-			String idInput, String nameInput, double nameOffsetXInput,
+			String idInput, double nameOffsetXInput,
 			double nameOffsetYInput,
 			boolean infServer, int angleInput, int priority) {
-		super(positionXInput, positionYInput, idInput, nameInput,
-				nameOffsetXInput, nameOffsetYInput);
+		super(positionXInput, positionYInput, idInput, nameOffsetXInput, nameOffsetYInput);
 		componentWidth = TRANSITION_HEIGHT; // sets width
 		componentHeight = TRANSITION_HEIGHT;// sets height
 		constructTransition();
@@ -235,7 +234,7 @@
 		double unZoomedY = (y - COMPONENT_DRAW_OFFSET)
 				/ (zoomPercentage / 100.0);
 
-		someArc = CreateGui.getDrawingSurface().createArc;
+		Arc someArc = CreateGui.getDrawingSurface().createArc;
 		if (someArc != null) { // Must be drawing a new Arc if non-NULL.
 			if ((proximityTransition.contains((int) unZoomedX, (int) unZoomedY) || transition
 					.contains((int) unZoomedX, (int) unZoomedY))
@@ -416,11 +415,6 @@
 	}
 
 	@Override
-	public void showEditor() {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
 	public void update(boolean displayConstantNames) {
 		pnName.setText(getText());
 		pnName.zoomUpdate(zoom);
@@ -481,24 +475,6 @@
 		}
 
 	}
-
-	 @Override
-	 public Transition clone() {
-		 Transition toReturn=null;
-		 toReturn = (Transition)super.clone();
-
-		 toReturn.positionX = positionX;
-
-		 toReturn.componentWidth = TRANSITION_HEIGHT; //sets width
-		 toReturn.componentHeight = TRANSITION_HEIGHT;//sets height
-		 toReturn.constructTransition();
-		 toReturn.angle = 0;
-		 toReturn.setCentre((int)positionX, (int)positionY);
-		 toReturn.rotate(getAngle());
-		 toReturn.updateBounds();
-
-		 return toReturn;
-	 }
 	 
 	 public void blink(){
 		 if(blinkTimer == null) { initBlinkTimer(); }

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedInhibitorArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedInhibitorArcComponent.java	2014-06-10 16:32:25 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedInhibitorArcComponent.java	2018-10-18 13:14:57 +0000
@@ -29,14 +29,29 @@
 
 	public TimedInhibitorArcComponent(TimedOutputArcComponent arc) {
 		super(arc);
+
+		//XXX: se note in funcation
+		addMouseHandler();
 	}
 
 	public TimedInhibitorArcComponent(TimedOutputArcComponent arc, String guard) {
 		super(arc, guard);
+
+		//XXX: se note in funcation
+		addMouseHandler();
 	}
 
 	public TimedInhibitorArcComponent(PlaceTransitionObject source) {
 		super(source);
+
+		//XXX: se note in funcation
+		addMouseHandler();
+	}
+
+	private 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.
+		mouseHandler = new TimedArcHandler(this);
 	}
 
 	public void setUnderlyingArc(TimedInhibitorArc arc) {
@@ -163,11 +178,6 @@
 		
 		arc.setUnderlyingArc(tapn.getInhibitorArcFromPlaceAndTransition(tapn.getPlaceByName(inhibitorArc.source().name()), tapn.getTransitionByName(inhibitorArc.destination().name())));
 		
-		TimedArcHandler timedArcHandler = new TimedArcHandler((DrawingSurfaceImpl)getParent(), arc);
-		arc.addMouseListener(timedArcHandler);
-	//	arc.addMouseWheelListener(timedArcHandler);
-		arc.addMouseMotionListener(timedArcHandler);
-		
 		arc.setGuiModel(guiModel);
 		
 		return arc;

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java	2018-08-05 10:00:26 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java	2018-10-18 13:14:57 +0000
@@ -34,22 +34,40 @@
 	public TimedInputArcComponent(PlaceTransitionObject source) {
 		super(source);
 		init();
-	}
-
-	private void init() {
-		timeInterval = "[0,inf)";
-		updateLabel(true);
+
+		//XXX: se note in funcation
+		addMouseHandler();
+
 	}
 
 	public TimedInputArcComponent(TimedOutputArcComponent arc) {
 		super(arc);
 		init();
+
+		//XXX: se note in funcation
+		addMouseHandler();
+
 	}
 
 	public TimedInputArcComponent(TimedOutputArcComponent arc, String guard) {
 		super(arc);
 		timeInterval = guard;
 		updateLabel(true);
+
+		//XXX: se note in funcation
+		addMouseHandler();
+
+	}
+
+	private void init() {
+		timeInterval = "[0,inf)";
+		updateLabel(true);
+	}
+
+	private 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.
+		mouseHandler = new TimedArcHandler(this);
 	}
 
 	@Override
@@ -147,20 +165,6 @@
 	}
 
 	@Override
-	public TimedInputArcComponent copy() {
-		return new TimedInputArcComponent(new TimedOutputArcComponent(this), timeInterval);
-	}
-
-	@Override
-	public TimedInputArcComponent paste(double despX, double despY,	boolean toAnotherView) {
-		TimedOutputArcComponent copy = new TimedOutputArcComponent(this);
-		copy.setSource(this.getSource());
-		copy.setTarget(this.getTarget());
-		TimedInputArcComponent timedCopy = new TimedInputArcComponent(copy.paste(despX, despY, toAnotherView), timeInterval);
-		return timedCopy;
-	}
-
-	@Override
 	public void setLabelPosition() {
 		/*label.setPosition((int) (myPath.midPoint.x + nameOffsetX)
 				+ label.getWidth() / 2 - 4, (int) (myPath.midPoint.y + nameOffsetY)
@@ -188,11 +192,6 @@
 		arc.getSource().addConnectFrom(arc);
 		arc.getTarget().addConnectTo(arc);
 		
-		TimedArcHandler timedArcHandler = new TimedArcHandler((DrawingSurfaceImpl)getParent(), arc);
-		arc.addMouseListener(timedArcHandler);
-		//arc.addMouseWheelListener(timedArcHandler);
-		arc.addMouseMotionListener(timedArcHandler);
-		
 		arc.setGuiModel(guiModel);
 		
 		return arc;

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java	2018-08-11 10:29:10 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedOutputArcComponent.java	2018-10-18 13:14:57 +0000
@@ -78,6 +78,9 @@
 		super(startPositionXInput, startPositionYInput, endPositionXInput,
 				endPositionYInput, sourceInput, targetInput, weightInput,
 				idInput);
+
+		//XXX: se note in funcation
+		addMouseHandler();
 	}
 
 	/**
@@ -85,11 +88,14 @@
 	 */
 	public TimedOutputArcComponent(PlaceTransitionObject newSource) {
 		super(newSource);
+
+		//XXX: se note in funcation
+		addMouseHandler();
 	}
 
 	public TimedOutputArcComponent(TimedOutputArcComponent arc) {
 		zoom = arc.zoom;
-		label = new NameLabel(zoom);
+
 		myPath = new ArcPath(this);
 		for (int i = 0; i <= arc.myPath.getEndIndex(); i++) {
 			myPath.addPoint(arc.myPath.getPoint(i).getX(), arc.myPath.getPoint(i).getY(), arc.myPath.getPointType(i),zoom);
@@ -99,60 +105,17 @@
 		id = arc.id;
 		this.setSource(arc.getSource());
 		this.setTarget(arc.getTarget());
-	}
-
-	public TimedOutputArcComponent paste(double despX, double despY,
-			boolean toAnotherView) {
-		PlaceTransitionObject source = this.getSource().getLastCopy();
-		PlaceTransitionObject target = this.getTarget().getLastCopy();
-
-		if (source == null && target == null) {
-			// don't paste an arc with neither source nor target
-			return null;
-		}
-
-		if (source == null) {
-			if (toAnotherView) {
-				// if the source belongs to another Petri Net, the arc can't be
-				// pasted
-				return null;
-			} else {
-				source = this.getSource();
-			}
-		}
-
-		if (target == null) {
-			if (toAnotherView) {
-				// if the target belongs to another Petri Net, the arc can't be
-				// pasted
-				return null;
-			} else {
-				target = this.getTarget();
-			}
-		}
-
-		TimedOutputArcComponent copy = new TimedOutputArcComponent(0, 0, // startPoint
-				0, 0, // endPoint
-				source, target, 1, source.getId() + " to "
-						+ target.getId(), false);
-
-		copy.myPath.delete();
-		for (int i = 0; i <= myPath.getEndIndex(); i++) {
-			copy.myPath.addPoint(myPath.getPoint(i).getX() + despX,
-					myPath.getPoint(i).getY() + despY, myPath
-							.getPointType(i));
-			copy.myPath.selectPoint(i);
-		}
-
-		source.addConnectFrom(copy);
-		target.addConnectTo(copy);
-
-		return copy;
-	}
-
-	public TimedOutputArcComponent copy() {
-		return new TimedOutputArcComponent(this);
-	}
+
+		//XXX: se note in funcation
+		addMouseHandler();
+	}
+
+	private 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.
+		mouseHandler = new ArcHandler(this);
+	}
+
 
 	public Command setGuardAndWeight(TimeInterval guard, Weight weight) {
 
@@ -265,11 +228,6 @@
 		
 		newCopyArc.getSource().addConnectFrom(newCopyArc);
 		newCopyArc.getTarget().addConnectTo(newCopyArc);
-				
-		ArcHandler arcHandler = new ArcHandler((DrawingSurfaceImpl)getParent(), newCopyArc);
-		newCopyArc.addMouseListener(arcHandler);
-		//arc.addMouseWheelListener(arcHandler);
-		newCopyArc.addMouseMotionListener(arcHandler);
 		
 		newCopyArc.setGuiModel(guiModel);
 		

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java	2018-04-29 09:54:50 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java	2018-10-18 13:14:57 +0000
@@ -25,11 +25,8 @@
 
 import pipe.dataLayer.DataLayer;
 import pipe.gui.CreateGui;
-import pipe.gui.DrawingSurfaceImpl;
 import pipe.gui.Pipe;
-import pipe.gui.Zoomer;
 import pipe.gui.graphicElements.Place;
-import pipe.gui.handler.LabelHandler;
 import pipe.gui.handler.PlaceHandler;
 import pipe.gui.undo.TimedPlaceInvariantEdit;
 import pipe.gui.widgets.EscapableDialog;
@@ -61,27 +58,40 @@
 
 		attributesVisible = true;
 		ageOfTokensWindow = new Window(new Frame());
+
+		//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.
+		addMouseHandler();
 	}
 
 	public TimedPlaceComponent(double positionXInput, double positionYInput,
-			String idInput, String nameInput, Double nameOffsetXInput,
-			Double nameOffsetYInput, int initialMarkingInput,
-			double markingOffsetXInput, double markingOffsetYInput,
-			int capacityInput) {
+			String idInput, Double nameOffsetXInput,
+			Double nameOffsetYInput,
+			double markingOffsetXInput, double markingOffsetYInput) {
 
-		super(positionXInput, positionYInput, idInput, nameInput,
-				nameOffsetXInput, nameOffsetYInput, initialMarkingInput,
-				markingOffsetXInput, markingOffsetYInput, capacityInput);
+		super(positionXInput, positionYInput, idInput,
+				nameOffsetXInput, nameOffsetYInput,
+				markingOffsetXInput, markingOffsetYInput);
 		listener = timedPlaceListener();
 		attributesVisible = true;
 		ageOfTokensWindow = new Window(new Frame());
+
+		//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.
+		addMouseHandler();
+	}
+
+	private 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.
+		mouseHandler = new PlaceHandler(this);
 	}
 
 	private TimedPlaceListener timedPlaceListener() {
 		return new TimedPlaceListener() {
 			public void nameChanged(TimedPlaceEvent e) {
 				TimedPlace place = e.source();
-				TimedPlaceComponent.super.setName(place.name());				
+				TimedPlaceComponent.super.setName(place.name());
 			}
 			
 			public void invariantChanged(TimedPlaceEvent e) { 
@@ -93,32 +103,6 @@
 			}
 		};
 	}
-	
-	@Override
-	public TimedPlaceComponent clone() {
-		TimedPlaceComponent toReturn = (TimedPlaceComponent) super.clone();
-
-		toReturn.setInvariant(this.getInvariant());
-		return toReturn;
-
-	}
-
-	@Override
-	public TimedPlaceComponent copy() {
-		TimedPlaceComponent copy = new TimedPlaceComponent(Zoomer
-				.getUnzoomedValue(this.getX(), zoom), Zoomer.getUnzoomedValue(
-						this.getY(), zoom), place);
-		copy.pnName.setName(this.getName());
-		copy.nameOffsetX = nameOffsetX;
-		copy.nameOffsetY = nameOffsetY;
-		copy.capacity = capacity;
-		copy.attributesVisible = attributesVisible;
-		copy.markingOffsetX = markingOffsetX;
-		copy.markingOffsetY = markingOffsetY;
-		copy.setOriginal(this);
-		return copy;
-	}
-
 
 	public String getInvariantAsString() {
 		return getInvariant().toString();
@@ -448,19 +432,9 @@
 	}
 
 	public TimedPlaceComponent copy(TimedArcPetriNet tapn, DataLayer guiModel) {
-		TimedPlaceComponent placeComponent = new TimedPlaceComponent(getPositionXObject(), getPositionYObject(), id, place.name(), nameOffsetX, nameOffsetY, 0, markingOffsetX, markingOffsetY, capacity);
+		TimedPlaceComponent placeComponent = new TimedPlaceComponent(getPositionXObject(), getPositionYObject(), id, nameOffsetX, nameOffsetY, markingOffsetX, markingOffsetY);
 		placeComponent.setUnderlyingPlace(tapn.getPlaceByName(place.name()));
 
-		LabelHandler labelHandler = new LabelHandler(placeComponent.getNameLabel(), placeComponent);
-		placeComponent.getNameLabel().addMouseListener(labelHandler);
-		placeComponent.getNameLabel().addMouseMotionListener(labelHandler);
-		placeComponent.getNameLabel().addMouseWheelListener(labelHandler);
-
-		PlaceHandler placeHandler = new PlaceHandler((DrawingSurfaceImpl)getParent(), placeComponent, guiModel, tapn);
-		placeComponent.addMouseListener(placeHandler);
-		placeComponent.addMouseWheelListener(placeHandler);
-		placeComponent.addMouseMotionListener(placeHandler);
-
 		placeComponent.setGuiModel(guiModel);
 
 		return placeComponent;

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedTransitionComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedTransitionComponent.java	2016-11-14 09:58:40 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedTransitionComponent.java	2018-10-18 13:14:57 +0000
@@ -51,18 +51,34 @@
 		listener = timedTransitionListener();
 		transition.addTimedTransitionListener(listener);
 		attributesVisible = true;
+
+		//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.
+		addMouseHandler();
 	}
 
 	public TimedTransitionComponent(double positionXInput,
-			double positionYInput, String idInput, String nameInput,
+			double positionYInput, String idInput,
 			double nameOffsetXInput, double nameOffsetYInput,
 			boolean timedTransition, boolean infServer, int angleInput,
 			int priority) {
-		super(positionXInput, positionYInput, idInput, nameInput,
+		super(positionXInput, positionYInput, idInput,
 				nameOffsetXInput, nameOffsetYInput, infServer,
 				angleInput, priority);
 		listener = timedTransitionListener();
 		attributesVisible = true;
+
+		//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.
+		addMouseHandler();
+	}
+
+
+	private 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.
+		mouseHandler = new TAPNTransitionHandler(this);
+		addMouseListener(new AnimationHandler());
 	}
 
 	private TimedTransitionListener timedTransitionListener(){
@@ -210,21 +226,9 @@
 	}
 
 	public TimedTransitionComponent copy(TimedArcPetriNet tapn, DataLayer guiModel) {
-		TimedTransitionComponent transitionComponent = new TimedTransitionComponent(getPositionXObject(), getPositionYObject(), id, transition.name(), nameOffsetX, nameOffsetY, true, false, getAngle(), 0);
+		TimedTransitionComponent transitionComponent = new TimedTransitionComponent(getPositionXObject(), getPositionYObject(), id, nameOffsetX, nameOffsetY, true, false, getAngle(), 0);
 		transitionComponent.setUnderlyingTransition(tapn.getTransitionByName(transition.name()));
-
-		LabelHandler labelHandler = new LabelHandler(transitionComponent.getNameLabel(), transitionComponent);
-		transitionComponent.getNameLabel().addMouseListener(labelHandler);
-		transitionComponent.getNameLabel().addMouseMotionListener(labelHandler);
-		transitionComponent.getNameLabel().addMouseWheelListener(labelHandler);
-
-		TransitionHandler transitionHandler = new TAPNTransitionHandler((DrawingSurfaceImpl)getParent(), transitionComponent, guiModel, tapn);
-		transitionComponent.addMouseListener(transitionHandler);
-		transitionComponent.addMouseMotionListener(transitionHandler);
-		transitionComponent.addMouseWheelListener(transitionHandler);
-
-		transitionComponent.addMouseListener(new AnimationHandler());
-
+		
 		transitionComponent.setGuiModel(guiModel);
 
 		return transitionComponent;

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java	2018-04-29 09:54:50 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedTransportArcComponent.java	2018-10-18 13:14:57 +0000
@@ -27,24 +27,34 @@
 	private TimedTransportArcComponent connectedTo = null;
 	private TransportArc underlyingTransportArc;
 
-	public TimedTransportArcComponent(PlaceTransitionObject newSource, int groupNr,
-			boolean isInPreSet) {
+	public TimedTransportArcComponent(PlaceTransitionObject newSource, int groupNr, boolean isInPreSet) {
 		super(new TimedOutputArcComponent(newSource));
 		this.isInPreSet = isInPreSet;
 		setHead();
 		setGroup(groupNr);
 		// hack to reprint the label of the arc
 		updateLabel(true);
+
+		//XXX: se note in funcation
+		addMouseHandler();
 	}
 
-	public TimedTransportArcComponent(TimedInputArcComponent timedArc, int group,
-			boolean isInPreSet) {
+	public TimedTransportArcComponent(TimedInputArcComponent timedArc, int group, boolean isInPreSet) {
 		super(timedArc, "");
 		this.isInPreSet = isInPreSet;
 		setHead();
 		this.setGroup(group);
 		// hack to reprint the label of the arc
 		updateLabel(true);
+
+		//XXX: se note in funcation
+		addMouseHandler();
+	}
+
+	private 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.
+		mouseHandler = new TransportArcHandler(this);
 	}
 
 	public void setUnderlyingArc(TransportArc arc) {
@@ -139,12 +149,6 @@
 	}
 
 	@Override
-	public TimedTransportArcComponent copy() {
-
-		return null;
-	}
-
-	@Override
 	public void delete() {
 		if (underlyingTransportArc != null) {
 			underlyingTransportArc.delete();
@@ -180,26 +184,6 @@
 		connectedTo = a;
 	}
 
-	@Override
-	public TimedTransportArcComponent paste(double despX, double despY,
-			boolean toAnotherView) {
-
-		return null;
-	}
-
-	/*
-	 * public TransportArc getBuddy() { TransportArc toReturn = null; if
-	 * (isInPreSet){ HashMap<TransportArc, TransportArc> transportArcMap =
-	 * (HashMap<TransportArc, TransportArc>) ((HashMap)
-	 * CreateGui.getModel().getTransportArcMap() ). get( this.getTarget() );
-	 * 
-	 * toReturn = transportArcMap.get(this); }else { HashMap<TransportArc,
-	 * TransportArc> transportArcMap = (HashMap<TransportArc, TransportArc>)
-	 * ((HashMap) CreateGui.getModel().getTransportArcMap() ). get(
-	 * this.getSource() ); for ( TransportArc ta : transportArcMap.keySet() ){
-	 * if (transportArcMap.get(ta) == this){ toReturn = ta; } } } return
-	 * toReturn; }
-	 */
 	public boolean isInPreSet() {
 		return isInPreSet;
 	}
@@ -274,12 +258,7 @@
 		
 		arc.getSource().addConnectFrom(arc);
 		arc.getTarget().addConnectTo(arc);
-		
-		TransportArcHandler transportArcHandler = new TransportArcHandler((DrawingSurfaceImpl)getParent(), arc);
-		arc.addMouseListener(transportArcHandler);
-		//arc.addMouseWheelListener(transportArcHandler);
-		arc.addMouseMotionListener(transportArcHandler);
-		
+
 		arc.setGuiModel(guiModel);
 		
 		return arc;

=== modified file 'src/pipe/gui/handler/AnnotationNoteHandler.java'
--- src/pipe/gui/handler/AnnotationNoteHandler.java	2011-10-14 13:00:29 +0000
+++ src/pipe/gui/handler/AnnotationNoteHandler.java	2018-10-18 13:14:57 +0000
@@ -20,8 +20,8 @@
 
 public class AnnotationNoteHandler extends NoteHandler {
 
-	public AnnotationNoteHandler(Container contentpane, AnnotationNote note) {
-		super(contentpane, note);
+	public AnnotationNoteHandler(AnnotationNote note) {
+		super(note);
 		enablePopup = true;
 	}
 

=== modified file 'src/pipe/gui/handler/ArcHandler.java'
--- src/pipe/gui/handler/ArcHandler.java	2018-05-13 14:57:15 +0000
+++ src/pipe/gui/handler/ArcHandler.java	2018-10-18 13:14:57 +0000
@@ -24,8 +24,8 @@
  */
 public class ArcHandler extends PetriNetObjectHandler {
 
-	public ArcHandler(Container contentpane, Arc obj) {
-		super(contentpane, obj);
+	public ArcHandler(Arc obj) {
+		super(obj);
 		enablePopup = true;
 	}
 
@@ -86,7 +86,7 @@
 			// Calculate translation in mouse
 			int transX = (Grid.getModifiedX(e.getX() - dragInit.x));
 			int transY = (Grid.getModifiedY(e.getY() - dragInit.y));
-			((DrawingSurfaceImpl) contentPane).getSelectionObject()
+			myObject.getParent().getSelectionObject()
 					.translateSelection(transX, transY);
 			dragInit.translate(
 					-(currentObject.getLocation().x - oldLocation.x - transX),

=== modified file 'src/pipe/gui/handler/ArcPathPointHandler.java'
--- src/pipe/gui/handler/ArcPathPointHandler.java	2018-05-13 14:57:15 +0000
+++ src/pipe/gui/handler/ArcPathPointHandler.java	2018-10-18 13:14:57 +0000
@@ -5,7 +5,6 @@
  */
 package pipe.gui.handler;
 
-import java.awt.Container;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
 
@@ -19,8 +18,8 @@
 
 public class ArcPathPointHandler extends PetriNetObjectHandler {
 
-	public ArcPathPointHandler(Container contentpane, ArcPathPoint obj) {
-		super(contentpane, obj);
+	public ArcPathPointHandler(ArcPathPoint obj) {
+		super(obj);
 		enablePopup = true;
 	}
 

=== modified file 'src/pipe/gui/handler/NoteHandler.java'
--- src/pipe/gui/handler/NoteHandler.java	2011-09-22 13:02:33 +0000
+++ src/pipe/gui/handler/NoteHandler.java	2018-10-18 13:14:57 +0000
@@ -7,8 +7,8 @@
 
 public class NoteHandler extends PetriNetObjectHandler {
 
-	public NoteHandler(Container contentpane, Note note) {
-		super(contentpane, note);
+	public NoteHandler(Note note) {
+		super(note);
 		enablePopup = true;
 	}
 

=== modified file 'src/pipe/gui/handler/PetriNetObjectHandler.java'
--- src/pipe/gui/handler/PetriNetObjectHandler.java	2018-05-26 19:26:50 +0000
+++ src/pipe/gui/handler/PetriNetObjectHandler.java	2018-10-18 13:14:57 +0000
@@ -26,7 +26,6 @@
 public class PetriNetObjectHandler extends javax.swing.event.MouseInputAdapter
 		implements java.awt.event.MouseWheelListener {
 
-	protected Container contentPane;
 	protected PetriNetObject myObject = null;
 
 	// justSelected: set to true on press, and false on release;
@@ -40,8 +39,7 @@
 	private int totalY = 0;
 
 	// constructor passing in all required objects
-	public PetriNetObjectHandler(Container contentpane, PetriNetObject obj) {
-		contentPane = contentpane;
+	public PetriNetObjectHandler(PetriNetObject obj) {
 		myObject = obj;
 	}
 
@@ -76,8 +74,7 @@
 		if (CreateGui.getApp().getMode() == ElementType.SELECT) {
 			if (!myObject.isSelected()) {
 				if (!e.isShiftDown()) {
-					((DrawingSurfaceImpl) contentPane).getSelectionObject()
-							.clearSelection();
+					myObject.getParent().getSelectionObject().clearSelection();
 				}
 				myObject.select();
 				justSelected = true;
@@ -111,8 +108,7 @@
 			if (isDragging) {
 				isDragging = false;
 				CreateGui.getDrawingSurface().getUndoManager().translateSelection(
-						((DrawingSurfaceImpl) contentPane).getSelectionObject()
-								.getSelection(), totalX, totalY);
+						myObject.getParent().getSelectionObject().getSelection(), totalX, totalY);
 				totalX = 0;
 				totalY = 0;
 			} else {
@@ -120,8 +116,7 @@
 					if (e.isShiftDown()) {
 						myObject.deselect();
 					} else {
-						((DrawingSurfaceImpl) contentPane).getSelectionObject()
-								.clearSelection();
+						myObject.getParent().getSelectionObject().clearSelection();
 						myObject.select();
 					}
 				}
@@ -152,8 +147,7 @@
 			// Calculate translation in mouse
 			int transX = Grid.getModifiedX(e.getX() - dragInit.x);
 			int transY = Grid.getModifiedY(e.getY() - dragInit.y);
-			((DrawingSurfaceImpl) contentPane).getSelectionObject()
-					.translateSelection(transX, transY);
+			myObject.getParent().getSelectionObject().translateSelection(transX, transY);
 			
 			//Only register the actual distance and direction moved (in case of dragging past edge)
 			totalX += myObject.getX() - previousX;

=== modified file 'src/pipe/gui/handler/PlaceHandler.java'
--- src/pipe/gui/handler/PlaceHandler.java	2018-05-13 14:57:15 +0000
+++ src/pipe/gui/handler/PlaceHandler.java	2018-10-18 13:14:57 +0000
@@ -29,13 +29,8 @@
  */
 public class PlaceHandler extends PlaceTransitionObjectHandler {
 
-	public PlaceHandler(Container contentpane, Place obj) {
-		super(contentpane, obj);
-	}
-
-	public PlaceHandler(DrawingSurfaceImpl drawingSurfaceImpl, Place newObject,
-			DataLayer guiModel, TimedArcPetriNet model) {
-		super(drawingSurfaceImpl, newObject, guiModel, model);
+	public PlaceHandler(Place obj) {
+		super(obj);
 	}
 
 	/**
@@ -154,10 +149,13 @@
 			return;
 		}
 
-		if (e.getWheelRotation() < 0) {
-			((TimedPlaceComponent)myObject).addTokens(1);
-		} else {
-			((TimedPlaceComponent)myObject).removeTokens(1);
-		}
+		if (myObject instanceof TimedPlaceComponent) {
+            TimedPlaceComponent p = (TimedPlaceComponent) myObject;
+		    if (e.getWheelRotation() < 0) {
+                p.addTokens(1);
+            } else {
+                p.removeTokens(1);
+            }
+        }
 	}
 }

=== modified file 'src/pipe/gui/handler/PlaceTransitionObjectHandler.java'
--- src/pipe/gui/handler/PlaceTransitionObjectHandler.java	2018-05-13 14:57:15 +0000
+++ src/pipe/gui/handler/PlaceTransitionObjectHandler.java	2018-10-18 13:14:57 +0000
@@ -44,27 +44,17 @@
 
 public class PlaceTransitionObjectHandler extends PetriNetObjectHandler {
 	private static final String ERROR_MSG_TWO_ARCS = "We do not allow two arcs from a place to a transition or a transition to a place.";
-	private DataLayer guiModel;
-	private TimedArcPetriNet model;
-
-	public PlaceTransitionObjectHandler(Container contentpane,
-			PlaceTransitionObject obj, DataLayer guiModel,
-			TimedArcPetriNet model) {
-		this(contentpane, obj);
-		this.guiModel = guiModel;
-		this.model = model;
-	}
 
 	// constructor passing in all required objects
-	public PlaceTransitionObjectHandler(Container contentpane,
-			PlaceTransitionObject obj) {
-		super(contentpane, obj);
+	public PlaceTransitionObjectHandler(PlaceTransitionObject obj) {
+		super(obj);
 		enablePopup = true;
 	}
 
 	private void createArc(Arc newArc, PlaceTransitionObject currentObject) {
 		newArc.setZoom(CreateGui.getDrawingSurface().getZoom());
-		contentPane.add(newArc);
+		//Need to be casted to cointainer, as we only add it to the canvas but not the model
+		((Container)CreateGui.getDrawingSurface()).add(newArc);
 		currentObject.addConnectFrom(newArc);
 		CreateGui.getDrawingSurface().createArc = newArc;
 		// addPetriNetObject a handler for shift & esc actions drawing arc
@@ -115,8 +105,7 @@
 				boolean isInPreSet = false;
 				if (currentObject instanceof Place) {
 					isInPreSet = true;
-					Arc arc = new TimedTransportArcComponent(currentObject, 1,
-							isInPreSet);
+					Arc arc = new TimedTransportArcComponent(currentObject, 1, isInPreSet);
 					createArc(arc, currentObject);
 				}
 				break;
@@ -135,20 +124,20 @@
 		super.mouseReleased(e);
 
 		PlaceTransitionObject currentObject = (PlaceTransitionObject) myObject;
-		
-		if (view.createArc == null){
+
+		Arc createArc = view.createArc;
+		if (createArc == null){
 			//If we have no arc, we have nothing to do
 			return;
 		}
 
 		//Check if the mouse was moved since key down event, and we are looking at the target
 		//Break the drawing if this is the case
-		Arc createArc = view.createArc; 
-		if (createArc != null && currentObject != createArc.getSource()){
-		if (createArc.getTarget() == null) {
-			cleanupArc(createArc, view);
-			return;
-		}
+		if (currentObject != createArc.getSource()){
+			if (createArc.getTarget() == null) {
+				cleanupArc(createArc, view);
+				return;
+			}
 		}
 		
 		switch (app.getMode()) {
@@ -163,7 +152,7 @@
 								((TimedTransitionComponent) createTAPNInhibitorArc
 										.getTarget()).underlyingTransition(),
 								TimeInterval.ZERO_INF);
-						model.add(tia);
+						view.getModel().add(tia);
 						createTAPNInhibitorArc.setUnderlyingArc(tia);
 						createTAPNInhibitorArc.updateLabel(true);
 					} catch (RequireException ex) {
@@ -183,14 +172,16 @@
 					createTAPNInhibitorArc.getTransition().updateConnected();
 
 					// Evil hack to prevent the arc being added to GuiView twice
-					contentPane.remove(createTAPNInhibitorArc);
+					//Need to be casted to cointainer, as we only add it to the canvas but not the model
+					((Container)CreateGui.getDrawingSurface()).remove(createTAPNInhibitorArc);
 
-					guiModel.addArc(createTAPNInhibitorArc);
+					view.getGuiModel().addArc(createTAPNInhibitorArc);
 
 					view.addNewPetriNetObject(createTAPNInhibitorArc);
 
-					undoManager.addNewEdit(new AddTimedInhibitorArcCommand(
-							createTAPNInhibitorArc, model, guiModel, view));
+					undoManager.addNewEdit(
+							new AddTimedInhibitorArcCommand(createTAPNInhibitorArc, view.getModel(), view.getGuiModel(), view)
+					);
 
 					freeArc(createTAPNInhibitorArc);
 				}
@@ -200,168 +191,140 @@
 
 			Arc transportArcToCreate = view.createArc;
 
-				if (currentObject != transportArcToCreate.getSource()) {
-
-					transportArcToCreate.setSelectable(true);
-
-					// This is the first step
-					if (transportArcToCreate.getSource() instanceof Place) {
-
-						// mikaelhm - Dont allow a transport arc from place to
-						// transition if there is another arc.
-						boolean existsArc = false;
-
-						// Check if arc has leagal target
-						PlaceTransitionObject target = transportArcToCreate
-								.getTarget();
-						if (!(target instanceof Transition && target != null)) {
-							System.err.println("Error creating transport arc, invalid target");
-							transportArcToCreate.delete();
-							break;
-						}
-
-						Iterator<Arc> arcsFrom = transportArcToCreate
-								.getSource().getConnectFromIterator();
-						// search for pre-existent arcs from transportArcToCreate's source to
-						// transportArcToCreate's target
-						while (arcsFrom.hasNext()) {
-							Arc someArc = (arcsFrom.next());
-							if (someArc == transportArcToCreate) {
-								break;
-							} else if (someArc.getSource() == transportArcToCreate.getSource() && someArc.getTarget() == currentObject) {
-								existsArc = true;
-
-								if (someArc instanceof TimedInhibitorArcComponent) {
-									// user has drawn a transport arc where there is
-									// a TAPNInhibitorArc arc already - This does not make sense.
-									cleanupArc(transportArcToCreate, view);
-									System.out.println(ERROR_MSG_TWO_ARCS);
-									JOptionPane.showMessageDialog(
-													CreateGui.getApp(),
-													ERROR_MSG_TWO_ARCS,
-													"Error",
-													JOptionPane.ERROR_MESSAGE);
-
-								} else if (someArc instanceof TimedTransportArcComponent) {
-									// user has drawn a transport arc where there is
-									// a transport arc already - We do not allow that.
-									cleanupArc(transportArcToCreate, view);
-									System.out.println(ERROR_MSG_TWO_ARCS);
-									JOptionPane.showMessageDialog(CreateGui
-											.getApp(), ERROR_MSG_TWO_ARCS,
-											"Error", JOptionPane.ERROR_MESSAGE);
-
-								} else if (someArc instanceof TimedOutputArcComponent) {
-									// user has drawn a transport arc where there is
-									// a normal arc already - We do not allow that.
-									cleanupArc(transportArcToCreate, view);
-									System.out.println(ERROR_MSG_TWO_ARCS);
-									JOptionPane.showMessageDialog(CreateGui
-											.getApp(), ERROR_MSG_TWO_ARCS,
-											"Error", JOptionPane.ERROR_MESSAGE);
-
-								}
-								break;
-							}
-						}
-						if (existsArc) {
-							transportArcToCreate.delete();
-							break;
-						}
-
-						int groupMaxCounter = 0;
-
-						for (Object pt : transportArcToCreate.getTarget()
-								.getPostset()) {
-							if (pt instanceof TimedTransportArcComponent) {
-								if (((TimedTransportArcComponent) pt).getGroupNr() > groupMaxCounter) {
-									groupMaxCounter = ((TimedTransportArcComponent) pt).getGroupNr();
-								}
-							}
-						}
-
-						((TimedTransportArcComponent) transportArcToCreate).setGroupNr(groupMaxCounter + 1);
-
-						currentObject.addConnectTo(transportArcToCreate);
-
-						// Evil hack to prevent the arc being added to GuiView
-						// twice
-						contentPane.remove(transportArcToCreate);
-
-						guiModel.addArc((TimedOutputArcComponent) transportArcToCreate);
-						view.addNewPetriNetObject(transportArcToCreate);
-
-						freeArc(transportArcToCreate);
-						
-						// Create the next arc
-						TimedTransportArcComponent arc2 = new TimedTransportArcComponent(currentObject, groupMaxCounter + 1, false);
-						
-						//Update the partners for the arcs
-						TimedTransportArcComponent arc1 = ((TimedTransportArcComponent) transportArcToCreate);
-						
-						arc2.setConnectedTo(arc1);
-						arc1.setConnectedTo(arc2);
-										
-						//Draw part 2 of the transport arc
-						createArc(arc2, currentObject);
-						
-
-					} else if (transportArcToCreate.getSource() instanceof Transition) {
-						
-						TimedTransportArcComponent arc2 = (TimedTransportArcComponent) transportArcToCreate;
-						TimedTransportArcComponent arc1 = arc2.getConnectedTo();
-						
-						dk.aau.cs.model.tapn.TransportArc ta;
-						try {
-							ta = new dk.aau.cs.model.tapn.TransportArc(
-									((TimedPlaceComponent) arc1.getSource()).underlyingPlace(),
-									((TimedTransitionComponent) arc2.getSource()).underlyingTransition(),
-									((TimedPlaceComponent) arc2.getTarget()).underlyingPlace(),
-									TimeInterval.ZERO_INF);
-							model.add(ta);
-							((TimedTransportArcComponent) transportArcToCreate).setUnderlyingArc(ta);
-							arc1.setUnderlyingArc(ta);
-							arc1.updateLabel(true);
-							((TimedTransportArcComponent) transportArcToCreate).updateLabel(true);
-						} catch (RequireException ex) {
-							cleanupArc(arc1, view);
-							cleanupArc(arc2, view);
+			if (currentObject != transportArcToCreate.getSource()) {
+
+				transportArcToCreate.setSelectable(true);
+
+				// This is the first step
+				if (transportArcToCreate.getSource() instanceof Place) {
+
+					// mikaelhm - Dont allow a transport arc from place to
+					// transition if there is another arc.
+					boolean existsArc = false;
+
+					// Check if arc has leagal target
+					PlaceTransitionObject target = transportArcToCreate.getTarget();
+					if (!(target instanceof Transition)) {
+						transportArcToCreate.delete();
+						break;
+					}
+
+					Iterator<Arc> arcsFrom = transportArcToCreate.getSource().getConnectFromIterator();
+					// search for pre-existent arcs from transportArcToCreate's source to
+					// transportArcToCreate's target
+					while (arcsFrom.hasNext()) {
+						Arc someArc = (arcsFrom.next());
+						if (someArc == transportArcToCreate) {
+							break;
+						} else if (someArc.getSource() == transportArcToCreate.getSource() && someArc.getTarget() == currentObject) {
+							existsArc = true;
+
+							// There already is a arc between this place and transition
+							cleanupArc(transportArcToCreate, view);
 							JOptionPane.showMessageDialog(
-											CreateGui.getApp(),
-											"There was an error drawing the arc. Possible problems:\n"
-													+ " - There is already an arc between the source place and transition\n"
-													+ " - There is already an arc between the transtion and the target place\n"
-													+ " - You are attempting to draw an arc between a shared transition and a shared place",
-											"Error", JOptionPane.ERROR_MESSAGE);
-							break;
-						}
-
-						// Evil hack to prevent the arc being added to GuiView
-						// twice
-						contentPane.remove(arc2);
-
-						guiModel.addArc(arc2);
-						view.addNewPetriNetObject(arc2);
-						
-						currentObject.addConnectTo(arc2);
-						
-						undoManager.newEdit();
-
-						undoManager.addEdit(
-								new AddTransportArcCommand(
-										arc2,
-										arc2.underlyingTransportArc(), 
-										model, 
-										guiModel, 
-										view));
-
-						freeArc(transportArcToCreate);
-
-						arc2.setGroupNr(arc1.getGroupNr());
-					}
-
+									CreateGui.getApp(),
+									ERROR_MSG_TWO_ARCS,
+									"Error",
+									JOptionPane.ERROR_MESSAGE);
+						}
+					}
+					if (existsArc) {
+						transportArcToCreate.delete();
+						break;
+					}
+
+					int groupMaxCounter = 0;
+
+					for (Object pt : transportArcToCreate.getTarget().getPostset()) {
+						if (pt instanceof TimedTransportArcComponent) {
+							if (((TimedTransportArcComponent) pt).getGroupNr() > groupMaxCounter) {
+								groupMaxCounter = ((TimedTransportArcComponent) pt).getGroupNr();
+							}
+						}
+					}
+
+					((TimedTransportArcComponent) transportArcToCreate).setGroupNr(groupMaxCounter + 1);
+
+					currentObject.addConnectTo(transportArcToCreate);
+
+					// Evil hack to prevent the arc being added to GuiView twice
+					//Need to be casted to cointainer, as we only add it to the canvas but not the model
+					((Container) CreateGui.getDrawingSurface()).remove(transportArcToCreate);
+
+					view.getGuiModel().addArc((TimedOutputArcComponent) transportArcToCreate);
+					view.addNewPetriNetObject(transportArcToCreate);
+
+					freeArc(transportArcToCreate);
+
+					// Create the next arc
+					TimedTransportArcComponent arc2 = new TimedTransportArcComponent(currentObject, groupMaxCounter + 1, false);
+
+					//Update the partners for the arcs
+					TimedTransportArcComponent arc1 = ((TimedTransportArcComponent) transportArcToCreate);
+
+					arc2.setConnectedTo(arc1);
+					arc1.setConnectedTo(arc2);
+
+					//Draw part 2 of the transport arc
+					createArc(arc2, currentObject);
+
+
+				} else if (transportArcToCreate.getSource() instanceof Transition) {
+
+					TimedTransportArcComponent arc2 = (TimedTransportArcComponent) transportArcToCreate;
+					TimedTransportArcComponent arc1 = arc2.getConnectedTo();
+
+					dk.aau.cs.model.tapn.TransportArc ta;
+					try {
+						ta = new dk.aau.cs.model.tapn.TransportArc(
+								((TimedPlaceComponent) arc1.getSource()).underlyingPlace(),
+								((TimedTransitionComponent) arc2.getSource()).underlyingTransition(),
+								((TimedPlaceComponent) arc2.getTarget()).underlyingPlace(),
+								TimeInterval.ZERO_INF);
+						view.getModel().add(ta);
+						((TimedTransportArcComponent) transportArcToCreate).setUnderlyingArc(ta);
+						arc1.setUnderlyingArc(ta);
+						arc1.updateLabel(true);
+						((TimedTransportArcComponent) transportArcToCreate).updateLabel(true);
+					} catch (RequireException ex) {
+						cleanupArc(arc1, view);
+						cleanupArc(arc2, view);
+						JOptionPane.showMessageDialog(
+								CreateGui.getApp(),
+								"There was an error drawing the arc. Possible problems:\n"
+										+ " - There is already an arc between the source place and transition\n"
+										+ " - There is already an arc between the transtion and the target place\n"
+										+ " - You are attempting to draw an arc between a shared transition and a shared place",
+								"Error", JOptionPane.ERROR_MESSAGE);
+						break;
+					}
+
+					// Evil hack to prevent the arc being added to GuiView twice
+					//Need to be casted to cointainer, as we only add it to the canvas but not the model
+					((Container) CreateGui.getDrawingSurface()).remove(arc2);
+
+					view.getGuiModel().addArc(arc2);
+					view.addNewPetriNetObject(arc2);
+
+					currentObject.addConnectTo(arc2);
+
+					undoManager.newEdit();
+
+					undoManager.addEdit(
+							new AddTransportArcCommand(
+									arc2,
+									arc2.underlyingTransportArc(),
+									view.getModel(),
+									view.getGuiModel(),
+									view));
+
+					freeArc(transportArcToCreate);
+
+					arc2.setGroupNr(arc1.getGroupNr());
 				}
 
+			}
+
 
 			break;
 		case TAPNARC:
@@ -380,14 +343,14 @@
 						TimedOutputArcComponent outputArc = (TimedOutputArcComponent) timedArcToCreate;
 						
 						try {
-							if(hasArcFromTransitionToPlace(model,((TimedTransitionComponent) outputArc.getSource()), ((TimedPlaceComponent) outputArc.getTarget()))){
+							if(hasArcFromTransitionToPlace(view.getModel(),((TimedTransitionComponent) outputArc.getSource()), ((TimedPlaceComponent) outputArc.getTarget()))){
 								throw new RequireException(ERROR_MSG_TWO_ARCS);
 							}
 							
 							dk.aau.cs.model.tapn.TimedOutputArc timedOutputArc = new TimedOutputArc(
 									((TimedTransitionComponent) outputArc.getSource()).underlyingTransition(),
 									((TimedPlaceComponent) outputArc.getTarget()).underlyingPlace());
-							model.add(timedOutputArc);
+							view.getModel().add(timedOutputArc);
 							outputArc.setUnderlyingArc(timedOutputArc);
 							outputArc.updateLabel(true);
 						} catch (RequireException ex) {
@@ -402,18 +365,18 @@
 						}
 						currentObject.addConnectTo(timedArcToCreate);
 
-						// Evil hack to prevent the arc being added to GuiView
-						// twice
-						contentPane.remove(timedArcToCreate);
+						// Evil hack to prevent the arc being added to GuiView twice
+						//Need to be casted to cointainer, as we only add it to the canvas but not the model
+						((Container)CreateGui.getDrawingSurface()).remove(timedArcToCreate);
 
-						guiModel.addArc((TimedOutputArcComponent) timedArcToCreate);
+						view.getGuiModel().addArc((TimedOutputArcComponent) timedArcToCreate);
 						view.addNewPetriNetObject(timedArcToCreate);
 						
 						undoManager.newEdit(); // new "transaction""
 						
 						undoManager.addEdit(new AddTimedOutputArcCommand(
 								(TimedOutputArcComponent) timedArcToCreate,
-								model, guiModel, view));
+								view.getModel(), view.getGuiModel(), view));
 
 						// else source is a place (not transition)
 					} else {
@@ -421,7 +384,7 @@
 						// Set underlying TimedInputArc
 						TimedInputArcComponent timedArc = (TimedInputArcComponent) timedArcToCreate;
 						try {
-							if(hasArcFromPlaceToTransition(model,((TimedPlaceComponent) timedArc.getSource()), ((TimedTransitionComponent) timedArc.getTarget()))){
+							if(hasArcFromPlaceToTransition(view.getModel(),((TimedPlaceComponent) timedArc.getSource()), ((TimedTransitionComponent) timedArc.getTarget()))){
 								throw new RequireException("Cannot have two arcs between the same place and transition");
 							}
 							
@@ -429,7 +392,7 @@
 									((TimedPlaceComponent) timedArc.getSource()).underlyingPlace(),
 									((TimedTransitionComponent) timedArc.getTarget()).underlyingTransition(),
 									TimeInterval.ZERO_INF);
-							model.add(tia);
+							view.getModel().add(tia);
 							timedArc.setUnderlyingArc(tia);
 							timedArc.updateLabel(true);
 						} catch (RequireException ex) {
@@ -447,18 +410,17 @@
 						currentObject.addConnectTo(timedArcToCreate);
 						timedArcToCreate.getTransition().updateConnected();
 
-						// Evil hack to prevent the arc being added to GuiView
-						// twice
-						contentPane.remove(timedArcToCreate);
-						guiModel
-								.addArc((TimedOutputArcComponent) timedArcToCreate);
+						// Evil hack to prevent the arc being added to GuiView twice
+						//Need to be casted to cointainer, as we only add it to the canvas but not the model
+						((Container)CreateGui.getDrawingSurface()).remove(timedArcToCreate);
+						view.getGuiModel().addArc((TimedOutputArcComponent) timedArcToCreate);
 						view.addNewPetriNetObject(timedArcToCreate);
 
 						undoManager.newEdit(); // new "transaction""
 
 						undoManager.addEdit(new AddTimedInputArcCommand(
 								(TimedInputArcComponent) timedArcToCreate,
-								model, guiModel, view));
+								view.getModel(), view.getGuiModel(), view));
 
 					}
 

=== modified file 'src/pipe/gui/handler/TAPNTransitionHandler.java'
--- src/pipe/gui/handler/TAPNTransitionHandler.java	2018-05-13 14:57:15 +0000
+++ src/pipe/gui/handler/TAPNTransitionHandler.java	2018-10-18 13:14:57 +0000
@@ -14,15 +14,10 @@
 
 public class TAPNTransitionHandler extends TransitionHandler {
 
-	public TAPNTransitionHandler(Container contentpane, Transition obj) {
-		super(contentpane, obj);
-
-	}
-
-	public TAPNTransitionHandler(DrawingSurfaceImpl drawingSurfaceImpl,
-			Transition newObject, DataLayer guiModel, TimedArcPetriNet model) {
-		super(drawingSurfaceImpl, newObject, guiModel, model);
-	}
+	public TAPNTransitionHandler(Transition obj) {
+		super(obj);
+	}
+
 
 	// overwrite to remove shift behaviour
 	@Override

=== modified file 'src/pipe/gui/handler/TimedArcHandler.java'
--- src/pipe/gui/handler/TimedArcHandler.java	2012-05-02 07:16:22 +0000
+++ src/pipe/gui/handler/TimedArcHandler.java	2018-10-18 13:14:57 +0000
@@ -19,8 +19,8 @@
 
 public class TimedArcHandler extends ArcHandler {
 
-	public TimedArcHandler(Container contentpane, Arc obj) {
-		super(contentpane, obj);
+	public TimedArcHandler(Arc obj) {
+		super(obj);
 		enablePopup = true;
 	}
 

=== modified file 'src/pipe/gui/handler/TransitionHandler.java'
--- src/pipe/gui/handler/TransitionHandler.java	2018-05-13 14:57:15 +0000
+++ src/pipe/gui/handler/TransitionHandler.java	2018-10-18 13:14:57 +0000
@@ -27,13 +27,8 @@
 public class TransitionHandler extends PlaceTransitionObjectHandler implements
 		java.awt.event.MouseWheelListener {
 
-	public TransitionHandler(Container contentpane, Transition obj) {
-		super(contentpane, obj);
-	}
-
-	public TransitionHandler(DrawingSurfaceImpl drawingSurfaceImpl,
-			Transition newObject, DataLayer guiModel, TimedArcPetriNet model) {
-		super(drawingSurfaceImpl, newObject, guiModel, model);
+	public TransitionHandler(Transition obj) {
+		super(obj);
 	}
 
 	@Override

=== modified file 'src/pipe/gui/handler/TransportArcHandler.java'
--- src/pipe/gui/handler/TransportArcHandler.java	2011-09-22 13:02:33 +0000
+++ src/pipe/gui/handler/TransportArcHandler.java	2018-10-18 13:14:57 +0000
@@ -17,8 +17,8 @@
 
 public class TransportArcHandler extends TimedArcHandler {
 
-	public TransportArcHandler(Container contentpane, Arc obj) {
-		super(contentpane, obj);
+	public TransportArcHandler(Arc obj) {
+		super(obj);
 		enablePopup = true;
 	}
 

=== modified file 'src/pipe/gui/undo/DeletePetriNetObjectEdit.java'
--- src/pipe/gui/undo/DeletePetriNetObjectEdit.java	2011-09-22 14:51:36 +0000
+++ src/pipe/gui/undo/DeletePetriNetObjectEdit.java	2018-10-18 13:14:57 +0000
@@ -25,8 +25,6 @@
 		pnObject = _pnObject;
 		view = _view;
 		model = _model;
-
-		pnObject.markAsDeleted();
 	}
 
 	/** */