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

[Kenneth Yrke Jørgensen]

[Jiri Srba (srba)]

Tested and fixes the problem.

review: Approve

Unmerged revisions

1156. By Kenneth Yrke Jørgensen on 2021-10-26

Fixed bug #1947517, no popup on arcpathpoint

Fixes a bug where rightclicking on an arcpath point would not
display the popup menu.
Also fixes a bug where a NPE would be throw if you right clicked on the
first archpath point.

1155. By Kenneth Yrke Jørgensen on 2021-10-20

Synced with trunk

1154. By Kenneth Yrke Jørgensen on 2021-10-09

Made members final

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

Code cleanup

1152. By Kenneth Yrke Jørgensen on 2021-10-08

Refactored to use gridbaghelper

1151. By Kenneth Yrke Jørgensen on 2021-10-08

Refactored to use GridBagHelper

1150. By Kenneth Yrke Jørgensen on 2021-10-08

Code cleanup

1149. By Kenneth Yrke Jørgensen on 2021-10-08

Removed unsed param from switchToAnimationMode

1148. By Kenneth Yrke Jørgensen on 2021-10-08

Changed animator Panel to use its own copy of TemplateExplorer
insted of swapping the component between editor and animator

1147. By Kenneth Yrke Jørgensen on 2021-10-08

Code cleanup

=== modified file 'src/dk/aau/cs/gui/TabContent.java'
--- src/dk/aau/cs/gui/TabContent.java	2021-10-15 14:47:54 +0000
+++ src/dk/aau/cs/gui/TabContent.java	2021-10-26 13:37:18 +0000
@@ -838,7 +838,6 @@
 	private AnimationControlSidePanel animControlerBox;
     private AnimationHistorySidePanel animationHistorySidePanel;
 
-	private JScrollPane animationControllerScrollPane;
 	private AnimationHistoryList abstractAnimationPane = null;
 	private JPanel animationControlsPanel;
 	private TransitionFiringComponent transitionFiring;
@@ -1119,16 +1118,11 @@
 		safeApp.ifPresent(tab -> tab.updatedTabName(this));
 	}
 
-	/** Creates a new animationHistory text area, and returns a reference to it */
-	private void createAnimationHistory() {
+    private void createAnimatorSplitPane() {
+
         animationHistorySidePanel = new AnimationHistorySidePanel();
-	}
-
-	private void createAnimatorSplitPane() {
-
-	    createAnimationHistory();
-
-		if (animControlerBox == null) {
+
+        if (animControlerBox == null) {
             createAnimationControlSidePanel();
         }
 		if (transitionFiring == null) {
@@ -1193,9 +1187,6 @@
             )
         );
 
-        JButton dummy = new JButton("AnimatorDummy");
-        dummy.setMinimumSize(templateExplorer.getMinimumSize());
-        dummy.setPreferredSize(templateExplorer.getPreferredSize());
         animatorSplitPane.add(new JPanel(), templateExplorerName);
 
 		animatorSplitPane.add(animationControlsPanel, animControlName);
@@ -1205,7 +1196,7 @@
 		animatorSplitPane.repaint();
 	}
 
-	public void switchToAnimationComponents(boolean showEnabledTransitions) {
+	public void switchToAnimationComponents() {
 		
 		//Remove dummy
 		Component dummy = animatorSplitPane.getMultiSplitLayout().getComponentForNode(animatorSplitPane.getMultiSplitLayout().getNodeForName(templateExplorerName));
@@ -1214,17 +1205,9 @@
 		}
 
 		//Add the templateExplorer
-		animatorSplitPane.add(templateExplorer, templateExplorerName);
-
-		// Inserts dummy to avoid nullpointerexceptions from the displaynode
-		// method. A component can only be on one splitpane at the time
-		dummy = new JButton("EditorDummy");
-		dummy.setMinimumSize(templateExplorer.getMinimumSize());
-		dummy.setPreferredSize(templateExplorer.getPreferredSize());
-		editorSplitPane.add(dummy, templateExplorerName);
-
-		templateExplorer.switchToAnimationMode();
-		showEnabledTransitionsList(showEnabledTransitions);
+        var t = new TemplateExplorer(this);
+        t.switchToAnimationMode();
+		animatorSplitPane.add(t, templateExplorerName);
 		
 		this.setLeftComponent(animatorSplitPaneScroller);
 	}
@@ -1236,32 +1219,7 @@
 
     }
 
