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

[Kenneth Yrke Jørgensen]

General GUI refactoring and improvements.

[Kenneth Yrke Jørgensen (yrke)]

Please test loading of PNML files

[lp:~yrke/tapaal/guirefactor]

1137. By Kenneth Yrke Jørgensen on 2018-07-03

Merged branch, Implements zoome using scrollwheel with ctrl

[Jiri Srba (srba)]

Does not compile:

javac -source 1.6 -target 1.6 -sourcepath src -cp libs/\* -d classes/ 'src/TAPAAL.java' -encoding UTF8
warning: [options] bootstrap class path not set in conjunction with -source 1.6
src/pipe/gui/GuiFrame.java:2602: error: local variable filename is accessed from within inner class; needs to be declared final
       InputStream file = Thread.currentThread().getContextClassLoader().getResourceAsStream("resources/Example nets/" + filename);
                                                                                                                         ^
src/pipe/gui/GuiFrame.java:2603: error: local variable netname is accessed from within inner class; needs to be declared final
       createNewTabFromFile(file, netname);
                                  ^
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: Some input files use unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
2 errors
1 warning
make: *** [release] Error 1

review: Needs Fixing

[lp:~yrke/tapaal/guirefactor]

1138. By Kenneth Yrke Jørgensen on 2018-07-04

fixed closure to use final variable to allow to compile to java 1.6

[Kenneth Yrke Jørgensen (yrke)]

Added fix to support java 1.6. Please test the loading of examples nets when running TAPAAL from a Jar file.

[Jiri Srba (srba)]

Closing of a tab on Mac was before possible using cmd-W but now it does not work anymore (it requires ctrl-W). The same problem is for cmd-O (open net) and cmd-N (new net) that does not work
any more and requires ctrl instead, which is not the usual way on Mac. It used to work ok before.

review: Needs Fixing

[Kenneth Yrke Jørgensen (yrke)]

Hmm... shortcuts has been overwritten ala:

saveAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('S', shortcutkey));

instead of setting them in the correct way, should be a relative simple fix.

[lp:~yrke/tapaal/guirefactor]

1139. By Kenneth Yrke Jørgensen on 2018-07-04

Fixed some actions using hardcoded ctrl as shortcutkey

[Kenneth Yrke Jørgensen (yrke)]

Fixed shortcuts for select all, new net, open net, close net, and save as. Now set using the correct method instead of being overwritten.

Search for all places with hardcoded ctrl hotkey, no more found.

[Jiri Srba (srba)]

Shortcuts work as they should and loading example nets from jar file tested.

The ctrl-scrollwheel zoom works with mouse on Mac but is does not quite work
with the touchpad on macbookpro (it shrinks the net but enlarging it again just makes the net
to "jump" but after releasing the touch it gets back to its minimum size).

[Kenneth Yrke Jørgensen (yrke)]

interesting, might be related to how events are handled. Also im unsure what happens on a PC using the touchpad or similar, some machines this might be seen as a differenct kind of actions.

On macOS what are the conventions on zooming behaviour?

[Jiri Srba (srba)]

Tested on mac and all seems to work fine, so I am going to merge it to trunk.

review: Approve

=== modified file 'src/dk/aau/cs/gui/BatchProcessingDialog.java'
--- src/dk/aau/cs/gui/BatchProcessingDialog.java	2018-04-21 11:58:41 +0000
+++ src/dk/aau/cs/gui/BatchProcessingDialog.java	2018-07-04 11:38:47 +0000
@@ -31,7 +31,6 @@
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
 import javax.swing.JDialog;
-import javax.swing.JFileChooser;
 import javax.swing.JLabel;
 import javax.swing.JList;
 import javax.swing.JOptionPane;
@@ -54,7 +53,6 @@
 import javax.swing.event.ListSelectionListener;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
-import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
@@ -62,10 +60,9 @@
 import pipe.dataLayer.TAPNQuery;
 import pipe.dataLayer.TAPNQuery.SearchOption;
 import pipe.gui.CreateGui;
-import pipe.gui.FileFinderImpl;
 import pipe.gui.widgets.CustomJSpinner;
 import pipe.gui.widgets.EscapableDialog;
-import pipe.gui.widgets.FileBrowser;
+import pipe.gui.widgets.filebrowser.FileBrowser;
 import pipe.gui.widgets.QueryPane;
 import pipe.gui.widgets.InclusionPlaces.InclusionPlacesOption;
 import dk.aau.cs.gui.components.BatchProcessingResultsTableModel;
@@ -75,11 +72,7 @@
 import dk.aau.cs.translations.ReductionOption;
 import dk.aau.cs.util.MemoryMonitor;
 import dk.aau.cs.util.StringComparator;
-import dk.aau.cs.verification.UPPAAL.VerifytaOptions;
 import dk.aau.cs.verification.VerificationOptions;
-import dk.aau.cs.verification.VerifyTAPN.VerifyDTAPNOptions;
-import dk.aau.cs.verification.VerifyTAPN.VerifyPNOptions;
-import dk.aau.cs.verification.VerifyTAPN.VerifyTAPNOptions;
 import dk.aau.cs.verification.batchProcessing.BatchProcessingListener;
 import dk.aau.cs.verification.batchProcessing.BatchProcessingVerificationOptions;
 import dk.aau.cs.verification.batchProcessing.BatchProcessingVerificationOptions.ApproximationMethodOption;
@@ -512,7 +505,7 @@
 	}
 
 	private void addFiles() {
-		FileBrowser browser = new FileBrowser("Timed-Arc Petri Nets","xml", lastPath);
+		FileBrowser browser = FileBrowser.constructor("Timed-Arc Petri Nets","xml", lastPath);
 		
 		File[] filesArray = browser.openFiles();
 		if (filesArray.length>0) {
@@ -1026,7 +1019,7 @@
 			}
 
 			private void exportResults() {
-				String filename = new FileBrowser("CSV file", "csv", lastPath)
+				String filename = FileBrowser.constructor("CSV file", "csv", lastPath)
 						.saveFile("results");
 				if (filename != null) {
 					File exportFile = new File(filename);
@@ -1384,7 +1377,7 @@
 
 			public void fireFileChanged(FileChangedEvent e) {
 				if(!(isQueryListEmpty())) {
-					fileStatusLabel.setText(CreateGui.appGui.getCurrentTabName());
+					fileStatusLabel.setText(CreateGui.getAppGui().getCurrentTabName());
 				}
 				else
 					fileStatusLabel.setText(e.fileName());

=== removed file 'src/dk/aau/cs/gui/DrawingSurface.java'
--- src/dk/aau/cs/gui/DrawingSurface.java	2011-02-03 19:03:15 +0000
+++ src/dk/aau/cs/gui/DrawingSurface.java	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-package dk.aau.cs.gui;
-
-import java.awt.Component;
-
-public interface DrawingSurface {
-	void updatePreferredSize();
-
-	Component add(Component component);
-
-	void remove(Component component);
-}

=== modified file 'src/dk/aau/cs/gui/TabComponent.java'
--- src/dk/aau/cs/gui/TabComponent.java	2016-02-15 10:28:53 +0000
+++ src/dk/aau/cs/gui/TabComponent.java	2018-07-04 11:38:47 +0000
@@ -72,7 +72,7 @@
 	public TabComponent(final JTabbedPane pane) {
 		super(new FlowLayout(FlowLayout.LEFT, 0, 0));
 
-		Require.that(pane != null, "TabbedPane is null");
+		Require.notNull(pane, "TabbedPane is null");
 		
 		this.pane = pane;
 		setOpaque(false);
@@ -116,18 +116,7 @@
 			addActionListener(new ActionListener(){
 				public void actionPerformed(ActionEvent arg0) {
 					int index = pane.indexOfTabComponent(TabComponent.this);
-					if(pane.getTabCount() > 0 && CreateGui.getApp().checkForSave(index)){
-						if(pane.getTabCount() == 1) { CreateGui.getApp().setGUIMode(GUIMode.noNet); }
-
-						//Close the gui part first, else we get an error bug #826578
-						pane.removeTabAt(index);
-						CreateGui.removeTab(index);
-						
-						//Update DrawingSurfaceImpl manually. Bug #1543124
-						CreateGui.getApp().setObjects(pane.getSelectedIndex());
-						
-						CreateGui.getApp().activateSelectAction();
-					}
+					CreateGui.getApp().closeTab(index);
 				}
 			});
 		}

=== modified file 'src/dk/aau/cs/gui/TabContent.java'
--- src/dk/aau/cs/gui/TabContent.java	2018-03-27 07:52:47 +0000
+++ src/dk/aau/cs/gui/TabContent.java	2018-07-04 11:38:47 +0000
@@ -50,25 +50,25 @@
 public class TabContent extends JSplitPane {
 	private static final long serialVersionUID = -648006317150905097L;
 
-	protected TimedArcPetriNetNetwork tapnNetwork = new TimedArcPetriNetNetwork();
-	protected HashMap<TimedArcPetriNet, DataLayer> guiModels = new HashMap<TimedArcPetriNet, DataLayer>();
-	protected HashMap<TimedArcPetriNet, Zoomer> zoomLevels = new HashMap<TimedArcPetriNet, Zoomer>();
-	protected JScrollPane drawingSurfaceScroller;
-	protected JScrollPane editorSplitPaneScroller;
-	protected JScrollPane animatorSplitPaneScroller;
-	protected DrawingSurfaceImpl drawingSurface;
-	protected File appFile;
+	private TimedArcPetriNetNetwork tapnNetwork = new TimedArcPetriNetNetwork();
+	private HashMap<TimedArcPetriNet, DataLayer> guiModels = new HashMap<TimedArcPetriNet, DataLayer>();
+	private HashMap<TimedArcPetriNet, Zoomer> zoomLevels = new HashMap<TimedArcPetriNet, Zoomer>();
+	private JScrollPane drawingSurfaceScroller;
+	private JScrollPane editorSplitPaneScroller;
+	private JScrollPane animatorSplitPaneScroller;
+	private DrawingSurfaceImpl drawingSurface;
+	private File appFile;
 	private JPanel drawingSurfaceDummy;
 	
 	// Normal mode
-	BugHandledJXMultisplitPane editorSplitPane;
-	static Split editorModelroot = null;
-	static Split simulatorModelRoot = null;
+	private BugHandledJXMultisplitPane editorSplitPane;
+	private static Split editorModelroot = null;
+	private static Split simulatorModelRoot = null;
 
-	QueryPane queries;
-	ConstantsPane constantsPanel;
-	TemplateExplorer templateExplorer;
-	SharedPlacesAndTransitionsPanel sharedPTPanel;
+	private QueryPane queries;
+	private ConstantsPane constantsPanel;
+	private TemplateExplorer templateExplorer;
+	private SharedPlacesAndTransitionsPanel sharedPTPanel;
 
 	private static final String constantsName = "constants";
 	private static final String queriesName = "queries";
@@ -76,28 +76,25 @@
 	private static final String sharedPTName = "sharedPT";
 
 	// / Animation
-	protected AnimationHistoryComponent animBox;
-	protected AnimationController animControlerBox;
-	protected JScrollPane animationHistoryScrollPane;
-	protected JScrollPane animationControllerScrollPane;
-	protected AnimationHistoryComponent abstractAnimationPane = null;
-	protected JPanel animationControlsPanel;
-	protected TransitionFireingComponent transitionFireing;
+	private AnimationHistoryComponent animBox;
+	private AnimationController animControlerBox;
+	private JScrollPane animationHistoryScrollPane;
+	private JScrollPane animationControllerScrollPane;
+	private AnimationHistoryComponent abstractAnimationPane = null;
+	private JPanel animationControlsPanel;
+	private TransitionFireingComponent transitionFireing;
 
 	private static final String transitionFireingName = "enabledTransitions";
 	private static final String animControlName = "animControl";
 
-	protected JSplitPane animationHistorySplitter;
+	private JSplitPane animationHistorySplitter;
 
-	protected BugHandledJXMultisplitPane animatorSplitPane;
+	private BugHandledJXMultisplitPane animatorSplitPane;
 
 	private Integer selectedTemplate = 0;
 	private Boolean selectedTemplateWasActive = false;
 	
 	private WorkflowDialog workflowDialog = null;
-	
-	//Some nets are so big we can't draw them 
-	private boolean showDrawingSurface;
 
 	public TabContent(NetType netType) {
 		for (TimedArcPetriNet net : tapnNetwork.allTemplates()) {
@@ -139,7 +136,6 @@
 		this.setOneTouchExpandable(true);
 		this.setBorder(null); // avoid multiple borders
 		this.setDividerSize(8);	
-
 	}
 	
 	public SharedPlacesAndTransitionsPanel getSharedPlacesAndTransitionsPanel(){
@@ -298,14 +294,14 @@
 							for (int i = 0; i < Math.abs(steps); i++) {
 								animBox.stepBackwards();
 								anim.stepBack();
-								CreateGui.getAnimationController()
+								CreateGui.getCurrentTab().getAnimationController()
 								.setAnimationButtonsEnabled();
 							}
 						} else {
 							for (int i = 0; i < Math.abs(steps); i++) {
 								animBox.stepForward();
 								anim.stepForward();
-								CreateGui.getAnimationController()
+								CreateGui.getCurrentTab().getAnimationController()
 								.setAnimationButtonsEnabled();
 							}
 						}
@@ -325,8 +321,6 @@
 		//Add 10 pixel to the minimumsize of the scrollpane
 		animationHistoryScrollPane.setMinimumSize(new Dimension(animationHistoryScrollPane.getMinimumSize().width, animationHistoryScrollPane.getMinimumSize().height + 20));
 	}
-	
-	private final static String delayEnabledTransitionControlName = "delayEnabledTransitionControl";
 
 	private void createAnimatorSplitPane(NetType netType) {
 		if (animBox == null)
@@ -399,8 +393,7 @@
 		animatorSplitPane.add(templateExplorer, templateExplorerName);
 
 		// Inserts dummy to avoid nullpointerexceptions from the displaynode
-		// method
-		// A component can only be on one splitpane at the time
+		// method. A component can only be on one splitpane at the time
 		dummy = new JButton("EditorDummy");
 		dummy.setMinimumSize(templateExplorer.getMinimumSize());
 		dummy.setPreferredSize(templateExplorer.getPreferredSize());
@@ -410,7 +403,6 @@
 		showEnabledTransitionsList(showEnabledTransitions);
 		
 		this.setLeftComponent(animatorSplitPaneScroller);
-		animatorSplitPaneScroller.setPreferredSize(editorSplitPaneScroller.getSize());
 
 	}
 
@@ -427,8 +419,7 @@
 		if (animatorSplitPane != null) {
 
 			// Inserts dummy to avoid nullpointerexceptions from the displaynode
-			// method
-			// A component can only be on one splitpane at the time
+			// method. A component can only be on one splitpane at the time
 			dummy = new JButton("AnimatorDummy");
 			dummy.setMinimumSize(templateExplorer.getMinimumSize());
 			dummy.setPreferredSize(templateExplorer.getPreferredSize());
@@ -437,7 +428,6 @@
 
 		templateExplorer.switchToEditorMode();
 		this.setLeftComponent(editorSplitPaneScroller);
-		editorSplitPaneScroller.setPreferredSize(animatorSplitPaneScroller.getSize());
 		drawingSurface.repaintAll();
 	}
 
@@ -494,7 +484,6 @@
 		gbc.weighty = 1.0;
 		animationControlsPanel.add(animationHistoryScrollPane, gbc);
 		animatorSplitPane.validate();
-
 	}
 
 	private void createAnimationController(NetType netType) {
@@ -554,11 +543,24 @@
 		return count;
 	}
 
-	public void addTemplate(Template template) {
+	/*
+		XXX: 2018-05-07 kyrke, added a version of addTemplate that does not call templatExplorer.updatTemplateList
+		used in createNewTab (as updateTamplateList expects the current tab to be selected)
+		this needs to be refactored asap. but the is the only way I could get it to work for now.
+		The code is very unclean on what is a template, TimeArcPetriNetNetwork, seems to mix concerns about
+		gui/controller/model. Further refactoring is needed to clean up this mess.
+	 */
+	public void addTemplate(Template template, boolean updateTemplateExplorer) {
 		tapnNetwork.add(template.model());
 		guiModels.put(template.model(), template.guiModel());
 		zoomLevels.put(template.model(), template.zoomer());
-		templateExplorer.updateTemplateList();
+		if (updateTemplateExplorer) {
+			templateExplorer.updateTemplateList();
+		}
+	}
+
+	public void addTemplate(Template template) {
+		addTemplate(template, true);
 	}
 
 	public void addGuiModel(TimedArcPetriNet net, DataLayer guiModel) {
@@ -599,7 +601,6 @@
 
 	public void setConstants(Iterable<Constant> constants) {
 		tapnNetwork.setConstants(constants);
-		// constantsPanel.showConstants();
 	}
 
 	public void setupNameGeneratorsFromTemplates(Iterable<Template> templates) {
@@ -703,7 +704,6 @@
 		templateExplorer.selectFirst();
 		queries.selectFirst();
 		constantsPanel.selectFirst();
-		
 	}	
 	
 	public boolean isQueryPossible() {

=== modified file 'src/dk/aau/cs/gui/TemplateExplorer.java'
--- src/dk/aau/cs/gui/TemplateExplorer.java	2017-03-12 00:33:00 +0000
+++ src/dk/aau/cs/gui/TemplateExplorer.java	2018-07-04 11:38:47 +0000
@@ -126,7 +126,7 @@
 	}
 	
 	public Integer indexOfSelectedTemplate() {
-		return new Integer(templateList.getSelectedIndex());
+		return templateList.getSelectedIndex();
 	}
 	
 	public void restoreSelectedTemplate(Integer value) {
@@ -476,14 +476,14 @@
 	}
 	
 	private EscapableDialog dialog;
-	JPanel container;
-	JTextField nameTextField;
-	Dimension size;
-	JLabel nameLabel;
-	JPanel buttonContainer;
-	JButton okButton;
-	JButton cancelButton;
-	JPanel nameContainer;
+	private JPanel container;
+	private JTextField nameTextField;
+	private Dimension size;
+	private JLabel nameLabel;
+	private JPanel buttonContainer;
+	private JButton okButton;
+	private JButton cancelButton;
+	private JPanel nameContainer;
 	
 	private void onOKRenameTemplate() {		
 		Template template = selectedModel();			
@@ -928,7 +928,7 @@
 				JOptionPane.showMessageDialog(parent, "At least one component must be active.", "Cannot Deactive All Components", JOptionPane.INFORMATION_MESSAGE);
 			} else {
 				//The change was ok, record it to undo/redo history
-				undoManager.addNewEdit(new ToggleTemplateActivationCommand(parent.templateExplorer, item, newValue));
+				undoManager.addNewEdit(new ToggleTemplateActivationCommand(parent.getTemplateExplorer(), item, newValue));
 			}
 
 

=== removed file 'src/dk/aau/cs/gui/components/PetriNetElementControl.java'
--- src/dk/aau/cs/gui/components/PetriNetElementControl.java	2011-06-28 16:30:37 +0000
+++ src/dk/aau/cs/gui/components/PetriNetElementControl.java	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-package dk.aau.cs.gui.components;
-
-import java.awt.Graphics;
-import java.awt.Point;
-
-import javax.swing.JComponent;
-import javax.swing.JPopupMenu;
-
-import pipe.gui.Pipe;
-import dk.aau.cs.gui.DrawingSurface;
-
-public abstract class PetriNetElementControl extends JComponent {
-	private static final long serialVersionUID = -3429746860537818157L;
-
-	private Point originalLocation;
-	private final DrawingSurface parent;
-
-	private boolean selected = false;
-
-	public PetriNetElementControl(DrawingSurface parent, Point originalLocation) {
-		this.parent = parent;
-		this.originalLocation = originalLocation;
-	}
-
-	public boolean isSelected() {
-		return selected;
-	}
-
-	protected DrawingSurface parent() {
-		return parent;
-	}
-
-	public void select() {
-		if (!selected) {
-			selected = true;
-			selectChildren();
-			repaint();
-		}
-	}
-
-	public void deselect() {
-		if (selected) {
-			selected = false;
-			deselectChildren();
-			repaint();
-		}
-	}
-
-	public void zoom(int percentage) {
-		double scaleFactor = percentage / 100.0;
-
-		double positionX = originalLocation.x * scaleFactor;
-		double positionY = originalLocation.y * scaleFactor;
-		double width = Pipe.PLACE_TRANSITION_HEIGHT * scaleFactor;
-		double height = Pipe.PLACE_TRANSITION_HEIGHT * scaleFactor;
-
-		setLocation((int) positionX, (int) positionY);
-		setSize((int) width, (int) height);
-	}
-
-	@Override
-	public void paintComponent(Graphics g) {
-		super.paintComponent(g);
-		paintControl(g);
-	}
-
-	public void showPopupMenu(int x, int y) {
-		JPopupMenu menu = createPopupMenu();
-		menu.show(this, x, y);
-	}
-
-	protected void moveLabelRelativeToNewPlaceLocation(JComponent component,
-			int newPlaceX, int newPlaceY) {
-		Point componentLocation = component.getLocation();
-		Point placeLocation = getLocation();
-
-		int componentPlaceDiffX = componentLocation.x - placeLocation.x;
-		int componentPlaceDiffY = componentLocation.y - placeLocation.y;
-
-		component.setLocation(newPlaceX + componentPlaceDiffX, newPlaceY
-				+ componentPlaceDiffY);
-	}
-
-	protected void selectChildren() {
-	}
-
-	protected void deselectChildren() {
-	}
-
-	public void addMouseListeners() {
-	}
-
-	public void removeMouseListeners() {
-	}
-
-	protected abstract void paintControl(Graphics g);
-
-	protected abstract JPopupMenu createPopupMenu();
-
-	public void removeChildControls() {
-	}
-
-	public void addChildControls() {
-	}
-}

=== removed file 'src/dk/aau/cs/gui/components/TextLabel.java'
--- src/dk/aau/cs/gui/components/TextLabel.java	2011-09-23 21:23:31 +0000
+++ src/dk/aau/cs/gui/components/TextLabel.java	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-package dk.aau.cs.gui.components;
-
-import java.awt.Component;
-import java.awt.Font;
-import java.awt.Point;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
-import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
-
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.event.MouseInputAdapter;
-
-import pipe.gui.Pipe;
-import dk.aau.cs.gui.DrawingSurface;
-import dk.aau.cs.gui.components.handlers.DragHandler;
-
-public class TextLabel extends JLabel {
-	private static final long serialVersionUID = 2836463890383282585L;
-	private JComponent owner;
-	private DrawingSurface drawingSurface;
-
-	public TextLabel(DrawingSurface drawingSurface, JComponent owner,
-			Point locationRelativeTo, String text) {
-		this.drawingSurface = drawingSurface;
-		this.owner = owner;
-
-		setFont(new Font(Pipe.LABEL_FONT, Font.BOLD,
-				Pipe.LABEL_DEFAULT_FONT_SIZE));
-		setCursor(new java.awt.Cursor(java.awt.Cursor.CROSSHAIR_CURSOR));
-		setFocusable(false);
-		setOpaque(false);
-		setBackground(Pipe.BACKGROUND_COLOR);
-		setText(text);
-		setLocation(locationRelativeTo.x - getPreferredSize().width,
-				locationRelativeTo.y);
-		updateSize();
-	}
-
-	public void addMouseListeners() {
-		removeMouseListeners();
-
-		MouseWheelAndClickPassThroughHandler clickAndWheelHandler = new MouseWheelAndClickPassThroughHandler(
-				owner);
-		addMouseListener(clickAndWheelHandler);
-		addMouseWheelListener(clickAndWheelHandler);
-		addMouseMotionListener(new DragHandler(this, drawingSurface, false));
-	}
-
-	public void removeMouseListeners() {
-		for (MouseListener listener : getMouseListeners())
-			removeMouseListener(listener);
-		for (MouseWheelListener listener : getMouseWheelListeners())
-			removeMouseWheelListener(listener);
-		for (MouseMotionListener listener : getMouseMotionListeners())
-			removeMouseMotionListener(listener);
-	}
-
-	private void updateSize() {
-		setSize(getPreferredSize().width, getPreferredSize().height);
-	}
-
-	public void zoom(int percentage) {
-		float newSize = Pipe.LABEL_DEFAULT_FONT_SIZE * (percentage / 100.0f);
-		Font newFont = getFont().deriveFont(newSize);
-		setFont(newFont);
-		updateSize();
-	}
-
-	private class MouseWheelAndClickPassThroughHandler extends
-			MouseInputAdapter {
-		private Component targetComponent;
-
-		public MouseWheelAndClickPassThroughHandler(Component target) {
-			targetComponent = target;
-		}
-
-		@Override
-		public void mouseClicked(MouseEvent e) {
-			targetComponent.dispatchEvent(e);
-		}
-
-		@Override
-		public void mouseWheelMoved(MouseWheelEvent e) {
-			targetComponent.dispatchEvent(e);
-		}
-	}
-}

=== removed file 'src/dk/aau/cs/gui/components/TimedPlaceControl.java'
--- src/dk/aau/cs/gui/components/TimedPlaceControl.java	2012-10-14 12:07:04 +0000
+++ src/dk/aau/cs/gui/components/TimedPlaceControl.java	1970-01-01 00:00:00 +0000
@@ -1,200 +0,0 @@
-package dk.aau.cs.gui.components;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.RenderingHints;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionListener;
-import java.awt.geom.Ellipse2D;
-
-import javax.swing.BorderFactory;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-
-import pipe.gui.Pipe;
-import dk.aau.cs.gui.DrawingSurface;
-import dk.aau.cs.gui.components.handlers.ClickHandler;
-import dk.aau.cs.gui.components.handlers.DragHandler;
-import dk.aau.cs.model.tapn.LocalTimedPlace;
-
-public class TimedPlaceControl extends PetriNetElementControl {
-	private static final long serialVersionUID = 3512995997457683903L;
-
-	private static final float DEFAULT_LINE_THICKNESS = 1.0f;
-	private static final int DRAW_OFFSET = 1;
-
-	private final LocalTimedPlace timedPlace;
-	private TextLabel nameLabel;
-	private TextLabel invariantLabel;
-
-	private float lineThickness = DEFAULT_LINE_THICKNESS;
-	private boolean attributesVisible = true;
-
-	public TimedPlaceControl(DrawingSurface parent, LocalTimedPlace timedPlace,
-			Point position) {
-		super(parent, position);
-		this.timedPlace = timedPlace;
-
-		setLocation(position);
-		setSize(Pipe.PLACE_TRANSITION_HEIGHT + DRAW_OFFSET,
-				Pipe.PLACE_TRANSITION_HEIGHT + DRAW_OFFSET);
-		this.setBorder(BorderFactory.createLineBorder(Color.red));
-
-		initComponents();
-		addMouseListeners();
-
-	}
-
-	private void initComponents() {
-		Point position = getLocation();
-		nameLabel = new TextLabel(parent(), this, new Point(position.x - 5,
-				position.y), timedPlace.name());
-		invariantLabel = new TextLabel(parent(), this, new Point(
-				position.x - 5, position.y + Pipe.LABEL_DEFAULT_FONT_SIZE + 1),
-				"inv: " + timedPlace.invariant().toString());
-		addChildControls();
-	}
-
-	@Override
-	public void addMouseListeners() {
-		removeMouseListeners();
-		addMouseMotionListener(new DragHandler(this, parent(), true));
-		addMouseListener(new ClickHandler(this));
-
-		nameLabel.addMouseListeners();
-		invariantLabel.addMouseListeners();
-	}
-
-	@Override
-	public void removeMouseListeners() {
-		for (MouseMotionListener listener : getMouseMotionListeners())
-			removeMouseMotionListener(listener);
-		for (MouseListener listener : getMouseListeners())
-			removeMouseListener(listener);
-		nameLabel.removeMouseListeners();
-		invariantLabel.removeMouseListeners();
-	}
-
-	public boolean isAttributesVisible() {
-		return attributesVisible;
-	}
-
-	public void setAttributesVisible(boolean value) {
-		if (value != attributesVisible) {
-			attributesVisible = value;
-			if (value) {
-				addChildControls();
-			} else {
-				removeChildControls();
-			}
-		}
-	}
-
-	@Override
-	public void addChildControls() {
-		parent().add(nameLabel);
-		parent().add(invariantLabel);
-		// parent().surfaceChanged();
-	}
-
-	@Override
-	public void removeChildControls() {
-		parent().remove(nameLabel);
-		parent().remove(invariantLabel);
-		// parent().surfaceChanged();
-	}
-
-	@Override
-	public void setLocation(int x, int y) {
-		if (nameLabel != null)
-			moveLabelRelativeToNewPlaceLocation(nameLabel, x, y);
-		if (invariantLabel != null)
-			moveLabelRelativeToNewPlaceLocation(invariantLabel, x, y);
-		super.setLocation(x, y);
-	}
-
-	@Override
-	public void zoom(int percentage) {
-		super.zoom(percentage);
-		nameLabel.zoom(percentage);
-		invariantLabel.zoom(percentage);
-		lineThickness = DEFAULT_LINE_THICKNESS * (percentage / 100.0f);
-	}
-
-	@Override
-	protected void selectChildren() {
-		nameLabel.setForeground(Pipe.SELECTION_TEXT_COLOUR);
-		invariantLabel.setForeground(Pipe.SELECTION_TEXT_COLOUR);
-	}
-
-	@Override
-	protected void deselectChildren() {
-		nameLabel.setForeground(Pipe.ELEMENT_TEXT_COLOUR);
-		invariantLabel.setForeground(Pipe.ELEMENT_TEXT_COLOUR);
-	}
-
-	@Override
-	protected void paintControl(Graphics g) {
-		Graphics2D g2 = (Graphics2D) g;
-
-		g2.setStroke(new BasicStroke(lineThickness));
-		g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-				RenderingHints.VALUE_ANTIALIAS_ON);
-
-		g2.setColor(isSelected() ? Pipe.SELECTION_FILL_COLOUR
-				: Pipe.ELEMENT_FILL_COLOUR);
-		Ellipse2D.Double ellipse = new Ellipse2D.Double(0, 0, getSize().width
-				- DRAW_OFFSET, getSize().height - DRAW_OFFSET);
-		g2.fill(ellipse);
-
-		g2.setPaint(isSelected() ? Pipe.SELECTION_LINE_COLOUR
-				: Pipe.ELEMENT_LINE_COLOUR);
-		g2.draw(ellipse);
-	}
-
-	@Override
-	public JPopupMenu createPopupMenu() {
-		JPopupMenu menu = new JPopupMenu();
-
-		if (attributesVisible) {
-			JMenuItem item = new JMenuItem("Hide Attributes");
-			item.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent arg0) {
-					setAttributesVisible(false);
-				}
-			});
-			menu.add(item);
-		} else {
-			JMenuItem item = new JMenuItem("Show Attributes");
-			item.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent arg0) {
-					setAttributesVisible(true);
-				}
-			});
-			menu.add(item);
-		}
-
-		JMenuItem deleteItem = new JMenuItem("Delete");
-		deleteItem.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				// delete();
-			}
-		});
-		menu.add(deleteItem);
-
-		JMenuItem propertiesItem = new JMenuItem("Properties");
-		propertiesItem.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				// showEditor();
-			}
-		});
-		menu.add(propertiesItem);
-
-		return menu;
-	}
-}

