diff --git a/server/netty/src/com/riiablo/nnet/Endpoint.java b/server/netty/src/com/riiablo/nnet/Endpoint.java index 9ff5623c..938e55ba 100644 --- a/server/netty/src/com/riiablo/nnet/Endpoint.java +++ b/server/netty/src/com/riiablo/nnet/Endpoint.java @@ -11,7 +11,5 @@ public interface Endpoint { interface IdResolver { R get(int id); - R put(int id, R ch); - R remove(int id); } } diff --git a/server/netty/src/com/riiablo/server/d2gs/Server.java b/server/netty/src/com/riiablo/server/d2gs/Server.java index 998205bb..6d8d75a7 100644 --- a/server/netty/src/com/riiablo/server/d2gs/Server.java +++ b/server/netty/src/com/riiablo/server/d2gs/Server.java @@ -75,16 +75,6 @@ public class Server implements PacketProcessor { return clients[id].channel; } - @Override - public Channel put(int id, Channel ch) { - throw new UnsupportedOperationException(); - } - - @Override - public Channel remove(int id) { - throw new UnsupportedOperationException(); - } - @Override public String toString() { return ArrayUtils.toString(clients); diff --git a/server/netty/src/com/riiablo/server/d2gs/tcp/ChannelIdResolver.java b/server/netty/src/com/riiablo/server/d2gs/tcp/ChannelIdResolver.java index 6387385a..10639f16 100644 --- a/server/netty/src/com/riiablo/server/d2gs/tcp/ChannelIdResolver.java +++ b/server/netty/src/com/riiablo/server/d2gs/tcp/ChannelIdResolver.java @@ -4,6 +4,11 @@ import io.netty.channel.Channel; import com.riiablo.nnet.Endpoint; +/** + * Not used anymore -- prefer to use anonymous implementations of {@link Endpoint.IdResolver} which + * wrap preexisting data structures. + */ +@Deprecated public class ChannelIdResolver implements Endpoint.IdResolver { private final Channel[] channels; @@ -15,16 +20,4 @@ public class ChannelIdResolver implements Endpoint.IdResolver { public Channel get(int id) { return channels[id]; } - - @Override - public Channel put(int id, Channel ch) { - Channel oldValue = channels[id]; - channels[id] = ch; - return oldValue; - } - - @Override - public Channel remove(int id) { - return put(id, null); - } }