-	public void switchToEditorComponents() {
-		
-		//Remove dummy
-		Component dummy = editorSplitPane.getMultiSplitLayout().getComponentForNode(editorSplitPane.getMultiSplitLayout().getNodeForName(templateExplorerName));
-		if(dummy != null){
-			editorSplitPane.remove(dummy);
-		}
-		
-		//Add the templateexplorer again
-		editorSplitPane.add(templateExplorer, templateExplorerName);
-		if (animatorSplitPane != null) {
-
-			// Inserts dummy to avoid nullpointerexceptions from the displaynode
-			// method. A component can only be on one splitpane at the time
-			dummy = new JButton("AnimatorDummy");
-			dummy.setMinimumSize(templateExplorer.getMinimumSize());
-			dummy.setPreferredSize(templateExplorer.getPreferredSize());
-			animatorSplitPane.add(dummy, templateExplorerName);
-		}
-
-		templateExplorer.switchToEditorMode();
-		this.setLeftComponent(editorSplitPaneScroller);
-		//drawingSurface.repaintAll();
-	}
-
-	public AnimationHistoryList getUntimedAnimationHistory() {
+    public AnimationHistoryList getUntimedAnimationHistory() {
 		return abstractAnimationPane;
 	}
 
@@ -1744,7 +1702,7 @@
 		if (!animationmode) {
 			if (numberOfActiveTemplates() > 0) {
 				app.ifPresent(o->o.setGUIMode(GuiFrame.GUIMode.animation));
-                switchToAnimationComponents(true);
+                switchToAnimationComponents();
 
 				setManager(animationModeController);
 
@@ -1793,9 +1751,9 @@
                 getAnimator().restoreModel();
             }
 
-            switchToEditorComponents();
+            this.setLeftComponent(editorSplitPaneScroller);
 
-			setManager(notingManager);
+            setManager(notingManager);
 
 			drawingSurface().setBackground(Pipe.ELEMENT_FILL_COLOUR);
 			setMode(Pipe.ElementType.SELECT);
@@ -2738,6 +2696,10 @@
                 e-> ((Arc) e.pno).getMouseHandler().getPopup(e.e).show(e.pno, e.e.getX(), e.e.getY())
             );
             registerEvent(
+                e->e.pno instanceof ArcPathPoint && e.a == MouseAction.rightClicked,
+                e-> ((ArcPathPoint) e.pno).getMouseHandler().getPopup(e.e).show(e.pno, e.e.getX(), e.e.getY())
+            );
+            registerEvent(
                 e->e.pno instanceof AnnotationNote && e.a == MouseAction.doubleClicked,
                 e-> ((AnnotationNote) e.pno).enableEditMode()
             );

=== modified file 'src/dk/aau/cs/gui/TemplateExplorer.java'
--- src/dk/aau/cs/gui/TemplateExplorer.java	2021-04-08 08:30:29 +0000
+++ src/dk/aau/cs/gui/TemplateExplorer.java	2021-10-26 13:37:18 +0000
@@ -39,6 +39,7 @@
 import dk.aau.cs.gui.undo.MoveElementDownCommand;
 import dk.aau.cs.gui.undo.MoveElementUpCommand;
 import net.tapaal.resourcemanager.ResourceManager;
+import net.tapaal.swinghelpers.GridBagHelper;
 import net.tapaal.swinghelpers.SwingHelper;
 import pipe.dataLayer.DataLayer;
 import pipe.dataLayer.TAPNQuery;
@@ -66,6 +67,9 @@
 import dk.aau.cs.util.Tuple;
 import pipe.gui.widgets.SidePane;
 
+import static net.tapaal.swinghelpers.GridBagHelper.Anchor.*;
+import static net.tapaal.swinghelpers.GridBagHelper.Fill.BOTH;
+
 public class TemplateExplorer extends JPanel implements SidePane {
 
 	// Template explorer panel items
@@ -96,8 +100,6 @@
 	private final static String toolTipSortComponents = "Sort the components alphabetically";
 	private final static String toolTipMoveUp = "Move the selected component up";
 	private final static String toolTipMoveDown = "Move the selected component down";
-    //private static final String toolTipComponents ="Here you can manage the different components of the Net.<html><br/></html>" +
-    	//	"A Net can be broken up in several components and connected via shared places and transitions.";
 	
 	public TemplateExplorer(TabContent parent) {
 		this(parent, false);
@@ -140,29 +142,17 @@
 		addCreatedComponents(hideButtons);
 		
 		this.addComponentListener(new ComponentListener() {
-			int minimumHegiht = TemplateExplorer.this.getMinimumSize().height + sortButton.getMinimumSize().height;
-			public void componentShown(ComponentEvent e) {
-			}
-			
-			
+			final int minimumHegiht = TemplateExplorer.this.getMinimumSize().height + sortButton.getMinimumSize().height;
+
 			public void componentResized(ComponentEvent e) {
-				
 				if(!isInAnimationMode){
-					if(TemplateExplorer.this.getSize().height <= minimumHegiht){
-						sortButton.setVisible(false);
-					} else {
-						sortButton.setVisible(true);
-					}
+                    sortButton.setVisible(TemplateExplorer.this.getSize().height > minimumHegiht);
 				}
 			}
-			
-			
-			public void componentMoved(ComponentEvent e) {
-			}
-			
-			
-			public void componentHidden(ComponentEvent e) {
-			}
+
+            public void componentShown(ComponentEvent e) {}
+			public void componentMoved(ComponentEvent e) {}
+			public void componentHidden(ComponentEvent e) {}
 		});
 	}
 
@@ -195,11 +185,7 @@
 
 		listModel.addListDataListener(new ListDataListener() {
 			public void contentsChanged(ListDataEvent arg0) {
-				if (parent.numberOfActiveTemplates() > 1) {
-					removeTemplateButton.setEnabled(false);
-				} else {
-					removeTemplateButton.setEnabled(true);
-				}
+                removeTemplateButton.setEnabled(parent.numberOfActiveTemplates() <= 1);
 			}
 
 			public void intervalAdded(ListDataEvent arg0) {
@@ -218,74 +204,59 @@
 
 		templateList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		templateList.setSelectedIndex(0);
-		templateList.setCellRenderer(new TemplateListCellRenderer(templateList.getCellRenderer()));
+		templateList.setCellRenderer(new TemplateListCellRenderer<>(templateList.getCellRenderer()));
 		
 		TemplateListManager manager = new TemplateListManager(templateList);
 		templateList.addListSelectionListener(manager);
 		templateList.addMouseListener(manager);
-		
-		//templateList.setFocusTraversalKeysEnabled(false);
 
 		scrollpane = new JScrollPane(templateList);
 		//Add 10 pixel to the minimumsize of the scrollpane
 		scrollpane.setMinimumSize(new Dimension(scrollpane.getMinimumSize().width, scrollpane.getMinimumSize().height + 20));
 		
-		GridBagConstraints gbc = new GridBagConstraints();
-		gbc.gridx = 0;
-		gbc.gridy = 0;
+		var gbc = GridBagHelper.as(0, 0, NORTHWEST, BOTH);
 		gbc.gridheight = 3;
 		gbc.weightx = 1;
 		gbc.weighty = 1;
-		gbc.fill = GridBagConstraints.BOTH;
-		gbc.anchor = GridBagConstraints.NORTHWEST;
+
 		templatePanel.add(scrollpane, gbc);
 		
 		moveUpButton = new JButton(ResourceManager.getIcon("Up.png"));
 		moveUpButton.setMargin(new Insets(2,2,2,2));
 		moveUpButton.setEnabled(false);
 		moveUpButton.setToolTipText(toolTipMoveUp);
-		moveUpButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				int index = templateList.getSelectedIndex();
-				
-				if(index > 0) {
-				    Command c = new MoveElementUpCommand(TemplateExplorer.this, index, index-1);
-				    undoManager.addNewEdit(c);
-				    c.redo();
-                    templateList.ensureIndexIsVisible(index+1);
-					templateList.setSelectedIndex(index-1);
-				}
-			}
-		});
+		moveUpButton.addActionListener(e -> {
+            int index = templateList.getSelectedIndex();
+
+            if(index > 0) {
+                Command c = new MoveElementUpCommand(TemplateExplorer.this, index, index-1);
+                undoManager.addNewEdit(c);
+                c.redo();
+                templateList.ensureIndexIsVisible(index+1);
+                templateList.setSelectedIndex(index-1);
+            }
+        });
 		
-		gbc = new GridBagConstraints();
-		gbc.gridx = 1;
-		gbc.gridy = 0;
-		gbc.anchor = GridBagConstraints.SOUTH;
+		gbc = GridBagHelper.as(1, 0, SOUTH);
 		templatePanel.add(moveUpButton,gbc);
 		
 		moveDownButton = new JButton(ResourceManager.getIcon("Down.png"));
 		moveDownButton.setMargin(new Insets(2,2,2,2));
 		moveDownButton.setEnabled(false);
 		moveDownButton.setToolTipText(toolTipMoveDown);
-		moveDownButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				int index = templateList.getSelectedIndex();
-				
-				if(index < parent.network().allTemplates().size() - 1) {
-                    Command c = new MoveElementDownCommand(TemplateExplorer.this, index, index+1);
-                    undoManager.addNewEdit(c);
-                    c.redo();
-                    templateList.ensureIndexIsVisible(index+1);
-					templateList.setSelectedIndex(index+1);
-				}
-			}
-		});
+		moveDownButton.addActionListener(e -> {
+            int index = templateList.getSelectedIndex();
+
+            if(index < parent.network().allTemplates().size() - 1) {
+                Command c = new MoveElementDownCommand(TemplateExplorer.this, index, index+1);
+                undoManager.addNewEdit(c);
+                c.redo();
+                templateList.ensureIndexIsVisible(index+1);
+                templateList.setSelectedIndex(index+1);
+            }
+        });
 		