=== removed file 'src/dk/aau/cs/gui/components/handlers/ClickHandler.java'
--- src/dk/aau/cs/gui/components/handlers/ClickHandler.java	2011-03-02 19:03:58 +0000
+++ src/dk/aau/cs/gui/components/handlers/ClickHandler.java	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-package dk.aau.cs.gui.components.handlers;
-
-import java.awt.event.MouseEvent;
-
-import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
-import javax.swing.event.MouseInputAdapter;
-
-import dk.aau.cs.gui.components.PetriNetElementControl;
-
-public class ClickHandler extends MouseInputAdapter {
-	private PetriNetElementControl control;
-
-	public ClickHandler(PetriNetElementControl control) {
-		this.control = control;
-	}
-
-	@Override
-	public void mouseClicked(MouseEvent e) {
-		if (SwingUtilities.isLeftMouseButton(e)) {
-			if (e.getClickCount() == 2) {
-				JOptionPane.showMessageDialog(null, "editor");
-			} else {
-				control.select();
-				// JOptionPane.showMessageDialog(null, "select");
-				// if not animation mode
-				// select control
-			}
-		} else if (SwingUtilities.isRightMouseButton(e)) {
-			// if not animation mode
-			control.showPopupMenu(e.getX(), e.getY());
-		}
-	}
-}

=== removed file 'src/dk/aau/cs/gui/components/handlers/DragHandler.java'
--- src/dk/aau/cs/gui/components/handlers/DragHandler.java	2011-06-28 16:30:37 +0000
+++ src/dk/aau/cs/gui/components/handlers/DragHandler.java	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-package dk.aau.cs.gui.components.handlers;
-
-import java.awt.Point;
-import java.awt.event.MouseEvent;
-
-import javax.swing.JComponent;
-
-import pipe.gui.Grid;
-import dk.aau.cs.gui.DrawingSurface;
-
-public class DragHandler extends javax.swing.event.MouseInputAdapter {
-	private Point anchorPoint;
-	private JComponent draggableComponent;
-	private DrawingSurface drawingSurface;
-	private boolean snapToGrid;
-
-	public DragHandler(JComponent draggableComponent,
-			DrawingSurface drawingSurface, boolean snapToGrid) {
-		this.draggableComponent = draggableComponent;
-		this.drawingSurface = drawingSurface;
-		this.snapToGrid = snapToGrid;
-	}
-
-	@Override
-	public void mouseMoved(MouseEvent e) {
-		anchorPoint = e.getPoint();
-	}
-
-	@Override
-	public void mouseDragged(MouseEvent e) {
-		int anchorX = anchorPoint.x;
-		int anchorY = anchorPoint.y;
-
-		Point parentOnScreen = draggableComponent.getParent().getLocationOnScreen();
-		Point mouseOnScreen = e.getLocationOnScreen();
-
-		int x = Math.max(0, mouseOnScreen.x - parentOnScreen.x - anchorX);
-		int y = Math.max(0, mouseOnScreen.y - parentOnScreen.y - anchorY);
-
-		if (snapToGrid) {
-			x = Grid.getModifiedX(x);
-			y = Grid.getModifiedY(y);
-		}
-
-		Point position = new Point(x, y);
-		draggableComponent.setLocation(position);
-
-		drawingSurface.updatePreferredSize();
-	}
-}
\ No newline at end of file

=== removed file 'src/dk/aau/cs/gui/undo/AddPetriNetControlCommand.java'
--- src/dk/aau/cs/gui/undo/AddPetriNetControlCommand.java	2011-03-02 19:03:58 +0000
+++ src/dk/aau/cs/gui/undo/AddPetriNetControlCommand.java	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-package dk.aau.cs.gui.undo;
-
-import dk.aau.cs.gui.DrawingSurface;
-import dk.aau.cs.gui.components.PetriNetElementControl;
-
-public class AddPetriNetControlCommand extends Command {
-	private PetriNetElementControl control;
-	private DrawingSurface surface;
-
-	public AddPetriNetControlCommand(PetriNetElementControl control,
-			DrawingSurface surface) {
-		this.surface = surface;
-		this.control = control;
-	}
-
-	@Override
-	public void redo() {
-		control.addChildControls();
-		surface.add(control);
-		// surface.surfaceChanged();
-	}
-
-	@Override
-	public void undo() {
-		control.removeChildControls();
-		surface.remove(control);
-		// surface.surfaceChanged();
-	}
-}

=== modified file 'src/dk/aau/cs/io/TraceImportExport.java'
--- src/dk/aau/cs/io/TraceImportExport.java	2014-08-04 21:06:50 +0000
+++ src/dk/aau/cs/io/TraceImportExport.java	2018-07-04 11:38:47 +0000
@@ -13,7 +13,7 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import javax.swing.JOptionPane;
-import pipe.gui.widgets.FileBrowser;
+import pipe.gui.widgets.filebrowser.FileBrowser;
 import dk.aau.cs.model.tapn.TimedArcPetriNet;
 import dk.aau.cs.model.tapn.TimedToken;
 import dk.aau.cs.model.tapn.TimedTransition;
