From ff86cbd1674103ce7ea45a3f5c98b345d0770064 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Tue, 23 Dec 2008 11:55:37 +0000 Subject: [PATCH] Changed meaning of version in settings info. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@915 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/prism/PrismSettings.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/prism/src/prism/PrismSettings.java b/prism/src/prism/PrismSettings.java index fb702307..b040857b 100644 --- a/prism/src/prism/PrismSettings.java +++ b/prism/src/prism/PrismSettings.java @@ -504,8 +504,9 @@ public class PrismSettings implements Observer Setting set = settingFromHash(key); if(set != null) { - // If "version" of setting is newer than the version of the settings file, ignore - if (resaveNeeded && Prism.compareVersions(set.getVersion(), version) >= 0) continue; + // If the version of the settings file is not newer than the "version" of the setting, + // and we are re-saving the file, overwrite the setting with the default value + if (resaveNeeded && Prism.compareVersions(version, set.getVersion()) <= 0) continue; try { Object valObj = set.parseStringValue(value); @@ -543,8 +544,9 @@ public class PrismSettings implements Observer Setting set = settingFromHash(key); if(set != null) { - // If "version" of setting is newer than the version of the settings file, ignore - if (resaveNeeded && Prism.compareVersions(set.getVersion(), version) >= 0) continue; + // If the version of the settings file is not newer than the "version" of the setting, + // and we are re-saving the file, overwrite the setting with the default value + if (resaveNeeded && Prism.compareVersions(version, set.getVersion()) <= 0) continue; try { Object valObj = set.parseStringValue(multiline.toString() + line);