Merge lp:~yrke/tapaal/evenMore-gui-cleanup into lp:tapaal

[Kenneth Yrke Jørgensen]

Testing
  - double check that bugs are fixed
  - Play with quick draw (press ctrl while drawing to continue drawing and placing missing place/transtison) - working as expected, ideas to improve.
  - Check that warnings are correctly displayed when drawing invalid nets (eg. double arcs etc)
  - check code diff

[lp:~yrke/tapaal/evenMore-gui-cleanup]

1151. By Kenneth Yrke Jørgensen on 2020-08-04

Removed .THIS file

[Peter Haahr Taankvist (ptaank)]

1. Right now quick draw only works if you are drawing arcs. Maybe it would be nice if it also worked when drawing places and transitions, i.e. it would place a place then start the quick draw.

2. It would be nice if it wasn't possible to place transitions underneath a place when quickdrawing and vice versa.

3. Right now, if you select drawing an arc an click anywhere it will create a new place (unless you click a place or transition) even if you are not holding ctrl. I'm not sure if this is intended. By my intuition it should just do nothing.

4. Just pressing 'A' will add a new edit to the undomanager, which is undoable. Place a place, press 'A', press ctrl + z. I would expect the place to disappear.

5. I cannot verify that https://bugs.launchpad.net/tapaal/+bug/1829887 is fixed. I cannot run it for 100+ seconds before getting an answer. Same for the mac bugs.

6. https://bugs.launchpad.net/tapaal/+bug/1762817 seems to be fixed

[lp:~yrke/tapaal/evenMore-gui-cleanup]

1152. By Kenneth Yrke Jørgensen on 2020-08-06

Added required to use ctrl to start quick draw.

[Kenneth Yrke Jørgensen (yrke)]

(1) & (2) would be nice, but would required some more work on the model before its feasible to implement.

Fixed (3)

(4) is also in trunk, think its a remain from how we used to draw arcs

[Jiri Srba (srba)]

Can 4 be easily fixed in this branch or not?

[lp:~yrke/tapaal/evenMore-gui-cleanup]

1153. By Kenneth Yrke Jørgensen on 2020-08-10

Merged with trunk

1154. By Kenneth Yrke Jørgensen on 2020-08-10

Added logger for memory monitor

1155. By Kenneth Yrke Jørgensen on 2020-08-10

Removed logging of memory command

[Jiri Srba (srba)]

The logic of showing tool tips is reversed (it shows them when the tick is off and the other way round).

review: Needs Fixing

[lp:~yrke/tapaal/evenMore-gui-cleanup]

1156. By Kenneth Yrke Jørgensen on 2020-08-10

Fixed an issue where showTokenAge action was updated insted of showToolTipaction

[Jiri Srba (srba)]

The view option of enabled transitions and future enabled transitions are still broken. Open intro example, go to simulator, deselect future enabled transitions but they are still shown in yellow. The same problem with enabled transitions. Correct behaviour is in 3.6.1

review: Needs Fixing

[Jiri Srba (srba)]

For the quick draw, it would be nice if the ctrl is release that it will finish the quick draw and the dagnlig arc disappers - right now one has to press ESC to finish this.

[lp:~yrke/tapaal/evenMore-gui-cleanup]

1157. By Kenneth Yrke Jørgensen on 2020-08-10

Fixes bug #1891001, no longer hardcoded to alwas show dealy enabled transitions

[Jiri Srba (srba)]

The bug with enabled transitions is almost fixed, small problem remains:

1. Open intro example and go to simulator
2. Select not to show enabled transitions, the panel correctly disappears
3. Go back to editor and back to simulator
4. Now enabled transitions are shown again - turn the feature on and off and they disappear again.

review: Needs Fixing

[Jiri Srba (srba)]

review: Approve

=== modified file 'build.gradle'
--- build.gradle	2020-05-18 06:17:09 +0000
+++ build.gradle	2020-08-10 09:00:56 +0000
@@ -54,6 +54,7 @@
     implementation group: 'commons-cli', name: 'commons-cli', version: '1.4'
     implementation group: 'org.swinglabs.swingx', name: 'swingx-all', version: '1.6.5-1'
     implementation group: 'net.java.dev.jna', name: 'jna', version: '4.5.1'
+    implementation 'org.jetbrains:annotations:16.0.2'
     //compile group: 'com.apple', name: 'AppleJavaExtensions', version: '1.4' // Not working
 
     //Add jars from libs dir

=== removed file 'libs/AppleJavaExtensions.jar'
Binary files libs/AppleJavaExtensions.jar	2014-03-04 11:20:32 +0000 and libs/AppleJavaExtensions.jar	1970-01-01 00:00:00 +0000 differ
=== modified file 'src/dk/aau/cs/approximation/OverApproximation.java'
--- src/dk/aau/cs/approximation/OverApproximation.java	2019-03-22 11:36:50 +0000
+++ src/dk/aau/cs/approximation/OverApproximation.java	2020-08-10 09:00:56 +0000
@@ -63,10 +63,10 @@
 		IntBound newLowerBound = new IntBound((int) Math.floor(oldInterval.lowerBound().value() / denominator));
 
 		return new TimeInterval(
-			 oldInterval.IsLowerBoundNonStrict(),
+			 oldInterval.isLowerBoundNonStrict(),
 			 newLowerBound,
 			 newUpperBound,
-			 oldInterval.IsUpperBoundNonStrict()
+			 oldInterval.isUpperBoundNonStrict()
 			 );
 	}
 	

=== modified file 'src/dk/aau/cs/approximation/UnderApproximation.java'
--- src/dk/aau/cs/approximation/UnderApproximation.java	2019-07-01 08:42:23 +0000
+++ src/dk/aau/cs/approximation/UnderApproximation.java	2020-08-10 09:00:56 +0000
@@ -163,11 +163,11 @@
 					newUpperBound = new IntBound((int) Math.floor((double)oldInterval.upperBound().value() / denominator));
 				}
 				
-				boolean isLowerBoundNonStrict = oldInterval.IsLowerBoundNonStrict();
-				boolean isUpperBoundNonStrict = oldInterval.IsUpperBoundNonStrict();
+				boolean isLowerBoundNonStrict = oldInterval.isLowerBoundNonStrict();
+				boolean isUpperBoundNonStrict = oldInterval.isUpperBoundNonStrict();
 				
 				// if the interval becomes too small we make it a bit bigger to secure, that we do not have to delete the arc
-				if ( (newUpperBound.value() == newLowerBound.value()) && !(oldInterval.IsLowerBoundNonStrict() && oldInterval.IsUpperBoundNonStrict()))
+				if ( (newUpperBound.value() == newLowerBound.value()) && !(oldInterval.isLowerBoundNonStrict() && oldInterval.isUpperBoundNonStrict()))
 				{
 					isUpperBoundNonStrict = true;
 					isLowerBoundNonStrict = true;

=== modified file 'src/dk/aau/cs/debug/Logger.java'
--- src/dk/aau/cs/debug/Logger.java	2017-04-01 10:46:28 +0000
+++ src/dk/aau/cs/debug/Logger.java	2020-08-10 09:00:56 +0000
@@ -21,14 +21,18 @@
 		if (enableDebug) {
 			logDevice.println(log);
 		}
-
 	}
 
+    public static void log(Exception e) {
+        if (enableDebug) {
+            e.printStackTrace();
+        }
+    }
+
 	public static void log(Object log) {
 		if (enableDebug) {
 			logDevice.println(log.toString());
 		}
-
 	}
 
 }

=== modified file 'src/dk/aau/cs/gui/BatchProcessingDialog.java'
--- src/dk/aau/cs/gui/BatchProcessingDialog.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/gui/BatchProcessingDialog.java	2020-08-10 09:00:56 +0000
@@ -360,8 +360,8 @@
 		JPanel fileListPanel = new JPanel(new GridBagLayout());
 		fileListPanel.setBorder(BorderFactory.createTitledBorder("Models"));
 
-		listModel = new DefaultListModel();
-		fileList = new JList(listModel);
+		listModel = new DefaultListModel<>();
+		fileList = new JList<>(listModel);
 		fileList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 		fileList.setSelectedIndex(0);
 		fileList.addKeyListener(new KeyAdapter() {
@@ -383,7 +383,7 @@
 			}
 		});
 
-		fileList.setCellRenderer(new FileNameCellRenderer());
+		fileList.setCellRenderer(new FileNameCellRenderer<>());
 
 		JScrollPane scrollpane = new JScrollPane(fileList);
 		scrollpane.setMinimumSize(new Dimension(175, 225));
@@ -529,7 +529,7 @@
 
 		String[] options = new String[] { name_KeepQueryOption,
 				name_SEARCHWHOLESTATESPACE, name_EXISTDEADLOCK, name_SOUNDNESS, name_STRONGSOUNDNESS};
-		queryPropertyOption = new JComboBox(options);
+		queryPropertyOption = new JComboBox<>(options);
 		queryPropertyOption.setToolTipText(TOOL_TIP_Query_Property_Option);
 		
 		gbc = new GridBagConstraints();
@@ -559,7 +559,7 @@
 				name_OVER_APPROXIMATION,
 				name_UNDER_APPROXIMATION
 				};
