Merge lp:~tapaal-contributor/tapaal/ltl-icon-selection-1997234 into lp:tapaal

[Lena Ernstsen]

Considers LTL nodes when selecting icons for verification

[lp:~tapaal-contributor/tapaal/ltl-icon-selection-1997234]

1177. By Lena Ernstsen on 2023-01-19

Reverted change to avoid NPE

1178. By Lena Ernstsen on 2023-01-19

Added 'show raw query results' button for state equation results

1179. By Lena Ernstsen on 2023-01-23

Fixed wrong statistics for CTL queries

Unmerged revisions

1179. By Lena Ernstsen on 2023-01-23

Fixed wrong statistics for CTL queries

1178. By Lena Ernstsen on 2023-01-19

Added 'show raw query results' button for state equation results

1177. By Lena Ernstsen on 2023-01-19

Reverted change to avoid NPE

1176. By Lena Ernstsen on 2023-01-09

Icon selection now considers LTL nodes

1175. By <email address hidden> on 2022-09-16

increased version to 3.9.3 and min version of verifypn to 4.2.2

1174. By <email address hidden> on 2022-08-03

merged in lp:~tapaal-contributor/tapaal/update-ltl-support-3.9 fixing bug #1983371

1173. By <email address hidden> on 2022-08-02

merged in lp:~tapaal-contributor/tapaal/save-file-browser-location-3.9 fixing the remembering of a location when opening a file

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

=== modified file 'src/dk/aau/cs/model/tapn/TAPNQuery.java'
--- src/dk/aau/cs/model/tapn/TAPNQuery.java	2016-04-14 20:09:47 +0000
+++ src/dk/aau/cs/model/tapn/TAPNQuery.java	2023-01-09 11:13:50 +0000
@@ -1,9 +1,6 @@
 package dk.aau.cs.model.tapn;
 
-import dk.aau.cs.TCTL.TCTLAFNode;
-import dk.aau.cs.TCTL.TCTLAbstractProperty;
-import dk.aau.cs.TCTL.TCTLEFNode;
-import dk.aau.cs.TCTL.TCTLEGNode;
+import dk.aau.cs.TCTL.*;
 import dk.aau.cs.TCTL.visitors.HasDeadlockVisitor;
 import dk.aau.cs.verification.QueryType;
 import pipe.dataLayer.TAPNQuery.QueryCategory;
