Merge lp:~tapaal-contributor/tapaal/undo-up-down-sidepane-3.6-1870894 into lp:tapaal

[Peter Haahr Taankvist]

Add undo/redo functionality when moving up and down with the arrows in the sidepanes.

Unmerged revisions

1051. By Peter Taankvist <email address hidden> on 2020-05-13

Add undo functionality to up/down arrows in sidepane

1050. By Jiri Srba on 2020-05-10

merged in lp:~tapaal-contributor/tapaal/undo-redo-batchprocessing-3.6-1870904 fixing redo/undo in batch processing in the file selection dialog

1049. By Jiri Srba on 2020-05-10

merged in lp:~tapaal-contributor/tapaal/undo-redo-update-scrollbar-3.6-1875174 fixing unde/redo if a an object is placed outside of the drawing area

1048. By Jiri Srba on 2020-04-16

merged in lp:~tapaal-contributor/tapaal/fix-shared-places-exception-1871091 fixing exceptions in component copying and shared places

1047. By Jiri Srba on 2020-04-16

merged in lp:~tapaal-contributor/tapaal/fix-positionalInfo-detection-1870899 fixing positional info loading for PNML files

1046. By Jiri Srba on 2020-04-11

merged in lp:~tapaal-contributor/tapaal/shared-place-transition-rename-1871091 fixing problem with renaming of shared places

1045. By Jiri Srba on 2020-03-27

merged in lp:~tapaal-contributor/tapaal/pnml-disable-buttons-1868535 fixing enabled buttons when pnml file open fails

1044. By Jiri Srba on 2020-03-27

merged in lp:~tapaal-contributor/tapaal/open-on-windows-1868525 fixing .xml file open on windows

1043. By <email address hidden> on 2020-03-18

changed version number to 3.6.1 - this is the release version

1042. By <email address hidden> on 2020-03-18

changed year from 2019 to 2020

=== modified file 'src/dk/aau/cs/gui/BatchProcessingDialog.java'
--- src/dk/aau/cs/gui/BatchProcessingDialog.java	2020-05-03 09:49:19 +0000
+++ src/dk/aau/cs/gui/BatchProcessingDialog.java	2020-05-13 15:53:33 +0000
@@ -24,14 +24,25 @@
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 
+<<<<<<< TREE
 import dk.aau.cs.gui.undo.AddFileBatchProcessingCommand;
 import dk.aau.cs.gui.undo.Command;
 import dk.aau.cs.gui.undo.RemoveFileBatchProcessingCommand;
+=======
+import dk.aau.cs.gui.undo.Command;
+import dk.aau.cs.verification.batchProcessing.Undo.AddFileCommand;
+import dk.aau.cs.verification.batchProcessing.Undo.RemoveFileCommand;
+>>>>>>> MERGE-SOURCE
 import pipe.dataLayer.TAPNQuery;
 import pipe.dataLayer.TAPNQuery.SearchOption;
 import pipe.gui.CreateGui;
+<<<<<<< TREE
 import net.tapaal.swinghelpers.CustomJSpinner;
 import pipe.gui.undo.UndoManager;
+=======
+import pipe.gui.undo.UndoManager;
+import pipe.gui.widgets.CustomJSpinner;
+>>>>>>> MERGE-SOURCE
 import pipe.gui.widgets.EscapableDialog;
 import pipe.gui.widgets.filebrowser.FileBrowser;
 import pipe.gui.widgets.QueryPane;
@@ -237,6 +248,7 @@
 	private static int memoryTimerCount = 0;
 	private static int memoryTimerMode = 0;
 	private static int peakMemory = -1;