-		approximationMethodOption = new JComboBox(options);
+		approximationMethodOption = new JComboBox<>(options);
 		approximationMethodOption.setToolTipText(TOOL_TIP_Approximation_Method_Option_Keep);
 		approximationMethodOption.addActionListener(new ActionListener() {
 			@Override
@@ -796,7 +796,7 @@
 
 		String[] options = new String[] { name_KeepQueryOption, name_SYMMETRY,
 				name_NOSYMMETRY };
-		symmetryOption = new JComboBox(options);
+		symmetryOption = new JComboBox<>(options);
 		symmetryOption.setToolTipText(TOOL_TIP_SymmetryOption);
 
 		gbc = new GridBagConstraints();
@@ -821,7 +821,7 @@
 
 		String[] options = new String[] { name_KeepQueryOption, name_STUBBORNREUDCTION,
 				name_NOSTUBBORNREDUCTION };
-		stubbornReductionOption = new JComboBox(options);
+		stubbornReductionOption = new JComboBox<>(options);
 		stubbornReductionOption.setToolTipText(TOOL_TIP_StubbornReductionOption);
 
 		gbc = new GridBagConstraints();
@@ -944,7 +944,7 @@
 
 		String[] options = new String[] { name_KeepQueryOption, name_HEURISTIC,
 				name_BFS, name_DFS, name_Random };
-		searchOption = new JComboBox(options);
+		searchOption = new JComboBox<>(options);
 		searchOption.setToolTipText(TOOL_TIP_SearchOption);
 
 		gbc = new GridBagConstraints();

=== modified file 'src/dk/aau/cs/gui/DeleteSharedPlaceOrTransition.java'
--- src/dk/aau/cs/gui/DeleteSharedPlaceOrTransition.java	2020-04-18 16:08:44 +0000
+++ src/dk/aau/cs/gui/DeleteSharedPlaceOrTransition.java	2020-08-10 09:00:56 +0000
@@ -54,13 +54,13 @@
 	private static final String TRANSITION_IS_USED_MESSAGE = "<html>The shared transition is used in one or more components.<br/>TAPAAL will unshare all transitions under this name,<br/>but leave the transitions in the components.</html>";
 	private static final String PLACE_IS_USED_MESSAGE = "<html>The shared place is used in one or more components.<br/>TAPAAL will unshare all places under this name,<br/>but leave the places in the components.</html>";
 	
-	JList list;
-	SharedPlacesAndTransitionsPanel sharedPlacesAndTransitionsPanel;
-	TabContent tab;
-	UndoManager undoManager;
-	SharedPlacesListModel sharedPlacesListModel;
-	SharedTransitionsListModel sharedTransitionsListModel;
-	NameGenerator nameGenerator;
+	final JList list;
+	final SharedPlacesAndTransitionsPanel sharedPlacesAndTransitionsPanel;
+	final TabContent tab;
+	final UndoManager undoManager;
+	final SharedPlacesListModel sharedPlacesListModel;
+	final SharedTransitionsListModel sharedTransitionsListModel;
+	final NameGenerator nameGenerator;
 	boolean messageShown;
 	
 	public DeleteSharedPlaceOrTransition(JList list, SharedPlacesAndTransitionsPanel sharedPlacesAndTransitionsPanel, TabContent tab, 
@@ -82,7 +82,7 @@
 		JList listOfComponents = new JList(affectedComponents.toArray());
 		JScrollPane scrollPane = new JScrollPane(listOfComponents);
 		Object[] params = {label, checkBox, new JLabel("Components affected:"), scrollPane};
-		result = JOptionPane.showConfirmDialog(CreateGui.getApp(), params, "Warning", JOptionPane.WARNING_MESSAGE);
+		result = JOptionPane.showConfirmDialog(CreateGui.getApp(), params, "Warning", JOptionPane.OK_CANCEL_OPTION);
 		boolean deleteFromTemplates = checkBox.isSelected();
 		return new DeleteSharedResult(result, deleteFromTemplates);
 	}
@@ -161,13 +161,17 @@
 			for(Template template : tab.allTemplates()){ // TODO: Get rid of pipe references somehow
 				TimedPlaceComponent place = (TimedPlaceComponent)template.guiModel().getPlaceByName(placeToRemove.name());
 				if(place != null){
-					for(Arc arc : place.getPreset()){
-						deleteArc(arc, template);
-					}
-
-					for(Arc arc : place.getPostset()){
-						deleteArc(arc, template);
-					}
+                    //XXX: we need to save arcs to delete, if we delete it while iterating pre/post set it can lead to errors
+                    ArrayList<Arc> arcsToDelete = new ArrayList<>();
+
+                    for(Arc arc : place.getPreset()){
+                        arcsToDelete.add(arc);
+                    }
+
+                    for(Arc arc : place.getPostset()){
+                        arcsToDelete.add(arc);
+                    }
+                    arcsToDelete.forEach(arc->deleteArc(arc, template));
 
 					Command cmd = new DeleteTimedPlaceCommand(place, template.model(), template.guiModel());
 					cmd.redo();
@@ -280,13 +284,17 @@
 			for(Template template : tab.allTemplates()){ // TODO: Get rid of pipe references somehow
 				TimedTransitionComponent transition = (TimedTransitionComponent)template.guiModel().getTransitionByName(transitionToBeRemoved.name());
 				if(transition != null){
+				    //XXX: we need to save arcs to delete, if we delete it while iterating pre/post set it can lead to errors
+				    ArrayList<Arc> arcsToDelete = new ArrayList<>();
+
 					for(Arc arc : transition.getPreset()){
-						deleteArc(arc, template);
+						arcsToDelete.add(arc);
 					}
 
 					for(Arc arc : transition.getPostset()){
-						deleteArc(arc, template);
+						arcsToDelete.add(arc);
 					}
+					arcsToDelete.forEach(arc->deleteArc(arc, template));
 
 					Command c = new DeleteTimedTransitionCommand(transition, transition.underlyingTransition().model(), template.guiModel());
 					undoManager.addEdit(c);
@@ -321,8 +329,8 @@
 	}
 	
 	private static class DeleteSharedResult{
-		public int choice;
-		public boolean deleteFromTemplates;
+		public final int choice;
+		public final boolean deleteFromTemplates;
 		
 		public DeleteSharedResult(int choice, boolean deleteFromTemplates) {
 			this.choice = choice;

=== modified file 'src/dk/aau/cs/gui/FileNameCellRenderer.java'
--- src/dk/aau/cs/gui/FileNameCellRenderer.java	2020-04-18 12:27:02 +0000
+++ src/dk/aau/cs/gui/FileNameCellRenderer.java	2020-08-10 09:00:56 +0000
@@ -7,7 +7,7 @@
 import javax.swing.JList;
 import javax.swing.ListCellRenderer;
 
-public class FileNameCellRenderer extends JLabel implements ListCellRenderer  {
+public class FileNameCellRenderer<T> extends JLabel implements ListCellRenderer<T>  {
 	// Custom cell renderer for the file list to only display the name of the
 	// file	instead of the whole path.{
 	

=== modified file 'src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java'
--- src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java	2020-08-03 14:47:11 +0000
+++ src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java	2020-08-10 09:00:56 +0000
@@ -10,7 +10,6 @@
 import javax.swing.AbstractListModel;
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JList;
@@ -25,7 +24,6 @@
 import net.tapaal.resourcemanager.ResourceManager;
 import pipe.gui.CreateGui;
 import pipe.gui.undo.UndoManager;
-import pipe.gui.widgets.ConstantsPane;
 import pipe.gui.widgets.EscapableDialog;
 
 import dk.aau.cs.gui.components.NonsearchableJList;
@@ -42,10 +40,11 @@
 	private static final String TRANSITIONS = "Transitions";
 	private static final String PLACES = "Places";
 
-	private final JList list = new NonsearchableJList();
+	//XXX contains a SharedTransition SharePlace based on what is displayed, should be a type param
+	private final JList<Object> list = new NonsearchableJList<>();
 	private final SharedPlacesListModel sharedPlacesListModel;
 	private final SharedTransitionsListModel sharedTransitionsListModel;
-	private final JComboBox placesTransitionsComboBox = new JComboBox(new String[]{ PLACES, TRANSITIONS });
+	private final JComboBox<String> placesTransitionsComboBox = new JComboBox<>(new String[]{ PLACES, TRANSITIONS });
 	private final UndoManager undoManager;
 	private final NameGenerator nameGenerator;
 	private final TabContent tab;
@@ -68,8 +67,7 @@
 	//private static final String toolTipSharedPlacesPanel = "Here you can manage the shared places.<html><br/></html>Shared places can link different components.";
 	private static final String toolTipNewTransition = "Create a new transition";
 	private static final String toolTipRenameTransition = "Rename the selected transition";
-	//private static final String toolTipSharedTransitionsPanel = "Here you can manage the shared transitions.<html><br/></html>" +
-		//	"Shared transitions can link different components.";
+	//private static final String toolTipSharedTransitionsPanel = "Here you can manage the shared transitions.<html><br/></html>" + "Shared transitions can link different components.";
 	private static final String toolTipRemoveTransition ="Remove the selected transition";
 	private static final String toolTipChangeBetweenPlacesAndTransitions = "Switch between shared places and transitions";
 
@@ -129,7 +127,7 @@
         list.addListSelectionListener(new ListSelectionListener() {
 			public void valueChanged(ListSelectionEvent e) {
 				if(!e.getValueIsAdjusting()){
-					JList source = (JList)e.getSource();
+					JList<Object> source = (JList<Object>)e.getSource();
 					if(source.getSelectedIndex() == -1){
 						removeButton.setEnabled(false);
 						renameButton.setEnabled(false);
@@ -143,31 +141,36 @@
 					}
 					
 					int index = list.getSelectedIndex();
-					if(index > 0 && list.getSelectedIndices().length == 1)
-						moveUpButton.setEnabled(true);
-					else
-						moveUpButton.setEnabled(false);
+					if(index > 0 && list.getSelectedIndices().length == 1) {
+                        moveUpButton.setEnabled(true);
+                    } else {
+                        moveUpButton.setEnabled(false);
+                    }
 								
 					if(isDisplayingTransitions()) {
-						if(index < sharedTransitionsListModel.getSize() - 1 && list.getSelectedIndices().length == 1)
-							moveDownButton.setEnabled(true);
-						else
-							moveDownButton.setEnabled(false);
+						if(index < sharedTransitionsListModel.getSize() - 1 && list.getSelectedIndices().length == 1) {
+                            moveDownButton.setEnabled(true);
+                        } else {
+                            moveDownButton.setEnabled(false);
+                        }
 						
 						if (sharedTransitionsListModel.getSize() >=2) {
 							sortButton.setEnabled(true);
-						} else
-							sortButton.setEnabled(false);
+						} else {
+                            sortButton.setEnabled(false);
+                        }
 					} else {
-						if(index < sharedPlacesListModel.getSize() - 1 && list.getSelectedIndices().length == 1)
-							moveDownButton.setEnabled(true);
-						else
-							moveDownButton.setEnabled(false);
+						if(index < sharedPlacesListModel.getSize() - 1 && list.getSelectedIndices().length == 1) {
+                            moveDownButton.setEnabled(true);
+                        } else {
+                            moveDownButton.setEnabled(false);
+                        }
 						
 						if (sharedPlacesListModel.getSize() >=2) {
 							sortButton.setEnabled(true);
-						} else
-							sortButton.setEnabled(false);
+						} else {
+                            sortButton.setEnabled(false);
+                        }
 					}
 				}
 			}

=== modified file 'src/dk/aau/cs/gui/TabContent.java'
--- src/dk/aau/cs/gui/TabContent.java	2020-08-07 12:53:14 +0000
+++ src/dk/aau/cs/gui/TabContent.java	2020-08-10 09:00:56 +0000
@@ -1,19 +1,9 @@
 package dk.aau.cs.gui;
 
-import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.geom.Point2D;
-import java.io.*;
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.List;
-
-import javax.swing.*;
-import javax.swing.border.BevelBorder;
-
 import dk.aau.cs.debug.Logger;
+import dk.aau.cs.gui.components.BugHandledJXMultisplitPane;
 import dk.aau.cs.gui.components.StatisticsPanel;
+import dk.aau.cs.gui.components.TransitionFireingComponent;
 import dk.aau.cs.gui.undo.Command;
 import dk.aau.cs.gui.undo.DeleteQueriesCommand;
 import dk.aau.cs.gui.undo.TimedPlaceMarkingEdit;
@@ -21,33 +11,43 @@
 import dk.aau.cs.io.queries.SUMOQueryLoader;
 import dk.aau.cs.io.queries.XMLQueryLoader;
 import dk.aau.cs.model.tapn.*;
+import dk.aau.cs.util.Require;
 import dk.aau.cs.util.Tuple;
 import dk.aau.cs.verification.NameMapping;
 import dk.aau.cs.verification.TAPNComposer;
 import net.tapaal.gui.DrawingSurfaceManager.AbstractDrawingSurfaceManager;
 import net.tapaal.helpers.Reference.MutableReference;
+import net.tapaal.swinghelpers.JSplitPaneFix;
 import org.jdesktop.swingx.MultiSplitLayout.Divider;
 import org.jdesktop.swingx.MultiSplitLayout.Leaf;
 import org.jdesktop.swingx.MultiSplitLayout.Split;
-
-import pipe.dataLayer.*;
+import org.jetbrains.annotations.NotNull;
+import pipe.dataLayer.DataLayer;
+import pipe.dataLayer.NetWriter;
 import pipe.dataLayer.TAPNQuery;
+import pipe.dataLayer.Template;
 import pipe.gui.*;
 import pipe.gui.canvas.DrawingSurfaceImpl;
 import pipe.gui.graphicElements.*;
 import pipe.gui.graphicElements.tapn.*;
 import pipe.gui.undo.*;
 import pipe.gui.widgets.ConstantsPane;
-import pipe.gui.undo.ChangeSpacingEdit;
-import pipe.gui.undo.UndoManager;
-import pipe.gui.widgets.*;
-
-import net.tapaal.swinghelpers.JSplitPaneFix;
-import dk.aau.cs.gui.components.BugHandledJXMultisplitPane;
-import dk.aau.cs.gui.components.TransitionFireingComponent;
-import dk.aau.cs.util.Require;
+import pipe.gui.widgets.QueryPane;
+import pipe.gui.widgets.WorkflowDialog;
 import pipe.gui.widgets.filebrowser.FileBrowser;
 
+import javax.swing.*;
+import javax.swing.border.BevelBorder;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
+import java.awt.geom.Point2D;
+import java.io.*;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.*;
+
 public class TabContent extends JSplitPane implements TabContentActions{
 
     public static class TAPNLens {
@@ -76,18 +76,74 @@
 	private final HashMap<TimedArcPetriNet, DataLayer> guiModels = new HashMap<TimedArcPetriNet, DataLayer>();
 	private final HashMap<DataLayer, TimedArcPetriNet> guiModelToModel = new HashMap<>();
 
+	//XXX: should be replaced iwth DataLayer->Zoomer, TimedArcPetriNet has nothing to do with zooming
 	private final HashMap<TimedArcPetriNet, Zoomer> zoomLevels = new HashMap<TimedArcPetriNet, Zoomer>();
 
 
 	private final UndoManager undoManager = new UndoManager();
 
+    public final static class Result<T,R> {
+        private final T result;
+        private final boolean hasErrors;
+        private final List<R> errors;
+
+        public Result(T result) {
+            hasErrors = false;
+            this.result = result;
+            errors = new ArrayList<>(0);
+        }
+        public Result(Collection<R> errors) {
+            hasErrors = true;
+            this.errors = new ArrayList<>(errors);
+            result = null;
+        }
+    }
+    public final static class RequirementChecker<R> {
+        public final List<R> errors = new LinkedList<R>();
+
+        public final void Not(boolean b, R s) {
+            if (b) {
+                errors.add(s);
+            }
+        }
+
+        public final void notNull(Object c, R s) {
+            if (c == null) {
+                errors.add(s);
+            }
+        }
+
+        public final boolean failed() {
+            return errors.size() != 0;
+        }
+        public final List<R> getErrors() {
+            return Collections.unmodifiableList(errors);
+        }
+    }
+    private enum ModelViolation {
+        
+        //PlaceNotNull("Place can't be null"),
+        //TransitionNotNull("Transion can't be null"),
+        //ModelNotNull("Model can't be null"),
+        MaxOneArcBetweenPlaceAndTransition("There is already an arc between the selected place and transition"),
+        MaxOneArcBetweenTransitionAndPlace("There is already an arc between the selected transition and place"),
+        CantHaveArcBetweenSharedPlaceAndTransition("You are attempting to draw an arc between a shared transition and a shared place");
+
+        private final String errorMessage;
+
+        ModelViolation(String s) {
+            this.errorMessage = s;
+        }
+
+        public String getErrorMessage() { return this.errorMessage;}
+    }
 	public final GuiModelManager guiModelManager = new GuiModelManager();
 	public class GuiModelManager {
 	    public GuiModelManager(){
 
         }
 
-        public void addNewTimedPlace(DataLayer c, Point p){
+        public Result<TimedPlaceComponent, ModelViolation> addNewTimedPlace(DataLayer c, Point p){
 	        Require.notNull(c, "datalyer can't be null");
             Require.notNull(p, "Point can't be null");
 
@@ -97,10 +153,10 @@
             c.addPetriNetObject(pnObject);
 
             getUndoManager().addNewEdit(new AddTimedPlaceCommand(pnObject, guiModelToModel.get(c), c));
-
+            return new Result<>(pnObject);
         }
 
-        public void addNewTimedTransitions(DataLayer c, Point p) {
+        public Result<TimedTransitionComponent, ModelViolation> addNewTimedTransitions(DataLayer c, Point p) {
             dk.aau.cs.model.tapn.TimedTransition transition = new dk.aau.cs.model.tapn.TimedTransition(drawingSurface.getNameGenerator().getNewTransitionName(guiModelToModel.get(c)));
 
             TimedTransitionComponent pnObject = new TimedTransitionComponent(p.x, p.y, transition);
@@ -109,6 +165,7 @@
             c.addPetriNetObject(pnObject);
 
             getUndoManager().addNewEdit(new AddTimedTransitionCommand(pnObject, guiModelToModel.get(c), c));
+            return new Result<>(pnObject);
         }
 
         public void addAnnotationNote(DataLayer c, Point p) {
@@ -122,134 +179,119 @@
             }
         }
 
-        public void addTimedInputArc(DataLayer c, TimedPlaceComponent p, TimedTransitionComponent t, ArcPath path) {
-            Require.notNull(c, "DataLayer can't be null");
-            Require.notNull(p, "Place can't be null");
-            Require.notNull(t, "Transitions can't be null");
-
-            TimedArcPetriNet modelNet = guiModelToModel.get(c);
-
-            if (!modelNet.hasArcFromPlaceToTransition(p.underlyingPlace(), t.underlyingTransition())) {
-
-                TimedInputArc tia = new TimedInputArc(
-                    p.underlyingPlace(),
-                    t.underlyingTransition(),
-                    TimeInterval.ZERO_INF
-                );
-
-                TimedInputArcComponent tiac = new TimedInputArcComponent(p,t,tia);
-
-                if (path != null) {
-                    tiac.setArcPath(new ArcPath(tiac, path));
-                }
-
-                Command edit = new AddTimedInputArcCommand(
-                    tiac,
-                    modelNet,
-                    c
-                );
-                edit.redo();
-
-                undoManager.addNewEdit(edit);
-
-            }  else {
-                //TODO: can't have two arcs between place and transition
-                JOptionPane.showMessageDialog(
-                    CreateGui.getApp(),
-                    "There was an error drawing the arc. Possible problems:\n"
-                        + " - There is already an arc between the selected place and transition\n"
-                        + " - You are attempting to draw an arc between a shared transition and a shared place",
-                    "Error", JOptionPane.ERROR_MESSAGE
-                );
-            }
-        }
-
-        public void addTimedOutputArc(DataLayer c, TimedTransitionComponent t, TimedPlaceComponent p, ArcPath path) {
-            Require.notNull(c, "DataLayer can't be null");
-            Require.notNull(p, "Place can't be null");
-            Require.notNull(t, "Transitions can't be null");
-
-            TimedArcPetriNet modelNet = guiModelToModel.get(c);
-
-            if (!modelNet.hasArcFromTransitionToPlace(t.underlyingTransition(), p.underlyingPlace())) {
-
-                TimedOutputArc toa = new TimedOutputArc(
-                    t.underlyingTransition(),
-                    p.underlyingPlace()
-                );
-
-                TimedOutputArcComponent toac = new TimedOutputArcComponent(t, p, toa);
-
-                if (path != null) {
-                    toac.setArcPath(new ArcPath(toac, path));
-                }
-
-                Command edit = new AddTimedOutputArcCommand(
-                    toac,
-                    modelNet,
-                    c
-                );
-                edit.redo();
-                undoManager.addNewEdit(edit);
-
-            } else {
-
-                JOptionPane.showMessageDialog(
-                    CreateGui.getApp(),
-                    "There was an error drawing the arc. Possible problems:\n"
-                        + " - There is already an arc between the selected place and transition\n"
-                        + " - You are attempting to draw an arc between a shared transition and a shared place",
-                    "Error", JOptionPane.ERROR_MESSAGE
-                );
-
-            }
-
-
-        }
-
-        public void addInhibitorArc(DataLayer c, TimedPlaceComponent p, TimedTransitionComponent t, ArcPath path) {
-            Require.notNull(c, "DataLayer can't be null");
-            Require.notNull(p, "Place can't be null");
-            Require.notNull(t, "Transitions can't be null");
-
-            TimedArcPetriNet modelNet = guiModelToModel.get(c);
-
-            if (!modelNet.hasArcFromPlaceToTransition(p.underlyingPlace(), t.underlyingTransition())) {
-
-                TimedInhibitorArc tiha = new TimedInhibitorArc(
-                    p.underlyingPlace(),
-                    t.underlyingTransition()
-                );
-
-                TimedInhibitorArcComponent tihac = new TimedInhibitorArcComponent(p, t, tiha);
-
-                if (path != null) {
-                    tihac.setArcPath(new ArcPath(tihac, path));
-                }
-
-                Command edit = new AddTimedInhibitorArcCommand(
-                    tihac,
-                    modelNet,
-                    c
-                );
-                edit.redo();
-                undoManager.addNewEdit(edit);
-
-            } else {
-
-                JOptionPane.showMessageDialog(
-                    CreateGui.getApp(),
-                    "There was an error drawing the arc. Possible problems:\n"
-                        + " - There is already an arc between the selected place and transition\n"
-                        + " - You are attempting to draw an arc between a shared transition and a shared place",
-                    "Error", JOptionPane.ERROR_MESSAGE
-                );
-
-            }
-
-        }
-
-        public void addTimedTransportArc(DataLayer c, TimedPlaceComponent p1, TimedTransitionComponent t, TimedPlaceComponent p2, ArcPath path1, ArcPath path2) {
+        public Result<TimedInputArcComponent, ModelViolation> addTimedInputArc(@NotNull DataLayer c, @NotNull TimedPlaceComponent p, @NotNull TimedTransitionComponent t, ArcPath path) {
+            Require.notNull(c, "DataLayer can't be null");
+            Require.notNull(p, "Place can't be null");
+            Require.notNull(t, "Transitions can't be null");
+
+	        var require = new RequirementChecker<ModelViolation>();
+            require.Not(guiModelToModel.get(c).hasArcFromPlaceToTransition(p.underlyingPlace(), t.underlyingTransition()), ModelViolation.MaxOneArcBetweenPlaceAndTransition);
+            require.Not( (p.underlyingPlace().isShared() && t.underlyingTransition().isShared()), ModelViolation.CantHaveArcBetweenSharedPlaceAndTransition);
+
+            if (require.failed()) {
+                return new Result<>(require.getErrors());
+            }
+
+            TimedArcPetriNet modelNet = guiModelToModel.get(c);
+            TimedInputArc tia = new TimedInputArc(
+                p.underlyingPlace(),
+                t.underlyingTransition(),
+                TimeInterval.ZERO_INF
+            );
+
+            TimedInputArcComponent tiac = new TimedInputArcComponent(p, t, tia);
+
+            if (path != null) {
+                tiac.setArcPath(new ArcPath(tiac, path));
+            }
+
+            Command edit = new AddTimedInputArcCommand(
+                tiac,
+                modelNet,
+                c
+            );
+            edit.redo();
+
+            undoManager.addNewEdit(edit);
+
+            return new Result<>(tiac);
+        }
+
+        public Result<TimedOutputArcComponent, ModelViolation> addTimedOutputArc(DataLayer c, TimedTransitionComponent t, TimedPlaceComponent p, ArcPath path) {
+            Require.notNull(c, "DataLayer can't be null");
+            Require.notNull(p, "Place can't be null");
+            Require.notNull(t, "Transitions can't be null");
+
+            var require = new RequirementChecker<ModelViolation>();
+            require.Not(guiModelToModel.get(c).hasArcFromTransitionToPlace(t.underlyingTransition(), p.underlyingPlace()), ModelViolation.MaxOneArcBetweenTransitionAndPlace);
+            require.Not((p.underlyingPlace().isShared() && t.underlyingTransition().isShared()), ModelViolation.CantHaveArcBetweenSharedPlaceAndTransition);
+
+            if (require.failed()) {
+                return new Result<>(require.getErrors());
+            }
+
+            TimedArcPetriNet modelNet = guiModelToModel.get(c);
+
+            TimedOutputArc toa = new TimedOutputArc(
+                t.underlyingTransition(),
+                p.underlyingPlace()
+            );
+
+            TimedOutputArcComponent toac = new TimedOutputArcComponent(t, p, toa);
+
+            if (path != null) {
+                toac.setArcPath(new ArcPath(toac, path));
+            }
+
+            Command edit = new AddTimedOutputArcCommand(
+                toac,
+                modelNet,
+                c
+            );
+            edit.redo();
+            undoManager.addNewEdit(edit);
+
+            return new Result<>(toac);
+        }
+
+        public Result<TimedInhibitorArcComponent, ModelViolation> addInhibitorArc(DataLayer c, TimedPlaceComponent p, TimedTransitionComponent t, ArcPath path) {
+            Require.notNull(c, "DataLayer can't be null");
+            Require.notNull(p, "Place can't be null");
+            Require.notNull(t, "Transitions can't be null");
+
+            TimedArcPetriNet modelNet = guiModelToModel.get(c);
+
+            var require = new RequirementChecker<ModelViolation>();
+            require.Not(modelNet.hasArcFromPlaceToTransition(p.underlyingPlace(), t.underlyingTransition()), ModelViolation.MaxOneArcBetweenPlaceAndTransition);
+            require.Not( (p.underlyingPlace().isShared() && t.underlyingTransition().isShared()), ModelViolation.CantHaveArcBetweenSharedPlaceAndTransition);
+
+            if (require.failed()) {
+                return new Result<>(require.getErrors());
+            }
+
+            TimedInhibitorArc tiha = new TimedInhibitorArc(
+                p.underlyingPlace(),
+                t.underlyingTransition()
+            );
+
+            TimedInhibitorArcComponent tihac = new TimedInhibitorArcComponent(p, t, tiha);
+
+            if (path != null) {
+                tihac.setArcPath(new ArcPath(tihac, path));
+            }
+
+            Command edit = new AddTimedInhibitorArcCommand(
+                tihac,
+                modelNet,
+                c
+            );
+            edit.redo();
+            undoManager.addNewEdit(edit);
+
+            return new Result<>(tihac);
+        }
+
+        public Result<TimedTransportArcComponent, ModelViolation> addTimedTransportArc(DataLayer c, TimedPlaceComponent p1, TimedTransitionComponent t, TimedPlaceComponent p2, ArcPath path1, ArcPath path2) {
             Require.notNull(c, "DataLayer can't be null");
             Require.notNull(p1, "Place1 can't be null");
             Require.notNull(t, "Transitions can't be null");
@@ -257,48 +299,45 @@
 
             TimedArcPetriNet modelNet = guiModelToModel.get(c);
 
-            if (
-                !modelNet.hasArcFromPlaceToTransition(p1.underlyingPlace(), t.underlyingTransition()) &&
-                !modelNet.hasArcFromTransitionToPlace(t.underlyingTransition(), p2.underlyingPlace())
-            ) {
-
-                int groupNr = getNextTransportArcMaxGroupNumber(p1, t);
-
-                TransportArc tta = new TransportArc(p1.underlyingPlace(), t.underlyingTransition(), p2.underlyingPlace());
-
-                TimedTransportArcComponent ttac1 = new TimedTransportArcComponent(p1, t, tta, groupNr);
-                TimedTransportArcComponent ttac2 = new TimedTransportArcComponent(t, p2, tta, groupNr);
-
-                ttac1.setConnectedTo(ttac2);
-                ttac2.setConnectedTo(ttac1);
-
-                if (path1 != null) {
-                    ttac1.setArcPath(new ArcPath(ttac1, path1));
-                }
-                if (path2 != null) {
-                    ttac2.setArcPath(new ArcPath(ttac2, path2));
-                }
-
-                //XXX: the Command should take both arcs
-                Command edit = new AddTransportArcCommand(
-                    ttac2,
-                    tta,
-                    modelNet,
-                    c
-                );
-                edit.redo();
-                undoManager.addNewEdit(edit);
-
-            } else {
-                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
-                );
-            }
+            var require = new RequirementChecker<ModelViolation>();
+            require.Not(modelNet.hasArcFromPlaceToTransition(p1.underlyingPlace(), t.underlyingTransition()), ModelViolation.MaxOneArcBetweenPlaceAndTransition);
+            require.Not(modelNet.hasArcFromTransitionToPlace(t.underlyingTransition(), p2.underlyingPlace()), ModelViolation.MaxOneArcBetweenTransitionAndPlace);
+            require.Not((p1.underlyingPlace().isShared() && t.underlyingTransition().isShared()), ModelViolation.CantHaveArcBetweenSharedPlaceAndTransition);
+            require.Not((p2.underlyingPlace().isShared() && t.underlyingTransition().isShared()), ModelViolation.CantHaveArcBetweenSharedPlaceAndTransition);
+
+            if (require.failed()) {
+                return new Result<>(require.getErrors());
+            }
+
+
+            int groupNr = getNextTransportArcMaxGroupNumber(p1, t);
+
+            TransportArc tta = new TransportArc(p1.underlyingPlace(), t.underlyingTransition(), p2.underlyingPlace());
+
+            TimedTransportArcComponent ttac1 = new TimedTransportArcComponent(p1, t, tta, groupNr);
+            TimedTransportArcComponent ttac2 = new TimedTransportArcComponent(t, p2, tta, groupNr);
+
+            ttac1.setConnectedTo(ttac2);
+            ttac2.setConnectedTo(ttac1);
+
+            if (path1 != null) {
+                ttac1.setArcPath(new ArcPath(ttac1, path1));
+            }
+            if (path2 != null) {
+                ttac2.setArcPath(new ArcPath(ttac2, path2));
+            }
+
+            //XXX: the Command should take both arcs
+            Command edit = new AddTransportArcCommand(
+                ttac2,
+                tta,
+                modelNet,
+                c
+            );
+            edit.redo();
+            undoManager.addNewEdit(edit);
+
+            return new Result<>(ttac1);
 
         }
 
@@ -316,6 +355,31 @@
             return groupMaxCounter+1;
         }
 
+        public void addToken(DataLayer d, TimedPlaceComponent p, int numberOfTokens) {
+	        Require.notNull(d, "Datalayer can't be null");
+	        Require.notNull(p, "TimedPlaceComponent can't be null");
+	        Require.that(numberOfTokens > 0, "Number of tokens to add must be strictly greater than 0");
+
+            Command command = new TimedPlaceMarkingEdit(p, numberOfTokens);
+            command.redo();
+            undoManager.addNewEdit(command);
+        }
+
+        public void removeToken(DataLayer d, TimedPlaceComponent p, int numberOfTokens) {
+            Require.notNull(d, "Datalayer can't be null");
+            Require.notNull(p, "TimedPlaceComponent can't be null");
+            Require.that(numberOfTokens > 0, "Number of tokens to remove must be strictly greater than 0");
+
+            //Can't remove more than the number of tokens
+            int tokensToRemove = Math.min(numberOfTokens, p.getNumberOfTokens());
+
+            //Ignore if number of tokens to remove is 0
+            if (tokensToRemove > 0) {
+                Command command = new TimedPlaceMarkingEdit(p, -tokensToRemove);
+                command.redo();
+                undoManager.addNewEdit(command);
+            }
+        }
 
         public void deleteSelection() {
             // check if queries need to be removed
@@ -1434,7 +1498,8 @@
 
 		if (!animationmode) {
 			if (numberOfActiveTemplates() > 0) {
-				CreateGui.getApp().setGUIMode(GuiFrame.GUIMode.animation);
+				app.ifPresent(o->o.setGUIMode(GuiFrame.GUIMode.animation));
+                switchToAnimationComponents(true);
 
 				setManager(animationModeController);
 
@@ -1470,11 +1535,18 @@
 						"You need at least one active template to enter simulation mode",
 						"Simulation Mode Error", JOptionPane.ERROR_MESSAGE);
 				animationmode = false;
-				CreateGui.getApp().setGUIMode(GuiFrame.GUIMode.draw);
+                app.ifPresent(o->o.setGUIMode(GuiFrame.GUIMode.draw));
 			}
 		} else {
 			drawingSurface().getSelectionObject().clearSelection();
-			CreateGui.getApp().setGUIMode(GuiFrame.GUIMode.draw);
+            app.ifPresent(o->o.setGUIMode(GuiFrame.GUIMode.draw));
+
+            if (isInAnimationMode()) {
+                getAnimator().restoreModel();
+            }
+
+            switchToEditorComponents();
+
 			setManager(notingManager);
 
 			drawingSurface().setBackground(Pipe.ELEMENT_FILL_COLOUR);
@@ -1507,15 +1579,9 @@
                     public void registerEvents() {
                         registerEvent(
                             e -> e.pno instanceof TimedPlaceComponent && e.a == MouseAction.pressed,
-                            e -> placeClicked((TimedPlaceComponent) e.pno)
+                            e -> guiModelManager.addToken(getModel(), (TimedPlaceComponent) e.pno, 1)
                         );
                     }
-
-                    public void placeClicked(TimedPlaceComponent pno) {
-                        Command command = new TimedPlaceMarkingEdit(pno, 1);
-                        command.redo();
-                        undoManager.addNewEdit(command);
-                    }
                 });
                 break;
             case DELTOKEN:
@@ -1524,15 +1590,9 @@
                     public void registerEvents() {
                         registerEvent(
                             e -> e.pno instanceof TimedPlaceComponent && e.a == MouseAction.pressed,
-                            e -> placeClicked((TimedPlaceComponent) e.pno)
+                            e -> guiModelManager.removeToken(getModel(), (TimedPlaceComponent) e.pno, 1)
                         );
                     }
-
-                    public void placeClicked(TimedPlaceComponent pno) {
-                        Command command = new TimedPlaceMarkingEdit(pno, -1);
-                        command.redo();
-                        undoManager.addNewEdit(command);
-                    }
                 });
                 break;
             case TAPNPLACE:
@@ -1660,12 +1720,14 @@
 
     /* GUI Model / Actions */
 
-	Optional<GuiFrameActions>  app = Optional.empty();
-	MutableReference<SafeGuiFrameActions> safeApp = new MutableReference<>();
+	private final MutableReference<GuiFrameActions> app = new MutableReference<>();
+	private final MutableReference<SafeGuiFrameActions> safeApp = new MutableReference<>();
 	@Override
 	public void setApp(GuiFrameActions newApp) {
-		this.app = Optional.ofNullable(newApp);
-		undoManager.setApp(newApp);
+		app.setReference(newApp);
+		undoManager.setApp(app);
+
+		updateFeatureText();
 
 		updateFeatureText();
 
@@ -1918,79 +1980,25 @@
         }
     }
 
-    class CanvasInhibitorarcDrawController extends AbstractDrawingSurfaceManager {
+    final class CanvasInhibitorarcDrawController extends AbstractCanvasArcDrawController {
 
         private TimedTransitionComponent transition;
         private TimedPlaceComponent place;
-        private Arc arc;
-
-        @Override
-        public void registerEvents() {
-            registerEvent(
-                e->e.pno instanceof TimedPlaceComponent && e.a == MouseAction.pressed,
-                e->placeClicked(((TimedPlaceComponent) e.pno))
-            );
-            registerEvent(
-                e->e.pno instanceof TimedTransitionComponent && e.a == MouseAction.pressed,
-                e->transitionClicked(((TimedTransitionComponent) e.pno))
-            );
-            registerEvent(
-                e->e.pno instanceof PlaceTransitionObject && e.a == MouseAction.entered,
-                e->placetranstionMouseOver(((PlaceTransitionObject) e.pno))
-            );
-            registerEvent(
-                e->e.pno instanceof PlaceTransitionObject && e.a == MouseAction.exited,
-                e->placetranstionMouseExited(((PlaceTransitionObject) e.pno))
-            );
-            registerEvent(
-                e->e.pno instanceof PlaceTransitionObject && e.a == MouseAction.moved,
-                e->placetransitionMouseMoved(((PlaceTransitionObject) e.pno), e.e)
-            );
-        }
-
-        private void placetransitionMouseMoved(PlaceTransitionObject pno, MouseEvent e) {
-            if (arc != null) {
-                if (arc.getSource() == pno || !arc.getSource().areNotSameType(pno)) {
-                    //Dispatch event to parent (drawing surface)
-                    e.translatePoint(pno.getX(),pno.getY());
-                    pno.getParent().dispatchEvent(e);
-                }
-            }
-        }
-
-        private void placetranstionMouseExited(PlaceTransitionObject pto) {
-            if (arc != null) {
-                arc.setTarget(null);
-                //XXX this is bad, we have to clean up internal state manually, should be refactored //kyrke - 2019-11-14
-                // Relates to bug #1849786
-                if (pto instanceof Transition) {
-                    ((Transition)pto).removeArcCompareObject(arc);
-                }
-                arc.updateArcPosition();
-            }
-        }
-
-        private void placetranstionMouseOver(PlaceTransitionObject pno) {
-            if (arc != null) {
-                if (arc.getSource() != pno && arc.getSource().areNotSameType(pno)) {
-                    arc.setTarget(pno);
-                    arc.updateArcPosition();
-                }
-            }
-        }
-
-        private void transitionClicked(TimedTransitionComponent pno) {
+
+        protected void transitionClicked(TimedTransitionComponent pno, MouseEvent e) {
             if (place != null && transition == null) {
                 transition = pno;
                 CreateGui.getDrawingSurface().clearAllPrototype();
-                guiModelManager.addInhibitorArc(getModel(), place, transition, arc.getArcPath());
+                var result = guiModelManager.addInhibitorArc(getModel(), place, transition, arc.getArcPath());
+                showPopupIfFailed(result);
                 clearPendingArc();
             }
         }
 
-        private void placeClicked(TimedPlaceComponent pno) {
+        protected void placeClicked(TimedPlaceComponent pno, MouseEvent e) {
             if (place == null && transition == null) {
                 place = pno;
+                connectsTo = 2;
                 arc = new TimedInhibitorArcComponent(pno);
                 //XXX calling zoomUpdate will set the endpoint to 0,0, drawing the arc from source to 0,0
                 //to avoid this we change the endpoint to set the end point to the same as the end point
@@ -2000,68 +2008,33 @@
                 arc.requestFocusInWindow();
                 arc.setSelectable(false);
                 arc.enableDrawingKeyBindings(this::clearPendingArc);
-            } else if (transition != null && place == null) {
-                place = pno;
-                CreateGui.getDrawingSurface().clearAllPrototype();
-                guiModelManager.addTimedOutputArc(getModel(), transition, place, arc.getArcPath());
-                clearPendingArc();
             }
         }
 
-        private void clearPendingArc() {
+        @Override
+        protected void clearPendingArc() {
+            super.clearPendingArc();
             CreateGui.getDrawingSurface().clearAllPrototype();
             place = null;
             transition = null;
             arc = null;
         }
 
-        @Override
-        public void drawingSurfaceMouseMoved(MouseEvent e) {
-            if(arc!=null) {
-                arc.setEndPoint(e.getX(), e.getY(), e.isShiftDown());
-            }
-        }
-
-        @Override
-        public void drawingSurfaceMousePressed(MouseEvent e) {
-            if (arc!=null) {
-                Point p = e.getPoint();
-                int x = Zoomer.getUnzoomedValue(p.x, CreateGui.getDrawingSurface().getZoom());
-                int y = Zoomer.getUnzoomedValue(p.y, CreateGui.getDrawingSurface().getZoom());
-
-                boolean shiftDown = e.isShiftDown();
-                //XXX: x,y is ignored is overwritten when mouse is moved, this just add a new point to the end of list
-                arc.getArcPath().addPoint(arc.getArcPath().getEndIndex(), x,y, shiftDown);
-            }
-        }
-
-        @Override
-        public void registerManager(DrawingSurfaceImpl canvas) {
-            CreateGui.useExtendedBounds = true;
-        }
-
-        @Override
-        public void deregisterManager() {
-            clearPendingArc();
-            CreateGui.useExtendedBounds = false;
-        }
-
-
     }
-    class CanvasArcDrawController extends  AbstractDrawingSurfaceManager {
-        private TimedTransitionComponent transition;
-        private TimedPlaceComponent place;
-        private Arc arc;
+
+    abstract class AbstractCanvasArcDrawController extends AbstractDrawingSurfaceManager {
+        protected Arc arc;
+        protected int connectsTo = 1; // 0 if nothing, 1 if place, 2 if transition
 
         @Override
         public void registerEvents() {
             registerEvent(
                 e->e.pno instanceof TimedPlaceComponent && e.a == MouseAction.pressed,
-                e->placeClicked(((TimedPlaceComponent) e.pno))
+                e->placeClicked(((TimedPlaceComponent) e.pno), e.e)
             );
             registerEvent(
                 e->e.pno instanceof TimedTransitionComponent && e.a == MouseAction.pressed,
-                e->transitionClicked(((TimedTransitionComponent) e.pno))
+                e->transitionClicked(((TimedTransitionComponent) e.pno), e.e)
             );
             registerEvent(
                 e->e.pno instanceof PlaceTransitionObject && e.a == MouseAction.entered,
@@ -2077,7 +2050,78 @@
             );
         }
 
-        private void placetransitionMouseMoved(PlaceTransitionObject pno, MouseEvent e) {
+        protected abstract void transitionClicked(TimedTransitionComponent pno, MouseEvent e);
+        protected abstract void placeClicked(TimedPlaceComponent pno, MouseEvent e);
+
+        protected void clearPendingArc() {
+            connectsTo = 0;
+        };
+
+        @Override
+        public void setupManager() {
+            CreateGui.useExtendedBounds = true;
+        }
+
+        @Override
+        public void teardownManager() {
+            clearPendingArc();
+            CreateGui.useExtendedBounds = false;
+        }
+
+        @Override
+        public void drawingSurfaceMouseMoved(MouseEvent e) {
+            if(arc!=null) {
+                arc.setEndPoint(e.getX(), e.getY(), e.isShiftDown());
+            }
+        }
+
+        @Override
+        public void drawingSurfaceMousePressed(MouseEvent e) {
+            if (arc!=null) {
+                if (!e.isControlDown()) {
+                    Point p = e.getPoint();
+                    int x = Zoomer.getUnzoomedValue(p.x, CreateGui.getDrawingSurface().getZoom());
+                    int y = Zoomer.getUnzoomedValue(p.y, CreateGui.getDrawingSurface().getZoom());
+
+                    boolean shiftDown = e.isShiftDown();
+                    //XXX: x,y is ignored is overwritten when mouse is moved, this just add a new point to the end of list
+                    arc.getArcPath().addPoint(arc.getArcPath().getEndIndex(), x, y, shiftDown);
+                } else if (connectsTo != 0) { // Quick draw
+                    Point p = canvas.adjustPointToGridAndZoom(e.getPoint(), canvas.getZoom());
+
+                    if (connectsTo == 1) { // Place
+                        var r = guiModelManager.addNewTimedPlace(getModel(), p);
+                        placeClicked(r.result, e);
+                    } else { //Transition
+                        var r = guiModelManager.addNewTimedTransitions(getModel(), p);
+                        transitionClicked(r.result, e);
+                    }
+                }
+            } else if (e.isControlDown()){ // Quick draw
+                Point p = canvas.adjustPointToGridAndZoom(e.getPoint(), canvas.getZoom());
+                var r = guiModelManager.addNewTimedPlace(getModel(), p);
+
+                placeClicked(r.result, e);
+            }
+        }
+
+        protected void showPopupIfFailed(Result<?, ModelViolation> result) {
+            if (result.hasErrors) {
+                StringBuilder errorMessage = new StringBuilder();
+                errorMessage.append("There was an error drawing the arc. Possible problems:");
+                for (ModelViolation v : result.errors) {
+                    errorMessage.append("\n  - ").append(v.getErrorMessage());
+                }
+
+                JOptionPane.showMessageDialog(
+                    CreateGui.getApp(),
+                    errorMessage,
+                    "Error", JOptionPane.ERROR_MESSAGE
+                );
+            }
+        }
+
+        protected void placetransitionMouseMoved(PlaceTransitionObject pno, MouseEvent e) {
             if (arc != null) {
                 if (arc.getSource() == pno || !arc.getSource().areNotSameType(pno)) {
                     //Dispatch event to parent (drawing surface)
@@ -2087,7 +2131,7 @@
             }
         }
 
-        private void placetranstionMouseExited(PlaceTransitionObject pto) {
+        protected void placetranstionMouseExited(PlaceTransitionObject pto) {
             if (arc != null) {
                 arc.setTarget(null);
                 //XXX this is bad, we have to clean up internal state manually, should be refactored //kyrke - 2019-11-14
@@ -2099,7 +2143,7 @@
             }
         }
 
-        private void placetranstionMouseOver(PlaceTransitionObject pno) {
+        protected void placetranstionMouseOver(PlaceTransitionObject pno) {
             if (arc != null) {
                 if (arc.getSource() != pno && arc.getSource().areNotSameType(pno)) {
                     arc.setTarget(pno);
@@ -2107,10 +2151,16 @@
                 }
             }
         }
-
-        private void transitionClicked(TimedTransitionComponent pno) {
+    }
+
+    final class CanvasArcDrawController extends AbstractCanvasArcDrawController {
+        private TimedTransitionComponent transition;
+        private TimedPlaceComponent place;
+
+        protected void transitionClicked(TimedTransitionComponent pno, MouseEvent e) {
             if (place == null && transition == null) {
                 transition = pno;
+                connectsTo = 1;
                 arc = new TimedOutputArcComponent(pno);
 
                 //XXX calling zoomUpdate will set the endpoint to 0,0, drawing the arc from source to 0,0
@@ -2124,14 +2174,30 @@
             } else if (place != null && transition == null) {
                 transition = pno;
                 CreateGui.getDrawingSurface().clearAllPrototype();
-                guiModelManager.addTimedInputArc(getModel(), place, transition, arc.getArcPath());
+                var result = guiModelManager.addTimedInputArc(getModel(), place, transition, arc.getArcPath());
+                showPopupIfFailed(result);
                 clearPendingArc();
+
+                if (e != null && e.isControlDown()) {
+                    transition = pno;
+                    connectsTo = 1;
+                    arc = new TimedOutputArcComponent(pno);
+                    //XXX calling zoomUpdate will set the endpoint to 0,0, drawing the arc from source to 0,0
+                    //to avoid this we change the endpoint to set the end point to the same as the end point
+                    //needs further refactorings //kyrke 2019-09-05
+                    arc.setEndPoint(pno.getPositionX(), pno.getPositionY(), false);
+                    CreateGui.getDrawingSurface().addPrototype(arc);
+                    arc.requestFocusInWindow();
+                    arc.setSelectable(false);
+                    arc.enableDrawingKeyBindings(this::clearPendingArc);
+                }
             }
         }
 
-        private void placeClicked(TimedPlaceComponent pno) {
+        protected void placeClicked(TimedPlaceComponent pno, MouseEvent e) {
             if (place == null && transition == null) {
                 place = pno;
+                connectsTo = 2;
                 arc = new TimedInputArcComponent(pno);
                 //XXX calling zoomUpdate will set the endpoint to 0,0, drawing the arc from source to 0,0
                 //to avoid this we change the endpoint to set the end point to the same as the end point
@@ -2144,48 +2210,35 @@
             } else if (transition != null && place == null) {
                 place = pno;
                 CreateGui.getDrawingSurface().clearAllPrototype();
-                guiModelManager.addTimedOutputArc(getModel(), transition, place, arc.getArcPath());
+                var result = guiModelManager.addTimedOutputArc(getModel(), transition, place, arc.getArcPath());
+                showPopupIfFailed(result);
                 clearPendingArc();
+
+                if (e!= null && e.isControlDown()) {
+                    place = pno;
+                    connectsTo = 2;
+                    arc = new TimedInputArcComponent(pno);
+                    //XXX calling zoomUpdate will set the endpoint to 0,0, drawing the arc from source to 0,0
+                    //to avoid this we change the endpoint to set the end point to the same as the end point
+                    //needs further refactorings //kyrke 2019-09-05
+                    arc.setEndPoint(pno.getPositionX(), pno.getPositionY(), false);
+                    CreateGui.getDrawingSurface().addPrototype(arc);
+                    arc.requestFocusInWindow();
+                    arc.setSelectable(false);
+                    arc.enableDrawingKeyBindings(this::clearPendingArc);
+                }
             }
         }
 
-        private void clearPendingArc() {
+        @Override
+        protected void clearPendingArc() {
+            super.clearPendingArc();
             CreateGui.getDrawingSurface().clearAllPrototype();
             place = null;
             transition = null;
             arc = null;
         }
 
-        @Override
-        public void drawingSurfaceMouseMoved(MouseEvent e) {
-            if(arc!=null) {
-                arc.setEndPoint(e.getX(), e.getY(), e.isShiftDown());
-            }
-        }
-
-        @Override
-        public void drawingSurfaceMousePressed(MouseEvent e) {
-            if (arc!=null) {
-                Point p = e.getPoint();
-                int x = Zoomer.getUnzoomedValue(p.x, CreateGui.getDrawingSurface().getZoom());
-                int y = Zoomer.getUnzoomedValue(p.y, CreateGui.getDrawingSurface().getZoom());
-
-                boolean shiftDown = e.isShiftDown();
-                //XXX: x,y is ignored is overwritten when mouse is moved, this just add a new point to the end of list
-                arc.getArcPath().addPoint(arc.getArcPath().getEndIndex(), x,y, shiftDown);
-            }
-        }
-
-        @Override
-        public void registerManager(DrawingSurfaceImpl canvas) {
-            CreateGui.useExtendedBounds = true;
-        }
-
-        @Override
-        public void deregisterManager() {
-            clearPendingArc();
-            CreateGui.useExtendedBounds = false;
-        }
     }
 
 	static class CanvasAnimationController extends AbstractDrawingSurfaceManager {
@@ -2234,7 +2287,23 @@
 				((TimedTransitionComponent) pto).showDInterval(false);
 			}
 		}
-	}
+
+        @Override
+        public void teardownManager() {
+            //Remove all mouse-over menus if we exit animation mode
+            ArrayList<PetriNetObject> selection = CreateGui.getCurrentTab().drawingSurface().getGuiModel().getPNObjects();
+
+            for (PetriNetObject pn : selection) {
+                if (pn instanceof TimedPlaceComponent) {
+                    TimedPlaceComponent place = (TimedPlaceComponent) pn;
+                    place.showAgeOfTokens(false);
+                } else if (pn instanceof TimedTransitionComponent) {
+                    TimedTransitionComponent transition = (TimedTransitionComponent) pn;
+                    transition.showDInterval(false);
+                }
+            }
+        }
+    }
 
 
     MutableReference<AbstractDrawingSurfaceManager> managerRef = new MutableReference<>(notingManager);
@@ -2257,51 +2326,16 @@
         return lens;
     }
 
-    private final class CanvasTransportarcDrawController extends AbstractDrawingSurfaceManager {
+
+    private final class CanvasTransportarcDrawController extends AbstractCanvasArcDrawController {
 
         private TimedTransitionComponent transition;
         private TimedPlaceComponent place1;
         private TimedPlaceComponent place2;
-        private Arc arc;
         private Arc arc1;
         private Arc arc2;
 
-
-        @Override
-        public void registerEvents() {
-            registerEvent(
-                e->e.pno instanceof TimedPlaceComponent && e.a == MouseAction.pressed,
-                e->placeClicked(((TimedPlaceComponent) e.pno))
-            );
-            registerEvent(
-                e->e.pno instanceof TimedTransitionComponent && e.a == MouseAction.pressed,
-                e->transitionClicked(((TimedTransitionComponent) e.pno))
-            );
-            registerEvent(
-                e->e.pno instanceof PlaceTransitionObject && e.a == MouseAction.entered,
-                e->placetranstionMouseOver(((PlaceTransitionObject) e.pno))
-            );
-            registerEvent(
-                e->e.pno instanceof PlaceTransitionObject && e.a == MouseAction.exited,
-                e->placetranstionMouseExited(((PlaceTransitionObject) e.pno))
-            );
-            registerEvent(
-                e->e.pno instanceof PlaceTransitionObject && e.a == MouseAction.moved,
-                e->placetransitionMouseMoved(((PlaceTransitionObject) e.pno), e.e)
-            );
-        }
-
-        private void placetransitionMouseMoved(PlaceTransitionObject pno, MouseEvent e) {
-            if (arc != null) {
-                if (arc.getSource() == pno || !arc.getSource().areNotSameType(pno)) {
-                    //Dispatch event to parent (drawing surface)
-                    e.translatePoint(pno.getX(),pno.getY());
-                    pno.getParent().dispatchEvent(e);
-                }
-            }
-        }
-
-        private void placetranstionMouseExited(PlaceTransitionObject pto) {
+        protected void placetranstionMouseExited(PlaceTransitionObject pto) {
             if (arc != null) {
                 arc.setTarget(null);
                 //XXX this is bad, we have to clean up internal state manually, should be refactored //kyrke - 2019-11-14
@@ -2313,7 +2347,7 @@
             }
         }
 
-        private void placetranstionMouseOver(PlaceTransitionObject pno) {
+        protected void placetranstionMouseOver(PlaceTransitionObject pno) {
             if (arc != null) {
                 if (arc.getSource() != pno && arc.getSource().areNotSameType(pno)) {
                     arc.setTarget(pno);
@@ -2322,9 +2356,10 @@
             }
         }
 
-        private void transitionClicked(TimedTransitionComponent pno) {
+        protected void transitionClicked(TimedTransitionComponent pno, MouseEvent e) {
             if (place1 != null && transition == null) {
                 transition = pno;
+                connectsTo = 1;
                 arc2 = arc = new TimedTransportArcComponent(pno, -1, false);
 
                 //XXX calling zoomUpdate will set the endpoint to 0,0, drawing the arc from source to 0,0
@@ -2338,9 +2373,10 @@
             }
         }
 
-        private void placeClicked(TimedPlaceComponent pno) {
+        protected void placeClicked(TimedPlaceComponent pno, MouseEvent e) {
             if (place1 == null && transition == null) {
                 place1 = pno;
+                connectsTo = 2;
                 arc1 = arc = new TimedTransportArcComponent(pno, -1, true);
                 //XXX calling zoomUpdate will set the endpoint to 0,0, drawing the arc from source to 0,0
                 //to avoid this we change the endpoint to set the end point to the same as the end point
@@ -2353,48 +2389,35 @@
             } else if (transition != null && place2 == null) {
                 place2 = pno;
                 CreateGui.getDrawingSurface().clearAllPrototype();
-                guiModelManager.addTimedTransportArc(getModel(), place1, transition, place2, arc1.getArcPath(), arc2.getArcPath());
+                var result = guiModelManager.addTimedTransportArc(getModel(), place1, transition, place2, arc1.getArcPath(), arc2.getArcPath());
+                showPopupIfFailed(result);
                 clearPendingArc();
+
+                if (e != null && e.isControlDown()) {
+                    place1 = pno;
+                    connectsTo = 2;
+                    arc1 = arc = new TimedTransportArcComponent(pno, -1, true);
+                    //XXX calling zoomUpdate will set the endpoint to 0,0, drawing the arc from source to 0,0
+                    //to avoid this we change the endpoint to set the end point to the same as the end point
+                    //needs further refactorings //kyrke 2019-09-05
+                    arc.setEndPoint(pno.getPositionX(), pno.getPositionY(), false);
+                    CreateGui.getDrawingSurface().addPrototype(arc);
+                    arc.requestFocusInWindow();
+                    arc.setSelectable(false);
+                    arc.enableDrawingKeyBindings(this::clearPendingArc);
+                }
             }
         }
 
-        private void clearPendingArc() {
+        @Override
+        protected void clearPendingArc() {
+            super.clearPendingArc();
             CreateGui.getDrawingSurface().clearAllPrototype();
             place1 = place2 = null;
             transition = null;
             arc = arc1 = arc2 = null;
         }
 
-        @Override
-        public void drawingSurfaceMouseMoved(MouseEvent e) {
-            if(arc!=null) {
-                arc.setEndPoint(e.getX(), e.getY(), e.isShiftDown());
-            }
-        }
-
-        @Override
-        public void drawingSurfaceMousePressed(MouseEvent e) {
-            if (arc!=null) {
-                Point p = e.getPoint();
-                int x = Zoomer.getUnzoomedValue(p.x, CreateGui.getDrawingSurface().getZoom());
-                int y = Zoomer.getUnzoomedValue(p.y, CreateGui.getDrawingSurface().getZoom());
-
-                boolean shiftDown = e.isShiftDown();
-                //XXX: x,y is ignored is overwritten when mouse is moved, this just add a new point to the end of list
-                arc.getArcPath().addPoint(arc.getArcPath().getEndIndex(), x,y, shiftDown);
-            }
-        }
-
-        @Override
-        public void registerManager(DrawingSurfaceImpl canvas) {
-            CreateGui.useExtendedBounds = true;
-        }
-
-        @Override
-        public void deregisterManager() {
-            clearPendingArc();
-            CreateGui.useExtendedBounds = false;
-        }
     }
 
     private class CanvasGeneralDrawController extends AbstractDrawingSurfaceManager {
@@ -2437,14 +2460,41 @@
                 e -> ((Arc)e.pno).getArcPath().hidePoints()
             );
             registerEvent(
+                e->e.pno instanceof TimedOutputArcComponent && e.a == MouseAction.doubleClicked && !e.e.isControlDown(),
+                e -> ((TimedOutputArcComponent) e.pno).showTimeIntervalEditor()
+            );
+            registerEvent(
                 e->e.pno instanceof Arc && e.a == MouseAction.doubleClicked && e.e.isControlDown(),
                 e->arcDoubleClickedWithContrl(((Arc) e.pno), e.e)
             );
             registerEvent(
-                e->e.pno instanceof TimedOutputArcComponent && e.a == MouseAction.doubleClicked && !e.e.isControlDown(),
-                e -> ((TimedOutputArcComponent) e.pno).showTimeIntervalEditor()
-            );
-
+                e->e.pno instanceof TimedPlaceComponent && e.a == MouseAction.wheel && e.e.isShiftDown(),
+                e->timedPlaceMouseWheelWithShift(((TimedPlaceComponent) e.pno), ((MouseWheelEvent) e.e))
+            );
+            registerEvent(
+                e->e.pno instanceof TimedTransitionComponent && e.a == MouseAction.wheel && e.e.isShiftDown(),
+                e->timedTranstionMouseWheelWithShift(((TimedTransitionComponent) e.pno), ((MouseWheelEvent) e.e))
+            );
+
+        }
+
+        private void timedTranstionMouseWheelWithShift(TimedTransitionComponent p, MouseWheelEvent e) {
+            int rotation = 0;
+            if (e.getWheelRotation() < 0) {
+                rotation = -e.getWheelRotation() * 135;
+            } else {
+                rotation = e.getWheelRotation() * 45;
+            }
+
+            CreateGui.getCurrentTab().getUndoManager().addNewEdit(((Transition) p).rotate(rotation));
+        }
+
+        private void timedPlaceMouseWheelWithShift(TimedPlaceComponent p, MouseWheelEvent e) {
+            if (e.getWheelRotation() < 0) {
+                guiModelManager.addToken(getModel(), p, 1);
+            } else {
+                guiModelManager.removeToken(getModel(), p, 1);
+            }
         }
 
         private void arcDoubleClickedWithContrl(Arc arc, MouseEvent e) {

=== modified file 'src/dk/aau/cs/gui/TabTransformer.java'
--- src/dk/aau/cs/gui/TabTransformer.java	2020-05-06 15:19:14 +0000
+++ src/dk/aau/cs/gui/TabTransformer.java	2020-08-10 09:00:56 +0000
@@ -51,7 +51,7 @@
                     DataLayer guiModel = template.guiModel();
                     Place guiSource = guiModel.getPlaceByName(arc.getSource().getName());
                     Transition guiTarget = guiModel.getTransitionByName(arc.getTarget().getName());
-                    Arc newArc = new TimedInputArcComponent(new TimedOutputArcComponent(
+                    TimedInputArcComponent newArc = new TimedInputArcComponent(new TimedOutputArcComponent(
                         guiSource,
                             guiTarget,
                             arc.getWeight().value(),
@@ -64,7 +64,7 @@
                     ArcPath newArcPath = createArcPath(guiModel, oldGuiSource, oldGuiTarget, newArc);
 
                     // Set arcPath, guiModel and connectors
-                    ((TimedInputArcComponent) newArc).setUnderlyingArc(addedArc);
+                    newArc.setUnderlyingArc(addedArc);
                     newArc.setArcPath(newArcPath);
                     newArc.updateArcPosition();
                     guiModel.addPetriNetObject(newArc);

=== modified file 'src/dk/aau/cs/gui/TemplateExplorer.java'
--- src/dk/aau/cs/gui/TemplateExplorer.java	2020-08-04 08:07:21 +0000
+++ src/dk/aau/cs/gui/TemplateExplorer.java	2020-08-10 09:00:56 +0000
@@ -19,7 +19,6 @@
 
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;

=== modified file 'src/dk/aau/cs/gui/components/ConstantsListModel.java'
--- src/dk/aau/cs/gui/components/ConstantsListModel.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/gui/components/ConstantsListModel.java	2020-08-10 09:00:56 +0000
@@ -8,7 +8,7 @@
 import dk.aau.cs.model.tapn.event.ConstantEvent;
 import dk.aau.cs.model.tapn.event.ConstantsListener;
 
-public class ConstantsListModel extends AbstractListModel {
+public class ConstantsListModel extends AbstractListModel<Constant> {
 	
 	private TimedArcPetriNetNetwork network;
 

=== modified file 'src/dk/aau/cs/gui/components/EnabledTransitionsList.java'
--- src/dk/aau/cs/gui/components/EnabledTransitionsList.java	2020-06-21 11:02:36 +0000
+++ src/dk/aau/cs/gui/components/EnabledTransitionsList.java	2020-08-10 09:00:56 +0000
@@ -1,11 +1,7 @@
 package dk.aau.cs.gui.components;
 
 import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Insets;
 
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -13,20 +9,17 @@
 import java.util.Arrays;
 import java.util.Random;
 
-import javax.swing.DefaultListCellRenderer;
 import javax.swing.DefaultListModel;
-import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.border.Border;
 
 import dk.aau.cs.util.IntervalOperations;
 import dk.aau.cs.util.StringComparator;
 
+import org.jetbrains.annotations.NotNull;
 import pipe.dataLayer.Template;
 import pipe.gui.CreateGui;
-import pipe.gui.GuiFrame;
 import pipe.gui.graphicElements.Transition;
 import pipe.gui.graphicElements.tapn.TimedTransitionComponent;
 //TODO clean up!!! 
@@ -173,7 +166,7 @@
 			return template.model().getTransitionByName(transition.getName()).isShared();
 		}
 
-		public int compareTo(ListItem o) {
+		public int compareTo(@NotNull ListItem o) {
 			if(o instanceof TransitionListItem){
 				return compareTo((TransitionListItem)o);
 			} else {
@@ -188,8 +181,8 @@
 			//Sort according to lower bound
 			int result = thisLower.compareTo(otherLower);
 			//According to strict non strict
-			if(result == 0 && this.transition.getDInterval().IsLowerBoundNonStrict() != o.transition.getDInterval().IsLowerBoundNonStrict()){
-				if(this.transition.getDInterval().IsLowerBoundNonStrict()){
+			if(result == 0 && this.transition.getDInterval().isLowerBoundNonStrict() != o.transition.getDInterval().isLowerBoundNonStrict()){
+				if(this.transition.getDInterval().isLowerBoundNonStrict()){
 					result = -1;
 				} else {
 					result = 1;

=== modified file 'src/dk/aau/cs/gui/components/NonsearchableJComboBox.java'
--- src/dk/aau/cs/gui/components/NonsearchableJComboBox.java	2020-04-18 12:27:02 +0000
+++ src/dk/aau/cs/gui/components/NonsearchableJComboBox.java	2020-08-10 09:00:56 +0000
@@ -19,7 +19,7 @@
 		removeKeyListener();
 	}
 
-	public NonsearchableJComboBox(ComboBoxModel aModel) {
+	public NonsearchableJComboBox(ComboBoxModel<E> aModel) {
 		super(aModel);
 		removeKeyListener();
 	}

=== modified file 'src/dk/aau/cs/gui/components/StatisticsPanel.java'
--- src/dk/aau/cs/gui/components/StatisticsPanel.java	2020-08-04 06:34:24 +0000
+++ src/dk/aau/cs/gui/components/StatisticsPanel.java	2020-08-10 09:00:56 +0000
@@ -12,7 +12,6 @@
 import javax.swing.JPanel;
 import javax.swing.JSeparator;
 
-import dk.aau.cs.TCTL.TCTLStateToPathConverter;
 import dk.aau.cs.model.tapn.TimedPlace;
 import pipe.gui.*;
 import pipe.gui.graphicElements.tapn.TimedPlaceComponent;

=== modified file 'src/dk/aau/cs/gui/undo/AddFileBatchProcessingCommand.java'
--- src/dk/aau/cs/gui/undo/AddFileBatchProcessingCommand.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/gui/undo/AddFileBatchProcessingCommand.java	2020-08-10 09:00:56 +0000
@@ -1,8 +1,6 @@
 package dk.aau.cs.gui.undo;
 
 import dk.aau.cs.gui.BatchProcessingDialog;
-import dk.aau.cs.gui.SharedPlacesAndTransitionsPanel;
-import dk.aau.cs.model.tapn.SharedPlace;
 
 import javax.swing.*;
 import java.io.File;
@@ -10,9 +8,10 @@
 
 public class AddFileBatchProcessingCommand extends Command{
     private final DefaultListModel<File> listModel;
-    List<File> files;
-    File file;
+    final List<File> files;
+    final File file;
     private final BatchProcessingDialog dialog;
+
     public AddFileBatchProcessingCommand(DefaultListModel<File> listModel, File file, List<File> files, BatchProcessingDialog dialog){
         this.listModel = listModel;
         this.file = file;

=== modified file 'src/dk/aau/cs/gui/undo/MoveElementDownCommand.java'
--- src/dk/aau/cs/gui/undo/MoveElementDownCommand.java	2020-05-05 18:44:30 +0000
+++ src/dk/aau/cs/gui/undo/MoveElementDownCommand.java	2020-08-10 09:00:56 +0000
@@ -1,15 +1,12 @@
 package dk.aau.cs.gui.undo;
 
-import pipe.dataLayer.Template;
 import pipe.gui.widgets.SidePane;
 
-import javax.swing.*;
-
 public class MoveElementDownCommand extends Command{
-    int oldIndex;
-    int newIndex;
-    SidePane sidePane;
-    JList<Template> templateList;
+    final int oldIndex;
+    final int newIndex;
+    final SidePane sidePane;
+
     public MoveElementDownCommand(SidePane sidePane, int oldIndex, int newIndex){
         this.oldIndex = oldIndex;
         this.newIndex = newIndex;

=== modified file 'src/dk/aau/cs/gui/undo/MoveElementUpCommand.java'
--- src/dk/aau/cs/gui/undo/MoveElementUpCommand.java	2020-05-03 11:28:45 +0000
+++ src/dk/aau/cs/gui/undo/MoveElementUpCommand.java	2020-08-10 09:00:56 +0000
@@ -1,15 +1,12 @@
 package dk.aau.cs.gui.undo;
 
-import pipe.dataLayer.Template;
 import pipe.gui.widgets.SidePane;
 
-import javax.swing.*;
-
 public class MoveElementUpCommand extends Command{
-    int oldIndex;
-    int newIndex;
-    SidePane sidePane;
-    JList<Template> templateList;
+    final int oldIndex;
+    final int newIndex;
+    final SidePane sidePane;
+
     public MoveElementUpCommand(SidePane sidePane, int oldIndex, int newIndex){
         this.oldIndex = oldIndex;
         this.newIndex = newIndex;

=== modified file 'src/dk/aau/cs/gui/undo/MovePlaceTransitionObject.java'
--- src/dk/aau/cs/gui/undo/MovePlaceTransitionObject.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/gui/undo/MovePlaceTransitionObject.java	2020-08-10 09:00:56 +0000
@@ -10,15 +10,16 @@
 	private final int newY;
 	private final int newX;
 	private final PlaceTransitionObject objectToBeMoved;
-	private int oldY;
-	private int oldX;
-	private boolean doUpdate = false;
+	private final int oldY;
+	private final int oldX;
 	
 	
 	public MovePlaceTransitionObject(PlaceTransitionObject object, Point point) {
 		objectToBeMoved = object;
 		this.newX = point.x;
 		this.newY = point.y;
+        this.oldY = objectToBeMoved.getOriginalY();
+        this.oldX = objectToBeMoved.getOriginalX();
 	}
 
 	@Override
@@ -34,19 +35,14 @@
 
 	@Override
 	public void redo() {
-		oldY = objectToBeMoved.getOriginalY();
-		oldX = objectToBeMoved.getOriginalX();
-		
 		objectToBeMoved.setOriginalX(newX);
 		objectToBeMoved.setOriginalY(newY);
 		
-		if(doUpdate) {
-			objectToBeMoved.updateOnMoveOrZoom();
-			objectToBeMoved.repaint();
-			CreateGui.getDrawingSurface().updatePreferredSize();
-		}
-		doUpdate = true;
-		
+
+		objectToBeMoved.updateOnMoveOrZoom();
+		objectToBeMoved.repaint();
+		CreateGui.getDrawingSurface().updatePreferredSize();
+
 	}
 
 }

=== modified file 'src/dk/aau/cs/gui/undo/RemoveFileBatchProcessingCommand.java'
--- src/dk/aau/cs/gui/undo/RemoveFileBatchProcessingCommand.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/gui/undo/RemoveFileBatchProcessingCommand.java	2020-08-10 09:00:56 +0000
@@ -1,8 +1,6 @@
 package dk.aau.cs.gui.undo;
 
 import dk.aau.cs.gui.BatchProcessingDialog;
-import dk.aau.cs.gui.SharedPlacesAndTransitionsPanel;
-import dk.aau.cs.model.tapn.SharedPlace;
 
 import javax.swing.*;
 import java.io.File;
@@ -10,8 +8,8 @@
 
 public class RemoveFileBatchProcessingCommand extends Command{
     private final DefaultListModel<File> listModel;
-    List<File> files;
-    File file;
+    final List<File> files;
+    final File file;
     private final BatchProcessingDialog dialog;
     public RemoveFileBatchProcessingCommand(DefaultListModel<File> listModel, File file, List<File> files, BatchProcessingDialog dialog){
         this.listModel = listModel;

=== modified file 'src/dk/aau/cs/gui/undo/SortConstantsCommand.java'
--- src/dk/aau/cs/gui/undo/SortConstantsCommand.java	2012-01-27 13:27:31 +0000
+++ src/dk/aau/cs/gui/undo/SortConstantsCommand.java	2020-08-10 09:00:56 +0000
@@ -6,8 +6,8 @@
 
 public class SortConstantsCommand extends Command{
 	
-	TabContent tabContent;
-	ConstantsPane constantsPane;
+	final TabContent tabContent;
+	final ConstantsPane constantsPane;
 	Constant[] oldOrder;
 	
 	public SortConstantsCommand(TabContent tabContent, ConstantsPane constantsPane) {

=== modified file 'src/dk/aau/cs/gui/undo/SortQueriesCommand.java'
--- src/dk/aau/cs/gui/undo/SortQueriesCommand.java	2012-01-27 13:27:31 +0000
+++ src/dk/aau/cs/gui/undo/SortQueriesCommand.java	2020-08-10 09:00:56 +0000
@@ -8,7 +8,7 @@
 
 public class SortQueriesCommand extends Command {
 	
-	DefaultListModel listModel;
+	final DefaultListModel listModel;
 	Object[] oldOrder;
 	
 	public SortQueriesCommand(DefaultListModel listModel) {

=== modified file 'src/dk/aau/cs/gui/undo/SortSharedPlacesCommand.java'
--- src/dk/aau/cs/gui/undo/SortSharedPlacesCommand.java	2012-01-27 13:27:31 +0000
+++ src/dk/aau/cs/gui/undo/SortSharedPlacesCommand.java	2020-08-10 09:00:56 +0000
@@ -5,7 +5,7 @@
 
 public class SortSharedPlacesCommand extends Command {
 
-	SharedPlacesListModel listModel;
+	final SharedPlacesListModel listModel;
 	SharedPlace[] oldOrder;
 	
 	public SortSharedPlacesCommand(SharedPlacesListModel listModel) {

=== modified file 'src/dk/aau/cs/gui/undo/SortSharedTransitionsCommand.java'
--- src/dk/aau/cs/gui/undo/SortSharedTransitionsCommand.java	2019-03-22 10:13:18 +0000
+++ src/dk/aau/cs/gui/undo/SortSharedTransitionsCommand.java	2020-08-10 09:00:56 +0000
@@ -5,7 +5,7 @@
 
 public class SortSharedTransitionsCommand extends Command {
 	
-	SharedTransitionsListModel listModel;
+	final SharedTransitionsListModel listModel;
 	SharedTransition[] oldOrder;
 	
 	public SortSharedTransitionsCommand(SharedTransitionsListModel listModel) {

=== modified file 'src/dk/aau/cs/gui/undo/SortTemplatesCommand.java'
--- src/dk/aau/cs/gui/undo/SortTemplatesCommand.java	2019-03-23 23:24:37 +0000
+++ src/dk/aau/cs/gui/undo/SortTemplatesCommand.java	2020-08-10 09:00:56 +0000
@@ -10,10 +10,10 @@
 
 public class SortTemplatesCommand extends Command{
 	TimedArcPetriNet[] oldOrder;
-	TabContent tabContent; 
-	TemplateExplorer templateExplorer;
-	JList<Template> templateList;
-	DefaultListModel<Template> listModel;
+	final TabContent tabContent;
+	final TemplateExplorer templateExplorer;
+	final JList<Template> templateList;
+	final DefaultListModel<Template> listModel;
 	
 	public SortTemplatesCommand(TabContent tabContent, TemplateExplorer templateExplorer, JList<Template> templateList, DefaultListModel<Template> listModel) {
 		this.templateList = templateList;

=== modified file 'src/dk/aau/cs/gui/undo/UpdateNameLabelOffsetCommand.java'
--- src/dk/aau/cs/gui/undo/UpdateNameLabelOffsetCommand.java	2020-04-30 12:57:50 +0000
+++ src/dk/aau/cs/gui/undo/UpdateNameLabelOffsetCommand.java	2020-08-10 09:00:56 +0000
@@ -3,8 +3,11 @@
 import pipe.gui.graphicElements.PetriNetObjectWithLabel;
 
 public class UpdateNameLabelOffsetCommand extends Command {
-	int newXOffset, newYOffset, oldXOffset, oldYOffset;
-	PetriNetObjectWithLabel obj;
+	final int newXOffset;
+    final int newYOffset;
+    final int oldXOffset;
+    final int oldYOffset;
+	final PetriNetObjectWithLabel obj;
 	
 	public UpdateNameLabelOffsetCommand(int newXOffset, int newYOffset, int oldXOffset, int oldYOffset, PetriNetObjectWithLabel obj) {
 		this.obj = obj;

=== modified file 'src/dk/aau/cs/io/LoadedModel.java'
--- src/dk/aau/cs/io/LoadedModel.java	2020-08-04 08:07:21 +0000
+++ src/dk/aau/cs/io/LoadedModel.java	2020-08-10 09:00:56 +0000
@@ -8,9 +8,9 @@
 import pipe.dataLayer.Template;
 import dk.aau.cs.model.tapn.TimedArcPetriNetNetwork;
 
-
 public class LoadedModel implements LoadedBatchProcessingModel {
-	private final Collection<Template> templates;
+
+    private final Collection<Template> templates;
 	private final Collection<TAPNQuery> queries;
 	private final TimedArcPetriNetNetwork network;
     private final boolean isTimed;
@@ -20,9 +20,9 @@
 	public LoadedModel(TimedArcPetriNetNetwork network, Collection<Template> templates, Collection<TAPNQuery> queries, Collection<String> messages){
         this(network, templates, queries, messages, true, false);
     }
-    public LoadedModel(TimedArcPetriNetNetwork network, Collection<Template> templates, Collection<TAPNQuery> queries) {
-	    this(network, templates, queries, List.of());
-    }
+	public LoadedModel(TimedArcPetriNetNetwork network, Collection<Template> templates, Collection<TAPNQuery> queries){
+		this(network, templates, queries, List.of(), true, false);
+	}
 
     public LoadedModel(TimedArcPetriNetNetwork network, Collection<Template> templates, Collection<TAPNQuery> queries, Collection<String> messages, boolean isTimed, boolean isGame){
         this.templates = templates;
@@ -36,9 +36,9 @@
 	public Collection<Template> templates(){ return templates; }
 	public Collection<TAPNQuery> queries(){ return queries; }
 	public TimedArcPetriNetNetwork network(){ return network; }
-
     public Collection<String> getMessages() { return messages; }
 
+
 	public boolean isTimed() {
 	    return isTimed;
     }

=== modified file 'src/dk/aau/cs/io/PNMLoader.java'
--- src/dk/aau/cs/io/PNMLoader.java	2020-07-13 14:30:00 +0000
+++ src/dk/aau/cs/io/PNMLoader.java	2020-08-10 09:00:56 +0000
@@ -275,10 +275,9 @@
 			Node text = getFirstDirectChild(inscription, "text");
 			if(text != null){
 				String weightString = text.getTextContent().trim();
-				try{
-					if(weightString != null)
-						weight = Integer.parseInt(weightString);
-					} catch(NumberFormatException e) {}
+                try {
+                    weight = Integer.parseInt(weightString);
+                } catch (NumberFormatException ignored) {} //Default values is 1
 			}
 		}
 		

=== modified file 'src/dk/aau/cs/io/TapnLegacyXmlLoader.java'
--- src/dk/aau/cs/io/TapnLegacyXmlLoader.java	2020-07-14 10:37:29 +0000
+++ src/dk/aau/cs/io/TapnLegacyXmlLoader.java	2020-08-10 09:00:56 +0000
@@ -81,8 +81,10 @@
 	private boolean firstInhibitorIntervalWarning = true;
 	private boolean firstPlaceRenameWarning = true;
 	private final IdResolver idResolver = new IdResolver();
+
     private final Collection<String> messages = new ArrayList<>(10);
 
+
 	public TapnLegacyXmlLoader() {}
 	
 	public LoadedModel load(InputStream file) throws FormatException {
@@ -204,9 +206,8 @@
                                         String inscriptionTempStorage, PlaceTransitionObject sourceIn,
                                         PlaceTransitionObject targetIn,
                                         int _endx, int _endy) {
-		
-		Arc tempArc;
-		String[] inscriptionSplit = {};
+
+        String[] inscriptionSplit = {};
 		if (inscriptionTempStorage.contains(":")) {
 			inscriptionSplit = inscriptionTempStorage.split(":");
 		}
@@ -214,7 +215,7 @@
 		if (sourceIn instanceof Place) {
 			isInPreSet = true;
 		}
-		tempArc = new TimedTransportArcComponent(new TimedInputArcComponent(new TimedOutputArcComponent(sourceIn, targetIn, 1, idInput)), Integer.parseInt(inscriptionSplit[1]), isInPreSet);
+        TimedTransportArcComponent tempArc = new TimedTransportArcComponent(new TimedInputArcComponent(new TimedOutputArcComponent(sourceIn, targetIn, 1, idInput)), Integer.parseInt(inscriptionSplit[1]), isInPreSet);
 
 
 		if (isInPreSet) {
@@ -231,7 +232,7 @@
 
 				TransportArc transArc = new TransportArc(sourcePlace, trans, destPlace, interval);
 
-				((TimedTransportArcComponent) tempArc).setUnderlyingArc(transArc);
+				tempArc.setUnderlyingArc(transArc);
 				postsetTransportArc.setUnderlyingArc(transArc);
 				guiModel.addPetriNetObject(tempArc);
 				guiModel.addPetriNetObject(postsetTransportArc);
@@ -239,8 +240,8 @@
 
 				postsetArcs.remove(targetIn);
 			} else {
-				presetArcs.put((TimedTransitionComponent) targetIn,	(TimedTransportArcComponent) tempArc);
-				transportArcsTimeIntervals.put((TimedTransportArcComponent) tempArc, TimeInterval.parse(inscriptionSplit[0], constants));
+				presetArcs.put((TimedTransitionComponent) targetIn, tempArc);
+				transportArcsTimeIntervals.put(tempArc, TimeInterval.parse(inscriptionSplit[0], constants));
 			}
 		} else {
 			if (presetArcs.containsKey(sourceIn)) {
@@ -257,7 +258,7 @@
 				TransportArc transArc = new TransportArc(sourcePlace, trans,
 						destPlace, interval);
 
-				((TimedTransportArcComponent) tempArc).setUnderlyingArc(transArc);
+				tempArc.setUnderlyingArc(transArc);
 				presetTransportArc.setUnderlyingArc(transArc);
 				guiModel.addPetriNetObject(presetTransportArc);
 				guiModel.addPetriNetObject(tempArc);
@@ -266,7 +267,7 @@
 				presetArcs.remove(sourceIn);
 				transportArcsTimeIntervals.remove(presetTransportArc);
 			} else {
-				postsetArcs.put((TimedTransitionComponent) sourceIn, (TimedTransportArcComponent) tempArc);
+				postsetArcs.put((TimedTransitionComponent) sourceIn, tempArc);
 			}
 		}
 		return tempArc;
@@ -276,15 +277,15 @@
                                          String inscriptionTempStorage, PlaceTransitionObject sourceIn,
                                          PlaceTransitionObject targetIn,
                                          int _endx, int _endy) throws FormatException {
-		Arc tempArc;
-		tempArc = new TimedInputArcComponent(new TimedOutputArcComponent(sourceIn, targetIn, 1, idInput));
+
+	    TimedInputArcComponent tempArc = new TimedInputArcComponent(new TimedOutputArcComponent(sourceIn, targetIn, 1, idInput));
 
 		TimedPlace place = tapn.getPlaceByName(sourceIn.getName());
 		TimedTransition transition = tapn.getTransitionByName(targetIn.getName());
 		TimeInterval interval = TimeInterval.parse(inscriptionTempStorage, constants);
 
 		TimedInputArc inputArc = new TimedInputArc(place, transition, interval);
-		((TimedInputArcComponent) tempArc).setUnderlyingArc(inputArc);
+		tempArc.setUnderlyingArc(inputArc);
 		
 		if(tapn.hasArcFromPlaceToTransition(inputArc.source(), inputArc.destination())) {
 			throw new FormatException("Multiple arcs between a place and a transition is not allowed");
@@ -300,12 +301,12 @@
                                              String inscriptionTempStorage, PlaceTransitionObject sourceIn,
                                              PlaceTransitionObject targetIn,
                                              int _endx, int _endy) {
-		Arc tempArc;
-		tempArc = new TimedInhibitorArcComponent(
-					new TimedInputArcComponent(
-						new TimedOutputArcComponent(sourceIn, targetIn, 1, idInput)
-					),
-				(inscriptionTempStorage != null ? inscriptionTempStorage : ""));
+        TimedInhibitorArcComponent tempArc = new TimedInhibitorArcComponent(
+            new TimedInputArcComponent(
+                new TimedOutputArcComponent(sourceIn, targetIn, 1, idInput)
+            ),
+            (inscriptionTempStorage != null ? inscriptionTempStorage : "")
+        );
 		TimedPlace place = tapn.getPlaceByName(sourceIn.getName());
 		TimedTransition transition = tapn.getTransitionByName(targetIn.getName());
 		TimeInterval interval = TimeInterval.parse(inscriptionTempStorage, constants);
@@ -317,7 +318,7 @@
 		
 		TimedInhibitorArc inhibArc = new TimedInhibitorArc(place, transition, interval);
 
-		((TimedInhibitorArcComponent) tempArc).setUnderlyingArc(inhibArc);
+		tempArc.setUnderlyingArc(inhibArc);
 		guiModel.addPetriNetObject(tempArc);
 		tapn.add(inhibArc);
 
@@ -528,55 +529,45 @@
 		tapn.add(t);
 	}
 
-	private void parseAndAddPlaceAsOldFormat(Element element, TimedMarking marking) throws FormatException {
-		int positionXInput = (int)getPositionAttribute(element, "x");
-		int positionYInput = (int)getPositionAttribute(element, "y");
-		String idInput = element.getAttribute("id");
-		String nameInput = getChildNodesContentOfValueChildNodeAsString(element, "name");
-		int nameOffsetXInput = (int)getNameOffsetAttribute(element, "x");
-		int nameOffsetYInput = (int)getNameOffsetAttribute(element, "y");
-		int initialMarkingInput = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element, "initialMarking");
-		String invariant = getChildNodesContentOfValueChildNodeAsString(element, "invariant");
-		
-		if (idInput.length() == 0 && nameInput.length() > 0) {
-			idInput = nameInput;
-		}
-
-		if (nameInput.length() == 0 && idInput.length() > 0) {
-			nameInput = idInput;
-		}
-		
-		if(nameInput.toLowerCase().equals("true") || nameInput.toLowerCase().equals("false")) {
-			nameInput = "_" + nameInput;
-			if(firstPlaceRenameWarning) {
-				messages.add(PLACENAME_ERROR_MESSAGE);
-				firstPlaceRenameWarning = false;
-			}
-		}
-		idResolver.add(tapn.name(), idInput, nameInput);
-
-		Place place = null;
-
-//		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, nameOffsetXInput, nameOffsetYInput);
-			
-			LocalTimedPlace p = new LocalTimedPlace(nameInput, TimeInvariant.parse(invariant, constants));
-			tapn.add(p);
-			
-			((TimedPlaceComponent) place).setUnderlyingPlace(p);
-			guiModel.addPetriNetObject(place);
-
-			for (int i = 0; i < initialMarkingInput; i++) {
-				marking.add(new TimedToken(p, new BigDecimal(0.0)));
-			}
-		}
-//	}
+    private void parseAndAddPlaceAsOldFormat(Element element, TimedMarking marking) throws FormatException {
+        int positionXInput = (int) getPositionAttribute(element, "x");
+        int positionYInput = (int) getPositionAttribute(element, "y");
+        String idInput = element.getAttribute("id");
+        String nameInput = getChildNodesContentOfValueChildNodeAsString(element, "name");
+        int nameOffsetXInput = (int) getNameOffsetAttribute(element, "x");
+        int nameOffsetYInput = (int) getNameOffsetAttribute(element, "y");
+        int initialMarkingInput = getContentOfFirstSpecificChildNodesValueChildNodeAsInt(element, "initialMarking");
+        String invariant = getChildNodesContentOfValueChildNodeAsString(element, "invariant");
+
+        if (idInput.length() == 0 && nameInput.length() > 0) {
+            idInput = nameInput;
+        }
+
+        if (nameInput.length() == 0 && idInput.length() > 0) {
+            nameInput = idInput;
+        }
+
+        if (nameInput.toLowerCase().equals("true") || nameInput.toLowerCase().equals("false")) {
+            nameInput = "_" + nameInput;
+            if (firstPlaceRenameWarning) {
+                messages.add(PLACENAME_ERROR_MESSAGE);
+                firstPlaceRenameWarning = false;
+            }
+        }
+        idResolver.add(tapn.name(), idInput, nameInput);
+
+        TimedPlaceComponent place = new TimedPlaceComponent(positionXInput, positionYInput, idInput, nameOffsetXInput, nameOffsetYInput);
+
+        LocalTimedPlace p = new LocalTimedPlace(nameInput, TimeInvariant.parse(invariant, constants));
+        tapn.add(p);
+
+        place.setUnderlyingPlace(p);
+        guiModel.addPetriNetObject(place);
+
+        for (int i = 0; i < initialMarkingInput; i++) {
+            marking.add(new TimedToken(p, new BigDecimal(0.0)));
+        }
+    }
 
 	private void parseAndAddArcAsOldFormat(Element inputArcElement) throws FormatException {
 		String idInput = inputArcElement.getAttribute("id");

=== modified file 'src/dk/aau/cs/io/TapnXmlLoader.java'
--- src/dk/aau/cs/io/TapnXmlLoader.java	2020-08-06 07:05:34 +0000
+++ src/dk/aau/cs/io/TapnXmlLoader.java	2020-08-10 09:00:56 +0000
@@ -136,7 +136,6 @@
 		parseFeature(doc, network);
 
 		return new LoadedModel(network, templates, queries,messages, isTimed, isGame);
-
 	}
 
 	private void parseBound(Document doc, TimedArcPetriNetNetwork network){
@@ -647,15 +646,14 @@
                                          String inscriptionTempStorage, PlaceTransitionObject sourceIn,
                                          PlaceTransitionObject targetIn,
                                          int _endx, int _endy, Template template, ConstantStore constants, Weight weight) throws FormatException {
-		Arc tempArc;
-		tempArc = new TimedInputArcComponent(new TimedOutputArcComponent(sourceIn, targetIn, 1, idInput));
+        TimedInputArcComponent tempArc = new TimedInputArcComponent(new TimedOutputArcComponent(sourceIn, targetIn, 1, idInput));
 
 		TimedPlace place = template.model().getPlaceByName(sourceIn.getName());
 		TimedTransition transition = template.model().getTransitionByName(targetIn.getName());
 		TimeInterval interval = TimeInterval.parse(inscriptionTempStorage, constants);
 
 		TimedInputArc inputArc = new TimedInputArc(place, transition, interval, weight);
-		((TimedInputArcComponent) tempArc).setUnderlyingArc(inputArc);
+		tempArc.setUnderlyingArc(inputArc);
 
 		if(template.model().hasArcFromPlaceToTransition(inputArc.source(), inputArc.destination())) {
 			throw new FormatException("Multiple arcs between a place and a transition is not allowed");

=== modified file 'src/dk/aau/cs/io/TraceImportExport.java'
--- src/dk/aau/cs/io/TraceImportExport.java	2020-06-17 20:30:35 +0000
+++ src/dk/aau/cs/io/TraceImportExport.java	2020-08-10 09:00:56 +0000
@@ -175,7 +175,6 @@
             TimedArcPetriNetTrace traceComposed = traceParser.parseTrace(br);
             TAPNTraceDecomposer decomposer = new TAPNTraceDecomposer(traceComposed, CreateGui.getCurrentTab().network(), model.value2());
 
-            CreateGui.getApp().setGUIMode(pipe.gui.GuiFrame.GUIMode.animation);
             CreateGui.getAnimator().setTrace(decomposer.decompose());
 
         } catch (FileNotFoundException e) {

=== modified file 'src/dk/aau/cs/model/NTA/trace/UppaalTrace.java'
--- src/dk/aau/cs/model/NTA/trace/UppaalTrace.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/model/NTA/trace/UppaalTrace.java	2020-08-10 09:00:56 +0000
@@ -1,5 +1,7 @@
 package dk.aau.cs.model.NTA.trace;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -21,7 +23,7 @@
 		firingActions.add(action);
 	}
 
-	public Iterator<TAFiringAction> iterator() {
+	public @NotNull Iterator<TAFiringAction> iterator() {
 		return firingActions.iterator();
 	}
 

=== modified file 'src/dk/aau/cs/model/tapn/ConstantStore.java'
--- src/dk/aau/cs/model/tapn/ConstantStore.java	2019-03-22 13:57:03 +0000
+++ src/dk/aau/cs/model/tapn/ConstantStore.java	2020-08-10 09:00:56 +0000
@@ -112,8 +112,8 @@
 		Bound lower = interval.lowerBound();
 		Bound upper = interval.upperBound();
 
-		int diff = interval.IsLowerBoundNonStrict()
-				&& interval.IsUpperBoundNonStrict() ? 0 : 1;
+		int diff = interval.isLowerBoundNonStrict()
+				&& interval.isUpperBoundNonStrict() ? 0 : 1;
 
 		if (lower instanceof ConstantBound && upper instanceof ConstantBound) {
 			Constant lowerConstant = getConstantByName(((ConstantBound) lower).name());

=== modified file 'src/dk/aau/cs/model/tapn/LocalTimedMarking.java'
--- src/dk/aau/cs/model/tapn/LocalTimedMarking.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/model/tapn/LocalTimedMarking.java	2020-08-10 09:00:56 +0000
@@ -7,7 +7,6 @@
 import java.util.Map.Entry;
 
 import dk.aau.cs.model.NTA.trace.TraceToken;
-import dk.aau.cs.model.tapn.TimedPlace.PlaceType;
 import dk.aau.cs.model.tapn.simulation.FiringMode;
 import dk.aau.cs.util.Require;
 import dk.aau.cs.util.Tuple;

=== modified file 'src/dk/aau/cs/model/tapn/NetworkMarking.java'
--- src/dk/aau/cs/model/tapn/NetworkMarking.java	2020-06-21 12:14:21 +0000
+++ src/dk/aau/cs/model/tapn/NetworkMarking.java	2020-08-10 09:00:56 +0000
@@ -8,7 +8,6 @@
 
 import dk.aau.cs.model.NTA.trace.TraceToken;
 import pipe.gui.CreateGui;
-import dk.aau.cs.model.tapn.TimedPlace.PlaceType;
 import dk.aau.cs.model.tapn.simulation.FiringMode;
 import dk.aau.cs.util.Require;
 import dk.aau.cs.util.Tuple;

=== modified file 'src/dk/aau/cs/model/tapn/TimeInterval.java'
--- src/dk/aau/cs/model/tapn/TimeInterval.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/model/tapn/TimeInterval.java	2020-08-10 09:00:56 +0000
@@ -25,8 +25,7 @@
 		this.upper = upper;
 		this.isUpperIncluded = isUpperIncluded;
 		
-		Require.that(isValidInterval(), "The constructed interval "
-				+ toString() + " is empty.");
+		Require.that(isValidInterval(), "The constructed interval " + toString() + " is empty.");
 	}
 
 	public TimeInterval(TimeInterval interval) {
@@ -101,11 +100,11 @@
 		this.upper = upper;
 	}
 
-	public boolean IsLowerBoundNonStrict() {
+	public boolean isLowerBoundNonStrict() {
 		return isLowerIncluded;
 	}
 
-	public boolean IsUpperBoundNonStrict() {
+	public boolean isUpperBoundNonStrict() {
 		return isUpperIncluded;
 	}
 

=== modified file 'src/dk/aau/cs/model/tapn/TimedArcPetriNet.java'
--- src/dk/aau/cs/model/tapn/TimedArcPetriNet.java	2020-08-06 13:08:24 +0000
+++ src/dk/aau/cs/model/tapn/TimedArcPetriNet.java	2020-08-10 09:00:56 +0000
@@ -436,7 +436,7 @@
             numberOfOrphanPlaces += t.getOrphanPlaces().size();
 			//Test if all inputarcs is untimed and get the number of untimed input arcs
 			for(TimedInputArc in : t.inputArcs()){
-				if(!(in.interval().lowerBound().value() == 0 && in.interval().IsLowerBoundNonStrict() && in.interval().upperBound().equals(Bound.Infinity))){
+				if(!(in.interval().lowerBound().value() == 0 && in.interval().isLowerBoundNonStrict() && in.interval().upperBound().equals(Bound.Infinity))){
 					networkUntimed = false;
 				} else {
 					numberOfUntimedInputArcs++;
@@ -447,7 +447,7 @@
 			}
 			//Test if all tansportarcs is untimed and get the number of untimed transport arcs
 			for(TransportArc in : t.transportArcs()){
-				if(!(in.interval().lowerBound().value() == 0 && in.interval().IsLowerBoundNonStrict() && in.interval().upperBound().equals(Bound.Infinity))){
+				if(!(in.interval().lowerBound().value() == 0 && in.interval().isLowerBoundNonStrict() && in.interval().upperBound().equals(Bound.Infinity))){
 					networkUntimed = false;
 				} else {
 					numberOfUntimedTransportArcs++;
@@ -658,13 +658,13 @@
 	
 	public boolean isNonStrict(){
 		for(TimedInputArc t : inputArcs){
-			if(!t.interval().IsLowerBoundNonStrict() || (!t.interval().IsUpperBoundNonStrict() && !(t.interval().upperBound() instanceof InfBound))){
+			if(!t.interval().isLowerBoundNonStrict() || (!t.interval().isUpperBoundNonStrict() && !(t.interval().upperBound() instanceof InfBound))){
 				return false;
 			}
 		}
 		
 		for(TransportArc t : transportArcs){
-			if(!t.interval().IsLowerBoundNonStrict() || (!t.interval().IsUpperBoundNonStrict() && !(t.interval().upperBound() instanceof InfBound))){
+			if(!t.interval().isLowerBoundNonStrict() || (!t.interval().isUpperBoundNonStrict() && !(t.interval().upperBound() instanceof InfBound))){
 				return false;
 			}
 		}

=== modified file 'src/dk/aau/cs/model/tapn/TimedInputArc.java'
--- src/dk/aau/cs/model/tapn/TimedInputArc.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/model/tapn/TimedInputArc.java	2020-08-10 09:00:56 +0000
@@ -127,15 +127,15 @@
 						newUpper = BigDecimal.ZERO;
 					}
 					
-					if (newUpper.compareTo(newLower) == 0 && (interval.IsLowerBoundNonStrict() || overrideLowerInclusion) && interval.IsUpperBoundNonStrict()){
+					if (newUpper.compareTo(newLower) == 0 && (interval.isLowerBoundNonStrict() || overrideLowerInclusion) && interval.isUpperBoundNonStrict()){
 						temp = new TimeInterval(true, new RatBound(newLower), new RatBound(newUpper), true);
 					} else if (newLower.compareTo(newUpper) < 0){
-						temp = new  TimeInterval(interval.IsLowerBoundNonStrict() || overrideLowerInclusion, new RatBound(newLower), new RatBound(newUpper), interval.IsUpperBoundNonStrict());
+						temp = new  TimeInterval(interval.isLowerBoundNonStrict() || overrideLowerInclusion, new RatBound(newLower), new RatBound(newUpper), interval.isUpperBoundNonStrict());
 					} else { //new bounds are empty
 						temp = null;
 					}
 				} else { //upper bound is inf
-					temp = new TimeInterval(interval.IsLowerBoundNonStrict(), new RatBound(newLower), interval.upperBound(), false);
+					temp = new TimeInterval(interval.isLowerBoundNonStrict(), new RatBound(newLower), interval.upperBound(), false);
 				}
 			}
 			

=== modified file 'src/dk/aau/cs/model/tapn/TransportArc.java'
--- src/dk/aau/cs/model/tapn/TransportArc.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/model/tapn/TransportArc.java	2020-08-10 09:00:56 +0000
@@ -153,15 +153,15 @@
 						newUpper = BigDecimal.ZERO;
 					}
 					
-					if (newUpper.compareTo(newLower) == 0 && interval.IsLowerBoundNonStrict() && interval.IsUpperBoundNonStrict()){
+					if (newUpper.compareTo(newLower) == 0 && interval.isLowerBoundNonStrict() && interval.isUpperBoundNonStrict()){
 						temp = new TimeInterval(true, new RatBound(newLower), new RatBound(newUpper), true);
 					} else if (newLower.compareTo(newUpper) < 0){
-						temp = new  TimeInterval(interval.IsLowerBoundNonStrict() || overrideLowerInclusion, new RatBound(newLower), new RatBound(newUpper), interval.IsUpperBoundNonStrict());
+						temp = new  TimeInterval(interval.isLowerBoundNonStrict() || overrideLowerInclusion, new RatBound(newLower), new RatBound(newUpper), interval.isUpperBoundNonStrict());
 					} else { //new bounds are empty
 						temp = null;
 					}
 				} else { //upper bound is inf
-					temp = new TimeInterval(interval.IsLowerBoundNonStrict(), new RatBound(newLower), interval.upperBound(), false);
+					temp = new TimeInterval(interval.isLowerBoundNonStrict(), new RatBound(newLower), interval.upperBound(), false);
 				}
 			}
 			

=== modified file 'src/dk/aau/cs/model/tapn/simulation/ManualDelayMode.java'
--- src/dk/aau/cs/model/tapn/simulation/ManualDelayMode.java	2020-04-18 12:27:02 +0000
+++ src/dk/aau/cs/model/tapn/simulation/ManualDelayMode.java	2020-08-10 09:00:56 +0000
@@ -88,7 +88,7 @@
 			JPanel buttonPanel = createButtonPanel();
 			BigDecimal value = IntervalOperations.getRatBound(dInterval.lowerBound()).getBound();
 
-			if(!dInterval.IsLowerBoundNonStrict()){
+			if(!dInterval.isLowerBoundNonStrict()){
 				value = value.add(delayGranularity);
 				value = value.stripTrailingZeros();
 			}

=== modified file 'src/dk/aau/cs/model/tapn/simulation/RandomDelayMode.java'
--- src/dk/aau/cs/model/tapn/simulation/RandomDelayMode.java	2019-03-22 11:36:50 +0000
+++ src/dk/aau/cs/model/tapn/simulation/RandomDelayMode.java	2020-08-10 09:00:56 +0000
@@ -39,11 +39,11 @@
 		BigDecimal result;
 		
 		if(dInterval.upperBound() instanceof Bound.InfBound){
-			TimeInterval range = new TimeInterval(dInterval.IsLowerBoundNonStrict(), new IntBound(0), Bound.Infinity, dInterval.IsUpperBoundNonStrict());
+			TimeInterval range = new TimeInterval(dInterval.isLowerBoundNonStrict(), new IntBound(0), Bound.Infinity, dInterval.isUpperBoundNonStrict());
 			result = exponentialDistribution(range, transition);
 		} else {
 			//This is safe as the difference between the bounds is always ints - and constants in the model is ints as well
-			TimeInterval range = new TimeInterval(dInterval.IsLowerBoundNonStrict(), new IntBound(0), new RatBound(upper.subtract(lower)), dInterval.IsUpperBoundNonStrict());
+			TimeInterval range = new TimeInterval(dInterval.isLowerBoundNonStrict(), new IntBound(0), new RatBound(upper.subtract(lower)), dInterval.isUpperBoundNonStrict());
 			result = randomBigDecimal(range);
 		}
 		

=== modified file 'src/dk/aau/cs/model/tapn/simulation/ShortestDelayMode.java'
--- src/dk/aau/cs/model/tapn/simulation/ShortestDelayMode.java	2019-03-22 10:13:18 +0000
+++ src/dk/aau/cs/model/tapn/simulation/ShortestDelayMode.java	2020-08-10 09:00:56 +0000
@@ -26,7 +26,7 @@
 	public BigDecimal GetDelay(TimedTransition transition,
 			TimeInterval dInterval, BigDecimal delayGranularity) {
 		
-		if(dInterval.IsLowerBoundNonStrict()){
+		if(dInterval.isLowerBoundNonStrict()){
 			return IntervalOperations.getRatBound(dInterval.lowerBound()).getBound();
 		} else {
 			return IntervalOperations.getRatBound(dInterval.lowerBound()).getBound().add(delayGranularity, new MathContext(Pipe.AGE_PRECISION));

=== modified file 'src/dk/aau/cs/model/tapn/simulation/TimedArcPetriNetTrace.java'
--- src/dk/aau/cs/model/tapn/simulation/TimedArcPetriNetTrace.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/model/tapn/simulation/TimedArcPetriNetTrace.java	2020-08-10 09:00:56 +0000
@@ -7,6 +7,7 @@
 import dk.aau.cs.model.tapn.TimedToken;
 import dk.aau.cs.util.Require;
 import dk.aau.cs.verification.VerifyTAPN.TraceType;
+import org.jetbrains.annotations.NotNull;
 
 public class TimedArcPetriNetTrace implements Iterable<TimedArcPetriNetStep> {
 	private boolean nextIsLoop;	
@@ -31,7 +32,7 @@
 		steps.add(step);
 	}
 
-	public Iterator<TimedArcPetriNetStep> iterator() {
+	public @NotNull Iterator<TimedArcPetriNetStep> iterator() {
 		return steps.iterator();
 	}
 

=== modified file 'src/dk/aau/cs/model/tapn/simulation/TimedTAPNNetworkTrace.java'
--- src/dk/aau/cs/model/tapn/simulation/TimedTAPNNetworkTrace.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/model/tapn/simulation/TimedTAPNNetworkTrace.java	2020-08-10 09:00:56 +0000
@@ -5,6 +5,7 @@
 import java.util.List;
 
 import dk.aau.cs.verification.VerifyTAPN.TraceType;
+import org.jetbrains.annotations.NotNull;
 
 public class TimedTAPNNetworkTrace implements TAPNNetworkTrace {
 	private final List<TAPNNetworkTraceStep> steps = new ArrayList<TAPNNetworkTraceStep>();
@@ -22,7 +23,7 @@
 		steps.add(step);
 	}
 
-	public Iterator<TAPNNetworkTraceStep> iterator() {
+	public @NotNull Iterator<TAPNNetworkTraceStep> iterator() {
 		return steps.iterator();
 	}
 

=== modified file 'src/dk/aau/cs/model/tapn/simulation/UntimedTAPNNetworkTrace.java'
--- src/dk/aau/cs/model/tapn/simulation/UntimedTAPNNetworkTrace.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/model/tapn/simulation/UntimedTAPNNetworkTrace.java	2020-08-10 09:00:56 +0000
@@ -1,5 +1,7 @@
 package dk.aau.cs.model.tapn.simulation;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -11,7 +13,7 @@
 		steps.add(step);
 	}
 
-	public Iterator<TAPNNetworkTraceStep> iterator() {
+	public @NotNull Iterator<TAPNNetworkTraceStep> iterator() {
 		return steps.iterator();
 	}
 

=== modified file 'src/dk/aau/cs/translations/tapn/BroadcastTranslation.java'
--- src/dk/aau/cs/translations/tapn/BroadcastTranslation.java	2020-08-04 08:07:21 +0000
+++ src/dk/aau/cs/translations/tapn/BroadcastTranslation.java	2020-08-10 09:00:56 +0000
@@ -644,9 +644,9 @@
 		
 		StringBuilder builder = new StringBuilder();
 		boolean lowerBoundAdded = false;
-		if(!(interval.lowerBound().value() == 0 && interval.IsLowerBoundNonStrict())) {
+		if(!(interval.lowerBound().value() == 0 && interval.isLowerBoundNonStrict())) {
 			builder.append(TOKEN_CLOCK_NAME);
-			if(interval.IsLowerBoundNonStrict())
+			if(interval.isLowerBoundNonStrict())
 				builder.append(" >= ");
 			else
 				builder.append(" > ");
@@ -659,7 +659,7 @@
 			if(lowerBoundAdded) builder.append(" && ");
 			builder.append(TOKEN_CLOCK_NAME);
 			
-			if(interval.IsUpperBoundNonStrict())
+			if(interval.isUpperBoundNonStrict())
 				builder.append(" <= ");
 			else
 				builder.append(" < ");

=== modified file 'src/dk/aau/cs/translations/tapn/CombiTranslation.java'
--- src/dk/aau/cs/translations/tapn/CombiTranslation.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/translations/tapn/CombiTranslation.java	2020-08-10 09:00:56 +0000
@@ -1158,9 +1158,9 @@
 
 		StringBuilder builder = new StringBuilder();
 		boolean lowerBoundAdded = false;
-		if(!(interval.lowerBound().value() == 0 && interval.IsLowerBoundNonStrict())) {
+		if(!(interval.lowerBound().value() == 0 && interval.isLowerBoundNonStrict())) {
 			builder.append(TOKEN_CLOCK_NAME);
-			if(interval.IsLowerBoundNonStrict())
+			if(interval.isLowerBoundNonStrict())
 				builder.append(" >= ");
 			else
 				builder.append(" > ");
@@ -1173,7 +1173,7 @@
 			if(lowerBoundAdded) builder.append(" && ");
 			builder.append(TOKEN_CLOCK_NAME);
 
-			if(interval.IsUpperBoundNonStrict())
+			if(interval.isUpperBoundNonStrict())
 				builder.append(" <= ");
 			else
 				builder.append(" < ");

=== modified file 'src/dk/aau/cs/translations/tapn/Degree2BroadcastTranslation.java'
--- src/dk/aau/cs/translations/tapn/Degree2BroadcastTranslation.java	2020-08-04 08:07:21 +0000
+++ src/dk/aau/cs/translations/tapn/Degree2BroadcastTranslation.java	2020-08-10 09:00:56 +0000
@@ -674,9 +674,9 @@
 		StringBuilder builder = new StringBuilder();
 		
 		boolean lowerBoundAdded = false;
-		if(!(interval.lowerBound().value() == 0 && interval.IsLowerBoundNonStrict())) {
+		if(!(interval.lowerBound().value() == 0 && interval.isLowerBoundNonStrict())) {
 			builder.append(CLOCK_NAME);
-			if(interval.IsLowerBoundNonStrict())
+			if(interval.isLowerBoundNonStrict())
 				builder.append(" >= ");
 			else
 				builder.append(" > ");
@@ -689,7 +689,7 @@
 			if(lowerBoundAdded) builder.append(" && ");
 			builder.append(CLOCK_NAME);
 			
-			if(interval.IsUpperBoundNonStrict())
+			if(interval.isUpperBoundNonStrict())
 				builder.append(" <= ");
 			else
 				builder.append(" < ");

=== modified file 'src/dk/aau/cs/translations/tapn/OptimizedStandardTranslation.java'
--- src/dk/aau/cs/translations/tapn/OptimizedStandardTranslation.java	2020-08-04 08:07:21 +0000
+++ src/dk/aau/cs/translations/tapn/OptimizedStandardTranslation.java	2020-08-10 09:00:56 +0000
@@ -372,9 +372,9 @@
 		
 		StringBuilder builder = new StringBuilder();
 		boolean lowerBoundAdded = false;
-		if(!(interval.lowerBound().value() == 0 && interval.IsLowerBoundNonStrict())) {
+		if(!(interval.lowerBound().value() == 0 && interval.isLowerBoundNonStrict())) {
 			builder.append(TOKEN_CLOCK_NAME);
-			if(interval.IsLowerBoundNonStrict())
+			if(interval.isLowerBoundNonStrict())
 				builder.append(" >= ");
 			else
 				builder.append(" > ");
@@ -387,7 +387,7 @@
 			if(lowerBoundAdded) builder.append(" && ");
 			builder.append(TOKEN_CLOCK_NAME);
 			
-			if(interval.IsUpperBoundNonStrict())
+			if(interval.isUpperBoundNonStrict())
 				builder.append(" <= ");
 			else
 				builder.append(" < ");

=== modified file 'src/dk/aau/cs/translations/tapn/StandardTranslation.java'
--- src/dk/aau/cs/translations/tapn/StandardTranslation.java	2020-08-04 08:07:21 +0000
+++ src/dk/aau/cs/translations/tapn/StandardTranslation.java	2020-08-10 09:00:56 +0000
@@ -311,9 +311,9 @@
 		StringBuilder builder = new StringBuilder();
 		
 		boolean lowerBoundAdded = false;
-		if(!(interval.lowerBound().value() == 0 && interval.IsLowerBoundNonStrict())) {
+		if(!(interval.lowerBound().value() == 0 && interval.isLowerBoundNonStrict())) {
 			builder.append(TOKEN_CLOCK_NAME);
-			if(interval.IsLowerBoundNonStrict())
+			if(interval.isLowerBoundNonStrict())
 				builder.append(" >= ");
 			else
 				builder.append(" > ");
@@ -326,7 +326,7 @@
 			if(lowerBoundAdded) builder.append(" && ");
 			builder.append(TOKEN_CLOCK_NAME);
 			
-			if(interval.IsUpperBoundNonStrict())
+			if(interval.isUpperBoundNonStrict())
 				builder.append(" <= ");
 			else
 				builder.append(" < ");

=== modified file 'src/dk/aau/cs/util/IntervalOperations.java'
--- src/dk/aau/cs/util/IntervalOperations.java	2012-09-19 18:15:59 +0000
+++ src/dk/aau/cs/util/IntervalOperations.java	2020-08-10 09:00:56 +0000
@@ -40,7 +40,7 @@
 		TimeInterval lower = min(i1, i2, BoundToCheck.lower);
 		TimeInterval upper = max(i1, i2, BoundToCheck.upper);
 		
-		return new TimeInterval(lower.IsLowerBoundNonStrict(), lower.lowerBound(), upper.upperBound(), upper.IsUpperBoundNonStrict()); 
+		return new TimeInterval(lower.isLowerBoundNonStrict(), lower.lowerBound(), upper.upperBound(), upper.isUpperBoundNonStrict());
 	}
 	
 	
@@ -56,8 +56,8 @@
 		BigDecimal iUp = getRatBound(upper.upperBound()).getBound();
 		BigDecimal iLow = getRatBound(lower.lowerBound()).getBound();
 		
-		if(iUp.compareTo(iLow) > 0 || iUp.compareTo(iLow) == 0 && lower.IsLowerBoundNonStrict() && upper.IsUpperBoundNonStrict() || (upper.upperBound().value() < 0)){
-			return new TimeInterval(lower.IsLowerBoundNonStrict(), lower.lowerBound(), upper.upperBound(), upper.IsUpperBoundNonStrict());
+		if(iUp.compareTo(iLow) > 0 || iUp.compareTo(iLow) == 0 && lower.isLowerBoundNonStrict() && upper.isUpperBoundNonStrict() || (upper.upperBound().value() < 0)){
+			return new TimeInterval(lower.isLowerBoundNonStrict(), lower.lowerBound(), upper.upperBound(), upper.isUpperBoundNonStrict());
 		} else {
 			return null;
 		}
@@ -75,7 +75,7 @@
 			BigDecimal b1 = getRatBound(i1.lowerBound()).getBound();
 			BigDecimal b2 = getRatBound(i2.lowerBound()).getBound();
 			
-			if(b1.compareTo(b2) < 0 || b1.compareTo(b2) == 0 && i1.IsLowerBoundNonStrict() && !i2.IsLowerBoundNonStrict()){
+			if(b1.compareTo(b2) < 0 || b1.compareTo(b2) == 0 && i1.isLowerBoundNonStrict() && !i2.isLowerBoundNonStrict()){
 				return i1;
 			} else {
 				return i2;
@@ -84,7 +84,7 @@
 			b1 = getRatBound(i1.upperBound()).getBound();
 			b2 = getRatBound(i2.upperBound()).getBound();
 			if(b1.compareTo(BigDecimal.ZERO) >= 0 && b2.compareTo(BigDecimal.ZERO) >= 0){
-				if(b1.compareTo(b2) < 0 || b1.compareTo(b2) == 0 && !i1.IsUpperBoundNonStrict() && i2.IsUpperBoundNonStrict()){
+				if(b1.compareTo(b2) < 0 || b1.compareTo(b2) == 0 && !i1.isUpperBoundNonStrict() && i2.isUpperBoundNonStrict()){
 					return i1;
 				} else {
 					return i2;
@@ -146,10 +146,10 @@
 					output.add(intersection(IS1.get(i), IS2.get(j)));
 				}
 			
-				if(i1up.compareTo(i2up) == -1 || (i2up.compareTo(i1up) == 0 && (IS2.get(j).IsUpperBoundNonStrict() == IS1.get(i).IsUpperBoundNonStrict() || !IS1.get(i).IsUpperBoundNonStrict()))){
+				if(i1up.compareTo(i2up) == -1 || (i2up.compareTo(i1up) == 0 && (IS2.get(j).isUpperBoundNonStrict() == IS1.get(i).isUpperBoundNonStrict() || !IS1.get(i).isUpperBoundNonStrict()))){
 					incrementI = true;
 				}
-				if(i2up.compareTo(i1up) == -1 || (i2up.compareTo(i1up) == 0 && (IS2.get(j).IsUpperBoundNonStrict() == IS1.get(i).IsUpperBoundNonStrict() || !IS2.get(j).IsUpperBoundNonStrict()))){
+				if(i2up.compareTo(i1up) == -1 || (i2up.compareTo(i1up) == 0 && (IS2.get(j).isUpperBoundNonStrict() == IS1.get(i).isUpperBoundNonStrict() || !IS2.get(j).isUpperBoundNonStrict()))){
 					j++;
 				}
 			
@@ -196,14 +196,14 @@
 				if(IS2.get(j).lowerBound() instanceof RatBound){ i2lo = ((RatBound)IS2.get(j).lowerBound());}
 				else{i2lo = new RatBound(new BigDecimal(IS2.get(j).lowerBound().value(), new MathContext(Pipe.AGE_PRECISION)));}
 
-				if(intersection(IS1.get(i), IS2.get(j)) != null || (i1lo.compareTo(i2up)==0 && (IS1.get(i).IsLowerBoundNonStrict()||IS2.get(j).IsUpperBoundNonStrict()))
-				        || (i2lo.compareTo(i1up)==0 && (IS2.get(j).IsLowerBoundNonStrict()||IS1.get(i).IsUpperBoundNonStrict()))){
+				if(intersection(IS1.get(i), IS2.get(j)) != null || (i1lo.compareTo(i2up)==0 && (IS1.get(i).isLowerBoundNonStrict()||IS2.get(j).isUpperBoundNonStrict()))
+				        || (i2lo.compareTo(i1up)==0 && (IS2.get(j).isLowerBoundNonStrict()||IS1.get(i).isUpperBoundNonStrict()))){
 
 					temp = union(temp, union(IS1.get(i), IS2.get(j)));
 					
-					if(i1up.compareTo(i2up) == 1 || (i1up.compareTo(i2up) == 0 && !IS2.get(j).IsUpperBoundNonStrict() && IS1.get(i).IsUpperBoundNonStrict())){
+					if(i1up.compareTo(i2up) == 1 || (i1up.compareTo(i2up) == 0 && !IS2.get(j).isUpperBoundNonStrict() && IS1.get(i).isUpperBoundNonStrict())){
 						j++;
-					} else if(i2up.compareTo(i1up) == 1 || (i2up.compareTo(i1up) == 0 && !IS1.get(i).IsUpperBoundNonStrict() && IS2.get(j).IsUpperBoundNonStrict())){
+					} else if(i2up.compareTo(i1up) == 1 || (i2up.compareTo(i1up) == 0 && !IS1.get(i).isUpperBoundNonStrict() && IS2.get(j).isUpperBoundNonStrict())){
 						i++;
 					} else {
 						break;

=== modified file 'src/dk/aau/cs/util/MemoryMonitor.java'
--- src/dk/aau/cs/util/MemoryMonitor.java	2020-04-18 15:39:19 +0000
+++ src/dk/aau/cs/util/MemoryMonitor.java	2020-08-10 09:00:56 +0000
@@ -1,8 +1,10 @@
 package dk.aau.cs.util;
 
 import com.sun.jna.*;
+import dk.aau.cs.debug.Logger;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.reflect.Field;
 import java.text.DecimalFormat;
@@ -14,14 +16,7 @@
 
 public class MemoryMonitor {
 
-	interface Kernel32 extends Library {
-
-		static Kernel32 INSTANCE = Native.loadLibrary("kernel32", Kernel32.class);
-
-		int GetProcessId(Long hProcess);
-	}
-
-	private static int PID = -1;
+	private static long PID = -1;
 	private static Semaphore busy = new Semaphore(1);
 	private static double peakMemory = -1;
 	private static Boolean cumulativePeakMemory = false;
@@ -37,7 +32,7 @@
 	}
 
 	public static void attach(Process p){
-		PID = getPid(p);
+		PID = p.pid();
 		
 		if( ! cumulativePeakMemory) {
 			peakMemory = -1;
@@ -79,17 +74,19 @@
 					if(m.matches()){
 						memory = Double.parseDouble(m.group(1).replace(".", "").replace(",", ""))/1024;
 					}
-				} catch (Exception e) { 
+				} catch (IOException e) {
+				    Logger.log(e);
 				} 
 			}else{
-				try { 
+				try {
 					Process p = Runtime.getRuntime().exec("ps -p "+PID+" -o rss"); 
 					BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream())); 
-					
-					String s = input.readLine();
-					s = input.readLine();	//Actual memory usage is second line output
+
+					input.readLine(); //Actual memory usage is second line output
+                    String s = input.readLine();
 					memory = Double.parseDouble(s.replace(" ", ""))/1024;
-				} catch (Exception e) { 
+				} catch (IOException e) {
+                    Logger.log(e);
 				} 
 			}
 
@@ -105,24 +102,6 @@
 		}
 	}
 
-	private static int getPid(Process p) {
-		Field f;
-
-		try{
-			if (Platform.isWindows()) {
-				f = p.getClass().getDeclaredField("handle");
-				f.setAccessible(true);
-                return Kernel32.INSTANCE.GetProcessId((Long) f.get(p));
-			} else {
-				f = p.getClass().getDeclaredField("pid");
-				f.setAccessible(true);
-                return (int) (Integer) f.get(p);
-			}
-		}catch(Exception e){
-			return -1;
-		}
-	}
-	
 	public static String getPeakMemory(){
 		return peakMemory == -1? "N/A":getFormatter().format(Math.ceil(peakMemory)) + " MB";
 	}

=== modified file 'src/dk/aau/cs/verification/TAPNComposer.java'
--- src/dk/aau/cs/verification/TAPNComposer.java	2020-08-04 08:19:44 +0000
+++ src/dk/aau/cs/verification/TAPNComposer.java	2020-08-10 09:00:56 +0000
@@ -380,7 +380,7 @@
 					Place guiSource = guiModel.getPlaceByName(mapping.map(sourceTemplate, arc.source().name()));
 					Transition guiTarget = guiModel.getTransitionByName(mapping.map(targetTemplate, arc.destination().name()));
 					
-					Arc newArc = new TimedInputArcComponent(new TimedOutputArcComponent(
+					TimedInputArcComponent newArc = new TimedInputArcComponent(new TimedOutputArcComponent(
                         guiSource,
 							guiTarget,
 							arc.getWeight().value(),
@@ -394,7 +394,7 @@
 					ArcPath newArcPath = createArcPath(currentGuiModel, oldGuiSource, oldGuiTarget, newArc, offset.value1() * greatestWidth, offset.value2() * greatestHeight);
 					
 					// Set arcPath, guiModel and connectors
-					((TimedInputArcComponent) newArc).setUnderlyingArc(addedArc);
+					newArc.setUnderlyingArc(addedArc);
 					newArc.setArcPath(newArcPath);
 					newArc.updateArcPosition();
 					guiModel.addPetriNetObject(newArc);
@@ -600,7 +600,7 @@
 				if (this.guiModels != null) {
 					Place guiSource = guiModel.getPlaceByName(mapping.map(sourceTemplate, arc.source().name()));
 					Transition guiTarget = guiModel.getTransitionByName(mapping.map(destinationTemplate, arc.destination().name()));
-					Arc newArc = new TimedInhibitorArcComponent(new TimedOutputArcComponent(
+					TimedInhibitorArcComponent newArc = new TimedInhibitorArcComponent(new TimedOutputArcComponent(
                         guiSource,
 							guiTarget,
 							arc.getWeight().value(),
@@ -612,7 +612,7 @@
 					Transition oldGuiTarget = currentGuiModel.getTransitionByName(arc.destination().name());
 					ArcPath newArcPath = createArcPath(currentGuiModel, oldGuiSource, oldGuiTarget, newArc, offset.value1() * greatestWidth, offset.value2() * greatestHeight);
 					
-					((TimedInhibitorArcComponent) newArc).setUnderlyingArc(addedArc);
+					newArc.setUnderlyingArc(addedArc);
 					newArc.setArcPath(newArcPath);
 					newArc.updateArcPosition();
 					guiModel.addPetriNetObject(newArc);

=== modified file 'src/dk/aau/cs/verification/VerificationResult.java'
--- src/dk/aau/cs/verification/VerificationResult.java	2020-04-18 16:08:44 +0000
+++ src/dk/aau/cs/verification/VerificationResult.java	2020-08-10 09:00:56 +0000
@@ -96,7 +96,7 @@
 	public static class transitionTupleComparator implements Comparator<Tuple<String,Integer>> {
 		
 		public int compare(Tuple<String,Integer> tuple1,Tuple<String,Integer> tuple2) {
-			return (tuple1.value2() > tuple2.value2() ? -1 : (tuple1.value2() == tuple2.value2() ? 0 : 1));
+            return tuple2.value2() - tuple1.value2();
 		}
 	}
 

=== modified file 'src/net/tapaal/gui/DrawingSurfaceManager/AbstractDrawingSurfaceManager.java'
--- src/net/tapaal/gui/DrawingSurfaceManager/AbstractDrawingSurfaceManager.java	2020-06-29 10:58:39 +0000
+++ src/net/tapaal/gui/DrawingSurfaceManager/AbstractDrawingSurfaceManager.java	2020-08-10 09:00:56 +0000
@@ -2,7 +2,6 @@
 
 import pipe.gui.canvas.DrawingSurfaceImpl;
 import pipe.gui.graphicElements.GraphicalElement;
-import pipe.gui.graphicElements.PetriNetObject;
 
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
@@ -53,13 +52,19 @@
     private final Map<Predicate<DrawingSurfaceEvent>, Consumer<DrawingSurfaceEvent>> filter = new LinkedHashMap<>();
     private final AbstractDrawingSurfaceManager next = null;
 
-    public void registerManager(DrawingSurfaceImpl canvas){
+    public final void registerManager(DrawingSurfaceImpl canvas){
         this.canvas = canvas;
+        setupManager();
     }
-    public void deregisterManager(){
+
+    public final void deregisterManager(){
         this.canvas = null;
+        teardownManager();
     }
 
+    public void setupManager(){}
+    public void teardownManager(){}
+
     public AbstractDrawingSurfaceManager() {
 			registerEvents();
     }

=== modified file 'src/net/tapaal/resourcemanager/ResourceManager.java'
--- src/net/tapaal/resourcemanager/ResourceManager.java	2020-07-13 13:58:47 +0000
+++ src/net/tapaal/resourcemanager/ResourceManager.java	2020-08-10 09:00:56 +0000
@@ -8,8 +8,6 @@
 import javax.imageio.ImageIO;
 import javax.swing.ImageIcon;
 
-import pipe.gui.CreateGui;
-
 public class ResourceManager {
     public static final String imgPath = "resources/Images/";
 

=== modified file 'src/net/tapaal/swinghelpers/ExtendedJTabbedPane.java'
--- src/net/tapaal/swinghelpers/ExtendedJTabbedPane.java	2020-04-18 13:49:06 +0000
+++ src/net/tapaal/swinghelpers/ExtendedJTabbedPane.java	2020-08-10 09:00:56 +0000
@@ -1,5 +1,7 @@
 package net.tapaal.swinghelpers;
 
+import org.jetbrains.annotations.NotNull;
+
 import javax.swing.*;
 import java.awt.*;
 import java.util.Iterator;
@@ -13,7 +15,7 @@
  * TODO: check that input type is T?!??!?
  *
  */
-public abstract class ExtendedJTabbedPane<T> extends JTabbedPane implements Iterable<T>{
+public abstract class ExtendedJTabbedPane<T extends Component> extends JTabbedPane implements Iterable<T>{
 
     public ExtendedJTabbedPane() {
     }
@@ -80,7 +82,7 @@
     }
 
     @Override
-    public Iterator<T> iterator() {
+    public @NotNull Iterator<T> iterator() {
         return new TabIterator();
     }
 
@@ -95,6 +97,8 @@
 
         @Override
         public T next() {
+            //XXX - known unsafe call, in theory someone could add something not of type T
+            //noinspection unchecked
             T toReturn = (T) getTabComponentAt(position);
             position += 1;
             return toReturn;

=== added file 'src/net/tapaal/swinghelpers/GridBagHelper.java'
--- src/net/tapaal/swinghelpers/GridBagHelper.java	1970-01-01 00:00:00 +0000
+++ src/net/tapaal/swinghelpers/GridBagHelper.java	2020-08-10 09:00:56 +0000
@@ -0,0 +1,82 @@
+package net.tapaal.swinghelpers;
+
+import java.awt.*;
+
+public class GridBagHelper {
+
+
+
+
+    public enum Anchor {
+        NORTH(11),
+        EAST(13),
+        WEST(17),
+        NORTHWEST(18);
+
+        public final int value;
+
+        Anchor(int value) {
+            this.value = value;
+        }
+    }
+
+    public enum Fill {
+        HORIZONTAL(2);
+
+        public final int value;
+
+        Fill(int value) {
+
+            this.value = value;
+        }
+    }
+
+    public static GridBagConstraints as(int gridx, int gridy, Anchor anchor, Fill fill, Insets inset) {
+        var gridBagConstraints = new GridBagConstraints();
+        gridBagConstraints.gridx = gridx;
+        gridBagConstraints.gridy = gridy;
+
+        if (anchor != null) {
+            gridBagConstraints.anchor = anchor.value;
+        }
+
+        if (fill != null) {
+            gridBagConstraints.fill = fill.value;
+        }
+
+        if (inset != null) {
+            gridBagConstraints.insets = inset;
+        }
+
+        return gridBagConstraints;
+    }
+    public static GridBagConstraints as(int gridx, int gridy, Anchor anchor, Insets inset) {
+        return as(gridx, gridy, anchor, null, inset);
+    }
+
+    public static GridBagConstraints as(int gridx, int gridy, Fill fill, Insets inset) {
+        return as(gridx, gridy, null, fill, inset);
+    }
+
+    public static GridBagConstraints as(int gridx, int gridy, Anchor anchor) {
+        return as(gridx, gridy, anchor, null);
+    }
+
+    public static GridBagConstraints as(int gridx, int gridy, Insets inset) {
+        return as(gridx, gridy, null, null, inset);
+    }
+
+    public static GridBagConstraints as(int gridx, int gridy) {
+        return as(gridx, gridy, null, null, null);
+    }
+    public static GridBagConstraints as(int gridx, int gridy, int gridwidth, Anchor anchor, Insets inset) {
+        return as(gridx, gridy, gridwidth, 1, anchor, inset);
+    }
+    public static GridBagConstraints as(int gridx, int gridy, int gridwidth, int gridtheight, Anchor anchor, Insets inset) {
+        var r = as(gridx, gridy, anchor, null, inset );
+        r.gridwidth = gridwidth;
+        r.gridheight = gridtheight;
+        return r;
+    }
+
+}

=== modified file 'src/pipe/dataLayer/Template.java'
--- src/pipe/dataLayer/Template.java	2020-07-27 07:17:11 +0000
+++ src/pipe/dataLayer/Template.java	2020-08-10 09:00:56 +0000
@@ -2,7 +2,6 @@
 
 import pipe.gui.Zoomer;
 import dk.aau.cs.model.tapn.TimedArcPetriNet;
-import dk.aau.cs.util.Require;
 
 public class Template {
 	private final TimedArcPetriNet net;

=== modified file 'src/pipe/gui/AnimationControlSidePanel.java'
--- src/pipe/gui/AnimationControlSidePanel.java	2020-05-25 07:16:04 +0000
+++ src/pipe/gui/AnimationControlSidePanel.java	2020-08-10 09:00:56 +0000
@@ -61,7 +61,7 @@
 		setLayout(new GridBagLayout());
 		GridBagConstraints c = new GridBagConstraints();
 
-		firermodebox = new NonsearchableJComboBox<>(animator.FIRINGMODES);
+		firermodebox = new NonsearchableJComboBox<>(Animator.FIRINGMODES);
 		updateFiringModeComboBox();
 
 		firermodebox.addActionListener(evt -> animator.setFiringmode((String) firermodebox.getSelectedItem()));

=== modified file 'src/pipe/gui/AnimationSettingsDialog.java'
--- src/pipe/gui/AnimationSettingsDialog.java	2020-05-18 14:15:24 +0000
+++ src/pipe/gui/AnimationSettingsDialog.java	2020-08-10 09:00:56 +0000
@@ -4,8 +4,6 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 import javax.swing.JButton;
 import javax.swing.JDialog;

=== modified file 'src/pipe/gui/Animator.java'
--- src/pipe/gui/Animator.java	2020-06-18 11:31:04 +0000
+++ src/pipe/gui/Animator.java	2020-08-10 09:00:56 +0000
@@ -314,7 +314,7 @@
         BigDecimal delayGranularity = tab.getDelayEnabledTransitionControl().getValue();
         //Make sure the granularity is small enough
         BigDecimal lowerBound = IntervalOperations.getRatBound(dInterval.lowerBound()).getBound();
-        if(!dInterval.IsLowerBoundNonStrict() && !dInterval.isIncluded(lowerBound.add(delayGranularity))){
+        if(!dInterval.isLowerBoundNonStrict() && !dInterval.isIncluded(lowerBound.add(delayGranularity))){
             do{
                 delayGranularity = delayGranularity.divide(BigDecimal.TEN);
             } while (delayGranularity.compareTo(new BigDecimal("0.00001")) >= 0 && !dInterval.isIncluded(lowerBound.add(delayGranularity)));

=== modified file 'src/pipe/gui/CreateGui.java'
--- src/pipe/gui/CreateGui.java	2020-06-29 06:55:51 +0000
+++ src/pipe/gui/CreateGui.java	2020-08-10 09:00:56 +0000
@@ -1,17 +1,17 @@
 package pipe.gui;
 
+import java.awt.*;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
-
 import com.sun.jna.Platform;
+import dk.aau.cs.debug.Logger;
 import net.tapaal.TAPAAL;
+import net.tapaal.resourcemanager.ResourceManager;
 import pipe.dataLayer.DataLayer;
 import pipe.gui.canvas.DrawingSurfaceImpl;
-import pipe.gui.handler.SpecialMacHandler;
 import dk.aau.cs.gui.TabContent;
 
-
 public class CreateGui {
 
 	private final static GuiFrame appGui = new GuiFrame(TAPAAL.getProgramName());
@@ -21,13 +21,31 @@
 
 	public static void init() {
 
-        if (Platform.isMac()){
-			try {
-				SpecialMacHandler.postprocess();
-			} catch (NoClassDefFoundError e) {
-				//Failed loading special mac handler, ignore and run program without MacOS integration
-			}
-		}
+	    try {
+            Desktop.getDesktop().setAboutHandler(e -> appGuiController.showAbout());
+        } catch (SecurityException | UnsupportedOperationException ignored) {
+            Logger.log("Failed to set native about handler");
+        }
+
+	    try {
+	        Desktop.getDesktop().setQuitHandler(
+	            (e, response) -> {
+	                appGuiController.exit();
+	                response.cancelQuit(); //If we get here the request was canceled.
+	            }
+	        );
+
+        } catch (SecurityException | UnsupportedOperationException ignored) {
+	        Logger.log("Failed to set native quit handler");
+        }
+
+        try {
+            Image appImage = ResourceManager.getIcon("icon.png").getImage();
+            Taskbar.getTaskbar().setIconImage(appImage);
+
+        } catch (SecurityException | UnsupportedOperationException ignored) {
+            Logger.log("Failed to set DockIcon");
+        }
 
 		appGui.setVisible(true);
 		appGuiController.checkForUpdate(false);

=== modified file 'src/pipe/gui/DelayEnabledTransitionControl.java'
--- src/pipe/gui/DelayEnabledTransitionControl.java	2020-06-21 11:29:58 +0000
+++ src/pipe/gui/DelayEnabledTransitionControl.java	2020-08-10 09:00:56 +0000
@@ -3,22 +3,17 @@
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
-import java.awt.Insets;
 import java.math.BigDecimal;
 import java.math.MathContext;
 import java.util.Hashtable;
 
 import javax.swing.BorderFactory;
-import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
-import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JSlider;
 
-import pipe.gui.widgets.EscapableDialog;
-
 import dk.aau.cs.model.tapn.simulation.DelayMode;
 import dk.aau.cs.model.tapn.simulation.ManualDelayMode;
 import dk.aau.cs.model.tapn.simulation.RandomDelayMode;
@@ -59,7 +54,7 @@
 		setValue(defaultGranularity);
 		
 		DelayMode[] items = {ShortestDelayMode.getInstance(), RandomDelayMode.getInstance(), ManualDelayMode.getInstance()};
-		delayMode = new JComboBox(items);
+		delayMode = new JComboBox<>(items);
 		setDelayMode(defaultDelayMode);
 
         setRandomTransitionMode(defaultIsRandomTrasition);

=== modified file 'src/pipe/gui/ExportBatchDialog.java'
--- src/pipe/gui/ExportBatchDialog.java	2020-07-13 13:58:47 +0000
+++ src/pipe/gui/ExportBatchDialog.java	2020-08-10 09:00:56 +0000
@@ -78,8 +78,8 @@
 	private JButton exportFilesButton;
 	private JPanel chooserPanel;
 	private JTextField destinationPathField;
-	private JList fileList;
-	private DefaultListModel listModel;
+	private JList<File> fileList;
+	private DefaultListModel<File> listModel;
 	private final List<File> files = new ArrayList<File>();
 	private String lastExportPath;
 	private String lastSelectPath;
@@ -287,8 +287,8 @@
 		JPanel fileListPanel = new JPanel(new GridBagLayout());
 		fileListPanel.setBorder(BorderFactory.createTitledBorder("Files"));
 
-		listModel = new DefaultListModel();
-		fileList = new JList(listModel);
+		listModel = new DefaultListModel<>();
+		fileList = new JList<>(listModel);
 		fileList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 		fileList.setSelectedIndex(0);
 		fileList.addKeyListener(new KeyAdapter() {
@@ -300,7 +300,7 @@
 			}
 		});
 
-		fileList.setCellRenderer(new FileNameCellRenderer());
+		fileList.setCellRenderer(new FileNameCellRenderer<>());
 		GridBagConstraints gbc = new GridBagConstraints();
 
 		JScrollPane scrollpane = new JScrollPane(fileList);

=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2020-08-04 08:19:44 +0000
+++ src/pipe/gui/GuiFrame.java	2020-08-10 09:00:56 +0000
@@ -9,17 +9,16 @@
 import java.awt.event.WindowEvent;
 import java.io.*;
 import java.net.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import javax.imageio.ImageIO;
 import javax.swing.*;
 
-import com.apple.eawt.Application;
+import com.sun.jna.Platform;
 import dk.aau.cs.gui.*;
 import dk.aau.cs.verification.VerifyTAPN.VerifyPN;
 import net.tapaal.Preferences;
-import com.sun.jna.Platform;
 import net.tapaal.TAPAAL;
 import net.tapaal.helpers.Reference.MutableReference;
 import net.tapaal.helpers.Reference.Reference;
@@ -27,10 +26,6 @@
 import net.tapaal.swinghelpers.ToggleButtonWithoutText;
 import pipe.gui.Pipe.ElementType;
 import pipe.gui.action.GuiAction;
-import pipe.gui.graphicElements.PetriNetObject;
-import pipe.gui.graphicElements.tapn.TimedPlaceComponent;
-import pipe.gui.graphicElements.tapn.TimedTransitionComponent;
-import pipe.gui.handler.SpecialMacHandler;
 import pipe.gui.widgets.WorkflowDialog;
 import dk.aau.cs.debug.Logger;
 import dk.aau.cs.gui.smartDraw.SmartDrawDialog;
@@ -45,7 +40,7 @@
     // for zoom combobox and dropdown
     private final int[] zoomLevels = {40, 60, 80, 100, 120, 140, 160, 180, 200, 300};
 
-    private String frameTitle;
+    private final String frameTitle;
 
     private Pipe.ElementType mode;
 
@@ -53,9 +48,9 @@
 
     final MutableReference<GuiFrameControllerActions> guiFrameController = new MutableReference<>();
 
-    private ExtendedJTabbedPane<TabContent> appTab;
+    private final ExtendedJTabbedPane<TabContent> appTab;
 
-    private StatusBar statusBar;
+    private final StatusBar statusBar;
     private JMenuBar menuBar;
     private JToolBar drawingToolBar;
     private final JLabel featureInfoText = new JLabel();
@@ -351,7 +346,7 @@
             guiFrameController.ifPresent(GuiFrameControllerActions::toggleQueries);
         }
     };
-    private GuiAction showConstantsAction = new GuiAction("Display constants", "Show/hide global constants.", KeyStroke.getKeyStroke('4', shortcutkey), true) {
+    private final GuiAction showConstantsAction = new GuiAction("Display constants", "Show/hide global constants.", KeyStroke.getKeyStroke('4', shortcutkey), true) {
         public void actionPerformed(ActionEvent e) {
             guiFrameController.ifPresent(GuiFrameControllerActions::toggleConstants);
         }
@@ -386,7 +381,7 @@
             guiFrameController.ifPresent(GuiFrameControllerActions::showSimpleWorkspace);
         }
     };
-    private GuiAction saveWorkSpaceAction = new GuiAction("Save workspace", "Save the current workspace as the default one", false) {
+    private final GuiAction saveWorkSpaceAction = new GuiAction("Save workspace", "Save the current workspace as the default one", false) {
         public void actionPerformed(ActionEvent e) {
             guiFrameController.ifPresent(GuiFrameControllerActions::saveWorkspace);
         }
@@ -444,22 +439,22 @@
             currentTab.ifPresent(TabContentActions::stepBackwards);
         }
     };
-    private GuiAction timeAction = new GuiAction("Delay one time unit", "Let time pass one time unit", "W") {
+    private final GuiAction timeAction = new GuiAction("Delay one time unit", "Let time pass one time unit", "W") {
         public void actionPerformed(ActionEvent e) {
             currentTab.ifPresent(TabContentActions::timeDelay);
         }
     };
-    private GuiAction delayFireAction = new GuiAction("Delay and fire", "Delay and fire selected transition", "F") {
+    private final GuiAction delayFireAction = new GuiAction("Delay and fire", "Delay and fire selected transition", "F") {
         public void actionPerformed(ActionEvent e) {
             currentTab.ifPresent(TabContentActions::delayAndFire);
         }
     };
-    private GuiAction prevcomponentAction = new GuiAction("Previous component", "Previous component", "pressed UP") {
+    private final GuiAction prevcomponentAction = new GuiAction("Previous component", "Previous component", "pressed UP") {
         public void actionPerformed(ActionEvent e) {
             currentTab.ifPresent(TabContentActions::previousComponent);
         }
     };
-    private GuiAction nextcomponentAction = new GuiAction("Next component", "Next component", "pressed DOWN") {
+    private final GuiAction nextcomponentAction = new GuiAction("Next component", "Next component", "pressed DOWN") {
         public void actionPerformed(ActionEvent e) {
             currentTab.ifPresent(TabContentActions::nextComponent);
         }
@@ -488,10 +483,7 @@
         this.setMinimumSize(new Dimension(825, 480));
 
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-
-        //XXX: Moved appTab from creategui needs further refacotring
-        //kyrke 2018-05-20
-        appTab = new ExtendedJTabbedPane<TabContent>() {
+        appTab= new ExtendedJTabbedPane<TabContent>() {
             @Override
             public Component generator() {
                 return new TabComponent(this) {
@@ -556,23 +548,8 @@
             Logger.log("Error loading L&F: " + exc);
         }
 
-        if (Platform.isMac()) {
-
-            try {
-                new SpecialMacHandler(guiFrameController);
-            } catch (NoClassDefFoundError e) {
-                //Failed loading special mac handler, ignore and run program without MacOS integration
-            }
-
-            //XXX Refactor to sperate function, only a test to see of this fixes issues for TAPAAL on Java9 bug #1764383
-            Application app = Application.getApplication();
-            try {
-                Image appImage;
-                appImage = ImageIO.read(Thread.currentThread().getContextClassLoader().getResource(ResourceManager.imgPath + "icon.png"));
-                app.setDockIconImage(appImage);
-            } catch (IOException e) {
-                Logger.log("Error loading Image");
-            }
+
+        if (Platform.isMac()){
 
             //Set specific settings
             System.setProperty("apple.laf.useScreenMenuBar", "true");
@@ -603,11 +580,9 @@
     private void buildMenus() {
         menuBar = new JMenuBar();
 
-        int shortcutkey = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
-
-        menuBar.add(buildMenuFiles(shortcutkey));
-        menuBar.add(buildMenuEdit(shortcutkey));
-        menuBar.add(buildMenuView(shortcutkey));
+        menuBar.add(buildMenuFiles());
+        menuBar.add(buildMenuEdit());
+        menuBar.add(buildMenuView());
         menuBar.add(buildMenuDraw());
         menuBar.add(buildMenuAnimation());
         menuBar.add(buildMenuTools());
@@ -617,7 +592,7 @@
 
     }
 
-    private JMenu buildMenuEdit(int shortcutkey) {
+    private JMenu buildMenuEdit() {
 
         /* Edit Menu */
         JMenu editMenu = new JMenu("Edit");
@@ -672,7 +647,7 @@
         return drawMenu;
     }
 
-    private JMenu buildMenuView(int shortcutkey) {
+    private JMenu buildMenuView() {
         /* ViewMenu */
         JMenu viewMenu = new JMenu("View");
         viewMenu.setMnemonic('V');
@@ -786,8 +761,6 @@
 
         toolsMenu.add(netStatisticsAction).setMnemonic('i');
 
-
-        //JMenuItem batchProcessing = new JMenuItem("Batch processing");
         JMenuItem batchProcessing = new JMenuItem(batchProcessingAction);
         batchProcessing.setMnemonic('b');
         toolsMenu.add(batchProcessing);
@@ -800,7 +773,6 @@
         smartDrawDialog.setMnemonic('D');
         toolsMenu.add(smartDrawDialog);
 
-        //Stip off timing information
         JMenuItem stripTimeDialog = new JMenuItem(stripTimeDialogAction);
         stripTimeDialog.setMnemonic('e');
         toolsMenu.add(stripTimeDialog);
@@ -940,8 +912,6 @@
                 }
             };
 
-            //JMenuItem newItem = new JMenuItem(a);
-
             zoomMenu.add(newZoomAction);
         }
 
@@ -1262,16 +1232,8 @@
                 // Enable all draw actions
                 startAction.setSelected(false);
 
-                if (getCurrentTab().isInAnimationMode()) {
-                    getCurrentTab().getAnimator().restoreModel();
-                    hideComponentWindow();
-                }
-
-                getCurrentTab().switchToEditorComponents();
-
                 break;
             case animation:
-                getCurrentTab().switchToAnimationComponents(true);
                 startAction.setSelected(true);
 
                 break;
@@ -1299,20 +1261,6 @@
         a.dispose();
     }
 
-    private void hideComponentWindow() {
-        ArrayList<PetriNetObject> selection = getCurrentTab().drawingSurface().getGuiModel().getPNObjects();
-
-        for (PetriNetObject pn : selection) {
-            if (pn instanceof TimedPlaceComponent) {
-                TimedPlaceComponent place = (TimedPlaceComponent) pn;
-                place.showAgeOfTokens(false);
-            } else if (pn instanceof TimedTransitionComponent) {
-                TimedTransitionComponent transition = (TimedTransitionComponent) pn;
-                transition.showDInterval(false);
-            }
-        }
-    }
-
     //XXX temp while refactoring, kyrke - 2019-07-25, should only be called from TabContent
     @Override
     public void updateMode(Pipe.ElementType _mode) {
@@ -1384,7 +1332,7 @@
 
     @Override
     public void setShowToolTipsSelected(boolean b) {
-        showTokenAgeAction.setSelected(b);
+        showToolTipsAction.setSelected(b);
     }
 
     @Override
@@ -1444,7 +1392,7 @@
         return false;
     }
 
-    private JMenu buildMenuFiles(int shortcutkey) {
+    private JMenu buildMenuFiles() {
         JMenu fileMenu = new JMenu("File");
         fileMenu.setMnemonic('F');
 
@@ -1575,7 +1523,7 @@
                 /* A JAR path */
                 String jarPath = dirURL.getPath().substring(5, dirURL.getPath().indexOf('!')); // strip out only the JAR
                 // file
-                JarFile jar = new JarFile(URLDecoder.decode(jarPath, "UTF-8"));
+                JarFile jar = new JarFile(URLDecoder.decode(jarPath, StandardCharsets.UTF_8));
                 Enumeration<JarEntry> entries = jar.entries(); // gives ALL entries in jar
                 Set<String> result = new HashSet<String>(); // avoid duplicates in case it is a subdirectory
                 while (entries.hasMoreElements()) {
@@ -1626,10 +1574,10 @@
         return appTab.getTitleAt(appTab.getSelectedIndex());
     }
 
+    //XXX: Needs further cleanup
+    @Deprecated
     public boolean isShowingDelayEnabledTransitions() {
-        //XXX:
-        return true;
-        //return showDelayEnabledTransitions;
+        return showDelayEnabledTransitionsAction.isSelected();
     }
 
     public boolean showZeroToInfinityIntervals() {

=== modified file 'src/pipe/gui/GuiFrameController.java'
--- src/pipe/gui/GuiFrameController.java	2020-08-03 14:00:57 +0000
+++ src/pipe/gui/GuiFrameController.java	2020-08-10 09:00:56 +0000
@@ -33,8 +33,8 @@
 
 public class GuiFrameController implements GuiFrameControllerActions{
 
-    GuiFrame guiFrameDirectAccess; //XXX - while refactoring shold only use guiFrameActions
-    GuiFrameActions guiFrame;
+    final GuiFrame guiFrameDirectAccess; //XXX - while refactoring shold only use guiFrameActions
+    final GuiFrameActions guiFrame;
 
     final MutableReference<TabContentActions> currentTab = new MutableReference<>();
 
@@ -88,6 +88,7 @@
         DelayEnabledTransitionControl.setDefaultIsRandomTransition(prefs.getDelayEnabledTransitionIsRandomTransition());
 
         showToolTips = prefs.getShowToolTips();
+        setDisplayToolTips(showToolTips);
         guiFrame.setShowToolTipsSelected(showToolTips);
 
         showZeroToInfinityIntervals = prefs.getShowZeroInfIntervals();
@@ -109,6 +110,8 @@
 
         guiFrame.attachTabToGuiFrame(tab);
         guiFrame.changeToTab(tab);
+        //XXX fixes an issue where on first open of a net the time intervals are not shown
+        tab.drawingSurface().repaintAll();
 
     }
 
@@ -484,7 +487,7 @@
     @Override
     public void showBatchProcessingDialog() {
         if (showSavePendingChangesDialogForAllTabs()) {
-            BatchProcessingDialog.showBatchProcessingDialog(new JList(new DefaultListModel()));
+            BatchProcessingDialog.showBatchProcessingDialog(new JList<>(new DefaultListModel<>()));
         }
     }
 
@@ -670,7 +673,8 @@
 
     @Override
     public void toggleDisplayToolTips() {
-        setDisplayToolTips(!showToolTips);
+        showToolTips = !showToolTips;
+        setDisplayToolTips(showToolTips);
     }
 
     private void setDisplayToolTips(boolean b) {

=== modified file 'src/pipe/gui/Pipe.java'
--- src/pipe/gui/Pipe.java	2020-04-18 13:17:20 +0000
+++ src/pipe/gui/Pipe.java	2020-08-10 09:00:56 +0000
@@ -62,19 +62,19 @@
 
 	public static final int NAMELABEL_OFFSET = 12;
 
-	public static int DEFAULT_BUFFER_CAPACITY = 50;
+	public static final int DEFAULT_BUFFER_CAPACITY = 50;
 
 	public static final int ZOOM_DELTA = 10;
 	public static final int ZOOM_MAX = 300;
 	public static final int ZOOM_MIN = 40;
 	public static final int ZOOM_DEFAULT = 100;
 
-	public static Color BACKGROUND_COLOR = new Color(255, 255, 255, 200);
-	public static Color ANIMATION_BACKGROUND_COLOR = new Color(246, 250, 255);
+	public static final Color BACKGROUND_COLOR = new Color(255, 255, 255, 200);
+	public static final Color ANIMATION_BACKGROUND_COLOR = new Color(246, 250, 255);
 	
-	public static Color QUERY_SATISFIED_COLOR = new Color(44, 103, 0);
-	public static Color QUERY_NOT_SATISFIED_COLOR = new Color(204, 0, 0);
-	public static Color QUERY_INCONCLUSIVE_COLOR = new Color(255, 153, 0);
+	public static final Color QUERY_SATISFIED_COLOR = new Color(44, 103, 0);
+	public static final Color QUERY_NOT_SATISFIED_COLOR = new Color(204, 0, 0);
+	public static final Color QUERY_INCONCLUSIVE_COLOR = new Color(255, 153, 0);
 
 	public static final String verifytaMinRev = "4.1.19";
 	public static final String verifytapnMinRev = "1.3.0";

=== modified file 'src/pipe/gui/RunVerification.java'
--- src/pipe/gui/RunVerification.java	2020-07-13 13:58:47 +0000
+++ src/pipe/gui/RunVerification.java	2020-08-10 09:00:56 +0000
@@ -22,7 +22,6 @@
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 
-import pipe.gui.GuiFrame.GUIMode;
 import dk.aau.cs.Messenger;
 import dk.aau.cs.model.tapn.simulation.TAPNNetworkTrace;
 import dk.aau.cs.util.MemoryMonitor;
@@ -62,8 +61,6 @@
 				);
 	
 				if (result.getTrace() != null) {
-					CreateGui.getApp().setGUIMode(GUIMode.animation);
-	
 					CreateGui.getAnimator().setTrace(result.getTrace());
 				}
 			}

=== modified file 'src/pipe/gui/SelectionManager.java'
--- src/pipe/gui/SelectionManager.java	2020-07-13 13:58:47 +0000
+++ src/pipe/gui/SelectionManager.java	2020-08-10 09:00:56 +0000
@@ -12,7 +12,6 @@
 import java.awt.event.MouseWheelEvent;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.jetbrains.annotations.Nullable;
 import pipe.gui.canvas.DrawingSurfaceImpl;

=== modified file 'src/pipe/gui/action/GuiAction.java'
--- src/pipe/gui/action/GuiAction.java	2020-05-27 13:07:27 +0000
+++ src/pipe/gui/action/GuiAction.java	2020-08-10 09:00:56 +0000
@@ -10,7 +10,6 @@
 import javax.swing.KeyStroke;
 
 import net.tapaal.resourcemanager.ResourceManager;
-import pipe.gui.CreateGui;
 
 /**
  * GuiAction class

=== modified file 'src/pipe/gui/action/SplitArcAction.java'
--- src/pipe/gui/action/SplitArcAction.java	2020-07-13 13:58:47 +0000
+++ src/pipe/gui/action/SplitArcAction.java	2020-08-10 09:00:56 +0000
@@ -17,7 +17,7 @@
 public class SplitArcAction extends javax.swing.AbstractAction {
 
 	private final Arc selected;
-	Point2D.Double mouseposition;
+	private final Point2D.Double mouseposition;
 
 	public SplitArcAction(Arc arc, Point mousepos) {
 		selected = arc;

=== modified file 'src/pipe/gui/canvas/Canvas.java'
--- src/pipe/gui/canvas/Canvas.java	2020-06-19 08:55:38 +0000
+++ src/pipe/gui/canvas/Canvas.java	2020-08-10 09:00:56 +0000
@@ -1,7 +1,6 @@
 package pipe.gui.canvas;
 
 import pipe.gui.graphicElements.GraphicalElement;
-import pipe.gui.graphicElements.PetriNetObject;
 
 public interface Canvas {
 

=== modified file 'src/pipe/gui/canvas/DrawingSurfaceImpl.java'
--- src/pipe/gui/canvas/DrawingSurfaceImpl.java	2020-08-04 06:34:24 +0000
+++ src/pipe/gui/canvas/DrawingSurfaceImpl.java	2020-08-10 09:00:56 +0000
@@ -11,14 +11,12 @@
 import javax.swing.event.MouseInputAdapter;
 
 import dk.aau.cs.gui.TabContent;
-import dk.aau.cs.gui.undo.Command;
 import net.tapaal.gui.DrawingSurfaceManager.AbstractDrawingSurfaceManager;
 import net.tapaal.helpers.Reference.Reference;
 import pipe.dataLayer.DataLayer;
 import pipe.gui.*;
 import pipe.gui.Pipe.ElementType;
 import pipe.gui.graphicElements.*;
-import pipe.gui.graphicElements.tapn.*;
 import pipe.gui.undo.*;
 import dk.aau.cs.gui.NameGenerator;
 import dk.aau.cs.model.tapn.TimedArcPetriNet;

=== modified file 'src/pipe/gui/canvas/PrototypeCanvas.java'
--- src/pipe/gui/canvas/PrototypeCanvas.java	2020-06-19 08:55:38 +0000
+++ src/pipe/gui/canvas/PrototypeCanvas.java	2020-08-10 09:00:56 +0000
@@ -1,7 +1,6 @@
 package pipe.gui.canvas;
 
 import pipe.gui.graphicElements.GraphicalElement;
-import pipe.gui.graphicElements.PetriNetObject;
 
 /**
  * ProtypeCanvas is used by controllers to draw objects that are not (yet) committed to the medel

=== modified file 'src/pipe/gui/graphicElements/AnnotationNote.java'
--- src/pipe/gui/graphicElements/AnnotationNote.java	2020-07-13 13:58:47 +0000
+++ src/pipe/gui/graphicElements/AnnotationNote.java	2020-08-10 09:00:56 +0000
@@ -315,14 +315,18 @@
 		public ResizePoint(Note obj, int type) {
 			myNote = obj;
 			setOpaque(false);
-			setBounds(-SIZE - 1, -SIZE - 1, 2 * SIZE
-					+ Pipe.ANNOTATION_SIZE_OFFSET + 1, 2 * SIZE
-					+ Pipe.ANNOTATION_SIZE_OFFSET + 1);
+			setBounds(
+			    -SIZE - 1, -SIZE - 1,
+                2 * SIZE + Pipe.ANNOTATION_SIZE_OFFSET + 1,
+                2 * SIZE + Pipe.ANNOTATION_SIZE_OFFSET + 1
+            );
 			typeMask = type;
 		}
 
-		public void setLocation(double x, double y) {
-			super.setLocation((int) (x - SIZE), (int) (y - SIZE));
+		//Adjust the point a bit to hit center on corner of box
+        @Override
+		public void setLocation(int x, int y) {
+			super.setLocation(x - SIZE, y - SIZE);
 		}
 
 		private void drag(int x, int y) {

=== modified file 'src/pipe/gui/graphicElements/Arc.java'
--- src/pipe/gui/graphicElements/Arc.java	2020-06-30 06:41:30 +0000
+++ src/pipe/gui/graphicElements/Arc.java	2020-08-10 09:00:56 +0000
@@ -5,11 +5,9 @@
 import java.awt.event.KeyEvent;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
-import java.util.function.Supplier;
 
 import javax.swing.*;
 
-import pipe.gui.CreateGui;
 import pipe.gui.Grid;
 import pipe.gui.Pipe;
 import pipe.gui.Zoomer;
@@ -368,7 +366,6 @@
 	 * Handles keyboard input when drawing arcs in the GUI. Keys are bound to action names,
 	 * and action names are mapped to action objects. The key bindings are disabled when the
 	 * arc object is deleted, or the arc is connected to a place/transition.
-     * @param action
      */
 	public void enableDrawingKeyBindings(Runnable action) {
 		InputMap iMap = this.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);

=== modified file 'src/pipe/gui/graphicElements/Place.java'
--- src/pipe/gui/graphicElements/Place.java	2020-06-29 06:55:51 +0000
+++ src/pipe/gui/graphicElements/Place.java	2020-08-10 09:00:56 +0000
@@ -19,20 +19,20 @@
 	protected static final int DIAMETER = Pipe.PLACE_TRANSITION_HEIGHT;
 
 	// Token Width and Height
-	protected static int tWidth = 5;
-	protected static int tHeight = 5;
+	protected static final int tWidth = 5;
+	protected static final int tHeight = 5;
 
 	// Token dot position offsets
-	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;
+	protected static final int tLeftX = 7;
+	protected static final int tRightX = 19;
+	protected static final int tTopY = 7;
+	protected static final int tBotY = 19;
+	protected static final int tMiddleX = 13;
+	protected static final 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);
+	protected static final Ellipse2D.Double placeEllipse = new Ellipse2D.Double(0, 0,	DIAMETER, DIAMETER);
+	protected static final Shape proximityPlace = (new BasicStroke(Pipe.PLACE_TRANSITION_PROXIMITY_RADIUS)).createStrokedShape(placeEllipse);
 
 
 	public Place(

=== modified file 'src/pipe/gui/graphicElements/PlaceTransitionObject.java'
--- src/pipe/gui/graphicElements/PlaceTransitionObject.java	2020-06-23 13:43:53 +0000
+++ src/pipe/gui/graphicElements/PlaceTransitionObject.java	2020-08-10 09:00:56 +0000
@@ -5,7 +5,6 @@
 
 import java.awt.*;
 import java.awt.geom.Point2D;
-import java.util.Iterator;
 import java.util.LinkedList;
 
 /**

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java	2020-06-12 14:09:08 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedInputArcComponent.java	2020-08-10 09:00:56 +0000
@@ -4,7 +4,6 @@
 
 import pipe.gui.CreateGui;
 import pipe.gui.Pipe;
-import pipe.gui.graphicElements.Place;
 import pipe.gui.graphicElements.PlaceTransitionObject;
 import pipe.gui.handler.TimedArcHandler;
 import pipe.gui.undo.ArcTimeIntervalEdit;

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java	2020-06-21 13:12:27 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedPlaceComponent.java	2020-08-10 09:00:56 +0000
@@ -27,11 +27,9 @@
 import pipe.gui.Pipe;
 import pipe.gui.graphicElements.Place;
 import pipe.gui.handler.PlaceHandler;
-import pipe.gui.undo.TimedPlaceInvariantEdit;
 import pipe.gui.widgets.EscapableDialog;
 import pipe.gui.widgets.PlaceEditorPanel;
 import dk.aau.cs.gui.Context;
-import dk.aau.cs.gui.undo.Command;
 import dk.aau.cs.model.tapn.Bound.InfBound;
 import dk.aau.cs.model.tapn.Constant;
 import dk.aau.cs.model.tapn.Bound;

=== modified file 'src/pipe/gui/graphicElements/tapn/TimedTransitionComponent.java'
--- src/pipe/gui/graphicElements/tapn/TimedTransitionComponent.java	2020-08-04 08:19:44 +0000
+++ src/pipe/gui/graphicElements/tapn/TimedTransitionComponent.java	2020-08-10 09:00:56 +0000
@@ -90,8 +90,7 @@
 	@Override
 	public void showEditor() {
 		// Build interface
-		EscapableDialog guiDialog = new EscapableDialog(CreateGui.getApp(),
-				"Edit Transition", true);
+		EscapableDialog guiDialog = new EscapableDialog(CreateGui.getApp(), "Edit Transition", true);
 
 		Container contentPane = guiDialog.getContentPane();
 

=== modified file 'src/pipe/gui/handler/ArcHandler.java'
--- src/pipe/gui/handler/ArcHandler.java	2020-07-09 12:55:25 +0000
+++ src/pipe/gui/handler/ArcHandler.java	2020-08-10 09:00:56 +0000
@@ -1,18 +1,11 @@
 package pipe.gui.handler;
 
 import java.awt.event.MouseEvent;
-import java.awt.geom.Point2D;
 import javax.swing.*;
 
 import net.tapaal.TAPAAL;
-import pipe.gui.CreateGui;
-import pipe.gui.Zoomer;
 import pipe.gui.action.SplitArcAction;
 import pipe.gui.graphicElements.Arc;
-import pipe.gui.graphicElements.PlaceTransitionObject;
-import pipe.gui.graphicElements.tapn.TimedInputArcComponent;
-import pipe.gui.graphicElements.tapn.TimedOutputArcComponent;
-import pipe.gui.graphicElements.tapn.TimedTransportArcComponent;
 
 /**
  * Class used to implement methods corresponding to mouse events on arcs.

=== modified file 'src/pipe/gui/handler/PetriNetObjectHandler.java'
--- src/pipe/gui/handler/PetriNetObjectHandler.java	2020-06-29 12:11:25 +0000
+++ src/pipe/gui/handler/PetriNetObjectHandler.java	2020-08-10 09:00:56 +0000
@@ -11,11 +11,7 @@
 import pipe.gui.Grid;
 import pipe.gui.Pipe.ElementType;
 
-import pipe.gui.graphicElements.AnnotationNote;
-import pipe.gui.graphicElements.Arc;
 import pipe.gui.graphicElements.PetriNetObject;
-import pipe.gui.graphicElements.tapn.TimedPlaceComponent;
-import pipe.gui.graphicElements.tapn.TimedTransitionComponent;
 
 /**
  * Class used to implement methods corresponding to mouse events on all
@@ -67,18 +63,6 @@
 		return popup;
 	}
 
-	/**
-	 * Displays the popup menu
-	 */
-	private void checkForPopup(MouseEvent e) {
-		if (SwingUtilities.isRightMouseButton(e) && CreateGui.getApp().getMode() == ElementType.SELECT) {
-			JPopupMenu m = getPopup(e);
-			if (m != null && !(myObject instanceof TimedPlaceComponent || myObject instanceof TimedTransitionComponent || myObject instanceof Arc || myObject instanceof AnnotationNote)) {
-				m.show(myObject, e.getX(), e.getY());
-			}
-		}
-	}
-
 	@Override
 	public void mousePressed(MouseEvent e) {
 		if(CreateGui.getCurrentTab().isInAnimationMode()) return;
@@ -93,10 +77,7 @@
 			}
 			dragInit = e.getPoint();
 		}
-		
-		if (CreateGui.getApp().isEditionAllowed()) {
-			checkForPopup(e);
-		}
+
 	}
 
 	/**
@@ -106,10 +87,6 @@
 	@Override
 	public void mouseReleased(MouseEvent e) {
 		if(CreateGui.getCurrentTab().isInAnimationMode()) return;
-		// Have to check for popup here as well as on pressed for crossplatform!!
-		if (CreateGui.getApp().isEditionAllowed()) {
-			checkForPopup(e);
-		}
 
 		if (!SwingUtilities.isLeftMouseButton(e)) {
 			return;

=== modified file 'src/pipe/gui/handler/PlaceHandler.java'
--- src/pipe/gui/handler/PlaceHandler.java	2020-06-29 10:58:39 +0000
+++ src/pipe/gui/handler/PlaceHandler.java	2020-08-10 09:00:56 +0000
@@ -1,19 +1,12 @@
 package pipe.gui.handler;
 
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseWheelEvent;
 
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
-import javax.swing.SwingUtilities;
 
-import pipe.gui.CreateGui;
-import pipe.gui.Zoomer;
-import pipe.gui.Pipe.ElementType;
 import pipe.gui.action.ShowHideInfoAction;
-import pipe.gui.graphicElements.PetriNetObjectWithLabel;
 import pipe.gui.graphicElements.Place;
-import pipe.gui.graphicElements.tapn.TimedPlaceComponent;
 
 /**
  * Class used to implement methods corresponding to mouse events on places.
@@ -49,17 +42,4 @@
 		return popup;
 	}
 
-	@Override
-    public void mouseWheelMoved(MouseWheelEvent e) {
-        if (!(CreateGui.getApp().isEditionAllowed()) || e.isControlDown() || !(myObject.isSelected()) || !(myObject instanceof TimedPlaceComponent)) {
-            return;
-        }
-
-        TimedPlaceComponent p = (TimedPlaceComponent) myObject;
-        if (e.getWheelRotation() < 0) {
-            p.underlyingPlace().addTokens(1);
-        } else {
-            p.underlyingPlace().removeTokens(1);
-        }
-    }
 }

=== removed file 'src/pipe/gui/handler/SpecialMacHandler.java'
=== modified file 'src/pipe/gui/handler/TimedArcHandler.java'
--- src/pipe/gui/handler/TimedArcHandler.java	2020-08-04 07:41:30 +0000
+++ src/pipe/gui/handler/TimedArcHandler.java	2020-08-10 09:00:56 +0000
@@ -5,13 +5,8 @@
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 
-import dk.aau.cs.model.tapn.TimedOutputArc;
-import pipe.gui.action.SplitArcAction;
 import pipe.gui.graphicElements.Arc;
-import pipe.gui.graphicElements.tapn.TimedInhibitorArcComponent;
-import pipe.gui.graphicElements.tapn.TimedInputArcComponent;
 import pipe.gui.graphicElements.tapn.TimedOutputArcComponent;
-import pipe.gui.graphicElements.tapn.TimedTransportArcComponent;
 
 public class TimedArcHandler extends ArcHandler {
 

=== modified file 'src/pipe/gui/handler/TransitionHandler.java'
--- src/pipe/gui/handler/TransitionHandler.java	2020-06-29 10:58:39 +0000
+++ src/pipe/gui/handler/TransitionHandler.java	2020-08-10 09:00:56 +0000
@@ -1,15 +1,10 @@
 package pipe.gui.handler;
 
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseWheelEvent;
 
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
-import javax.swing.SwingUtilities;
 
-import pipe.gui.CreateGui;
-import pipe.gui.Zoomer;
-import pipe.gui.Pipe.ElementType;
 import pipe.gui.action.ShowHideInfoAction;
 import pipe.gui.graphicElements.Transition;
 
@@ -23,24 +18,6 @@
 		super(obj);
 	}
 
-	@Override
-	public void mouseWheelMoved(MouseWheelEvent e) {
-		
-		if (!(CreateGui.getApp().isEditionAllowed()) || e.isControlDown() || !(myObject.isSelected())) {
-			return;
-		}
-
-		int rotation = 0;
-		if (e.getWheelRotation() < 0) {
-			rotation = -e.getWheelRotation() * 135;
-		} else {
-			rotation = e.getWheelRotation() * 45;
-		}
-
-		CreateGui.getCurrentTab().getUndoManager().addNewEdit(((Transition) myObject).rotate(rotation));
-
-	}
-
 	/**
 	 * Creates the popup menu that the user will see when they right click on a
 	 * component

=== modified file 'src/pipe/gui/undo/AddArcPathPointEdit.java'
--- src/pipe/gui/undo/AddArcPathPointEdit.java	2020-04-18 14:41:05 +0000
+++ src/pipe/gui/undo/AddArcPathPointEdit.java	2020-08-10 09:00:56 +0000
@@ -16,10 +16,10 @@
  */
 public class AddArcPathPointEdit extends Command {
 
-	ArcPath arcPath;
-	ArcPathPoint point;
+	final ArcPath arcPath;
+	final ArcPathPoint point;
 	private final DataLayer guiModel;
-	Integer index;
+	final Integer index;
 
 	/** Creates a new instance of AddArcPathPointEdit */
 	public AddArcPathPointEdit(Arc _arc, ArcPathPoint _point, DataLayer guiModel) {

=== modified file 'src/pipe/gui/undo/AddTemplateCommand.java'
--- src/pipe/gui/undo/AddTemplateCommand.java	2020-04-18 14:41:05 +0000
+++ src/pipe/gui/undo/AddTemplateCommand.java	2020-08-10 09:00:56 +0000
@@ -5,7 +5,7 @@
 import dk.aau.cs.gui.undo.Command;
 
 public class AddTemplateCommand extends Command {
-	protected Template template;
+	protected final Template template;
 	protected final TemplateExplorer templateExplorer;
 	private final int listIndex;
 

=== modified file 'src/pipe/gui/undo/AnnotationBorderEdit.java'
--- src/pipe/gui/undo/AnnotationBorderEdit.java	2011-09-22 13:02:33 +0000
+++ src/pipe/gui/undo/AnnotationBorderEdit.java	2020-08-10 09:00:56 +0000
@@ -13,7 +13,7 @@
  */
 public class AnnotationBorderEdit extends Command {
 
-	Note note;
+	final Note note;
 
 	/** Creates a new instance of placeRateEdit */
 	public AnnotationBorderEdit(Note _note) {

=== modified file 'src/pipe/gui/undo/AnnotationTextEdit.java'
--- src/pipe/gui/undo/AnnotationTextEdit.java	2019-10-23 13:12:24 +0000
+++ src/pipe/gui/undo/AnnotationTextEdit.java	2020-08-10 09:00:56 +0000
@@ -13,9 +13,9 @@
  */
 public final class AnnotationTextEdit extends Command {
 
-	AnnotationNote annotationNote;
-	String oldText;
-	String newText;
+	final AnnotationNote annotationNote;
+	final String oldText;
+	final String newText;
 
 	/** Creates a new instance of placeRateEdit */
 	public AnnotationTextEdit(AnnotationNote _annotationNote, String _oldText,

=== modified file 'src/pipe/gui/undo/ArcPathPointTypeEdit.java'
--- src/pipe/gui/undo/ArcPathPointTypeEdit.java	2011-09-22 13:02:33 +0000
+++ src/pipe/gui/undo/ArcPathPointTypeEdit.java	2020-08-10 09:00:56 +0000
@@ -13,7 +13,7 @@
  */
 public class ArcPathPointTypeEdit extends Command {
 
-	ArcPathPoint arcPathPoint;
+	final ArcPathPoint arcPathPoint;
 
 	/** Creates a new instance of placeWeightEdit */
 	public ArcPathPointTypeEdit(ArcPathPoint _arcPathPoint) {

=== modified file 'src/pipe/gui/undo/ArcTimeIntervalEdit.java'
--- src/pipe/gui/undo/ArcTimeIntervalEdit.java	2020-04-18 14:41:05 +0000
+++ src/pipe/gui/undo/ArcTimeIntervalEdit.java	2020-08-10 09:00:56 +0000
@@ -7,10 +7,10 @@
 
 public class ArcTimeIntervalEdit extends Command {
 	private final TimedOutputArcComponent arc;
-	TimeInterval oldTimeInterval;
-	TimeInterval newTimeInterval;
-	Weight oldWeight;
-	Weight newWeight;
+	final TimeInterval oldTimeInterval;
+	final TimeInterval newTimeInterval;
+	final Weight oldWeight;
+	final Weight newWeight;
 
 	public ArcTimeIntervalEdit(TimedOutputArcComponent arc,
 			TimeInterval oldTimeInterval, TimeInterval newTimeInterval, Weight oldWeight, Weight newWeight) {

=== modified file 'src/pipe/gui/undo/TransitionRotationEdit.java'
--- src/pipe/gui/undo/TransitionRotationEdit.java	2011-09-25 09:35:57 +0000
+++ src/pipe/gui/undo/TransitionRotationEdit.java	2020-08-10 09:00:56 +0000
@@ -12,8 +12,8 @@
  */
 public class TransitionRotationEdit extends Command {
 
-	Transition transition;
-	Integer angle;
+	final Transition transition;
+	final Integer angle;
 
 	/** Creates a new instance of placePriorityEdit */
 	public TransitionRotationEdit(Transition _transition, Integer _angle) {

=== modified file 'src/pipe/gui/undo/TranslatePetriNetObjectEdit.java'
--- src/pipe/gui/undo/TranslatePetriNetObjectEdit.java	2020-07-03 07:08:59 +0000
+++ src/pipe/gui/undo/TranslatePetriNetObjectEdit.java	2020-08-10 09:00:56 +0000
@@ -15,10 +15,10 @@
  */
 public class TranslatePetriNetObjectEdit extends Command {
 
-	PetriNetObject pnObject;
-	Integer transX;
-	Integer transY;
-	DrawingSurfaceImpl ds;
+	final PetriNetObject pnObject;
+	final Integer transX;
+	final Integer transY;
+	final DrawingSurfaceImpl ds;
 
 	/** Creates a new instance of */
 	public TranslatePetriNetObjectEdit(PetriNetObject _pnObject, Integer _transX, Integer _transY, DrawingSurfaceImpl drawingSurface) {

=== modified file 'src/pipe/gui/undo/UndoManager.java'
--- src/pipe/gui/undo/UndoManager.java	2020-06-29 06:47:48 +0000
+++ src/pipe/gui/undo/UndoManager.java	2020-08-10 09:00:56 +0000
@@ -4,12 +4,13 @@
 package pipe.gui.undo;
 
 import java.util.ArrayList;
-import java.util.Optional;
+
 import dk.aau.cs.gui.undo.Command;
+import net.tapaal.helpers.Reference.MutableReference;
+import net.tapaal.helpers.Reference.Reference;
 import pipe.gui.CreateGui;
 import pipe.gui.GuiFrameActions;
 import pipe.gui.Pipe;
-import pipe.gui.handler.PlaceTransitionObjectHandler;
 
 /**
  * Class to handle undo & redo functionality
@@ -27,9 +28,9 @@
 
 	private final ArrayList<ArrayList<Command>> edits = new ArrayList<ArrayList<Command>>(UNDO_BUFFER_CAPACITY);
 
-	private Optional<GuiFrameActions> app = Optional.empty();
-	public void setApp(GuiFrameActions app) {
-		this.app = Optional.ofNullable(app);
+	private Reference<GuiFrameActions> app = new MutableReference<>();
+	public void setApp(Reference<GuiFrameActions> app) {
+		this.app = app;
 
 		// Undo/Redo is enabled based on undo/redo manager
 		setUndoRedoStatus();

=== modified file 'src/pipe/gui/widgets/CTLQueryDialog.java'
--- src/pipe/gui/widgets/CTLQueryDialog.java	2020-08-07 09:07:44 +0000
+++ src/pipe/gui/widgets/CTLQueryDialog.java	2020-08-10 09:00:56 +0000
@@ -218,19 +218,21 @@
 	private final HashMap<TimedArcPetriNet, DataLayer> guiModels;
 	private QueryConstructionUndoManager undoManager;
 	private UndoableEditSupport undoSupport;
-	private boolean isNetDegree2;
-	private boolean hasInhibitorArcs;
-	private InclusionPlaces inclusionPlaces;
-    private TabContent.TAPNLens lens;
-
-	private String name_verifyTAPN = "TAPAAL: Continous Engine (verifytapn)";
-	private String name_COMBI = "UPPAAL: Optimized Broadcast Reduction";
-	private String name_OPTIMIZEDSTANDARD = "UPPAAL: Optimised Standard Reduction";
-	private String name_STANDARD = "UPPAAL: Standard Reduction";
+
+	private final boolean isNetDegree2;
+	private final boolean hasInhibitorArcs;
+	private final InclusionPlaces inclusionPlaces;
+    private final TabContent.TAPNLens lens;
+
+
+	private final String name_verifyTAPN = "TAPAAL: Continous Engine (verifytapn)";
+	private final String name_COMBI = "UPPAAL: Optimized Broadcast Reduction";
+	private final String name_OPTIMIZEDSTANDARD = "UPPAAL: Optimised Standard Reduction";
+	private final String name_STANDARD = "UPPAAL: Standard Reduction";
 	private String name_BROADCAST = "UPPAAL: Broadcast Reduction";
-	private String name_BROADCASTDEG2 = "UPPAAL: Broadcast Degree 2 Reduction";
-	private String name_DISCRETE = "TAPAAL: Discrete Engine (verifydtapn)";
-	private String name_UNTIMED = "TAPAAL: Untimed Engine (verifypn)";
+	private final String name_BROADCASTDEG2 = "UPPAAL: Broadcast Degree 2 Reduction";
+	private final String name_DISCRETE = "TAPAAL: Discrete Engine (verifydtapn)";
+	private final String name_UNTIMED = "TAPAAL: Untimed Engine (verifypn)";
 	
 	private boolean userChangedAtomicPropSelection = true;
 
@@ -2575,8 +2577,8 @@
 	
 	public class QueryConstructionEdit extends AbstractUndoableEdit {
 
-		private TCTLAbstractProperty original;
-		private TCTLAbstractProperty replacement;
+		private final TCTLAbstractProperty original;
+		private final TCTLAbstractProperty replacement;
 
 		public TCTLAbstractProperty getOriginal() {
 			return original;

=== modified file 'src/pipe/gui/widgets/ConstantsDialogPanel.java'
--- src/pipe/gui/widgets/ConstantsDialogPanel.java	2020-04-18 12:27:02 +0000
+++ src/pipe/gui/widgets/ConstantsDialogPanel.java	2020-08-10 09:00:56 +0000
@@ -5,7 +5,6 @@
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.event.KeyEvent;
-import java.io.IOException;
 import java.util.regex.Pattern;
 
 import javax.swing.JButton;
@@ -23,68 +22,48 @@
 import dk.aau.cs.model.tapn.Constant;
 import dk.aau.cs.model.tapn.TimedArcPetriNetNetwork;
 
-/*
- * LeftConstantsPane.java
- *
- * Created on 08-10-2009, 13:51:42
- */
-
-/**
- * 
- * @author Morten Jacobsen
- */
 public class ConstantsDialogPanel extends javax.swing.JPanel {
 
-	private JRootPane rootPane;
-	private TimedArcPetriNetNetwork model;
+    private final TimedArcPetriNetNetwork model;
 	private int lowerBound;
 	private int upperBound;
 	private int initialValue = 0;
 	private EscapableDialog dialog;
 
-	JPanel nameTextFieldPane;
-	JTextField nameTextField;
+    JTextField nameTextField;
 	Dimension size;
-	JLabel nameLabel;  
-	JPanel valueSpinnerPane;
-	JLabel valueLabel; 	
+	JLabel nameLabel;
+    JLabel valueLabel;
 	CustomJSpinner valueSpinner;
 	JPanel container;
 	JPanel buttonContainer;
 	JButton okButton;
 	JButton cancelButton;
 
-	private String oldName;
-
-	public ConstantsDialogPanel() throws IOException {
-		initComponents();		
-	}
-
-	public ConstantsDialogPanel(JRootPane pane, TimedArcPetriNetNetwork model) throws IOException {
-		initComponents();
-		rootPane = pane;
-		this.model = model;		
-		oldName = "";
-		nameTextField.setText(oldName);
-	}
-
-	public ConstantsDialogPanel(JRootPane pane, TimedArcPetriNetNetwork model,
-			Constant constant) throws IOException {		
-		rootPane = pane;
-		this.model = model;	
-
-		initialValue = constant.value();		
-		initComponents();
-		
-		oldName = constant.name();
-		lowerBound = constant.lowerBound();
-		upperBound = constant.upperBound();		 
+	private final String oldName;
+
+    public ConstantsDialogPanel(TimedArcPetriNetNetwork model) {
+		this(model, null);
+	}
+
+	public ConstantsDialogPanel(TimedArcPetriNetNetwork model, Constant constant) {
+        this.model = model;
+
+        if (constant != null) {
+            initialValue = constant.value();
+            oldName = constant.name();
+            lowerBound = constant.lowerBound();
+            upperBound = constant.upperBound();
+        } else {
+            oldName = "";
+        }
+		initComponents();
+
 		nameTextField.setText(oldName);
 	}
 
 	public void showDialog() {
-		dialog = new EscapableDialog(CreateGui.getApp(),
-				"Edit Constant", true);
+		dialog = new EscapableDialog(CreateGui.getApp(), "Edit Constant", true);
 		dialog.add(container);
 		dialog.getRootPane().setDefaultButton(okButton);
 		dialog.setResizable(false);
@@ -93,7 +72,7 @@
 		dialog.setVisible(true);
 	}
 
-	private void initComponents() throws IOException {						
+	private void initComponents() {
 		container = new JPanel();
 		container.setLayout(new GridBagLayout());
 		size = new Dimension(330, 25);

=== modified file 'src/pipe/gui/widgets/ConstantsPane.java'
--- src/pipe/gui/widgets/ConstantsPane.java	2020-08-04 08:07:21 +0000
+++ src/pipe/gui/widgets/ConstantsPane.java	2020-08-10 09:00:56 +0000
@@ -18,7 +18,6 @@
 
 
 import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JList;
 import javax.swing.JOptionPane;
@@ -51,7 +50,7 @@
 	private JScrollPane constantsScroller;
 	private final JPanel buttonsPanel;
 
-	private final JList constantsList;
+	private final JList<Constant> constantsList;
 	private final ConstantsListModel listModel;
 	private JButton editBtn;
 	private JButton removeBtn;
@@ -95,7 +94,7 @@
 			
 		});
 
-		constantsList = new NonsearchableJList(listModel);
+		constantsList = new NonsearchableJList<>(listModel);
 		constantsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		constantsList.addListSelectionListener(new ListSelectionListener() {
 			public void valueChanged(ListSelectionEvent e) {
@@ -141,7 +140,7 @@
 					highlightConstant(index);
 					
 					if (arg0.getButton() == MouseEvent.BUTTON1 && arg0.getClickCount() == 2) {
-						showEditConstantDialog(c,index);						
+						showEditConstantDialog(c);
 					}
 				}
 			}
@@ -295,7 +294,7 @@
 		editBtn.setToolTipText(toolTipEditConstant);
 		editBtn.addActionListener(e -> {
 			Constant c = (Constant) constantsList.getSelectedValue();
-			showEditConstantDialog(c,constantsList.getSelectedIndex());
+			showEditConstantDialog(c);
 		});
 		GridBagConstraints gbc = new GridBagConstraints();
 		gbc.gridx = 0;
@@ -407,44 +406,9 @@
 		constantsPanel.add(sortButton,gbc);
 	}
 
-	private void showEditConstantDialog(Constant constant) {	
-		ConstantsDialogPanel panel = null;
-		if (constant != null)
-			try {
-				panel = new ConstantsDialogPanel(new JRootPane(),
-						parent.network(), constant);
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		else
-			try {
-				panel = new ConstantsDialogPanel(new JRootPane(),
-						parent.network());
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		panel.showDialog();
-		showConstants();
-	}
+	private void showEditConstantDialog(Constant constant) {
+		ConstantsDialogPanel panel = new ConstantsDialogPanel(parent.network(), constant);
 
-	private void showEditConstantDialog(Constant constant, int selectedIndex) {	
-		ConstantsDialogPanel panel = null;
-		if (constant != null)
-			try {
-				panel = new ConstantsDialogPanel(new JRootPane(),
-						parent.network(), constant);
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		else
-			try {
-				panel = new ConstantsDialogPanel(new JRootPane(),
-						parent.network());
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
 		panel.showDialog();
 		showConstants();
 	}
@@ -457,8 +421,9 @@
 					"You cannot remove a constant that is used in the net.\nRemove all references "
 							+ "to the constant in the net and try again.",
 							"Constant in use", JOptionPane.ERROR_MESSAGE);
-		} else
-			parent.getUndoManager().addNewEdit(edit);
+		} else {
+            parent.getUndoManager().addNewEdit(edit);
+        }
 
 		//showConstants();
 	}
@@ -485,7 +450,7 @@
     }
 
     @Override
-    public JList getJList() {
+    public JList<Constant> getJList() {
         return constantsList;
     }
 }

=== modified file 'src/pipe/gui/widgets/EngineDialogPanel.java'
--- src/pipe/gui/widgets/EngineDialogPanel.java	2020-07-13 13:58:47 +0000
+++ src/pipe/gui/widgets/EngineDialogPanel.java	2020-08-10 09:00:56 +0000
@@ -33,23 +33,23 @@
 
 	JButton closeButton;
 
-	JLabel tapaalLocationLabel = new JLabel("Located: ");
-	JLabel tapaalVersionLabel = new JLabel("Version: ");
-	JLabel dtapaalLocationLabel = new JLabel("Located: ");
-	JLabel dtapaalVersionLabel = new JLabel("Version: ");
-	JLabel untimedLocationLabel = new JLabel("Located: ");
-	JLabel untimedVersionLabel = new JLabel("Version: ");
-	JLabel uppaalLocationLabel = new JLabel("Located: ");
-	JLabel uppaalVersionLabel = new JLabel("Version: ");
+	final JLabel tapaalLocationLabel = new JLabel("Located: ");
+	final JLabel tapaalVersionLabel = new JLabel("Version: ");
+	final JLabel dtapaalLocationLabel = new JLabel("Located: ");
+	final JLabel dtapaalVersionLabel = new JLabel("Version: ");
+	final JLabel untimedLocationLabel = new JLabel("Located: ");
+	final JLabel untimedVersionLabel = new JLabel("Version: ");
+	final JLabel uppaalLocationLabel = new JLabel("Located: ");
+	final JLabel uppaalVersionLabel = new JLabel("Version: ");
 
-	JLabel tapaalLocationLabelVal = new JLabel("Not setup");
-	JLabel tapaalVersionLabelVal = new JLabel("N/A");
-	JLabel dtapaalLocationLabelVal = new JLabel("Not setup");
-	JLabel dtapaalVersionLabelVal = new JLabel("N/A");
-	JLabel untimedLocationLabelVal = new JLabel("Not setup");
-	JLabel untimedVersionLabelVal = new JLabel("N/A");
-	JLabel uppaalLocationLabelVal = new JLabel("Not setup");
-	JLabel uppaalVersionLabelVal = new JLabel("N/A");
+	final JLabel tapaalLocationLabelVal = new JLabel("Not setup");
+	final JLabel tapaalVersionLabelVal = new JLabel("N/A");
+	final JLabel dtapaalLocationLabelVal = new JLabel("Not setup");
+	final JLabel dtapaalVersionLabelVal = new JLabel("N/A");
+	final JLabel untimedLocationLabelVal = new JLabel("Not setup");
+	final JLabel untimedVersionLabelVal = new JLabel("N/A");
+	final JLabel uppaalLocationLabelVal = new JLabel("Not setup");
+	final JLabel uppaalVersionLabelVal = new JLabel("N/A");
 
 	private final Dimension minimumSize = new Dimension(320,1);
 	private final Insets panelInsets = new Insets(5, 5, 5, 5);

=== modified file 'src/pipe/gui/widgets/GuardDialogue.java'
--- src/pipe/gui/widgets/GuardDialogue.java	2020-07-13 13:58:47 +0000
+++ src/pipe/gui/widgets/GuardDialogue.java	2020-08-10 09:00:56 +0000
@@ -61,11 +61,11 @@
 	private JComboBox<String> rightDelimiter;
 
 	private JCheckBox leftUseConstant;
-	private WidthAdjustingComboBox leftConstantsComboBox;
+	private WidthAdjustingComboBox<String> leftConstantsComboBox;
 	private JCheckBox rightUseConstant;
-	private WidthAdjustingComboBox rightConstantsComboBox;
+	private WidthAdjustingComboBox<String> rightConstantsComboBox;
 	private JCheckBox weightUseConstant;
-	private WidthAdjustingComboBox weightConstantsComboBox;
+	private WidthAdjustingComboBox<String> weightConstantsComboBox;
 	
 	private final int maxNumberOfPlacesToShowAtOnce = 20;
 
@@ -261,8 +261,8 @@
 		
 	    Arrays.sort(constantArray, String.CASE_INSENSITIVE_ORDER);
 	    
-	    weightConstantsComboBox = new WidthAdjustingComboBox(maxNumberOfPlacesToShowAtOnce);
-		weightConstantsComboBox.setModel(new DefaultComboBoxModel(constantArray));
+	    weightConstantsComboBox = new WidthAdjustingComboBox<>(maxNumberOfPlacesToShowAtOnce);
+		weightConstantsComboBox.setModel(new DefaultComboBoxModel<>(constantArray));
 		weightConstantsComboBox.setMaximumRowCount(20);
 		weightConstantsComboBox.setVisible(false);
 		weightConstantsComboBox.setPreferredSize(intervalBoxDims);
@@ -320,22 +320,22 @@
 		guardEditPanel.add(label, gridBagConstraints);
 
 		String[] left = { "[", "(" };
-		leftDelimiter = new JComboBox();
+		leftDelimiter = new JComboBox<>();
 		Dimension dims = new Dimension(55, 25);
 		leftDelimiter.setPreferredSize(dims);
 		leftDelimiter.setMinimumSize(dims);
 		leftDelimiter.setMaximumSize(dims);
-		leftDelimiter.setModel(new DefaultComboBoxModel(left));
+		leftDelimiter.setModel(new DefaultComboBoxModel<>(left));
 		gridBagConstraints.gridx = 1;
 		gridBagConstraints.gridy = 1;
 		guardEditPanel.add(leftDelimiter, gridBagConstraints);
 
 		String[] right = { "]", ")" };
-		rightDelimiter = new JComboBox();
+		rightDelimiter = new JComboBox<>();
 		rightDelimiter.setPreferredSize(dims);
 		rightDelimiter.setMinimumSize(dims);
 		rightDelimiter.setMaximumSize(dims);
-		rightDelimiter.setModel(new DefaultComboBoxModel(right));
+		rightDelimiter.setModel(new DefaultComboBoxModel<>(right));
 		gridBagConstraints.gridx = 5;
 		gridBagConstraints.gridy = 1;
 		guardEditPanel.add(rightDelimiter, gridBagConstraints);
@@ -417,8 +417,8 @@
 		guardEditPanel.add(leftUseConstant, gridBagConstraints);
 
 	
-		leftConstantsComboBox = new WidthAdjustingComboBox(maxNumberOfPlacesToShowAtOnce);
-		leftConstantsComboBox.setModel(new DefaultComboBoxModel(constantArray));
+		leftConstantsComboBox = new WidthAdjustingComboBox<>(maxNumberOfPlacesToShowAtOnce);
+		leftConstantsComboBox.setModel(new DefaultComboBoxModel<>(constantArray));
 	//	leftConstantsComboBox = new JComboBox(constants.toArray());
 		leftConstantsComboBox.setMaximumRowCount(20);
 		leftConstantsComboBox.setVisible(false);
@@ -450,8 +450,8 @@
 		gridBagConstraints.gridy = 0;
 		guardEditPanel.add(rightUseConstant, gridBagConstraints);
 
-		rightConstantsComboBox = new WidthAdjustingComboBox(maxNumberOfPlacesToShowAtOnce);
-		rightConstantsComboBox.setModel(new DefaultComboBoxModel(constantArray));
+		rightConstantsComboBox = new WidthAdjustingComboBox<>(maxNumberOfPlacesToShowAtOnce);
+		rightConstantsComboBox.setModel(new DefaultComboBoxModel<>(constantArray));
 		rightConstantsComboBox.setMaximumRowCount(20);
 		rightConstantsComboBox.setVisible(false);
 	//	rightConstantsComboBox.setMaximumSize(intervalBoxDims);

=== modified file 'src/pipe/gui/widgets/PlaceEditorPanel.java'
--- src/pipe/gui/widgets/PlaceEditorPanel.java	2020-07-13 13:58:47 +0000
+++ src/pipe/gui/widgets/PlaceEditorPanel.java	2020-08-10 09:00:56 +0000
@@ -23,6 +23,7 @@
 import javax.swing.event.ChangeListener;
 
 import net.tapaal.swinghelpers.CustomJSpinner;
+import net.tapaal.swinghelpers.GridBagHelper;
 import net.tapaal.swinghelpers.WidthAdjustingComboBox;
 import pipe.dataLayer.Template;
 import pipe.gui.CreateGui;
@@ -51,13 +52,16 @@
 import dk.aau.cs.model.tapn.TransportArc;
 import dk.aau.cs.util.RequireException;
 
+import static net.tapaal.swinghelpers.GridBagHelper.Anchor.*;
+import static net.tapaal.swinghelpers.GridBagHelper.Fill.HORIZONTAL;
+
 public class PlaceEditorPanel extends javax.swing.JPanel {
 
 	private final JRootPane rootPane;
 	
 	private JCheckBox sharedCheckBox;
 	private JCheckBox makeNewSharedCheckBox;
-	private WidthAdjustingComboBox sharedPlacesComboBox;
+	private WidthAdjustingComboBox<TimedPlace> sharedPlacesComboBox;
 
 	private final TimedPlaceComponent place;
 	private final Context context;
@@ -78,30 +82,19 @@
 		setLayout(new java.awt.GridBagLayout());
 
 		initBasicPropertiesPanel();
-		GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints();
-		gridBagConstraints.gridx = 0;
-		gridBagConstraints.gridy = 0;
-		gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
-		gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
-		gridBagConstraints.insets = new Insets(5, 8, 0, 8);
+		GridBagConstraints gridBagConstraints = GridBagHelper.as(0,0, WEST, HORIZONTAL, new Insets(5, 8, 0, 8));
 		add(basicPropertiesPanel, gridBagConstraints);
 
 		initTimeInvariantPanel();
-		gridBagConstraints = new java.awt.GridBagConstraints();
-		gridBagConstraints.gridx = 0;
-		gridBagConstraints.gridy = 1;
-		gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
-		gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
-		gridBagConstraints.insets = new Insets(0, 8, 0, 8);
+
+		gridBagConstraints = GridBagHelper.as(0,1, WEST, HORIZONTAL, new Insets(0, 8, 0, 8));
 		add(timeInvariantPanel, gridBagConstraints);
 
 		initButtonPanel();
-		gridBagConstraints = new java.awt.GridBagConstraints();
-		gridBagConstraints.gridx = 0;
-		gridBagConstraints.gridy = 2;
+
+		gridBagConstraints = GridBagHelper.as(0,2, new Insets(0, 8, 5, 8));
 		gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
-		//	gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
-		gridBagConstraints.insets = new Insets(0, 8, 5, 8);
+		//gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
 		add(buttonPanel, gridBagConstraints);
 	}
 
@@ -130,21 +123,14 @@
 		cancelButton.setPreferredSize(new java.awt.Dimension(100, 25));
 		cancelButton.addActionListener(evt -> exit());
 
-		gridBagConstraints = new java.awt.GridBagConstraints();
-		gridBagConstraints.gridx = 0;
-		gridBagConstraints.gridy = 0;
+		gridBagConstraints = GridBagHelper.as(0,0,EAST, new Insets(5, 5, 5, 5));
 		gridBagConstraints.gridwidth = java.awt.GridBagConstraints.RELATIVE;
-		gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
-		gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
+
 		buttonPanel.add(cancelButton, gridBagConstraints);
 
 
 
-		gridBagConstraints = new java.awt.GridBagConstraints();
-		gridBagConstraints.gridx = 1;
-		gridBagConstraints.gridy = 0;
-		gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
-		gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
+		gridBagConstraints = GridBagHelper.as(1,0, WEST, new Insets(5, 5, 5, 5));
 		buttonPanel.add(okButton, gridBagConstraints);
 
 		setupInitialState();
@@ -166,7 +152,7 @@
 		}
 
 		sharedPlaces.sort((o1, o2) -> o1.name().compareToIgnoreCase(o2.name()));
-		sharedPlacesComboBox.setModel(new DefaultComboBoxModel(sharedPlaces));
+		sharedPlacesComboBox.setModel(new DefaultComboBoxModel<>(sharedPlaces));
 		if(place.underlyingPlace().isShared()) {
 
 			sharedPlacesComboBox.setSelectedItem(place.underlyingPlace());
@@ -224,11 +210,7 @@
 			}
 		});
 
-		GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints();
-		gridBagConstraints.gridx = 2;
-		gridBagConstraints.gridy = 1;
-		gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
-		gridBagConstraints.insets = new java.awt.Insets(0, 3, 3, 3);
+		GridBagConstraints gridBagConstraints = GridBagHelper.as(2,1, WEST, new Insets(0, 3, 3, 3));
 		basicPropertiesPanel.add(sharedCheckBox, gridBagConstraints);
 
 		makeSharedButton = new javax.swing.JButton();
@@ -250,19 +232,11 @@
 			makeNewShared = false;
 		});
 		
-		gridBagConstraints = new java.awt.GridBagConstraints();
-		gridBagConstraints.gridx = 3;
-		gridBagConstraints.gridy = 1;
-		gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
-		gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
+		gridBagConstraints = GridBagHelper.as(3,1, WEST, new Insets(5, 5, 5, 5));
 		basicPropertiesPanel.add(makeSharedButton, gridBagConstraints);
 		
 		nameLabel = new javax.swing.JLabel("Name:");
-		gridBagConstraints = new java.awt.GridBagConstraints();
-		gridBagConstraints.gridx = 0;
-		gridBagConstraints.gridy = 1;
-		gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
-		gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3);
+		gridBagConstraints = GridBagHelper.as(0,1, EAST, new Insets(3, 3, 3, 3));
 		basicPropertiesPanel.add(nameLabel, gridBagConstraints);
 
 		nameTextField = new javax.swing.JTextField();
@@ -281,32 +255,18 @@
 		});
 
 		markingLabel = new javax.swing.JLabel("Marking:");
-		gridBagConstraints = new java.awt.GridBagConstraints();
-		gridBagConstraints.gridx = 0;
-		gridBagConstraints.gridy = 2;
-		gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
-		gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3);
+		gridBagConstraints = GridBagHelper.as(0,2, EAST, new Insets(3, 3, 3, 3));
 		basicPropertiesPanel.add(markingLabel, gridBagConstraints);
 
-		//		markingSpinner = new javax.swing.JSpinner();
-		//		markingSpinner.setModel(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1));
-		//		markingSpinner.setPreferredSize(new Dimension(75,27));
 		markingSpinner = new CustomJSpinner(0, okButton);
-		gridBagConstraints = new java.awt.GridBagConstraints();
-		gridBagConstraints.gridx = 1;
-		gridBagConstraints.gridy = 2;
-		gridBagConstraints.anchor = GridBagConstraints.WEST;
-		gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3);
+		gridBagConstraints = GridBagHelper.as(1,2, WEST, new Insets(3, 3, 3, 3));
 		basicPropertiesPanel.add(markingSpinner, gridBagConstraints);
 
 		attributesCheckBox = new javax.swing.JCheckBox("Show place name");
 		attributesCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		attributesCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
-		gridBagConstraints = new java.awt.GridBagConstraints();
-		gridBagConstraints.gridx = 1;
-		gridBagConstraints.gridy = 3;
-		gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
-		gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3);
+		attributesCheckBox.setMargin(new Insets(0, 0, 0, 0));
+
+		gridBagConstraints = GridBagHelper.as(1,3,WEST, new Insets(3, 3, 3, 3));
 		basicPropertiesPanel.add(attributesCheckBox, gridBagConstraints);
 	}
 
@@ -336,8 +296,8 @@
 		timeInvariantPanel.setBorder(javax.swing.BorderFactory.createTitledBorder("Age Invariant"));
 
 		invariantGroup = new JPanel(new GridBagLayout());
-		invRelationNormal = new JComboBox(new String[] { "<=", "<" });
-		invRelationConstant = new JComboBox(new String[] { "<=", "<" });
+		invRelationNormal = new JComboBox<>(new String[] { "<=", "<" });
+		invRelationConstant = new JComboBox<>(new String[] { "<=", "<" });
 		//invariantSpinner = new JSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1));
 		invariantSpinner = new CustomJSpinner(0, okButton);
 		invariantSpinner.addChangeListener(e -> {
@@ -351,28 +311,13 @@
 			}
 		});
 
-		GridBagConstraints gbc = new GridBagConstraints();
-		gbc.gridx = 1;
-		gbc.gridy = 0;
-		gbc.insets = new Insets(3, 3, 3, 3);
-		gbc.fill = GridBagConstraints.HORIZONTAL;
+		GridBagConstraints gbc = GridBagHelper.as(1,0, HORIZONTAL, new Insets(3, 3, 3, 3));
 		invariantGroup.add(invRelationNormal, gbc);
 
-		gbc = new GridBagConstraints();
-		gbc.gridx = 1;
-		gbc.gridy = 1;
-		gbc.insets = new Insets(3, 3, 3, 3);
-		gbc.fill = GridBagConstraints.HORIZONTAL;
-		invariantGroup.add(invRelationConstant, gbc);
-
-		//	invariantSpinner.setMaximumSize(new Dimension(100, 30));
-		//  invariantSpinner.setMinimumSize(new Dimension(230, 30));
-		//invariantSpinner.setPreferredSize(new Dimension(230, 30));
-
-		gbc = new GridBagConstraints();
-		gbc.gridx = 2;
-		gbc.gridy = 0;
-		gbc.insets = new Insets(3, 3, 3, 3);
+		gbc = GridBagHelper.as(1,1, HORIZONTAL, new Insets(3, 3, 3, 3));
+        invariantGroup.add(invRelationConstant, gbc);
+
+		gbc = GridBagHelper.as(2,0, new Insets(3, 3, 3, 3));
 		invariantGroup.add(invariantSpinner, gbc);
 
 		invariantInf = new JCheckBox("inf");
@@ -386,29 +331,27 @@
 				invariantSpinner.setEnabled(true);
 				invRelationNormal.setSelectedItem("<=");
 				if ((Integer) invariantSpinner.getValue() < 1) {
-					invRelationNormal.setModel(new DefaultComboBoxModel(new String[] { "<=" }));
+					invRelationNormal.setModel(new DefaultComboBoxModel<>(new String[] { "<=" }));
 				} else {
-					invRelationNormal.setModel(new DefaultComboBoxModel(new String[] { "<=", "<" }));
+					invRelationNormal.setModel(new DefaultComboBoxModel<>(new String[] { "<=", "<" }));
 				}
 			} else {
 				invRelationNormal.setEnabled(false);
 				invariantSpinner.setEnabled(false);
 				invRelationNormal.setSelectedItem("<");
-				invRelationNormal.setModel(new DefaultComboBoxModel(new String[] { "<" }));
+				invRelationNormal.setModel(new DefaultComboBoxModel<>(new String[] { "<" }));
 			}
 
 		});
-		gbc = new GridBagConstraints();
-		gbc.gridx = 3;
-		gbc.gridy = 0;
+		gbc = GridBagHelper.as(3,0);
 		invariantGroup.add(invariantInf, gbc);
 
 		Set<String> constants = context.network().getConstantNames();
 		String[] constantArray = constants.toArray(new String[constants.size()]);
 		Arrays.sort(constantArray, String.CASE_INSENSITIVE_ORDER);
 
-		invConstantsComboBox = new WidthAdjustingComboBox(maxNumberOfPlacesToShowAtOnce);
-		invConstantsComboBox.setModel(new DefaultComboBoxModel(constantArray));
+		invConstantsComboBox = new WidthAdjustingComboBox<>(maxNumberOfPlacesToShowAtOnce);
+		invConstantsComboBox.setModel(new DefaultComboBoxModel<>(constantArray));
 		//	invConstantsComboBox = new JComboBox(constants.toArray());
 		invConstantsComboBox.setMaximumRowCount(20);
 		//	invConstantsComboBox.setMinimumSize(new Dimension(100, 30));
@@ -419,10 +362,7 @@
 			}
 		});
 
-		gbc = new GridBagConstraints();
-		gbc.gridx = 2;
-		gbc.gridy = 1;
-		gbc.anchor = GridBagConstraints.WEST;
+		gbc = GridBagHelper.as(2,1, WEST);
 		invariantGroup.add(invConstantsComboBox, gbc);
 
 		normalInvRadioButton = new JRadioButton("Normal");
@@ -443,16 +383,10 @@
 		btnGroup.add(normalInvRadioButton);
 		btnGroup.add(constantInvRadioButton);
 
-		gbc = new GridBagConstraints();
-		gbc.gridx = 0;
-		gbc.gridy = 0;
-		gbc.anchor = GridBagConstraints.WEST;
+		gbc = GridBagHelper.as(0,0, WEST);
 		invariantGroup.add(normalInvRadioButton, gbc);
 
-		gbc = new GridBagConstraints();
-		gbc.gridx = 0;
-		gbc.gridy = 1;
-		gbc.anchor = GridBagConstraints.WEST;
+		gbc = GridBagHelper.as(0,1, WEST);
 		invariantGroup.add(constantInvRadioButton, gbc);
 
 		TimeInvariant invariantToSet = place.getInvariant();
@@ -465,7 +399,7 @@
 
 		if (invariantToSet.upperBound() instanceof InfBound) {
 			invariantSpinner.setEnabled(false);
-			invRelationNormal.setModel(new DefaultComboBoxModel(new String[] { "<" }));
+			invRelationNormal.setModel(new DefaultComboBoxModel<>(new String[] { "<" }));
 			invariantInf.setSelected(true);
 			invRelationNormal.setSelectedItem("<");
 		}
@@ -481,9 +415,9 @@
 			normalInvRadioButton.setSelected(true);
 			if (invariantToSet.upperBound() instanceof IntBound) {
 				if ((Integer) invariantSpinner.getValue() < 1) {
-					invRelationNormal.setModel(new DefaultComboBoxModel(new String[] { "<=" }));
+					invRelationNormal.setModel(new DefaultComboBoxModel<>(new String[] { "<=" }));
 				} else {
-					invRelationNormal.setModel(new DefaultComboBoxModel(new String[] { "<=", "<" }));
+					invRelationNormal.setModel(new DefaultComboBoxModel<>(new String[] { "<=", "<" }));
 				}
 				invariantSpinner.setValue(invariantToSet.upperBound().value());
 				invariantSpinner.setEnabled(true);
@@ -492,12 +426,7 @@
 			}
 		}
 
-		GridBagConstraints gridBagConstraints = new java.awt.GridBagConstraints();
-		gridBagConstraints.gridx = 1;
-		gridBagConstraints.gridy = 4;
-		gridBagConstraints.gridwidth = 2;
-		gridBagConstraints.anchor = GridBagConstraints.WEST;
-		gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3);
+		GridBagConstraints gridBagConstraints = GridBagHelper.as(1,4,2, WEST, new Insets(3, 3, 3, 3));
 		timeInvariantPanel.add(invariantGroup, gridBagConstraints);
 	}
 
@@ -506,9 +435,9 @@
 
 		String selected = invRelationConstant.getSelectedItem().toString();
 		if (value == 0) {
-			invRelationConstant.setModel(new DefaultComboBoxModel(new String[] { "<=" }));
+			invRelationConstant.setModel(new DefaultComboBoxModel<>(new String[] { "<=" }));
 		} else {
-			invRelationConstant.setModel(new DefaultComboBoxModel(new String[] { "<=", "<" }));
+			invRelationConstant.setModel(new DefaultComboBoxModel<>(new String[] { "<=", "<" }));
 		}
 		invRelationConstant.setSelectedItem(selected);
 	}
@@ -524,7 +453,7 @@
 		invariantInf.setEnabled(true);
 		invariantSpinner.setValue(0);
 		invariantInf.setSelected(true);
-		invRelationNormal.setModel(new DefaultComboBoxModel(new String[] { "<" }));
+		invRelationNormal.setModel(new DefaultComboBoxModel<>(new String[] { "<" }));
 	}
 
 	protected void disableInvariantComponents() {
@@ -535,35 +464,20 @@
 		invariantInf.setEnabled(false);
 	}
 
-	ChangeListener changeListener = new javax.swing.event.ChangeListener() {
-		public void stateChanged(javax.swing.event.ChangeEvent evt) {
-			JSpinner spinner = (JSpinner) evt.getSource();
-			JSpinner.NumberEditor numberEditor = ((JSpinner.NumberEditor) spinner.getEditor());
-			numberEditor.getTextField().setBackground(new Color(255, 255, 255));
-			spinner.removeChangeListener(this);
-		}
-	};
-
 	private void switchToNameTextField() {
 		basicPropertiesPanel.remove(sharedPlacesComboBox);
-		GridBagConstraints gbc = new java.awt.GridBagConstraints();
-		gbc.gridx = 1;
-		gbc.gridy = 1;
-		gbc.fill = java.awt.GridBagConstraints.HORIZONTAL;
-		gbc.insets = new java.awt.Insets(3, 3, 3, 3);
-		basicPropertiesPanel.add(nameTextField, gbc);	
+		GridBagConstraints gbc = GridBagHelper.as(1,1, HORIZONTAL, new Insets(3, 3, 3, 3));
+		basicPropertiesPanel.add(nameTextField, gbc);
+
 		basicPropertiesPanel.validate();
 		basicPropertiesPanel.repaint();
 	}
 
 	private void switchToNameDropDown() {
 		basicPropertiesPanel.remove(nameTextField);
-		GridBagConstraints gbc = new java.awt.GridBagConstraints();
-		gbc.gridx = 1;
-		gbc.gridy = 1;
-		gbc.fill = java.awt.GridBagConstraints.HORIZONTAL;
-		gbc.insets = new java.awt.Insets(3, 3, 3, 3);
-		basicPropertiesPanel.add(sharedPlacesComboBox, gbc);		
+		GridBagConstraints gbc = GridBagHelper.as(1,1, HORIZONTAL, new Insets(3, 3, 3, 3));
+		basicPropertiesPanel.add(sharedPlacesComboBox, gbc);
+
 		basicPropertiesPanel.validate();
 		basicPropertiesPanel.repaint();
 
@@ -587,7 +501,7 @@
 	private void setInvariantControlsBasedOn(TimeInvariant invariant) {
 		if(invariant.upperBound() instanceof ConstantBound){
 			constantInvRadioButton.setSelected(true);
-			invRelationConstant.setModel(new DefaultComboBoxModel(invariant.upperBound().value() == 0 ? new String[] { "<=" } : new String[] { "<", "<=" }));
+			invRelationConstant.setModel(new DefaultComboBoxModel<>(invariant.upperBound().value() == 0 ? new String[] { "<=" } : new String[] { "<", "<=" }));
 			invRelationConstant.setSelectedItem(invariant.isUpperNonstrict() ? "<=" : "<");
 			invRelationConstant.setEnabled(true);
 			invConstantsComboBox.setEnabled(true);
@@ -595,16 +509,16 @@
 		}else{