Merge lp:~tapaal-contributor/tapaal/only-dirs-batch-export-3.6-1870887 into lp:tapaal

[Peter Haahr Taankvist]

Batch export now only shows dirs in save dialog for windows and linux and has better functionality for mac.

Unmerged revisions

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

Batch export now only shows dirs when selecting destination

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:54:44 +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/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:54:44 +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-13 15:54:44 +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:54:44 +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-13 15:54: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-13 15:54: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/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:54:44 +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/ExportBatchDialog.java'
--- src/pipe/gui/ExportBatchDialog.java	2020-04-18 16:08:44 +0000
+++ src/pipe/gui/ExportBatchDialog.java	2020-05-13 15:54:44 +0000
@@ -235,10 +235,21 @@
 		gbc.anchor = GridBagConstraints.WEST;
 		gbc.insets = new Insets(0, 10, 0, 0);
 		JButton destinationPathSelector = new JButton("Select destination folder");
+<<<<<<< TREE
 		destinationPathSelector.addActionListener(e -> {
 			selectDestinationPath();
 			destinationPathField.setText(destinationFile.getParent());
 			enableButtons();
+=======
+		destinationPathSelector.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				selectDestinationPath();
+				if(destinationFile != null) {
+					destinationPathField.setText(lastExportPath);
+				}
+				enableButtons();
+			}
+>>>>>>> MERGE-SOURCE
 		});
 		chooserPanel.add(destinationPathSelector, gbc);
 		
@@ -450,10 +461,10 @@
 	}
 	
 	private void selectDestinationPath() {
-		String chosenFile = FileBrowser.constructor("Select an export folder", ".", lastExportPath).saveFile("Export");
+		File chosenFile = FileBrowser.constructor("Select an export folder", ".", lastExportPath).saveFileToDir();
 		if(chosenFile != null) {
-			destinationFile = new File(chosenFile);
-			lastExportPath = chosenFile;
+			destinationFile = chosenFile;
+			lastExportPath = destinationFile.getAbsolutePath();
 		}
 		else return;
 	}

=== 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:54:44 +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:54:44 +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/filebrowser/FileBrowser.java'
--- src/pipe/gui/widgets/filebrowser/FileBrowser.java	2020-04-18 15:39:19 +0000
+++ src/pipe/gui/widgets/filebrowser/FileBrowser.java	2020-05-13 15:54:44 +0000
@@ -11,8 +11,8 @@
     //Default value null makes the open dialog open default folder, For Windows, My Documents, For *nix  ~ , etc
 	//XXX 2018-05-23 moved from CreateGUI, refactor with regards to usage with lastPath local var in this class
     public static String userPath = null;
-    static String lastSavePath = null;
-    static String lastOpenPath = null;
+    static String lastSavePath = ".";
+    static String lastOpenPath = ".";
 
 	public static FileBrowser constructor(String filetype, final String ext) {
 		return constructor(filetype, ext, null);
@@ -48,5 +48,6 @@
 	}
 
 	public abstract String saveFile(String suggestedName);
+	public abstract File saveFileToDir();
 
 }

=== modified file 'src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java'
--- src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java	2020-04-18 15:39:19 +0000
+++ src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java	2020-05-13 15:54:44 +0000
@@ -7,8 +7,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.swing.JOptionPane;
-
+import javax.swing.*;
 import pipe.gui.CreateGui;
 
 class NativeFileBrowser extends FileBrowser {
@@ -23,7 +22,7 @@
 	NativeFileBrowser(String filetype, final String ext, final String optionalExt, String path) {
 		fc = new FileDialog(CreateGui.getAppGui(), filetype);
 		this.specifiedPath = path;
-		
+
 		if (filetype == null) {
 			filetype = "file";
 		}
@@ -85,7 +84,7 @@
         lastOpenPath = fc.getDirectory();
             return selectedFiles;
 	}
-	
+
 	public String saveFile(String suggestedName) {
 		if(specifiedPath == null) specifiedPath = lastSavePath;
 		fc.setDirectory(specifiedPath);
@@ -146,5 +145,34 @@
 
 		return file;
 	}
-
+    public File saveFileToDir(){
+	    //In Windows the native FileDialog only works with files
+        //So we make a JFileChooser in which we can control it
+	    if(System.getProperty("os.name").startsWith("Windows")) {
+            File selectedDir = null;
+            if (specifiedPath == null) specifiedPath = lastSavePath;
+            JFileChooser c = new JFileChooser(specifiedPath);
+            c.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+            c.setDialogTitle("Choose target directory for export");
+            int rVal = c.showSaveDialog(c);
+            if (rVal == JFileChooser.APPROVE_OPTION) {
+                selectedDir = c.getSelectedFile();
+                lastSavePath = selectedDir.getPath();
+            }
+
+            return selectedDir;
+        } else{
+	        //For Mac we can set Directories only
+            //For linux a save dialog only shows directories
+            System.setProperty("apple.awt.fileDialogForDirectories", "true");
+            String selection = saveFile("Choose Directory");
+            System.setProperty("apple.awt.fileDialogForDirectories", "false");
+            if(selection != null) {
+                return new File(fc.getDirectory());
+            } else{
+                return null;
+            }
+        }
+
+    }
 }

=== modified file 'src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java'
--- src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java	2020-04-18 14:41:05 +0000
+++ src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java	2020-05-13 15:54:44 +0000
@@ -10,7 +10,6 @@
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileNameExtensionFilter;
-
 import pipe.gui.CreateGui;
 
 class NativeFileBrowserFallback extends FileBrowser {
@@ -159,4 +158,34 @@
 		}
 		return file;
 	}
+    public File saveFileToDir(){
+        //In Windows the native FileDialog only works with files
+        //So we make a JFileChooser in which we can control it
+        if(System.getProperty("os.name").startsWith("Windows")) {
+            File selectedDir = null;
+            if (specifiedPath == null) specifiedPath = lastSavePath;
+            JFileChooser c = new JFileChooser(specifiedPath);
+            c.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+            c.setDialogTitle("Choose target directory for export");
+            int rVal = c.showSaveDialog(c);
+            if (rVal == JFileChooser.APPROVE_OPTION) {
+                selectedDir = c.getSelectedFile();
+                lastSavePath = selectedDir.getPath();
+            }
+
+            return selectedDir;
+        } else{
+            //For Mac we can set Directories only
+            //For linux a save dialog only shows directories
+            System.setProperty("apple.awt.fileDialogForDirectories", "true");
+            String selection = saveFile("Choose Directory");
+            System.setProperty("apple.awt.fileDialogForDirectories", "false");
+            if(selection != null) {
+                return new File(fc.getDirectory());
+            } else{
+                return null;
+            }
+        }
+
+    }
 }