From c38b709b6af20abce5b31e899c0e793f5d3db235 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Mon, 20 Apr 2009 17:56:44 +0000
Subject: [PATCH] Use handy new addDispatcher().

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@814 c613c5cb-e716-0410-b11b-feb51c14d237
---
 .../trick/server/TrickCardGameManagerDelegate.java    | 11 +----------
 .../com/threerings/puzzle/server/PuzzleManager.java   |  5 +----
 .../threerings/stage/server/StageSceneManager.java    |  9 +--------
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java
index 4f4fe2a2..30dbab2a 100644
--- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java
+++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java
@@ -104,16 +104,7 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate
         _deck = new Deck();
         _trickCardGame = (TrickCardGameObject)plobj;
         _cardGame = (CardGameObject)plobj;
-        _trickCardGame.setTrickCardGameService(
-            _invmgr.registerDispatcher(new TrickCardGameDispatcher(this)));
-    }
-
-    @Override
-    public void didShutdown ()
-    {
-        super.didShutdown();
-
-        _invmgr.clearDispatcher(_trickCardGame.getTrickCardGameService());
+        _trickCardGame.setTrickCardGameService(addDispatcher(new TrickCardGameDispatcher(this)));
     }
 
     @Override
diff --git a/src/java/com/threerings/puzzle/server/PuzzleManager.java b/src/java/com/threerings/puzzle/server/PuzzleManager.java
index cd136b0d..8fa60b21 100644
--- a/src/java/com/threerings/puzzle/server/PuzzleManager.java
+++ b/src/java/com/threerings/puzzle/server/PuzzleManager.java
@@ -157,7 +157,7 @@ public abstract class PuzzleManager extends GameManager
         _puzobj = (PuzzleObject)_gameobj;
 
         // create and fill in our game service object
-        _puzobj.setPuzzleGameService(_invmgr.registerDispatcher(new PuzzleGameDispatcher(this)));
+        _puzobj.setPuzzleGameService(addDispatcher(new PuzzleGameDispatcher(this)));
     }
 
     @Override
@@ -350,9 +350,6 @@ public abstract class PuzzleManager extends GameManager
             _statusInterval.cancel();
             _statusInterval = null;
         }
-
-        // clear out our service registration
-        _invmgr.clearDispatcher(_puzobj.puzzleGameService);
     }
 
     /**
diff --git a/src/java/com/threerings/stage/server/StageSceneManager.java b/src/java/com/threerings/stage/server/StageSceneManager.java
index 794a1e81..d5dbabcb 100644
--- a/src/java/com/threerings/stage/server/StageSceneManager.java
+++ b/src/java/com/threerings/stage/server/StageSceneManager.java
@@ -254,14 +254,7 @@ public class StageSceneManager extends SpotSceneManager
         _ssobj = (StageSceneObject)_plobj;
 
         // register and fill in our stage scene service
-        _ssobj.setStageSceneService(_invmgr.registerDispatcher(new StageSceneDispatcher(this)));
-    }
-
-    @Override // documentation inherited
-    protected void didShutdown ()
-    {
-        super.didShutdown();
-        _invmgr.clearDispatcher(_ssobj.stageSceneService);
+        _ssobj.setStageSceneService(addDispatcher(new StageSceneDispatcher(this)));
     }
 
     @Override // documentation inherited