From 57b2e93ac31a3544950082a1e5c7c8664d383750 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 24 Oct 2001 00:36:40 +0000 Subject: [PATCH] Modified DObjectManager.createObject() to not afford optional subscription because subscription no longer means receiving events. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@537 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../presents/client/ClientDObjectMgr.java | 5 ++--- .../presents/dobj/DObjectManager.java | 8 ++------ .../presents/server/InvocationManager.java | 4 ++-- .../presents/server/PresentsClient.java | 4 ++-- .../presents/server/PresentsDObjectMgr.java | 17 +++++------------ .../com/threerings/presents/server/DOMTest.java | 6 +++--- .../presents/server/DestroyedRefTest.java | 6 +++--- .../com/threerings/presents/server/RefTest.java | 6 +++--- .../threerings/presents/server/TestServer.java | 4 ++-- 9 files changed, 24 insertions(+), 36 deletions(-) diff --git a/src/java/com/threerings/presents/client/ClientDObjectMgr.java b/src/java/com/threerings/presents/client/ClientDObjectMgr.java index d7a5a6a52..71c365568 100644 --- a/src/java/com/threerings/presents/client/ClientDObjectMgr.java +++ b/src/java/com/threerings/presents/client/ClientDObjectMgr.java @@ -1,5 +1,5 @@ // -// $Id: ClientDObjectMgr.java,v 1.9 2001/10/16 16:41:14 mdb Exp $ +// $Id: ClientDObjectMgr.java,v 1.10 2001/10/24 00:36:40 mdb Exp $ package com.threerings.presents.client; @@ -36,8 +36,7 @@ public class ClientDObjectMgr } // inherit documentation from the interface - public void createObject (Class dclass, Subscriber target, - boolean subscribe) + public void createObject (Class dclass, Subscriber target) { // not presently supported throw new RuntimeException("createObject() not supported"); diff --git a/src/java/com/threerings/presents/dobj/DObjectManager.java b/src/java/com/threerings/presents/dobj/DObjectManager.java index 51ab3f3fa..c82daeaa7 100644 --- a/src/java/com/threerings/presents/dobj/DObjectManager.java +++ b/src/java/com/threerings/presents/dobj/DObjectManager.java @@ -1,5 +1,5 @@ // -// $Id: DObjectManager.java,v 1.9 2001/10/11 04:07:52 mdb Exp $ +// $Id: DObjectManager.java,v 1.10 2001/10/24 00:36:40 mdb Exp $ package com.threerings.presents.dobj; @@ -27,12 +27,8 @@ public interface DObjectManager * @param target The subscriber to be notified when the object is * created and available, or if there was a problem creating the * object. - * @param subscribe If true, the subscriber will be subscribed to the - * object after creation; if false, it will merely be notified of it's - * availability but not added as a subscriber. */ - public void createObject (Class dclass, Subscriber target, - boolean subscribe); + public void createObject (Class dclass, Subscriber target); /** * Requests that the specified subscriber be subscribed to the object diff --git a/src/java/com/threerings/presents/server/InvocationManager.java b/src/java/com/threerings/presents/server/InvocationManager.java index 905d825d6..91d634cd8 100644 --- a/src/java/com/threerings/presents/server/InvocationManager.java +++ b/src/java/com/threerings/presents/server/InvocationManager.java @@ -1,5 +1,5 @@ // -// $Id: InvocationManager.java,v 1.9 2001/10/12 00:03:03 mdb Exp $ +// $Id: InvocationManager.java,v 1.10 2001/10/24 00:36:40 mdb Exp $ package com.threerings.presents.server; @@ -39,7 +39,7 @@ public class InvocationManager _omgr = omgr; // create the object on which we'll listen for invocation requests - omgr.createObject(DObject.class, this, true); + omgr.createObject(DObject.class, this); } public int getOid () diff --git a/src/java/com/threerings/presents/server/PresentsClient.java b/src/java/com/threerings/presents/server/PresentsClient.java index 1a4d1f531..11928c0b3 100644 --- a/src/java/com/threerings/presents/server/PresentsClient.java +++ b/src/java/com/threerings/presents/server/PresentsClient.java @@ -1,5 +1,5 @@ // -// $Id: PresentsClient.java,v 1.23 2001/10/18 18:41:29 mdb Exp $ +// $Id: PresentsClient.java,v 1.24 2001/10/24 00:36:40 mdb Exp $ package com.threerings.presents.server; @@ -78,7 +78,7 @@ public class PresentsClient } }; Class clobjClass = _cmgr.getClientObjectClass(); - PresentsServer.omgr.createObject(clobjClass, sub, false); + PresentsServer.omgr.createObject(clobjClass, sub); } /** diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java index 6d18e33a0..373493403 100644 --- a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java +++ b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java @@ -1,5 +1,5 @@ // -// $Id: PresentsDObjectMgr.java,v 1.18 2001/10/12 00:03:03 mdb Exp $ +// $Id: PresentsDObjectMgr.java,v 1.19 2001/10/24 00:36:40 mdb Exp $ package com.threerings.presents.server; @@ -41,11 +41,10 @@ public class PresentsDObjectMgr implements DObjectManager } // inherit documentation from the interface - public void createObject (Class dclass, Subscriber target, - boolean subscribe) + public void createObject (Class dclass, Subscriber target) { // queue up a create object event - postEvent(new CreateObjectEvent(dclass, target, subscribe)); + postEvent(new CreateObjectEvent(dclass, target)); } // inherit documentation from the interface @@ -453,13 +452,11 @@ public class PresentsDObjectMgr implements DObjectManager */ protected class CreateObjectEvent extends DEvent { - public CreateObjectEvent (Class clazz, Subscriber target, - boolean subscribe) + public CreateObjectEvent (Class clazz, Subscriber target) { super(0); // target the fake object _class = clazz; _target = target; - _subscribe = subscribe; } public boolean applyToObject (DObject target) @@ -482,10 +479,7 @@ public class PresentsDObjectMgr implements DObjectManager if (_target != null) { // add the subscriber to this object's subscriber list - // if they requested it - if (_subscribe) { - obj.addSubscriber(_target); - } + obj.addSubscriber(_target); // let the target subscriber know that their object is // available @@ -513,7 +507,6 @@ public class PresentsDObjectMgr implements DObjectManager protected Class _class; protected Subscriber _target; - protected boolean _subscribe; } /** diff --git a/tests/src/java/com/threerings/presents/server/DOMTest.java b/tests/src/java/com/threerings/presents/server/DOMTest.java index 3b595ecd7..bc70e204a 100644 --- a/tests/src/java/com/threerings/presents/server/DOMTest.java +++ b/tests/src/java/com/threerings/presents/server/DOMTest.java @@ -1,5 +1,5 @@ // -// $Id: DOMTest.java,v 1.3 2001/10/12 00:03:03 mdb Exp $ +// $Id: DOMTest.java,v 1.4 2001/10/24 00:36:40 mdb Exp $ package com.threerings.presents.server.test; @@ -48,10 +48,10 @@ public class DOMTest implements Subscriber, AttributeChangeListener DOMTest sub = new DOMTest(); // request that a new TestObject be created - omgr.createObject(TestObject.class, sub, true); + omgr.createObject(TestObject.class, sub); // or for fun you can try this bogus create request - // omgr.createObject(Integer.class, sub, true); + // omgr.createObject(Integer.class, sub); // and run the object manager omgr.run(); diff --git a/tests/src/java/com/threerings/presents/server/DestroyedRefTest.java b/tests/src/java/com/threerings/presents/server/DestroyedRefTest.java index d4bc429f2..ac247a6f1 100644 --- a/tests/src/java/com/threerings/presents/server/DestroyedRefTest.java +++ b/tests/src/java/com/threerings/presents/server/DestroyedRefTest.java @@ -1,5 +1,5 @@ // -// $Id: DestroyedRefTest.java,v 1.3 2001/10/12 00:03:03 mdb Exp $ +// $Id: DestroyedRefTest.java,v 1.4 2001/10/24 00:36:40 mdb Exp $ package com.threerings.presents.server.test; @@ -17,8 +17,8 @@ public class DestroyedRefTest public void run () { // create two test objects - PresentsServer.omgr.createObject(TestObject.class, this, true); - PresentsServer.omgr.createObject(TestObject.class, this, true); + PresentsServer.omgr.createObject(TestObject.class, this); + PresentsServer.omgr.createObject(TestObject.class, this); } public void objectAvailable (DObject object) diff --git a/tests/src/java/com/threerings/presents/server/RefTest.java b/tests/src/java/com/threerings/presents/server/RefTest.java index 08ac44bd7..711410f96 100644 --- a/tests/src/java/com/threerings/presents/server/RefTest.java +++ b/tests/src/java/com/threerings/presents/server/RefTest.java @@ -1,5 +1,5 @@ // -// $Id: RefTest.java,v 1.3 2001/10/12 00:03:03 mdb Exp $ +// $Id: RefTest.java,v 1.4 2001/10/24 00:36:40 mdb Exp $ package com.threerings.presents.server.test; @@ -16,8 +16,8 @@ public class RefTest public void run () { // create two test objects - PresentsServer.omgr.createObject(TestObject.class, this, true); - PresentsServer.omgr.createObject(TestObject.class, this, true); + PresentsServer.omgr.createObject(TestObject.class, this); + PresentsServer.omgr.createObject(TestObject.class, this); } public void objectAvailable (DObject object) diff --git a/tests/src/java/com/threerings/presents/server/TestServer.java b/tests/src/java/com/threerings/presents/server/TestServer.java index 26017a83b..4d88feaea 100644 --- a/tests/src/java/com/threerings/presents/server/TestServer.java +++ b/tests/src/java/com/threerings/presents/server/TestServer.java @@ -1,5 +1,5 @@ // -// $Id: TestServer.java,v 1.5 2001/10/12 00:03:03 mdb Exp $ +// $Id: TestServer.java,v 1.6 2001/10/24 00:36:40 mdb Exp $ package com.threerings.presents.server.test; @@ -39,7 +39,7 @@ public class TestServer extends PresentsServer "[error=" + cause + "]."); } }; - omgr.createObject(TestObject.class, sub, false); + omgr.createObject(TestObject.class, sub); } public static void main (String[] args)