@@ -47,9 +47,9 @@
         try {
             ByteArrayOutputStream os = prepareTraceStream();
 
-            FileBrowser fb = new FileBrowser("Export Trace", "trc");
+            FileBrowser fb = FileBrowser.constructor("Export Trace", "trc");
             // path = fb.saveFile(CreateGui.appGui.getCurrentTabName().substring(0, CreateGui.appGui.getCurrentTabName().lastIndexOf('.')) + "-trace");
-            path = fb.saveFile(CreateGui.appGui.getCurrentTabName().substring(0, CreateGui.appGui.getCurrentTabName().lastIndexOf('.')));
+            path = fb.saveFile(CreateGui.getAppGui().getCurrentTabName().substring(0, CreateGui.getAppGui().getCurrentTabName().lastIndexOf('.')));
 
             FileOutputStream fs = new FileOutputStream(path);
             fs.write(os.toByteArray());
@@ -148,7 +148,7 @@
     }
 
     public static void importTrace() {
-        if (pipe.gui.CreateGui.getAnimationHistory().getListModel().size() > 1) {
+        if (pipe.gui.CreateGui.getCurrentTab().getAnimationHistory().getListModel().size() > 1) {
             int answer = JOptionPane.showConfirmDialog(CreateGui.getApp(),
                     "You are about to import a trace. This removes the current trace.",
                     "Import Trace", JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
@@ -157,7 +157,7 @@
             }
         }
 
-        FileBrowser fb = new FileBrowser("Import Trace", "trc");
+        FileBrowser fb = FileBrowser.constructor ("Import Trace", "trc");
         File f = fb.openFile();
 
         if (f == null) {

=== added file 'src/dk/aau/cs/util/JavaUtil.java'
--- src/dk/aau/cs/util/JavaUtil.java	1970-01-01 00:00:00 +0000
+++ src/dk/aau/cs/util/JavaUtil.java	2018-07-04 11:38:47 +0000
@@ -0,0 +1,23 @@
+package dk.aau.cs.util;
+
+import dk.aau.cs.debug.Logger;
+
+public class JavaUtil {
+    public static int getJREMajorVersion(){
+        String version = System.getProperty("java.version");
+        String[] versionSplit = version.split("\\.");
+
+        try {
+            if (Integer.parseInt(versionSplit[0]) >= 9) {
+                //Version format (9.X.Y)
+                return Integer.parseInt(versionSplit[0]);
+            } else {
+                //Before java 9 version in format (1.X.Y)
+                return Integer.parseInt(versionSplit[1]);
+            }
+        } catch (NumberFormatException e) {
+            Logger.log("Error parsing java version, failing silent (0): " + e.getMessage());
+            return 0; // Unknown version
+        }
+    }
+}

=== modified file 'src/dk/aau/cs/util/Require.java'
--- src/dk/aau/cs/util/Require.java	2011-03-07 18:40:05 +0000
+++ src/dk/aau/cs/util/Require.java	2018-07-04 11:38:47 +0000
@@ -6,6 +6,11 @@
 			throw new RequireException(message);
 	}
 	
+	public static void notNull(Object o, String message) {
+		if (o == null)
+			throw new RequireException(message);
+	}
+	
 	public static void notImplemented(){
 		throw new RuntimeException("NOT IMPLEMENTED");
 	}

=== modified file 'src/dk/aau/cs/verification/UPPAAL/Verifyta.java'
--- src/dk/aau/cs/verification/UPPAAL/Verifyta.java	2014-03-06 05:43:24 +0000
+++ src/dk/aau/cs/verification/UPPAAL/Verifyta.java	2018-07-04 11:38:47 +0000
@@ -10,10 +10,8 @@
 import java.util.regex.Pattern;
 
 import net.tapaal.Preferences;
-import pipe.dataLayer.TAPNQuery.SearchOption;
 import pipe.dataLayer.TAPNQuery.TraceOption;
 import pipe.gui.FileFinder;
-import pipe.gui.FileFinderImpl;
 import pipe.gui.MessengerImpl;
 import pipe.gui.Pipe;
 import dk.aau.cs.Messenger;
@@ -28,7 +26,6 @@
 import dk.aau.cs.model.tapn.simulation.TimedArcPetriNetTrace;
 import dk.aau.cs.translations.ReductionOption;
 import dk.aau.cs.util.ExecutabilityChecker;
-import dk.aau.cs.util.MemoryMonitor;
 import dk.aau.cs.util.Tuple;
 import dk.aau.cs.util.UnsupportedModelException;
 import dk.aau.cs.util.UnsupportedQueryException;
@@ -36,7 +33,6 @@
 import dk.aau.cs.verification.NameMapping;
 import dk.aau.cs.verification.ProcessRunner;
 import dk.aau.cs.verification.QueryResult;
-import dk.aau.cs.verification.QueryType;
 import dk.aau.cs.verification.VerificationOptions;
 import dk.aau.cs.verification.VerificationResult;
 
@@ -186,7 +182,7 @@
 		if (verifyta != null && !verifyta.equals("")) {
 			if (new File(verifyta).exists()){
 				verifytapath = verifyta;
-				Verifyta v = new Verifyta(new FileFinderImpl(), new MessengerImpl());
+				Verifyta v = new Verifyta(new FileFinder(), new MessengerImpl());
 				if(v.isCorrectVersion()){
 					return true;
 				}else{
@@ -199,7 +195,7 @@
 		verifyta = Preferences.getInstance().getVerifytaLocation();
 		if (verifyta != null && !verifyta.equals("")) {
 			verifytapath = verifyta;
-			Verifyta v = new Verifyta(new FileFinderImpl(), new MessengerImpl());
+			Verifyta v = new Verifyta(new FileFinder(), new MessengerImpl());
 			if(v.isCorrectVersion()){
 				return true;
 			}else{

=== modified file 'src/dk/aau/cs/verification/VerifyTAPN/VerifyPN.java'
--- src/dk/aau/cs/verification/VerifyTAPN/VerifyPN.java	2017-06-27 13:49:24 +0000
+++ src/dk/aau/cs/verification/VerifyTAPN/VerifyPN.java	2018-07-04 11:38:47 +0000
@@ -17,15 +17,12 @@
 import pipe.dataLayer.TAPNQuery.SearchOption;
 import pipe.dataLayer.TAPNQuery.TraceOption;
 import pipe.gui.FileFinder;
-import pipe.gui.FileFinderImpl;
 import pipe.gui.MessengerImpl;
 import pipe.gui.Pipe;
 import pipe.gui.widgets.InclusionPlaces;
 import pipe.gui.widgets.InclusionPlaces.InclusionPlacesOption;
 import dk.aau.cs.Messenger;
 import dk.aau.cs.TCTL.TCTLAFNode;
-import dk.aau.cs.TCTL.TCTLAGNode;
-import dk.aau.cs.TCTL.TCTLEFNode;
 import dk.aau.cs.TCTL.TCTLEGNode;
 import dk.aau.cs.model.tapn.LocalTimedPlace;
 import dk.aau.cs.model.tapn.TAPNQuery;
@@ -40,7 +37,6 @@
 import dk.aau.cs.verification.NameMapping;
 import dk.aau.cs.verification.ProcessRunner;
 import dk.aau.cs.verification.QueryResult;
-import dk.aau.cs.verification.QueryType;
 import dk.aau.cs.verification.Stats;
 import dk.aau.cs.verification.VerificationOptions;
 import dk.aau.cs.verification.VerificationResult;
@@ -227,7 +223,7 @@
 			if (verifypn != null && !verifypn.isEmpty()) {
 				if (new File(verifypn).exists()){
 					verifypnpath = verifypn;
-					VerifyPN v = new VerifyPN(new FileFinderImpl(), new MessengerImpl());
+					VerifyPN v = new VerifyPN(new FileFinder(), new MessengerImpl());
 					if(v.isCorrectVersion()){
 						return true;
 					}else{
@@ -254,7 +250,7 @@
 				if (verifypnfile.exists()){
 
 					verifypnpath = verifypnfile.getAbsolutePath();
-					VerifyPN v = new VerifyPN(new FileFinderImpl(), new MessengerImpl());
+					VerifyPN v = new VerifyPN(new FileFinder(), new MessengerImpl());
 					if(v.isCorrectVersion()){
 						return true;
 					}else{

=== modified file 'src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPN.java'
--- src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPN.java	2014-05-09 16:52:21 +0000
+++ src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPN.java	2018-07-04 11:38:47 +0000
@@ -15,7 +15,6 @@
 import net.tapaal.TAPAAL;
 import pipe.dataLayer.TAPNQuery.TraceOption;
 import pipe.gui.FileFinder;
-import pipe.gui.FileFinderImpl;
 import pipe.gui.MessengerImpl;
 import pipe.gui.Pipe;
 import pipe.gui.widgets.InclusionPlaces;
@@ -38,7 +37,6 @@
 import dk.aau.cs.verification.NameMapping;
 import dk.aau.cs.verification.ProcessRunner;
 import dk.aau.cs.verification.QueryResult;
-import dk.aau.cs.verification.QueryType;
 import dk.aau.cs.verification.Stats;
 import dk.aau.cs.verification.VerificationOptions;
 import dk.aau.cs.verification.VerificationResult;
@@ -215,7 +213,7 @@
 		if (verifytapn != null && !verifytapn.isEmpty()) {
 			if (new File(verifytapn).exists()){
 				verifytapnpath = verifytapn;
-				VerifyTAPN v = new VerifyTAPN(new FileFinderImpl(), new MessengerImpl());
+				VerifyTAPN v = new VerifyTAPN(new FileFinder(), new MessengerImpl());
 				if(v.isCorrectVersion()){
 					return true;
 				}else{
@@ -242,7 +240,7 @@
 			if (verifytapnfile.exists()){
 
 				verifytapnpath = verifytapnfile.getAbsolutePath();
-				VerifyTAPN v = new VerifyTAPN(new FileFinderImpl(), new MessengerImpl());
+				VerifyTAPN v = new VerifyTAPN(new FileFinder(), new MessengerImpl());
 				if(v.isCorrectVersion()){
 					return true;
 				}else{

=== modified file 'src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNDiscreteVerification.java'
--- src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNDiscreteVerification.java	2014-06-13 22:38:04 +0000
+++ src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNDiscreteVerification.java	2018-07-04 11:38:47 +0000
@@ -36,7 +36,6 @@
 import pipe.dataLayer.TAPNQuery.TraceOption;
 import pipe.dataLayer.TAPNQuery.WorkflowMode;
 import pipe.gui.FileFinder;
-import pipe.gui.FileFinderImpl;
 import pipe.gui.MessengerImpl;
 import pipe.gui.Pipe;
 import pipe.gui.widgets.InclusionPlaces;
@@ -216,7 +215,7 @@
 			if (verifydtapn != null && !verifydtapn.isEmpty()) {
 				if (new File(verifydtapn).exists()){
 					verifydtapnpath = verifydtapn;
-					VerifyTAPNDiscreteVerification v = new VerifyTAPNDiscreteVerification(new FileFinderImpl(), new MessengerImpl());
+					VerifyTAPNDiscreteVerification v = new VerifyTAPNDiscreteVerification(new FileFinder(), new MessengerImpl());
 					if(v.isCorrectVersion()){
 						return true;
 					}else{
@@ -243,7 +242,7 @@
 				if (verifydtapnfile.exists()){
 
 					verifydtapnpath = verifydtapnfile.getAbsolutePath();
-					VerifyTAPNDiscreteVerification v = new VerifyTAPNDiscreteVerification(new FileFinderImpl(), new MessengerImpl());
+					VerifyTAPNDiscreteVerification v = new VerifyTAPNDiscreteVerification(new FileFinder(), new MessengerImpl());
 					if(v.isCorrectVersion()){
 						return true;
 					}else{

=== modified file 'src/dk/aau/cs/verification/batchProcessing/BatchProcessingWorker.java'
--- src/dk/aau/cs/verification/batchProcessing/BatchProcessingWorker.java	2018-04-02 20:03:24 +0000
+++ src/dk/aau/cs/verification/batchProcessing/BatchProcessingWorker.java	2018-07-04 11:38:47 +0000
@@ -9,7 +9,7 @@
 import pipe.dataLayer.TAPNQuery.SearchOption;
 import pipe.dataLayer.TAPNQuery.TraceOption;
 import pipe.gui.CreateGui;
-import pipe.gui.FileFinderImpl;
+import pipe.gui.FileFinder;
 import pipe.gui.MessengerImpl;
 import pipe.gui.widgets.QueryPane;
 import dk.aau.cs.Messenger;
@@ -377,7 +377,7 @@
 		BatchProcessingVerificationResult result;		
 		if(QueryPane.getTemporaryFile() != null && fileName.equals(QueryPane.getTemporaryFile().getName())) {
 			//removes numbers from tempFile so it looks good
-			result = new BatchProcessingVerificationResult(CreateGui.appGui.getCurrentTabName(), query, verificationResult, verificationTime, MemoryMonitor.getPeakMemory(), stats);
+			result = new BatchProcessingVerificationResult(CreateGui.getAppGui().getCurrentTabName(), query, verificationResult, verificationTime, MemoryMonitor.getPeakMemory(), stats);
 		} else {
 			result = new BatchProcessingVerificationResult(fileName, query, verificationResult, verificationTime, MemoryMonitor.getPeakMemory(), stats);
 		}
@@ -465,25 +465,25 @@
 	}
 
 	private Verifyta getVerifyta() {
-		Verifyta verifyta = new Verifyta(new FileFinderImpl(), new MessengerImpl());
+		Verifyta verifyta = new Verifyta(new FileFinder(), new MessengerImpl());
 		verifyta.setup();
 		return verifyta;
 	}
 
 	private static VerifyTAPN getVerifyTAPN() {
-		VerifyTAPN verifytapn = new VerifyTAPN(new FileFinderImpl(), new MessengerImpl());
+		VerifyTAPN verifytapn = new VerifyTAPN(new FileFinder(), new MessengerImpl());
 		verifytapn.setup();
 		return verifytapn;
 	}
 	
 	private static VerifyPN getVerifyPN() {
-		VerifyPN verifypn = new VerifyPN(new FileFinderImpl(), new MessengerImpl());
+		VerifyPN verifypn = new VerifyPN(new FileFinder(), new MessengerImpl());
 		verifypn.setup();
 		return verifypn;
 	}
 	
 	private static VerifyTAPNDiscreteVerification getVerifyTAPNDiscreteVerification() {
-		VerifyTAPNDiscreteVerification verifytapnDiscreteVerification = new VerifyTAPNDiscreteVerification(new FileFinderImpl(), new MessengerImpl());
+		VerifyTAPNDiscreteVerification verifytapnDiscreteVerification = new VerifyTAPNDiscreteVerification(new FileFinder(), new MessengerImpl());
 		verifytapnDiscreteVerification.setup();
 		return verifytapnDiscreteVerification;
 	}

=== modified file 'src/net/tapaal/TAPAAL.java'
--- src/net/tapaal/TAPAAL.java	2014-02-08 16:38:01 +0000
+++ src/net/tapaal/TAPAAL.java	2018-07-04 11:38:47 +0000
@@ -45,7 +45,7 @@
 		try {
 			commandline = parser.parse(options, args);
 		} catch (ParseException exp) {
-			System.err.println("There where an error parsing the specifyed arguments");
+			System.err.println("There where an error parsing the specified arguments");
 			System.err.println("Unexpected exception:" + exp.getMessage());
 		}
 
@@ -57,6 +57,11 @@
 			Logger.enableLogging(true);
 		}
 
+		if (TAPAAL.VERSION == "DEV"){
+			Logger.enableLogging(true);
+			Logger.log("Debug logging is enabled by default in DEV branch");
+		}
+
 		// Open files
 		String[] files = commandline.getArgs();
 		for (String f : files) {
@@ -64,7 +69,7 @@
 
 			if (file.exists()) { // Open the file
 				if (file.canRead()) {
-					CreateGui.appGui.createNewTabFromFile(file, false);
+					CreateGui.getAppGui().createNewTabFromFile(file);
 				} else if (file.exists()) {
 					System.err.println("Can not read file " + file.toString());
 				}

=== modified file 'src/pipe/dataLayer/DataLayer.java'
--- src/pipe/dataLayer/DataLayer.java	2014-02-27 13:04:19 +0000
+++ src/pipe/dataLayer/DataLayer.java	2018-07-04 11:38:47 +0000
@@ -72,14 +72,6 @@
 	 * Create empty Petri-Net object
 	 */
 	public DataLayer() {
-		initializeMatrices();
-	}
-
-	/**
-	 * Initialize Arrays
-	 */
-	private void initializeMatrices() {
-
 		placesArray = new ArrayList<Place>();
 		transitionsArray = new ArrayList<Transition>();
 		arcsArray = new ArrayList<Arc>();
@@ -92,6 +84,7 @@
 		tapnInhibitorsMap = new Hashtable<PlaceTransitionObject, ArrayList<TimedInhibitorArcComponent>>();
 	}
 
+
 	/**
 	 * Add placeInput to the back of the Place ArrayList All observers are
 	 * notified of this change (Model-View Architecture)

=== modified file 'src/pipe/dataLayer/Template.java'
--- src/pipe/dataLayer/Template.java	2012-01-27 10:21:31 +0000
+++ src/pipe/dataLayer/Template.java	2018-07-04 11:38:47 +0000
@@ -37,7 +37,7 @@
 	}
 
 	public void setGuiModel(DataLayer guiModel) {
-		Require.that(guiModel != null, "GuiModel cannot be null");
+		Require.notNull(guiModel, "GuiModel cannot be null");
 		this.guiModel = guiModel;
 	}
 

=== modified file 'src/pipe/gui/AnimationController.java'
--- src/pipe/gui/AnimationController.java	2014-11-05 14:20:41 +0000
+++ src/pipe/gui/AnimationController.java	2018-07-04 11:38:47 +0000
@@ -29,24 +29,17 @@
 import javax.swing.JTextField;
 import javax.swing.JToggleButton;
 import javax.swing.JToolBar;
-import javax.swing.KeyStroke;
 import javax.swing.ToolTipManager;
 import javax.swing.border.EmptyBorder;
 import javax.swing.text.AbstractDocument;
-import javax.swing.text.AttributeSet;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.DocumentFilter;
-import javax.swing.text.DocumentFilter.FilterBypass;
+
 import pipe.dataLayer.NetType;
-import pipe.gui.GuiFrame.AnimateAction;
-import pipe.gui.Pipe.ElementType;
 import pipe.gui.action.GuiAction;
 import pipe.gui.widgets.DecimalOnlyDocumentFilter;
 import dk.aau.cs.gui.components.NonsearchableJComboBox;
 import dk.aau.cs.model.tapn.simulation.FiringMode;
-import java.awt.BorderLayout;
+
 import java.awt.event.ActionListener;
-import java.util.Dictionary;
 import java.util.Hashtable;
 import javax.swing.JButton;
 import javax.swing.JSlider;
@@ -64,72 +57,27 @@
 
 public class AnimationController extends JPanel {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 7037756165634426275L;
 	private javax.swing.JButton okButton;
-        private JSlider delaySlider;
-        private int delayScale = 10;
-	private String PRECISION_ERROR_MESSAGE = "The precision is limited to 5 decimal places, the number will be truncated.";
-	private String PRECISION_ERROR_DIALOG_TITLE = "Precision of Time Delay Exceeded"; 
-
-	class ToggleButton extends JToggleButton implements PropertyChangeListener {
-
-		/**
-		 * 
-		 */
-		private static final long serialVersionUID = -6594894202788511816L;
-
-		public ToggleButton(Action a) {
-			super(a);
-			if (a.getValue(Action.SMALL_ICON) != null) {
-				// toggle buttons like to have images *and* text, nasty
-				setText(null);
-			}
-			a.addPropertyChangeListener(this);
-		}
-
-		public void propertyChange(PropertyChangeEvent evt) {
-			if (evt.getPropertyName().equals("selected")) {
-				Boolean b = (Boolean) evt.getNewValue();
-				if (b != null) {
-					setSelected(b.booleanValue());
-				}
-			}
-		}
-
-	}
-
-	private void addButton(JToolBar toolBar, GuiAction action) {
-
-		if (action.getValue("selected") != null) {
-			toolBar.add(new ToggleButton(action));
-		} else {
-			toolBar.add(action);
-		}
-	}
-
-	AnimateAction startAction, stepforwardAction, stepbackwardAction,
-			randomAction, randomAnimateAction, timeAction;
+	private JSlider delaySlider;
+	private int delayScale = 10;
+	private static final String PRECISION_ERROR_MESSAGE = "The precision is limited to 5 decimal places, the number will be truncated.";
+	private static final String PRECISION_ERROR_DIALOG_TITLE = "Precision of Time Delay Exceeded";
+
+	private GuiAction stepforwardAction, stepbackwardAction;
+
+	JTextField TimeDelayField = new JTextField();
+	JComboBox firermodebox = null;
+	private static final String[] FIRINGMODES = { "Random", "Oldest", "Youngest", "Manual" };
 
 	public AnimationController(NetType netType) {
-		startAction = CreateGui.appGui.startAction;
 
-		stepbackwardAction = CreateGui.appGui.stepbackwardAction;
-		stepforwardAction = CreateGui.appGui.stepforwardAction;
+		stepbackwardAction = CreateGui.getAppGui().stepbackwardAction;
+		stepforwardAction = CreateGui.getAppGui().stepforwardAction;
 
 		stepbackwardAction.setEnabled(false);
 		stepforwardAction.setEnabled(false);
 
-		// timeAction = new AnimateAction("Time", Pipe.TIMEPASS,
-		// "Let Time pass", "_");
-
-		//randomAction = new AnimateAction("Random", ElementType.RANDOM,
-		//		"Randomly fire a transition", "typed 5");
-		//randomAnimateAction = new AnimateAction("Simulate", ElementType.ANIMATE,
-		//		"Randomly fire a number of transitions", "typed 7", true);
-
 		setLayout(new GridBagLayout());
 		GridBagConstraints c = new GridBagConstraints();
 
@@ -149,8 +97,8 @@
 		JToolBar animationToolBar = new JToolBar();
 		animationToolBar.setFloatable(false);
 		animationToolBar.setBorder(new EmptyBorder(0, 0, 0, 0));
-		addButton(animationToolBar, stepbackwardAction);
-		addButton(animationToolBar, stepforwardAction);
+		animationToolBar.add(stepbackwardAction);
+		animationToolBar.add(stepforwardAction);
 
 		animationToolBar.setVisible(true);
 
@@ -173,9 +121,9 @@
 			c.gridy = 0;
 			add(firemode, c);
 
-                        initDelayTimePanel(animationToolBar);
-                        
-                        initDelaySlider();
+			initDelayTimePanel(animationToolBar);
+
+			initDelaySlider();
 		}
                 
 		setBorder(BorderFactory.createCompoundBorder(BorderFactory
@@ -186,168 +134,159 @@
 		
 		initializeDocumentFilterForDelayInput();
 	}
-        
-         private void initDelaySlider() {
-                JPanel sliderPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
-                JButton decrese = new JButton("-");
-                decrese.setPreferredSize(new Dimension(20, 30));
-                decrese.addActionListener(new ActionListener() {
-                        public void actionPerformed(ActionEvent e) {
-                                setDelayModeScale(delayScale / 2);
-                                delaySlider.setValue(delaySlider.getValue() * 2);
-                        }
-                });
-                sliderPanel.add(decrese);
-
-                delaySlider = new JSlider(0, 160);
-                delaySlider.setSnapToTicks(false);
-                delaySlider.setMajorTickSpacing(10);
-                delaySlider.setMinorTickSpacing(0);
-                delaySlider.setPaintLabels(true);
-                delaySlider.setPaintTicks(true);
-                delaySlider.addChangeListener(new ChangeListener() {
-                        @Override
-                        public void stateChanged(ChangeEvent e) {
-                                TimeDelayField.setText(Double.toString(delaySlider.getValue() * ((double) delayScale) / 160));
-                                CreateGui.getAnimator().reportBlockingPlaces();
-
-                        }
-                });
-
-                delaySlider.addKeyListener(new KeyListener() {
-                        public void keyPressed(KeyEvent e) {
-                                if (e.getKeyCode() == KeyEvent.VK_ENTER) {
-                                        addTimeDelayToHistory();
-                                }
-                        }
-
-                        public void keyReleased(KeyEvent e) {
-                                CreateGui.getAnimator().reportBlockingPlaces();
-                        }
-
-                        public void keyTyped(KeyEvent e) {
-
-                        }
-                });
-
-                setDelayModeScale(16);
-
-                sliderPanel.add(delaySlider);
-                JButton increse = new JButton("+");
-                increse.setPreferredSize(new Dimension(20, 30));
-                increse.addActionListener(new ActionListener() {
-                        public void actionPerformed(ActionEvent e) {
-                                setDelayModeScale(delayScale * 2);
-                                delaySlider.setValue(delaySlider.getValue() / 2);
-                        }
-                });
-                sliderPanel.add(increse);
-
-                GridBagConstraints c = new GridBagConstraints();
-                c.fill = GridBagConstraints.HORIZONTAL;
-                c.weightx = 0.5;
-                c.gridx = 0;
-                c.gridy = 1;
-                add(sliderPanel, c);
-        }
-        
-        private void setDelayModeScale(int scale){
-            if (scale == 0) return;
-            delayScale = scale;
-            Hashtable<Integer, JLabel> labels = new Hashtable<Integer, JLabel>();
-            labels.put(0, new JLabel("0"));
-            labels.put(160, new JLabel(Integer.toString(delayScale)));
-            delaySlider.setLabelTable(labels);
-        }
-        
-        
-        private void initDelayTimePanel(JToolBar animationToolBar) {
-                JPanel timedelayPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-
-                okButton = new javax.swing.JButton();
-
-                okButton.setText("Time delay");
-                // okButton.setMaximumSize(new java.awt.Dimension(75, 25));
-                okButton.setMinimumSize(new java.awt.Dimension(75, 25));
-                // okButton.setPreferredSize(new java.awt.Dimension(75, 25));
-                okButton.addActionListener(new java.awt.event.ActionListener() {
-                        public void actionPerformed(java.awt.event.ActionEvent evt) {
-                                // okButtonHandler(evt);
-                                addTimeDelayToHistory();
-                        }
-                });
-
-                //"Hack" to make sure the toolTip for this button is showed as long as possible
-                okButton.addMouseListener(new MouseAdapter() {
-                        final int defaultDismissTimeout = ToolTipManager.sharedInstance().getDismissDelay();
-                        final int defaultInitalDelay = ToolTipManager.sharedInstance().getInitialDelay();
-                        final int defaultReshowDelay = ToolTipManager.sharedInstance().getReshowDelay();
-                        final int dismissDelayMinutes = Integer.MAX_VALUE;
-
-                        @Override
-                        public void mouseEntered(MouseEvent e) {
-                                ToolTipManager.sharedInstance().setDismissDelay(dismissDelayMinutes);
-                                ToolTipManager.sharedInstance().setInitialDelay(0);
-                                ToolTipManager.sharedInstance().setReshowDelay(0);
-                                ToolTipManager.sharedInstance().setEnabled(true);
-                        }
-
-                        @Override
-                        public void mouseExited(MouseEvent e) {
-                                ToolTipManager.sharedInstance().setDismissDelay(defaultDismissTimeout);
-                                ToolTipManager.sharedInstance().setInitialDelay(defaultInitalDelay);
-                                ToolTipManager.sharedInstance().setReshowDelay(defaultReshowDelay);
-                                ToolTipManager.sharedInstance().setEnabled(CreateGui.getApp().isShowingToolTips());
-                        }
-                });
-
-                TimeDelayField.addKeyListener(new KeyListener() {
-                        public void keyPressed(KeyEvent e) {
-                                if (e.getKeyCode() == KeyEvent.VK_ENTER) {
-                                        addTimeDelayToHistory();
-                                        TimeDelayField.getFocusCycleRootAncestor().requestFocus();	// Remove focus
-                                }
-                        }
-
-                        public void keyReleased(KeyEvent e) {
-                                CreateGui.getAnimator().reportBlockingPlaces();
-                        }
-
-                        public void keyTyped(KeyEvent e) {
-
-                        }
-
-                });
-
-                // Disable shortcuts when focused
-                TimeDelayField.addFocusListener(new FocusListener() {
-                        public void focusLost(FocusEvent arg0) {
-                                CreateGui.getApp().setStepShotcutEnabled(true);
-                        }
-
-                        public void focusGained(FocusEvent arg0) {
-                                CreateGui.getApp().setStepShotcutEnabled(false);
-                        }
-                });
-
-                DecimalFormat df = new DecimalFormat();
-                df.setMaximumFractionDigits(Pipe.AGE_DECIMAL_PRECISION);
-                df.setMinimumFractionDigits(Pipe.AGE_DECIMAL_PRECISION);
-
-                TimeDelayField.setText(df.format(1f));
-                TimeDelayField.setColumns(6);
-
-                timedelayPanel.add(TimeDelayField);
-                timedelayPanel.add(okButton);
-			//CreateGui.getAnimator().reportBlockingPlaces();
-
-			// c.fill = GridBagConstraints.HORIZONTAL;
-                // c.weightx = 0.5;
-                // c.gridx = 0;
-                // c.gridy = 3;
-                // add(timedelayPanel, c);
-                animationToolBar.add(timedelayPanel);
-        }
+
+	private void initDelaySlider() {
+		JPanel sliderPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
+		JButton decrese = new JButton("-");
+		decrese.setPreferredSize(new Dimension(20, 30));
+		decrese.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				setDelayModeScale(delayScale / 2);
+				delaySlider.setValue(delaySlider.getValue() * 2);
+			}
+		});
+		sliderPanel.add(decrese);
+
+		delaySlider = new JSlider(0, 160);
+		delaySlider.setSnapToTicks(false);
+		delaySlider.setMajorTickSpacing(10);
+		delaySlider.setMinorTickSpacing(0);
+		delaySlider.setPaintLabels(true);
+		delaySlider.setPaintTicks(true);
+		delaySlider.addChangeListener(new ChangeListener() {
+			@Override
+			public void stateChanged(ChangeEvent e) {
+				TimeDelayField.setText(Double.toString(delaySlider.getValue() * ((double) delayScale) / 160));
+				CreateGui.getAnimator().reportBlockingPlaces();
+
+			}
+		});
+
+		delaySlider.addKeyListener(new KeyListener() {
+			public void keyPressed(KeyEvent e) {
+				if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+					addTimeDelayToHistory();
+				}
+			}
+
+			public void keyReleased(KeyEvent e) {
+				CreateGui.getAnimator().reportBlockingPlaces();
+			}
+
+			public void keyTyped(KeyEvent e) {
+
+			}
+		});
+
+		setDelayModeScale(16);
+
+		sliderPanel.add(delaySlider);
+		JButton increse = new JButton("+");
+		increse.setPreferredSize(new Dimension(20, 30));
+		increse.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				setDelayModeScale(delayScale * 2);
+				delaySlider.setValue(delaySlider.getValue() / 2);
+			}
+		});
+		sliderPanel.add(increse);
+
+		GridBagConstraints c = new GridBagConstraints();
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.weightx = 0.5;
+		c.gridx = 0;
+		c.gridy = 1;
+		add(sliderPanel, c);
+	}
+
+	private void setDelayModeScale(int scale) {
+		if (scale == 0) return;
+		delayScale = scale;
+		Hashtable<Integer, JLabel> labels = new Hashtable<Integer, JLabel>();
+		labels.put(0, new JLabel("0"));
+		labels.put(160, new JLabel(Integer.toString(delayScale)));
+		delaySlider.setLabelTable(labels);
+	}
+
+
+	private void initDelayTimePanel(JToolBar animationToolBar) {
+		JPanel timedelayPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
+
+		okButton = new javax.swing.JButton();
+
+		okButton.setText("Time delay");
+		okButton.setMinimumSize(new java.awt.Dimension(75, 25));
+		okButton.addActionListener(new java.awt.event.ActionListener() {
+			public void actionPerformed(java.awt.event.ActionEvent evt) {
+				addTimeDelayToHistory();
+			}
+		});
+
+		//"Hack" to make sure the toolTip for this button is showed as long as possible
+		okButton.addMouseListener(new MouseAdapter() {
+			final int defaultDismissTimeout = ToolTipManager.sharedInstance().getDismissDelay();
+			final int defaultInitalDelay = ToolTipManager.sharedInstance().getInitialDelay();
+			final int defaultReshowDelay = ToolTipManager.sharedInstance().getReshowDelay();
+			final int dismissDelayMinutes = Integer.MAX_VALUE;
+
+			@Override
+			public void mouseEntered(MouseEvent e) {
+				ToolTipManager.sharedInstance().setDismissDelay(dismissDelayMinutes);
+				ToolTipManager.sharedInstance().setInitialDelay(0);
+				ToolTipManager.sharedInstance().setReshowDelay(0);
+				ToolTipManager.sharedInstance().setEnabled(true);
+			}
+
+			@Override
+			public void mouseExited(MouseEvent e) {
+				ToolTipManager.sharedInstance().setDismissDelay(defaultDismissTimeout);
+				ToolTipManager.sharedInstance().setInitialDelay(defaultInitalDelay);
+				ToolTipManager.sharedInstance().setReshowDelay(defaultReshowDelay);
+				ToolTipManager.sharedInstance().setEnabled(CreateGui.getApp().isShowingToolTips());
+			}
+		});
+
+		TimeDelayField.addKeyListener(new KeyListener() {
+			public void keyPressed(KeyEvent e) {
+				if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+					addTimeDelayToHistory();
+					TimeDelayField.getFocusCycleRootAncestor().requestFocus();    // Remove focus
+				}
+			}
+
+			public void keyReleased(KeyEvent e) {
+				CreateGui.getAnimator().reportBlockingPlaces();
+			}
+
+			public void keyTyped(KeyEvent e) {
+
+			}
+
+		});
+
+		// Disable shortcuts when focused
+		TimeDelayField.addFocusListener(new FocusListener() {
+			public void focusLost(FocusEvent arg0) {
+				CreateGui.getApp().setStepShotcutEnabled(true);
+			}
+
+			public void focusGained(FocusEvent arg0) {
+				CreateGui.getApp().setStepShotcutEnabled(false);
+			}
+		});
+
+		DecimalFormat df = new DecimalFormat();
+		df.setMaximumFractionDigits(Pipe.AGE_DECIMAL_PRECISION);
+		df.setMinimumFractionDigits(Pipe.AGE_DECIMAL_PRECISION);
+
+		TimeDelayField.setText(df.format(1f));
+		TimeDelayField.setColumns(6);
+
+		timedelayPanel.add(TimeDelayField);
+		timedelayPanel.add(okButton);
+
+		animationToolBar.add(timedelayPanel);
+	}
 
 	public void updateFiringModeComboBox() {
 		FiringMode currentFiringMode = CreateGui.getAnimator().getFiringmode();
@@ -364,7 +303,7 @@
 	}
 
 	private void addTimeDelayToHistory() {
-		AnimationHistoryComponent animBox = CreateGui.getAnimationHistory();
+		AnimationHistoryComponent animBox = CreateGui.getCurrentTab().getAnimationHistory();
 		try {
 
 			// Hack to allow usage of localised numbes
@@ -432,13 +371,10 @@
 																	// number
 																	// localised
 		// Try parse
-
 		BigDecimal timeDelayToSet = new BigDecimal(parseTime.toString(),
 				new MathContext(Pipe.AGE_PRECISION));
 
-		// BigDecimal timeDelayToSet = new
-		// BigDecimal(TimeDelayField.getText(), new
-		// MathContext(Pipe.AGE_PRECISION));
+
 		return timeDelayToSet;
 	}
 
@@ -453,13 +389,13 @@
 	}
 
 	public void setAnimationButtonsEnabled() {
-		AnimationHistoryComponent animationHistory = CreateGui.getAnimationHistory();
+		AnimationHistoryComponent animationHistory = CreateGui.getCurrentTab().getAnimationHistory();
 
 		setEnabledStepforwardAction(animationHistory.isStepForwardAllowed());
 		setEnabledStepbackwardAction(animationHistory.isStepBackAllowed());
 
-		CreateGui.appGui.setEnabledStepForwardAction(animationHistory.isStepForwardAllowed());
-		CreateGui.appGui.setEnabledStepBackwardAction(animationHistory.isStepBackAllowed());
+		CreateGui.getAppGui().setEnabledStepForwardAction(animationHistory.isStepForwardAllowed());
+		CreateGui.getAppGui().setEnabledStepBackwardAction(animationHistory.isStepBackAllowed());
 	}
 	
 	private void initializeDocumentFilterForDelayInput() {
@@ -467,7 +403,5 @@
 		((AbstractDocument)doc).setDocumentFilter(new DecimalOnlyDocumentFilter(5));
 	}
 
-	JTextField TimeDelayField = new JTextField();
-	JComboBox firermodebox = null;
-	private final String[] FIRINGMODES = { "Random", "Oldest", "Youngest", "Manual" };
+
 }

=== modified file 'src/pipe/gui/AnimationHistoryComponent.java'
--- src/pipe/gui/AnimationHistoryComponent.java	2016-11-14 09:58:40 +0000
+++ src/pipe/gui/AnimationHistoryComponent.java	2018-07-04 11:38:47 +0000
@@ -147,16 +147,16 @@
         
         private void layoutAdjustment() { 
             // if the trace ends with "deadlock", "delay for ever" or "goto *" makes sure we don't have to scrool to see it
-            int selectedIndex = CreateGui.getAnimationHistory().getSelectedIndex();
-            if (selectedIndex == CreateGui.getAnimationHistory().getListModel().getSize()-2) {
-                CreateGui.getAnimationHistory().setSelectedIndex(selectedIndex+1);
-                CreateGui.getAnimationHistory().setSelectedIndex(selectedIndex);
+            int selectedIndex = CreateGui.getCurrentTab().getAnimationHistory().getSelectedIndex();
+            if (selectedIndex == CreateGui.getCurrentTab().getAnimationHistory().getListModel().getSize()-2) {
+                CreateGui.getCurrentTab().getAnimationHistory().setSelectedIndex(selectedIndex+1);
+                CreateGui.getCurrentTab().getAnimationHistory().setSelectedIndex(selectedIndex);
             }
         }
 	
 	private void updateAccordingToDeadlock() {
 		
-		if(CreateGui.getTab().getSelectedIndex() == -1 || lastShown == TraceType.EG_DELAY_FOREVER){
+		if(CreateGui.getApp().getSelectedTabIndex() == -1 || lastShown == TraceType.EG_DELAY_FOREVER){
 			return;
 		}
 		for (Template t : CreateGui.getCurrentTab().activeTemplates()){

=== modified file 'src/pipe/gui/AnimationSettings.java'
--- src/pipe/gui/AnimationSettings.java	2016-11-14 09:58:40 +0000
+++ src/pipe/gui/AnimationSettings.java	2018-07-04 11:38:47 +0000
@@ -31,7 +31,7 @@
 				if(simControl.randomSimulation()){
 					delayEnabled.randomMode.setSelected(true);
 				}
-				CreateGui.getTransitionFireingComponent().updateFireButton();
+				CreateGui.getCurrentTab().getTransitionFireingComponent().updateFireButton();
 			}
 		});
 		

=== modified file 'src/pipe/gui/Animator.java'
--- src/pipe/gui/Animator.java	2016-11-14 09:58:40 +0000
+++ src/pipe/gui/Animator.java	2018-07-04 11:38:47 +0000
@@ -80,20 +80,20 @@
 		currentAction = -1;
 		currentMarkingIndex = 0;
 		tab.network().setMarking(markings.get(currentMarkingIndex));
-		CreateGui.getAnimationHistory().setSelectedIndex(0);
-		CreateGui.getAnimationController().setAnimationButtonsEnabled();
+		CreateGui.getCurrentTab().getAnimationHistory().setSelectedIndex(0);
+		CreateGui.getCurrentTab().getAnimationController().setAnimationButtonsEnabled();
 		updateFireableTransitions();
 	}
 
 	private void setUntimedTrace(TAPNNetworkTrace trace) {
 		tab.addAbstractAnimationPane();
-		AnimationHistoryComponent untimedAnimationHistory = CreateGui.getAbstractAnimationPane();
+		AnimationHistoryComponent untimedAnimationHistory = CreateGui.getCurrentTab().getUntimedAnimationHistory();
 
 		for(TAPNNetworkTraceStep step : trace){
 			untimedAnimationHistory.addHistoryItem(step.toString());
 		}
 
-		CreateGui.getAbstractAnimationPane().setSelectedIndex(0);
+		CreateGui.getCurrentTab().getUntimedAnimationHistory().setSelectedIndex(0);
 		setFiringmode("Random");
 
 		JOptionPane.showMessageDialog(CreateGui.getApp(),
@@ -113,7 +113,7 @@
 			addMarking(step, step.performStepFrom(currentMarking()));
 		}
 		if(getTrace().getTraceType() != TraceType.NOT_EG){ //If the trace was not explicitly set, maybe we have calculated it is deadlock.
-			CreateGui.getAnimationHistory().setLastShown(getTrace().getTraceType());
+			CreateGui.getCurrentTab().getAnimationHistory().setLastShown(getTrace().getTraceType());
 		}
 	}
 
@@ -169,7 +169,7 @@
 	}
 
 	public void updateFireableTransitions(){
-		TransitionFireingComponent transFireComponent = CreateGui.getTransitionFireingComponent();
+		TransitionFireingComponent transFireComponent = CreateGui.getCurrentTab().getTransitionFireingComponent();
 		transFireComponent.startReInit();
 		isUrgentTransitionEnabled = false;
 		
@@ -267,7 +267,7 @@
 
 	public void stepForward() {
 		if(currentAction == actionHistory.size()-1 && trace != null){
-			int selectedIndex = CreateGui.getAnimationHistory().getSelectedIndex();
+			int selectedIndex = CreateGui.getCurrentTab().getAnimationHistory().getSelectedIndex();
 			int action = currentAction;
 			int markingIndex = currentMarkingIndex;
 
@@ -278,7 +278,7 @@
 				addToTimedTrace(getTrace().getLoopSteps());
 			}
 
-			CreateGui.getAnimationHistory().setSelectedIndex(selectedIndex);
+			CreateGui.getCurrentTab().getAnimationHistory().setSelectedIndex(selectedIndex);
 			currentAction = action;
 			currentMarkingIndex = markingIndex;
 		}
@@ -436,9 +436,9 @@
 	public void reportBlockingPlaces(){
 
 		try{
-			BigDecimal delay = CreateGui.getAnimationController().getCurrentDelay();
+			BigDecimal delay = CreateGui.getCurrentTab().getAnimationController().getCurrentDelay();
 		if(isUrgentTransitionEnabled && delay.compareTo(new BigDecimal(0))>0){
-			CreateGui.getAnimationController().getOkButton().setEnabled(false);
+			CreateGui.getCurrentTab().getAnimationController().getOkButton().setEnabled(false);
 			StringBuilder sb = new StringBuilder();
 			sb.append("<html>Time delay is disabled due to the<br /> following enabled urgent transitions:<br /><br />");
 			for( Template temp : CreateGui.getCurrentTab().activeTemplates()){
@@ -451,17 +451,17 @@
 				}
 			}
 			sb.append("</html>");
-			CreateGui.getAnimationController().getOkButton().setToolTipText(sb.toString());
+			CreateGui.getCurrentTab().getAnimationController().getOkButton().setToolTipText(sb.toString());
 			return;
 		}
 			if(delay.compareTo(new BigDecimal(0))<0){
-				CreateGui.getAnimationController().getOkButton().setEnabled(false);
-				CreateGui.getAnimationController().getOkButton().setToolTipText("Time delay is possible only for nonnegative rational numbers");
+				CreateGui.getCurrentTab().getAnimationController().getOkButton().setEnabled(false);
+				CreateGui.getCurrentTab().getAnimationController().getOkButton().setToolTipText("Time delay is possible only for nonnegative rational numbers");
 			} else {
 				List<TimedPlace> blockingPlaces = currentMarking().getBlockingPlaces(delay);
 				if(blockingPlaces.size() == 0){
-					CreateGui.getAnimationController().getOkButton().setEnabled(true);
-					CreateGui.getAnimationController().getOkButton().setToolTipText("Press to add the delay");
+					CreateGui.getCurrentTab().getAnimationController().getOkButton().setEnabled(true);
+					CreateGui.getCurrentTab().getAnimationController().getOkButton().setToolTipText("Press to add the delay");
 				} else {
 					StringBuilder sb = new StringBuilder();
 					sb.append("<html>Time delay of " + delay + " time unit(s) is disabled due to <br /> age invariants in the following places:<br /><br />");
@@ -470,15 +470,15 @@
 					}
 					//JOptionPane.showMessageDialog(null, sb.toString());
 					sb.append("</html>");
-					CreateGui.getAnimationController().getOkButton().setEnabled(false);
-					CreateGui.getAnimationController().getOkButton().setToolTipText(sb.toString());
+					CreateGui.getCurrentTab().getAnimationController().getOkButton().setEnabled(false);
+					CreateGui.getCurrentTab().getAnimationController().getOkButton().setToolTipText(sb.toString());
 				}
 			}
 		} catch (NumberFormatException e) {
 			// Do nothing, invalud number
 		} catch (ParseException e) {
-			CreateGui.getAnimationController().getOkButton().setEnabled(false);
-			CreateGui.getAnimationController().getOkButton().setToolTipText("The text in the input field is not a number");
+			CreateGui.getCurrentTab().getAnimationController().getOkButton().setEnabled(false);
+			CreateGui.getCurrentTab().getAnimationController().getOkButton().setToolTipText("The text in the input field is not a number");
 		}
 	}
 
@@ -514,7 +514,7 @@
 			removeStoredActions(currentAction + 1);
 
 		tab.network().setMarking(marking);
-		CreateGui.getAnimationHistory().addHistoryItem(action.toString());
+		CreateGui.getCurrentTab().getAnimationHistory().addHistoryItem(action.toString());
 		actionHistory.add(action);
 		markings.add(marking);
 		currentAction++;
@@ -540,8 +540,8 @@
 			.println("Illegal firing mode mode: " + t + " not found.");
 		}
 
-		CreateGui.getAnimationController().updateFiringModeComboBox();
-		CreateGui.getAnimationController().setToolTipText("Select a method for choosing tokens during transition firing");
+		CreateGui.getCurrentTab().getAnimationController().updateFiringModeComboBox();
+		CreateGui.getCurrentTab().getAnimationController().setToolTipText("Select a method for choosing tokens during transition firing");
 	}	
 
 	enum FillListStatus{
@@ -644,7 +644,7 @@
 			if(answer != JOptionPane.OK_OPTION) return false;
 		}
 		if(isDisplayingUntimedTrace){
-			CreateGui.removeAbstractAnimationPane();
+			CreateGui.getCurrentTab().removeAbstractAnimationPane();
 		}
 		isDisplayingUntimedTrace = false;
 		trace = null;
@@ -661,7 +661,7 @@
 			answer = removeSetTrace(true);
 		}
 		if(answer){
-			CreateGui.getAnimationHistory().clearStepsForward();
+			CreateGui.getCurrentTab().getAnimationHistory().clearStepsForward();
 		}
 		return answer;
 	}

=== modified file 'src/pipe/gui/CreateGui.java'
--- src/pipe/gui/CreateGui.java	2018-04-21 11:58:41 +0000
+++ src/pipe/gui/CreateGui.java	2018-07-04 11:38:47 +0000
@@ -1,176 +1,34 @@
 package pipe.gui;
 
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyEvent;
-import java.io.File;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.JTabbedPane;
-
+import com.sun.jna.Platform;
 import net.tapaal.TAPAAL;
-import net.tapaal.Preferences;
 import pipe.dataLayer.DataLayer;
 import pipe.dataLayer.NetType;
 import pipe.gui.handler.SpecialMacHandler;
 import dk.aau.cs.gui.TabContent;
-import dk.aau.cs.gui.components.TransitionFireingComponent;
-import dk.aau.cs.verification.UPPAAL.Verifyta;
-import dk.aau.cs.verification.VerifyTAPN.VerifyPN;
-import dk.aau.cs.verification.VerifyTAPN.VerifyTAPN;
-import dk.aau.cs.verification.VerifyTAPN.VerifyTAPNDiscreteVerification;
-
-
 
 
 public class CreateGui {
 
-	public static GuiFrame appGui;
-	private static Animator animator;
-	private static JTabbedPane appTab;
+	private static GuiFrame appGui;
 	private static ArrayList<TabContent> tabs = new ArrayList<TabContent>();
 	
-	private static boolean usingGTKFileBrowser = true;
-	
-	private static boolean showZeroToInfinityIntervals = true;
-	private static boolean showTokenAge = true;
-
-	public static String imgPath, userPath; // useful for stuff
-	
-	public static Integer MaximalNumberOfTokensAllowed = new Integer(999);
-
-	
-	public static void checkForUpdate(boolean forcecheck) {
-		final VersionChecker versionChecker = new VersionChecker();
-		if (versionChecker.checkForNewVersion(forcecheck))  {
-			StringBuffer message = new StringBuffer("There is a new version of TAPAAL available at www.tapaal.net.");
-			message.append("\n\nCurrent version: ");
-			message.append(TAPAAL.VERSION);
-			message.append("\nNew version: ");
-			message.append(versionChecker.getNewVersionNumber());
-			String changelog = versionChecker.getChangelog();
-			if (!changelog.equals("")){
-				message.append('\n');
-				message.append('\n');
-				message.append("Changelog:");
-				message.append('\n');
-				message.append(changelog);
-			}
-			JOptionPane optionPane = new JOptionPane();
-		    optionPane.setMessage(message.toString());
-		    optionPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);
-		    JButton updateButton, laterButton, ignoreButton;
-		    updateButton = new JButton("Update now");
-		    updateButton.setMnemonic(KeyEvent.VK_C);
-			optionPane.add(updateButton);
-            laterButton = new JButton("Update later"); 
-            laterButton.setMnemonic(KeyEvent.VK_C);
-            optionPane.add(laterButton);
-            ignoreButton = new JButton("Ignore this update"); 
-            laterButton.setMnemonic(KeyEvent.VK_C);
-            optionPane.add(ignoreButton);
-            
-		    optionPane.setOptions(new Object[] {updateButton, laterButton, ignoreButton});
-		   
-		  
-		    final JDialog dialog = optionPane.createDialog(null, "New Version of TAPAAL");
-		    laterButton.addActionListener(new ActionListener() {
-    			public void actionPerformed(ActionEvent e) {
-    				Preferences.getInstance().setLatestVersion(null);
-    				dialog.setVisible(false);
-    				dialog.dispose ();
-    			}
-    		});
-		    updateButton.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					Preferences.getInstance().setLatestVersion(null);
-					dialog.setVisible(false);
-					dialog.dispose();
-					pipe.gui.GuiFrame.showInBrowser("http://www.tapaal.net/download");
-				//    appGui.exit();
-				}
-			});
-		    ignoreButton.addActionListener(new ActionListener() {
-    			public void actionPerformed(ActionEvent e) {
-    				Preferences.getInstance().setLatestVersion(versionChecker.getNewVersionNumber());
-    				dialog.setVisible(false);
-    				dialog.dispose ();
-    			}
-    		});
-		    
-		    updateButton.requestFocusInWindow();	
-		    dialog.getRootPane().setDefaultButton(updateButton);
-		    dialog.setVisible(true);
-		}
-	}
-	
+	public static final String imgPath = "resources/Images/";
 
 	public static void init() {
-		
-		imgPath = "resources/Images/";
-
-		// make the initial dir for browsing be My Documents (win), ~ (*nix),
-		// etc
-		userPath = null;
-
 		appGui = new GuiFrame(TAPAAL.getProgramName());
-		
-		if (appGui.isMac()){ 
-			try {
-				SpecialMacHandler.postprocess();
-			} catch (NoClassDefFoundError e) {
-				//Failed loading special mac handler, ignore and run program without MacOS integration
-			}	
+
+		if (Platform.isMac()){
+			SpecialMacHandler.postprocess();
 		}
-		
-		Grid.enableGrid();
-
-		appTab = new JTabbedPane();
-		
-		//TODO
-		/*
-		appTab.addChangeListener(new ChangeListener() {
-			int oldIndex = 0;
-			@Override
-			public void stateChanged(ChangeEvent arg0) {
-				Split model = getTab(oldIndex).getModelRoot();
-				getCurrentTab().setModelRoot(model);
-				oldIndex = appTab.getSelectedIndex();
-			}
-		});
-		*/
-		
-
-		animator = new Animator();
-
-		appGui.setTab(); // sets Tab properties
-
-		appGui.getContentPane().add(appTab);
-
-		// appGui.createNewTabFromFile(null);
 
 		appGui.setVisible(true);
-		appGui.activateSelectAction();
-		Verifyta.trySetup();
-		VerifyTAPN.trySetup();
-		VerifyTAPNDiscreteVerification.trySetup();
-		VerifyPN.trySetup();
-
-		checkForUpdate(false);
-	}
-
-	public static GuiFrame getApp() { // returns a reference to the application
-		return appGui;
+		appGui.checkForUpdate(false);
 	}
 
 	public static DataLayer getModel() {
-		return getModel(appTab.getSelectedIndex());
+		return getModel(appGui.getSelectedTabIndex());
 	}
 
 	public static DataLayer getModel(int index) {
@@ -183,7 +41,7 @@
 	}
 
 	public static DrawingSurfaceImpl getDrawingSurface() {
-		return getDrawingSurface(appTab.getSelectedIndex());
+		return getDrawingSurface(appGui.getSelectedTabIndex());
 	}
 
 	public static DrawingSurfaceImpl getDrawingSurface(int index) {
@@ -193,175 +51,60 @@
 		}
 
 		TabContent tab = (tabs.get(index));
-		while (tab.drawingSurface() == null) {
-
-			try {
-				tab.setDrawingSurface(new DrawingSurfaceImpl(tab.getModel()));
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
+
+		//XXX: 2018-04-26//kyrke The following code should never be called, a TAB always has a driwingSurface,
+		// if not seems wired to just create it.
+		// Code left in place for history, in case we someday experience problems with this.
+		// If no problems have been observed for some time, please remove the code and comment.
+//		while (tab.drawingSurface() == null) {
+//
+//			try {
+//				tab.setDrawingSurface(new DrawingSurfaceImpl(tab.getModel(),
+//						tab));
+//			} catch (Exception e) {
+//				e.printStackTrace();
+//			}
+//		}
+
 		return tab.drawingSurface();
 	}
 
-	public static DrawingSurfaceImpl getView() {
-		return getDrawingSurface(appTab.getSelectedIndex());
-	}
-
-	public static File getFile() {
-		return getFile(appTab.getSelectedIndex());
-	}
-
-	public static void setFile(File modelfile, int fileNo) {
-		if (fileNo >= tabs.size()) {
-			return;
-		}
-
-		TabContent tab = (tabs.get(fileNo));
-		tab.setFile(modelfile);
-
-	}
 
 	public static int getFreeSpace(NetType netType) {
 		tabs.add(new TabContent(netType));
 		return tabs.size() - 1;
 	}
 
+	public static void addTab (TabContent tab ) {
+		tabs.add(tab);
+	}
+
 	public static void removeTab(int index) {
 		tabs.remove(index);
 	}
 
-	public static JTabbedPane getTab() {
-		return appTab;
-	}
-
 	public static TabContent getTab(int index) {
 		return tabs.get(index);
 	}
 
 	public static TabContent getCurrentTab() {
-		return tabs.get(appTab.getSelectedIndex());
-	}
-
-	public static Animator getAnimator() {
-		return animator;
+		return getTab(appGui.getSelectedTabIndex());
 	}
 
 	/**
-	 * returns the current dataLayer object - used to get a reference to pass to
-	 * the modules
+	 * @deprecated Use method getAnimator in GuiFrame
+	 * @return
 	 */
-	public static DataLayer currentPNMLData() {
-		if (appTab.getSelectedIndex() < 0) {
-			return null;
-		}
-
-		TabContent tab = (tabs.get(appTab.getSelectedIndex()));
-		return tab.getModel();
-	}
-
-	/** Creates a new animationHistory text area, and returns a reference to it */
-	public static void switchToAnimationComponents() {
-		TabContent tab = (tabs.get(appTab.getSelectedIndex()));
-		tab.switchToAnimationComponents(true);
-	}
-
-	public static void switchToEditorComponents() {
-		TabContent tab = (tabs.get(appTab.getSelectedIndex()));
-		tab.switchToEditorComponents();
-	}
-
-	public static AnimationHistoryComponent getAbstractAnimationPane() {
-		TabContent tab = (tabs.get(appTab.getSelectedIndex()));
-		return tab.getUntimedAnimationHistory();
-
-	}
-
-	public static void addAbstractAnimationPane() {
-		TabContent tab = (tabs.get(appTab.getSelectedIndex()));
-		tab.addAbstractAnimationPane();
-	}
-
-	public static AnimationController getAnimationController() {
-		TabContent tab = (tabs.get(appTab.getSelectedIndex()));
-		return tab.getAnimationController();
-
-	}
-	
-	
-	public static TransitionFireingComponent getTransitionFireingComponent() {
-		TabContent tab = (tabs.get(appTab.getSelectedIndex()));
-		return tab.getTransitionFireingComponent();
-
-	}	
-
-	public static void removeAbstractAnimationPane() {
-		TabContent tab = (tabs.get(appTab.getSelectedIndex()));
-		tab.removeAbstractAnimationPane();
-	}
-
-	// public static void addAnimationController() {
-	// TabContent tab = (tabs.get(appTab.getSelectedIndex()));
-	// //tab.addAnimationController();
-	// }
-
-	// public static void removeAnimationHistory() {
-	// TabContent tab = (tabs.get(appTab.getSelectedIndex()));
-	// tab.removeAnimationHistory();
-	// }
-	//	
-	// public static void removeAnimationController() {
-	// TabContent tab = (tabs.get(appTab.getSelectedIndex()));
-	// tab.removeAnimationController();
-	// }
-
-	public static AnimationHistoryComponent getAnimationHistory() {
-		TabContent tab = (tabs.get(appTab.getSelectedIndex()));
-		return tab.getAnimationHistory();
-	}
-
-	public static void updateConstantsList() {
-		TabContent tab = (tabs.get(appTab.getSelectedIndex()));
-		tab.updateConstantsList();
-	}
-
-	public static void undoGetFreeSpace() {
-		tabs.remove(tabs.size() - 1);
-	}
-
-	public static File getFile(int index) {
-		TabContent tab = tabs.get(index);
-		return tab.getFile();
-	}
-
-	public static void setUsingGTKFileBrowser(boolean useGTKFileBrowser) {
-		usingGTKFileBrowser = useGTKFileBrowser;
-	}
-	
-	public static boolean usingGTKFileBrowser() {
-		return usingGTKFileBrowser;
-	}
-	
-	public static void toggleShowZeroToInfinityIntervals() {
-		showZeroToInfinityIntervals = !showZeroToInfinityIntervals;
-	}
-	
-	public static boolean showZeroToInfinityIntervals() {
-		return showZeroToInfinityIntervals;
-	}
-
-	public static boolean showTokenAge(){
-		return showTokenAge;
-	}
-
-	public static void toggleShowTokenAge(){
-		showTokenAge = !showTokenAge;
-	}
-
-	public static void verifyQuery() {
-		TabContent tab = getCurrentTab();
-		if (tab.isQueryPossible()) {
-			getCurrentTab().verifySelectedQuery();
-		}
+	@Deprecated
+	public static Animator getAnimator() {
+		return appGui.getAnimator();
+	}
+	
+	//XXX Two Methodes to access same data (created after auto encapsulate)
+	public static GuiFrame getApp() { // returns a reference to the application
+		return getAppGui();
+	}
+	public static GuiFrame getAppGui() {
+		return appGui;
 	}
 }

=== modified file 'src/pipe/gui/DelayEnabledTransitionControl.java'
--- src/pipe/gui/DelayEnabledTransitionControl.java	2016-11-14 09:58:40 +0000
+++ src/pipe/gui/DelayEnabledTransitionControl.java	2018-07-04 11:38:47 +0000
@@ -33,10 +33,10 @@
 	private static BigDecimal defaultGranularity = new BigDecimal("0.1");
 	private static boolean defaultIsRandomTrasition;
 	
-	JLabel precitionLabel;
-	JSlider delayEnabledPrecision;
-	JLabel delayModeLabel;
-	JComboBox delayMode;
+	private JLabel precitionLabel;
+	private JSlider delayEnabledPrecision;
+	private JLabel delayModeLabel;
+	private JComboBox delayMode;
 	JCheckBox randomMode;
 	
 	private DelayEnabledTransitionControl() {
@@ -45,12 +45,12 @@
 		//0 corresponds to 0.00001, 5 corresponds to 1 (   thus x corresponds to 1/(10^(5−x))  )
 		delayEnabledPrecision = new JSlider(JSlider.HORIZONTAL, 0, 5, 4);
 		Hashtable<Integer, JLabel> labelTable = new Hashtable<Integer, JLabel>();
-		labelTable.put(new Integer(0), new JLabel("0.00001"));
-		labelTable.put(new Integer(1), new JLabel("0.0001"));
-		labelTable.put(new Integer(2), new JLabel("0.001"));
-		labelTable.put(new Integer(3), new JLabel("0.01"));
-		labelTable.put(new Integer(4), new JLabel("0.1"));
-		labelTable.put(new Integer(5), new JLabel("1"));
+		labelTable.put(0, new JLabel("0.00001"));
+		labelTable.put(1, new JLabel("0.0001"));
+		labelTable.put(2, new JLabel("0.001"));
+		labelTable.put(3, new JLabel("0.01"));
+		labelTable.put(4, new JLabel("0.1"));
+		labelTable.put(5, new JLabel("1"));
 		
 		delayEnabledPrecision.setLabelTable(labelTable);
 		delayEnabledPrecision.setSnapToTicks(true);

=== modified file 'src/pipe/gui/DrawingSurfaceImpl.java'
--- src/pipe/gui/DrawingSurfaceImpl.java	2018-04-21 11:58:41 +0000
+++ src/pipe/gui/DrawingSurfaceImpl.java	2018-07-04 11:38:47 +0000
@@ -32,7 +32,6 @@
 import pipe.gui.undo.AddTimedPlaceCommand;
 import pipe.gui.undo.AddTimedTransitionCommand;
 import pipe.gui.undo.UndoManager;
-import dk.aau.cs.gui.DrawingSurface;
 import dk.aau.cs.gui.NameGenerator;
 import dk.aau.cs.gui.TabContent;
 import dk.aau.cs.model.tapn.TimedArcPetriNet;
@@ -41,15 +40,14 @@
  * The petrinet is drawn onto this frame.
  */
 public class DrawingSurfaceImpl extends JLayeredPane implements Observer,
-Printable, DrawingSurface {
+Printable {
 	private static final long serialVersionUID = 4434596266503933386L;
 	private boolean netChanged = false;
 	private boolean animationmode = false;
 
 	public Arc createArc; // no longer static
-	public PlaceTransitionObject createPTO;
 	
-	protected static final int DRAWING_SURFACE_GROW = 100;
+	private static final int DRAWING_SURFACE_GROW = 100;
 
 	private AnimationHandler animationHandler = new AnimationHandler();
 
@@ -59,9 +57,6 @@
 	private GuiFrame app = CreateGui.getApp();
 	private Zoomer zoomControl;
 
-	// flag used in fast mode to know if a new PetriNetObject has been created
-	public boolean newPNO = false;
-
 	// flag used in paintComponents() to know if a call to zoom() has been done
 	private boolean doSetViewPosition = true;
 
@@ -87,7 +82,7 @@
 		mouseHandler = new MouseHandler(this, dataLayer);
 		addMouseListener(mouseHandler);
 		addMouseMotionListener(mouseHandler);
-		//addMouseWheelListener(mouseHandler);
+		addMouseWheelListener(mouseHandler);
 
 		selection = new SelectionManager(this);
 		undoManager = new UndoManager(this, guiModel, app);
@@ -129,9 +124,9 @@
 			add(pnObject);
 		}
 
-		if(CreateGui.getApp().getMode() == ElementType.SELECT)
+		if(CreateGui.getApp().getMode() == ElementType.SELECT) {
 			this.selection.enableSelection();
-
+		}
 
 	}
 
@@ -229,7 +224,7 @@
 
 	public void update(Observable o, Object diffObj) {
 		if ((diffObj instanceof PetriNetObject) && (diffObj != null)) {
-			if (CreateGui.appGui.getMode() == ElementType.CREATING) {
+			if (CreateGui.getAppGui().getMode() == ElementType.CREATING) {
 
 				addNewPetriNetObject((PetriNetObject) diffObj);
 			}
@@ -321,16 +316,6 @@
 		}
 	}
 
-	public void setCursorType(String type) {
-		if (type.equals("arrow")) {
-			setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
-		} else if (type.equals("crosshair")) {
-			setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
-		} else if (type.equals("move")) {
-			setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
-		}
-	}
-
 	public SelectionManager getSelectionObject() {
 		return selection;
 	}
@@ -355,7 +340,7 @@
 		}
 	}
 
-	public void calculateNewBoundsForScrollPane(Rectangle rect) {
+	private void calculateNewBoundsForScrollPane(Rectangle rect) {
 		boolean changed = false;
 		Dimension current = getPreferredSize();
 		
@@ -457,6 +442,13 @@
 		return (new java.awt.Point((int) midpointX, (int) midpointY));
 	}
 
+	void zoomToMidPoint() {
+
+		Point midpoint = midpoint(zoomControl.getPercent());
+		zoomTo(midpoint);
+
+	}
+
 	public void zoomIn() {
 		int zoom = zoomControl.getPercent();
 		if (zoomControl.zoomIn()) {
@@ -612,7 +604,7 @@
 					getUndoManager().addNewEdit(
 							new AddPetriNetObjectEdit(pto, view, guiModel));
 					if (e.isControlDown()) {
-						app.setFastMode(ElementType.FAST_TRANSITION);
+						app.setMode(ElementType.FAST_TRANSITION);
 						pnObject.dispatchEvent(e);
 					}
 					break;
@@ -629,7 +621,7 @@
 						app.setMode(ElementType.TAPNARC);
 						getPlaceTransitionObjectHandlerOf(pto2).mousePressed(e);
 						getPlaceTransitionObjectHandlerOf(pto2).mouseReleased(e);
-						app.setFastMode(ElementType.FAST_TRANSITION);
+						app.setMode(ElementType.FAST_TRANSITION);
 						// enter fast mode
 						pnObject.dispatchEvent(e);
 					}
@@ -637,12 +629,12 @@
 
 				case IMMTRANS:
 				case TIMEDTRANS:
-					boolean timed = (mode == ElementType.TIMEDTRANS ? true : false);
+					boolean timed = (mode == ElementType.TIMEDTRANS);
 					pto = newTransition(e.getPoint(), timed);
 					getUndoManager().addNewEdit(
 							new AddPetriNetObjectEdit(pto, view, guiModel));
 					if (e.isControlDown()) {
-						app.setFastMode(ElementType.FAST_PLACE);
+						app.setMode(ElementType.FAST_PLACE);
 						pnObject.dispatchEvent(e);
 					}
 					break;
@@ -659,7 +651,7 @@
 						getPlaceTransitionObjectHandlerOf(pto).mousePressed(e);
 						getPlaceTransitionObjectHandlerOf(pto).mouseReleased(e);
 						// enter fast mode
-						app.setFastMode(ElementType.FAST_PLACE);
+						app.setMode(ElementType.FAST_PLACE);
 						pnObject.dispatchEvent(e);
 					}
 					break;
@@ -714,7 +706,7 @@
 						getPlaceTransitionObjectHandlerOf(pto).mousePressed(e);
 						getPlaceTransitionObjectHandlerOf(pto).mouseReleased(e);
 						// enter fast mode
-						app.setFastMode(ElementType.FAST_PLACE);
+						app.setMode(ElementType.FAST_PLACE);
 					} else{
 						app.endFastMode();
 					}
@@ -733,7 +725,7 @@
 						getPlaceTransitionObjectHandlerOf(pto3).mousePressed(e);
 						getPlaceTransitionObjectHandlerOf(pto3).mouseReleased(e);
 						// enter fast mode
-						app.setFastMode(ElementType.FAST_TRANSITION);
+						app.setMode(ElementType.FAST_TRANSITION);
 					} else{
 						app.endFastMode();
 					}
@@ -789,14 +781,15 @@
 
 		@Override
 		public void mouseWheelMoved(MouseWheelEvent e) {
-			if (!e.isControlDown()) {
-				return;
-			} else {
+			if (e.isControlDown()) {
 				if (e.getWheelRotation() > 0) {
 					view.zoomIn();
 				} else {
 					view.zoomOut();
 				}
+			} else {
+				//Dispatch Event to scroll pane to allow scrolling up/down. -- kyrke
+				getParent().dispatchEvent(e);
 			}
 		}
 	}

=== modified file 'src/pipe/gui/Export.java'
--- src/pipe/gui/Export.java	2018-05-11 16:23:59 +0000
+++ src/pipe/gui/Export.java	2018-07-04 11:38:47 +0000
@@ -29,7 +29,6 @@
 import javax.print.SimpleDoc;
 import javax.print.StreamPrintServiceFactory;
 import javax.print.attribute.HashPrintRequestAttributeSet;
-import javax.swing.JComponent;
 import javax.swing.JOptionPane;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerConfigurationException;
@@ -52,7 +51,7 @@
 import pipe.dataLayer.TAPNQuery;
 import pipe.gui.GuiFrame.GUIMode;
 import pipe.gui.graphicElements.PetriNetObject;
-import pipe.gui.widgets.FileBrowser;
+import pipe.gui.widgets.filebrowser.FileBrowser;
 
 /**
  * Class for exporting things to other formats, as well as printing.
@@ -182,8 +181,8 @@
 		}
 
 		String filename = null;
-		if (CreateGui.getFile() != null) {
-			filename = CreateGui.getFile().getAbsolutePath();
+		if (CreateGui.getCurrentTab().getFile() != null) {
+			filename = CreateGui.getCurrentTab().getFile().getAbsolutePath();
 			// change file extension
 			int dotpos = filename.lastIndexOf('.');
 			if (dotpos > filename.lastIndexOf(System.getProperty("file.separator"))) {
@@ -217,13 +216,13 @@
 		try {
 			switch (format) {
 			case PNG:
-				filename = new FileBrowser("PNG image", "png", filename).saveFile();
+				filename = FileBrowser.constructor("PNG image", "png", filename).saveFile();
 				if (filename != null) {
 					toPNG(g, filename);
 				}
 				break;
 			case POSTSCRIPT:
-				filename = new FileBrowser("PostScript file", "ps", filename)
+				filename = FileBrowser.constructor("PostScript file", "ps", filename)
 				.saveFile();
 				if (filename != null) {
 					toPostScript(g, filename);
@@ -249,21 +248,21 @@
 				if (figureOptions == possibilities[1])
 					tikZOption = TikZExporter.TikZOutputOption.FULL_LATEX;
 
-				filename = new FileBrowser("TikZ figure", "tex", filename).saveFile();
+				filename = FileBrowser.constructor("TikZ figure", "tex", filename).saveFile();
 				if (filename != null) {
 					TikZExporter output = new TikZExporter(model, filename, tikZOption);
 					output.ExportToTikZ();
 				}
 				break;
 			case PNML:
-				filename = new FileBrowser("PNML file", "pnml", filename)
+				filename = FileBrowser.constructor("PNML file", "pnml", filename)
 				.saveFile();
 				if (filename != null) {
 					toPnml(g, filename);
 				}
 				break;
 			case QUERY:
-				filename = new FileBrowser("Query XML file", "xml", filename).saveFile(CreateGui.appGui.getCurrentTabName().replaceAll(".xml", "-queries"));
+				filename = FileBrowser.constructor("Query XML file", "xml", filename).saveFile(CreateGui.getAppGui().getCurrentTabName().replaceAll(".xml", "-queries"));
 				if (filename != null) {
 					toQueryXML(filename);
 				}

=== modified file 'src/pipe/gui/ExportBatchDialog.java'
--- src/pipe/gui/ExportBatchDialog.java	2018-05-07 14:49:44 +0000
+++ src/pipe/gui/ExportBatchDialog.java	2018-07-04 11:38:47 +0000
@@ -50,17 +50,14 @@
 import javax.xml.transform.TransformerException;
 import org.w3c.dom.DOMException;
 import dk.aau.cs.gui.FileNameCellRenderer;
-import dk.aau.cs.gui.components.BatchProcessingResultsTableModel;
 import dk.aau.cs.gui.components.ExportBatchResultTableModel;
 import dk.aau.cs.io.LoadedModel;
 import dk.aau.cs.io.ModelLoader;
 import dk.aau.cs.io.PNMLWriter;
 import dk.aau.cs.model.tapn.TimedArcPetriNet;
 import dk.aau.cs.util.StringComparator;
-import dk.aau.cs.verification.batchProcessing.BatchProcessingVerificationResult;
 import pipe.dataLayer.DataLayer;
-import pipe.dataLayer.TAPNQuery;
-import pipe.gui.widgets.FileBrowser;
+import pipe.gui.widgets.filebrowser.FileBrowser;
 
 public class ExportBatchDialog extends JDialog {
 
@@ -416,7 +413,7 @@
 	}
 
 	private void addFiles() {
-		FileBrowser browser = new FileBrowser("Timed-Arc Petri Nets",".xml", lastSelectPath);
+		FileBrowser browser = FileBrowser.constructor("Timed-Arc Petri Nets", "xml", lastSelectPath);
 		
 		File[] filesArray = browser.openFiles();
 		if (filesArray.length>0) {
@@ -466,7 +463,7 @@
 	}
 	
 	private void selectDestinationPath() {
-		String chosenFile = new FileBrowser("Select an export folder", ".", lastExportPath).saveFile("Export");
+		String chosenFile = FileBrowser.constructor("Select an export folder", ".", lastExportPath).saveFile("Export");
 		if(chosenFile != null) {
 			destinationFile = new File(chosenFile);
 			lastExportPath = chosenFile;

=== removed file 'src/pipe/gui/ExtensionFilter.java'
--- src/pipe/gui/ExtensionFilter.java	2011-02-03 19:03:15 +0000
+++ src/pipe/gui/ExtensionFilter.java	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/*
- * Created on 16-Feb-2004
- */
-package pipe.gui;
-
-import java.io.File;
-
-import javax.swing.filechooser.FileFilter;
-
-public class ExtensionFilter extends FileFilter {
-
-	protected String myExtensionString; // The extension we will accept
-	protected String myExtensionDesc; // A description of its meaning
-
-	public ExtensionFilter(String ext, String desc) {
-		myExtensionString = ext.toLowerCase();
-		myExtensionDesc = desc;
-	}
-
-	@Override
-	public boolean accept(File f) {
-		return f.isDirectory()
-				|| f.getName().toLowerCase().endsWith(myExtensionString);
-	} // Don't want directories, especially ones which end with the desired
-		// extension!
-
-	@Override
-	public String getDescription() {
-		return myExtensionDesc;
-	}
-
-}

=== modified file 'src/pipe/gui/FileFinder.java'
--- src/pipe/gui/FileFinder.java	2013-03-22 19:37:07 +0000
+++ src/pipe/gui/FileFinder.java	2018-07-04 11:38:47 +0000
@@ -1,7 +1,16 @@
 package pipe.gui;
 
+import pipe.gui.widgets.filebrowser.FileBrowser;
+
 import java.io.File;
 
-public interface FileFinder {
-	File ShowFileBrowserDialog(String description, String extension, String path);
+
+public class FileFinder {
+
+	public File ShowFileBrowserDialog(String description, String extension, String path) {
+		if (path==null || path=="") { path= System.getProperty("user.home"); }
+		FileBrowser fileBrowser = FileBrowser.constructor(description, extension, path);
+		return fileBrowser.openFile();
+	}
+
 }

=== removed file 'src/pipe/gui/FileFinderImpl.java'
--- src/pipe/gui/FileFinderImpl.java	2013-03-22 19:37:07 +0000
+++ src/pipe/gui/FileFinderImpl.java	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-package pipe.gui;
-
-import java.io.File;
-
-import pipe.gui.widgets.FileBrowser;
-
-public class FileFinderImpl implements FileFinder {
-
-	public File ShowFileBrowserDialog(String description, String extension, String path) {
-		if (path==null || path=="") { path= System.getProperty("user.home"); }
-		FileBrowser fileBrowser = new FileBrowser(description, extension, path);
-		return fileBrowser.openFile();
-	}
-
-}

=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2018-05-11 13:19:26 +0000
+++ src/pipe/gui/GuiFrame.java	2018-07-04 11:38:47 +0000
@@ -17,38 +17,14 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import javax.imageio.ImageIO;
-import javax.swing.Action;
-import javax.swing.BoxLayout;
-import javax.swing.DefaultListModel;
-import javax.swing.ImageIcon;
-import javax.swing.JCheckBox;
-import javax.swing.JCheckBoxMenuItem;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JList;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTabbedPane;
-import javax.swing.JToggleButton;
-import javax.swing.JToolBar;
-import javax.swing.JViewport;
-import javax.swing.KeyStroke;
-import javax.swing.ToolTipManager;
-import javax.swing.UIDefaults;
-import javax.swing.UIManager;
-import javax.swing.UIManager.LookAndFeelInfo;
-import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
 import com.apple.eawt.Application;
 import dk.aau.cs.gui.TabTransformer;
 import dk.aau.cs.model.tapn.*;
+import dk.aau.cs.verification.VerifyTAPN.VerifyPN;
 import net.tapaal.Preferences;
 import com.sun.jna.Platform;
 
@@ -71,10 +47,9 @@
 import pipe.gui.undo.ChangeSpacingEdit;
 import pipe.gui.widgets.EngineDialogPanel;
 import pipe.gui.widgets.EscapableDialog;
-import pipe.gui.widgets.FileBrowser;
+import pipe.gui.widgets.filebrowser.FileBrowser;
 import pipe.gui.widgets.NewTAPNPanel;
 import pipe.gui.widgets.QueryDialog;
-import pipe.gui.widgets.QueryPane;
 import pipe.gui.widgets.WorkflowDialog;
 import dk.aau.cs.debug.Logger;
 import dk.aau.cs.gui.BatchProcessingDialog;
@@ -101,39 +76,70 @@
 
 	private static final long serialVersionUID = 7509589834941127217L;
 	// for zoom combobox and dropdown
-	private final String[] zoomExamples = { "40%", "60%", "80%", "100%",
-			"120%", "140%", "160%", "180%", "200%", "300%" };
-	private String frameTitle; // Frame title
-	private GuiFrame appGui;
+	private final int[] zoomExamples = { 40, 60, 80, 100,
+			120, 140, 160, 180, 200, 300 };
+	
+	private String frameTitle;
 	private DrawingSurfaceImpl appView;
-	private Pipe.ElementType mode, prev_mode, old_mode; // *** mode WAS STATIC ***
+
+	public Animator getAnimator() {
+		return animator;
+	}
+
+	private Animator animator;
+	private Pipe.ElementType mode, prev_mode;
+	private GUIMode guiMode = GUIMode.noNet;
+
 	private int newNameCounter = 1;
+
 	private JTabbedPane appTab;
+
 	private StatusBar statusBar;
 	private JMenuBar menuBar;
 	private JToolBar drawingToolBar;
-	private JComboBox zoomComboBox;
-
-	private FileAction createAction, openAction, closeAction, saveAction,
-	saveAsAction, exitAction, printAction, importPNMLAction, importSUMOAction,
-        importXMLAction, exportPNGAction, exportPSAction, exportToTikZAction,
-        exportToPNMLAction, exportToXMLAction, exportTraceAction, importTraceAction, 
-        exportBatchAction;
-
-	private VerificationAction runUppaalVerification;
-
-	private EditAction /* copyAction, cutAction, pasteAction, */undoAction, redoAction;
-	private GridAction toggleGrid;
-	private ToolAction netStatisticsAction, batchProcessingAction, engineSelectionAction, verifyAction, workflowDialogAction, stripTimeDialogAction;
-	private ZoomAction zoomOutAction, zoomInAction;
-	private SpacingAction incSpacingAction, decSpacingAction;
-	private DeleteAction deleteAction;
-	private SelectAllAction selectAllAction;
-	private TypeAction annotationAction, arcAction, inhibarcAction,
-	placeAction, transAction, timedtransAction, tokenAction,
-	selectAction, deleteTokenAction, timedPlaceAction;
-	private ViewAction showTokenAgeAction, showComponentsAction, showQueriesAction, showConstantsAction,showZeroToInfinityIntervalsAction,showEnabledTransitionsAction, showDelayEnabledTransitionsAction,showToolTipsAction,showAdvancedWorkspaceAction,showSimpleWorkspaceAction,saveWorkSpaceAction;
-	private HelpAction showAboutAction, showHomepage, showAskQuestionAction, showReportBugAction, showFAQAction, checkUpdate;
+	private JComboBox<String> zoomComboBox;
+
+	private GuiAction createAction;
+	private GuiAction openAction;
+	private GuiAction closeAction;
+	private GuiAction saveAction;
+	private GuiAction saveAsAction;
+	private GuiAction exitAction;
+	private GuiAction printAction;
+	private GuiAction importPNMLAction;
+	private GuiAction importSUMOAction;
+	private GuiAction importXMLAction;
+	private GuiAction exportPNGAction;
+	private GuiAction exportPSAction;
+	private GuiAction exportToTikZAction;
+	private GuiAction exportToPNMLAction;
+	private GuiAction exportToXMLAction;
+	private GuiAction exportTraceAction;
+	private GuiAction importTraceAction;
+	private GuiAction exportBatchAction;
+
+	private GuiAction /* copyAction, cutAction, pasteAction, */undoAction, redoAction;
+	private GuiAction toggleGrid;
+	private GuiAction netStatisticsAction;
+	private GuiAction batchProcessingAction;
+	private GuiAction engineSelectionAction;
+	private GuiAction verifyAction;
+	private GuiAction workflowDialogAction;
+	private GuiAction stripTimeDialogAction;
+	private GuiAction zoomOutAction;
+	private GuiAction zoomInAction;
+
+	private GuiAction incSpacingAction;
+	private GuiAction decSpacingAction;
+	public GuiAction deleteAction;
+
+	private TypeAction annotationAction;
+	private TypeAction inhibarcAction;
+	private TypeAction transAction;
+	private TypeAction tokenAction;
+	private TypeAction selectAction;
+	private TypeAction deleteTokenAction;
+	private TypeAction timedPlaceAction;
 
 	private JMenuItem statistics;
 	private JMenuItem verification;
@@ -141,25 +147,40 @@
 	private TypeAction timedArcAction;
 	private TypeAction transportArcAction;
 
-
-	public AnimateAction startAction, stepforwardAction, stepbackwardAction,
-	randomAction, randomAnimateAction, timeAction, delayFireAction, prevcomponentAction, nextcomponentAction;
-
-	public boolean dragging = false;
-
-	private boolean editionAllowed = true;
+	private GuiAction showTokenAgeAction;
+	private GuiAction showComponentsAction;
+	private GuiAction showQueriesAction;
+	private GuiAction showConstantsAction;
+	private GuiAction showZeroToInfinityIntervalsAction;
+	private GuiAction showEnabledTransitionsAction;
+	private GuiAction showDelayEnabledTransitionsAction;
+	private GuiAction showToolTipsAction;
+	private GuiAction showAdvancedWorkspaceAction;
+	private GuiAction showSimpleWorkspaceAction;
+	private GuiAction saveWorkSpaceAction;
+	private GuiAction showAboutAction;
+	private GuiAction showHomepage;
+	private GuiAction showAskQuestionAction;
+	private GuiAction showReportBugAction;
+	private GuiAction showFAQAction;
+	private GuiAction checkUpdate;
+
+
+	private GuiAction selectAllAction;
+
+	public GuiAction startAction;
+	public GuiAction stepforwardAction;
+	public GuiAction stepbackwardAction;
+	private GuiAction timeAction;
+	private GuiAction delayFireAction;
+	private GuiAction prevcomponentAction;
+	private GuiAction nextcomponentAction;
 
 	public enum GUIMode {
 		draw, animation, noNet
 	}
 
 	private JCheckBoxMenuItem showZeroToInfinityIntervalsCheckBox;
-	private JCheckBoxMenuItem showComponentsCheckBox;
-	private JCheckBoxMenuItem showQueriesCheckBox;
-	private JCheckBoxMenuItem showEnabledTransitionsCheckBox;
-	private JCheckBoxMenuItem showDelayEnabledTransitionsCheckBox;
-	private JCheckBoxMenuItem showConstantsCheckBox;
-	private JCheckBoxMenuItem showToolTipsCheckBox;
 	private JCheckBoxMenuItem showTokenAgeCheckBox;
 
 	private boolean showComponents = true;
@@ -168,49 +189,101 @@
 	private boolean showEnabledTransitions = true;
 	private boolean showDelayEnabledTransitions = true;
 	private boolean showToolTips = true;
-
-	private GUIMode guiMode = GUIMode.noNet;
+	private boolean showZeroToInfinityIntervals = true;
+	private boolean showTokenAge = true;
+
+
 	private JMenu importMenu, exportMenu, zoomMenu;
 
-
-	public boolean isMac(){
-		return Platform.isMac();
-	}
-
-	public int getJRE(){
-		String version = System.getProperty("java.version");
-		String[] versionSplit = version.split("\\.");
-
-		try {
-			if (Integer.parseInt(versionSplit[0]) >= 9) {
-				//Version format (9.X.Y)
-				return Integer.parseInt(versionSplit[0]);
-			} else {
-				//Before java 9 version in format (1.X.Y)
-				return Integer.parseInt(versionSplit[1]);
-			}
-		} catch (NumberFormatException e) {
-			Logger.log("Error parsing java version, failing silent (0): " + e.getMessage());
-			return 0; // Unknown version
-		}
-	}	
-
 	public GuiFrame(String title) {
 		// HAK-arrange for frameTitle to be initialized and the default file
 		// name to be appended to basic window title
 
 		frameTitle = title;
 		setTitle(null);
+		trySetLookAndFeel();
+
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		this.setSize(screenSize.width * 80 / 100, screenSize.height * 80 / 100);
+		this.setLocationRelativeTo(null);
+		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 JTabbedPane();
+		getContentPane().add(appTab);
+		setChangeListenerOnTab(); // sets Tab properties
+
+
+		animator = new Animator();
+		Grid.enableGrid();
+
+		loadPrefrences();
+
+		buildMenus();
+
+		// Status bar...
+		statusBar = new StatusBar();
+		getContentPane().add(statusBar, BorderLayout.PAGE_END);
+
+		// Build menus
+		buildToolbar();
+
+		addWindowListener(new WindowAdapter() {
+			// Handler for window closing event
+			public void windowClosing(WindowEvent e) {
+				exitAction.actionPerformed(null);
+			}
+		});
+
+		this.setForeground(java.awt.Color.BLACK);
+
+		// Set GUI mode
+		setGUIMode(GUIMode.noNet);
+
+		//XXX 2018-05-23 kyrke: Moved from CreatGUI (static), needs further refactoring to seperate conserns
+		Verifyta.trySetup();
+		VerifyTAPN.trySetup();
+		VerifyTAPNDiscreteVerification.trySetup();
+		VerifyPN.trySetup();
+
+	}
+
+	private void trySetLookAndFeel() {
 		try {
 			// Set the Look and Feel native for the system.
-			setLookAndFeel();
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+
+			//XXX Bug made us select non-native L&F for Windows, bug seems to be no longer present.
+//			if(UIManager.getLookAndFeel().getName().equals("Windows")){
+//				for (LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
+//					if ("Nimbus".equals(info.getName())) {
+//						UIManager.setLookAndFeel(info.getClassName());
+//						UIManager.getLookAndFeelDefaults().put("List[Selected].textBackground", new Color(57, 105, 138));
+//						UIManager.getLookAndFeelDefaults().put("List[Selected].textForeground", new Color(255,255,255));
+//						UIManager.getLookAndFeelDefaults().put("List.background", new Color(255,255,255));
+//
+//						break;
+//					}
+//				}
+//			}
+
+			// Set enter to select focus button rather than default (makes ENTER selection key on all LAFs)
+			UIManager.put("Button.focusInputMap", new UIDefaults.LazyInputMap(new Object[]
+					{
+					"SPACE", "pressed",
+					"released SPACE", "released",
+					"ENTER", "pressed",
+					"released ENTER", "released"
+					}));
 			UIManager.put("OptionPane.informationIcon", ResourceManager.infoIcon());
                         UIManager.put("Slider.paintValue", false);
 
 			// 2010-05-07, Kenneth Yrke Joergensen:
 			// If the native look and feel is GTK replace the useless open
-			// dialog,
-			// with a java-reimplementation.
+			// dialog, with a java-reimplementation.
 
 			if ("GTK look and feel".equals(UIManager.getLookAndFeel().getName())){
 				try {
@@ -218,18 +291,17 @@
 					Class.forName("com.google.code.gtkjfilechooser.ui.GtkFileChooserUI", false, this.getClass().getClassLoader());
 					UIManager.put("FileChooserUI", "com.google.code.gtkjfilechooser.ui.GtkFileChooserUI");
 				} catch (ClassNotFoundException exc){
-					System.err.println("Error loading GtkFileChooserUI Look and Feel, using default jvm GTK look and feel instead");
-					CreateGui.setUsingGTKFileBrowser(false);
+					Logger.log("Error loading GtkFileChooserUI Look and Feel, using default jvm GTK look and feel instead");
 				}
 
 			}
 
 
 		} catch (Exception exc) {
-			System.err.println("Error loading L&F: " + exc);
+			Logger.log("Error loading L&F: " + exc);
 		}
 
-		if (isMac()){ 
+		if (Platform.isMac()){
 
 			try{
 				new SpecialMacHandler();
@@ -263,31 +335,6 @@
 		}
 
 		this.setIconImage(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource(CreateGui.imgPath + "icon.png")).getImage());
-
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		this.setSize(screenSize.width * 80 / 100, screenSize.height * 80 / 100);
-		this.setLocationRelativeTo(null);
-		this.setMinimumSize(new Dimension(825, 480));
-
-		setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-
-		loadPrefrences();
-
-		buildMenus();
-
-		// Status bar...
-		statusBar = new StatusBar();
-		getContentPane().add(statusBar, BorderLayout.PAGE_END);
-
-		// Build menus
-		buildToolbar();
-
-		addWindowListener(new WindowHandler());
-
-		this.setForeground(java.awt.Color.BLACK);
-
-		// Set GUI mode
-		setGUIMode(GUIMode.noNet);
 	}
 
 	private void loadPrefrences() {
@@ -308,12 +355,12 @@
 
 		showToolTips = prefs.getShowToolTips();
 
-		if(CreateGui.showZeroToInfinityIntervals() != prefs.getShowZeroInfIntervals()){
-			CreateGui.toggleShowZeroToInfinityIntervals();
+		if(showZeroToInfinityIntervals() != prefs.getShowZeroInfIntervals()){
+			toggleShowZeroToInfinityIntervals();
 		}
 
-		if(CreateGui.showTokenAge() != prefs.getShowTokenAge()){
-			CreateGui.toggleShowTokenAge();
+		if(showTokenAge() != prefs.getShowTokenAge()){
+			toggleShowTokenAge();
 		}
 
 		Dimension dimension = prefs.getWindowSize();
@@ -323,287 +370,246 @@
 
 	}
 
-	private void setLookAndFeel() throws ClassNotFoundException, InstantiationException, IllegalAccessException, UnsupportedLookAndFeelException{
-		UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		if(UIManager.getLookAndFeel().getName().equals("Windows")){
-			for (LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
-				if ("Nimbus".equals(info.getName())) {
-					UIManager.setLookAndFeel(info.getClassName());
-					UIManager.getLookAndFeelDefaults().put("List[Selected].textBackground", new Color(57, 105, 138));
-					UIManager.getLookAndFeelDefaults().put("List[Selected].textForeground", new Color(255,255,255));
-					UIManager.getLookAndFeelDefaults().put("List.background", new Color(255,255,255));
-									
-					break;
-				}
+	//XXX 2018-05-23 kyrke, moved from CreateGui, static method
+	//Needs further refactoring to seperate conserns
+	public void checkForUpdate(boolean forcecheck) {
+		final VersionChecker versionChecker = new VersionChecker();
+		if (versionChecker.checkForNewVersion(forcecheck))  {
+			StringBuffer message = new StringBuffer("There is a new version of TAPAAL available at www.tapaal.net.");
+			message.append("\n\nCurrent version: ");
+			message.append(TAPAAL.VERSION);
+			message.append("\nNew version: ");
+			message.append(versionChecker.getNewVersionNumber());
+			String changelog = versionChecker.getChangelog();
+			if (!changelog.equals("")){
+				message.append('\n');
+				message.append('\n');
+				message.append("Changelog:");
+				message.append('\n');
+				message.append(changelog);
 			}
+			JOptionPane optionPane = new JOptionPane();
+			optionPane.setMessage(message.toString());
+			optionPane.setMessageType(JOptionPane.INFORMATION_MESSAGE);
+			JButton updateButton, laterButton, ignoreButton;
+			updateButton = new JButton("Update now");
+			updateButton.setMnemonic(KeyEvent.VK_C);
+			optionPane.add(updateButton);
+			laterButton = new JButton("Update later");
+			laterButton.setMnemonic(KeyEvent.VK_C);
+			optionPane.add(laterButton);
+			ignoreButton = new JButton("Ignore this update");
+			laterButton.setMnemonic(KeyEvent.VK_C);
+			optionPane.add(ignoreButton);
+
+			optionPane.setOptions(new Object[] {updateButton, laterButton, ignoreButton});
+
+
+			final JDialog dialog = optionPane.createDialog(null, "New Version of TAPAAL");
+			laterButton.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					Preferences.getInstance().setLatestVersion(null);
+					dialog.setVisible(false);
+					dialog.dispose ();
+				}
+			});
+			updateButton.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					Preferences.getInstance().setLatestVersion(null);
+					dialog.setVisible(false);
+					dialog.dispose();
+					pipe.gui.GuiFrame.showInBrowser("http://www.tapaal.net/download");
+				}
+			});
+			ignoreButton.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					Preferences.getInstance().setLatestVersion(versionChecker.getNewVersionNumber());
+					dialog.setVisible(false);
+					dialog.dispose ();
+				}
+			});
+
+			updateButton.requestFocusInWindow();
+			dialog.getRootPane().setDefaultButton(updateButton);
+			dialog.setVisible(true);
 		}
-
-		// Set enter to select focus button rather than default (makes ENTER selection key on all LAFs)
-		UIManager.put("Button.focusInputMap", new UIDefaults.LazyInputMap(new Object[]
-				{
-				"SPACE", "pressed",
-				"released SPACE", "released",
-				"ENTER", "pressed",
-				"released ENTER", "released"
-				}));
 	}
 
 	/**
-	 * This method does build the menus
-	 * 
-	 * @author Dave Patterson - fixed problem on OSX due to invalid character in
-	 *         URI caused by unescaped blank. The code changes one blank
-	 *         character if it exists in the string version of the URL. This way
-	 *         works safely in both OSX and Windows. I also added a
-	 *         printStackTrace if there is an exception caught in the setup for
-	 *         the "Example nets" folder.
-	 * @author Kenneth Yrke Joergensen <[e-mail]>, 2011-06-28
-	 * 	       Code cleanup, removed unused parts, Refactored help menu, Fixed 
-	 *         loading of Example Nets to work if we create a Jar. 
+	 * Build the menues and actions
 	 **/
 	private void buildMenus() {
 		menuBar = new JMenuBar();
 
-		JMenu fileMenu = new JMenu("File");
-		fileMenu.setMnemonic('F');
-
 		int shortcutkey = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
 
-		addMenuItem(fileMenu, createAction = new FileAction("New",
-				"Create a new Petri net", "ctrl N"));
-		createAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('N', shortcutkey));
-
-		addMenuItem(fileMenu, openAction = new FileAction("Open", "Open",
-				"ctrl O"));
-		openAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('O', shortcutkey));
-
-		addMenuItem(fileMenu, closeAction = new FileAction("Close",
-				"Close the current tab", "ctrl W"));
-		closeAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('W', shortcutkey));
-		fileMenu.addSeparator();
-
-		addMenuItem(fileMenu, saveAction = new FileAction("Save", "Save",
-				"ctrl S"));
-		saveAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('S', shortcutkey));
-		addMenuItem(fileMenu, saveAsAction = new FileAction("Save as",
-				"Save as...", null));
-		saveAsAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('S', (shortcutkey + InputEvent.SHIFT_MASK)));
-
-
-		// Import menu
-		importMenu = new JMenu("Import");
-
-		importMenu.setIcon(new ImageIcon(Thread.currentThread()
-				.getContextClassLoader().getResource(
-						CreateGui.imgPath + "Export.png")));
-		addMenuItem(importMenu, importPNMLAction = new FileAction("PNML untimed net",
-				"Import an untimed net in the PNML format", "ctrl X"));
-		importPNMLAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('X', shortcutkey));
-
-		addMenuItem(importMenu, importSUMOAction = new FileAction("SUMO queries (.txt)", 
-				"Import SUMO queries in a plain text format",""));
-		//importSUMOAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('R', shortcutkey));
-
-		addMenuItem(importMenu, importXMLAction = new FileAction("XML queries (.xml)", 
-				"Import MCC queries in XML format", "ctrl R"));
-		importXMLAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('R', shortcutkey));
-
-		fileMenu.add(importMenu);
-
-		// Export menu
-		exportMenu = new JMenu("Export");
-
-		exportMenu.setIcon(new ImageIcon(Thread.currentThread()
-				.getContextClassLoader().getResource(
-						CreateGui.imgPath + "Export.png")));
-		addMenuItem(exportMenu, exportPNGAction = new FileAction("PNG",
-				"Export the net to PNG format", "ctrl G"));
-		exportPNGAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('G', shortcutkey));
-		addMenuItem(exportMenu, exportPSAction = new FileAction("PostScript",
-				"Export the net to PostScript format", "ctrl T"));
-		exportPSAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('T', shortcutkey));
-		addMenuItem(exportMenu, exportToTikZAction = new FileAction("TikZ",
-				"Export the net to LaTex (TikZ) format", "ctrl L"));
-		exportToTikZAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('L', shortcutkey));
-		addMenuItem(exportMenu, exportToPNMLAction = new FileAction("PNML",
-				"Export the net to PNML format", "ctrl D"));
-		exportToPNMLAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('D', shortcutkey));
-		addMenuItem(exportMenu, exportToXMLAction = new FileAction("XML Queries",
-				"Export the queries to XML format", "ctrl H"));
-		exportToXMLAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('H', shortcutkey));
-		addMenuItem(exportMenu, exportBatchAction = new FileAction("Batch Export to PNML and XML Queries", "Export multiple nets into PNML together with the XML queries, while removing the timing information", "ctrl K"));
-		exportBatchAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('K', shortcutkey));
-		
-		fileMenu.add(exportMenu);
-
-		fileMenu.addSeparator();
-		addMenuItem(fileMenu, printAction = new FileAction("Print", "Print",
-				"ctrl P"));
-		printAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('P', shortcutkey));
-		fileMenu.addSeparator();
-
-		// Example files menu
-		try {
-
-			/**
-			 * The next block loads the example nets as InputStream from the resources 
-			 * Notice the check for if we are inside a jar file, as files inside a jar cant
-			 * be listed in the normal way.
-			 * 
-			 *  @author Kenneth Yrke Joergensen <[e-mail]>, 2011-06-27
-			 */
-
-			String[] nets = null;
-
-			URL dirURL = Thread.currentThread().getContextClassLoader().getResource("resources/Example nets/");
-			if (dirURL != null && dirURL.getProtocol().equals("file")) {
-				/* A file path: easy enough */
-				nets = new File(dirURL.toURI()).list();
-			} 
-
-			if (dirURL == null) {
-				/* 
-				 * In case of a jar file, we can't actually find a directory.
-				 * Have to assume the same jar as clazz.
-				 */
-				String me = this.getName().replace(".", "/")+".class";
-				dirURL = Thread.currentThread().getContextClassLoader().getResource(me);
-			}
-
-			if (dirURL.getProtocol().equals("jar")) {
-				/* 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"));
-				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()) {
-					String name = entries.nextElement().getName();
-					if (name.startsWith("resources/Example nets/")) { //filter according to the path
-						String entry = name.substring("resources/Example nets/".length());
-						int checkSubdir = entry.indexOf('/');
-						if (checkSubdir >= 0) {
-							// if it is a subdirectory, we just return the directory name
-							entry = entry.substring(0, checkSubdir);
-						}
-						result.add(entry);
-					}
-				}
-				nets = result.toArray(new String[result.size()]);
-			} 
-
-			Arrays.sort(nets, new Comparator<String>() {
-				public int compare(String one, String two) {
-
-					int toReturn = one.compareTo(two);
-					// Special hack to get intro-example first
-					if (one.equals("intro-example.xml")) {
-						toReturn = -1;
-					}
-					if (two.equals("intro-example.xml")) {
-						toReturn = 1;
-					}
-					return toReturn;
-				}
-			});
-
-			// Oliver Haggarty - fixed code here so that if folder contains non
-			// .xml file the Example x counter is not incremented when that file
-			// is ignored
-			if (nets.length > 0) {
-				JMenu exampleMenu = new JMenu("Example nets");
-				exampleMenu.setIcon(new ImageIcon(Thread.currentThread()
-						.getContextClassLoader().getResource(
-								CreateGui.imgPath + "Example.png")));
-				int k = 0;
-				for (int i = 0; i < nets.length; i++) {
-					if (nets[i].toLowerCase().endsWith(".xml")) {
-						//addMenuItem(exampleMenu, new ExampleFileAction(nets[i], (k < 10) ? "ctrl " + (k++) : null));
-
-						ExampleFileAction tmp = new ExampleFileAction(nets[i], nets[i].replace(".xml", ""), null);
-						if (k < 10) {
-
-							//tmp.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyStroke.getKeyStroke(""+k).getKeyCode(), shortcutkey));
-
-						}
-						k++;
-
-						addMenuItem(exampleMenu, tmp);
-					}
-				}
-				fileMenu.add(exampleMenu);
-				fileMenu.addSeparator();
-			}
-		} catch (Exception e) {
-			Logger.log("Error getting example files:" + e);
-			e.printStackTrace();
-		}
-		addMenuItem(fileMenu, exitAction = new FileAction("Exit",
-				"Close the program", "ctrl Q"));
-		exitAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('Q', shortcutkey));
+		menuBar.add(buildMenuFiles(shortcutkey));
+		menuBar.add(buildMenuEdit(shortcutkey));
+		menuBar.add(buildMenuView(shortcutkey));
+		menuBar.add(buildMenuDraw());
+		menuBar.add(buildMenuAnimation());
+		menuBar.add(buildMenuTools());
+		menuBar.add(buildMenuHelp());
+
+		setJMenuBar(menuBar);
+
+	}
+
+	private JMenu buildMenuEdit(int shortcutkey) {
 
 		/* Edit Menu */
 		JMenu editMenu = new JMenu("Edit");
 		editMenu.setMnemonic('E');
-		addMenuItem(editMenu, undoAction = new EditAction("Undo",
-				"Undo", "ctrl Z"));
-		undoAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('Z', shortcutkey));
-		addMenuItem(editMenu, redoAction = new EditAction("Redo",
-				"Redo", "ctrl Y"));
-		redoAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('Y', shortcutkey));
+		editMenu.add( undoAction = new GuiAction("Undo",
+				"Undo", KeyStroke.getKeyStroke('Z', shortcutkey)) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if (CreateGui.getApp().isEditionAllowed()) {
+					appView.getUndoManager().undo();
+					CreateGui.getCurrentTab().network().buildConstraints();
+				}
+			}
+		});
+		
+		
+		editMenu.add( redoAction = new GuiAction("Redo",
+				"Redo", KeyStroke.getKeyStroke('Y', shortcutkey)) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				if (CreateGui.getApp().isEditionAllowed()) {
+					appView.getUndoManager().redo();
+					CreateGui.getCurrentTab().network().buildConstraints();
+				}
+			}
+		});
 		editMenu.addSeparator();
 
