From 2d9452c16bd3a12436ce303434ca0cfbcc343244 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Tue, 5 Jun 2001 21:29:51 +0000 Subject: [PATCH] Changed the names of the upstream messages to requests rather than notifications. The client always requests, the server replies or notifies. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@25 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../presents/net/ForwardEventRequest.java | 12 ++++++------ .../threerings/presents/net/LogoffRequest.java | 8 ++++---- .../threerings/presents/net/PingRequest.java | 8 ++++---- .../com/threerings/presents/net/Registry.java | 18 +++++++++--------- .../presents/net/UnsubscribeRequest.java | 12 ++++++------ 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/java/com/threerings/presents/net/ForwardEventRequest.java b/src/java/com/threerings/presents/net/ForwardEventRequest.java index bdde27df3..3b92a42e8 100644 --- a/src/java/com/threerings/presents/net/ForwardEventRequest.java +++ b/src/java/com/threerings/presents/net/ForwardEventRequest.java @@ -1,5 +1,5 @@ // -// $Id: ForwardEventRequest.java,v 1.4 2001/06/02 01:31:43 mdb Exp $ +// $Id: ForwardEventRequest.java,v 1.5 2001/06/05 21:29:51 mdb Exp $ package com.threerings.cocktail.cher.net; @@ -9,23 +9,23 @@ import java.io.DataOutputStream; import com.threerings.cocktail.cher.dobj.DEvent; -public class ForwardEventNotification extends UpstreamMessage +public class ForwardEventRequest extends UpstreamMessage { - /** The code for a forward event notification. */ + /** The code for a forward event request. */ public static final short TYPE = TYPE_BASE + 4; /** * Zero argument constructor used when unserializing an instance. */ - public ForwardEventNotification () + public ForwardEventRequest () { super(); } /** - * Constructs a forward event notification for the supplied event. + * Constructs a forward event request for the supplied event. */ - public ForwardEventNotification (DEvent event) + public ForwardEventRequest (DEvent event) { _event = event; } diff --git a/src/java/com/threerings/presents/net/LogoffRequest.java b/src/java/com/threerings/presents/net/LogoffRequest.java index bca1aa56b..001d4dd10 100644 --- a/src/java/com/threerings/presents/net/LogoffRequest.java +++ b/src/java/com/threerings/presents/net/LogoffRequest.java @@ -1,17 +1,17 @@ // -// $Id: LogoffRequest.java,v 1.2 2001/05/30 23:58:31 mdb Exp $ +// $Id: LogoffRequest.java,v 1.3 2001/06/05 21:29:51 mdb Exp $ package com.threerings.cocktail.cher.net; -public class LogoffNotification extends UpstreamMessage +public class LogoffRequest extends UpstreamMessage { - /** The code for a logoff notification. */ + /** The code for a logoff request. */ public static final short TYPE = TYPE_BASE + 6; /** * Zero argument constructor used when unserializing an instance. */ - public LogoffNotification () + public LogoffRequest () { super(); } diff --git a/src/java/com/threerings/presents/net/PingRequest.java b/src/java/com/threerings/presents/net/PingRequest.java index 8bdd4f095..36b9a9585 100644 --- a/src/java/com/threerings/presents/net/PingRequest.java +++ b/src/java/com/threerings/presents/net/PingRequest.java @@ -1,17 +1,17 @@ // -// $Id: PingRequest.java,v 1.2 2001/05/30 23:58:31 mdb Exp $ +// $Id: PingRequest.java,v 1.3 2001/06/05 21:29:51 mdb Exp $ package com.threerings.cocktail.cher.net; -public class PingNotification extends UpstreamMessage +public class PingRequest extends UpstreamMessage { - /** The code for a ping notification. */ + /** The code for a ping request. */ public static final short TYPE = TYPE_BASE + 5; /** * Zero argument constructor used when unserializing an instance. */ - public PingNotification () + public PingRequest () { super(); } diff --git a/src/java/com/threerings/presents/net/Registry.java b/src/java/com/threerings/presents/net/Registry.java index d82dafa03..96e6e90ea 100644 --- a/src/java/com/threerings/presents/net/Registry.java +++ b/src/java/com/threerings/presents/net/Registry.java @@ -1,5 +1,5 @@ // -// $Id: Registry.java,v 1.2 2001/05/30 23:58:31 mdb Exp $ +// $Id: Registry.java,v 1.3 2001/06/05 21:29:51 mdb Exp $ package com.threerings.cocktail.cher.net; @@ -27,14 +27,14 @@ public class Registry SubscribeRequest.class); TypedObjectFactory.registerClass(FetchRequest.TYPE, FetchRequest.class); - TypedObjectFactory.registerClass(UnsubscribeNotification.TYPE, - UnsubscribeNotification.class); - TypedObjectFactory.registerClass(ForwardEventNotification.TYPE, - ForwardEventNotification.class); - TypedObjectFactory.registerClass(PingNotification.TYPE, - PingNotification.class); - TypedObjectFactory.registerClass(LogoffNotification.TYPE, - LogoffNotification.class); + TypedObjectFactory.registerClass(UnsubscribeRequest.TYPE, + UnsubscribeRequest.class); + TypedObjectFactory.registerClass(ForwardEventRequest.TYPE, + ForwardEventRequest.class); + TypedObjectFactory.registerClass(PingRequest.TYPE, + PingRequest.class); + TypedObjectFactory.registerClass(LogoffRequest.TYPE, + LogoffRequest.class); // register our downstream message classes TypedObjectFactory.registerClass(AuthResponse.TYPE, diff --git a/src/java/com/threerings/presents/net/UnsubscribeRequest.java b/src/java/com/threerings/presents/net/UnsubscribeRequest.java index 63ea04c30..30e2c62c2 100644 --- a/src/java/com/threerings/presents/net/UnsubscribeRequest.java +++ b/src/java/com/threerings/presents/net/UnsubscribeRequest.java @@ -1,5 +1,5 @@ // -// $Id: UnsubscribeRequest.java,v 1.2 2001/05/30 23:58:31 mdb Exp $ +// $Id: UnsubscribeRequest.java,v 1.3 2001/06/05 21:29:51 mdb Exp $ package com.threerings.cocktail.cher.net; @@ -7,24 +7,24 @@ import java.io.IOException; import java.io.DataInputStream; import java.io.DataOutputStream; -public class UnsubscribeNotification extends UpstreamMessage +public class UnsubscribeRequest extends UpstreamMessage { - /** The code for an unsubscribe notification. */ + /** The code for an unsubscribe request. */ public static final short TYPE = TYPE_BASE + 3; /** * Zero argument constructor used when unserializing an instance. */ - public UnsubscribeNotification () + public UnsubscribeRequest () { super(); } /** - * Constructs a unsubscribe notification for the distributed object + * Constructs a unsubscribe request for the distributed object * with the specified object id. */ - public UnsubscribeNotification (int oid) + public UnsubscribeRequest (int oid) { _oid = oid; }