+	private UndoManager undoManager = new UndoManager(null,null,null);
 	
 	private void startMemoryTimer(){
 		if(memoryTimer.isRunning()){
@@ -465,25 +477,51 @@
 		FileBrowser browser = FileBrowser.constructor("Timed-Arc Petri Nets","tapn", "xml", lastPath);
 		File[] filesArray = browser.openFiles();
 		if (filesArray.length>0) {
+<<<<<<< TREE
             undoManager.newEdit();
             for (File file : filesArray) {
+=======
+			undoManager.newEdit();
+			for (File file : filesArray) {
+>>>>>>> MERGE-SOURCE
 				lastPath = file.getParent();
 				if (!files.contains(file)) {
+<<<<<<< TREE
                     Command c = new AddFileBatchProcessingCommand(listModel,file, files, this );
                     c.redo();
                     undoManager.addEdit(c);
+=======
+					Command c = new AddFileCommand(listModel,file,files,this);
+					c.redo();
+					undoManager.addEdit(c);
+
+>>>>>>> MERGE-SOURCE
 				}
 			}
+<<<<<<< TREE
+=======
+			enableButtons();
+>>>>>>> MERGE-SOURCE
 		}
 	}
 
 	private void removeSelectedFiles() {
+<<<<<<< TREE
 	    undoManager.newEdit();
+=======
+		undoManager.newEdit();
+>>>>>>> MERGE-SOURCE
 		for (Object o : fileList.getSelectedValuesList()) {
 			File file = (File) o;
+<<<<<<< TREE
             Command c = new RemoveFileBatchProcessingCommand(listModel,file, files, this );
             c.redo();
             undoManager.addEdit(c);
+=======
+			Command c = new RemoveFileCommand(listModel, file,files,this);
+			c.redo();
+			undoManager.addEdit(c);
+>>>>>>> MERGE-SOURCE
 		}
 	}
 	
@@ -1383,6 +1421,7 @@
 	}
 
 	private void clearFiles() {
+<<<<<<< TREE
         undoManager.newEdit();
 
         for (Object o : listModel.toArray()) {
@@ -1391,6 +1430,15 @@
             c.redo();
             undoManager.addEdit(c);
         }
+=======
+		undoManager.newEdit();
+		for (Object o : listModel.toArray()) {
+			File file = (File)o;
+			Command c = new RemoveFileCommand(listModel,file, files, this );
+			c.redo();
+			undoManager.addEdit(c);
+		}
+>>>>>>> MERGE-SOURCE
 	}
 
 	private void disableButtonsDuringProcessing() {
@@ -1425,6 +1473,25 @@
 
 		enabledVerificationOptionButtons();
 	}
+	private void makeShortcuts(){
+		int shortcutkey = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+		ActionMap am = splitpane.getActionMap();
+		am.put("undo", new AbstractAction() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				undoManager.undo();
+			}
+		});
+		am.put("redo", new AbstractAction() {
+			@Override
+          	public void actionPerformed(ActionEvent e) {
+				undoManager.redo();
+			}
+        });
+		InputMap im = splitpane.getInputMap(JPanel.WHEN_IN_FOCUSED_WINDOW);
+		im.put(KeyStroke.getKeyStroke('Z', shortcutkey), "undo");
+		im.put(KeyStroke.getKeyStroke('Y', shortcutkey), "redo");
+	}
 
 	// Custom cell renderer for the Query Column of the result table display the
 	// property of the query

=== modified file 'src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java'
--- src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java	2020-04-18 12:27:02 +0000
+++ src/dk/aau/cs/gui/SharedPlacesAndTransitionsPanel.java	2020-05-13 15:53:33 +0000
@@ -27,9 +27,11 @@
 import pipe.gui.CreateGui;
 import pipe.gui.undo.UndoManager;
 import pipe.gui.widgets.EscapableDialog;
-
+import pipe.gui.widgets.SidePane;
 import dk.aau.cs.gui.components.NonsearchableJList;
 import dk.aau.cs.gui.undo.Command;
+import dk.aau.cs.gui.undo.MoveElementDownCommand;
+import dk.aau.cs.gui.undo.MoveElementUpCommand;
 import dk.aau.cs.gui.undo.SortSharedPlacesCommand;
 import dk.aau.cs.gui.undo.SortSharedTransitionsCommand;
 import dk.aau.cs.model.tapn.SharedPlace;
@@ -37,7 +39,7 @@
 import dk.aau.cs.model.tapn.TimedArcPetriNetNetwork;
 import dk.aau.cs.util.Require;
 
-public class SharedPlacesAndTransitionsPanel extends JPanel {
+public class SharedPlacesAndTransitionsPanel extends JPanel implements SidePane{
 	private static final String TRANSITION_IS_USED_MESSAGE = "<html>The shared transition is used in one or more components.<br/>TAPAAL will unshare all transitions under this name,<br/>but leave the transitions in the components.</html>";
 	private static final String PLACE_IS_USED_MESSAGE = "<html>The shared place is used in one or more components.<br/>TAPAAL will unshare all places under this name,<br/>but leave the places in the components.</html>";
 
@@ -192,6 +194,7 @@
 		moveUpButton = new JButton(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("resources/Images/Up.png")));
 		moveUpButton.setEnabled(false);
 		moveUpButton.setToolTipText(toolTipMoveUp);
+<<<<<<< TREE
 		moveUpButton.addActionListener(e -> {
 			int index = list.getSelectedIndex();
 
@@ -202,6 +205,19 @@
 					sharedPlacesListModel.swap(index, index-1);
 				list.setSelectedIndex(index-1);
 				list.ensureIndexIsVisible(index-1);
+=======
+		moveUpButton.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				int index = list.getSelectedIndex();
+				
+				if(index > 0) {
+					Command c = new MoveElementUpCommand(SharedPlacesAndTransitionsPanel.this, index, index-1);
+					undoManager.addNewEdit(c);
+					c.redo();
+					list.setSelectedIndex(index-1);
+					list.ensureIndexIsVisible(index-1);
+				}
+>>>>>>> MERGE-SOURCE
 			}
 		});
 		
@@ -214,6 +230,7 @@
 		moveDownButton = new JButton(new ImageIcon(Thread.currentThread().getContextClassLoader().getResource("resources/Images/Down.png")));
 		moveDownButton.setEnabled(false);
 		moveDownButton.setToolTipText(toolTipMoveDown);
+<<<<<<< TREE
 		moveDownButton.addActionListener(e -> {
 			int index = list.getSelectedIndex();
 
@@ -230,6 +247,17 @@
 					list.setSelectedIndex(index+1);
 					list.ensureIndexIsVisible(index+1);
 				}
+=======
+		moveDownButton.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				int index = list.getSelectedIndex();
+				
+				Command c = new MoveElementDownCommand(SharedPlacesAndTransitionsPanel.this, index, index+1);
+				undoManager.addNewEdit(c);
+				c.redo();
+				list.setSelectedIndex(index+1);
+				list.ensureIndexIsVisible(index+1);
+>>>>>>> MERGE-SOURCE
 			}
 		});
 		
