RegexStringList->IgnoreList

Issue 2736

src/com/dmdirc/IgnoreList.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc;
 
-import com.dmdirc.parser.irc.RegexStringList;
+import com.dmdirc.parser.common.IgnoreList;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -33,7 +33,7 @@ import java.util.List;
  *
  * @author chris
  */
-public class IgnoreList extends RegexStringList {
+public class IgnoreList extends IgnoreList {
 
     /**
      * Creates a new instance of IgnoreList.

src/com/dmdirc/Invite.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc;
 
-import com.dmdirc.parser.interfaces.ClientInfo;
 import java.util.Date;
 
 /**

src/com/dmdirc/parser/irc/RegexStringList.java → src/com/dmdirc/parser/common/IgnoreList.java

@@ -20,18 +20,18 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.parser.irc;
+package com.dmdirc.parser.common;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.PatternSyntaxException;
 
 /**
- * IRC Parser Ignore list.
+ * Parser Ignore list.
  *
  * @author Shane Mc Cormack
  */
-public class RegexStringList {
+public class IgnoreList {
 
 	/** Arraylist storing ignore patterns. */
 	protected final List<String> ignoreInfo = new ArrayList<String>();
@@ -39,7 +39,7 @@ public class RegexStringList {
 	/**
 	 * Creates a new instance of RegexStringList.
 	 */
-	public RegexStringList() {
+	public IgnoreList() {
 		// Do nothing
 	}
 
@@ -48,7 +48,7 @@ public class RegexStringList {
 	 *
 	 * @param items Items to add to this RegexStringList
 	 */
-	public RegexStringList(final List<String> items) {
+	public IgnoreList(final List<String> items) {
 		addAll(items);
 	}
 

src/com/dmdirc/parser/interfaces/Parser.java

@@ -23,7 +23,7 @@
 package com.dmdirc.parser.interfaces;
 
 import com.dmdirc.parser.irc.IRCStringConverter;
-import com.dmdirc.parser.irc.RegexStringList;
+import com.dmdirc.parser.common.IgnoreList;
 import com.dmdirc.parser.common.CallbackManager;
 
 import java.util.Collection;
@@ -307,14 +307,14 @@ public interface Parser extends Runnable {
      *
      * @param ignoreList The new ignore list to be used by the parser
      */
-    void setIgnoreList(RegexStringList ignoreList);
+    void setIgnoreList(IgnoreList ignoreList);
 
     /**
      * Retrieves the ignore list which is currently in use by this parser.
      *
      * @return This parser's ignore list
      */
-    RegexStringList getIgnoreList();
+    IgnoreList getIgnoreList();
 
     /**
      * Parses the specified hostmask into an array containing a nickname,

src/com/dmdirc/parser/irc/IRCParser.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.common.IgnoreList;
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.interfaces.SecureParser;
 import com.dmdirc.parser.interfaces.callbacks.ConnectErrorListener;
@@ -215,7 +216,7 @@ public class IRCParser implements SecureParser, Runnable {
 	final Map<String, String> h005Info = new Hashtable<String, String>();
 
 	/** Ignore List. */
-	RegexStringList myIgnoreList = new RegexStringList();
+	IgnoreList myIgnoreList = new IgnoreList();
 
 	/** Reference to the callback Manager. */
 	CallbackManager<IRCParser> myCallbackManager = new IRCCallbackManager(this);
@@ -410,11 +411,11 @@ public class IRCParser implements SecureParser, Runnable {
 
 	/** {@inheritDoc} */
 	@Override
-	public RegexStringList getIgnoreList() { return myIgnoreList; }
+	public IgnoreList getIgnoreList() { return myIgnoreList; }
 
 	/** {@inheritDoc} */
 	@Override
-	public void setIgnoreList(final RegexStringList ignoreList) { myIgnoreList = ignoreList; }
+	public void setIgnoreList(final IgnoreList ignoreList) { myIgnoreList = ignoreList; }
 
 	//---------------------------------------------------------------------------
 	// Start Callbacks

test/com/dmdirc/parser/irc/RegexStringListTest.java

@@ -21,6 +21,7 @@
  */
 package com.dmdirc.parser.irc;
 
+import com.dmdirc.parser.common.IgnoreList;
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Test;
@@ -30,7 +31,7 @@ public class RegexStringListTest {
 
     @Test
     public void testAdd() {
-        final RegexStringList list = new RegexStringList();
+        final IgnoreList list = new IgnoreList();
         list.add("a!b@c");
         list.add("a!b@c");
         list.add("A!B@c");
@@ -47,7 +48,7 @@ public class RegexStringListTest {
         tempList.add("A!B@C");
         tempList.add("Data.*");
 
-        final RegexStringList list = new RegexStringList(tempList);
+        final IgnoreList list = new IgnoreList(tempList);
 
         assertEquals(2, list.count());
         assertEquals("a!b@c", list.get(0));
@@ -60,7 +61,7 @@ public class RegexStringListTest {
         tempList.add("a!b@c");
         tempList.add("Data.*");
 
-        final RegexStringList list = new RegexStringList(tempList);
+        final IgnoreList list = new IgnoreList(tempList);
         list.remove(0);
         list.remove(17);
 
@@ -74,7 +75,7 @@ public class RegexStringListTest {
         tempList.add("a!b@c");
         tempList.add("Data.*");
 
-        final RegexStringList list = new RegexStringList(tempList);
+        final IgnoreList list = new IgnoreList(tempList);
         list.clear();
 
         assertEquals(0, list.count());
@@ -86,7 +87,7 @@ public class RegexStringListTest {
         tempList.add("a!b@c");
         tempList.add("Data.*");
 
-        final RegexStringList list = new RegexStringList(tempList);
+        final IgnoreList list = new IgnoreList(tempList);
 
         assertTrue(list.matches("a!b@c") == 0);
         assertTrue(list.matches("foo") == -1);
@@ -97,7 +98,7 @@ public class RegexStringListTest {
     
     @Test
     public void testGet() {
-        final RegexStringList list = new RegexStringList();
+        final IgnoreList list = new IgnoreList();
         list.add("a!b@c");
         assertEquals("a!b@c", list.get(0));
         assertEquals("", list.get(7));
@@ -105,7 +106,7 @@ public class RegexStringListTest {
 
     @Test
     public void testSet() {
-        final RegexStringList list = new RegexStringList();
+        final IgnoreList list = new IgnoreList();
         list.add("a!b@c");
         list.set(0, "moo");
         list.set(1, "bar");