@@ -27,10 +24,13 @@
 	}
 	
 	public QueryType queryType(){
-		if(property instanceof TCTLEFNode) return QueryType.EF;
-		else if(property instanceof TCTLEGNode) return QueryType.EG;
-		else if(property instanceof TCTLAFNode) return QueryType.AF;
-		else return QueryType.AG;
+		if (property instanceof TCTLEFNode) return QueryType.EF;
+		else if (property instanceof TCTLEGNode) return QueryType.EG;
+		else if (property instanceof TCTLAFNode) return QueryType.AF;
+		else if (property instanceof TCTLAGNode) return QueryType.AG;
+        else if (property instanceof LTLANode) return QueryType.A;
+        else if (property instanceof LTLENode) return QueryType.E;
+		else return null;
 	}
 	
 	public boolean hasDeadlock(){
 
=== modified file 'src/dk/aau/cs/verification/QueryResult.java'
--- src/dk/aau/cs/verification/QueryResult.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/verification/QueryResult.java	2023-01-09 11:13:50 +0000
@@ -61,6 +61,8 @@
 		|| (queryType().equals(QueryType.EG)) // && !isQuerySatisfied()) 
 		|| (queryType().equals(QueryType.AF)) // && isQuerySatisfied())
 		|| (queryType().equals(QueryType.AG) && isQuerySatisfied())
+        || (queryType().equals(QueryType.A))
+        || (queryType().equals(QueryType.E))
 		|| (hasDeadlock() && 
 				(!isQuerySatisfied() && queryType().equals(QueryType.EF)) || 
 				(isQuerySatisfied() && queryType().equals(QueryType.AG))
 
=== modified file 'src/dk/aau/cs/verification/QueryType.java'
--- src/dk/aau/cs/verification/QueryType.java	2011-05-21 13:00:05 +0000
+++ src/dk/aau/cs/verification/QueryType.java	2023-01-09 11:13:50 +0000
@@ -4,5 +4,7 @@
 	EF,
 	EG,
 	AF,
-	AG
+	AG,
+    A,
+    E
 }
 
=== modified file 'src/dk/aau/cs/verification/Stats.java'
--- src/dk/aau/cs/verification/Stats.java	2020-07-13 13:58:47 +0000
+++ src/dk/aau/cs/verification/Stats.java	2023-01-09 11:13:50 +0000
@@ -137,15 +137,15 @@
 	@Override
 	public String toString() {
 		StringBuilder buffer = new StringBuilder();
-		buffer.append("Discovered markings: ");
+		buffer.append("Discovered configurations: ");
 		buffer.append(discovered);
 		buffer.append(System.getProperty("line.separator"));
 		
-		buffer.append("Explored markings: ");
+		buffer.append("Explored configurations: ");
 		buffer.append(explored);
 		buffer.append(System.getProperty("line.separator"));
 		
-		buffer.append("Stored markings: ");
+		buffer.append("Stored configurations: ");
 		buffer.append(stored);
 		return buffer.toString();
 	}
 
=== modified file 'src/dk/aau/cs/verification/VerificationResult.java'
--- src/dk/aau/cs/verification/VerificationResult.java	2021-10-13 18:51:36 +0000
+++ src/dk/aau/cs/verification/VerificationResult.java	2023-01-09 11:13:50 +0000
@@ -4,6 +4,8 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import dk.aau.cs.model.tapn.NetworkMarking;
 import dk.aau.cs.model.tapn.TimedArcPetriNetNetwork;
@@ -21,6 +23,7 @@
 	private NameMapping nameMapping;
 	private TTrace secondaryTrace;
 	private boolean isSolvedUsingStateEquation = false;
+	private int bound;
 	
 	public boolean isQuerySatisfied() {
 		return queryResult.isQuerySatisfied();
@@ -32,6 +35,15 @@
 		this.verificationTime = verificationTime;
 		this.stats = stats;
 		this.rawOutput = rawOutput;
+
+		String[] lines = rawOutput.split(System.getProperty("line.separator"));
+		for (String line : lines) {
+            Matcher matcher = Pattern.compile("\\s*-k\\s*(\\d+)\\s*").matcher(line);
+            if (matcher.find()) {
+                this.bound = Integer.parseInt(matcher.group(1));
+                break;
+            }
+        }
 	}
 
     public VerificationResult(QueryResult queryResult, TTrace trace, long verificationTime, Stats stats, boolean isSolvedUsingStateEquation){
@@ -231,4 +243,8 @@
 	public String getRawOutput() {
 	    return rawOutput;
     }
+
+    public int getBound() {
+	    return bound;
+    }
 }
 
=== modified file 'src/dk/aau/cs/verification/VerifyTAPN/VerifyPN.java'
--- src/dk/aau/cs/verification/VerifyTAPN/VerifyPN.java	2021-07-16 20:39:22 +0000
+++ src/dk/aau/cs/verification/VerifyTAPN/VerifyPN.java	2023-01-09 11:13:50 +0000
@@ -340,7 +340,6 @@
 					    tapnTrace = parseTrace(trace, options, model, exportedModel, query, queryResult.value1());
                     } else {
                         tapnTrace = parseTrace(errorOutput, options, model, exportedModel, query, queryResult.value1());
-
                     }
 					return new VerificationResult<TimedArcPetriNetTrace>(queryResult.value1(), tapnTrace, runner.getRunningTime(), queryResult.value2(), approximationResult, standardOutput);
 				}
 