-		gbc = new GridBagConstraints();
-		gbc.gridx = 1;
-		gbc.gridy = 1;
-		gbc.anchor = GridBagConstraints.NORTH;
+		gbc = GridBagHelper.as(1, 1, NORTH);
 		templatePanel.add(moveDownButton,gbc);
 		
 		//Sort button
@@ -299,11 +270,7 @@
 			command.redo();
 		});
 		
-		gbc = new GridBagConstraints();
-		gbc.gridx = 1;
-		gbc.gridy = 2;
-		gbc.fill = GridBagConstraints.HORIZONTAL;
-		gbc.anchor = GridBagConstraints.NORTH;
+		gbc = GridBagHelper.as(1,2, NORTH, GridBagHelper.Fill.HORIZONTAL);
 		templatePanel.add(sortButton,gbc);
 	}
 
@@ -402,10 +369,7 @@
 			}
 		});
 
-		gbc = new GridBagConstraints();
-		gbc.gridx = 0;
-		gbc.gridy = 1;
-		gbc.anchor = GridBagConstraints.WEST;
+		gbc = GridBagHelper.as(0, 1, WEST);
 		buttonPanel.add(removeTemplateButton, gbc);
 
 		renameButton = new JButton("Rename");
@@ -413,17 +377,12 @@
 		renameButton.setPreferredSize(dimension);
 		renameButton.setToolTipText(toolTipRenameComponent);
 
-		renameButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				showRenameTemplateDialog("");
-				templateList.validate();
-			}
-		});
+		renameButton.addActionListener(arg0 -> {
+            showRenameTemplateDialog("");
+            templateList.validate();
+        });
 
-		gbc = new GridBagConstraints();
-		gbc.gridx = 1;
-		gbc.gridy = 0;
-		gbc.anchor = GridBagConstraints.WEST;
+		gbc = GridBagHelper.as(1, 0, WEST);
 		buttonPanel.add(renameButton, gbc);
 
 		copyButton = new JButton("Copy");
@@ -459,18 +418,14 @@
 			}
 		});
 
-		gbc = new GridBagConstraints();
-		gbc.gridx = 0;
-		gbc.gridy = 0;
-		gbc.anchor = GridBagConstraints.WEST;
+		gbc = GridBagHelper.as(0, 0, WEST);
 		buttonPanel.add(copyButton, gbc);
 	}
 	
 	private EscapableDialog dialog;
 	private JPanel container;
 	private JTextField nameTextField;
-	private Dimension size;
-	private JLabel nameLabel;
+    private JLabel nameLabel;
 	private JPanel buttonContainer;
 	private JButton okButton;
 	private JButton cancelButton;
@@ -550,9 +505,8 @@
 		container.setLayout(new GridBagLayout());
 		nameContainer = new JPanel();
 		nameContainer.setLayout(new GridBagLayout());
-		size = new Dimension(330, 25);
 
-		nameTextField = new javax.swing.JTextField();
+        nameTextField = new javax.swing.JTextField();
         SwingHelper.setPreferredWidth(nameTextField,330);
 		nameTextField.setText(nameToShow);
 		nameTextField.addAncestorListener(new RequestFocusListener());
