Merge lp:~ptaank/tapaal/run-multiple-queries- into lp:tapaal

[Peter Haahr Taankvist]

Fixed:
The list used for showing the queries is now reset properly after batch processing has been run, so it shows all the original queries.

The 'unnecessary update' is because when the queries are selected, the queries not selected are removed from the net, then the net is saved in the temporary file and batch processing is run, and they are re-added after batchprocessing is closed.

[Jiri Srba (srba)]

There is still a bug in the branch that returns:

ensionHost is implemented in both /System/Library/PrivateFrameworks/FinderKit.framework/Versions/A/FinderKit (0x7fff923fdb68) and /System/Library/PrivateFrameworks/FileProvider.framework/OverrideBundles/FinderSyncCollaborationFileProviderOverride.bundle/Contents/MacOS/FinderSyncCollaborationFileProviderOverride (0x133b6dcd8). One of the two will be used. Which one is undefined.

To reproduce:
1. Make new net with just one place
2. Make query called 1 that is EF true
3. Make query called 2 thas is EF false
4. Select both queries and run verify - the query names get refreshed for no reason
5. After you close the batch processing dialog, there are now queries 1, 2, 1, 2
   in the list of queries.

review: Needs Fixing

[Jiri Srba (srba)]

There are two issues before we can merge it to trunk:

1. Once you run multiple queries, the name of the net is changed (some long number is appended) every time you run the multiple queries. After we return from batch processing, the name of the net is still modified.

2. If you have three queries and select only two of them, once you enter the batch processing,
   the non-selected query disappears temporarily from the list and reappears after batch processing is closed.

review: Needs Fixing

[Jiri Srba (srba)]

And I still get this warning:

objc[29737]: Class FIFinderSyncExtensionHost is implemented in both /System/Library/PrivateFrameworks/FinderKit.framework/Versions/A/FinderKit (0x7fff91849b68) and /System/Library/PrivateFrameworks/FileProvider.framework/OverrideBundles/FinderSyncCollaborationFileProviderOverride.bundle/Contents/MacOS/FinderSyncCollaborationFileProviderOverride (0x13eec1cd8). One of the two will be used. Which one is undefined.

[Peter Haahr Taankvist (ptaank)]

As far as I can see it's a problem with high Sierra, and therefore not
something I can do anything about :/

However, most people say it's harmless..

Peter

On 9 Mar 2018 08.25, "Jiri Srba" <email address hidden> wrote:

> And I still get this warning:
>
> objc[29737]: Class FIFinderSyncExtensionHost is implemented in both
> /System/Library/PrivateFrameworks/FinderKit.framework/Versions/A/FinderKit
> (0x7fff91849b68) and /System/Library/PrivateFrameworks/
> FileProvider.framework/OverrideBundles/FinderSyncCollaborationFilePro
> viderOverride.bundle/Contents/MacOS/FinderSyncCollaborationFileProviderOverride
> (0x13eec1cd8). One of the two will be used. Which one is undefined.
> --
> https://code.launchpad.net/~ptaank/tapaal/run-multiple-
> queries-/+merge/340078
> You are the owner of lp:~ptaank/tapaal/run-multiple-queries-.
>

[lp:~ptaank/tapaal/run-multiple-queries-]

956. By Peter Taankvist <email address hidden> on 2018-03-09

Made new save method for run multiple queries

[Peter Haahr Taankvist (ptaank)]

Made new method for saving specifically for when selecting multiple queries in GuiFrame.

Difference from other method: Does not set a new tab name. Does not reset undos and redos.

Deleted some methods which were unnecessary after the creation of the new method.

review: Needs Resubmitting

[Jiri Srba (srba)]

Tested and works very nice and as expected, I only found one issue:

Make a new net, do not save it and run multiquery verification. Once finished,
press do "Save" and the temporary file name gets appended to the net. Repeat
the multi query verification, return to the editor and save the net and now again
the file name gets longer with additional random string etc.

Also, it would be nice if in the batch processing the name of the net in the results overview
was without the appended random string (try to hide it somehow).

review: Needs Fixing

