Merge lp:~danilovesky/workcraft/trunk-bug-1538674 into lp:workcraft

[Danil Sokolov]

[Danil Sokolov (danilovesky)]

review: Approve

=== modified file 'MpsatSynthesisPlugin/src/org/workcraft/plugins/mpsat/MpsatSynthesisUtilitySettings.java'
--- MpsatSynthesisPlugin/src/org/workcraft/plugins/mpsat/MpsatSynthesisUtilitySettings.java	2016-01-15 17:00:47 +0000
+++ MpsatSynthesisPlugin/src/org/workcraft/plugins/mpsat/MpsatSynthesisUtilitySettings.java	2016-01-28 09:55:28 +0000
@@ -34,17 +34,20 @@
 	private static final String prefix = "Tools.mpsatSynthesis";
 	
 	private static final String keyCommand = prefix + ".command";
-	private static final String keyExtraArgs = prefix + ".args";
+	private static final String keyArgs = prefix + ".args";
+	private static final String keyAdvancedMode= prefix + ".advancedMode";
 	private static final String keyPrintStdout= prefix + ".printStdout";
 	private static final String keyPrintStderr= prefix + ".printStderr";
 	
 	private static final String defaultCommand = (DesktopApi.getOs().isWindows() ? "tools\\UnfoldingTools\\mpsat.exe" : "tools/UnfoldingTools/mpsat");
-	private static final String defaultExtraArgs = "";
+	private static final String defaultArgs = "";
+	private static final Boolean defaultAdvancedMode = false;
 	private static final Boolean defaultPrintStdout = true;
 	private static final Boolean defaultPrintStderr = true;
 
 	private static String command = defaultCommand;
-	private static String extraArgs = defaultExtraArgs;
+	private static String args = defaultArgs;
+	private static Boolean advancedMode = defaultAdvancedMode;
 	private static Boolean printStdout = defaultPrintStdout;
 	private static Boolean printStderr = defaultPrintStderr;
 
@@ -62,11 +65,21 @@
 		properties.add(new PropertyDeclaration<MpsatSynthesisUtilitySettings, String>(
 				this, "Additional parameters", String.class, true, false, false) {
 			protected void setter(MpsatSynthesisUtilitySettings object, String value) {
-				setExtraArgs(value);
+				setArgs(value);
 				
 			}
 			protected String getter(MpsatSynthesisUtilitySettings object) {
-				return getExtraArgs();
+				return getArgs();
+			}
+		});
+
+		properties.add(new PropertyDeclaration<MpsatSynthesisUtilitySettings, Boolean>(
+				this, "Edit additional parameters before every call", Boolean.class, true, false, false) {
+			protected void setter(MpsatSynthesisUtilitySettings object, Boolean value) {
+				setAdvancedMode(value);
+			}
+			protected Boolean getter(MpsatSynthesisUtilitySettings object) {
+				return getAdvancedMode();
 			}
 		});
 
@@ -99,7 +112,8 @@
 	@Override
 	public void load(Config config) {
 		setCommand(config.getString(keyCommand, defaultCommand));
-		setExtraArgs(config.getString(keyExtraArgs, defaultExtraArgs));
+		setArgs(config.getString(keyArgs, defaultArgs));
+		setAdvancedMode(config.getBoolean(keyAdvancedMode, defaultAdvancedMode));
 		setPrintStdout(config.getBoolean(keyPrintStdout, defaultPrintStdout));
 		setPrintStderr(config.getBoolean(keyPrintStderr, defaultPrintStderr));
 	}
@@ -107,7 +121,8 @@
 	@Override
 	public void save(Config config) {
 		config.set(keyCommand, getCommand());
-		config.set(keyExtraArgs, getExtraArgs());
+		config.set(keyArgs, getArgs());
+		config.setBoolean(keyAdvancedMode, getAdvancedMode());
 		config.setBoolean(keyPrintStdout, getPrintStdout());
 		config.setBoolean(keyPrintStderr, getPrintStderr());
 	}
@@ -130,12 +145,20 @@
 		command = value;
 	}
 
