Merge lp:~tapaal-contributor/tapaal/open-on-windows-1868525 into lp:tapaal

[Peter Haahr Taankvist]

Open on Windows now also shows both xml and tapn files as on Linux and Mac

[Jiri Srba (srba)]

As on Mac this was not a problem, I just want to ask whether this has been properly tested on Windows?

review: Needs Information

[Peter Haahr Taankvist (ptaank)]

I tested it on my Windows machine and it works. Maybe Kenneth can confirm?

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java'
--- src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java	2020-01-13 10:28:16 +0000
+++ src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java	2020-03-23 16:27:17 +0000
@@ -14,6 +14,7 @@
 class NativeFileBrowser extends FileBrowser {
 	private FileDialog fc;
 	private String ext;
+        private String optionalExt;
 	private String specifiedPath;
 	NativeFileBrowser(String filetype, final String ext, String path) {
 		this(filetype, ext, "", path);
@@ -29,9 +30,11 @@
 		//if(path == null) path = lastPath;
 
 		this.ext = ext;
+                this.optionalExt = optionalExt;
 		//fc.setDirectory(path);
 
 		// Setup filter if extension specified
+                //This is needed for Linux and Mac
 		if(!ext.equals("")){
 			if(!optionalExt.equals("")) {
 				fc.setFilenameFilter(new FilenameFilter() {
@@ -54,30 +57,34 @@
 	
 
 	public File openFile() {
-		if(specifiedPath == null) specifiedPath = lastOpenPath;
-		fc.setDirectory(specifiedPath);
-		fc.setFile(ext.equals("")? "":"*."+ext);
-		fc.setMode(FileDialog.LOAD);
-		fc.setMultipleMode(false);
-		fc.setVisible(true);
-		String selectedFile = fc.getFile();
-		String selectedDir = fc.getDirectory();
-		lastOpenPath = selectedDir;
-		File file = selectedFile == null? null:new File(selectedDir + selectedFile);
-		return file;
+            if(specifiedPath == null) specifiedPath = lastOpenPath;
+            fc.setDirectory(specifiedPath);
+            //This is needed for Windows
+            if(optionalExt.equals("")) fc.setFile(ext.equals("")? "":("*."+ext));
+            else fc.setFile(ext.equals("")? "":("*."+ext+";*."+optionalExt));
+            fc.setMode(FileDialog.LOAD);
+            fc.setMultipleMode(false);
+            fc.setVisible(true);
+            String selectedFile = fc.getFile();
+            String selectedDir = fc.getDirectory();
+            lastOpenPath = selectedDir;
+            File file = selectedFile == null? null:new File(selectedDir + selectedFile);
+            return file;
 	}
 	
 	public File[] openFiles() {
-		if(specifiedPath == null) specifiedPath = lastOpenPath;
-		fc.setDirectory(specifiedPath);
-		fc.setFile(ext.equals("")? "":"*."+ext);
-		fc.setMultipleMode(true);
-		fc.setMode(FileDialog.LOAD);
-		fc.setVisible(true);
-		File[] selectedFiles = fc.getFiles();
-		String selectedDir = fc.getDirectory();
-		lastOpenPath = selectedDir;
-		return selectedFiles;
+            if(specifiedPath == null) specifiedPath = lastOpenPath;
+            fc.setDirectory(specifiedPath);
+            //This is needed for Windows
+            if(optionalExt.equals("")) fc.setFile(ext.equals("")? "":("*."+ext));
+            else fc.setFile(ext.equals("")? "":("*."+ext+";*."+optionalExt));
+            fc.setMultipleMode(true);
+            fc.setMode(FileDialog.LOAD);
+            fc.setVisible(true);
+            File[] selectedFiles = fc.getFiles();
+            String selectedDir = fc.getDirectory();
+            lastOpenPath = selectedDir;
+            return selectedFiles;
 	}
 	
 	public String saveFile(String suggestedName) {

=== modified file 'src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java'
--- src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java	2020-01-13 10:10:50 +0000
+++ src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java	2020-03-23 16:27:17 +0000
@@ -17,6 +17,7 @@
 class NativeFileBrowserFallback extends FileBrowser {
 	private FileDialog fc;
 	private String ext;
+        private String optionalExt;
 	private String specifiedPath;
 	private JFileChooser fileChooser;
 	/**
@@ -36,6 +37,7 @@
 		//if(path == null) path = lastPath;
 
 		this.ext = ext;
+                this.optionalExt = optionalExt;
 		//fc.setDirectory(path);
 
 		/* Setup JFileChooser for multi file selection */
@@ -44,6 +46,7 @@
 		FileNameExtensionFilter filter;
 
 		// Setup filter if extension specified
+                //This is needed for Linux and Mac
 		if(!ext.equals("")){
 			if(!optionalExt.equals("")) {
 				fc.setFilenameFilter(new FilenameFilter() {
@@ -76,7 +79,9 @@
 	public File openFile() {
 		if(specifiedPath == null) specifiedPath = lastOpenPath;
 		fc.setDirectory(specifiedPath);
-		fc.setFile(ext.equals("")? "":"*."+ext);
+                //This is needed for windows
+		if(optionalExt.equals("")) fc.setFile(ext.equals("")? "":("*."+ext));
+                else fc.setFile(ext.equals("")? "":("*."+ext+";*."+optionalExt));
 		fc.setMode(FileDialog.LOAD);
 		fc.setVisible(true);
 		String selectedFile = fc.getFile();