-		addMenuItem(editMenu, deleteAction = new DeleteAction("Delete",
-				"Delete selection", "DELETE"));
+		editMenu.add( deleteAction = new GuiAction("Delete", "Delete selection", "DELETE") {
+
+			@Override
+			public void actionPerformed(ActionEvent arg0) {
+				// check if queries need to be removed
+				ArrayList<PetriNetObject> selection = CreateGui.getDrawingSurface().getSelectionObject().getSelection();
+				Iterable<TAPNQuery> queries = ((TabContent) appTab.getSelectedComponent()).queries();
+				HashSet<TAPNQuery> queriesToDelete = new HashSet<TAPNQuery>();
+
+				boolean queriesAffected = false;
+				for (PetriNetObject pn : selection) {
+					if (pn instanceof TimedPlaceComponent) {
+						TimedPlaceComponent place = (TimedPlaceComponent)pn;
+						if(!place.underlyingPlace().isShared()){
+							for (TAPNQuery q : queries) {
+								if (q.getProperty().containsAtomicPropositionWithSpecificPlaceInTemplate(((LocalTimedPlace)place.underlyingPlace()).model().name(),place.underlyingPlace().name())) {
+									queriesAffected = true;
+									queriesToDelete.add(q);
+								}
+							}
+						}
+					} else if (pn instanceof TimedTransitionComponent){
+						TimedTransitionComponent transition = (TimedTransitionComponent)pn;
+						if(!transition.underlyingTransition().isShared()){
+							for (TAPNQuery q : queries) {
+								if (q.getProperty().containsAtomicPropositionWithSpecificTransitionInTemplate((transition.underlyingTransition()).model().name(),transition.underlyingTransition().name())) {
+									queriesAffected = true;
+									queriesToDelete.add(q);
+								}
+							}
+						}
+					}
+				}
+				StringBuilder s = new StringBuilder();
+				s.append("The following queries are associated with the currently selected objects:\n\n");
+				for (TAPNQuery q : queriesToDelete) {
+					s.append(q.getName());
+					s.append('\n');
+				}
+				s.append("\nAre you sure you want to remove the current selection and all associated queries?");
+
+				int choice = queriesAffected ? JOptionPane.showConfirmDialog(
+						CreateGui.getApp(), s.toString(), "Warning",
+						JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE)
+						: JOptionPane.YES_OPTION;
+
+						if (choice == JOptionPane.YES_OPTION) {
+							appView.getUndoManager().newEdit(); // new "transaction""
+							if (queriesAffected) {
+								TabContent currentTab = CreateGui.getCurrentTab();
+								for (TAPNQuery q : queriesToDelete) {
+									Command cmd = new DeleteQueriesCommand(currentTab, Arrays.asList(q));
+									cmd.redo();
+									appView.getUndoManager().addEdit(cmd);
+								}
+							}
+
+							appView.getUndoManager().deleteSelection(appView.getSelectionObject().getSelection());
+							appView.getSelectionObject().deleteSelection();
+							appView.repaint();
+							CreateGui.getCurrentTab().network().buildConstraints();
+						}
+				
+			}
+			
+		});
 
 		// Bind delete to backspace also
 		editMenu.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
 				KeyStroke.getKeyStroke("BACK_SPACE"), "Delete");
 		editMenu.getActionMap().put("Delete", deleteAction);
