colon as file separator replaced by semicolon

src/main/java/edu/ucla/sspace/mains/OptionDescriptions.java

@@ -70,12 +70,12 @@ private OptionDescriptions() { }
         "included or\n" +
         "excluded.  The behavior, \"include\" or \"exclude\" is specified\n" +
         "first, followed by one or more file names, each separated by " +
-        "colons.\n" +
+        "semicolons.\n" +
         "Multiple behaviors may be specified one after the other using a ','\n"+
         "character to separate them.  For example, a typical configuration " +
         "may\n" +
         "look like: " +
-        "include=top-tokens.txt:test-words.txt,exclude=stop-words.txt\n" +
+        "include=top-tokens.txt;test-words.txt,exclude=stop-words.txt\n" +
         "Note that behaviors are applied in the order they are presented on the " +
         "command-line.";
 

src/main/java/edu/ucla/sspace/text/TokenFilter.java

@@ -60,7 +60,7 @@
  * chain of filters from a text configuration.  This is intended to facility
  * command-line tools that want to provide easily configurable filters.  An
  * example configuration might look like:
- * <tt>include=top-tokens.txt:test-words.txt,exclude=stop-words.txt</tt>
+ * <tt>include=top-tokens.txt;test-words.txt,exclude=stop-words.txt</tt>
  *
  * @see FilteredIterator
  */
@@ -160,10 +160,10 @@ public TokenFilter combine(TokenFilter parent) {
      * 
      * A configuration lists sets of files that contain tokens to be included or
      * excluded.  The behavior, {@code include} or {@code exclude} is specified
-     * first, followed by one or more file names, each separated by colons.
+     * first, followed by one or more file names, each separated by semicolons.
      * Multiple behaviors may be specified one after the other using a {@code ,}
      * character to separate them.  For example, a typicaly configuration may
-     * look like: "include=top-tokens.txt,test-words.txt:exclude=stop-words.txt"
+     * look like: "include=top-tokens.txt;test-words.txt,exclude=stop-words.txt"
      * <b>Note</b> behaviors are applied in the order they are presented on the
      * command-line.
      *
@@ -186,10 +186,10 @@ public static TokenFilter loadFromSpecification(String configuration) {
      * 
      * A configuration lists sets of files that contain tokens to be included or
      * excluded.  The behavior, {@code include} or {@code exclude} is specified
-     * first, followed by one or more file names, each separated by colons.
+     * first, followed by one or more file names, each separated by semicolons.
      * Multiple behaviors may be specified one after the other using a {@code ,}
      * character to separate them.  For example, a typicaly configuration may
-     * look like: "include=top-tokens.txt,test-words.txt:exclude=stop-words.txt"
+     * look like: "include=top-tokens.txt;test-words.txt,exclude=stop-words.txt"
      * <b>Note</b> behaviors are applied in the order they are presented on the
      * command-line.
      *
@@ -207,7 +207,7 @@ public static TokenFilter loadFromSpecification(String configuration,
 
 	TokenFilter toReturn = null;
 
-	// multiple filter are separated by a ':'
+	// multiple filter are separated by a ';'
 	String[] filters = configuration.split(",");
 
 	for (String s : filters) {
@@ -223,7 +223,7 @@ public static TokenFilter loadFromSpecification(String configuration,
                 throw new IllegalArgumentException(
                     "Invalid filter behavior: " + behavior);
 
-            String[] files = optionAndFiles[1].split(":");
+            String[] files = optionAndFiles[1].split(";");
 
 	    // Load the words in the file(s)
 	    Set<String> words = new HashSet<String>();

src/test/java/edu/ucla/sspace/text/TokenFilterTests.java

@@ -57,7 +57,7 @@ public class TokenFilterTests {
     @Test public void testMultipleInclude() throws IOException {
         File toInclude = createFileWithText("include\nthree\nwords");
         File toInclude2 = createFileWithText("foo\nbar\nbaz");
-        String filterSpec = "include=" + toInclude.getAbsolutePath() + ":"
+        String filterSpec = "include=" + toInclude.getAbsolutePath() + ";"
             + toInclude2.getAbsolutePath();
         TokenFilter filter = TokenFilter.loadFromSpecification(filterSpec);
         assertTrue(filter.accept("include"));