[lp:~ptaank/tapaal/run-multiple-queries-]

957. By Peter Taankvist <email address hidden> on 2018-04-02

Refactor of save method and modelname fixed in results

[Peter Haahr Taankvist (ptaank)]

I refactored the new save method, saveNet, so it is only when you actually save the net that the GUI changes, meaning that it is not affected by running multiple queries.

Made condition that the filename cannot be that of the temporary file.(Very small likelihood that the user names a file that of the temporary file) If it is it uses the name of the current tab.

review: Needs Resubmitting

[Jiri Srba (srba)]

Works just fine, just remove please also the tmp file name in Monitor, Net:
It is still shown there.

review: Needs Fixing

[Jiri Srba (srba)]

And one more problem, the classical batch processing is broken now.
Just load a few models, click verify and nothing happens - the batch processing
does not start.

review: Needs Fixing

[lp:~ptaank/tapaal/run-multiple-queries-]

958. By Peter Taankvist <email address hidden> on 2018-04-02

Fix Monitor, net and NullPointerException

[Peter Haahr Taankvist (ptaank)]

Batch processing didn't start because of a Null Pointer Exception which is now handled.

Monitor, Net now shows the current tabname instead of the name of the tempfile

review: Needs Resubmitting

[Jiri Srba (srba)]

Tested again and discovered two more issues:

1. The moving up and down of queries using the arrows to the right of the query panel,
as well as sorting the alphabetically is broken in the current version.