-		
+
 		editMenu.addSeparator();
 
-		addMenuItem(editMenu, selectAllAction = new SelectAllAction("Select all",
-			"Select all components", "ctrl A"));
 
-		editMenu.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
-				KeyStroke.getKeyStroke('A', shortcutkey), "SelectAll");
+		editMenu.add(selectAllAction = new GuiAction("Select all", "Select all components",  KeyStroke.getKeyStroke('A', shortcutkey )) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				CreateGui.getDrawingSurface().getSelectionObject().selectAll();
+			}
+		});
+		editMenu.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke('A', shortcutkey), "SelectAll");
 		editMenu.getActionMap().put("SelectAll", selectAllAction);
 
+		return editMenu;
+	}
+
+	private JMenu buildMenuDraw() {
 		/* Draw menu */
 		JMenu drawMenu = new JMenu("Draw");
 		drawMenu.setMnemonic('D');
-		addMenuItem(drawMenu, selectAction = new TypeAction("Select",
+		drawMenu.add( selectAction = new TypeAction("Select",
 				ElementType.SELECT, "Select components (S)", "S", true));
 		drawMenu.addSeparator();
 
-		addMenuItem(drawMenu, timedPlaceAction = new TypeAction("Place",
+		drawMenu.add( timedPlaceAction = new TypeAction("Place",
 				ElementType.TAPNPLACE, "Add a place (P)", "P", true));
 
-		addMenuItem(drawMenu, transAction = new TypeAction("Transition",
+		drawMenu.add( transAction = new TypeAction("Transition",
 				ElementType.TAPNTRANS, "Add a transition (T)", "T", true));
 
-		addMenuItem(drawMenu, timedArcAction = new TypeAction("Arc",
+		drawMenu.add( timedArcAction = new TypeAction("Arc",
 				ElementType.TAPNARC, "Add an arc (A)", "A", true));
 
-		addMenuItem(drawMenu, transportArcAction = new TypeAction(
+		drawMenu.add( transportArcAction = new TypeAction(
 				"Transport arc", ElementType.TRANSPORTARC, "Add a transport arc (R)", "R",
 				true));
 
-		addMenuItem(drawMenu, inhibarcAction = new TypeAction("Inhibitor arc",
+		drawMenu.add( inhibarcAction = new TypeAction("Inhibitor arc",
 				ElementType.TAPNINHIBITOR_ARC, "Add an inhibitor arc (I)", "I", true));
 
-		addMenuItem(drawMenu, annotationAction = new TypeAction("Annotation",
+		drawMenu.add(annotationAction = new TypeAction("Annotation",
 				ElementType.ANNOTATION, "Add an annotation (N)", "N", true));
 
 		drawMenu.addSeparator();
 
-		addMenuItem(drawMenu, tokenAction = new TypeAction("Add token",
+		drawMenu.add( tokenAction = new TypeAction("Add token",
 				ElementType.ADDTOKEN, "Add a token (+)", "typed +", true));
 
-		addMenuItem(drawMenu, deleteTokenAction = new TypeAction(
+		drawMenu.add( deleteTokenAction = new TypeAction(
 				"Delete token", ElementType.DELTOKEN, "Delete a token (-)", "typed -",
 				true));
+		return drawMenu;
+	}
 
+	private JMenu buildMenuView(int shortcutkey) {
 		/* ViewMenu */
 		JMenu viewMenu = new JMenu("View");
 		viewMenu.setMnemonic('V');
@@ -612,224 +618,364 @@
 		zoomMenu.setIcon(new ImageIcon(Thread.currentThread()
 				.getContextClassLoader().getResource(
 						CreateGui.imgPath + "Zoom.png")));
+		
 		addZoomMenuItems(zoomMenu);
 
-		addMenuItem(viewMenu, zoomInAction = new ZoomAction("Zoom in",
-				"Zoom in by 10% ", "ctrl J"));
-		zoomInAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyStroke.getKeyStroke("J").getKeyCode(), shortcutkey));
+		viewMenu.add( zoomInAction = new GuiAction("Zoom in",
+				"Zoom in by 10% ", KeyStroke.getKeyStroke('J', shortcutkey)) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				boolean didZoom = appView.getZoomController().zoomIn();
+				if (didZoom) {
+					updateZoomCombo();
+					appView.zoomToMidPoint(); //Do Zoom
+				}
+			}
+		});
 
-		addMenuItem(viewMenu, zoomOutAction = new ZoomAction("Zoom out",
-				"Zoom out by 10% ", "ctrl K"));
-		zoomOutAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyStroke.getKeyStroke("K").getKeyCode(), shortcutkey));
+		viewMenu.add( zoomOutAction = new GuiAction("Zoom out",
+				"Zoom out by 10% ", KeyStroke.getKeyStroke('K', shortcutkey)) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				boolean didZoom = appView.getZoomController().zoomOut();
+				if (didZoom) {
+					updateZoomCombo();
+					appView.zoomToMidPoint(); //Do Zoom
+				}
+			}
+		});
 		viewMenu.add(zoomMenu);
 
 		viewMenu.addSeparator();
 		
-		addMenuItem(viewMenu, incSpacingAction = new SpacingAction("Increase node spacing",
-				"Increase spacing by 20% ", null));
-		incSpacingAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyStroke.getKeyStroke("U").getKeyCode(), shortcutkey));
-		
-		addMenuItem(viewMenu, decSpacingAction = new SpacingAction("Decrease node spacing",
-				"Decrease spacing by 20% ", null));
-		decSpacingAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke("shift U"));
-
-		
-		viewMenu.addSeparator();
-		
-		addMenuItem(viewMenu, toggleGrid = new GridAction("Cycle grid",
-				"Change the grid size", "G"));
-
-		viewMenu.addSeparator();
-
-		addCheckboxMenuItem(viewMenu, showComponents, showComponentsAction = new ViewAction("Display components", 
-				453243, "Show/hide the list of components.", "ctrl 1", true),
-				showComponentsCheckBox = new JCheckBoxMenuItem());
-		showComponentsAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('1', shortcutkey));
-
-		addCheckboxMenuItem(viewMenu, showQueries, showQueriesAction = new ViewAction("Display queries", 
-				453244, "Show/hide verification queries.", "ctrl 2", true),
-				showQueriesCheckBox= new JCheckBoxMenuItem());
-		showQueriesAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('2', shortcutkey));
-
-		addCheckboxMenuItem(viewMenu, showConstants, showConstantsAction = new ViewAction("Display constants", 
-				453245, "Show/hide global constants.", "ctrl 3", true),
-				showConstantsCheckBox = new JCheckBoxMenuItem());
-		showConstantsAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('3', shortcutkey));
-
-		addCheckboxMenuItem(viewMenu, showEnabledTransitions, showEnabledTransitionsAction = new ViewAction("Display enabled transitions",
-				453247, "Show/hide the list of enabled transitions","ctrl 4",true),
-				showEnabledTransitionsCheckBox = new JCheckBoxMenuItem());
-		showEnabledTransitionsAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('4', shortcutkey));
-
-		addCheckboxMenuItem(viewMenu, showDelayEnabledTransitions, showDelayEnabledTransitionsAction = new ViewAction("Display future-enabled transitions",
-				453247, "Highlight transitions which can be enabled after a delay","ctrl 5",true),
-				showDelayEnabledTransitionsCheckBox = new JCheckBoxMenuItem());
-		showDelayEnabledTransitionsAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('5', shortcutkey));
-
-		addCheckboxMenuItem(viewMenu, CreateGui.showZeroToInfinityIntervals(), showZeroToInfinityIntervalsAction = new ViewAction("Display intervals [0,inf)",
-				453246, "Show/hide intervals [0,inf) that do not restrict transition firing in any way.","ctrl 6",true),
-				showZeroToInfinityIntervalsCheckBox = new JCheckBoxMenuItem());
-		showZeroToInfinityIntervalsAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('6', shortcutkey));
-
-		addCheckboxMenuItem(viewMenu, showToolTips, showToolTipsAction = new ViewAction("Display tool tips",
-				453246, "Show/hide tool tips when mouse is over an element","ctrl 7",true),
-				showToolTipsCheckBox = new JCheckBoxMenuItem());
-		showToolTipsAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('7', shortcutkey));
-
-		addCheckboxMenuItem(viewMenu, CreateGui.showTokenAge(), showTokenAgeAction = new ViewAction("Display token age",
-						453246, "Show/hide displaying the token age 0.0 (when hidden the age 0.0 is drawn as a dot)","ctrl 8",true),
-				showTokenAgeCheckBox = new JCheckBoxMenuItem());
-		showTokenAgeAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('8', shortcutkey));
-
-		viewMenu.addSeparator();
-
-		addMenuItem(viewMenu, showSimpleWorkspaceAction = new ViewAction("Show simple workspace", 453249, "Show only the most important panels", "", false));
-		addMenuItem(viewMenu, showAdvancedWorkspaceAction = new ViewAction("Show advanced workspace", 453248, "Show all panels", "", false));
-		addMenuItem(viewMenu, saveWorkSpaceAction = new ViewAction("Save workspace", 453250, "Save the current workspace as the default one", "", false));
-
+		viewMenu.add(incSpacingAction = new GuiAction("Increase node spacing", "Increase spacing by 20% ",
+				KeyStroke.getKeyStroke('U', shortcutkey)) {
+			public void actionPerformed(ActionEvent arg0) {
+				double factor = 1.25;
+				changeSpacing(factor);
+				appView.getUndoManager().addNewEdit(new ChangeSpacingEdit(factor));
+			}
+		});
+
+		viewMenu.add(decSpacingAction = new GuiAction("Decrease node spacing", "Decrease spacing by 20% ",
+				KeyStroke.getKeyStroke("shift U")) {
+			public void actionPerformed(ActionEvent arg0) {
+				double factor = 0.8;
+				changeSpacing(factor);
+				appView.getUndoManager().addNewEdit(new ChangeSpacingEdit(factor));
+			}
+		});
+		
+
+		
+		viewMenu.addSeparator();
+		
+		viewMenu.add( toggleGrid = new GuiAction("Cycle grid",
+				"Change the grid size", "G") {
+					public void actionPerformed(ActionEvent arg0) {
+						Grid.increment();
+						repaint();			
+					}		
+		});
+		
+
+		viewMenu.addSeparator();
+
+		showComponentsAction = new GuiAction("Display components", "Show/hide the list of components.",
+				KeyStroke.getKeyStroke('1', shortcutkey), true) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				toggleComponents();
+			}
+		};
+		addCheckboxMenuItem(viewMenu, showComponents, showComponentsAction);
+
+		showQueriesAction = new GuiAction("Display queries", "Show/hide verification queries.",
+				KeyStroke.getKeyStroke('2', shortcutkey), true) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				toggleQueries();
+			}
+		};
+		addCheckboxMenuItem(viewMenu, showQueries, showQueriesAction);
+
+		showConstantsAction = new GuiAction("Display constants", "Show/hide global constants.",
+				KeyStroke.getKeyStroke('3', shortcutkey), true) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				toggleConstants();
+			}
+		};
+		addCheckboxMenuItem(viewMenu, showConstants, showConstantsAction);
+
+		showEnabledTransitionsAction = new GuiAction("Display enabled transitions",
+				"Show/hide the list of enabled transitions", KeyStroke.getKeyStroke('4', shortcutkey), true) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				toggleEnabledTransitionsList();
+			}
+		};
+		addCheckboxMenuItem(viewMenu, showEnabledTransitions, showEnabledTransitionsAction);
+
+		showDelayEnabledTransitionsAction = new GuiAction("Display future-enabled transitions",
+				"Highlight transitions which can be enabled after a delay", KeyStroke.getKeyStroke('5', shortcutkey),
+				true) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				toggleDelayEnabledTransitions();
+			}
+		};
+		addCheckboxMenuItem(viewMenu, showDelayEnabledTransitions, showDelayEnabledTransitionsAction);
+
+		showZeroToInfinityIntervalsAction = new GuiAction("Display intervals [0,inf)",
+				"Show/hide intervals [0,inf) that do not restrict transition firing in any way.",
+				KeyStroke.getKeyStroke('6', shortcutkey), true) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				toggleZeroToInfinityIntervals();
+			}
+		};
+		showZeroToInfinityIntervalsCheckBox = addCheckboxMenuItem(viewMenu, showZeroToInfinityIntervals(),
+				showZeroToInfinityIntervalsAction);
+
+		showToolTipsAction = new GuiAction("Display tool tips", "Show/hide tool tips when mouse is over an element",
+				KeyStroke.getKeyStroke('7', shortcutkey), true) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				toggleToolTips();
+			}
+		};
+		addCheckboxMenuItem(viewMenu, showToolTips, showToolTipsAction);
+
+		showTokenAgeAction = new GuiAction("Display token age",
+				"Show/hide displaying the token age 0.0 (when hidden the age 0.0 is drawn as a dot)",
+				KeyStroke.getKeyStroke('8', shortcutkey), true) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				toggleTokenAge();
+			}
+		};
+		showTokenAgeCheckBox = addCheckboxMenuItem(viewMenu, showTokenAge(), showTokenAgeAction);
+
+		viewMenu.addSeparator();
+
+		viewMenu.add( showSimpleWorkspaceAction = new GuiAction("Show simple workspace", "Show only the most important panels", false) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				showAdvancedWorkspace(false);
+			}
+		});
+		viewMenu.add( showAdvancedWorkspaceAction = new GuiAction("Show advanced workspace", "Show all panels", false) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				showAdvancedWorkspace(true);
+			}
+		});
+		viewMenu.add( saveWorkSpaceAction = new GuiAction("Save workspace", "Save the current workspace as the default one", false) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				saveWorkspace();
+			}
+		});
+		return viewMenu;
+	}
+
+	private JMenu buildMenuAnimation() {
 		/* Simulator */
 		JMenu animateMenu = new JMenu("Simulator");
 		animateMenu.setMnemonic('A');
-		addMenuItem(animateMenu, startAction = new AnimateAction(
-				"Simulation mode", ElementType.START, "Toggle simulation mode (M)",
-				"M", true));
-		addMenuItem(animateMenu, stepbackwardAction = new AnimateAction("Step backward",
-				ElementType.STEPBACKWARD, "Step backward", "pressed LEFT"));
-		addMenuItem(animateMenu,
-				stepforwardAction = new AnimateAction("Step forward",
-						ElementType.STEPFORWARD, "Step forward", "pressed RIGHT"));
-
-		addMenuItem(animateMenu, timeAction = new AnimateAction("Delay one time unit",
-				ElementType.TIMEPASS, "Let time pass one time unit", "W"));
-
-		addMenuItem(animateMenu, delayFireAction = new AnimateAction("Delay and fire",
-				ElementType.DELAYFIRE, "Delay and fire selected transition", "F"));
-
-		addMenuItem(animateMenu, prevcomponentAction = new AnimateAction("Previous component",
-				ElementType.PREVCOMPONENT, "Previous component", "pressed UP"));
-
-		addMenuItem(animateMenu, nextcomponentAction = new AnimateAction("Next component",
-				ElementType.NEXTCOMPONENT, "Next component", "pressed DOWN"));
+		animateMenu.add( startAction = new GuiAction(
+				"Simulation mode", "Toggle simulation mode (M)",
+				"M", true) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				toggleAnimationMode();
+			}
+		});
+		
+		
+		animateMenu.add( stepbackwardAction = new GuiAction("Step backward",
+				"Step backward", "pressed LEFT") {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				CreateGui.getCurrentTab().getAnimationHistory().stepBackwards();
+				getAnimator().stepBack();
+				updateMouseOverInformation();
+				CreateGui.getCurrentTab().getAnimationController().setAnimationButtonsEnabled();
+			}
+		});
+		animateMenu.add(
+				stepforwardAction = new GuiAction("Step forward", "Step forward", "pressed RIGHT") {
+					@Override
+					public void actionPerformed(ActionEvent e) {
+						CreateGui.getCurrentTab().getAnimationHistory().stepForward();
+						getAnimator().stepForward();
+						updateMouseOverInformation();
+						CreateGui.getCurrentTab().getAnimationController().setAnimationButtonsEnabled();
+					}
+				});
+
+		animateMenu.add( timeAction = new GuiAction("Delay one time unit",
+				"Let time pass one time unit", "W") {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				getAnimator().letTimePass(BigDecimal.ONE);
+				CreateGui.getCurrentTab().getAnimationController().setAnimationButtonsEnabled();
+				updateMouseOverInformation();
+			}
+		});
+
+		animateMenu.add( delayFireAction = new GuiAction("Delay and fire",
+				"Delay and fire selected transition", "F") {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				CreateGui.getCurrentTab().getTransitionFireingComponent().fireSelectedTransition();
+				CreateGui.getCurrentTab().getAnimationController().setAnimationButtonsEnabled();
+				updateMouseOverInformation();
+			}
+		});
+
+		animateMenu.add( prevcomponentAction = new GuiAction("Previous component",
+				"Previous component", "pressed UP") {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				CreateGui.getCurrentTab().getTemplateExplorer().selectPrevious();
+			}
+		});
+
+		animateMenu.add( nextcomponentAction = new GuiAction("Next component",
+				"Next component", "pressed DOWN") {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				CreateGui.getCurrentTab().getTemplateExplorer().selectNext();
+			}
+		});
 
 		animateMenu.addSeparator();
 
