Merge lp:~tapaal-contributor/tapaal/fix1945984 into lp:~tapaal-contributor/tapaal/cpn-gui-dev

[Kenneth Yrke Jørgensen]

[Jiri Srba (srba)]

I could not reproduce the bug on mac but after this patch saving and opening files still works on mac, so I approve.

review: Approve

=== modified file 'src/pipe/gui/widgets/filebrowser/FileBrowser.java'
--- src/pipe/gui/widgets/filebrowser/FileBrowser.java	2021-11-18 11:18:54 +0000
+++ src/pipe/gui/widgets/filebrowser/FileBrowser.java	2021-12-21 09:05:52 +0000
@@ -1,42 +1,186 @@
 package pipe.gui.widgets.filebrowser;
 
+import pipe.gui.CreateGui;
+
+import javax.swing.*;
+import java.awt.*;
 import java.io.File;
-
-import dk.aau.cs.util.JavaUtil;
-import pipe.gui.CreateGui;
-
-
-public abstract class FileBrowser  {
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+public class FileBrowser {
     //Used for latest open dialog path
     //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
+    //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 = ".";
     static String lastOpenPath = ".";
-
-	public static FileBrowser constructor(String filetype, final String ext) {
-		return constructor(filetype, ext, null);
-	}
-
-	public static FileBrowser constructor(String filetype, final String ext, String path) {
-		return constructor(filetype, ext, "", path);
-	}
-	public static FileBrowser constructor(String filetype, final String ext, final String optionalExt, String path) {
-		return new NativeFileBrowser(filetype, ext, optionalExt, path);
-	}
-
-	public abstract File openFile();
-
-	public abstract File[] openFiles();
-
-	public String saveFile(){
-		if(CreateGui.getAppGui().getCurrentTabName().endsWith(".tapn"))
-			return saveFile(CreateGui.getAppGui().getCurrentTabName().replaceAll(".tapn", ""));
-		else
-			return saveFile(CreateGui.getAppGui().getCurrentTabName().replaceAll(".xml", ""));
-	}
-
-	public abstract String saveFile(String suggestedName);
-	public abstract File saveFileToDir();
+    protected final FileDialog fileDialog;
+    protected final String ext;
+    protected final String optionalExt;
+    protected String specifiedPath;
+
+    private FileBrowser(String filetype, final String ext, final String optionalExt, String path) {
+        fileDialog = new FileDialog(CreateGui.getAppGui(), filetype);
+        this.ext = ext;
+        this.optionalExt = optionalExt;
+        this.specifiedPath = path;
+
+        if (filetype == null) {
+            filetype = "file";
+        }
+
+        // Setup filter if extension specified
+        //This is needed for Linux and Mac
+        if (!ext.equals("")) {
+            if (!optionalExt.equals("")) {
+                fileDialog.setFilenameFilter((dir, name) -> name.endsWith(ext) || name.endsWith(optionalExt));
+            } else {
+                fileDialog.setFilenameFilter((dir, name) -> name.endsWith(ext));
+            }
+        }
+    }
+
+    public static FileBrowser constructor(String filetype, final String ext) {
+        return constructor(filetype, ext, null);
+    }
+
+    public static FileBrowser constructor(String filetype, final String ext, String path) {
+        return constructor(filetype, ext, "", path);
+    }
+
+    public static FileBrowser constructor(String filetype, final String ext, final String optionalExt, String path) {
+        return new FileBrowser(filetype, ext, optionalExt, path);
+    }
+
+    public File openFile() {
+        if (specifiedPath == null) specifiedPath = lastOpenPath;
+        fileDialog.setDirectory(specifiedPath);
+        //This is needed for Windows
+        if (optionalExt.equals("")) {
+            fileDialog.setFile(ext.equals("") ? "" : ("*." + ext));
+        } else {
+            fileDialog.setFile(ext.equals("") ? "" : ("*." + ext + ";*." + optionalExt));
+        }
+        fileDialog.setMode(FileDialog.LOAD);
+        fileDialog.setMultipleMode(false);
+        fileDialog.setVisible(true);
+        String selectedFile = fileDialog.getFile();
+        String selectedDir = fileDialog.getDirectory();
+        lastOpenPath = selectedDir;
+        File file = selectedFile == null ? null : new File(selectedDir + selectedFile);
+        return file;
+    }
+
+    public File[] openFiles() {
+        if (specifiedPath == null) specifiedPath = lastOpenPath;
+        fileDialog.setDirectory(specifiedPath);
+        //This is needed for Windows
+        if (optionalExt.equals("")) {
+            fileDialog.setFile(ext.equals("") ? "" : ("*." + ext));
+        } else {
+            fileDialog.setFile(ext.equals("") ? "" : ("*." + ext + ";*." + optionalExt));
+        }
+        fileDialog.setMultipleMode(true);
+        fileDialog.setMode(FileDialog.LOAD);
+        fileDialog.setVisible(true);
+        File[] selectedFiles = fileDialog.getFiles();
+        lastOpenPath = fileDialog.getDirectory();
+        return selectedFiles;
+    }
+
+    public String saveFile() {
+        if (CreateGui.getAppGui().getCurrentTabName().endsWith(".tapn")) {
+            return saveFile(CreateGui.getAppGui().getCurrentTabName().replaceAll(".tapn", ""));
+        } else {
+            return saveFile(CreateGui.getAppGui().getCurrentTabName().replaceAll(".xml", ""));
+        }
+    }
+
+    public String saveFile(String suggestedName) {
+        if (specifiedPath == null) specifiedPath = lastSavePath;
+
+        fileDialog.setDirectory(specifiedPath);
+        fileDialog.setFile(suggestedName + (suggestedName.endsWith("." + ext) ? "" : "." + ext));
+        fileDialog.setMode(FileDialog.SAVE);
+        fileDialog.setVisible(true);
+
+        // user canceled
+        if (fileDialog.getFile() == null) {
+            return null;
+        }
+
+        // Fixes bug:1648076 for OS X
+        if (fileDialog.getDirectory().endsWith(suggestedName + "." + ext + "/")) {
+            fileDialog.setDirectory(fileDialog.getDirectory().replaceAll(suggestedName + "." + ext + "/", ""));
+        }
+
+        String file = fileDialog.getDirectory() + fileDialog.getFile();
+        lastSavePath = fileDialog.getDirectory();
+
+        // Windows does not enforce file ending on save
+        if (!file.endsWith("." + ext)) {
+
+            Pattern p = Pattern.compile(".*\\.(.*)");
+            Matcher m = p.matcher(file);
+            String newName = file + "." + ext;
+
+            // I guess this tries to replace any existing file ending? I don't think this is safe --kyrke
+            if (m.matches()) {
+                newName = file.substring(0, file.length() - m.group(1).length()) + ext;
+            }
+            File destination = new File(newName);
+
+            // Overwrite dialog is already shown, but since we changed the named file, we need to show it again
+            if (destination.exists()) {
+                int overRide = JOptionPane.showConfirmDialog(CreateGui.getAppGui(), newName + "\nDo you want to overwrite this file?");
+                switch (overRide) {
+                    case JOptionPane.NO_OPTION:
+                        return saveFile(suggestedName); // Reopen dialog to select new name
+                    case JOptionPane.YES_OPTION:
+                        file = newName;
+                        break;
+                    default:
+                        return null;
+                }
+            } else  {
+                file = newName;
+            }
+        }
+        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(fileDialog.getDirectory());
+            } else {
+                return null;
+            }
+        }
+
+    }
 
 }

=== removed file 'src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java'