Update most, but not all of the uses of stringToProperties. The serialized parser objects still have one because the BaseLexicons were serialized with a TestOptions inside them

Author: AngledLuffa

src/edu/stanford/nlp/process/WhitespaceTokenizer.java

@@ -7,12 +7,12 @@
 import java.io.PrintWriter;
 import java.io.Reader;
 import java.util.Iterator;
-import java.util.Properties;
+import java.util.LinkedHashMap;
 
 import edu.stanford.nlp.ling.CoreLabel;
 import edu.stanford.nlp.ling.HasWord;
 import edu.stanford.nlp.ling.Word;
-import edu.stanford.nlp.util.PropertiesUtils;
+import edu.stanford.nlp.util.Maps;
 import edu.stanford.nlp.util.StringUtils;
 
 /**
@@ -76,8 +76,8 @@ public WhitespaceTokenizerFactory(LexedTokenFactory<T> factory) {
     public WhitespaceTokenizerFactory(LexedTokenFactory<T> factory,
                                       String options) {
       this.factory = factory;
-      Properties prop = StringUtils.stringToProperties(options);
-      this.tokenizeNLs = PropertiesUtils.getBool(prop, "tokenizeNLs", false);
+      LinkedHashMap<String, String> prop = StringUtils.stringToPropertiesMap(options);
+      this.tokenizeNLs = Maps.getBool(prop, "tokenizeNLs", false);
     }
 
     public WhitespaceTokenizerFactory(LexedTokenFactory<T> factory,
@@ -98,16 +98,16 @@ public Tokenizer<T> getTokenizer(Reader r) {
 
     @Override
     public Tokenizer<T> getTokenizer(Reader r, String extraOptions) {
-      Properties prop = StringUtils.stringToProperties(extraOptions);
-      boolean tokenizeNewlines = PropertiesUtils.getBool(prop, "tokenizeNLs", this.tokenizeNLs);
+      LinkedHashMap<String, String> prop = StringUtils.stringToPropertiesMap(extraOptions);
+      boolean tokenizeNewlines = Maps.getBool(prop, "tokenizeNLs", this.tokenizeNLs);
 
       return new WhitespaceTokenizer<>(factory, r, tokenizeNewlines);
     }
 
     @Override
     public void setOptions(String options) {
-      Properties prop = StringUtils.stringToProperties(options);
-      tokenizeNLs = PropertiesUtils.getBool(prop, "tokenizeNLs", tokenizeNLs);
+      LinkedHashMap<String, String> prop = StringUtils.stringToPropertiesMap(options);
+      tokenizeNLs = Maps.getBool(prop, "tokenizeNLs", tokenizeNLs);
     }
 
   } // end class WhitespaceTokenizerFactory

src/edu/stanford/nlp/process/WordSegmentingTokenizer.java

@@ -5,11 +5,11 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Properties;
+import java.util.LinkedHashMap;
 
 import edu.stanford.nlp.ling.CoreLabel;
 import edu.stanford.nlp.ling.HasWord;
-import edu.stanford.nlp.util.PropertiesUtils;
+import edu.stanford.nlp.util.Maps;
 import edu.stanford.nlp.util.StringUtils;
 
 /** A tokenizer that works by calling a WordSegmenter.
@@ -82,16 +82,16 @@ public Tokenizer<HasWord> getTokenizer(Reader r) {
     public Tokenizer<HasWord> getTokenizer(Reader r, String extraOptions) {
       boolean tokenizeNewlines = this.tokenizeNLs;
       if (extraOptions != null) {
-        Properties prop = StringUtils.stringToProperties(extraOptions);
-        tokenizeNewlines = PropertiesUtils.getBool(prop, "tokenizeNLs", this.tokenizeNLs);
+        LinkedHashMap<String, String> prop = StringUtils.stringToPropertiesMap(extraOptions);
+        tokenizeNewlines = Maps.getBool(prop, "tokenizeNLs", this.tokenizeNLs);
       }
 
       return new WordSegmentingTokenizer(segmenter, WhitespaceTokenizer.newCoreLabelWhitespaceTokenizer(r, tokenizeNewlines));
     }
 
     public void setOptions(String options) {
-      Properties prop = StringUtils.stringToProperties(options);
-      tokenizeNLs = PropertiesUtils.getBool(prop, "tokenizeNLs", tokenizeNLs);
+      LinkedHashMap<String, String> prop = StringUtils.stringToPropertiesMap(options);
+      tokenizeNLs = Maps.getBool(prop, "tokenizeNLs", tokenizeNLs);
     }
   }
 }

src/edu/stanford/nlp/trees/TreePrint.java

@@ -51,8 +51,8 @@ public class TreePrint  {
     "conll2007"
   };
 
-  private final Properties formats;
-  private final Properties options;
+  private final LinkedHashMap<String, String> formats;
+  private final LinkedHashMap<String, String> options;
 
   private final boolean markHeadNodes; // = false;
   private final boolean lexicalize; // = false;
@@ -143,11 +143,10 @@ public TreePrint(String formats, String options, TreebankLanguagePack tlp) {
    * @param hf      The HeadFinder used in printing output
    */
   public TreePrint(String formatString, String optionsString, TreebankLanguagePack tlp, HeadFinder hf, HeadFinder typedDependencyHF) {
-    formats = StringUtils.stringToProperties(formatString);
-    options = StringUtils.stringToProperties(optionsString);
+    formats = StringUtils.stringToPropertiesMap(formatString);
+    options = StringUtils.stringToPropertiesMap(optionsString);
     List<String> okOutputs = Arrays.asList(outputTreeFormats);
-    for (Object formObj : formats.keySet()) {
-      String format = (String) formObj;
+    for (String format : formats.keySet()) {
       if ( ! okOutputs.contains(format)) {
         throw new RuntimeException("Error: output tree format " + format + " not supported. Known formats are: " + okOutputs);
       }
@@ -208,8 +207,8 @@ public TreePrint(String formatString, String optionsString, TreebankLanguagePack
   }
 
 
-  private static boolean propertyToBoolean(Properties prop, String key) {
-    return Boolean.parseBoolean(prop.getProperty(key));
+  private static boolean propertyToBoolean(LinkedHashMap<String, String> prop, String key) {
+    return Boolean.parseBoolean(prop.get(key));
   }
 
   /**

src/edu/stanford/nlp/util/Maps.java

@@ -164,6 +164,26 @@ public static<T,V> Map<T, V> getAll(Map<T, V> map, Collection<T> indices){
     return result;
   }
 
+  /**
+   * Load a boolean property from a Map.  If the key is not present, returns false.
+   */
+  public static boolean getBool(Map<String, String> props, String key) {
+    return getBool(props, key, false);
+  }
+
+  /**
+   * Load a boolean property from a Map.  If the key is not present, returns defaultValue.
+   */
+  public static boolean getBool(Map<String, String> props, String key,
+                                boolean defaultValue) {
+    String value = props.get(key);
+    if (value != null) {
+      return Boolean.parseBoolean(value);
+    } else {
+      return defaultValue;
+    }
+  }
+
   /**
    * Pretty print a Counter. This one has more flexibility in formatting, and
    * doesn't sort the keys.