-		addMenuItem(animateMenu, exportTraceAction = new FileAction("Export trace",
-				"Export the current trace",""));
-		addMenuItem(animateMenu, importTraceAction = new FileAction("Import trace",
-				"Import trace to simulator",""));
-
-		/*
-		 * addMenuItem(animateMenu, randomAction = new AnimateAction("Random",
-		 * Pipe.RANDOM, "Randomly fire a transition", "typed 5"));
-		 * addMenuItem(animateMenu, randomAnimateAction = new
-		 * AnimateAction("Simulate", Pipe.ANIMATE,
-		 * "Randomly fire a number of transitions", "typed 7",true));
-		 */
-		randomAction = new AnimateAction("Random", ElementType.RANDOM,
-				"Randomly fire a transition", "typed 5");
-		randomAnimateAction = new AnimateAction("Simulate", ElementType.ANIMATE,
-				"Randomly fire a number of transitions", "typed 7", true);
-
-
-		/* The help part */
+		animateMenu.add( exportTraceAction = new GuiAction("Export trace",
+				"Export the current trace","") {
+					public void actionPerformed(ActionEvent arg0) {
+						TraceImportExport.exportTrace();
+					}		
+		});
+		animateMenu.add( importTraceAction = new GuiAction("Import trace",
+				"Import trace to simulator",""){
+			public void actionPerformed(ActionEvent arg0) {
+				TraceImportExport.importTrace();
+			}		
+		});
+
+
+		return animateMenu;
+	}
+
+	private JMenu buildMenuHelp() {
 		JMenu helpMenu = new JMenu("Help");
 		helpMenu.setMnemonic('H');
 
-		addMenuItem(helpMenu, showHomepage = new HelpAction("Visit TAPAAL home",
-				453257, "Visit the TAPAAL homepage", "_"));
-
-		addMenuItem(helpMenu, checkUpdate = new HelpAction("Check for updates",
-				463257, "Check if there is a new version of TAPAAL", "_"));
-
-		helpMenu.addSeparator();
-
-		addMenuItem(helpMenu, showFAQAction = new HelpAction("Show FAQ",
-				454256, "See TAPAAL frequently asked questions", "_"));
-		addMenuItem(helpMenu, showAskQuestionAction = new HelpAction("Ask a question",
-				453256, "Ask a question about TAPAAL", "_"));
-		addMenuItem(helpMenu, showReportBugAction = new HelpAction("Report bug",
-				453254, "Report a bug in TAPAAL", "_"));
-
-		helpMenu.addSeparator();
-
-		addMenuItem(helpMenu, showAboutAction = new HelpAction("About",
-				453246, "Show the About menu", "_"));
-
-		menuBar.add(fileMenu);
-		menuBar.add(editMenu);
-		menuBar.add(viewMenu);
-		menuBar.add(drawMenu);
-		menuBar.add(animateMenu);
-		menuBar.add(buildToolsMenu());
-		menuBar.add(helpMenu);
-
-		setJMenuBar(menuBar);
-
+		helpMenu.add(showHomepage = new GuiAction("Visit TAPAAL home", "Visit the TAPAAL homepage") {
+			public void actionPerformed(ActionEvent arg0) {
+				showInBrowser("http://www.tapaal.net");
+			}
+		});
+
+		helpMenu.add(checkUpdate = new GuiAction("Check for updates", "Check if there is a new version of TAPAAL") {
+			public void actionPerformed(ActionEvent arg0) {
+				checkForUpdate(true);
+			}
+		});
+
+		helpMenu.addSeparator();
+
+		helpMenu.add(showFAQAction = new GuiAction("Show FAQ", "See TAPAAL frequently asked questions") {
+			public void actionPerformed(ActionEvent arg0) {
+				showInBrowser("https://answers.launchpad.net/tapaal/+faqs");
+			}
+		});
+		helpMenu.add(showAskQuestionAction = new GuiAction("Ask a question", "Ask a question about TAPAAL") {
+			public void actionPerformed(ActionEvent arg0) {
+				showInBrowser("https://answers.launchpad.net/tapaal/+addquestion");
+			}
+		});
+		helpMenu.add(showReportBugAction = new GuiAction("Report bug", "Report a bug in TAPAAL") {
+			public void actionPerformed(ActionEvent arg0) {
+				showInBrowser("https://bugs.launchpad.net/tapaal/+filebug");
+			}
+		});
+
+		helpMenu.addSeparator();
+
+		helpMenu.add(showAboutAction = new GuiAction("About", "Show the About menu") {
+			public void actionPerformed(ActionEvent arg0) {
+				showAbout();
+			}
+		});
+		return helpMenu;
 	}
 