=== 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	2023-01-09 11:13:50 +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/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNIconSelector.java'
--- src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNIconSelector.java	2019-03-22 10:13:18 +0000
+++ src/dk/aau/cs/verification/VerifyTAPN/VerifyTAPNIconSelector.java	2023-01-09 11:13:50 +0000
@@ -15,27 +15,47 @@
 		switch(result.getQueryResult().queryType())
 		{
 		case EF:
-			if(result.isQuerySatisfied()){
+			if (result.isQuerySatisfied()) {
 				return satisfiedIcon;
-			}else if(!result.isQuerySatisfied() && result.getQueryResult().boundednessAnalysis().boundednessResult().equals(Boundedness.Bounded)){
+			} else if (!result.isQuerySatisfied() && result.getQueryResult().boundednessAnalysis().boundednessResult().equals(Boundedness.Bounded)) {
 				return notSatisfiedIcon;
 			}
 			break;
 		case AG:
-			if(!result.isQuerySatisfied()) return notSatisfiedIcon;
-			else if(result.isQuerySatisfied() && result.getQueryResult().boundednessAnalysis().boundednessResult().equals(Boundedness.Bounded)) return satisfiedIcon;
+			if (!result.isQuerySatisfied() && result.getBound() >= result.getQueryResult().boundednessAnalysis().usedTokens()) {
+			    return notSatisfiedIcon;
+            } else if (result.isQuerySatisfied() && result.getQueryResult().boundednessAnalysis().boundednessResult().equals(Boundedness.Bounded)) {
+			    return satisfiedIcon;
+            }
 			break;
 		case AF:
-			if(!result.isQuerySatisfied() && result.getQueryResult().boundednessAnalysis().boundednessResult().equals(Boundedness.Bounded)){
+			if (!result.isQuerySatisfied() && result.getQueryResult().boundednessAnalysis().boundednessResult().equals(Boundedness.Bounded)) {
 				return notSatisfiedIcon;
-			} else if(result.isQuerySatisfied() && result.getQueryResult().boundednessAnalysis().boundednessResult().equals(Boundedness.Bounded)){
+			} else if (result.isQuerySatisfied() && result.getQueryResult().boundednessAnalysis().boundednessResult().equals(Boundedness.Bounded)) {
 				return satisfiedIcon;
 			}
 			break;
 		case EG:
-			if(result.isQuerySatisfied() && result.getQueryResult().boundednessAnalysis().boundednessResult().equals(Boundedness.Bounded)) return satisfiedIcon;
-			else if(!result.isQuerySatisfied() && result.getQueryResult().boundednessAnalysis().boundednessResult().equals(Boundedness.Bounded)) return notSatisfiedIcon;
+			if (result.isQuerySatisfied() && result.getQueryResult().boundednessAnalysis().boundednessResult().equals(Boundedness.Bounded)) {
+			    return satisfiedIcon;
+            } else if (!result.isQuerySatisfied() && result.getQueryResult().boundednessAnalysis().boundednessResult().equals(Boundedness.Bounded)) {
+			    return notSatisfiedIcon;
+            }
 			break;
+        case A:
+            if (!result.isQuerySatisfied()) {
+                return notSatisfiedIcon;
+            } else if (result.isQuerySatisfied() && result.getBound() >= result.getQueryResult().boundednessAnalysis().usedTokens()) {
+                return satisfiedIcon;
+            }
+            break;
+        case E:
+            if (!result.isQuerySatisfied() && result.getBound() >= result.getQueryResult().boundednessAnalysis().usedTokens()) {
+                return notSatisfiedIcon;
+            } else if (result.isQuerySatisfied()) {
+                return satisfiedIcon;
+            }
+            break;
 		default:
 			return null;
 		}
 
=== modified file 'src/net/tapaal/Preferences.java'
--- src/net/tapaal/Preferences.java	2022-08-01 09:36:08 +0000
+++ src/net/tapaal/Preferences.java	2023-01-09 11:13:50 +0000
@@ -329,6 +329,7 @@
 
 		return object;
 	}
+<<<<<<< TREE
 
     public void setFileBrowserLocation(String location) {
         final String key = "file.location";
@@ -343,4 +344,20 @@
     public String getFileBrowserLocation() {
         return pref.get("file.location", null);
     }
+=======
+
+    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);
+    }
+>>>>>>> MERGE-SOURCE
 }
 
=== modified file 'src/net/tapaal/TAPAAL.java'
--- src/net/tapaal/TAPAAL.java	2021-11-23 22:09:14 +0000
+++ src/net/tapaal/TAPAAL.java	2023-01-09 11:13:50 +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.3";
 
 	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	2023-01-09 11:13:50 +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/Pipe.java'
--- src/pipe/gui/Pipe.java	2021-11-22 16:58:24 +0000
+++ src/pipe/gui/Pipe.java	2023-01-09 11:13:50 +0000
@@ -79,7 +79,7 @@
 	public static final String verifytaMinRev = "4.1.19";
 	public static final String verifytapnMinRev = "1.3.1";
 	public static final String verifydtapnMinRev = "3.5.0";
-	public static final String verifypnMinRev = "4.2.1";
+	public static final String verifypnMinRev = "4.2.2";
 	public static final int AGE_DECIMAL_PRECISION = 5;
 	public static final int AGE_PRECISION = AGE_DECIMAL_PRECISION + 4;
 
 
=== modified file 'src/pipe/gui/RunVerification.java'
--- src/pipe/gui/RunVerification.java	2021-10-13 18:51:36 +0000
+++ src/pipe/gui/RunVerification.java	2023-01-09 11:13:50 +0000
@@ -298,6 +298,16 @@
 		gbc.anchor = GridBagConstraints.WEST;		
 		panel.add(new JLabel(toHTML(result.getResultString())), gbc);
 