-	public static String getExtraArgs() {
-		return extraArgs;
-	}
-
-	public static void setExtraArgs(String value) {
-		extraArgs = value;
+	public static String getArgs() {
+		return args;
+	}
+
+	public static void setArgs(String value) {
+		args = value;
+	}
+
+	public static Boolean getAdvancedMode() {
+		return advancedMode;
+	}
+
+	public static void setAdvancedMode(Boolean value) {
+		advancedMode = value;
 	}
 
 	public static Boolean getPrintStdout() {

=== modified file 'MpsatSynthesisPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatSynthesisTask.java'
--- MpsatSynthesisPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatSynthesisTask.java	2016-01-17 22:35:32 +0000
+++ MpsatSynthesisPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatSynthesisTask.java	2016-01-28 09:55:28 +0000
@@ -6,6 +6,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.swing.JOptionPane;
+
+import org.workcraft.Framework;
+import org.workcraft.gui.MainWindow;
 import org.workcraft.plugins.circuit.CircuitSettings;
 import org.workcraft.plugins.mpsat.MpsatSynthesisUtilitySettings;
 import org.workcraft.plugins.punf.PunfUtilitySettings;
@@ -74,8 +78,16 @@
 		}
 		
 		// Extra arguments (should go before the file parameters)
-		for (String arg : MpsatSynthesisUtilitySettings.getExtraArgs().split("\\s")) {
-			if (!arg.isEmpty()) {
+		String extraArgs = MpsatSynthesisUtilitySettings.getArgs();
+		if (MpsatSynthesisUtilitySettings.getAdvancedMode()) {
+			MainWindow mainWindow = Framework.getInstance().getMainWindow();
+			String tmp = JOptionPane.showInputDialog(mainWindow, "Additional parameters for MPSat:", extraArgs);
+			if (tmp != null) {
+				extraArgs = tmp;
+			}
+		}
+		for (String arg : extraArgs.split("\\s")) {
+			if ( !arg.isEmpty() ) {
 				command.add(arg);
 			}
 		}

=== modified file 'MpsatVerificationPlugin/src/org/workcraft/plugins/mpsat/MpsatCombinedChainResultHandler.java'
--- MpsatVerificationPlugin/src/org/workcraft/plugins/mpsat/MpsatCombinedChainResultHandler.java	2016-01-22 23:52:54 +0000
+++ MpsatVerificationPlugin/src/org/workcraft/plugins/mpsat/MpsatCombinedChainResultHandler.java	2016-01-28 09:55:28 +0000
@@ -15,7 +15,6 @@
 import org.workcraft.tasks.DummyProgressMonitor;
 import org.workcraft.tasks.Result;
 import org.workcraft.tasks.Result.Outcome;
-import org.workcraft.util.LogUtils;
 import org.workcraft.workspace.WorkspaceEntry;
 
 public class MpsatCombinedChainResultHandler extends DummyProgressMonitor<MpsatCombinedChainResult> {

=== modified file 'MpsatVerificationPlugin/src/org/workcraft/plugins/mpsat/MpsatUtilitySettings.java'
--- MpsatVerificationPlugin/src/org/workcraft/plugins/mpsat/MpsatUtilitySettings.java	2016-01-15 17:00:47 +0000
+++ MpsatVerificationPlugin/src/org/workcraft/plugins/mpsat/MpsatUtilitySettings.java	2016-01-28 09:55:28 +0000
@@ -33,25 +33,28 @@
 public class MpsatUtilitySettings implements Settings {
 
 	private static final LinkedList<PropertyDescriptor> properties = new LinkedList<PropertyDescriptor>();
-	private static final String prefix = "Tools.mpsat";
+	private static final String prefix = "Tools.mpsatVerification";
 	
 	private static final String keyCommand = prefix + ".command";
 	private static final String keySolutionMode = prefix + ".solutionMode";
-	private static final String keyExtraArgs = prefix + ".args";
+	private static final String keyArgs = prefix + ".args";
+	private static final String keyAdvancedMode= prefix + ".advancedMode";
 	private static final String keyPrintStdout= prefix + ".printStdout";
 	private static final String keyPrintStderr= prefix + ".printStderr";
 	private static final String keyDebugReach = prefix + ".debugReach";
 	
 	private static final String defaultCommand = (DesktopApi.getOs().isWindows() ? "tools\\UnfoldingTools\\mpsat.exe" : "tools/UnfoldingTools/mpsat");
 	private static final SolutionMode defaultSolutionMode = SolutionMode.MINIMUM_COST;
-	private static final String defaultExtraArgs = "";
+	private static final String defaultArgs = "";
+	private static final Boolean defaultAdvancedMode = false;
 	private static final Boolean defaultPrintStdout = true;
 	private static final Boolean defaultPrintStderr = true;
 	private static final Boolean defaultDebugReach = false;
 
 	private static String command = defaultCommand;
 	private static SolutionMode solutionMode = defaultSolutionMode;
-	private static String extraArgs = defaultExtraArgs;
+	private static String args = defaultArgs;
+	private static Boolean advancedMode = defaultAdvancedMode;
 	private static Boolean printStdout = defaultPrintStdout;
 	private static Boolean printStderr = defaultPrintStderr;
 	private static Boolean debugReach = defaultDebugReach;
@@ -80,10 +83,20 @@
 		properties.add(new PropertyDeclaration<MpsatUtilitySettings, String>(
 				this, "Additional parameters", String.class, true, false, false) {
 			protected void setter(MpsatUtilitySettings object, String value) {
-				setExtraArgs(value);
+				setArgs(value);
 			}
 			protected String getter(MpsatUtilitySettings object) {
-				return getExtraArgs();
+				return getArgs();
+			}
+		});
+
+		properties.add(new PropertyDeclaration<MpsatUtilitySettings, Boolean>(
+				this, "Edit additional parameters before every call", Boolean.class, true, false, false) {
+			protected void setter(MpsatUtilitySettings object, Boolean value) {
+				setAdvancedMode(value);
+			}
+			protected Boolean getter(MpsatUtilitySettings object) {
+				return getAdvancedMode();
 			}
 		});
 
@@ -127,7 +140,8 @@
 	public void load(Config config) {
 		setCommand(config.getString(keyCommand, defaultCommand));
 		setSolutionMode(config.getEnum(keySolutionMode, SolutionMode.class, defaultSolutionMode));
-		setExtraArgs(config.getString(keyExtraArgs, defaultExtraArgs));
+		setArgs(config.getString(keyArgs, defaultArgs));
+		setAdvancedMode(config.getBoolean(keyAdvancedMode, defaultAdvancedMode));
 		setPrintStdout(config.getBoolean(keyPrintStdout, defaultPrintStdout));
 		setPrintStderr(config.getBoolean(keyPrintStderr, defaultPrintStderr));
 		setDebugReach(config.getBoolean(keyDebugReach, defaultDebugReach));
@@ -137,7 +151,8 @@
 	public void save(Config config) {
 		config.set(keyCommand, getCommand());
 		config.setEnum(keySolutionMode, SolutionMode.class, getSolutionMode());
-		config.set(keyExtraArgs, getExtraArgs());
+		config.set(keyArgs, getArgs());
+		config.setBoolean(keyAdvancedMode, getAdvancedMode());
 		config.setBoolean(keyPrintStdout, getPrintStdout());
 		config.setBoolean(keyPrintStderr, getPrintStderr());
 		config.setBoolean(keyDebugReach, getDebugReach());
@@ -161,12 +176,12 @@
 		command = value;
 	}
 
-	public static String getExtraArgs() {
-		return extraArgs;
+	public static String getArgs() {
+		return args;
 	}
 
-	public static void setExtraArgs(String value) {
-		extraArgs = value;
+	public static void setArgs(String value) {
+		args = value;
 	}
 
 	public static void setSolutionMode(SolutionMode value) {
@@ -181,6 +196,14 @@
 		return (solutionMode == SolutionMode.ALL) ? 10 : 1;
 	}
 
+	public static Boolean getAdvancedMode() {
+		return advancedMode;
+	}
+
+	public static void setAdvancedMode(Boolean value) {
+		advancedMode = value;
+	}
+
 	public static Boolean getPrintStdout() {
 		return printStdout;
 	}

=== modified file 'MpsatVerificationPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatTask.java'
--- MpsatVerificationPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatTask.java	2016-01-15 17:00:47 +0000
+++ MpsatVerificationPlugin/src/org/workcraft/plugins/mpsat/tasks/MpsatTask.java	2016-01-28 09:55:28 +0000
@@ -6,6 +6,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.swing.JOptionPane;
+
+import org.workcraft.Framework;
+import org.workcraft.gui.MainWindow;
 import org.workcraft.plugins.mpsat.MpsatUtilitySettings;
 import org.workcraft.plugins.punf.PunfUtilitySettings;
 import org.workcraft.plugins.shared.tasks.ExternalProcessResult;
@@ -50,8 +54,16 @@
 		}
 		
 		// Extra arguments (should go before the file parameters)
-		for (String arg : MpsatUtilitySettings.getExtraArgs().split("\\s")) {
-			if (!arg.isEmpty()) {
+		String extraArgs = MpsatUtilitySettings.getArgs();
+		if (MpsatUtilitySettings.getAdvancedMode()) {
+			MainWindow mainWindow = Framework.getInstance().getMainWindow();
+			String tmp = JOptionPane.showInputDialog(mainWindow, "Additional parameters for MPSat:", extraArgs);
+			if (tmp != null) {
+				extraArgs = tmp;
+			}
+		}
+		for (String arg : extraArgs.split("\\s")) {
+			if ( !arg.isEmpty() ) {
 				command.add(arg);
 			}
 		}

=== modified file 'PcompPlugin/src/org/workcraft/plugins/pcomp/tasks/PcompTask.java'
--- PcompPlugin/src/org/workcraft/plugins/pcomp/tasks/PcompTask.java	2016-01-15 17:00:47 +0000
+++ PcompPlugin/src/org/workcraft/plugins/pcomp/tasks/PcompTask.java	2016-01-28 09:55:28 +0000
@@ -63,7 +63,7 @@
 		}
 
 		// Extra arguments (should go before the file parameters)
-		for (String arg : PcompUtilitySettings.getExtraArgs().split(" ")) {
+		for (String arg : PcompUtilitySettings.getExtraArgs().split("\\s")) {
 			if (!arg.isEmpty()) {
 				command.add(arg);
 			}

=== modified file 'PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PetriNetConnectionTool.java'
--- PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PetriNetConnectionTool.java	2016-01-25 14:44:27 +0000
+++ PetriNetPlugin/src/org/workcraft/plugins/petri/tools/PetriNetConnectionTool.java	2016-01-28 09:55:28 +0000
@@ -27,7 +27,7 @@
 
 	@Override
 	public String getSecondHintMessage() {
-		return (super.getSecondHintMessage() + " Hold Shift to create a place shadow.");
+		return (super.getSecondHintMessage() + " Hold Shift to create a place proxy.");
 	}
 	
 	@Override

=== modified file 'PetriNetPlugin/src/org/workcraft/plugins/petri/tools/ReadArcConnectionTool.java'
--- PetriNetPlugin/src/org/workcraft/plugins/petri/tools/ReadArcConnectionTool.java	2016-01-25 14:44:27 +0000
+++ PetriNetPlugin/src/org/workcraft/plugins/petri/tools/ReadArcConnectionTool.java	2016-01-28 09:55:28 +0000
@@ -52,7 +52,7 @@
 	
 	@Override
 	public String getSecondHintMessage() {
-		return (super.getSecondHintMessage() + " Hold Shift to create a place shadow.");
+		return (super.getSecondHintMessage() + " Hold Shift to create a place proxy.");
 	}
 	
 	@Override

=== modified file 'PetriNetPlugin/src/org/workcraft/plugins/petri/tools/TransitionContractorTool.java'
--- PetriNetPlugin/src/org/workcraft/plugins/petri/tools/TransitionContractorTool.java	2016-01-14 18:28:55 +0000
+++ PetriNetPlugin/src/org/workcraft/plugins/petri/tools/TransitionContractorTool.java	2016-01-28 09:55:28 +0000
@@ -87,14 +87,14 @@
 			PetriNetModel mathModel = (PetriNetModel)visualModel.getMathModel();
 			VisualTransition visualTransition = (VisualTransition)node;
 			Transition mathTransition = visualTransition.getReferencedTransition(); 
-			if (needsWaitedArcs(mathModel, mathTransition)) {
+			if (hasSelfLoop(mathModel, mathTransition)) {
+				JOptionPane.showMessageDialog(null, 
+						"Error: a transition with a self-loop/read-arc cannot be contracted.", 
+						MESSAGE_TITLE, JOptionPane.ERROR_MESSAGE);
+			} else if (needsWaitedArcs(mathModel, mathTransition)) {
 				JOptionPane.showMessageDialog(null, 
 						"Error: this transformation requires weighted arcs that are currently not supported.", 
 						MESSAGE_TITLE, JOptionPane.ERROR_MESSAGE);
-			} else if (hasSelfLoop(mathModel, mathTransition)) {
-				JOptionPane.showMessageDialog(null, 
-						"Error: a transition with a self-loop/read-arc cannot be contracted.", 
-						MESSAGE_TITLE, JOptionPane.ERROR_MESSAGE);
 			} else if (isLanguageChanging(mathModel, mathTransition)) {
 				contractTransition(visualModel, visualTransition);
 				JOptionPane.showMessageDialog(null, 

=== modified file 'PetrifyExtraPlugin/src/org/workcraft/plugins/petrify/PetrifyExtraModule.java'
--- PetrifyExtraPlugin/src/org/workcraft/plugins/petrify/PetrifyExtraModule.java	2015-12-26 00:22:59 +0000
+++ PetrifyExtraPlugin/src/org/workcraft/plugins/petrify/PetrifyExtraModule.java	2016-01-28 09:55:28 +0000
@@ -35,6 +35,7 @@
 
 	@Override
 	public String getDescription() {
-		return "Petrify tool support";
+		return "Petrify state graph support";
 	}
+	
 }

=== modified file 'PetrifyExtraPlugin/src/org/workcraft/plugins/petrify/tasks/DrawAstgTask.java'
--- PetrifyExtraPlugin/src/org/workcraft/plugins/petrify/tasks/DrawAstgTask.java	2016-01-22 23:52:54 +0000
+++ PetrifyExtraPlugin/src/org/workcraft/plugins/petrify/tasks/DrawAstgTask.java	2016-01-28 09:55:28 +0000
@@ -36,7 +36,7 @@
 		}
 		
 		// Extra arguments (should go before the file parameters)
-		for (String arg : PetrifyExtraUtilitySettings.getDrawAstgArgs().split(" ")) {
+		for (String arg : PetrifyExtraUtilitySettings.getDrawAstgArgs().split("\\s")) {
 			if (!arg.isEmpty()) {
 				command.add(arg);
 			}

=== modified file 'PetrifyExtraPlugin/src/org/workcraft/plugins/petrify/tasks/WriteSgTask.java'
--- PetrifyExtraPlugin/src/org/workcraft/plugins/petrify/tasks/WriteSgTask.java	2016-01-22 23:52:54 +0000
+++ PetrifyExtraPlugin/src/org/workcraft/plugins/petrify/tasks/WriteSgTask.java	2016-01-28 09:55:28 +0000
@@ -52,7 +52,7 @@
 		}
 		
 		// Extra arguments (should go before the file parameters)
-		for (String arg : PetrifyExtraUtilitySettings.getWriteSgArgs().split(" ")) {
+		for (String arg : PetrifyExtraUtilitySettings.getWriteSgArgs().split("\\s")) {
 			if (!arg.isEmpty()) {
 				command.add(arg);
 			}

=== modified file 'PetrifyPlugin/src/org/workcraft/plugins/petrify/PetrifyModule.java'
--- PetrifyPlugin/src/org/workcraft/plugins/petrify/PetrifyModule.java	2015-12-26 00:13:28 +0000
+++ PetrifyPlugin/src/org/workcraft/plugins/petrify/PetrifyModule.java	2016-01-28 09:55:28 +0000
@@ -8,6 +8,7 @@
 import org.workcraft.plugins.petrify.tools.PetrifyCscConflictResolution;
 import org.workcraft.plugins.petrify.tools.PetrifyDummyContraction;
 import org.workcraft.plugins.petrify.tools.PetrifyNetSynthesis;
+import org.workcraft.plugins.petrify.tools.PetrifyNetSynthesisHide;
 import org.workcraft.plugins.petrify.tools.PetrifyNetSynthesisWithEr;
 import org.workcraft.plugins.petrify.tools.PetrifySynthesisComplexGate;
 import org.workcraft.plugins.petrify.tools.PetrifySynthesisGeneralisedCelement;
@@ -31,10 +32,12 @@
 		pm.registerClass(Tool.class, PetrifyDummyContraction.class);
 		pm.registerClass(Tool.class, PetrifyNetSynthesis.class);
 		pm.registerClass(Tool.class, PetrifyNetSynthesisWithEr.class);
+		pm.registerClass(Tool.class, PetrifyNetSynthesisHide.class);
 	}
 
 	@Override
 	public String getDescription() {
-		return "Petrify tool support";
+		return "Petrify synthesis support";
 	}
+	
 }

=== modified file 'PetrifyPlugin/src/org/workcraft/plugins/petrify/PetrifyUtilitySettings.java'
--- PetrifyPlugin/src/org/workcraft/plugins/petrify/PetrifyUtilitySettings.java	2016-01-15 17:00:47 +0000
+++ PetrifyPlugin/src/org/workcraft/plugins/petrify/PetrifyUtilitySettings.java	2016-01-28 09:55:28 +0000
@@ -32,20 +32,23 @@
 public class PetrifyUtilitySettings implements Settings {
 
 	private static final LinkedList<PropertyDescriptor> properties = new LinkedList<PropertyDescriptor>();
-	private static final String prefix = "Tools";
+	private static final String prefix = "Tools.petrify";
 	
-	private static final String keyPetrifyCkeyPmmand = prefix + ".petrify.command";
-	private static final String keyPetrifyArgs = prefix + ".petrify.args";
+	private static final String keyPetrifyCkeyPmmand = prefix + ".command";
+	private static final String keyPetrifyArgs = prefix + ".args";
+	private static final String keyAdvancedMode= prefix + ".advancedMode";
 	private static final String keyPrintStdout= prefix + ".printStdout";
 	private static final String keyPrintStderr= prefix + ".printStderr";
 	
-	private static final String defaultPetrifyCommand = (DesktopApi.getOs().isWindows() ? "tools\\PetrifyTools\\petrify.exe" : "tools/PetrifyTools/petrify");
-	private static final String defaultPetrifyArgs = "";
+	private static final String defaultCommand = (DesktopApi.getOs().isWindows() ? "tools\\PetrifyTools\\petrify.exe" : "tools/PetrifyTools/petrify");
+	private static final String defaultArgs = "";
+	private static final Boolean defaultAdvancedMode = false;
 	private static final Boolean defaultPrintStdout = true;
 	private static final Boolean defaultPrintStderr = true;
 
-	private static String petrifyCommand = defaultPetrifyCommand;
-	private static String petrifyArgs = defaultPetrifyArgs;
+	private static String command = defaultCommand;
+	private static String args = defaultArgs;
+	private static Boolean advancedMode = defaultAdvancedMode;
 	private static Boolean printStdout = defaultPrintStdout;
 	private static Boolean printStderr = defaultPrintStderr;
 
@@ -53,20 +56,30 @@
 		properties.add(new PropertyDeclaration<PetrifyUtilitySettings, String>(
 				this, "Petrify command", String.class, true, false, false) {
 			protected void setter(PetrifyUtilitySettings object, String value) {
-				setPetrifyCommand(value);
+				setCommand(value);
 			}
 			protected String getter(PetrifyUtilitySettings object) {
-				return getPetrifyCommand();
+				return getCommand();
 			}
 		});
 
 		properties.add(new PropertyDeclaration<PetrifyUtilitySettings, String>(
-				this, "Additional parameters for Petrify", String.class, true, false, false) {
+				this, "Additional parameters", String.class, true, false, false) {
 			protected void setter(PetrifyUtilitySettings object, String value) {
-				setPetrifyArgs(value);
+				setArgs(value);
 			}
 			protected String getter(PetrifyUtilitySettings object) {
-				return getPetrifyArgs();
+				return getArgs();
+			}
+		});
+
+		properties.add(new PropertyDeclaration<PetrifyUtilitySettings, Boolean>(
+				this, "Edit additional parameters before every call", Boolean.class, true, false, false) {
+			protected void setter(PetrifyUtilitySettings object, Boolean value) {
+				setAdvancedMode(value);
+			}
+			protected Boolean getter(PetrifyUtilitySettings object) {
+				return getAdvancedMode();
 			}
 		});
 
@@ -98,16 +111,18 @@
 
 	@Override
 	public void load(Config config) {
-		setPetrifyCommand(config.getString(keyPetrifyCkeyPmmand, defaultPetrifyCommand));
-		setPetrifyArgs(config.getString(keyPetrifyArgs, defaultPetrifyArgs));
+		setCommand(config.getString(keyPetrifyCkeyPmmand, defaultCommand));
+		setArgs(config.getString(keyPetrifyArgs, defaultArgs));
+		setAdvancedMode(config.getBoolean(keyAdvancedMode, defaultAdvancedMode));
 		setPrintStdout(config.getBoolean(keyPrintStdout, defaultPrintStdout));
 		setPrintStderr(config.getBoolean(keyPrintStderr, defaultPrintStderr));
 	}
 
 	@Override
 	public void save(Config config) {
-		config.set(keyPetrifyCkeyPmmand, getPetrifyCommand());
-		config.set(keyPetrifyArgs, getPetrifyArgs());
+		config.set(keyPetrifyCkeyPmmand, getCommand());
+		config.set(keyPetrifyArgs, getArgs());
+		config.setBoolean(keyAdvancedMode, getAdvancedMode());
 		config.setBoolean(keyPrintStdout, getPrintStdout());
 		config.setBoolean(keyPrintStderr, getPrintStderr());
 	}
@@ -122,20 +137,28 @@
 		return "Petrify";
 	}
 
-	public static String getPetrifyCommand() {
-		return petrifyCommand;
-	}
-
-	public static void setPetrifyCommand(String value) {
-		petrifyCommand = value;
-	}
-
-	public static String getPetrifyArgs() {
-		return petrifyArgs;
-	}
-
-	public static void setPetrifyArgs(String value) {
-		petrifyArgs = value;
+	public static String getCommand() {
+		return command;
+	}
+
+	public static void setCommand(String value) {
+		command = value;
+	}
+
+	public static String getArgs() {
+		return args;
+	}
+
+	public static void setArgs(String value) {
+		args = value;
+	}
+
+	public static Boolean getAdvancedMode() {
+		return advancedMode;
+	}
+
+	public static void setAdvancedMode(Boolean value) {
+		advancedMode = value;
 	}
 
 	public static Boolean getPrintStdout() {

=== modified file 'PetrifyPlugin/src/org/workcraft/plugins/petrify/tasks/SynthesisTask.java'
--- PetrifyPlugin/src/org/workcraft/plugins/petrify/tasks/SynthesisTask.java	2016-01-15 17:00:47 +0000
+++ PetrifyPlugin/src/org/workcraft/plugins/petrify/tasks/SynthesisTask.java	2016-01-28 09:55:28 +0000
@@ -4,8 +4,11 @@
 import java.io.IOException;
 import java.util.ArrayList;
 
+import javax.swing.JOptionPane;
+
 import org.workcraft.Framework;
 import org.workcraft.dom.Model;
+import org.workcraft.gui.MainWindow;
 import org.workcraft.interop.Exporter;
 import org.workcraft.interop.ExternalProcessListener;
 import org.workcraft.plugins.petrify.PetrifyUtilitySettings;
@@ -44,10 +47,10 @@
 	
 	@Override
 	public Result<? extends SynthesisResult> run(ProgressMonitor<? super SynthesisResult> monitor) {
-		ArrayList<String> command = new ArrayList<String>();
+		ArrayList<String> command = new ArrayList<>();
 
 		// Name of the executable
-		String toolName = ToolUtils.getAbsoluteCommandPath(PetrifyUtilitySettings.getPetrifyCommand());
+		String toolName = ToolUtils.getAbsoluteCommandPath(PetrifyUtilitySettings.getCommand());
 		command.add(toolName);
 		
 		// Built-in arguments
@@ -56,12 +59,20 @@
 		}
 		
 		// Extra arguments (should go before the file parameters)
-		for (String arg : PetrifyUtilitySettings.getPetrifyArgs().split(" ")) {
-			if (!arg.isEmpty()) {
+		String extraArgs = PetrifyUtilitySettings.getArgs();
+		if (PetrifyUtilitySettings.getAdvancedMode()) {
+			MainWindow mainWindow = Framework.getInstance().getMainWindow();
+			String tmp = JOptionPane.showInputDialog(mainWindow, "Additional parameters for Petrify:", extraArgs);
+			if (tmp != null) {
+				extraArgs = tmp;
+			}
+		}
+		for (String arg : extraArgs.split("\\s")) {
+			if ( !arg.isEmpty() ) {
 				command.add(arg);
 			}
 		}
-
+		
 		// Petrify uses the full name of the file as the name of the Verilog module (with _net suffix).
 		// As there may be non-alpha-numerical symbols in the model title, it is better not to include it to the directory name.				
 		String prefix = FileUtils.getTempPrefix(null/* we.getTitle() */);

=== modified file 'PetrifyPlugin/src/org/workcraft/plugins/petrify/tasks/TransformationTask.java'
--- PetrifyPlugin/src/org/workcraft/plugins/petrify/tasks/TransformationTask.java	2016-01-15 17:00:47 +0000
+++ PetrifyPlugin/src/org/workcraft/plugins/petrify/tasks/TransformationTask.java	2016-01-28 09:55:28 +0000
@@ -5,10 +5,13 @@
 import java.util.ArrayList;
 import java.util.UUID;
 
+import javax.swing.JOptionPane;
+
 import org.workcraft.Framework;
 import org.workcraft.dom.Model;
 import org.workcraft.exceptions.DeserialisationException;
 import org.workcraft.exceptions.SerialisationException;
+import org.workcraft.gui.MainWindow;
 import org.workcraft.interop.ExternalProcessListener;
 import org.workcraft.plugins.fsm.Fsm;
 import org.workcraft.plugins.petri.PetriNetModel;
@@ -48,17 +51,25 @@
 		ArrayList<String> command = new ArrayList<String>();
 
 		// Name of the executable
-		String toolName = ToolUtils.getAbsoluteCommandPath(PetrifyUtilitySettings.getPetrifyCommand());
+		String toolName = ToolUtils.getAbsoluteCommandPath(PetrifyUtilitySettings.getCommand());
 		command.add(toolName);
 
 		// Built-in arguments
 		for (String arg : args) {
 			command.add(arg);
 		}
-
+		
 		// Extra arguments (should go before the file parameters)
-		for (String arg : PetrifyUtilitySettings.getPetrifyArgs().split(" ")) {
-			if (!arg.isEmpty()) {
+		String extraArgs = PetrifyUtilitySettings.getArgs();
+		if (PetrifyUtilitySettings.getAdvancedMode()) {
+			MainWindow mainWindow = Framework.getInstance().getMainWindow();
+			String tmp = JOptionPane.showInputDialog(mainWindow, "Additional parameters for Petrify:", extraArgs);
+			if (tmp != null) {
+				extraArgs = tmp;
+			}
+		}
+		for (String arg : extraArgs.split("\\s")) {
+			if ( !arg.isEmpty() ) {
 				command.add(arg);
 			}
 		}

=== added file 'PetrifyPlugin/src/org/workcraft/plugins/petrify/tools/PetrifyNetSynthesisHide.java'
--- PetrifyPlugin/src/org/workcraft/plugins/petrify/tools/PetrifyNetSynthesisHide.java	1970-01-01 00:00:00 +0000
+++ PetrifyPlugin/src/org/workcraft/plugins/petrify/tools/PetrifyNetSynthesisHide.java	2016-01-28 09:55:28 +0000
@@ -0,0 +1,68 @@
+package org.workcraft.plugins.petrify.tools;
+
+import java.util.HashSet;
+
+import org.workcraft.ConversionTool;
+import org.workcraft.Framework;
+import org.workcraft.dom.visual.VisualModel;
+import org.workcraft.plugins.petri.PetriNetModel;
+import org.workcraft.plugins.petri.PetriNetUtils;
+import org.workcraft.plugins.petri.VisualTransition;
+import org.workcraft.plugins.petrify.tasks.TransformationResultHandler;
+import org.workcraft.plugins.petrify.tasks.TransformationTask;
+import org.workcraft.plugins.stg.STGModel;
+import org.workcraft.plugins.stg.VisualDummyTransition;
+import org.workcraft.plugins.stg.VisualSignalTransition;
+import org.workcraft.util.WorkspaceUtils;
+import org.workcraft.workspace.WorkspaceEntry;
+
+public class PetrifyNetSynthesisHide extends ConversionTool {
+
+	@Override
+	public String getDisplayName() {
+		return "Net synthesis hiding selected signals and dummies [Petrify]";
+	}
+	
+	@Override
+	public boolean isApplicableTo(WorkspaceEntry we) {
+		return WorkspaceUtils.canHas(we, PetriNetModel.class);
+	}
+
+	@Override
+	public void run(WorkspaceEntry we) {
+		VisualModel visualModel = we.getModelEntry().getVisualModel();
+		HashSet<VisualTransition> transitions = PetriNetUtils.getVisualTransitions(visualModel);
+		transitions.retainAll(visualModel.getSelection());
+		
+		HashSet<String> nameSet = new HashSet<>();
+		for (VisualTransition transition: transitions) {
+			String name = null;
+			if (transition instanceof VisualSignalTransition) {
+				name = ((VisualSignalTransition)transition).getSignalName();
+			} else if (transition instanceof VisualDummyTransition) {
+				name = ((VisualDummyTransition)transition).getReferencedTransition().getName();
+			} else {
+				name = visualModel.getMathName(transition);
+			}
+			if ((name != null) && !name.isEmpty()) {
+				nameSet.add(name);
+			}
+		}
+		if ( !nameSet.isEmpty() ) {
+			String names = "";
+			for (String name: nameSet) {
+				if ( !names.isEmpty() ) {
+					names += ",";
+				}
+				names += name;
+			}
+			final TransformationTask task = new TransformationTask(we, "Net synthesis", new String[] {"-hide", names});
+			
+			final Framework framework = Framework.getInstance();
+			boolean hasSignals = WorkspaceUtils.canHas(we, STGModel.class); 
+			TransformationResultHandler monitor = new TransformationResultHandler(we, hasSignals);
+			framework.getTaskManager().queue(task, "Petrify net synthesis", monitor);
+		}
+	}
+
+}

=== modified file 'PunfPlugin/src/org/workcraft/plugins/punf/tasks/PunfTask.java'
--- PunfPlugin/src/org/workcraft/plugins/punf/tasks/PunfTask.java	2016-01-15 17:00:47 +0000
+++ PunfPlugin/src/org/workcraft/plugins/punf/tasks/PunfTask.java	2016-01-28 09:55:28 +0000
@@ -29,7 +29,7 @@
 		command.add(toolName);
 		
 		// Extra arguments (should go before the file parameters)
-		for (String arg : PunfUtilitySettings.getExtraArgs().split(" ")) {
+		for (String arg : PunfUtilitySettings.getExtraArgs().split("\\s")) {
 			if (!arg.isEmpty()) {
 				command.add(arg);
 			}

=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/StgUtils.java'
--- STGPlugin/src/org/workcraft/plugins/stg/StgUtils.java	2016-01-02 22:46:33 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/StgUtils.java	2016-01-28 09:55:28 +0000
@@ -50,6 +50,7 @@
 				VisualConnection oldPredConnection = (VisualConnection)stg.getConnection(pred, oldTransition);
 				VisualConnection newPredConnection = stg.connect(pred, newTransition);
 				newPredConnection.copyStyle(oldPredConnection);
+				newPredConnection.copyShape(oldPredConnection);
 			} catch (InvalidConnectionException e) {
 				e.printStackTrace();
 			}

=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/VisualDummyTransition.java'
--- STGPlugin/src/org/workcraft/plugins/stg/VisualDummyTransition.java	2015-01-14 18:10:46 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/VisualDummyTransition.java	2016-01-28 09:55:28 +0000
@@ -43,16 +43,6 @@
 	public DummyTransition getReferencedTransition() {
 		return (DummyTransition)getReferencedComponent();
 	}
-		
-	@NoAutoSerialisation
-	public String getText() {
-		return getReferencedTransition().getName();
-	}
-	
-	@NoAutoSerialisation
-	public void setText(String name) {
-		getReferencedTransition().setName(name);
-	}
 
 	@Override
 	public Color getColor() {

=== modified file 'STGPlugin/src/org/workcraft/plugins/stg/VisualSTG.java'
--- STGPlugin/src/org/workcraft/plugins/stg/VisualSTG.java	2016-01-15 19:01:38 +0000
+++ STGPlugin/src/org/workcraft/plugins/stg/VisualSTG.java	2016-01-28 09:55:28 +0000
@@ -37,6 +37,7 @@
 import org.workcraft.dom.math.MathNode;
 import org.workcraft.dom.visual.AbstractVisualModel;
 import org.workcraft.dom.visual.ConnectionHelper;
+import org.workcraft.dom.visual.Replica;
 import org.workcraft.dom.visual.VisualComponent;
 import org.workcraft.dom.visual.VisualGroup;
 import org.workcraft.dom.visual.VisualNode;
@@ -280,7 +281,8 @@
 	public void maybeMakeImplicit(VisualPlace place, boolean preserveConnectionShape) {
 		Collection<Node> preset = getPreset(place);
 		Collection<Node> postset = getPostset(place);
-		if ((preset.size() == 1) && (postset.size() == 1)) {
+		Collection<Replica> replicas = place.getReplicas();
+		if ((preset.size() == 1) && (postset.size() == 1) && replicas.isEmpty()) {
 			final STGPlace stgPlace = (STGPlace)place.getReferencedPlace();
 			stgPlace.setImplicit(true);
 			VisualComponent first = (VisualComponent)preset.iterator().next();

=== modified file 'WorkcraftCore/src/org/workcraft/Console.java'
--- WorkcraftCore/src/org/workcraft/Console.java	2016-01-21 18:39:24 +0000
+++ WorkcraftCore/src/org/workcraft/Console.java	2016-01-28 09:55:28 +0000
@@ -32,6 +32,7 @@
 import org.mozilla.javascript.WrappedException;
 import org.workcraft.exceptions.OperationCancelledException;
 import org.workcraft.gui.FileFilters;
+import org.workcraft.gui.MainWindow;
 import org.workcraft.util.FileUtils;
 import org.workcraft.util.LogUtils;
 
@@ -77,15 +78,25 @@
 		if (startGUI) {
 			framework.startGUI();
 		}
+		
+		framework.loadConfig();
+
+		// Setting recent files and the window geometry is postponed until the configuration is loaded.
+		if (framework.isInGUIMode()) {
+			MainWindow mainWindow = framework.getMainWindow();
+			mainWindow.loadRecentFilesFromConfig();
+			mainWindow.loadWindowGeometryFromConfig();
+			mainWindow.loadDockingLayout();
+		}
 
 		framework.initPlugins();
-
+
 		LogUtils.logMessageLine("Running startup scripts...");
 		try {
 			framework.execJavaScript(FileUtils.readAllTextFromSystemResource("scripts/functions.js"));
 			framework.execJavaScript(FileUtils.readAllTextFromSystemResource("scripts/startup.js"));
-		} catch (FileNotFoundException e2) {
-			LogUtils.logWarningLine("System script file not found: " + e2.getMessage());
+		} catch (FileNotFoundException e) {
+			LogUtils.logWarningLine("System script file not found: " + e.getMessage());
 		} catch (IOException e) {
 			LogUtils.logErrorLine("Error reading system script file: " + e.getMessage());
 		} catch (WrappedException e) {
@@ -117,7 +128,8 @@
 			for (String arg: arglist) {
 				if (arg.endsWith(FileFilters.DOCUMENT_EXTENSION)) {
 					File file = new File(dir, arg);
-					framework.getMainWindow().openWork(file);
+					MainWindow mainWindow = framework.getMainWindow();
+					mainWindow.openWork(file);
 				}
 			}
 		}
@@ -126,6 +138,7 @@
 			if (framework.shutdownRequested()) {
 				try {
 					framework.shutdownGUI();
+					framework.saveConfig();
 				} catch (OperationCancelledException e) {
 					framework.abortShutdown();
 				}

=== modified file 'WorkcraftCore/src/org/workcraft/Framework.java'
--- WorkcraftCore/src/org/workcraft/Framework.java	2016-01-21 18:39:24 +0000
+++ WorkcraftCore/src/org/workcraft/Framework.java	2016-01-28 09:55:28 +0000
@@ -431,11 +431,11 @@
 
 	public void startGUI() {
 		if (inGUIMode) {
-			System.out.println ("Already in GUI mode");
+			System.out.println("Already in GUI mode");
 			return;
 		}
 		GUIRestartRequested = false;
-		System.out.println ("Switching to GUI mode...");
+		System.out.println("Switching to GUI mode...");
 
 		if (SwingUtilities.isEventDispatchThread()) {
 			mainWindow = new MainWindow();
@@ -443,6 +443,7 @@
 		} else {
 			try {
 				SwingUtilities.invokeAndWait(new Runnable() {
+					@Override
 					public void run() {
 						mainWindow = new MainWindow();
 						mainWindow.startup();
@@ -456,14 +457,15 @@
 		}
 
 		contextFactory.call(new ContextAction() {
+			@Override
 			public Object run(Context cx) {
 				Object guiScriptable = Context.javaToJS(mainWindow, systemScope);
 				ScriptableObject.putProperty(systemScope, "mainWindow", guiScriptable);
 				systemScope.setAttributes("mainWindow", ScriptableObject.READONLY);
 				return null;
-
 			}
 		});
+		
 		inGUIMode = true;
 	}
 
@@ -475,6 +477,7 @@
 			inGUIMode = false;
 
 			contextFactory.call(new ContextAction() {
+				@Override
 				public Object run(Context cx) {
 					ScriptableObject.deleteProperty(systemScope, "mainWindow");
 					return null;

=== modified file 'WorkcraftCore/src/org/workcraft/gui/DesktopApi.java'
--- WorkcraftCore/src/org/workcraft/gui/DesktopApi.java	2015-11-09 10:55:18 +0000
+++ WorkcraftCore/src/org/workcraft/gui/DesktopApi.java	2016-01-28 09:55:28 +0000
@@ -115,7 +115,7 @@
 		List<String> parts = new ArrayList<String>();
 		parts.add(command);
 		if (args != null) {
-			for (String s : args.split(" ")) {
+			for (String s : args.split("\\s")) {
 				s = String.format(s, file);
 				parts.add(s.trim());
 			}

=== modified file 'WorkcraftCore/src/org/workcraft/gui/LookAndFeelHelper.java'
--- WorkcraftCore/src/org/workcraft/gui/LookAndFeelHelper.java	2015-06-26 22:40:59 +0000
+++ WorkcraftCore/src/org/workcraft/gui/LookAndFeelHelper.java	2016-01-28 09:55:28 +0000
@@ -48,12 +48,14 @@
 		}
 		return Collections.unmodifiableMap(lafMap); 
 	}
-
+
+	public static void setDefaultLookAndFeel() {
+		String laf = UIManager.getCrossPlatformLookAndFeelClassName();
+		//String laf = UIManager.getSystemLookAndFeelClassName();
+		setLookAndFeel(laf);
+	}
+	
 	public static void setLookAndFeel(String laf) {
-		if (laf == null) {
-			laf = UIManager.getCrossPlatformLookAndFeelClassName();
-			//laf = UIManager.getSystemLookAndFeelClassName();
-		}
 		try {
 			UIManager.setLookAndFeel(laf);
 		} catch (ClassNotFoundException e) {

=== modified file 'WorkcraftCore/src/org/workcraft/gui/MainMenu.java'
--- WorkcraftCore/src/org/workcraft/gui/MainMenu.java	2016-01-14 18:28:55 +0000
+++ WorkcraftCore/src/org/workcraft/gui/MainMenu.java	2016-01-28 09:55:28 +0000
@@ -378,27 +378,27 @@
 		PluginManager pluginManager = framework.getPluginManager();
 		Collection<PluginInfo<? extends Exporter>> plugins = pluginManager.getPlugins(Exporter.class);
 
-		boolean haveVisual = false;
+		boolean hasVisualModelExporter = false;
 		for (PluginInfo<? extends Exporter> info : plugins) { 
 			Exporter exporter = info.getSingleton();
 			if (exporter.getCompatibility(model) > Exporter.NOT_COMPATIBLE) {
-				if (!haveVisual) {
-					addExportSeparator("Visual");
+				if (!hasVisualModelExporter) {
+					addExportSeparator("Visual model");
 				}
 				addExporter(exporter);
-				haveVisual = true;
+				hasVisualModelExporter = true;
 			}
 		}
 		
-		boolean haveNonVisual = false;
+		boolean hasMathModelExporter = false;
 		for (PluginInfo<? extends Exporter> info : plugins) { 
 			Exporter exporter = info.getSingleton();
 			if (exporter.getCompatibility(model.getMathModel()) > Exporter.NOT_COMPATIBLE) {
-				if (!haveNonVisual) {
-					addExportSeparator("Non-visual");
+				if (!hasMathModelExporter) {
+					addExportSeparator("Math model");
 				}
 				addExporter(exporter);
-				haveNonVisual = true;
+				hasMathModelExporter = true;
 			}
 		}
 		revalidate();
@@ -446,7 +446,7 @@
 		miClear.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				mainWindow.clearRecentFiles();
+				mainWindow.clearRecentFilesMenu();
 			}
 		});
 		mnRecent.add(miClear);

=== modified file 'WorkcraftCore/src/org/workcraft/gui/MainWindow.java'
--- WorkcraftCore/src/org/workcraft/gui/MainWindow.java	2016-01-21 18:39:24 +0000
+++ WorkcraftCore/src/org/workcraft/gui/MainWindow.java	2016-01-28 09:55:28 +0000
@@ -185,19 +185,6 @@
 		});
 	}
 
-	public void setLookAndFeel(String laf) throws OperationCancelledException {
-		int dialogResult = JOptionPane.showConfirmDialog(this,
-				"Changing Look and Feel requires GUI restart.\n\n"
-				+ "This will cause the visual editor windows to be closed.\n\nProceed?",
-				"Confirm", JOptionPane.YES_NO_OPTION);
-
-		if (dialogResult == JOptionPane.YES_OPTION) {
-			final Framework framework = Framework.getInstance();
-			framework.setConfigVar("gui.lookandfeel", laf);
-			framework.restartGUI();
-		}
-	}
-
 	private int getNextDockableID() {
 		return dockableIDCounter++;
 	}
@@ -361,10 +348,8 @@
 		mainMenu = new MainMenu(this);
 		setJMenuBar(mainMenu);
 
-		final Framework framework = Framework.getInstance();
-		String laf = framework.getConfigVar("gui.lookandfeel");
 		SilverOceanTheme.enable();
-		LookAndFeelHelper.setLookAndFeel(laf);
+		LookAndFeelHelper.setDefaultLookAndFeel();
 		SwingUtilities.updateComponentTreeUI(this);
 
 		content = new JPanel(new BorderLayout(0, 0));
@@ -377,38 +362,13 @@
 		rootDockingPort = new DefaultDockingPort("defaultDockingPort");
 		content.add(rootDockingPort, BorderLayout.CENTER);
 
-		lastSavePath = framework.getConfigVar("gui.main.lastSavePath");
-		lastOpenPath = framework.getConfigVar("gui.main.lastOpenPath");
-		for (int i = 0; i < CommonEditorSettings.getRecentCount(); i++) {
-			String entry = framework.getConfigVar("gui.main.recentFile" + i);
-			pushRecentFile(entry, false);
-		}
-		mainMenu.setRecentMenu(new ArrayList<String>(recentFiles));
-
-		String maximisedStr = framework.getConfigVar("gui.main.maximised");
-		String widthStr = framework.getConfigVar("gui.main.width");
-		String heightStr = framework.getConfigVar("gui.main.height");
-
-		boolean maximised = (maximisedStr == null) ? true : Boolean.parseBoolean(maximisedStr);
-        this.setExtendedState(maximised ? JFrame.MAXIMIZED_BOTH : JFrame.NORMAL);
-        
-       	DisplayMode mode = this.getGraphicsConfiguration().getDevice().getDisplayMode();
-       	Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(this.getGraphicsConfiguration());
-        int width = mode.getWidth() - insets.right - insets.left;
-        int height = mode.getHeight() - insets.top - insets.bottom;
-        if ((widthStr != null) && (heightStr != null)) {
-        	width = Integer.parseInt(widthStr);
-        	height = Integer.parseInt(heightStr);
-        }
-		this.setSize(width, height);
-
 		createWindows();
 
 		outputWindow.captureStream();
 		errorWindow.captureStream();
 
-		rootDockingPort.setBorderManager(new StandardBorderManager(
-				new ShadowBorder()));
+		StandardBorderManager borderManager = new StandardBorderManager(new ShadowBorder());
+		rootDockingPort.setBorderManager(borderManager);
 
 		float xSplit = 0.88f;
 		float ySplit = 0.82f;
@@ -475,13 +435,11 @@
 		new Thread(new Runnable() {
 			@Override
 			public void run() {
-				// hack to fix the annoying delay occurring when
-				// createGlyphVector is called for the first time
+				// Hack to fix the annoying delay occurring when createGlyphVector is called for the first time.
 				Font font = new Font(Font.SANS_SERIF, Font.PLAIN, 1);
-				font.createGlyphVector(new FontRenderContext(
-						new AffineTransform(), true, true), TITLE_PLACEHOLDER);
-
-				// force svg rendering classes to load
+				FontRenderContext frc = new FontRenderContext(new AffineTransform(), true, true);
+				font.createGlyphVector(frc, TITLE_PLACEHOLDER);
+				// Force SVG rendering classes to load.
 				GUI.createIconFromSVG("images/icons/svg/place.svg");
 			}
 		}).start();
@@ -649,13 +607,11 @@
 		}
 	}
 
-	private void saveDockingLayout() {
-		PerspectiveManager pm = (PerspectiveManager) DockingManager
-				.getLayoutManager();
+	public void saveDockingLayout() {
+		PerspectiveManager pm = (PerspectiveManager)DockingManager.getLayoutManager();
 		pm.getCurrentPerspective().cacheLayoutState(rootDockingPort);
 		pm.forceDockableUpdate();
-		PerspectiveModel pmodel = new PerspectiveModel(pm
-				.getDefaultPerspective().getPersistentId(),
+		PerspectiveModel pmodel = new PerspectiveModel(pm.getDefaultPerspective().getPersistentId(),
 				pm.getCurrentPerspectiveName(), pm.getPerspectives());
 		XMLPersister pers = new XMLPersister();
 		try {
@@ -677,29 +633,24 @@
 		}
 	}
 
-	private void loadDockingLayout() {
-		PerspectiveManager pm = (PerspectiveManager) DockingManager
-				.getLayoutManager();
+	public void loadDockingLayout() {
+		PerspectiveManager pm = (PerspectiveManager)DockingManager.getLayoutManager();
 		XMLPersister pers = new XMLPersister();
 		try {
 			File file = new File(Framework.UILAYOUT_FILE_PATH);
-			if (!file.exists()) {
-				return;
+			if (file.exists()) {
+				LogUtils.logMessageLine("Loading UI layout from " + file.getAbsolutePath());
+				FileInputStream is = new FileInputStream(file);
+				PerspectiveModel pmodel = pers.load(is);
+				pm.remove("defaultWorkspace");
+				pm.setCurrentPerspective("defaultWorkspace");
+				for (Perspective p : pmodel.getPerspectives()) {
+					pm.add(p, false);
+				}
+				pm.reload(rootDockingPort);
+				is.close();
+				DockingManager.display(outputDockable);
 			}
-			LogUtils.logMessageLine("Loading UI layout from " + file.getAbsolutePath());
-			FileInputStream is = new FileInputStream(file);
-
-			PerspectiveModel pmodel = pers.load(is);
-
-			pm.remove("defaultWorkspace");
-			pm.setCurrentPerspective("defaultWorkspace");
-
-			for (Perspective p : pmodel.getPerspectives())
-				pm.add(p, false);
-
-			pm.reload(rootDockingPort);
-
-			is.close();
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();
 		} catch (IOException e) {
@@ -729,16 +680,58 @@
 				throw new OperationCancelledException("Operation cancelled by user.");
 			}
 		}
-
 		saveDockingLayout();
+		saveWindowGeometryToConfig();
+		saveRecentFilesToConfig();
 
 		content.remove(rootDockingPort);
-		
+
+		outputWindow.releaseStream();
+		errorWindow.releaseStream();
+		setVisible(false);
+	}
+
+	public void loadWindowGeometryFromConfig() {
+		final Framework framework = Framework.getInstance();
+		String maximisedStr = framework.getConfigVar("gui.main.maximised");
+		String widthStr = framework.getConfigVar("gui.main.width");
+		String heightStr = framework.getConfigVar("gui.main.height");
+
+		boolean maximised = (maximisedStr == null) ? true : Boolean.parseBoolean(maximisedStr);
+        this.setExtendedState(maximised ? JFrame.MAXIMIZED_BOTH : JFrame.NORMAL);
+        
+       	DisplayMode mode = this.getGraphicsConfiguration().getDevice().getDisplayMode();
+       	Insets insets = Toolkit.getDefaultToolkit().getScreenInsets(this.getGraphicsConfiguration());
+        int width = mode.getWidth() - insets.right - insets.left;
+        int height = mode.getHeight() - insets.top - insets.bottom;
+        if ((widthStr != null) && (heightStr != null)) {
+        	width = Integer.parseInt(widthStr);
+        	height = Integer.parseInt(heightStr);
+        }
+		this.setSize(width, height);
+	}
+
+	public void saveWindowGeometryToConfig() {
+		final Framework framework = Framework.getInstance();
 		boolean maximised = ((getExtendedState() & JFrame.MAXIMIZED_BOTH) != 0);
 		framework.setConfigVar("gui.main.maximised", Boolean.toString(maximised));
 		framework.setConfigVar("gui.main.width", Integer.toString(getWidth()));
 		framework.setConfigVar("gui.main.height", Integer.toString(getHeight()));
-
+	}
+
+	public void loadRecentFilesFromConfig() {
+		final Framework framework = Framework.getInstance();
+		lastSavePath = framework.getConfigVar("gui.main.lastSavePath");
+		lastOpenPath = framework.getConfigVar("gui.main.lastOpenPath");
+		for (int i = 0; i < CommonEditorSettings.getRecentCount(); i++) {
+			String entry = framework.getConfigVar("gui.main.recentFile" + i);
+			pushRecentFile(entry, false);
+		}
+		updateRecentFilesMenu();
+	}
+
+	public void saveRecentFilesToConfig() {
+		final Framework framework = Framework.getInstance();
 		if (lastSavePath != null) {
 			framework.setConfigVar("gui.main.lastSavePath", lastSavePath);
 		}
@@ -750,10 +743,6 @@
 		for (int i = 0; i < recentCount; i++) {
 			framework.setConfigVar("gui.main.recentFile" + i, tmp[i]);
 		}
-
-		outputWindow.releaseStream();
-		errorWindow.releaseStream();
-		setVisible(false);
 	}
 	
 	public void pushRecentFile(String fileName, boolean updateMenu) {
@@ -774,15 +763,19 @@
 			}
 		}
 		if (updateMenu) {
-			mainMenu.setRecentMenu(new ArrayList<String>(recentFiles));
+			updateRecentFilesMenu();
 		}
 	}
 
-	public void clearRecentFiles() {
+	public void clearRecentFilesMenu() {
 		recentFiles.clear();
 		mainMenu.setRecentMenu(new ArrayList<String>(recentFiles));
 	}
 
+	public void updateRecentFilesMenu() {
+		mainMenu.setRecentMenu(new ArrayList<String>(recentFiles));
+	}
+	
 	public void createWork() throws OperationCancelledException {
 		createWork(Path.<String> empty());
 	}
@@ -1359,6 +1352,8 @@
 					framework.shutdownGUI();
 					new File(Framework.UILAYOUT_FILE_PATH).delete();
 					framework.startGUI();
+					loadWindowGeometryFromConfig();
+					loadDockingLayout();
 				} catch (OperationCancelledException e) {
 				}
 			}

=== modified file 'WorkcraftCore/src/org/workcraft/plugins/BuiltinExporters.java'
--- WorkcraftCore/src/org/workcraft/plugins/BuiltinExporters.java	2016-01-25 12:22:01 +0000
+++ WorkcraftCore/src/org/workcraft/plugins/BuiltinExporters.java	2016-01-28 09:55:28 +0000
@@ -8,7 +8,6 @@
 import org.workcraft.plugins.interop.EPSExporter;
 import org.workcraft.plugins.interop.PDFExporter;
 import org.workcraft.plugins.interop.PNGExporter;
-import org.workcraft.plugins.interop.PSExporter;
 import org.workcraft.plugins.interop.SVGExporter;
 
 public class BuiltinExporters implements Module {
@@ -20,7 +19,6 @@
 		pm.registerClass(Exporter.class, DotExporter.class);
 		pm.registerClass(Exporter.class, SVGExporter.class);
 		pm.registerClass(Exporter.class, PDFExporter.class);
-		pm.registerClass(Exporter.class, PSExporter.class);
 		pm.registerClass(Exporter.class, EPSExporter.class);
 		pm.registerClass(Exporter.class, PNGExporter.class);
 	}

=== modified file 'WorkcraftCore/src/scripts/shutdown.js'
--- WorkcraftCore/src/scripts/shutdown.js	2010-07-18 00:21:00 +0000
+++ WorkcraftCore/src/scripts/shutdown.js	2016-01-28 09:55:28 +0000
@@ -1,3 +1,2 @@
 // shutdown actions
 
-saveConfig();

=== modified file 'WorkcraftCore/src/scripts/startup.js'
--- WorkcraftCore/src/scripts/startup.js	2010-07-18 00:21:00 +0000
+++ WorkcraftCore/src/scripts/startup.js	2016-01-28 09:55:28 +0000
@@ -1,5 +1,3 @@
 // startup actions
 
-loadConfig();
-
 execResource("scripts/editor.js");