-	private JMenu buildToolsMenu() {
+	
+
+	private JMenu buildMenuTools() {
 		JMenu toolsMenu = new JMenu("Tools");
 		toolsMenu.setMnemonic('t');
 
 		int shortcutkey = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
 
-		verification = new JMenuItem(verifyAction = new ToolAction("Verify query","Verifies the currently selected query",KeyStroke.getKeyStroke(KeyEvent.VK_M, shortcutkey)));
-		verification.setMnemonic('m');
-		verification.addActionListener(new ActionListener() {			
+		verifyAction = new GuiAction("Verify query", "Verifies the currently selected query", KeyStroke.getKeyStroke(KeyEvent.VK_M, shortcutkey)) {
 			public void actionPerformed(ActionEvent arg0) {
-				CreateGui.getCurrentTab().verifySelectedQuery();				
+				CreateGui.getCurrentTab().verifySelectedQuery();
 			}
-		});
-		toolsMenu.add(verification);	
-		statistics = new JMenuItem(netStatisticsAction = new ToolAction("Net statistics", "Shows information about the number of transitions, places, arcs, etc.",KeyStroke.getKeyStroke(KeyEvent.VK_I, shortcutkey)));				
-		statistics.setMnemonic('i');		
-		statistics.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
+		};
+		toolsMenu.add(verifyAction).setMnemonic('m');
+
+		netStatisticsAction = new GuiAction("Net statistics", "Shows information about the number of transitions, places, arcs, etc.", KeyStroke.getKeyStroke(KeyEvent.VK_I, shortcutkey)) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
 				StatisticsPanel.showStatisticsPanel();
 			}
-		});		
-		toolsMenu.add(statistics);		
+		};
+		toolsMenu.add(netStatisticsAction).setMnemonic('i');
 
 
 		//JMenuItem batchProcessing = new JMenuItem("Batch processing");
-		JMenuItem batchProcessing = new JMenuItem(batchProcessingAction = new ToolAction("Batch processing", "Batch verification of multiple nets and queries",KeyStroke.getKeyStroke(KeyEvent.VK_B, shortcutkey)));				
-		batchProcessing.setMnemonic('b');				
-		batchProcessing.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
+		JMenuItem batchProcessing = new JMenuItem(batchProcessingAction = new GuiAction("Batch processing", "Batch verification of multiple nets and queries", KeyStroke.getKeyStroke(KeyEvent.VK_B, shortcutkey)) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
 				if(checkForSaveAll()){
 					BatchProcessingDialog.showBatchProcessingDialog(new JList(new DefaultListModel()));
 				}
 			}
 		});
+		batchProcessing.setMnemonic('b');
 		toolsMenu.add(batchProcessing);
 
-		JMenuItem workflowDialog = new JMenuItem(workflowDialogAction = new ToolAction("Workflow analysis", "Analyse net as a TAWFN", KeyStroke.getKeyStroke(KeyEvent.VK_F, shortcutkey)));				
+		JMenuItem workflowDialog = new JMenuItem(workflowDialogAction = new GuiAction("Workflow analysis", "Analyse net as a TAWFN", KeyStroke.getKeyStroke(KeyEvent.VK_F, shortcutkey)) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				WorkflowDialog.showDialog();
+			}
+		});
 		workflowDialog.setMnemonic('f');
-		workflowDialog.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				WorkflowDialog.showDialog();
-			}
-		});
 		toolsMenu.add(workflowDialog);
 
 		//Stip off timing information
-		JMenuItem stripTimeDialog = new JMenuItem(stripTimeDialogAction = new ToolAction("Remove timing information", "Remove all timing information from the net in the active tab and open it as a P/T net in a new tab.", KeyStroke.getKeyStroke(KeyEvent.VK_E, shortcutkey)));
-		stripTimeDialog.setMnemonic('e');
-		stripTimeDialog.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
+		JMenuItem stripTimeDialog = new JMenuItem(stripTimeDialogAction = new GuiAction("Remove timing information", "Remove all timing information from the net in the active tab and open it as a P/T net in a new tab.", KeyStroke.getKeyStroke(KeyEvent.VK_E, shortcutkey)) {
+			@Override
+			public void actionPerformed(ActionEvent e) {
 				duplicateTab((TabContent) appTab.getSelectedComponent());
 				convertToUntimedTab((TabContent) appTab.getSelectedComponent());
 			}
 		});
+		stripTimeDialog.setMnemonic('e');
 		toolsMenu.add(stripTimeDialog);
 
 		toolsMenu.addSeparator();
 
-		//JMenuItem engineSelection = new JMenuItem("Verification engines");
-		JMenuItem engineSelection = new JMenuItem(engineSelectionAction = new ToolAction("Engine selection", "View and modify the location of verification engines",null));
-		engineSelection.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				new EngineDialogPanel().showDialog();				
+		JMenuItem engineSelection = new JMenuItem(engineSelectionAction = new GuiAction("Engine selection", "View and modify the location of verification engines") {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				new EngineDialogPanel().showDialog();
 			}
 		});
 		toolsMenu.add(engineSelection);
@@ -852,7 +998,7 @@
 		return toolsMenu;
 	}
 
