From c5a098119f3e790675eddee88ded634f321f07c4 Mon Sep 17 00:00:00 2001
From: Charlie Groves <charlie@threerings.net>
Date: Tue, 5 Apr 2011 21:01:02 +0000
Subject: [PATCH] Use the convenience creation methods on ObserverList

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6604 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../as/com/threerings/presents/client/BasicDirector.as   | 2 +-
 .../com/threerings/crowd/chat/client/ChatDirector.java   | 9 +++------
 .../com/threerings/crowd/chat/client/MuteDirector.java   | 3 +--
 .../com/threerings/crowd/client/LocationDirector.java    | 3 +--
 .../com/threerings/presents/peer/server/PeerManager.java | 2 +-
 .../com/threerings/presents/server/ClientManager.java    | 8 ++++----
 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/main/as/com/threerings/presents/client/BasicDirector.as b/src/main/as/com/threerings/presents/client/BasicDirector.as
index 9c17d5b82..422c4eb00 100644
--- a/src/main/as/com/threerings/presents/client/BasicDirector.as
+++ b/src/main/as/com/threerings/presents/client/BasicDirector.as
@@ -44,7 +44,7 @@ public class BasicDirector extends EventDispatcher
     {
         // save context
         _ctx = ctx;
-        
+
         // listen for session start and end
         var client :Client = ctx.getClient();
         client.addClientObserver(this);
diff --git a/src/main/java/com/threerings/crowd/chat/client/ChatDirector.java b/src/main/java/com/threerings/crowd/chat/client/ChatDirector.java
index e39b01f4b..e75dbab89 100644
--- a/src/main/java/com/threerings/crowd/chat/client/ChatDirector.java
+++ b/src/main/java/com/threerings/crowd/chat/client/ChatDirector.java
@@ -1463,12 +1463,10 @@ public class ChatDirector extends BasicDirector
     protected boolean _mogrifyChat= true;
 
     /** A list of registered chat displays. */
-    protected ObserverList<ChatDisplay> _displays =
-        new ObserverList<ChatDisplay>(ObserverList.SAFE_IN_ORDER_NOTIFY);
+    protected ObserverList<ChatDisplay> _displays = ObserverList.newSafeInOrder();
 
     /** A list of registered chat filters. */
-    protected ObserverList<ChatFilter> _filters =
-        new ObserverList<ChatFilter>(ObserverList.SAFE_IN_ORDER_NOTIFY);
+    protected ObserverList<ChatFilter> _filters = ObserverList.newSafeInOrder();
 
     /** A mapping from auxiliary chat objects to the types under which
      * they are registered. */
@@ -1481,8 +1479,7 @@ public class ChatDirector extends BasicDirector
     protected LinkedList<Name> _chatters = new LinkedList<Name>();
 
     /** Observers that are watching our chatters list. */
-    protected ObserverList<ChatterObserver> _chatterObservers =
-        new ObserverList<ChatterObserver>(ObserverList.SAFE_IN_ORDER_NOTIFY);
+    protected ObserverList<ChatterObserver> _chatterObservers = ObserverList.newSafeInOrder();
 
     /** Operation used to filter chat messages. */
     protected FilterMessageOp _filterMessageOp = new FilterMessageOp();
diff --git a/src/main/java/com/threerings/crowd/chat/client/MuteDirector.java b/src/main/java/com/threerings/crowd/chat/client/MuteDirector.java
index 6d90a2689..a286efb30 100644
--- a/src/main/java/com/threerings/crowd/chat/client/MuteDirector.java
+++ b/src/main/java/com/threerings/crowd/chat/client/MuteDirector.java
@@ -189,6 +189,5 @@ public class MuteDirector extends BasicDirector
     protected HashSet<Name> _mutelist = Sets.newHashSet();
 
     /** List of mutelist observers. */
-    protected ObserverList<MuteObserver> _observers =
-        new ObserverList<MuteObserver>(ObserverList.FAST_UNSAFE_NOTIFY);
+    protected ObserverList<MuteObserver> _observers = ObserverList.newFastUnsafe();
 }
diff --git a/src/main/java/com/threerings/crowd/client/LocationDirector.java b/src/main/java/com/threerings/crowd/client/LocationDirector.java
index 5636a2a18..31ace5bd2 100644
--- a/src/main/java/com/threerings/crowd/client/LocationDirector.java
+++ b/src/main/java/com/threerings/crowd/client/LocationDirector.java
@@ -580,8 +580,7 @@ public class LocationDirector extends BasicDirector
     protected LocationService _lservice;
 
     /** Our location observer list. */
-    protected ObserverList<LocationObserver> _observers = new ObserverList<LocationObserver>(
-        ObserverList.SAFE_IN_ORDER_NOTIFY);
+    protected ObserverList<LocationObserver> _observers = ObserverList.newSafeInOrder();
 
     /** Used to subscribe to our place object. */
     protected SafeSubscriber<PlaceObject> _subber;
diff --git a/src/main/java/com/threerings/presents/peer/server/PeerManager.java b/src/main/java/com/threerings/presents/peer/server/PeerManager.java
index a1fa1c87b..fc6ca7d8d 100644
--- a/src/main/java/com/threerings/presents/peer/server/PeerManager.java
+++ b/src/main/java/com/threerings/presents/peer/server/PeerManager.java
@@ -875,7 +875,7 @@ public abstract class PeerManager
     {
         ObserverList<StaleCacheObserver> list = _cacheobs.get(cache);
         if (list == null) {
-            list = new ObserverList<StaleCacheObserver>(ObserverList.FAST_UNSAFE_NOTIFY);
+            list = ObserverList.newFastUnsafe();
             _cacheobs.put(cache, list);
         }
         list.add(observer);
diff --git a/src/main/java/com/threerings/presents/server/ClientManager.java b/src/main/java/com/threerings/presents/server/ClientManager.java
index eaacc43ba..c45142afb 100644
--- a/src/main/java/com/threerings/presents/server/ClientManager.java
+++ b/src/main/java/com/threerings/presents/server/ClientManager.java
@@ -231,7 +231,7 @@ public class ClientManager
     {
         _clobservers.remove(observer);
         if (observer instanceof DetailedClientObserver) {
-            _dclobservers.remove(observer);
+            _dclobservers.remove((DetailedClientObserver)observer);
         }
     }
 
@@ -265,15 +265,15 @@ public class ClientManager
             public void clientResolved (Name username, ClientObject clobj) {
                 try {
                     clop.apply(clobj);
-    
+
                 } catch (Exception e) {
                     log.warning("Client op failed", "username", username, "clop", clop, e);
-    
+
                 } finally {
                     releaseClientObject(username);
                 }
             }
-    
+
             public void resolutionFailed (Name username, Exception reason) {
                 clop.resolutionFailed(reason);
             }