Merge lp:~tapaal-contributor/tapaal/save-file-browser-location-3.9 into lp:tapaal

[Lena Ernstsen]

Stores the location of the file browser

Unmerged revisions

1173. By Lena Ernstsen on 2022-08-01

Loads file browser location when starting the application

1172. By Jiri Srba on 2022-06-03

merged in a fix for resting LTL queries

1171. By Jiri Srba on 2022-06-03

merged in a bug fix for LTL manual edit of queries ( E .. and .. and ...) did not allow manual edit and removing the last conjunct

1170. By Jiri Srba on 2022-06-03

merged in lp:~yrke/tapaal/fix1976494 fixing a problem with copying components that contain environmental transitions

1169. By Jiri Srba on 2022-05-24

merged in src/pipe/gui/widgets/QueryDialog.java fixing problem with and and or in query dialog

1168. By Jiri Srba <email address hidden> on 2022-02-10

merged in lp:~tapaal-contributor/tapaal/foxTAPNdi-39 fixing problem with passing inclusion places to verifytapn engine

1167. By <email address hidden> on 2022-02-01

version number to 3.9.2 and copyright to 2022

1166. By Jiri Srba on 2021-12-27

merged in lp:~tapaal-contributor/tapaal/fixApprox-39 fixing over/under-approximation for verifydtapn

1165. By Jiri Srba <email address hidden> on 2021-12-07

merged in lp:~yrke/tapaal/fix1947835 fixing problem with delay/fire in simulator

1164. By Jiri Srba on 2021-12-06

merged in lp:~tapaal-contributor/tapaal/fix-transition-name-highlighting-1952520 fixing problem with label highligting for transitions (dark mode on ubuntu should be checked)

=== modified file 'src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNExporter.java'
--- src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNExporter.java	2021-12-27 08:26:55 +0000
+++ src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNExporter.java	2022-08-01 13:38:30 +0000
@@ -1,33 +1,21 @@
 package dk.aau.cs.verification.VerifyTAPN;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Collection;
-import java.util.List;
-
+import dk.aau.cs.TCTL.visitors.CTLQueryVisitor;
 import dk.aau.cs.TCTL.visitors.LTLQueryVisitor;
 import dk.aau.cs.gui.TabContent;
+import dk.aau.cs.model.tapn.*;
 import dk.aau.cs.verification.NameMapping;
 import pipe.dataLayer.DataLayer;
 import pipe.dataLayer.TAPNQuery.QueryCategory;
-
-import dk.aau.cs.model.tapn.TAPNQuery;
-import dk.aau.cs.model.tapn.TimedArcPetriNet;
-import dk.aau.cs.model.tapn.TimedInhibitorArc;
-import dk.aau.cs.model.tapn.TimedInputArc;
-import dk.aau.cs.model.tapn.TimedOutputArc;
-import dk.aau.cs.model.tapn.TimedPlace;
-import dk.aau.cs.model.tapn.TimedTransition;
-import dk.aau.cs.model.tapn.TransportArc;
-
-import dk.aau.cs.TCTL.visitors.CTLQueryVisitor;
 import pipe.gui.CreateGui;
 import pipe.gui.graphicElements.Place;
 import pipe.gui.graphicElements.Transition;
 
