Move VariableStrings to util (this may wreck serialized tregex results, if such a thing exists)

Author: AngledLuffa

src/edu/stanford/nlp/semgraph/semgrex/CoordinationPattern.java

@@ -6,7 +6,7 @@
 import edu.stanford.nlp.ling.IndexedWord;
 import edu.stanford.nlp.semgraph.SemanticGraph;
 import edu.stanford.nlp.semgraph.SemanticGraphEdge;
-import edu.stanford.nlp.trees.tregex.VariableStrings;
+import edu.stanford.nlp.util.VariableStrings;
 
 /** @author Chloe Kiddon */
 public class CoordinationPattern extends SemgrexPattern  {

src/edu/stanford/nlp/semgraph/semgrex/NodePattern.java

@@ -12,10 +12,10 @@
 import edu.stanford.nlp.ling.IndexedWord;
 import edu.stanford.nlp.semgraph.SemanticGraph;
 import edu.stanford.nlp.semgraph.SemanticGraphEdge;
-import edu.stanford.nlp.trees.tregex.VariableStrings;
 import edu.stanford.nlp.util.Pair;
 import edu.stanford.nlp.util.Quadruple;
 import edu.stanford.nlp.util.Triple;
+import edu.stanford.nlp.util.VariableStrings;
 import edu.stanford.nlp.util.logging.Redwood;
 
 public class NodePattern extends SemgrexPattern  {

src/edu/stanford/nlp/semgraph/semgrex/SemgrexMatcher.java

@@ -3,8 +3,8 @@
 import edu.stanford.nlp.graph.CyclicGraphException;
 import edu.stanford.nlp.semgraph.SemanticGraph;
 import edu.stanford.nlp.semgraph.SemanticGraphEdge;
-import edu.stanford.nlp.trees.tregex.VariableStrings;
 import edu.stanford.nlp.ling.*;
+import edu.stanford.nlp.util.VariableStrings;
 import edu.stanford.nlp.util.logging.Redwood;
 
 import java.util.*;

src/edu/stanford/nlp/semgraph/semgrex/SemgrexPattern.java

@@ -16,13 +16,13 @@
 import edu.stanford.nlp.trees.MemoryTreebank;
 import edu.stanford.nlp.trees.Tree;
 import edu.stanford.nlp.trees.TreeNormalizer;
-import edu.stanford.nlp.trees.tregex.VariableStrings;
 import edu.stanford.nlp.trees.ud.CoNLLUDocumentWriter;
 import edu.stanford.nlp.util.ArrayCoreMap;
 import edu.stanford.nlp.util.CoreMap;
 import edu.stanford.nlp.util.Generics;
 import edu.stanford.nlp.util.Pair;
 import edu.stanford.nlp.util.StringUtils;
+import edu.stanford.nlp.util.VariableStrings;
 import edu.stanford.nlp.util.logging.Redwood;
 
 /**

src/edu/stanford/nlp/trees/tregex/CoordinationPattern.java

@@ -2,6 +2,7 @@
 
 import edu.stanford.nlp.trees.HeadFinder;
 import edu.stanford.nlp.trees.Tree;
+import edu.stanford.nlp.util.VariableStrings;
 
 import java.util.Iterator;
 import java.util.List;

src/edu/stanford/nlp/trees/tregex/DescriptionPattern.java

@@ -6,6 +6,7 @@
 import edu.stanford.nlp.trees.Tree;
 import edu.stanford.nlp.util.ArrayStringFilter;
 import edu.stanford.nlp.util.Pair;
+import edu.stanford.nlp.util.VariableStrings;
 import java.util.function.Predicate;
 
 import java.util.*;

src/edu/stanford/nlp/trees/tregex/TregexMatcher.java

@@ -33,6 +33,7 @@
 import edu.stanford.nlp.trees.HasParent;
 import edu.stanford.nlp.trees.HeadFinder;
 import edu.stanford.nlp.trees.Tree;
+import edu.stanford.nlp.util.VariableStrings;
 
 /**
  * A TregexMatcher can be used to match a {@link TregexPattern} against a {@link edu.stanford.nlp.trees.Tree}.

src/edu/stanford/nlp/trees/tregex/TregexPattern.java

@@ -42,6 +42,7 @@
 import edu.stanford.nlp.util.Pair;
 import edu.stanford.nlp.util.StringUtils;
 import edu.stanford.nlp.util.Timing;
+import edu.stanford.nlp.util.VariableStrings;
 import edu.stanford.nlp.util.logging.Redwood;
 
 

src/edu/stanford/nlp/trees/tregex/VariableStrings.java renamed to src/edu/stanford/nlp/util/VariableStrings.java

@@ -1,4 +1,4 @@
-package edu.stanford.nlp.trees.tregex;
+package edu.stanford.nlp.util;
 
 import edu.stanford.nlp.stats.IntCounter;
 import edu.stanford.nlp.util.ArrayMap;
@@ -8,9 +8,6 @@
 import java.util.Map;
 
 /** A class that takes care of the stuff necessary for variable strings.
- *
- *<br>
- * TODO: move this to util?
  *
  *  @author Roger Levy ([email protected])
  */