@@ -561,23 +515,12 @@
 			okButton.doClick();
 		});
 
-		GridBagConstraints gbc = new GridBagConstraints();
-		gbc.gridx = 0;
-		gbc.gridy = 1;
-		gbc.gridwidth = 1;
-		gbc.anchor = GridBagConstraints.WEST;
-		//gbc.fill = GridBagConstraints.HORIZONTAL;
-		gbc.insets = new Insets(4, 4, 2, 4);
+		var gbc = GridBagHelper.as(0, 1, 1, WEST, new Insets(4, 4, 2, 4));
 		nameContainer.add(nameTextField,gbc);
 		
 		nameLabel = new JLabel(); 
 		nameLabel.setText("Name of component: ");
-		gbc = new GridBagConstraints();
-		gbc.gridx = 0;
-		gbc.gridy = 0;
-		gbc.gridwidth = 1;
-		gbc.insets = new Insets(4, 4, 2, 4);
-		gbc.anchor = GridBagConstraints.WEST;
+		gbc = GridBagHelper.as(0, 0, 1, WEST, new Insets(4, 4, 2, 4));
 		nameContainer.add(nameLabel,gbc);
 		
 		buttonContainer = new JPanel();
@@ -589,11 +532,7 @@
 		okButton.setMinimumSize(new java.awt.Dimension(100, 25));
 		okButton.setPreferredSize(new java.awt.Dimension(100, 25));
 		okButton.setMnemonic(KeyEvent.VK_O);
-		gbc = new GridBagConstraints();		
-		gbc.gridx = 1;
-		gbc.gridy = 0;
-		gbc.anchor = java.awt.GridBagConstraints.WEST;
-		gbc.insets = new java.awt.Insets(5, 5, 5, 5);
+		gbc = GridBagHelper.as(1,0, WEST, new Insets(5, 5, 5, 5));
 		buttonContainer.add(okButton,gbc);
 		
 		cancelButton = new JButton();
@@ -602,39 +541,17 @@
 		cancelButton.setMinimumSize(new java.awt.Dimension(100, 25));
 		cancelButton.setPreferredSize(new java.awt.Dimension(100, 25));
 		cancelButton.setMnemonic(KeyEvent.VK_C);
-		gbc = new GridBagConstraints();
-		gbc.gridx = 0;
-		gbc.gridy = 0;
-		gbc.gridwidth = java.awt.GridBagConstraints.RELATIVE;
-		gbc.anchor = GridBagConstraints.EAST;
+		gbc = GridBagHelper.as(0, 0, GridBagConstraints.RELATIVE, EAST);
 		buttonContainer.add(cancelButton,gbc);		
 		
-		okButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				onOK();
-			}
-		});
-		
-		cancelButton.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				exit();
-			}
-		});
-		
-		gbc = new GridBagConstraints();
-		gbc.insets = new Insets(0, 8, 5, 8);
-		gbc.gridx = 0;
-		gbc.gridy = 1;
-		gbc.gridwidth = 1;
-		gbc.anchor = GridBagConstraints.EAST;
+		okButton.addActionListener(e -> onOK());
+		
+		cancelButton.addActionListener(e -> exit());
+		
+		gbc = GridBagHelper.as(0,1,1,EAST, new Insets(0, 8, 5, 8));
 		container.add(buttonContainer,gbc);
 		
-		gbc = new GridBagConstraints();
-		gbc.insets = new Insets(0, 8, 5, 8);
-		gbc.gridx = 0;
-		gbc.gridy = 0;
-		gbc.gridwidth = 1;
-		gbc.anchor = GridBagConstraints.WEST;
+		gbc = GridBagHelper.as(0, 0, 1, WEST, new Insets(0, 8, 5, 8));
 		container.add(nameContainer,gbc);
 	}
 
@@ -656,8 +573,7 @@
 	}
 	
 	private void initComponentsOfRenameTemplateDialog(String oldname) {
-		container = new JPanel();
-		container.setLayout(new GridBagLayout());
+
 		nameContainer = new JPanel();
 		nameContainer.setLayout(new GridBagLayout());
 
@@ -669,23 +585,13 @@
 			okButton.requestFocusInWindow();
 			okButton.doClick();
 		});
-		GridBagConstraints gbc = new GridBagConstraints();
-		gbc.gridx = 0;
-		gbc.gridy = 1;
-		gbc.gridwidth = 1;
-		gbc.anchor = GridBagConstraints.WEST;
-		//gbc.fill = GridBagConstraints.HORIZONTAL;
-		gbc.insets = new Insets(4, 4, 2, 4);
+		var gbc = GridBagHelper.as(0,1, 1, WEST, new Insets(4, 4, 2, 4));
 		nameContainer.add(nameTextField,gbc);
 		
 		nameLabel = new JLabel(); 
 		nameLabel.setText("Name of component: ");
-		gbc = new GridBagConstraints();
-		gbc.gridx = 0;
-		gbc.gridy = 0;
-		gbc.gridwidth = 1;
-		gbc.insets = new Insets(4, 4, 2, 4);
-		gbc.anchor = GridBagConstraints.WEST;
+
+		gbc = GridBagHelper.as(0,0,1,WEST,new Insets(4, 4, 2, 4));
 		nameContainer.add(nameLabel,gbc);
 		
 		buttonContainer = new JPanel();
@@ -697,11 +603,8 @@
 		okButton.setMinimumSize(new java.awt.Dimension(100, 25));
 		okButton.setPreferredSize(new java.awt.Dimension(100, 25));
 		okButton.setMnemonic(KeyEvent.VK_O);
-		gbc = new GridBagConstraints();		
-		gbc.gridx = 1;
-		gbc.gridy = 0;
-		gbc.anchor = java.awt.GridBagConstraints.WEST;
-		gbc.insets = new java.awt.Insets(5, 5, 5, 5);
+
+		gbc = GridBagHelper.as(1,0, WEST, new Insets(5, 5, 5, 5));
 		buttonContainer.add(okButton,gbc);
 		
 		cancelButton = new JButton();
