From e841f4ff9e6a87754e71d9174b7fdb4a11a17e42 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Wed, 28 Mar 2012 13:47:12 +0000 Subject: [PATCH] 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 | 18 +++++++++++++----- prism/src/userinterface/GUIPrism.java | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/prism/src/prism/Prism.java b/prism/src/prism/Prism.java index 078fd2f5..081662dc 100644 --- a/prism/src/prism/Prism.java +++ b/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(); + } + + /** + * 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(); } - + // Set methods /** diff --git a/prism/src/userinterface/GUIPrism.java b/prism/src/userinterface/GUIPrism.java index 66a9fb95..22514050 100644 --- a/prism/src/userinterface/GUIPrism.java +++ b/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(); }