@@ -606,4 +634,30 @@
 			fireContentsChanged(this, 0, network.numberOfSharedTransitions());
 		}
 	}
+
+	@Override
+    public void moveUp(int index) {
+        if(isDisplayingTransitions())
+            sharedTransitionsListModel.swap(index, index-1);
+        else
+            sharedPlacesListModel.swap(index, index-1);
+    }
+
+    @Override
+    public void moveDown(int index) {
+        if(isDisplayingTransitions()) {
+            if(index < sharedTransitionsListModel.getSize() - 1) {
+                sharedTransitionsListModel.swap(index, index+1);
+            }
+        } else {
+            if(index < sharedPlacesListModel.getSize() - 1) {
+                sharedPlacesListModel.swap(index, index+1);
+            }
+        }
+    }
+
+    @Override
+    public JList getJList() {
+        return list;
+    }
 }

=== modified file 'src/dk/aau/cs/gui/TabContent.java'
--- src/dk/aau/cs/gui/TabContent.java	2020-04-30 12:51:14 +0000
+++ src/dk/aau/cs/gui/TabContent.java	2020-05-13 15:53:33 +0000
@@ -51,6 +51,7 @@
 	private TimedArcPetriNetNetwork tapnNetwork = new TimedArcPetriNetNetwork();
 	private HashMap<TimedArcPetriNet, DataLayer> guiModels = new HashMap<TimedArcPetriNet, DataLayer>();
 	private HashMap<TimedArcPetriNet, Zoomer> zoomLevels = new HashMap<TimedArcPetriNet, Zoomer>();
+<<<<<<< TREE
 
 
 	private UndoManager undoManager = new UndoManager();
@@ -182,6 +183,9 @@
 
 	private HashMap<TimedArcPetriNet, Boolean> hasPositionalInfos = new HashMap<TimedArcPetriNet, Boolean>();
 
+=======
+	private HashMap<TimedArcPetriNet, Boolean> hasPositionalInfos = new HashMap<TimedArcPetriNet, Boolean>();
+>>>>>>> MERGE-SOURCE
 	private JScrollPane drawingSurfaceScroller;
 	private JScrollPane editorSplitPaneScroller;
 	private JScrollPane animatorSplitPaneScroller;
@@ -229,7 +233,11 @@
 		for (TimedArcPetriNet net : tapnNetwork.allTemplates()) {
 			guiModels.put(net, new DataLayer());
 			zoomLevels.put(net, new Zoomer());
+<<<<<<< TREE
 			hasPositionalInfos.put(net, Boolean.FALSE);
+=======
+			hasPositionalInfos.put(net, new Boolean(false));
+>>>>>>> MERGE-SOURCE
 		}
 		
 		drawingSurface = new DrawingSurfaceImpl(new DataLayer(), this, managerRef);

=== modified file 'src/dk/aau/cs/gui/TemplateExplorer.java'
--- src/dk/aau/cs/gui/TemplateExplorer.java	2020-04-18 15:50:17 +0000
+++ src/dk/aau/cs/gui/TemplateExplorer.java	2020-05-13 15:53:33 +0000
@@ -53,6 +53,8 @@
 import dk.aau.cs.TCTL.visitors.ContainsPlaceWithDisabledTemplateVisitor;
 import dk.aau.cs.gui.components.NonsearchableJList;
 import dk.aau.cs.gui.undo.Command;
+import dk.aau.cs.gui.undo.MoveElementDownCommand;
+import dk.aau.cs.gui.undo.MoveElementUpCommand;
 import dk.aau.cs.gui.undo.SortTemplatesCommand;
 import dk.aau.cs.model.tapn.Constant;
 import dk.aau.cs.model.tapn.SharedTransition;
@@ -61,8 +63,16 @@
 import dk.aau.cs.model.tapn.TimedTransition;
 import dk.aau.cs.util.Require;
 import dk.aau.cs.util.Tuple;
+<<<<<<< TREE
 
 public class TemplateExplorer extends JPanel {
+=======
+import pipe.gui.widgets.SidePane;
+
+
+public class TemplateExplorer extends JPanel implements SidePane{
+	private static final long serialVersionUID = -2334464984237161208L;
+>>>>>>> MERGE-SOURCE
 
 	// Template explorer panel items
 	private JPanel templatePanel;
@@ -244,10 +254,16 @@
 				int index = templateList.getSelectedIndex();
 				
 				if(index > 0) {
+<<<<<<< TREE
 					parent.swapTemplates(index, index-1);
 					Template o = listModel.getElementAt(index);
                     listModel.setElementAt(listModel.getElementAt(index-1), index);
                     listModel.setElementAt(o, index-1);
+=======
+				    Command c = new MoveElementUpCommand(TemplateExplorer.this, index, index-1);
+				    undoManager.addNewEdit(c);
+				    c.redo();
+>>>>>>> MERGE-SOURCE
                     templateList.ensureIndexIsVisible(index+1);
 					templateList.setSelectedIndex(index-1);
 				}
@@ -268,10 +284,16 @@
 				int index = templateList.getSelectedIndex();
 				
 				if(index < parent.network().allTemplates().size() - 1) {
+<<<<<<< TREE
 					parent.swapTemplates(index, index+1);
 					Template o = listModel.getElementAt(index);
                     listModel.setElementAt(listModel.getElementAt(index+1), index);
                     listModel.setElementAt(o, index+1);
+=======
+                    Command c = new MoveElementDownCommand(TemplateExplorer.this, index, index+1);
+                    undoManager.addNewEdit(c);
+                    c.redo();
+>>>>>>> MERGE-SOURCE
                     templateList.ensureIndexIsVisible(index+1);
 					templateList.setSelectedIndex(index+1);
 				}
@@ -1002,4 +1024,23 @@
 		}
 		
 	}