@@ -710,31 +613,21 @@
 		cancelButton.setMinimumSize(new java.awt.Dimension(100, 25));
 		cancelButton.setPreferredSize(new java.awt.Dimension(100, 25));
 		cancelButton.setMnemonic(KeyEvent.VK_C);
-		gbc = new GridBagConstraints();
-		gbc.gridx = 0;
-		gbc.gridy = 0;
-		gbc.gridwidth = java.awt.GridBagConstraints.RELATIVE;
-		gbc.anchor = GridBagConstraints.EAST;
+
+		gbc = GridBagHelper.as(0,0, GridBagConstraints.RELATIVE, EAST);
 		buttonContainer.add(cancelButton,gbc);		
 		
 		okButton.addActionListener(e -> onOKRenameTemplate());
 		
 		cancelButton.addActionListener(e -> exit());
+
+        container = new JPanel();
+        container.setLayout(new GridBagLayout());
 		
-		gbc = new GridBagConstraints();
-		gbc.insets = new Insets(0, 8, 5, 8);
-		gbc.gridx = 0;
-		gbc.gridy = 1;
-		gbc.gridwidth = 1;
-		gbc.anchor = GridBagConstraints.EAST;
+		gbc = GridBagHelper.as(0,1,1,EAST,new Insets(0, 8, 5, 8));
 		container.add(buttonContainer,gbc);
 		
-		gbc = new GridBagConstraints();
-		gbc.insets = new Insets(0, 8, 5, 8);
-		gbc.gridx = 0;
-		gbc.gridy = 0;
-		gbc.gridwidth = 1;
-		gbc.anchor = GridBagConstraints.WEST;
+		gbc = GridBagHelper.as(0,0,1,WEST,new Insets(0, 8, 5, 8));
 		container.add(nameContainer,gbc);
 
 	}
@@ -777,7 +670,6 @@
 		if (tapn != null) {
 			parent.changeToTemplate(tapn);
 		}
-		//parent.drawingSurface().repaintAll();
 	}
 
 	public Template selectedModel() {
@@ -809,7 +701,7 @@
 	}
 	
 	public void selectFirst() {
-			templateList.setSelectedIndex(0);
+        templateList.setSelectedIndex(0);
 	}
 
 	public void hideButtons() {
@@ -853,46 +745,45 @@
 	    return templateList;
     }
 
