Default settings file ~/.prism is only read in by GUI, not command-line.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4955 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/src/prism/Prism.java

@@ -226,6 +226,18 @@ public class Prism implements PrismSettingsListener
 
 		// set up some default options
 		settings = new PrismSettings();
+		// add this Prism object as a results listener
+		settings.addSettingsListener(this);
+		// create list of model listeners
+		modelListeners = new ArrayList<PrismModelListener>();
+	}
+
+	/**
+	 * Read in PRISM settings from a file (.prism in user's home directory).
+	 * If no file exists, attempt to create a new one with default settings.
+	 */
+	public void loadUserSettingsFile()
+	{
 		// load user's default settings
 		try {
 			settings.loadSettingsFile();
@@ -237,12 +249,8 @@ public class Prism implements PrismSettingsListener
 				mainLog.printWarning("Failed to create new PRISM settings file.");
 			}
 		}
-		// add this Prism object as a results listener
-		settings.addSettingsListener(this);
-		// create list of model listeners
-		modelListeners = new ArrayList<PrismModelListener>();
 	}
-
+	
 	// Set methods
 
 	/**

prism/src/userinterface/GUIPrism.java

@@ -220,6 +220,7 @@ public class GUIPrism extends JFrame
     {
         theLog = new userinterface.log.GUIWindowLog();
         prism = new Prism(theLog, new PrismFileLog("stdout"));
+        prism.loadUserSettingsFile();
         prism.initialise();
     }