From b75a481807cd2d4d4e4cc138e1e906e633d189b5 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Wed, 17 Oct 2007 08:55:55 +0000 Subject: [PATCH] Allow loading of partially (syntactically) correct properties files in GUI. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@453 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/prism/Prism.java | 5 ++++- .../properties/computation/LoadPropertiesThread.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/prism/src/prism/Prism.java b/prism/src/prism/Prism.java index c49ece6c..2178f0a6 100644 --- a/prism/src/prism/Prism.java +++ b/prism/src/prism/Prism.java @@ -668,6 +668,9 @@ public class Prism implements PrismSettingsListener // but if its null, we just create a blank one for you. public PropertiesFile parsePropertiesFile(ModulesFile mf, File file) throws FileNotFoundException, ParseException, PrismException + { return parsePropertiesFile(mf, file, true); } + + public PropertiesFile parsePropertiesFile(ModulesFile mf, File file, boolean tidy) throws FileNotFoundException, ParseException, PrismException { FileInputStream strProperties; PrismParser prismParser; @@ -700,7 +703,7 @@ public class Prism implements PrismSettingsListener throw new ParseException("Concurrency error in parser"); } - propertiesFile.tidyUp(); + if (tidy) propertiesFile.tidyUp(); return propertiesFile; } diff --git a/prism/src/userinterface/properties/computation/LoadPropertiesThread.java b/prism/src/userinterface/properties/computation/LoadPropertiesThread.java index 571a8101..6991ae10 100644 --- a/prism/src/userinterface/properties/computation/LoadPropertiesThread.java +++ b/prism/src/userinterface/properties/computation/LoadPropertiesThread.java @@ -80,7 +80,7 @@ public class LoadPropertiesThread extends Thread // do parsing try { - props = pri.parsePropertiesFile(mf, file); + props = pri.parsePropertiesFile(mf, file, false); } //If there was a problem with the loading, notify the interface. catch (FileNotFoundException e) {