-    private class TemplateListCellRenderer extends JPanel implements ListCellRenderer {
+    private class TemplateListCellRenderer<T> extends JPanel implements ListCellRenderer<T> {
 
 		private static final String UNCHECK_TO_DEACTIVATE = "Uncheck to deactive the component";
 		private static final String CHECK_TO_ACTIVATE = "Check to active the component";
 		private final JCheckBox activeCheckbox = new JCheckBox();
-		private final ListCellRenderer cellRenderer;
-		
-		
-		public TemplateListCellRenderer(ListCellRenderer renderer) {
+		private final ListCellRenderer<T> cellRenderer;
+		
+		
+		public TemplateListCellRenderer(ListCellRenderer<T> renderer) {
 			cellRenderer = renderer;
 			setLayout(new BorderLayout()); 
 	        setOpaque(false); 
 	        activeCheckbox.setOpaque(false);
 		}
-		
-		public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-			Component renderer = cellRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-			removeAll();
-			if(!isInAnimationMode) { 
-				boolean isActive = ((Template)value).isActive();
-				activeCheckbox.setSelected(isActive);
-				setToolTipText((isActive)? UNCHECK_TO_DEACTIVATE : CHECK_TO_ACTIVATE);
-				add(activeCheckbox, BorderLayout.WEST);
-			} else {
-				
-				setToolTipText(null);
-			}
-			add(renderer, BorderLayout.CENTER);
-			return this;
-		}
-		
-		
-	}
+
+        @Override
+        public Component getListCellRendererComponent(JList<? extends T> list, T value, int index, boolean isSelected, boolean cellHasFocus) {
+            Component renderer = cellRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+            removeAll();
+            if(!isInAnimationMode) {
+                boolean isActive = ((Template)value).isActive();
+                activeCheckbox.setSelected(isActive);
+                setToolTipText((isActive)? UNCHECK_TO_DEACTIVATE : CHECK_TO_ACTIVATE);
+                add(activeCheckbox, BorderLayout.WEST);
+            } else {
+
+                setToolTipText(null);
+            }
+            add(renderer, BorderLayout.CENTER);
+            return this;
+        }
+    }
 	
 	private class TemplateListManager extends MouseAdapter implements ListSelectionListener, ActionListener {
 		private final int checkBoxWidth = new JCheckBox().getPreferredSize().width;
 		private final ListSelectionModel selectionModel;
-		private final JList list;
+		private final JList<Template> list;
 		
-		public TemplateListManager(JList list) {
+		public TemplateListManager(JList<Template> list) {
 			this.list = list;
 			selectionModel = list.getSelectionModel();
 			this.list.registerKeyboardAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0), JComponent.WHEN_FOCUSED);
@@ -902,7 +793,7 @@
 			if(index<0) 
 				return; 
 
-			Template item = ((Template)list.getModel().getElementAt(index));
+			Template item = list.getModel().getElementAt(index);
 
 
 			if(!selectionModel.isSelectedIndex(index)) {
@@ -925,11 +816,7 @@
 			if (!selectedModel().isActive()){
 				removeTemplateButton.setEnabled(true);
 			}else {
-				if (parent.numberOfActiveTemplates() <= 1) {
-					removeTemplateButton.setEnabled(false);
-				} else {
-					removeTemplateButton.setEnabled(true);
-				}
+                removeTemplateButton.setEnabled(parent.numberOfActiveTemplates() > 1);
 			}
 			 
 			toggleAffectedQueries();
@@ -960,9 +847,10 @@
 			if(index<0) 
 				return; 
 			
-			if(e.getX()>templateList.getCellBounds(index, index).x+checkBoxWidth) 
-				return; 
-			
+			if(e.getX()>templateList.getCellBounds(index, index).x+checkBoxWidth) {
+                return;
+            }
+
 			if (!isInAnimationMode){
 				toggleSelection(index);
 			}
@@ -984,32 +872,14 @@
 						if (parent.numberOfActiveTemplates() > 1){
 							removeTemplateButton.setEnabled(true);
 						}else{
-							if (selectedModel().isActive()){
-								removeTemplateButton.setEnabled(false);
-							} else {
-								removeTemplateButton.setEnabled(true);
-							}
+                            removeTemplateButton.setEnabled(!selectedModel().isActive());
 						}
 						renameButton.setEnabled(true);
 						copyButton.setEnabled(true);
-						if(templateList.getModel().getSize() >= 2) {
-                            sortButton.setEnabled(true);
-                        } else {
-                            sortButton.setEnabled(false);
-                        }
+                        sortButton.setEnabled(templateList.getModel().getSize() >= 2);
 
-						if(index > 0) {
-                            moveUpButton.setEnabled(true);
-                        } else {
-                            moveUpButton.setEnabled(false);
-                        }
-								
-							
-						if(index < parent.network().allTemplates().size() - 1) {
-                            moveDownButton.setEnabled(true);
-                        } else {
-                            moveDownButton.setEnabled(false);
-                        }
+                        moveUpButton.setEnabled(index > 0);
+                        moveDownButton.setEnabled(index < parent.network().allTemplates().size() - 1);
 					}
 					templateList.ensureIndexIsVisible(index);
 					openSelectedTemplate();

=== added directory 'src/dk/aau/cs/gui/debug'
=== added file 'src/dk/aau/cs/gui/debug/Debug.kt'
--- src/dk/aau/cs/gui/debug/Debug.kt	1970-01-01 00:00:00 +0000
+++ src/dk/aau/cs/gui/debug/Debug.kt	2021-10-26 13:37:18 +0000
@@ -0,0 +1,38 @@
+package dk.aau.cs.gui.debug
+
+import dk.aau.cs.gui.TabContentActions
+import pipe.gui.GuiFrame
+import pipe.gui.action.GuiAction
+import java.awt.event.ActionEvent
+import java.util.function.Consumer
+import javax.swing.AbstractAction
+import javax.swing.Action
+import javax.swing.JMenu
+import javax.swing.KeyStroke
+
+fun noOp() {}
+object DEBUG {
+
+    @JvmStatic fun buildMenuDEBUG(): JMenu? {
+
+        val debugMenu = JMenu("DEBUG")
+
+        with(debugMenu) {
+
+            add(object : AbstractAction("Break Point") {
+                override fun actionPerformed(e: ActionEvent) = noOp()
+            })
+
+            add(object : AbstractAction("Throw Exception") {
+                override fun actionPerformed(e: ActionEvent) = throw RuntimeException("Casted Exception from DEBUG")
+            })
+
+            add(object : AbstractAction("Show undo/redo stack") {
+                override fun actionPerformed(e: ActionEvent) = UndoRedoSpy().show()
+            })
+        }
+
+        return debugMenu
+    }
+
+}
\ No newline at end of file

=== added file 'src/dk/aau/cs/gui/debug/UndoRedoSpy.kt'
--- src/dk/aau/cs/gui/debug/UndoRedoSpy.kt	1970-01-01 00:00:00 +0000
+++ src/dk/aau/cs/gui/debug/UndoRedoSpy.kt	2021-10-26 13:37:18 +0000
@@ -0,0 +1,53 @@
+package dk.aau.cs.gui.debug
+
+import dk.aau.cs.gui.undo.Command
+import pipe.gui.CreateGui
+import pipe.gui.undo.UndoManager
+import java.awt.event.ActionEvent
+import java.util.ArrayList
+import javax.swing.*
+import javax.swing.tree.DefaultMutableTreeNode
+import javax.swing.tree.DefaultTreeModel
+
+class UndoRedoSpy() : JFrame() {
+
+    private val reloadBtn = JButton(object : AbstractAction("Reload") {
+        override fun actionPerformed(e: ActionEvent?) {
+            reloadUndoRedoStack()
+        }
+    })
+
+    private val treeRoot = DefaultMutableTreeNode("root")
+    private val tree = JTree(treeRoot)
+
+    private fun reloadUndoRedoStack() {
+        val m = tree.model as DefaultTreeModel
+        treeRoot.removeAllChildren()
+
+        val edits = UndoManager::class.java.getDeclaredField("edits")
+        edits.isAccessible = true
+        val e = edits.get(CreateGui.getCurrentTab().undoManager) as ArrayList<ArrayList<Command>?>
+
+        e.forEach {
+            if (it != null && it.size > 0) {
+                treeRoot.add(DefaultMutableTreeNode(it))
+            }
+        }
+        m.reload()
+        tree.expandRow(0)
+    }
+
+
+    init {
+        contentPane.layout = BoxLayout(contentPane, BoxLayout.Y_AXIS)
+        contentPane.add(reloadBtn)
+
+        contentPane.add(JScrollPane(tree))
+
+        reloadUndoRedoStack()
+        pack()
+
+    }
+
+
+}
\ No newline at end of file

=== modified file 'src/net/tapaal/TAPAAL.java'
--- src/net/tapaal/TAPAAL.java	2020-10-15 15:44:06 +0000
+++ src/net/tapaal/TAPAAL.java	2021-10-26 13:37:18 +0000
@@ -40,6 +40,7 @@
 
 	public static final String TOOLNAME = "TAPAAL";
 	public static final String VERSION = "DEV";
+	public static final boolean IS_DEV = "DEV".equals(VERSION);
 
 	public static String getProgramName(){
 		return "" + TAPAAL.TOOLNAME + " " + TAPAAL.VERSION;
@@ -69,7 +70,7 @@
 			Logger.enableLogging(true);
 		}
 
-		if (TAPAAL.VERSION.equals("DEV")){
+		if (IS_DEV){
 			Logger.enableLogging(true);
 			Logger.log("Debug logging is enabled by default in DEV branch");
 		}

=== modified file 'src/net/tapaal/swinghelpers/GridBagHelper.java'
--- src/net/tapaal/swinghelpers/GridBagHelper.java	2020-07-23 09:18:11 +0000
+++ src/net/tapaal/swinghelpers/GridBagHelper.java	2021-10-26 13:37:18 +0000
@@ -4,14 +4,12 @@
 
 public class GridBagHelper {
 
-
-
-
     public enum Anchor {
         NORTH(11),
         EAST(13),
         WEST(17),
-        NORTHWEST(18);
+        NORTHWEST(18),
+        SOUTH(15);
 
         public final int value;
 
@@ -21,7 +19,8 @@
     }
 
     public enum Fill {
-        HORIZONTAL(2);
+        HORIZONTAL(2),
+        BOTH(1);
 
         public final int value;
 
@@ -50,6 +49,10 @@
 
         return gridBagConstraints;
     }
+
+    public static GridBagConstraints as(int gridx, int gridy, Anchor anchor, Fill fill) {
+        return as(gridx, gridy, anchor, fill, null);
+    }
     public static GridBagConstraints as(int gridx, int gridy, Anchor anchor, Insets inset) {
         return as(gridx, gridy, anchor, null, inset);
     }
@@ -59,7 +62,7 @@
     }
 
     public static GridBagConstraints as(int gridx, int gridy, Anchor anchor) {
-        return as(gridx, gridy, anchor, null);
+        return as(gridx, gridy, anchor, (Fill)null);
     }
 
     public static GridBagConstraints as(int gridx, int gridy, Insets inset) {
@@ -69,6 +72,9 @@
     public static GridBagConstraints as(int gridx, int gridy) {
         return as(gridx, gridy, null, null, null);
     }
+    public static GridBagConstraints as(int gridx, int gridy, int gridwidth, Anchor anchor) {
+        return as(gridx, gridy, gridwidth, 1, anchor, null);
+    }
     public static GridBagConstraints as(int gridx, int gridy, int gridwidth, Anchor anchor, Insets inset) {
         return as(gridx, gridy, gridwidth, 1, anchor, inset);
     }

=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2021-10-03 13:47:00 +0000
+++ src/pipe/gui/GuiFrame.java	2021-10-26 13:37:18 +0000
@@ -18,6 +18,7 @@
 
 import com.sun.jna.Platform;
 import dk.aau.cs.gui.*;
+import dk.aau.cs.gui.debug.DEBUG;
 import dk.aau.cs.util.JavaUtil;
 import dk.aau.cs.verification.VerifyTAPN.VerifyPN;
 import net.tapaal.Preferences;
@@ -58,8 +59,8 @@
     JMenu viewMenu;
     private JToolBar drawingToolBar;
     private final JLabel featureInfoText = new JLabel();
-    private JComboBox<String> timeFeatureOptions = new JComboBox(new String[]{"No", "Yes"});
-    private JComboBox<String> gameFeatureOptions = new JComboBox(new String[]{"No", "Yes"});
+    private final JComboBox<String> timeFeatureOptions = new JComboBox(new String[]{"No", "Yes"});
+    private final JComboBox<String> gameFeatureOptions = new JComboBox(new String[]{"No", "Yes"});
     private JComboBox<String> zoomComboBox;
 
     private static final int shortcutkey = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
@@ -405,7 +406,7 @@
     };
 
 
-    private GuiAction prevcomponentAction = new GuiAction("Previous component", "Previous component", "pressed UP") {
+    private final GuiAction prevcomponentAction = new GuiAction("Previous component", "Previous component", "pressed UP") {
         public void actionPerformed(ActionEvent e) {
             currentTab.ifPresent(TabContentActions::previousComponent);
         }
@@ -416,14 +417,14 @@
         }
     };
 
-    private GuiAction changeTimeFeatureAction = new GuiAction("Time", "Change time semantics") {
+    private final GuiAction changeTimeFeatureAction = new GuiAction("Time", "Change time semantics") {
         public void actionPerformed(ActionEvent e) {
             boolean isTime = timeFeatureOptions.getSelectedIndex() != 0;
             currentTab.ifPresent(o -> o.changeTimeFeature(isTime));
         }
     };
 
-    private GuiAction changeGameFeatureAction = new GuiAction("Game", "Change game semantics") {
+    private final GuiAction changeGameFeatureAction = new GuiAction("Game", "Change game semantics") {
         public void actionPerformed(ActionEvent e) {
             boolean isGame = gameFeatureOptions.getSelectedIndex() != 0;
             currentTab.ifPresent(o -> o.changeGameFeature(isGame));
@@ -587,12 +588,19 @@
 
         menuBar.add(buildMenuAnimation());
         menuBar.add(buildMenuTools());
+
+        if (TAPAAL.IS_DEV) {
+            menuBar.add(DEBUG.buildMenuDEBUG());
+        }
+
         menuBar.add(buildMenuHelp());
 
         setJMenuBar(menuBar);
 
     }
 
+
+
     private JMenu buildMenuEdit() {
 
         /* Edit Menu */

=== modified file 'src/pipe/gui/handler/ArcHandler.java'
--- src/pipe/gui/handler/ArcHandler.java	2020-07-20 07:19:51 +0000
+++ src/pipe/gui/handler/ArcHandler.java	2021-10-26 13:37:18 +0000
@@ -33,7 +33,7 @@
         popup.insert(new JPopupMenu.Separator(), popupIndex);
 
 
-        if ("DEV".equals(TAPAAL.VERSION)){
+        if (TAPAAL.IS_DEV){
             JTextArea pane = new JTextArea();
             pane.setEditable(false);
 

=== modified file 'src/pipe/gui/handler/ArcPathPointHandler.java'
--- src/pipe/gui/handler/ArcPathPointHandler.java	2020-10-09 09:58:09 +0000
+++ src/pipe/gui/handler/ArcPathPointHandler.java	2021-10-26 13:37:18 +0000
@@ -37,7 +37,7 @@
 		popup.insert(new JPopupMenu.Separator(), 0);
 
 		if (((ArcPathPoint) myObject).getIndex() == 0) {
-			return null;
+			return popup;
 		} else {
 			JMenuItem menuItem = new JMenuItem(new ToggleArcPointAction((ArcPathPoint) myObject));
 

=== modified file 'src/pipe/gui/handler/PetriNetObjectHandler.java'
--- src/pipe/gui/handler/PetriNetObjectHandler.java	2020-08-11 06:00:12 +0000
+++ src/pipe/gui/handler/PetriNetObjectHandler.java	2021-10-26 13:37:18 +0000
@@ -47,7 +47,7 @@
 		menuItem.setText("Delete");
 		popup.add(menuItem);
 
-        if ("DEV".equals(TAPAAL.VERSION)){
+        if (TAPAAL.IS_DEV){
             JTextArea pane = new JTextArea();
             pane.setEditable(false);
 

=== modified file 'src/pipe/gui/handler/PlaceTransitionObjectHandler.java'
--- src/pipe/gui/handler/PlaceTransitionObjectHandler.java	2020-06-29 10:58:39 +0000
+++ src/pipe/gui/handler/PlaceTransitionObjectHandler.java	2021-10-26 13:37:18 +0000
@@ -28,7 +28,7 @@
     @Override
     public JPopupMenu getPopup(MouseEvent e) {
 	    JPopupMenu popup = super.getPopup(e);
-        if ("DEV".equals(TAPAAL.VERSION)){
+        if (TAPAAL.IS_DEV){
             JTextArea pane = new JTextArea();
             pane.setEditable(false);
 

=== added file 'src/pipe/gui/undo/CompundCommand.java'
--- src/pipe/gui/undo/CompundCommand.java	1970-01-01 00:00:00 +0000
+++ src/pipe/gui/undo/CompundCommand.java	2021-10-26 13:37:18 +0000
@@ -0,0 +1,29 @@
+package pipe.gui.undo;
+
+import dk.aau.cs.gui.undo.Command;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CompundCommand extends Command {
+    private final List<Command> commands;
+
+    CompundCommand(List<Command> commands) {
+        this.commands = new ArrayList(commands);
+    }
+
+    @Override
+    public void undo() {
+        // Undo in reverse order (order matters)
+        for (int i = commands.size() - 1; i >= 0; i--) {
+            commands.get(i).undo();
+        }
+    }
+
+    @Override
+    public void redo() {
+        for (Command command : commands) {
+            command.redo();
+        }
+    }
+}

=== added file 'src/pipe/gui/undo/UndoRedoBuffer.java'
--- src/pipe/gui/undo/UndoRedoBuffer.java	1970-01-01 00:00:00 +0000
+++ src/pipe/gui/undo/UndoRedoBuffer.java	2021-10-26 13:37:18 +0000
@@ -0,0 +1,96 @@
+package pipe.gui.undo;
+
+//WIP: Implemented 2021-10 to takeover current undo/redo implementation
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class UndoRedoBuffer<T> {
+
+    public final int CAPACITY;
+    private final T[] buffer;
+
+    private int currentIndex;
+
+    private int elements = 0;
+    private int elementsOnTop = 0;
+
+    UndoRedoBuffer(int capacity) {
+        if (capacity <= 0) {
+            throw new IllegalArgumentException("Capacity must by larger than zero");
+        }
+
+        this.CAPACITY = capacity;
+        this.currentIndex = CAPACITY-1;
+
+        buffer = (T[])new Object[CAPACITY];
+
+    }
+
+    private int nextIndex() {
+        return (CAPACITY + currentIndex + 1) % CAPACITY;
+    }
+    private int previousIndex() {
+        return (CAPACITY + currentIndex - 1) % CAPACITY;
+    }
+
+    public void add(T e) {
+        elementsOnTop = 0;
+        currentIndex = nextIndex();
+        elements = Math.min(elements+1, CAPACITY);
+        buffer[currentIndex] = e;
+    }
+
+    public T rollback() {
+        if (elements > 0) {
+            var t = top();
+
+            elementsOnTop += 1;
+            elements -= 1;
+
+            currentIndex = previousIndex();
+            return t;
+        }
+        return null;
+    }
+
+    public T repeat() {
+        if (elementsOnTop > 0) {
+            elementsOnTop -= 1;
+            elements +=1;
+            currentIndex = nextIndex();
+            return top();
+        }
+        return null;
+    }
+
+    public T top() {
+        if ( elements > 0 ) {
+            return buffer[currentIndex];
+        } else {
+            return null;
+        }
+    }
+
+    public boolean canRepeat() {
+        return elementsOnTop > 0;
+    }
+
+    public boolean canRollback() {
+        return elements > 0;
+    }
+
+    @Override
+    public String toString() {
+        return "UndoRedoBuffer{" +
+            "CAPACITY=" + CAPACITY +
+            ", buffer=" + Arrays.toString(buffer) +
+            ", currentIndex=" + currentIndex +
+            ", elements=" + elements +
+            ", elementsOnTop=" + elementsOnTop +
+            '}';
+    }
+
+    public void print() {
+        System.out.println(this);
+    }
+}