+	@Override
+    public void moveUp(int index) {
+        parent.swapTemplates(index, index-1);
+        Object o = listModel.getElementAt(index);
+        listModel.setElementAt(listModel.getElementAt(index-1), index);
+        listModel.setElementAt(o, index-1);
+    }
+
+    @Override
+    public void moveDown(int index) {
+        parent.swapTemplates(index, index+1);
+        Object o = listModel.getElementAt(index);
+        listModel.setElementAt(listModel.getElementAt(index+1), index);
+        listModel.setElementAt(o, index+1);
+    }
+    @Override
+    public JList getJList(){
+	    return templateList;
+    }
 }

=== modified file 'src/dk/aau/cs/gui/undo/MakePlaceNewSharedMultiCommand.java'
--- src/dk/aau/cs/gui/undo/MakePlaceNewSharedMultiCommand.java	2020-04-18 14:41:05 +0000
+++ src/dk/aau/cs/gui/undo/MakePlaceNewSharedMultiCommand.java	2020-05-13 15:53:33 +0000
@@ -36,6 +36,7 @@
 			boolean first = true;
 			for(Template template : context.tabContent().allTemplates()) {
 				TimedPlaceComponent component = (TimedPlaceComponent)template.guiModel().getPlaceByName(place.getName());
+<<<<<<< TREE
 
                 if (component != null) {
                     if (first) { //We make a new shared place with the first place
@@ -50,6 +51,21 @@
                         commands.add(command);
                     }
                 }
+=======
+				//We make a new shared place with the first place
+				if(component != null && i < 1) {
+					command = new MakePlaceNewSharedCommand(template.model(), newSharedName, component.underlyingPlace(), component, context.tabContent(), true);
+					command.redo();
+					sharedPlace = (SharedPlace)component.underlyingPlace();
+					commands.add(command);
+					i++;
+				//For the rest we make them shared with the recently made place
+				} else if (component != null && i >= 1){
+					command = new MakePlaceSharedCommand(context.activeModel(), sharedPlace, component.underlyingPlace(), component, context.tabContent(), true);
+					command.redo();
+					commands.add(command);
+				}
+>>>>>>> MERGE-SOURCE
 			}
 		}
 

=== modified file 'src/dk/aau/cs/gui/undo/MakePlaceSharedCommand.java'
--- src/dk/aau/cs/gui/undo/MakePlaceSharedCommand.java	2020-04-18 14:41:05 +0000
+++ src/dk/aau/cs/gui/undo/MakePlaceSharedCommand.java	2020-05-13 15:53:33 +0000
@@ -27,9 +27,15 @@
 	
 	private final Hashtable<TAPNQuery, TAPNQuery> newQueryToOldQueryMapping;
 	private final List<TimedToken> oldTokens;