2. The batch file dialog does not remember the most recently opened folder
   but it should always open in the most recently open one (maybe this issues was already
   present in the earlier version of trunk.

review: Needs Fixing

[lp:~ptaank/tapaal/run-multiple-queries-]

959. By Peter Taankvist <email address hidden> on 2018-04-09

Fix up and down buttons

960. By Peter Taankvist <email address hidden> on 2018-04-09

Added lastpath to filebrowser in batchprocessing

[Peter Haahr Taankvist (ptaank)]

1. should be fixed now

2. Added lastpath to filebrowser so it opens the same place you were before. (This bug is present in current release)

review: Needs Resubmitting

[Jiri Srba (srba)]

Approved as it works as expected now.

review: Approve

=== modified file 'src/dk/aau/cs/gui/BatchProcessingDialog.java'
--- src/dk/aau/cs/gui/BatchProcessingDialog.java	2018-02-11 13:28:38 +0000
+++ src/dk/aau/cs/gui/BatchProcessingDialog.java	2018-04-09 08:31:59 +0000
@@ -66,6 +66,7 @@
 import pipe.gui.widgets.CustomJSpinner;
 import pipe.gui.widgets.EscapableDialog;
 import pipe.gui.widgets.FileBrowser;
+import pipe.gui.widgets.QueryPane;
 import pipe.gui.widgets.InclusionPlaces.InclusionPlacesOption;
 import dk.aau.cs.gui.components.BatchProcessingResultsTableModel;
 import dk.aau.cs.gui.components.MultiLineAutoWrappingToolTip;
@@ -241,6 +242,7 @@
 	private JComboBox approximationMethodOption;
 	private CustomJSpinner approximationDenominator;
 	private JCheckBox approximationDenominatorCheckbox;
+	private JList ListOfQueries;
 	
 	private Timer timeoutTimer = new Timer(30000, new ActionListener() {
 		public void actionPerformed(ActionEvent e) {
@@ -318,9 +320,16 @@
 	
 	static BatchProcessingDialog batchProcessingDialog;
 	
-	public static void showBatchProcessingDialog(){
+	/* ListOfQueries is used throughout the class to check if 
+	BatchProcessing was called from QueryPane
+	(should maybe be boolean)
+	*/
+	public static void showBatchProcessingDialog(JList ListOfQueries){
+		if(ListOfQueries.getModel().getSize() != 0) {
+			batchProcessingDialog = null;
+		}
 		if(batchProcessingDialog == null){
-			batchProcessingDialog = new BatchProcessingDialog(CreateGui.getApp(), "Batch Processing", true);
+			batchProcessingDialog = new BatchProcessingDialog(CreateGui.getApp(), "Batch Processing", true, ListOfQueries);
 			batchProcessingDialog.pack();
 			batchProcessingDialog.setPreferredSize(batchProcessingDialog.getSize());
 			//Set the minimum size to 150 less than the preferred, to be consistent with the minimum size of the result panel
@@ -331,16 +340,24 @@
 		batchProcessingDialog.setVisible(true);
 	}
 
-	private BatchProcessingDialog(Frame frame, String title, boolean modal) {
+	private BatchProcessingDialog(Frame frame, String title, boolean modal, JList ListOfQueries) {
 		super(frame, title, modal);
 		
 		addWindowListener(new WindowAdapter() {
 			public void windowClosing(WindowEvent we) {
+				if(!(isQueryListEmpty())) {
+					batchProcessingDialog = null;
+				}
 				terminateBatchProcessing();
 			}
 		});
+		this.ListOfQueries = ListOfQueries;
 
 		initComponents();
+		//Runs the BatchProcessing if it is called from the QueryPane
+		if(!(isQueryListEmpty())) {
+			process();
+		}
 	}
 
 	private void initComponents() {
@@ -353,6 +370,7 @@
 		initVerificationOptionsPanel();
 		initMonitorPanel();
 		initResultTablePanel();
+		setFileListToTempFile();
 		
 		splitpane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, topPanel, bottomPanel);		
 		splitpane.setResizeWeight(0);
@@ -360,6 +378,19 @@
 		splitpane.setContinuousLayout(true);
 		setContentPane(splitpane);
 	}
+	
+	private void setFileListToTempFile() {
+		if(!(isQueryListEmpty())) {
+			files.add(QueryPane.getTemporaryFile());
+		}
+	}
+	
+	private boolean isQueryListEmpty() {
+		if(ListOfQueries.getModel().getSize() == 0)
+			return true;
+		else
+			return false;
+	}
 
 	private void initFileListPanel() {
 		JPanel fileListPanel = new JPanel(new GridBagLayout());
@@ -474,10 +505,14 @@
 		gbc.gridheight = 2;
 		gbc.insets = new Insets(10, 5, 0, 5);
 		topPanel.add(fileListPanel, gbc);
+		//Hides the file list panel if batch processing is run from the tabcomponent
+		if(!(isQueryListEmpty())) {
+			fileListPanel.setVisible(false);
+		}
 	}
 
 	private void addFiles() {
-		FileBrowser browser = new FileBrowser("Timed-Arc Petri Nets","xml");
+		FileBrowser browser = new FileBrowser("Timed-Arc Petri Nets","xml", lastPath);
 		
 		File[] filesArray = browser.openFiles();
 		if (filesArray.length>0) {
@@ -528,6 +563,10 @@
 		gbc.weightx = 0;
 		gbc.insets = new Insets(10, 0, 0, 5);
 		topPanel.add(verificationOptionsPanel, gbc);
+		//Hides the verification options if batch processing is run from the tabcomponent
+		if(!(isQueryListEmpty())) {
+			verificationOptionsPanel.setVisible(false);
+		}
 	}
 
 	private void initQueryPropertyOptionsComponents() {
@@ -967,6 +1006,11 @@
 	private void exit() {
 		terminateBatchProcessing();
 		rootPane.getParent().setVisible(false);
+		//resets batch processing when exiting
+		//if batch processing was called from the tab
+		if(!(isQueryListEmpty())){
+			batchProcessingDialog = null;
+		}
 	}
 
 	private void initResultTablePanel() {
@@ -982,10 +1026,11 @@
 			}
 
 			private void exportResults() {
-				String filename = new FileBrowser("CSV file", "csv")
+				String filename = new FileBrowser("CSV file", "csv", lastPath)
 						.saveFile("results");
 				if (filename != null) {
 					File exportFile = new File(filename);
+					lastPath = exportFile.getParent();
 					BatchProcessingResultsExporter exporter = new BatchProcessingResultsExporter();
 					try {
 						exporter.exportToCSV(tableModel.getResults(),
@@ -1338,7 +1383,11 @@
 			}
 
 			public void fireFileChanged(FileChangedEvent e) {
-				fileStatusLabel.setText(e.fileName());
+				if(!(isQueryListEmpty())) {
+					fileStatusLabel.setText(CreateGui.appGui.getCurrentTabName());
+				}
+				else
+					fileStatusLabel.setText(e.fileName());
 			}
 
 		});

=== modified file 'src/dk/aau/cs/verification/batchProcessing/BatchProcessingWorker.java'
--- src/dk/aau/cs/verification/batchProcessing/BatchProcessingWorker.java	2018-02-11 13:28:38 +0000
+++ src/dk/aau/cs/verification/batchProcessing/BatchProcessingWorker.java	2018-04-09 08:31:59 +0000
@@ -8,8 +8,10 @@
 
 import pipe.dataLayer.TAPNQuery.SearchOption;
 import pipe.dataLayer.TAPNQuery.TraceOption;
+import pipe.gui.CreateGui;
 import pipe.gui.FileFinderImpl;
 import pipe.gui.MessengerImpl;
+import pipe.gui.widgets.QueryPane;
 import dk.aau.cs.Messenger;
 import dk.aau.cs.TCTL.TCTLAGNode;
 import dk.aau.cs.TCTL.TCTLEFNode;
@@ -372,7 +374,13 @@
 	}
 
 	private void publishResult(String fileName, pipe.dataLayer.TAPNQuery query, String verificationResult, long verificationTime, Stats stats) {
-		BatchProcessingVerificationResult result = new BatchProcessingVerificationResult(fileName, query, verificationResult, verificationTime, MemoryMonitor.getPeakMemory(), stats);
+		BatchProcessingVerificationResult result;		
+		if(QueryPane.getTemporaryFile() != null && fileName.equals(QueryPane.getTemporaryFile().getName())) {
+			//removes numbers from tempFile so it looks good
+			result = new BatchProcessingVerificationResult(CreateGui.appGui.getCurrentTabName(), query, verificationResult, verificationTime, MemoryMonitor.getPeakMemory(), stats);
+		} else {
+			result = new BatchProcessingVerificationResult(fileName, query, verificationResult, verificationTime, MemoryMonitor.getPeakMemory(), stats);
+		}
 		publish(result);
 	}
 

=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2018-02-15 11:31:28 +0000
+++ src/pipe/gui/GuiFrame.java	2018-04-09 08:31:59 +0000
@@ -25,6 +25,7 @@
 import java.util.jar.JarFile;
 import javax.swing.Action;
 import javax.swing.BoxLayout;
+import javax.swing.DefaultListModel;
 import javax.swing.ImageIcon;
 import javax.swing.JCheckBox;
 import javax.swing.JCheckBoxMenuItem;
@@ -32,6 +33,7 @@
 import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
+import javax.swing.JList;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
@@ -77,6 +79,7 @@
 import pipe.gui.widgets.FileBrowser;
 import pipe.gui.widgets.NewTAPNPanel;
 import pipe.gui.widgets.QueryDialog;
+import pipe.gui.widgets.QueryPane;
 import pipe.gui.widgets.WorkflowDialog;
 import dk.aau.cs.debug.Logger;
 import dk.aau.cs.gui.BatchProcessingDialog;
@@ -743,7 +746,7 @@
 		batchProcessing.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
 				if(checkForSaveAll()){
-					BatchProcessingDialog.showBatchProcessingDialog();
+					BatchProcessingDialog.showBatchProcessingDialog(new JList(new DefaultListModel()));
 				}
 			}
 		});
@@ -1355,6 +1358,26 @@
 
 	private void saveNet(int index, File outFile) {
 		try {
+			saveNet(index, outFile, (List<TAPNQuery>) CreateGui.getTab(index).queries());
+
+			CreateGui.setFile(outFile, index);
+
+			CreateGui.getDrawingSurface(index).setNetChanged(false);
+			appTab.setTitleAt(index, outFile.getName());
+			if(index == appTab.getSelectedIndex()) setTitle(outFile.getName()); // Change the window title
+			CreateGui.getDrawingSurface(index).getUndoManager().clear();
+			undoAction.setEnabled(false);
+			redoAction.setEnabled(false);
+		} catch (Exception e) {
+			System.err.println(e);
+			JOptionPane.showMessageDialog(GuiFrame.this, e.toString(),
+					"File Output Error", JOptionPane.ERROR_MESSAGE);
+			return;
+		}
+	}
+	
+	public void saveNet(int index, File outFile, List<TAPNQuery> queries) {
+		try {
 			TabContent currentTab = CreateGui.getTab(index);
 			NetworkMarking currentMarking = null;
 			if(getGUIMode().equals(GUIMode.animation)){
@@ -1365,20 +1388,12 @@
 			NetWriter tapnWriter = new TimedArcPetriNetNetworkWriter(
 					currentTab.network(),
 					currentTab.allTemplates(), 
-					currentTab.queries(), 
+					queries, 
 					currentTab.network().constants()
 					);
 
 			tapnWriter.savePNML(outFile);
 
-			CreateGui.setFile(outFile, index);
-
-			CreateGui.getDrawingSurface(index).setNetChanged(false);
-			appTab.setTitleAt(index, outFile.getName());
-			if(index == appTab.getSelectedIndex()) setTitle(outFile.getName()); // Change the window title
-			CreateGui.getDrawingSurface(index).getUndoManager().clear();
-			undoAction.setEnabled(false);
-			redoAction.setEnabled(false);
 			if(getGUIMode().equals(GUIMode.animation)){
 				currentTab.network().setMarking(currentMarking);
 			}

=== added file 'src/pipe/gui/undo/RemoveQueriesCommand.java'
--- src/pipe/gui/undo/RemoveQueriesCommand.java	1970-01-01 00:00:00 +0000
+++ src/pipe/gui/undo/RemoveQueriesCommand.java	2018-04-09 08:31:59 +0000
@@ -0,0 +1,32 @@
+package pipe.gui.undo;
+
+import java.util.List;
+
+import dk.aau.cs.gui.TabContent;
+import dk.aau.cs.gui.undo.Command;
+import pipe.dataLayer.TAPNQuery;
+
+public class RemoveQueriesCommand extends Command {
+	
+	private List<TAPNQuery> queriesToRemove;
+	private TabContent tabContent;
+
+
+	public RemoveQueriesCommand(List<TAPNQuery> QueriesToRemove, TabContent TabContent) {
+		this.queriesToRemove = QueriesToRemove;
+		this.tabContent = TabContent;
+	}
+	
+	@Override
+	public void redo() {
+		for(TAPNQuery queryToRemove : queriesToRemove) {
+			tabContent.removeQuery(queryToRemove);
+		}
+	}
+
+	@Override
+	public void undo() {
+		for(TAPNQuery query : queriesToRemove)
+			tabContent.addQuery(query);
+	}
+}

=== removed file 'src/pipe/gui/undo/RemoveQueryCommand.java'
--- src/pipe/gui/undo/RemoveQueryCommand.java	2011-04-02 16:30:48 +0000
+++ src/pipe/gui/undo/RemoveQueryCommand.java	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-package pipe.gui.undo;
-
-import pipe.dataLayer.TAPNQuery;
-import dk.aau.cs.gui.TabContent;
-
-public class RemoveQueryCommand extends AddQueryCommand {
-	
-	public RemoveQueryCommand(TAPNQuery query, TabContent tabContent) {
-		super(query, tabContent);
-	}
-	
-	@Override
-	public void redo() {
-		super.undo();
-	}
-
-	@Override
-	public void undo() {
-		super.redo();
-	}
-
-}

=== modified file 'src/pipe/gui/widgets/QueryPane.java'
--- src/pipe/gui/widgets/QueryPane.java	2017-06-23 09:03:39 +0000
+++ src/pipe/gui/widgets/QueryPane.java	2018-04-09 08:31:59 +0000
@@ -11,9 +11,12 @@
 import java.awt.event.ComponentListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListCellRenderer;
@@ -31,17 +34,20 @@
 import javax.swing.event.ListDataListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-
 import pipe.dataLayer.TAPNQuery;
 import pipe.gui.CreateGui;
+import pipe.gui.GuiFrame;
+import pipe.gui.MessengerImpl;
 import pipe.gui.Verifier;
 import pipe.gui.graphicElements.PetriNetObject;
 import pipe.gui.graphicElements.tapn.TimedPlaceComponent;
 import pipe.gui.undo.AddQueryCommand;
-import pipe.gui.undo.RemoveQueryCommand;
+import pipe.gui.undo.RemoveQueriesCommand;
 import pipe.gui.undo.UndoManager;
 import pipe.gui.widgets.QueryDialog.QueryDialogueOption;
+import dk.aau.cs.Messenger;
 import dk.aau.cs.debug.Logger;
+import dk.aau.cs.gui.BatchProcessingDialog;
 import dk.aau.cs.gui.TabContent;
 import dk.aau.cs.gui.TemplateExplorer;
 import dk.aau.cs.gui.undo.Command;
@@ -59,7 +65,9 @@
 	private JPanel buttonsPanel;
 	private DefaultListModel listModel;
 	private JList queryList;
+	private List<TAPNQuery> selectedQueries;
 	private JScrollPane queryScroller;
+	private Messenger messenger =  new MessengerImpl();
 
 	private JButton addQueryButton;
 	private JButton editQueryButton;
@@ -71,14 +79,15 @@
 	private JButton moveUpButton;
 	private JButton moveDownButton;
 	private JButton sortButton;
+	private static File tempFile;
 
 	private static final String toolTipNewQuery = "Create a new query";
 	private static final String toolTipEditQuery="Edit the selected query";
 	private static final String toolTipRemoveQuery="Remove the selected query";
 	private static final String toolTipVerifyQuery="Verify the selected query";
 	private static final String toolTipSortQueries="Sort the queries alphabetically";
-	private final static String toolTipMoveUp = "Move the selected query up";
-	private final static String toolTipMoveDown = "Move the selected query down";
+	private final static String toolTipMoveUp = "Move the selected query up; only one query can be moved at a time";
+	private final static String toolTipMoveDown = "Move the selected query down; only one query can be moved at a time";
 
 	//private static final String toolTipQueryPane = "Here you can manage queries. Queries can explore properties of the Net.";
 
@@ -107,7 +116,7 @@
 
 		queryList = new NonsearchableJList(listModel);
 		queryList.setCellRenderer(new QueryCellRenderer());
-		queryList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+		queryList.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 		queryList.addListSelectionListener(new ListSelectionListener() {
 			public void valueChanged(ListSelectionEvent e) {
 				if (!(e.getValueIsAdjusting())) {
@@ -179,13 +188,13 @@
 			removeQueryButton.setEnabled(true);
 		}
 		int index = queryList.getSelectedIndex();
-		if(index > 0)
+		if(index > 0 && queryList.getSelectedIndices().length == 1)
 			moveUpButton.setEnabled(true);
 		else
 			moveUpButton.setEnabled(false);
 
 
-		if(index < listModel.size()-1)
+		if(index < listModel.size()-1 && queryList.getSelectedIndices().length == 1)
 			moveDownButton.setEnabled(true);
 		else
 			moveDownButton.setEnabled(false);
@@ -211,10 +220,12 @@
 			public void actionPerformed(ActionEvent e) {
 				int index = queryList.getSelectedIndex();
 
-				if(index > 0) {
+				if(index > 0 && queryList.getSelectedIndices().length == 1) {
 					swapQueries(index, index-1);
 					queryList.setSelectedIndex(index-1);
 				}
+				else
+					moveUpButton.setEnabled(false);
 			}
 		});
 
@@ -231,10 +242,12 @@
 			public void actionPerformed(ActionEvent e) {
 				int index = queryList.getSelectedIndex();
 
-				if(index < listModel.size()-1) {
+				if(index < listModel.size()-1 && queryList.getSelectedIndices().length == 1) {
 					swapQueries(index, index+1);
 					queryList.setSelectedIndex(index+1);
 				}
+				else
+					moveDownButton.setEnabled(false);
 			}
 		});
 
@@ -272,7 +285,10 @@
 		editQueryButton.setPreferredSize(dimension);
 		editQueryButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
-				showEditDialog();
+				if(queryList.getSelectedIndices().length == 1)
+					showEditDialog();
+				else
+					messenger.displayErrorMessage("It is only possible to edit 1 query at a time. Only verification can be done with multiple queries.");
 			}
 		});
 		GridBagConstraints gbc = new GridBagConstraints();
@@ -302,11 +318,7 @@
 		removeQueryButton.setPreferredSize(dimension);
 		removeQueryButton.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
-				TAPNQuery query = (TAPNQuery) queryList.getSelectedValue();
-				undoManager.addNewEdit(new RemoveQueryCommand(query, tabContent));
-				if(listModel.getSize() > 0 && query != null){
-					listModel.remove(queryList.getSelectedIndex());
-				}
+				removeQueries();
 			}
 		});
 		gbc = new GridBagConstraints();
@@ -359,6 +371,16 @@
 		listModel.set(currentIndex, listModel.get(newIndex));
 		listModel.set(newIndex, temp);
 	}
+	
+	private void removeQueries() {
+		undoManager.addNewEdit(new RemoveQueriesCommand((List<TAPNQuery>) queryList.getSelectedValuesList(), tabContent));
+		if(listModel.getSize() > 0 && isQueryPossible()){
+			for(Object o : queryList.getSelectedValuesList()) {
+				listModel.removeElement(o);
+			}
+			updateQueryButtons();
+		}
+	}
 
 	public void showEditDialog() {
 		int openCTLDialog = JOptionPane.YES_OPTION;
@@ -463,13 +485,45 @@
 
 	private void verifyQuery() {
 		TAPNQuery query = (TAPNQuery) queryList.getSelectedValue();
-
-		if(query.getReductionOption() == ReductionOption.VerifyTAPN || query.getReductionOption() == ReductionOption.VerifyTAPNdiscreteVerification || query.getReductionOption() == ReductionOption.VerifyPN)
-			Verifier.runVerifyTAPNVerification(tabContent.network(), query, null, this.tabContent.getGuiModels());
-		else
-			Verifier.runUppaalVerification(tabContent.network(), query);
-	}
-
+		int NumberOfSelectedElements = queryList.getSelectedIndices().length;
+		
+		
+		if(NumberOfSelectedElements == 1) {
+			if(query.getReductionOption() == ReductionOption.VerifyTAPN || query.getReductionOption() == ReductionOption.VerifyTAPNdiscreteVerification || query.getReductionOption() == ReductionOption.VerifyPN)
+				Verifier.runVerifyTAPNVerification(tabContent.network(), query, null, this.tabContent.getGuiModels());
+			else
+				Verifier.runUppaalVerification(tabContent.network(), query);
+		}
+		else if(NumberOfSelectedElements > 1) {
+			saveNetAndRunBatchProcessing();
+		}
+	}
+	
+	private void saveNetAndRunBatchProcessing() {
+		getSelectedQueriesForProcessing();
+		//Saves the net in a temporary file which is used in batchProcessing
+		//File is deleted on exit
+		try {
+			tempFile = File.createTempFile(CreateGui.appGui.getCurrentTabName(), ".xml");
+			CreateGui.appGui.saveNet(CreateGui.getTab().getSelectedIndex(), tempFile, selectedQueries);
+			BatchProcessingDialog.showBatchProcessingDialog(queryList);
+			tempFile.deleteOnExit();
+			if(tempFile == null) {
+				throw new IOException();
+			}
+		}catch(IOException e) {
+			messenger.displayErrorMessage("Creation of temporary file needed for verification failed.");
+		}
+	}
+	
+	private void getSelectedQueriesForProcessing() {
+		selectedQueries = queryList.getSelectedValuesList();
+	}
+	
+	public static File getTemporaryFile() {
+		return tempFile;
+	}
+	
 	public boolean isQueryPossible() {
 		return (queryList.getModel().getSize() > 0 );
 	}