-import javax.xml.crypto.Data;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.Collection;
 
 public class VerifyTAPNExporter {
 	public ExportedVerifyTAPNModel export(TimedArcPetriNet model, TAPNQuery query, TabContent.TAPNLens lens, NameMapping mapping) {
@@ -140,9 +128,15 @@
 
     private void outputTransition(TimedTransition t, PrintStream modelStream, Collection<DataLayer> guiModels, NameMapping mapping) {
         //remove the net prefix from the transition name
+<<<<<<< TREE
         var m = mapping.map(t.name());
 
+=======
+        var m = mapping.map(t.name());
+        String transitionName;
+>>>>>>> MERGE-SOURCE
         Transition guiTransition = null;
+<<<<<<< TREE
         if (m != null) {
             String transitionName = m.value2();
             for(DataLayer guiModel : guiModels){
@@ -150,11 +144,19 @@
                 if(guiTransition != null){
                     break;
                 }
+=======
+        if (m != null) {
+            transitionName = m.value2();
+            for (DataLayer guiModel : guiModels) {
+                guiTransition = guiModel.getTransitionById(transitionName);
+                if (guiTransition != null) {
+                    break;
+                }
+>>>>>>> MERGE-SOURCE
             }
         }
 
 		modelStream.append("<transition ");
-
         modelStream.append("player=\"" + (t.isUncontrollable() ? "1" : "0") + "\" ");
         modelStream.append("id=\"" + t.name() + "\" ");
 		modelStream.append("name=\"" + t.name() + "\" ");

=== modified file 'src/net/tapaal/Preferences.java'
--- src/net/tapaal/Preferences.java	2016-11-14 09:58:40 +0000
+++ src/net/tapaal/Preferences.java	2022-08-01 13:38:30 +0000
@@ -329,4 +329,18 @@
 
 		return object;
 	}
+
+    public void setFileBrowserLocation(String location) {
+        final String key = "file.location";
+
+        if (location == null || location.equals("")){
+            pref.remove(key);
+        } else {
+            pref.put(key, location);
+        }
+    }
+
+    public String getFileBrowserLocation() {
+        return pref.get("file.location", null);
+    }
 }

=== modified file 'src/net/tapaal/TAPAAL.java'
--- src/net/tapaal/TAPAAL.java	2021-11-23 22:09:14 +0000
+++ src/net/tapaal/TAPAAL.java	2022-08-01 13:38:30 +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.9.2";
 
 	public static String getProgramName(){
 		return "" + TAPAAL.TOOLNAME + " " + TAPAAL.VERSION;

=== modified file 'src/pipe/gui/GuiFrameController.java'
--- src/pipe/gui/GuiFrameController.java	2021-10-17 18:41:49 +0000
+++ src/pipe/gui/GuiFrameController.java	2022-08-01 13:38:30 +0000
@@ -248,16 +248,16 @@
             buffer.append("Lasse Jacobsen, Morten Jacobsen,\nThomas S. Jacobsen, Jacob J. Jensen, Peter G. Jensen, ");
             buffer.append("Mads Johannsen,\nKenneth Y. Joergensen, Mikael H. Moeller, Christoffer Moesgaard, Kristian Morsing Pedersen,\nThomas Pedersen, Lena Said, Niels N. Samuelsen, Jiri Srba, Mathias G. Soerensen,\nJakob H. Taankvist and Peter H. Taankvist\n");
 
-            buffer.append("Aalborg University 2008-2021\n\n");
+            buffer.append("Aalborg University 2008-2022\n\n");
 
         buffer.append("TAPAAL Continuous Engine (verifytapn):\n");
             buffer.append("Alexandre David, Lasse Jacobsen, Morten Jacobsen and Jiri Srba\n");
-            buffer.append("Aalborg University 2011-2021\n\n");
+            buffer.append("Aalborg University 2011-2022\n\n");
 
         buffer.append("TAPAAL Discrete Engine (verifydtapn):\n");
             buffer.append("Mathias Andersen, Peter G. Jensen, Heine G. Larsen, Jiri Srba,\n");
             buffer.append("Mathias G. Soerensen and Jakob H. Taankvist\n");
-            buffer.append("Aalborg University 2012-2021\n\n");
+            buffer.append("Aalborg University 2012-2022\n\n");
 
         buffer.append("TAPAAL Untimed Engine (verifypn):\n");
             buffer.append("Alexander Bilgram, Frederik M. Boenneland, Jakob Dyhr, Peter Fogh, ");
@@ -265,7 +265,7 @@
             buffer.append("Tobias S. Jepsen, Kenneth Y. Joergensen,\nMads Johannsen, Isabella Kaufmann, ");
             buffer.append("Andreas H. Klostergaard, Soeren M. Nielsen,\nThomas S. Nielsen, Lars K. Oestergaard, ");
             buffer.append("Samuel Pastva, Thomas Pedersen, Jiri Srba,\nPeter H. Taankvist, Nikolaj J. Ulrik and Simon M. Virenfeldt\n");
-            buffer.append("Aalborg University 2014-2021\n\n");
+            buffer.append("Aalborg University 2014-2022\n\n");
 
 
         buffer.append("\n");

=== modified file 'src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java'
--- src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java	2020-11-27 12:35:35 +0000
+++ src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java	2022-08-01 13:38:30 +0000
@@ -8,6 +8,8 @@
 import java.util.regex.Pattern;
 
 import javax.swing.*;
+
+import net.tapaal.Preferences;
 import pipe.gui.CreateGui;
 
 class NativeFileBrowser extends FileBrowser {
@@ -56,7 +58,7 @@
 	
 
 	public File openFile() {
-            if(specifiedPath == null) specifiedPath = lastOpenPath;
+            if(specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();
             fc.setDirectory(specifiedPath);
             //This is needed for Windows
             if(optionalExt.equals("")) fc.setFile(ext.equals("")? "":("*."+ext));
@@ -66,13 +68,13 @@
             fc.setVisible(true);
             String selectedFile = fc.getFile();
             String selectedDir = fc.getDirectory();
-            lastOpenPath = selectedDir;
+            Preferences.getInstance().setFileBrowserLocation(selectedDir);
             File file = selectedFile == null? null:new File(selectedDir + selectedFile);
             return file;
 	}
 	
 	public File[] openFiles() {
-            if(specifiedPath == null) specifiedPath = lastOpenPath;
+            if(specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();;
             fc.setDirectory(specifiedPath);
             //This is needed for Windows
             if(optionalExt.equals("")) fc.setFile(ext.equals("")? "":("*."+ext));
@@ -81,12 +83,12 @@
             fc.setMode(FileDialog.LOAD);
             fc.setVisible(true);
             File[] selectedFiles = fc.getFiles();
-        lastOpenPath = fc.getDirectory();
+            Preferences.getInstance().setFileBrowserLocation(fc.getDirectory());
             return selectedFiles;
 	}
 
 	public String saveFile(String suggestedName) {
-		if(specifiedPath == null) specifiedPath = lastSavePath;
+		if(specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();
 		fc.setDirectory(specifiedPath);
 		fc.setFile(suggestedName + (suggestedName.endsWith("."+ext)? "":"."+ext));
 		fc.setMode(FileDialog.SAVE);
@@ -103,7 +105,7 @@
 		}
 
 		String file = fc.getFile() == null? null: fc.getDirectory() + fc.getFile();
-		lastSavePath = fc.getDirectory();
+        Preferences.getInstance().setFileBrowserLocation(fc.getDirectory());
 		
 		if(file == null){
 			return file;
@@ -150,14 +152,14 @@
         //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;
+            if (specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();;
             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();
+                Preferences.getInstance().setFileBrowserLocation(selectedDir.getPath());
             }
 
             return selectedDir;

=== modified file 'src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java'
--- src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java	2020-05-05 18:17:52 +0000
+++ src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java	2022-08-01 13:38:30 +0000
@@ -10,6 +10,8 @@
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileNameExtensionFilter;
+
+import net.tapaal.Preferences;
 import pipe.gui.CreateGui;
 
 class NativeFileBrowserFallback extends FileBrowser {
@@ -75,7 +77,7 @@
 	}
 
 	public File openFile() {
-		if(specifiedPath == null) specifiedPath = lastOpenPath;
+		if(specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();;
 		fc.setDirectory(specifiedPath);
                 //This is needed for windows
 		if(optionalExt.equals("")) fc.setFile(ext.equals("")? "":("*."+ext));
@@ -84,13 +86,13 @@
 		fc.setVisible(true);
 		String selectedFile = fc.getFile();
 		String selectedDir = fc.getDirectory();
-		lastOpenPath = selectedDir;
+        Preferences.getInstance().setFileBrowserLocation(selectedDir);
 		File file = selectedFile == null? null:new File(selectedDir + selectedFile);
 		return file;
 	}
 
 	public File[] openFiles() {
-		if(specifiedPath == null) specifiedPath = lastOpenPath;
+		if(specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();;
 		if(new File(specifiedPath).exists()) fileChooser.setCurrentDirectory(new File(specifiedPath));
 		/*if (lastPath != null) {
 			File path = new File(lastPath);
@@ -104,20 +106,20 @@
 			filesArray = fileChooser.getSelectedFiles();
 		}
 		//They should all come from the same directory so we just take one
-		lastOpenPath = filesArray[0].getAbsolutePath();
+        Preferences.getInstance().setFileBrowserLocation(filesArray[0].getAbsolutePath());
 		return filesArray;
 	}
 
 
 	public String saveFile(String suggestedName) {
-		if(specifiedPath == null) specifiedPath = lastSavePath;
+		if(specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();;
 		fc.setDirectory(specifiedPath);
 		fc.setFile(suggestedName + (suggestedName.endsWith("."+ext)? "":"."+ext));
 		fc.setMode(FileDialog.SAVE);
 		fc.setVisible(true);
 
 		String file = fc.getFile() == null? null: fc.getDirectory() + fc.getFile();
-		lastSavePath = fc.getDirectory();
+        Preferences.getInstance().setFileBrowserLocation(fc.getDirectory());
 
 		if(file == null){
 			return file;
@@ -163,14 +165,14 @@
         //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;
+            if (specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();;
             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();
+                Preferences.getInstance().setFileBrowserLocation(selectedDir.getPath());
             }
 
             return selectedDir;