Merge lp:~tapaal-contributor/tapaal/undo-redo-batchprocessing-3.6-1870904 into lp:tapaal/3.6

[Jiri Srba]

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/dk/aau/cs/gui/BatchProcessingDialog.java'
--- src/dk/aau/cs/gui/BatchProcessingDialog.java	2019-02-12 13:57:23 +0000
+++ src/dk/aau/cs/gui/BatchProcessingDialog.java	2020-05-10 20:01:44 +0000
@@ -1,15 +1,6 @@
 package dk.aau.cs.gui;
 
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Frame;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.Insets;
-import java.awt.Point;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
@@ -23,29 +14,8 @@
 import java.util.Comparator;
 import java.util.List;
 
-import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JSplitPane;
-import javax.swing.JTable;
-import javax.swing.ListCellRenderer;
-import javax.swing.ListSelectionModel;
-import javax.swing.SwingConstants;
+import javax.swing.*;
 import javax.swing.SwingWorker.StateValue;
-import javax.swing.Timer;
-import javax.swing.ToolTipManager;
 import javax.swing.border.Border;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
@@ -57,9 +27,13 @@
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 
+import dk.aau.cs.gui.undo.Command;
+import dk.aau.cs.verification.batchProcessing.Undo.AddFileCommand;
+import dk.aau.cs.verification.batchProcessing.Undo.RemoveFileCommand;
 import pipe.dataLayer.TAPNQuery;
 import pipe.dataLayer.TAPNQuery.SearchOption;
 import pipe.gui.CreateGui;
+import pipe.gui.undo.UndoManager;
 import pipe.gui.widgets.CustomJSpinner;
 import pipe.gui.widgets.EscapableDialog;
 import pipe.gui.widgets.filebrowser.FileBrowser;
@@ -272,6 +246,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()){
@@ -358,6 +333,7 @@
 		this.ListOfQueries = ListOfQueries;
 
 		initComponents();
+		makeShortcuts();
 		//Runs the BatchProcessing if it is called from the QueryPane
 		if(!(isQueryListEmpty())) {
 			process();
@@ -520,24 +496,27 @@
 		
 		File[] filesArray = browser.openFiles();
 		if (filesArray.length>0) {
+			undoManager.newEdit();
 			for (File file : filesArray) {
 				lastPath = file.getParent();
 				if (!files.contains(file)) {
-					files.add(file);
-					listModel.addElement(file);
+					Command c = new AddFileCommand(listModel,file,files,this);
+					c.redo();
+					undoManager.addEdit(c);
+
 				}
 			}
-
 			enableButtons();
-
 		}
 	}
 
 	private void removeSelectedFiles() {
+		undoManager.newEdit();
 		for (Object o : fileList.getSelectedValuesList()) {
 			File file = (File) o;
-			files.remove(file);
-			listModel.removeElement(file);
+			Command c = new RemoveFileCommand(listModel, file,files,this);
+			c.redo();
+			undoManager.addEdit(c);
 		}
 
 		enableButtons();
@@ -1451,8 +1430,13 @@
 	}
 
 	private void clearFiles() {
-		files.clear();
-		listModel.removeAllElements();
+		undoManager.newEdit();
+		for (Object o : listModel.toArray()) {
+			File file = (File)o;
+			Command c = new RemoveFileCommand(listModel,file, files, this );
+			c.redo();
+			undoManager.addEdit(c);
+		}
 	}
 
 	private void disableButtonsDuringProcessing() {
@@ -1466,7 +1450,7 @@
 		disableVerificationOptionsButtons();
 	}
 
-	private void enableButtons() {
+	public void enableButtons() {
 		fileList.setEnabled(true);
 		addFilesButton.setEnabled(true);
 
@@ -1487,6 +1471,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

=== 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-10 20:01:44 +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-10 20:01:44 +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/pipe/gui/undo/UndoManager.java'
--- src/pipe/gui/undo/UndoManager.java	2020-05-05 18:58:31 +0000
+++ src/pipe/gui/undo/UndoManager.java	2020-05-10 20:01:44 +0000
@@ -57,8 +57,10 @@
 		view = _view;
 		guiModel = _model;
 		app = _app;
-		app.setUndoActionEnabled(false);
-		app.setRedoActionEnabled(false);
+		if(app != null) {
+			app.setUndoActionEnabled(false);
+			app.setRedoActionEnabled(false);
+		}
 		for (int i = 0; i < UNDO_BUFFER_CAPACITY; i++) {
 			edits.add(null);
 		}
@@ -67,8 +69,10 @@
 	public void redo() {
 
 		if (undoneEdits > 0) {
-			checkArcBeingDrawn();
-			checkMode();
+			if(app != null && view != null) {
+				checkArcBeingDrawn();
+				checkMode();
+			}
 
 			// The currentEdit to redo
 			Iterator<Command> currentEdit = edits.get(indexOfNextAdd)
@@ -79,10 +83,12 @@
 			indexOfNextAdd = (indexOfNextAdd + 1) % UNDO_BUFFER_CAPACITY;
 			sizeOfBuffer++;
 			undoneEdits--;
-			if (undoneEdits == 0) {
-				app.setRedoActionEnabled(false);
+			if(app != null) {
+				if (undoneEdits == 0) {
+					app.setRedoActionEnabled(false);
+				}
+				app.setUndoActionEnabled(true);
 			}
-			app.setUndoActionEnabled(true);
 		}
 	}
 
@@ -99,8 +105,10 @@
 	public void undo() {
 
 		if (sizeOfBuffer > 0) {
-			checkArcBeingDrawn();
-			checkMode();
+			if(app != null && view != null) {
+				checkArcBeingDrawn();
+				checkMode();
+			}
 
 			if (--indexOfNextAdd < 0) {
 				indexOfNextAdd += UNDO_BUFFER_CAPACITY;
@@ -113,11 +121,12 @@
 			for (int i = currentEdit.size() - 1; i >= 0; i--) {
 				currentEdit.get(i).undo();
 			}
-
-			if (sizeOfBuffer == 0) {
-				app.setUndoActionEnabled(false);
+			if(app != null) {
+				if (sizeOfBuffer == 0) {
+					app.setUndoActionEnabled(false);
+				}
+				app.setRedoActionEnabled(true);
 			}
-			app.setRedoActionEnabled(true);
 		}
 	}
 
@@ -137,9 +146,13 @@
 		}
 
 		undoneEdits = 0;
-		app.setUndoActionEnabled(true);
-		app.setRedoActionEnabled(false);
-		view.setNetChanged(true);
+		if(app != null) {
+			app.setUndoActionEnabled(true);
+			app.setRedoActionEnabled(false);
+		}
+		if(view != null){
+			view.setNetChanged(true);
+		}
 
 		ArrayList<Command> compoundEdit = new ArrayList<Command>();
 		edits.set(indexOfNextAdd, compoundEdit);