-	public void showAdvancedWorkspace(boolean advanced){
+	private void showAdvancedWorkspace(boolean advanced){
 		QueryDialog.setAdvancedView(advanced);
 		showComponents(advanced);
 		showConstants(advanced);
@@ -862,10 +1008,10 @@
 		showEnabledTransitionsList(true);
 		showToolTips(true);
 		CreateGui.getCurrentTab().setResizeingDefault();
-		if(!CreateGui.showZeroToInfinityIntervals()){
+		if(!showZeroToInfinityIntervals()){
 			showZeroToInfinityIntervalsCheckBox.doClick();
 		}
-		if(!CreateGui.showTokenAge()){
+		if(!showTokenAge()){
 			showTokenAgeCheckBox.doClick();
 		}
 		//Delay-enabled Transitions
@@ -875,7 +1021,7 @@
 		DelayEnabledTransitionControl.getInstance().setRandomTransitionMode(false);
 	}
 
-	public void saveWorkspace(){
+	private void saveWorkspace(){
 		Preferences prefs = Preferences.getInstance();
 
 		prefs.setAdvancedQueryView(QueryDialog.getAdvancedView());
@@ -889,7 +1035,7 @@
 
 		prefs.setShowEnabledTrasitions(showEnabledTransitions);
 		prefs.setShowDelayEnabledTransitions(showDelayEnabledTransitions);
-		prefs.setShowTokenAge(CreateGui.showTokenAge());
+		prefs.setShowTokenAge(showTokenAge());
 		prefs.setDelayEnabledTransitionDelayMode(DelayEnabledTransitionControl.getDefaultDelayMode());
 		prefs.setDelayEnabledTransitionGranularity(DelayEnabledTransitionControl.getDefaultGranularity());
 		prefs.setDelayEnabledTransitionIsRandomTransition(DelayEnabledTransitionControl.isRandomTransition());
@@ -900,20 +1046,27 @@
 						"Workspace Saved", JOptionPane.INFORMATION_MESSAGE);
 	}
 
+
 	private void buildToolbar() {
+
+		//XXX .setRequestFocusEnabled(false), removed "border" around tollbar buttons when selcted/focus
+		// https://stackoverflow.com/questions/9361658/disable-jbutton-focus-border and
+		//https://stackoverflow.com/questions/20169436/how-to-prevent-toolbar-button-focus-in-java-swing
+
 		// Create the toolbar
 		JToolBar toolBar = new JToolBar();
 		toolBar.setFloatable(false);// Inhibit toolbar floating
+		toolBar.setRequestFocusEnabled(false);
 
 		// Basis file operations
-		toolBar.add(createAction);
-		toolBar.add(openAction);
-		toolBar.add(saveAction);
-		toolBar.add(saveAsAction);
+		toolBar.add(createAction).setRequestFocusEnabled(false);
+		toolBar.add(openAction).setRequestFocusEnabled(false);
+		toolBar.add(saveAction).setRequestFocusEnabled(false);
+		toolBar.add(saveAsAction).setRequestFocusEnabled(false);
 
 		// Print
 		toolBar.addSeparator();
-		toolBar.add(printAction);
+		toolBar.add(printAction).setRequestFocusEnabled(false);
 
 		// Copy/past
 		/*
@@ -924,32 +1077,46 @@
 
 		// Undo/redo
 		toolBar.addSeparator();
-		toolBar.add(deleteAction);
-		toolBar.add(undoAction);
-		toolBar.add(redoAction);
+		toolBar.add(deleteAction).setRequestFocusEnabled(false);
+		toolBar.add(undoAction).setRequestFocusEnabled(false);
+		toolBar.add(redoAction).setRequestFocusEnabled(false);
 
 		// Zoom
 		toolBar.addSeparator();
-		toolBar.add(zoomOutAction);
-		addZoomComboBox(toolBar, new ZoomAction("Zoom",
-				"Select zoom percentage ", ""));
-		toolBar.add(zoomInAction);
+		toolBar.add(zoomOutAction).setRequestFocusEnabled(false);
+		addZoomComboBox(toolBar, new GuiAction("Zoom", "Select zoom percentage ", "") {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				String selectedZoomLevel = (String) zoomComboBox.getSelectedItem();
+				//parse selected zoom level, and strip of %.
+				int newZoomLevel = Integer.parseInt(selectedZoomLevel.replace("%", ""));
+
+				boolean didZoom = appView.getZoomController().setZoom(newZoomLevel);
+				if (didZoom) {
+					updateZoomCombo();
+					appView.zoomToMidPoint(); //Do Zoom
+				}
+			}
+		});
+		toolBar.add(zoomInAction).setRequestFocusEnabled(false);
 
 		// Modes
 
 		toolBar.addSeparator();
-		toolBar.add(toggleGrid);
+		toolBar.add(toggleGrid).setRequestFocusEnabled(false);
+
 		toolBar.add(new ToggleButton(startAction));
 
 		// Start drawingToolBar
 		drawingToolBar = new JToolBar();
 		drawingToolBar.setFloatable(false);
 		drawingToolBar.addSeparator();
+		drawingToolBar.setRequestFocusEnabled(false);
 
 		// Normal arraw
-
 		drawingToolBar.add(new ToggleButton(selectAction));
 
+
 		// Drawing elements
 		drawingToolBar.addSeparator();
 		drawingToolBar.add(new ToggleButton(timedPlaceAction));
@@ -967,7 +1134,7 @@
 
 		// Create panel to put toolbars in
 		JPanel toolBarPanel = new JPanel();
-		toolBarPanel.setLayout(new FlowLayout(0, 0, 0));
+		toolBarPanel.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
 
 		// Add toolbars to pane
 		toolBarPanel.add(toolBar);
@@ -990,17 +1157,30 @@
 	/**
 	 * @author Ben Kirby Takes the method of setting up the Zoom menu out of the
 	 *         main buildMenus method.
-	 * @param JMenu
+	 * @param zoomMenu
 	 *            - the menu to add the submenu to
 	 */
 	private void addZoomMenuItems(JMenu zoomMenu) {
 		for (int i = 0; i <= zoomExamples.length - 1; i++) {
-			ZoomAction a = new ZoomAction(zoomExamples[i], "Select zoom percentage", "");
-
-			JMenuItem newItem = new JMenuItem(a);
-
-			zoomMenu.add(newItem);
+
+			final int zoomper = zoomExamples[i];
+			GuiAction newZoomAction = new GuiAction(zoomExamples[i] + "%", "Select zoom percentage", "") {
+				@Override
+				public void actionPerformed(ActionEvent e) {
+					boolean didZoom = appView.getZoomController().setZoom(zoomper);
+					if (didZoom) {
+						updateZoomCombo();
+						appView.zoomToMidPoint(); //Do Zoom
+					}
+				}
+			};
+
+			//JMenuItem newItem = new JMenuItem(a);
+
+			zoomMenu.add(newZoomAction);
 		}
+
+
 	}
 
 	/**
@@ -1014,7 +1194,14 @@
 	 */
 	private void addZoomComboBox(JToolBar toolBar, Action action) {
 		Dimension zoomComboBoxDimension = new Dimension(75, 28);
-		zoomComboBox = new JComboBox(zoomExamples);
+
+		String[] zoomExamplesStrings = new String[zoomExamples.length];
+		int i;
+		for (i=0; i < zoomExamples.length; i++) {
+			zoomExamplesStrings[i] = zoomExamples[i] + "%";
+		}
+
+		zoomComboBox = new JComboBox<String>(zoomExamplesStrings);
 		zoomComboBox.setEditable(true);
 		zoomComboBox.setSelectedItem("100%");
 		zoomComboBox.setMaximumRowCount(zoomExamples.length);
@@ -1026,21 +1213,10 @@
 		toolBar.add(zoomComboBox);
 	}
 
-	private JMenuItem addMenuItem(JMenu menu, Action action) {
-		JMenuItem item = menu.add(action);
-		KeyStroke keystroke = (KeyStroke) action.getValue(Action.ACCELERATOR_KEY);
-
-		if (keystroke != null) {
-			item.setAccelerator(keystroke);
-		}
-		return item;
-	}
-
-	private JMenuItem addCheckboxMenuItem(JMenu menu, boolean selected, Action action) {
-		return addCheckboxMenuItem(menu, selected, action, new JCheckBoxMenuItem());
-	}
-
-	private JMenuItem addCheckboxMenuItem(JMenu menu, boolean selected, Action action, JCheckBoxMenuItem checkBoxItem) {
+	private JCheckBoxMenuItem addCheckboxMenuItem(JMenu menu, boolean selected, Action action) {
+		
+		JCheckBoxMenuItem checkBoxItem = new JCheckBoxMenuItem();
+		
 		checkBoxItem.setAction(action);
 		checkBoxItem.setSelected(selected);
 		JMenuItem item = menu.add(checkBoxItem);
@@ -1049,7 +1225,7 @@
 		if (keystroke != null) {
 			item.setAccelerator(keystroke);
 		}
-		return item;
+		return checkBoxItem;
 	}
 
 	/**
@@ -1150,17 +1326,17 @@
 			// Remove constant highlight
 			CreateGui.getCurrentTab().removeConstantHighlights();
 
-			CreateGui.getAnimationController().requestFocusInWindow();
+			CreateGui.getCurrentTab().getAnimationController().requestFocusInWindow();
 
 			// Event repeater
-			((JPanel) CreateGui.getAnimationController()).getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0, false), "_right_hold");
-			((JPanel) CreateGui.getAnimationController()).getActionMap().put("_right_hold", stepforwardAction);
-			((JPanel) CreateGui.getAnimationController()).getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0, false), "_left_hold");
-			((JPanel) CreateGui.getAnimationController()).getActionMap().put("_left_hold", stepbackwardAction);
-			((JPanel) CreateGui.getAnimationController()).getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_UP, 0, false), "_up_hold");
-			((JPanel) CreateGui.getAnimationController()).getActionMap().put("_up_hold", prevcomponentAction);
-			((JPanel) CreateGui.getAnimationController()).getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0, false), "_down_hold");
-			((JPanel) CreateGui.getAnimationController()).getActionMap().put("_down_hold", nextcomponentAction);
+			CreateGui.getCurrentTab().getAnimationController().getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0, false), "_right_hold");
+			CreateGui.getCurrentTab().getAnimationController().getActionMap().put("_right_hold", stepforwardAction);
+			CreateGui.getCurrentTab().getAnimationController().getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0, false), "_left_hold");
+			CreateGui.getCurrentTab().getAnimationController().getActionMap().put("_left_hold", stepbackwardAction);
+			CreateGui.getCurrentTab().getAnimationController().getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_UP, 0, false), "_up_hold");
+			CreateGui.getCurrentTab().getAnimationController().getActionMap().put("_up_hold", prevcomponentAction);
+			CreateGui.getCurrentTab().getAnimationController().getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0, false), "_down_hold");
+			CreateGui.getCurrentTab().getAnimationController().getActionMap().put("_down_hold", nextcomponentAction);
 			break;
 		case noNet:
 			exportTraceAction.setEnabled(false);
@@ -1249,7 +1425,7 @@
 		startAction.setEnabled(enable);
 
 		// Tools
-		statistics.setEnabled(enable);
+		netStatisticsAction.setEnabled(enable);
 
 	}
 
@@ -1258,42 +1434,59 @@
 		appView = CreateGui.getDrawingSurface(index);
 	}
 
+	//XXX 2018-05-23 kyrke, implementation close to closeTab, needs refactoring
+	private void undoAddTab(int currentlySelected) {
+		CreateGui.removeTab(appTab.getSelectedIndex() );
+		appTab.removeTabAt(appTab.getSelectedIndex());
+		appTab.setSelectedIndex(currentlySelected);
+		//Update DrawingSurfaceImpl manually. Bug #1543124
+		setObjects(appTab.getSelectedIndex());
+	}
+
 	// set tabbed pane properties and add change listener that updates tab with
 	// linked model and view
-	public void setTab() {
+	public void setChangeListenerOnTab() {
 
-		appTab = CreateGui.getTab();
 		appTab.addChangeListener(new ChangeListener() {
 
 			public void stateChanged(ChangeEvent e) {
 
 				int index = appTab.getSelectedIndex();
-				setObjects(index);
-				if (appView != null) {
-					appView.setVisible(true);
-					appView.repaint();
-					updateZoomCombo();
-
-					setTitle(appTab.getTitleAt(index));
-					setGUIMode(GUIMode.draw);
-
-					// TODO: change this code... it's ugly :)
-					if (appGui.getMode() == ElementType.SELECT) {
-						appGui.activateSelectAction();
-					}
-
-				} else {
-					setTitle(null);
-				}
+				changeToTab(index);
 
 			}
 
 		});
-		appGui = CreateGui.getApp();
-		appView = CreateGui.getView();
-
-	}
-
+	}
+
+	//TODO: 2018-05-07 //kyrke Create CloseTab function, used to close a tab
+	//TODO: Refactor the setObject (bad name), inline in changeToTab/Close Tab and use changeToTab in newTab
+
+	private void changeToTab(int index) {
+
+		//If tab is changed by something else that by clicking a tab then change to the tab.
+		if (appTab.getSelectedIndex() != index) {
+			appTab.setSelectedIndex(index);
+		}
+
+		setObjects(index);
+		if (appView != null) {
+			appView.setVisible(true);
+			appView.repaint();
+			updateZoomCombo();
+
+			setTitle(appTab.getTitleAt(index));
+			setGUIMode(GUIMode.draw);
+
+			// TODO: change this code... it's ugly :)
+			if (getMode() == ElementType.SELECT) {
+				activateSelectAction();
+			}
+
+		} else {
+			setTitle(null);
+		}
+	}
 
 
 	// HAK Method called by netModel object when it changes
@@ -1303,98 +1496,97 @@
 		}
 	}
 
-	public void showQueries(boolean enable){
+	private void showQueries(boolean enable){
 		showQueries = enable;
 		CreateGui.getCurrentTab().showQueries(enable);
-		showQueriesCheckBox.setSelected(enable);
+
 	}
-	public void toggleQueries(){
+	private void toggleQueries(){
 		showQueries(!showQueries);
 	}
 
-	public void showConstants(boolean enable){
+	private void showConstants(boolean enable){
 		showConstants = enable;
 		CreateGui.getCurrentTab().showConstantsPanel(enable);
-		showConstantsCheckBox.setSelected(enable);
+
 	}
-	public void toggleConstants(){
+	private void toggleConstants(){
 		showConstants(!showConstants);
 	}
 
-	public void showToolTips(boolean enable){
+	private void showToolTips(boolean enable){
 		showToolTips = enable;
 		Preferences.getInstance().setShowToolTips(showToolTips);
-		showToolTipsCheckBox.setSelected(enable);
+
 		ToolTipManager.sharedInstance().setEnabled(enable);
 		ToolTipManager.sharedInstance().setInitialDelay(400);
 		ToolTipManager.sharedInstance().setReshowDelay(800);
 		ToolTipManager.sharedInstance().setDismissDelay(60000);
 	}
-	public void toggleToolTips(){
+	private void toggleToolTips(){
 		showToolTips(!showToolTips);
 	}
 
-	public boolean isShowingToolTips(){
+	boolean isShowingToolTips(){
 		return showToolTips;
 	}
 
-	public void toggleTokenAge(){
-		CreateGui.toggleShowTokenAge();
-		Preferences.getInstance().setShowTokenAge(CreateGui.showTokenAge());
-		appView.repaintAll();
-	}
-
-	public void toggleZeroToInfinityIntervals() {
-		CreateGui.toggleShowZeroToInfinityIntervals();
-		Preferences.getInstance().setShowZeroInfIntervals(CreateGui.showZeroToInfinityIntervals());
-		appView.repaintAll();
-	}
-
-	public void showComponents(boolean enable){
+	private void toggleTokenAge(){
+		toggleShowTokenAge();
+		Preferences.getInstance().setShowTokenAge(showTokenAge());
+		appView.repaintAll();
+	}
+
+	private void toggleZeroToInfinityIntervals() {
+		toggleShowZeroToInfinityIntervals();
+		Preferences.getInstance().setShowZeroInfIntervals(showZeroToInfinityIntervals());
+		appView.repaintAll();
+	}
+
+	private void showComponents(boolean enable){
 		showComponents = enable;
 		CreateGui.getCurrentTab().showComponents(enable);
-		showComponentsCheckBox.setSelected(enable);
+
 	}
-	public void toggleComponents(){
+	private void toggleComponents(){
 		showComponents(!showComponents);
 	}
 
-	public void showEnabledTransitionsList(boolean enable){
+	private void showEnabledTransitionsList(boolean enable){
 		showEnabledTransitions = enable;
 		CreateGui.getCurrentTab().showEnabledTransitionsList(enable);
-		showEnabledTransitionsCheckBox.setSelected(enable);
+
 	}
-	public void toggleEnabledTransitionsList(){
+	private void toggleEnabledTransitionsList(){
 		showEnabledTransitionsList(!showEnabledTransitions);
 	}
 
-	public void showDelayEnabledTransitions(boolean enable){
+	private void showDelayEnabledTransitions(boolean enable){
 		showDelayEnabledTransitions = enable;
 		CreateGui.getCurrentTab().showDelayEnabledTransitions(enable);
-		showDelayEnabledTransitionsCheckBox.setSelected(enable);
 	}
-	public void toggleDelayEnabledTransitions(){
+	private void toggleDelayEnabledTransitions(){
 		showDelayEnabledTransitions(!showDelayEnabledTransitions);
 	}
 
-	public void saveOperation(boolean forceSave){
+	private void saveOperation(boolean forceSave){
 		saveOperation(appTab.getSelectedIndex(), forceSave);
 	}
 
-	public boolean saveOperation(int index, boolean forceSaveAs) {
-		File modelFile = CreateGui.getFile(index);
-		boolean result = false;
+	private boolean saveOperation(int index, boolean forceSaveAs) {
+		File modelFile = CreateGui.getTab(index).getFile();
+		boolean result;
 		if (!forceSaveAs && modelFile != null) { // ordinary save
 			saveNet(index, modelFile);
 			result = true;
 		} else { // save as
-			String path = null;
+			String path;
 			if (modelFile != null) {
 				path = modelFile.toString();
 			} else {
 				path = appTab.getTitleAt(index);
 			}
-			String filename = new FileBrowser(path).saveFile();
+			String filename = FileBrowser.constructor("Timed-Arc Petri Net", "xml", path).saveFile();
 			if (filename != null) {
 				modelFile = new File(filename);
 				saveNet(index, modelFile);
@@ -1414,7 +1606,7 @@
 		try {
 			saveNet(index, outFile, (List<TAPNQuery>) CreateGui.getTab(index).queries());
 
-			CreateGui.setFile(outFile, index);
+			CreateGui.getCurrentTab().setFile(outFile);
 
 			CreateGui.getDrawingSurface(index).setNetChanged(false);
 			appTab.setTitleAt(index, outFile.getName());
@@ -1436,7 +1628,7 @@
 			NetworkMarking currentMarking = null;
 			if(getGUIMode().equals(GUIMode.animation)){
 				currentMarking = currentTab.network().marking();
-				currentTab.network().setMarking(CreateGui.getAnimator().getInitialMarking());
+				currentTab.network().setMarking(getAnimator().getInitialMarking());
 			}
 
 			NetWriter tapnWriter = new TimedArcPetriNetNetworkWriter(
@@ -1452,62 +1644,64 @@
 				currentTab.network().setMarking(currentMarking);
 			}
 		} catch (Exception e) {
-			System.err.println(e);
+			Logger.log(e);
 			JOptionPane.showMessageDialog(GuiFrame.this, e.toString(),
 					"File Output Error", JOptionPane.ERROR_MESSAGE);
-			return;
 		}
 	}
 
-	public void createNewTab(String name, NetType netType) {
-		int freeSpace = CreateGui.getFreeSpace(netType);
-
-		setObjects(freeSpace);
-		CreateGui.getModel(freeSpace).setNetType(netType);
+
+	public void createNewEmptyTab(String name, NetType netType){
+		TabContent tab = new TabContent(NetType.TAPN);
+
+		//Set Default Template
+		String templateName = tab.drawingSurface().getNameGenerator().getNewTemplateName();
+		Template template = new Template(new TimedArcPetriNet(templateName), new DataLayer(), new Zoomer());
+		tab.addTemplate(template, false);
+
+		createNewTab(name, tab);
+	}
+
+	public void createNewTab(String name, TabContent tab) {
+		//int freeSpace = CreateGui.getFreeSpace(netType);
+
+		//setObjects(freeSpace);
+		//CreateGui.getModel(freeSpace).setNetType(netType);
 
 		if (name == null || name.isEmpty()) {
 			name = "New Petri net " + (newNameCounter++) + ".xml";
 		}
-
-		TabContent tab = CreateGui.getTab(freeSpace);
+		
+		//tab.setCurrentTemplate(template);
+		CreateGui.addTab(tab);
 		appTab.addTab(name, tab);
-		appTab.setTabComponentAt(freeSpace, new TabComponent(appTab));
-		appTab.setSelectedIndex(freeSpace);
-
-		String templateName = tab.drawingSurface().getNameGenerator().getNewTemplateName();
-		Template template = new Template(new TimedArcPetriNet(templateName), new DataLayer(), new Zoomer());
-		tab.addTemplate(template);
-
-		tab.setCurrentTemplate(template);
-
-		appView.setNetChanged(false); // Status is unchanged
-		appView.updatePreferredSize();
-
-		setTitle(name);// Change the program caption
-		appTab.setTitleAt(freeSpace, name);
-		selectAction.actionPerformed(null);
+		int newTabIndex = appTab.getTabCount()-1;
+		appTab.setTabComponentAt(newTabIndex, new TabComponent(appTab));
+
+		//appView.setNetChanged(false); // Status is unchanged
+		//appView.updatePreferredSize();
+
+		//setTitle(name);// Change the program caption
+		//appTab.setTitleAt(freeSpace, name);
+		//selectAction.actionPerformed(null);
+		changeToTab(newTabIndex);
 	}
 
 
 	/**
 	 * Creates a new tab with the selected file, or a new file if filename==null
-	 * 
-	 * @param filename
-	 *            Filename of net to load, or <b>null</b> to create a new, empty
-	 *            tab
 	 */
-	public void createNewTabFromFile(InputStream file, String namePrefix) {
+	public TabContent createNewTabFromFile(InputStream file, String name) {
 		int freeSpace = CreateGui.getFreeSpace(NetType.TAPN);
-		String name = "";
+
 
 		setObjects(freeSpace);
 		int currentlySelected = appTab.getSelectedIndex();
 
-
-		if (namePrefix == null || namePrefix.equals("")) {
+		if (name == null || name.equals("")) {
 			name = "New Petri net " + (newNameCounter++) + ".xml";
-		} else {
-			name = namePrefix + ".xml";
+		} else if (!name.toLowerCase().endsWith(".xml")){
+			name = name + ".xml";
 		}
 
 		TabContent tab = CreateGui.getTab(freeSpace);
@@ -1515,56 +1709,52 @@
 		appTab.setTabComponentAt(freeSpace, new TabComponent(appTab));
 		appTab.setSelectedIndex(freeSpace);
 
-		if (file != null) {
-			try {
-				TabContent currentTab = (TabContent) appTab.getSelectedComponent();
-				if (CreateGui.getApp() != null) {
-					// Notifies used to indicate new instances.
-					CreateGui.getApp().setMode(ElementType.CREATING);
-				}
-
-				ModelLoader loader = new ModelLoader(currentTab.drawingSurface());
-				LoadedModel loadedModel = loader.load(file);
-
-				currentTab.setNetwork(loadedModel.network(), loadedModel.templates());
-				currentTab.setQueries(loadedModel.queries());
-				currentTab.setConstants(loadedModel.network().constants());
-				currentTab.setupNameGeneratorsFromTemplates(loadedModel.templates());
-
-				currentTab.selectFirstElements();
-
-				if (CreateGui.getApp() != null) {
-					CreateGui.getApp().restoreMode();
-				}
-
-				CreateGui.setFile(null, freeSpace);
-			} catch (Exception e) {
-				undoAddTab(currentlySelected);
-				JOptionPane.showMessageDialog(GuiFrame.this,
-						"TAPAAL encountered an error while loading the file: " + name + "\n\nPossible explanations:\n  - " + e.toString(), 
-						"Error loading file: " + name, 
-						JOptionPane.ERROR_MESSAGE);
-				return;
-			}
+
+		try {
+			if (CreateGui.getApp() != null) {
+				// Notifies used to indicate new instances.
+				CreateGui.getApp().setMode(ElementType.CREATING);
+			}
+
+			ModelLoader loader = new ModelLoader(tab.drawingSurface());
+			LoadedModel loadedModel = loader.load(file);
+
+			tab.setNetwork(loadedModel.network(), loadedModel.templates());
+			tab.setQueries(loadedModel.queries());
+			tab.setConstants(loadedModel.network().constants());
+			tab.setupNameGeneratorsFromTemplates(loadedModel.templates());
+
+			tab.selectFirstElements();
+
+			if (CreateGui.getApp() != null) {
+				CreateGui.getApp().restoreMode();
+			}
+
+			tab.setFile(null);
+		} catch (Exception e) {
+			undoAddTab(currentlySelected);
+			JOptionPane.showMessageDialog(GuiFrame.this,
+					"TAPAAL encountered an error while loading the file: " + name + "\n\nPossible explanations:\n  - " + e.toString(),
+					"Error loading file: " + name,
+					JOptionPane.ERROR_MESSAGE);
+			return null;
 		}
 
-		appView.setNetChanged(false); // Status is unchanged
-		appView.updatePreferredSize();
+
+		//appView.updatePreferredSize(); //XXX 2018-05-23 kyrke seems not to be needed
 		setTitle(name);// Change the program caption
-		appTab.setTitleAt(freeSpace, name);
+		//appTab.setTitleAt(freeSpace, name); //Set above in addTab
 		selectAction.actionPerformed(null);
+		return tab;
 	}
 
+
 	/**
 	 * Creates a new tab with the selected file, or a new file if filename==null
-	 * 
-	 * @param filename
-	 *            Filename of net to load, or <b>null</b> to create a new, empty
-	 *            tab
 	 */
-	public void createNewTabFromFile(File file, boolean loadPNML) {
+	public void createNewTabFromPNMLFile(File file) {
 		int freeSpace = CreateGui.getFreeSpace(NetType.TAPN);
-		String name = "";
+		String name;
 
 		setObjects(freeSpace);
 		int currentlySelected = appTab.getSelectedIndex();
@@ -1582,53 +1772,62 @@
 
 		if (file != null) {
 			try {
-				TabContent currentTab = (TabContent) appTab.getSelectedComponent();
 				if (CreateGui.getApp() != null) {
 					// Notifies used to indicate new instances.
 					CreateGui.getApp().setMode(ElementType.CREATING);
 				}
 
 				LoadedModel loadedModel;
-				if(loadPNML){
-					PNMLoader loader = new PNMLoader(currentTab.drawingSurface());
-					loadedModel = loader.load(file);
-				} else {
-					ModelLoader loader = new ModelLoader(currentTab.drawingSurface());
-					loadedModel = loader.load(file);
-				}
-
-				currentTab.setNetwork(loadedModel.network(), loadedModel.templates());
-				currentTab.setQueries(loadedModel.queries());
-				currentTab.setConstants(loadedModel.network().constants());
-				currentTab.setupNameGeneratorsFromTemplates(loadedModel.templates());
-
-				currentTab.selectFirstElements();
+
+				PNMLoader loader = new PNMLoader(tab.drawingSurface());
+				loadedModel = loader.load(file);
+
+
+				tab.setNetwork(loadedModel.network(), loadedModel.templates());
+				tab.setQueries(loadedModel.queries());
+				tab.setConstants(loadedModel.network().constants());
+				tab.setupNameGeneratorsFromTemplates(loadedModel.templates());
+
+				tab.selectFirstElements();
 
 				if (CreateGui.getApp() != null) {
 					CreateGui.getApp().restoreMode();
 				}
 
-				if(!loadPNML){
-					CreateGui.setFile(file, freeSpace);
-				}
 			} catch (Exception e) {
 				undoAddTab(currentlySelected);
 				JOptionPane.showMessageDialog(GuiFrame.this,
-						"TAPAAL encountered an error while loading the file: " + name + "\n\nPossible explanations:\n  - " + e.toString(), 
-						"Error loading file: " + name, 
+						"TAPAAL encountered an error while loading the file: " + name + "\n\nPossible explanations:\n  - " + e.toString(),
+						"Error loading file: " + name,
 						JOptionPane.ERROR_MESSAGE);
 				return;
 			}
 		}
 
-		appView.setNetChanged(false); // Status is unchanged
-		appView.updatePreferredSize();
-		name = name.replace(".pnml",".xml"); // rename .pnml input file to .xml	
+		//appView.updatePreferredSize(); //XXX 2018-05-23 kyrke seems not to be needed
+		name = name.replace(".pnml",".xml"); // rename .pnml input file to .xml
 		setTitle(name);// Change the program caption
-		appTab.setTitleAt(freeSpace, name);
+		//appTab.setTitleAt(freeSpace, name); //Set above in addTab
 		selectAction.actionPerformed(null);
 	}
 
+
+	/**
+	 * Creates a new tab with the selected file, or a new file if filename==null