From 3ba24a3dc5d24e256fb00ab4084ae3993bea7eaf Mon Sep 17 00:00:00 2001
From: "Ray J. Greenwell" <ray@threerings.net>
Date: Wed, 12 Dec 2012 13:32:49 -0800
Subject: [PATCH] Bugfix: cope with an empty stopwords list.

---
 .../crowd/chat/client/CurseFilter.java        | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/com/threerings/crowd/chat/client/CurseFilter.java b/core/src/main/java/com/threerings/crowd/chat/client/CurseFilter.java
index 3224e41e7..b399b047c 100644
--- a/core/src/main/java/com/threerings/crowd/chat/client/CurseFilter.java
+++ b/core/src/main/java/com/threerings/crowd/chat/client/CurseFilter.java
@@ -21,10 +21,14 @@
 
 package com.threerings.crowd.chat.client;
 
+import java.util.List;
 import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.google.common.base.Joiner;
+import com.google.common.collect.Lists;
+
 import com.samskivert.util.RandomUtil;
 import com.threerings.util.Name;
 
@@ -43,12 +47,11 @@ public abstract class CurseFilter implements ChatFilter
      */
     public static String comicChars (int length)
     {
-        StringBuilder buf = new StringBuilder();
+        char[] chars = new char[length];
         for (int ii=0; ii < length; ii++) {
-            buf.append(RandomUtil.pickRandom(COMIC_CHARS));
+            chars[ii] = RandomUtil.pickRandom(COMIC_CHARS);
         }
-
-        return buf.toString();
+        return new String(chars);
     }
 
 
@@ -202,20 +205,11 @@ public abstract class CurseFilter implements ChatFilter
      */
     protected void configureStopWords (String stopWords)
     {
-        StringTokenizer st = new StringTokenizer(stopWords);
-
-        String pattern = "";
-        while (st.hasMoreTokens()) {
-            if ("".equals(pattern)) {
-                pattern += "(";
-            } else {
-                pattern += "|";
-            }
-            pattern += getStopWordRegexp(st.nextToken());
+        List<String> patterns = Lists.newArrayList();
+        for (StringTokenizer st = new StringTokenizer(stopWords); st.hasMoreTokens(); ) {
+            patterns.add(getStopWordRegexp(st.nextToken()));
         }
-        pattern += ")";
-
-        setStopPattern(pattern);
+        setStopPattern("(" + Joiner.on('|').join(patterns) + ")");
     }
 
     /**
@@ -250,5 +244,5 @@ public abstract class CurseFilter implements ChatFilter
     protected String[] _vernacular;
 
     /** Comic replacement characters. */
-    protected static final String[] COMIC_CHARS = { "!", "@", "#", "%", "&", "*" };
+    protected static final Character[] COMIC_CHARS = { '!', '@', '#', '%', '&', '*' };
 }