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

[Kenneth Yrke Jørgensen]

[Jiri Srba (srba)]

I would maybe try to make this test case insensitive

if (f.getName().endsWith(".pnml"))

to that a file like net.PNML will be also parsed with the PNML parser.

[lp:~tapaal-contributor/tapaal/cpn-openPNML2]

1614. By Kenneth Yrke Jørgensen on 2022-02-17

Made .pnml check case insensitive

[Jiri Srba (srba)]

Tested and works great.

review: Approve

=== modified file 'src/net/tapaal/gui/GuiFrameController.java'
--- src/net/tapaal/gui/GuiFrameController.java	2022-02-10 07:46:25 +0000
+++ src/net/tapaal/gui/GuiFrameController.java	2022-02-17 10:51:44 +0000
@@ -273,18 +273,35 @@
 
     @Override
     public void openTAPNFile() {
-        final File[] files = FileBrowser.constructor("Timed-Arc Petri Net","tapn", "xml", FileBrowser.userPath).openFiles();
+        final File[] files = FileBrowser.constructor(new String[]{"tapn", "xml", "pnml"}, FileBrowser.userPath).openFiles();
         //show loading cursor
+        openTAPNFile(files);
+    }
+
+    @Override
+    public void importPNMLFile() {
+        final File[] files = FileBrowser.constructor("Import PNML", "pnml", FileBrowser.userPath).openFiles();
+
+        openPNMLFile(files);
+    }
+
+    private void openTAPNFile(File[] files) {
         guiFrameDirectAccess.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         //Do loading
-        SwingWorker<java.util.List<PetriNetTab>, Void> worker = new SwingWorker<java.util.List<PetriNetTab>, Void>() {
+        SwingWorker<List<PetriNetTab>, Void> worker = new SwingWorker<List<PetriNetTab>, Void>() {
             @Override
-            protected java.util.List<PetriNetTab> doInBackground() throws Exception {
-                java.util.List<PetriNetTab> filesOpened = new ArrayList<>();
+            protected List<PetriNetTab> doInBackground() throws Exception {
+                List<PetriNetTab> filesOpened = new ArrayList<>();
                 for(File f : files){
                     if(f.exists() && f.isFile() && f.canRead()){
                         FileBrowser.userPath = f.getParent();
-                        filesOpened.add(PetriNetTab.createNewTabFromFile(f));
+
+                        if (f.getName().toLowerCase().endsWith(".pnml")) {
+                            filesOpened.add(PetriNetTab.createNewTabFromPNMLFile(f));
+                        } else {
+                            filesOpened.add(PetriNetTab.createNewTabFromFile(f));
+                        }
+
                     }
                 }
                 return filesOpened;
@@ -293,7 +310,19 @@
             protected void done() {
                 try {
                     List<PetriNetTab> tabs = get();
-                    openTab(tabs);
+                    for (PetriNetTab tab : tabs) {
+                        openTab(tab);
+
+                        //Don't autolayout on empty net, hotfix for issue #1960000, we assue only pnml file does not have layout and they always only have one component
+                        if(!tab.currentTemplate().getHasPositionalInfo() && (tab.currentTemplate().guiModel().getPlaces().length + tab.currentTemplate().guiModel().getTransitions().length) > 0) {
+                            int dialogResult = JOptionPane.showConfirmDialog (null, "The net does not have any layout information. Would you like to do automatic layout?","Automatic Layout?", JOptionPane.YES_NO_OPTION);
+                            if(dialogResult == JOptionPane.YES_OPTION) {
+                                SmartDrawDialog.showSmartDrawDialog();
+                            }
+                        }
+                    }
+
+
                 } catch (Exception e) {
                     String message = e.getMessage();
 
@@ -301,9 +330,9 @@
                         message = message.split(":", 2)[1];
                     }
                     JOptionPane.showMessageDialog(TAPAALGUI.getApp(),
-                            message,
-                            "Error loading file",
-                            JOptionPane.ERROR_MESSAGE);
+                        message,
+                        "Error loading file",
+                        JOptionPane.ERROR_MESSAGE);
                     return;
                 }finally {
                     guiFrameDirectAccess.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
@@ -314,20 +343,17 @@
 
         //Sleep redrawing thread (EDT) until worker is done
         //This enables the EDT to schedule the many redraws called in createNewTabFromPNMLFile(f); much better
-			    while(!worker.isDone()) {
-			    	try {
-			    		Thread.sleep(1000);
-					} catch (InterruptedException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-			    }
+        while(!worker.isDone()) {
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
     }
 
-    @Override
-    public void importPNMLFile() {
-        final File[] files = FileBrowser.constructor("Import PNML", "pnml", FileBrowser.userPath).openFiles();
-
+    private void openPNMLFile(File[] files) {
         //Show loading cursor
         guiFrameDirectAccess.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         //Do loading of net
@@ -359,9 +385,9 @@
 
                 } catch (Exception e) {
                     JOptionPane.showMessageDialog(TAPAALGUI.getApp(),
-                            e.getMessage(),
-                            "Error loading file",
-                            JOptionPane.ERROR_MESSAGE);
+                        e.getMessage(),
+                        "Error loading file",
+                        JOptionPane.ERROR_MESSAGE);
                     return;
                 }finally {
                     guiFrameDirectAccess.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
@@ -372,14 +398,14 @@
 
         //Sleep redrawing thread (EDT) until worker is done
         //This enables the EDT to schedule the many redraws called in createNewTabFromPNMLFile(f); much better
-			    while(!worker.isDone()) {
-			    	try {
-			    		Thread.sleep(1000);
-					} catch (InterruptedException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-			    }
+        while(!worker.isDone()) {
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
     }
 
     //XXX 2018-05-23 kyrke, moved from CreateGui, static method

=== modified file 'src/pipe/gui/swingcomponents/filebrowser/FileBrowser.java'
--- src/pipe/gui/swingcomponents/filebrowser/FileBrowser.java	2022-01-07 14:57:22 +0000
+++ src/pipe/gui/swingcomponents/filebrowser/FileBrowser.java	2022-02-17 10:51:44 +0000
@@ -5,8 +5,10 @@
 import javax.swing.*;
 import java.awt.*;
 import java.io.File;
+import java.util.Arrays;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 
 public class FileBrowser {
@@ -16,29 +18,33 @@
     public static String userPath = null;
     static String lastSavePath = ".";
     static String lastOpenPath = ".";
+
     protected final FileDialog fileDialog;
-    protected final String ext;
-    protected final String optionalExt;
+    private final String[] fileExtensions;
     protected String specifiedPath;
 
-    private FileBrowser(String filetype, final String ext, final String optionalExt, String path) {
+    private FileBrowser(String filetype, String[] extensions, String path) {
         fileDialog = new FileDialog(TAPAALGUI.getAppGui(), filetype);
-        this.ext = ext;
-        this.optionalExt = optionalExt;
+        this.fileExtensions = extensions;
         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));
-            }
+        // Setup filter if extension specified used on Linux and MacOS
+        if (fileExtensions.length > 0) {
+
+
+
+            // FilenameFilter is used on Linux and MacOS, but not working on windows
+            fileDialog.setFilenameFilter((dir, name) -> {
+                for (String fileExtension : fileExtensions) {
+                    if (name.endsWith("." + fileExtension)) {
+                        return true;
+                    }
+                }
+                return false;
+            });
+            // Workaround for Windows to filter files in open dialog, overwritten in save menu
+            String filter = Arrays.stream(fileExtensions).map(ext -> "*." + ext).collect(Collectors.joining(";"));
+            fileDialog.setFile(filter);
         }
     }
 
@@ -51,18 +57,18 @@
     }
 
     public static FileBrowser constructor(String filetype, final String ext, final String optionalExt, String path) {
-        return new FileBrowser(filetype, ext, optionalExt, path);
+        return new FileBrowser(filetype, new String[]{ext, optionalExt}, path);
+    }
+
+    public static FileBrowser constructor(String[] extensions, String path) {
+        return new FileBrowser(null, extensions, 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);
@@ -77,11 +83,7 @@
         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);
@@ -99,6 +101,7 @@
     }
 
     public String saveFile(String suggestedName) {
+        String ext = fileExtensions[0];
         if (specifiedPath == null) specifiedPath = lastSavePath;
 
         fileDialog.setDirectory(specifiedPath);