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

[Peter Haahr Taankvist]

Can now undo/redo adding/removing files in batch processing in 3.6

Unmerged revisions

1050. By Peter Haahr Taankvist on 2020-05-05

Add files

1049. By Peter Haahr Taankvist on 2020-05-05

Add undo/redo functionality when adding/removing files in batch processing

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

1041. By Jiri Srba on 2020-03-17

lp:~tapaal-contributor/tapaal/select-all-disable-1835873 fixed focus issues when changing template

=== modified file 'src/dk/aau/cs/gui/BatchProcessingDialog.java'
--- src/dk/aau/cs/gui/BatchProcessingDialog.java	2020-04-18 13:49:06 +0000
+++ src/dk/aau/cs/gui/BatchProcessingDialog.java	2020-05-05 19:33:18 +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,6 +14,7 @@
 import java.util.Comparator;
 import java.util.List;
 
+<<<<<<< TREE
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
@@ -42,9 +34,10 @@
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingConstants;
+=======
+import javax.swing.*;
+>>>>>>> MERGE-SOURCE
 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;
@@ -53,10 +46,18 @@
 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;
+<<<<<<< TREE
 import net.tapaal.swinghelpers.CustomJSpinner;
+=======
+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;
@@ -261,6 +262,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()){
@@ -345,6 +347,7 @@
 		this.ListOfQueries = ListOfQueries;
 
 		initComponents();
+		makeShortcuts();
 		//Runs the BatchProcessing if it is called from the QueryPane
 		if(!(isQueryListEmpty())) {
 			process();
@@ -489,24 +492,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();
@@ -1408,8 +1414,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() {
@@ -1423,7 +1434,7 @@
 		disableVerificationOptionsButtons();
 	}
 
-	private void enableButtons() {
+	public void enableButtons() {
 		fileList.setEnabled(true);
 		addFilesButton.setEnabled(true);
 
@@ -1444,6 +1455,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/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-05 19:33:18 +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/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-05 19:33:18 +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-05 19:33:18 +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 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-05 19:33:18 +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-05 19:33:18 +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-05 19:33:18 +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/UndoManager.java'
--- src/pipe/gui/undo/UndoManager.java	2020-04-03 11:05:40 +0000
+++ src/pipe/gui/undo/UndoManager.java	2020-05-05 19:33:18 +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,9 +163,19 @@
 		}
 
 		undoneEdits = 0;
+<<<<<<< TREE
 		app.ifPresent(a -> a.setUndoActionEnabled(true));
 		app.ifPresent(a -> a.setRedoActionEnabled(false));
 		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);