[jsword-svn] r1873 - in trunk/common: . src/main/java/org/crosswire/common/config

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2008-06-10 08:51:55 -0700 (Tue, 10 Jun 2008)
New Revision: 1873

Modified:
   trunk/common/JSwordDictionary.txt
   trunk/common/src/main/java/org/crosswire/common/config/Config.java
Log:
Made WebWarning changes backwardly compatible.

Modified: trunk/common/JSwordDictionary.txt
===================================================================
--- trunk/common/JSwordDictionary.txt	2008-06-09 23:00:37 UTC (rev 1872)
+++ trunk/common/JSwordDictionary.txt	2008-06-10 15:51:55 UTC (rev 1873)
@@ -70,6 +70,10 @@
 gregorian
 downloaded
 sidebar
+idiom
+unencoded
+redistributable
+preloaded
 stopword
 lucene
 acrostic

Modified: trunk/common/src/main/java/org/crosswire/common/config/Config.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/Config.java	2008-06-09 23:00:37 UTC (rev 1872)
+++ trunk/common/src/main/java/org/crosswire/common/config/Config.java	2008-06-10 15:51:55 UTC (rev 1873)
@@ -319,7 +319,9 @@
             String key = (String) iter.next();
             String value = prop.getProperty(key);
 
-            if (value != null)
+            Choice model = getChoice(key);
+            // Only if a value was stored and it should be stored then we use it.
+            if (value != null && model.isSaveable())
             {
                 local.put(key, value);
             }