+<<<<<<< TREE
 	private final TabContent currentTab;
 
 	public MakePlaceSharedCommand(TimedArcPetriNet tapn, SharedPlace sharedPlace, TimedPlace place, TimedPlaceComponent placeComponent, TabContent currentTab, boolean multishare){
+=======
+	private TabContent currentTab;
+
+	public MakePlaceSharedCommand(TimedArcPetriNet tapn, SharedPlace sharedPlace, TimedPlace place, TimedPlaceComponent placeComponent, TabContent currentTab, boolean multishare){
+>>>>>>> MERGE-SOURCE
 		Require.that(tapn != null, "tapn cannot be null");
 		Require.that(sharedPlace != null, "sharedPlace cannot be null");
 		Require.that(place != null, "timedPlace cannot be null");

=== added file 'src/dk/aau/cs/gui/undo/MoveElementDownCommand.java'
--- src/dk/aau/cs/gui/undo/MoveElementDownCommand.java	1970-01-01 00:00:00 +0000
+++ src/dk/aau/cs/gui/undo/MoveElementDownCommand.java	2020-05-13 15:53:33 +0000
@@ -0,0 +1,46 @@
+package dk.aau.cs.gui.undo;
+
+import pipe.dataLayer.Template;
+import pipe.gui.widgets.SidePane;
+
+import javax.swing.*;
+
+public class MoveElementDownCommand extends Command{
+    int oldIndex;
+    int newIndex;
+    SidePane sidePane;
+    JList<Template> templateList;
+    public MoveElementDownCommand(SidePane sidePane, int oldIndex, int newIndex){
+        this.oldIndex = oldIndex;
+        this.newIndex = newIndex;
+        this.sidePane = sidePane;
+    }
+
+    @Override
+    public void redo() {
+        if(sidePane.getJList().getSelectedIndex() == oldIndex){
+            sidePane.moveDown(oldIndex);
+            sidePane.getJList().setSelectedIndex(oldIndex+1);
+        }else if(sidePane.getJList().getSelectedIndex() == oldIndex+1){
+            sidePane.moveDown(oldIndex);
+            sidePane.getJList().setSelectedIndex(newIndex-1);
+        } else{
+            sidePane.moveDown(oldIndex);
+        }
+        sidePane.getJList().updateUI();
+    }
+
+    @Override
+    public void undo() {
+        if(sidePane.getJList().getSelectedIndex() == newIndex){
+            sidePane.moveUp(newIndex);
+            sidePane.getJList().setSelectedIndex(newIndex-1);
+        } else if(sidePane.getJList().getSelectedIndex() == newIndex-1){
+            sidePane.moveUp(newIndex);
+            sidePane.getJList().setSelectedIndex(oldIndex+1);
+        }else{
+            sidePane.moveUp(newIndex);
+        }
+        sidePane.getJList().updateUI();
+    }
+}

=== added file 'src/dk/aau/cs/gui/undo/MoveElementUpCommand.java'
--- src/dk/aau/cs/gui/undo/MoveElementUpCommand.java	1970-01-01 00:00:00 +0000
+++ src/dk/aau/cs/gui/undo/MoveElementUpCommand.java	2020-05-13 15:53:33 +0000
@@ -0,0 +1,51 @@
+package dk.aau.cs.gui.undo;
+
+import pipe.dataLayer.Template;
+import pipe.gui.widgets.SidePane;
+
+import javax.swing.*;
+
+public class MoveElementUpCommand extends Command{
+    int oldIndex;
+    int newIndex;
+    SidePane sidePane;
+    JList<Template> templateList;
+    public MoveElementUpCommand(SidePane sidePane, int oldIndex, int newIndex){
+        this.oldIndex = oldIndex;
+        this.newIndex = newIndex;
+        this.sidePane = sidePane;
+    }
+
+    @Override
+    public void redo() {
+        if(sidePane.getJList().getSelectedIndex() == oldIndex){
+            sidePane.moveUp(oldIndex);
+            sidePane.getJList().setSelectedIndex(oldIndex-1);
+            sidePane.getJList().ensureIndexIsVisible(oldIndex-1);
+        } else if(sidePane.getJList().getSelectedIndex() == oldIndex-1){
+            sidePane.moveUp(oldIndex);
+            sidePane.getJList().setSelectedIndex(newIndex+1);
+            sidePane.getJList().ensureIndexIsVisible(newIndex+1);
+        }else{
+            sidePane.moveUp(oldIndex);
+        }
+        sidePane.getJList().updateUI();
+
+    }
+
+    @Override
+    public void undo() {
+        if(sidePane.getJList().getSelectedIndex() == newIndex){
+            sidePane.moveDown(newIndex);
+            sidePane.getJList().setSelectedIndex(newIndex+1);
+            sidePane.getJList().ensureIndexIsVisible(newIndex+1);
+        }else if(sidePane.getJList().getSelectedIndex() == newIndex+1){
+            sidePane.moveDown(newIndex);
+            sidePane.getJList().setSelectedIndex(oldIndex-1);
+            sidePane.getJList().ensureIndexIsVisible(oldIndex-1);
+        } else{
+            sidePane.moveDown(newIndex);
+        }
+        sidePane.getJList().updateUI();
+    }
+}

=== added directory 'src/dk/aau/cs/verification/batchProcessing/Undo'
=== added file 'src/dk/aau/cs/verification/batchProcessing/Undo/AddFileCommand.java'
--- src/dk/aau/cs/verification/batchProcessing/Undo/AddFileCommand.java	1970-01-01 00:00:00 +0000
+++ src/dk/aau/cs/verification/batchProcessing/Undo/AddFileCommand.java	2020-05-13 15:53:33 +0000
@@ -0,0 +1,34 @@
+package dk.aau.cs.verification.batchProcessing.Undo;
+
+import dk.aau.cs.gui.BatchProcessingDialog;
+import dk.aau.cs.gui.undo.Command;
+
+import javax.swing.*;
+import java.io.File;
+import java.util.List;
+
+public class AddFileCommand extends Command {
+    private DefaultListModel listModel;
+    List<File> files;
+    File file;
+    private BatchProcessingDialog dialog;
+    public AddFileCommand(DefaultListModel listModel, File file, List<File> files, BatchProcessingDialog dialog){
+        this.listModel = listModel;
+        this.file = file;
+        this.files = files;
+        this.dialog = dialog;
+    }
+    @Override
+    public void redo() {
+        files.add(file);
+        listModel.addElement(file);
+        dialog.enableButtons();
+    }
+
+    @Override
+    public void undo() {
+        files.remove(file);
+        listModel.removeElement(file);
+        dialog.enableButtons();
+    }
+}

=== added file 'src/dk/aau/cs/verification/batchProcessing/Undo/RemoveFileCommand.java'
--- src/dk/aau/cs/verification/batchProcessing/Undo/RemoveFileCommand.java	1970-01-01 00:00:00 +0000
+++ src/dk/aau/cs/verification/batchProcessing/Undo/RemoveFileCommand.java	2020-05-13 15:53:33 +0000
@@ -0,0 +1,35 @@
+package dk.aau.cs.verification.batchProcessing.Undo;
+
+import dk.aau.cs.gui.BatchProcessingDialog;
+import dk.aau.cs.gui.undo.Command;
+
+import javax.swing.*;
+import java.io.File;
+import java.util.List;
+
+public class RemoveFileCommand extends Command {
+    private DefaultListModel listModel;
+    List<File> files;
+    File file;
+    private BatchProcessingDialog dialog;
+    public RemoveFileCommand(DefaultListModel listModel, File file, List<File> files, BatchProcessingDialog dialog){
+        this.listModel = listModel;
+        this.file = file;
+        this.files = files;
+        this.dialog = dialog;
+    }
+    @Override
+    public void redo() {
+        files.remove(file);
+        listModel.removeElement(file);
+        dialog.enableButtons();
+    }
+
+    @Override
+    public void undo() {
+        files.add(file);
+        listModel.addElement(file);
+        dialog.enableButtons();
+    }
+}
+

=== modified file 'src/net/tapaal/TAPAAL.java'
--- src/net/tapaal/TAPAAL.java	2020-04-18 16:13:35 +0000
+++ src/net/tapaal/TAPAAL.java	2020-05-13 15:53:33 +0000
@@ -39,7 +39,7 @@
 public class TAPAAL {
 
 	public static final String TOOLNAME = "TAPAAL";
-	public static final String VERSION = "DEV"; 
+	public static final String VERSION = "3.6.1"; 
 
 	public static String getProgramName(){
 		return "" + TAPAAL.TOOLNAME + " " + TAPAAL.VERSION;

=== modified file 'src/pipe/gui/undo/TranslatePetriNetObjectEdit.java'
--- src/pipe/gui/undo/TranslatePetriNetObjectEdit.java	2020-05-02 15:30:09 +0000
+++ src/pipe/gui/undo/TranslatePetriNetObjectEdit.java	2020-05-13 15:53:33 +0000
@@ -4,7 +4,11 @@
 
 package pipe.gui.undo;
 
+<<<<<<< TREE
 import pipe.gui.canvas.DrawingSurfaceImpl;
+=======
+import pipe.gui.DrawingSurfaceImpl;
+>>>>>>> MERGE-SOURCE
 import pipe.gui.graphicElements.PetriNetObject;
 import dk.aau.cs.gui.undo.Command;
 
@@ -17,29 +21,49 @@
 	PetriNetObject pnObject;
 	Integer transX;
 	Integer transY;
+<<<<<<< TREE
 	DrawingSurfaceImpl ds;
+=======
+	DrawingSurfaceImpl view;
+>>>>>>> MERGE-SOURCE
 
 	/** Creates a new instance of */
 	public TranslatePetriNetObjectEdit(PetriNetObject _pnObject,
+<<<<<<< TREE
                                        Integer _transX, Integer _transY, DrawingSurfaceImpl drawingSurface) {
+=======
+									   Integer _transX, Integer _transY, DrawingSurfaceImpl view) {
+>>>>>>> MERGE-SOURCE
 		pnObject = _pnObject;
 		transX = _transX;
 		transY = _transY;
+<<<<<<< TREE
 		ds = drawingSurface;
+=======
+		this.view = view;
+>>>>>>> MERGE-SOURCE
 	}
 
 	/** */
 	@Override
 	public void undo() {
 		pnObject.translate(-transX, -transY);
+<<<<<<< TREE
         ds.updatePreferredSize();
+=======
+		view.updatePreferredSize();
+>>>>>>> MERGE-SOURCE
 	}
 
 	/** */
 	@Override
 	public void redo() {
 		pnObject.translate(transX, transY);
+<<<<<<< TREE
         ds.updatePreferredSize();
+=======
+		view.updatePreferredSize();
+>>>>>>> MERGE-SOURCE
 	}
 
 	@Override

=== modified file 'src/pipe/gui/undo/UndoManager.java'
--- src/pipe/gui/undo/UndoManager.java	2020-05-03 09:49:19 +0000
+++ src/pipe/gui/undo/UndoManager.java	2020-05-13 15:53:33 +0000
@@ -38,10 +38,21 @@
 	/**
 	 * Creates a new instance of UndoManager
 	 */
+<<<<<<< TREE
 	public UndoManager() {
 
 		app.ifPresent(a -> a.setUndoActionEnabled(false));
 		app.ifPresent(a -> a.setRedoActionEnabled(false));
+=======
+	public UndoManager(DrawingSurfaceImpl _view, DataLayer _model, GuiFrame _app) {
+		view = _view;
+		guiModel = _model;
+		app = _app;
+		if(app != null) {
+			app.setUndoActionEnabled(false);
+			app.setRedoActionEnabled(false);
+		}
+>>>>>>> MERGE-SOURCE
 		for (int i = 0; i < UNDO_BUFFER_CAPACITY; i++) {
 			edits.add(null);
 		}
@@ -50,7 +61,14 @@
 	public void redo() {
 
 		if (undoneEdits > 0) {
+<<<<<<< TREE
 			checkArcBeingDrawn();
+=======
+			if(app != null && view != null) {
+				checkArcBeingDrawn();
+				checkMode();
+			}
+>>>>>>> MERGE-SOURCE
 
 			// The currentEdit to redo
 			for (Command command : edits.get(indexOfNextAdd)) {
@@ -59,10 +77,21 @@
 			indexOfNextAdd = (indexOfNextAdd + 1) % UNDO_BUFFER_CAPACITY;
 			sizeOfBuffer++;
 			undoneEdits--;
+<<<<<<< TREE
 			if (undoneEdits == 0) {
 				app.ifPresent(a -> a.setRedoActionEnabled(false));
+=======
+			if(app != null) {
+				if (undoneEdits == 0) {
+					app.setRedoActionEnabled(false);
+				}
+				app.setUndoActionEnabled(true);
+>>>>>>> MERGE-SOURCE
 			}
+<<<<<<< TREE
 			app.ifPresent(a -> a.setUndoActionEnabled(true));
+=======
+>>>>>>> MERGE-SOURCE
 		}
 	}
 
@@ -79,7 +108,14 @@
 	public void undo() {
 
 		if (sizeOfBuffer > 0) {
+<<<<<<< TREE
 			checkArcBeingDrawn();
+=======
+			if(app != null && view != null) {
+				checkArcBeingDrawn();
+				checkMode();
+			}
+>>>>>>> MERGE-SOURCE
 
 			if (--indexOfNextAdd < 0) {
 				indexOfNextAdd += UNDO_BUFFER_CAPACITY;
@@ -92,11 +128,22 @@
 			for (int i = currentEdit.size() - 1; i >= 0; i--) {
 				currentEdit.get(i).undo();
 			}
+<<<<<<< TREE
 
 			if (sizeOfBuffer == 0) {
 				app.ifPresent(a -> a.setUndoActionEnabled(false));
+=======
+			if(app != null) {
+				if (sizeOfBuffer == 0) {
+					app.setUndoActionEnabled(false);
+				}
+				app.setRedoActionEnabled(true);
+>>>>>>> MERGE-SOURCE
 			}
+<<<<<<< TREE
 			app.ifPresent(a -> a.setRedoActionEnabled(true));
+=======
+>>>>>>> MERGE-SOURCE
 		}
 	}
 
@@ -116,11 +163,21 @@
 		}
 
 		undoneEdits = 0;
+<<<<<<< TREE
 		app.ifPresent(a -> a.setUndoActionEnabled(true));
 		app.ifPresent(a -> a.setRedoActionEnabled(false));
 		if(CreateGui.getCurrentTab() != null) {
             CreateGui.getCurrentTab().setNetChanged(true);
         }
+=======
+		if(app != null) {
+			app.setUndoActionEnabled(true);
+			app.setRedoActionEnabled(false);
+		}
+		if(view != null){
+			view.setNetChanged(true);
+		}
+>>>>>>> MERGE-SOURCE
 
 		ArrayList<Command> compoundEdit = new ArrayList<Command>();
 		edits.set(indexOfNextAdd, compoundEdit);
@@ -143,6 +200,40 @@
 		addEdit(undoableEdit);
 	}
 
+<<<<<<< TREE
+=======
+	private void deleteSelection(PetriNetObject pnObject) {
+		if(pnObject instanceof PlaceTransitionObject){
+			PlaceTransitionObject pto = (PlaceTransitionObject)pnObject;
+
+			for(Arc arc : pto.getPreset()){
+				deleteObject(arc);
+			}
+
+			for(Arc arc : pto.getPostset()){
+				deleteObject(arc);
+			}
+		}
+
+		deleteObject(pnObject);
+	}
+
+	public void deleteSelection(ArrayList<PetriNetObject> selection) {
+		for (PetriNetObject pnObject : selection) {
+			deleteSelection(pnObject);
+		}
+	}
+
+	public void translateSelection(ArrayList<PetriNetObject> objects,
+			int transX, int transY) {
+		newEdit(); // new "transaction""
+		Iterator<PetriNetObject> iterator = objects.iterator();
+		while (iterator.hasNext()) {
+			addEdit(new TranslatePetriNetObjectEdit(iterator.next(), transX,
+					transY, view));
+		}
+	}
+>>>>>>> MERGE-SOURCE
 
 	private int currentIndex() {
 		int lastAdd = indexOfNextAdd - 1;

=== modified file 'src/pipe/gui/widgets/ConstantsPane.java'
--- src/pipe/gui/widgets/ConstantsPane.java	2020-04-18 12:27:02 +0000
+++ src/pipe/gui/widgets/ConstantsPane.java	2020-05-13 15:53:33 +0000
@@ -19,7 +19,6 @@
 import java.awt.event.MouseEvent;
 import java.io.IOException;
 
-
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -39,14 +38,21 @@
 import pipe.gui.CreateGui;
 import dk.aau.cs.gui.TabContent;
 import dk.aau.cs.gui.undo.Command;
+import dk.aau.cs.gui.undo.MoveElementDownCommand;
+import dk.aau.cs.gui.undo.MoveElementUpCommand;
 import dk.aau.cs.gui.undo.SortConstantsCommand;
 import dk.aau.cs.model.tapn.Constant;
 import dk.aau.cs.model.tapn.TimedArcPetriNetNetwork;
 import dk.aau.cs.gui.components.ConstantsListModel;
 import dk.aau.cs.gui.components.NonsearchableJList;
 
+<<<<<<< TREE
 public class ConstantsPane extends JPanel {
 
+=======
+public class ConstantsPane extends JPanel implements SidePane {
+	private static final long serialVersionUID = -7883351020889779067L;
+>>>>>>> MERGE-SOURCE
 	private JPanel constantsPanel;
 	private JScrollPane constantsScroller;
 	private JPanel buttonsPanel;
@@ -352,10 +358,19 @@
 		moveUpButton.addActionListener(e -> {
 			int index = constantsList.getSelectedIndex();
 
+<<<<<<< TREE
 			if(index > 0) {
 				parent.swapConstants(index, index-1);
 				showConstants();
 				constantsList.setSelectedIndex(index-1);
+=======
+				if(index > 0) {
+					Command c = new MoveElementUpCommand(ConstantsPane.this, index, index-1);
+					CreateGui.getDrawingSurface().getUndoManager().addNewEdit(c);
+					c.redo();
+					constantsList.setSelectedIndex(index-1);
+				}
+>>>>>>> MERGE-SOURCE
 			}
 		});
 
@@ -371,10 +386,19 @@
 		moveDownButton.addActionListener(e -> {
 			int index = constantsList.getSelectedIndex();
 
+<<<<<<< TREE
 			if(index < parent.network().constants().size() - 1) {
 				parent.swapConstants(index, index+1);
 				showConstants();
 				constantsList.setSelectedIndex(index+1);
+=======
+				if(index < parent.network().constants().size() - 1) {
+					Command c = new MoveElementDownCommand(ConstantsPane.this, index, index+1);
+					CreateGui.getDrawingSurface().getUndoManager().addNewEdit(c);
+                	c.redo();
+					constantsList.setSelectedIndex(index+1);
+				}
+>>>>>>> MERGE-SOURCE
 			}
 		});
 
@@ -466,4 +490,21 @@
 		constantsList.setSelectedIndex(0);
 
 	}
+
+    @Override
+    public void moveUp(int index) {
+        parent.swapConstants(index, index-1);
+        showConstants();
+    }
+
+    @Override
+    public void moveDown(int index) {
+        parent.swapConstants(index, index+1);
+        showConstants();
+    }
+
+    @Override
+    public JList getJList() {
+        return constantsList;
+    }
 }

=== modified file 'src/pipe/gui/widgets/QueryPane.java'
--- src/pipe/gui/widgets/QueryPane.java	2020-04-18 16:08:44 +0000
+++ src/pipe/gui/widgets/QueryPane.java	2020-05-13 15:53:33 +0000
@@ -41,13 +41,20 @@
 import dk.aau.cs.gui.BatchProcessingDialog;
 import dk.aau.cs.gui.TabContent;
 import dk.aau.cs.gui.undo.Command;
+import dk.aau.cs.gui.undo.MoveElementDownCommand;
+import dk.aau.cs.gui.undo.MoveElementUpCommand;
 import dk.aau.cs.gui.undo.SortQueriesCommand;
 import dk.aau.cs.gui.components.NonsearchableJList;
 import dk.aau.cs.translations.ReductionOption;
 import dk.aau.cs.util.Require;
 
+<<<<<<< TREE
 public class QueryPane extends JPanel {
 
+=======
+public class QueryPane extends JPanel implements SidePane {
+	private static final long serialVersionUID = 4062539545170994654L;
+>>>>>>> MERGE-SOURCE
 	private JPanel queryCollectionPanel;
 	private JPanel buttonsPanel;
 	private DefaultListModel listModel;
@@ -213,7 +220,9 @@
 				int index = queryList.getSelectedIndex();
 
 				if(index > 0 && queryList.getSelectedIndices().length == 1) {
-					swapQueries(index, index-1);
+					Command c = new MoveElementUpCommand(QueryPane.this, index, index-1);
+                    undoManager.addNewEdit(c);
+                    c.redo();
 					queryList.setSelectedIndex(index-1);
 				}
 				else
@@ -235,8 +244,10 @@
 				int index = queryList.getSelectedIndex();
 
 				if(index < listModel.size()-1 && queryList.getSelectedIndices().length == 1) {
-					swapQueries(index, index+1);
-					queryList.setSelectedIndex(index+1);
+					Command c = new MoveElementDownCommand(QueryPane.this, index, index+1);
+                    undoManager.addNewEdit(c);
+                    c.redo();
+                    queryList.setSelectedIndex(index+1);
 				}
 				else
 					moveDownButton.setEnabled(false);
@@ -513,4 +524,17 @@
 	public void verifySelectedQuery() {
 		verifyQuery();
 	}
+
+	@Override
+	public void moveUp(int index){
+        swapQueries(index, index-1);
+    }
+    @Override
+    public void moveDown(int index){
+        swapQueries(index, index+1);
+    }
+    @Override
+    public JList getJList(){
+	    return queryList;
+    }
 }

=== added file 'src/pipe/gui/widgets/SidePane.java'
--- src/pipe/gui/widgets/SidePane.java	1970-01-01 00:00:00 +0000
+++ src/pipe/gui/widgets/SidePane.java	2020-05-13 15:53:33 +0000
@@ -0,0 +1,9 @@
+package pipe.gui.widgets;
+
+import javax.swing.*;
+
+public interface SidePane {
+    public void moveUp(int index);
+    public void moveDown(int index);
+    public JList getJList();
+}