+        if (result.getBound() < result.getQueryResult().boundednessAnalysis().usedTokens() &&
+            !result.getQueryResult().toString().toLowerCase().contains("only markings with")) {
+            gbc = new GridBagConstraints();
+            gbc.gridx = 0;
+            gbc.gridy = 0;
+            gbc.gridwidth = 2;
+            gbc.anchor = GridBagConstraints.WEST;
+            panel.add(new JLabel("<html><br/><br/>Only markings with at most " + result.getBound() + " tokens were explored<br/><br/></html>"), gbc);
+        }
+
 		// TODO remove this when the engine outputs statistics
 		boolean isCTLQuery = result.getQueryResult().isCTL;
 
 
=== modified file 'src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java'
--- src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java	2022-08-01 09:36:08 +0000
+++ src/pipe/gui/widgets/filebrowser/NativeFileBrowser.java	2023-01-09 11:13:50 +0000
@@ -8,6 +8,8 @@
 import java.util.regex.Pattern;
 
 import javax.swing.*;
+
+import net.tapaal.Preferences;
 import pipe.gui.CreateGui;
 import net.tapaal.Preferences;
 
@@ -73,7 +75,11 @@
 	}
 	
 	public File[] openFiles() {
+<<<<<<< TREE
             if(specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();
+=======
+            if(specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();;
+>>>>>>> MERGE-SOURCE
             fc.setDirectory(specifiedPath);
             //This is needed for Windows
             if(optionalExt.equals("")) fc.setFile(ext.equals("")? "":("*."+ext));
@@ -151,7 +157,11 @@
         //So we make a JFileChooser in which we can control it
 	    if(System.getProperty("os.name").startsWith("Windows")) {
             File selectedDir = null;
+<<<<<<< TREE
             if (specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();
+=======
+            if (specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();;
+>>>>>>> MERGE-SOURCE
             JFileChooser c = new JFileChooser(specifiedPath);
             c.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
             c.setDialogTitle("Choose target directory for export");
 
=== modified file 'src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java'
--- src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java	2022-08-01 09:36:08 +0000
+++ src/pipe/gui/widgets/filebrowser/NativeFileBrowserFallback.java	2023-01-09 11:13:50 +0000
@@ -77,7 +77,11 @@
 	}
 
 	public File openFile() {
+<<<<<<< TREE
 		if(specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();
+=======
+		if(specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();;
+>>>>>>> MERGE-SOURCE
 		fc.setDirectory(specifiedPath);
                 //This is needed for windows
 		if(optionalExt.equals("")) fc.setFile(ext.equals("")? "":("*."+ext));
@@ -86,13 +90,21 @@
 		fc.setVisible(true);
 		String selectedFile = fc.getFile();
 		String selectedDir = fc.getDirectory();
+<<<<<<< TREE
 		Preferences.getInstance().setFileBrowserLocation(selectedDir);
+=======
+        Preferences.getInstance().setFileBrowserLocation(selectedDir);
+>>>>>>> MERGE-SOURCE
 		File file = selectedFile == null? null:new File(selectedDir + selectedFile);
 		return file;
 	}
 
 	public File[] openFiles() {
+<<<<<<< TREE
 		if(specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();
+=======
+		if(specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();;
+>>>>>>> MERGE-SOURCE
 		if(new File(specifiedPath).exists()) fileChooser.setCurrentDirectory(new File(specifiedPath));
 		/*if (lastPath != null) {
 			File path = new File(lastPath);
@@ -112,7 +124,11 @@
 
 
 	public String saveFile(String suggestedName) {
+<<<<<<< TREE
 		if(specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();
+=======
+		if(specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();;
+>>>>>>> MERGE-SOURCE
 		fc.setDirectory(specifiedPath);
 		fc.setFile(suggestedName + (suggestedName.endsWith("."+ext)? "":"."+ext));
 		fc.setMode(FileDialog.SAVE);
@@ -165,7 +181,11 @@
         //So we make a JFileChooser in which we can control it
         if(System.getProperty("os.name").startsWith("Windows")) {
             File selectedDir = null;
+<<<<<<< TREE
             if (specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();
+=======
+            if (specifiedPath == null) specifiedPath = Preferences.getInstance().getFileBrowserLocation();;
+>>>>>>> MERGE-SOURCE
             JFileChooser c = new JFileChooser(specifiedPath);
             c.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
             c.setDialogTitle("Choose target directory for export");