From 8ba97d2f704ed1ee168496f918e44d3f14c47a0e Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sat, 9 Aug 2008 23:04:35 +0000 Subject: [PATCH] Switch NodeAction to use the Presents streaming system instead of Serializable. I wanted to avoid having to declare a bazillion no argument constructors, but it's too annoying to have to make all the Presents streamable classes that one naturally wants to send between servers also Serializable. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5301 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/presents/peer/server/PeerManager.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/java/com/threerings/presents/peer/server/PeerManager.java b/src/java/com/threerings/presents/peer/server/PeerManager.java index 47d759b56..94d251ada 100644 --- a/src/java/com/threerings/presents/peer/server/PeerManager.java +++ b/src/java/com/threerings/presents/peer/server/PeerManager.java @@ -23,9 +23,6 @@ package com.threerings.presents.peer.server; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; import java.util.List; import java.util.Map; @@ -45,6 +42,8 @@ import com.samskivert.util.ResultListener; import com.samskivert.util.ResultListenerList; import com.samskivert.util.Tuple; +import com.threerings.io.ObjectInputStream; +import com.threerings.io.ObjectOutputStream; import com.threerings.io.Streamable; import com.threerings.util.Name; @@ -151,7 +150,7 @@ public abstract class PeerManager * anonymously because that will maintain an implicit non-transient reference to its containing * class which will then also be serialized (assuming it is even serializable). */ - public static abstract class NodeAction implements Serializable + public static abstract class NodeAction implements Streamable { /** Returns true if this action should be executed on the specified node. This will be * called on the originating server to decide whether or not to deliver the action to the