Fix stupid listener list issues

Change-Id: I9cf9e071a8e1c134026b50e78de569def85eda56
Reviewed-on: http://gerrit.dmdirc.com/1136
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>

src/com/dmdirc/util/EqualComparator.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.util;
-
-import java.util.Comparator;
-
-/**
- * A comparator that says any two objects are equal.
- *
- * @since 0.6.4
- */
-public class EqualComparator implements Comparator<Object> {
-
-    /** {@inheritDoc} */
-    @Override
-    public int compare(final Object o1, final Object o2) {
-        return 0;
-    }
-}

src/com/dmdirc/util/ListenerList.java

@@ -25,7 +25,7 @@ package com.dmdirc.util;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * Represents a list of event listeners, similar to EventListenerList, but
@@ -34,9 +34,6 @@ import java.util.concurrent.ConcurrentSkipListSet;
  * @author chris
  */
 public class ListenerList {
-
-    /** The comparator to use. */
-    protected static EqualComparator COMPARATOR = new EqualComparator();
     
     /** The map of class->listener or string->listener that we're using. */
     private final Map<Object, Collection<Object>> listeners
@@ -57,7 +54,7 @@ public class ListenerList {
      */
     public <T> void add(final Class<T> listenerType, final T listener) {
         if (!listeners.containsKey(listenerType)) {
-            listeners.put(listenerType, new ConcurrentSkipListSet<Object>(COMPARATOR));
+            listeners.put(listenerType, new CopyOnWriteArrayList<Object>());
         }
 
         listeners.get(listenerType).add(listener);
@@ -71,7 +68,7 @@ public class ListenerList {
      */
     public void add(final String listenerType, final Object listener) {
         if (!listeners.containsKey(listenerType)) {
-            listeners.put(listenerType, new ConcurrentSkipListSet<Object>(COMPARATOR));
+            listeners.put(listenerType, new CopyOnWriteArrayList<Object>());
         }
 
         listeners.get(listenerType).add(listener);
@@ -111,7 +108,7 @@ public class ListenerList {
         if (listeners.containsKey(listenerType)) {
             return (Collection<T>) listeners.get(listenerType);
         } else {
-            return new ConcurrentSkipListSet<T>(COMPARATOR);
+            return new CopyOnWriteArrayList<T>();
         }
     }
     
@@ -125,7 +122,7 @@ public class ListenerList {
         if (listeners.containsKey(listenerType)) {
             return listeners.get(listenerType);
         } else {
-            return new ConcurrentSkipListSet<Object>(COMPARATOR);
+            return new CopyOnWriteArrayList<Object>();
         }
     }