From 4192222b384d0da733d42bce740bb2f00ff8bd7d Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Mon, 21 Jan 2013 12:10:07 +0100 Subject: [PATCH] Rname StreamOioByteChannel to OioByteStreamChannel --- .../src/main/java/io/netty/channel/rxtx/RxtxChannel.java | 4 ++-- .../{StreamOioByteChannel.java => OioByteStreamChannel.java} | 4 ++-- .../java/io/netty/channel/socket/oio/OioSocketChannel.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename transport/src/main/java/io/netty/channel/socket/oio/{StreamOioByteChannel.java => OioByteStreamChannel.java} (97%) diff --git a/transport-rxtx/src/main/java/io/netty/channel/rxtx/RxtxChannel.java b/transport-rxtx/src/main/java/io/netty/channel/rxtx/RxtxChannel.java index c9e5835773..d39dd43371 100644 --- a/transport-rxtx/src/main/java/io/netty/channel/rxtx/RxtxChannel.java +++ b/transport-rxtx/src/main/java/io/netty/channel/rxtx/RxtxChannel.java @@ -18,7 +18,7 @@ package io.netty.channel.rxtx; import gnu.io.CommPort; import gnu.io.CommPortIdentifier; import gnu.io.SerialPort; -import io.netty.channel.socket.oio.StreamOioByteChannel; +import io.netty.channel.socket.oio.OioByteStreamChannel; import java.net.SocketAddress; @@ -27,7 +27,7 @@ import static io.netty.channel.rxtx.RxtxChannelOption.*; /** * A channel to a serial device using the RXTX library. */ -public class RxtxChannel extends StreamOioByteChannel { +public class RxtxChannel extends OioByteStreamChannel { private static final RxtxDeviceAddress LOCAL_ADDRESS = new RxtxDeviceAddress("localhost"); diff --git a/transport/src/main/java/io/netty/channel/socket/oio/StreamOioByteChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioByteStreamChannel.java similarity index 97% rename from transport/src/main/java/io/netty/channel/socket/oio/StreamOioByteChannel.java rename to transport/src/main/java/io/netty/channel/socket/oio/OioByteStreamChannel.java index 7d7730dc44..2fdc90f5b2 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/StreamOioByteChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioByteStreamChannel.java @@ -30,7 +30,7 @@ import java.nio.channels.WritableByteChannel; /** * Abstract base class for OIO Channels that are based on streams. */ -public abstract class StreamOioByteChannel extends AbstractOioByteChannel { +public abstract class OioByteStreamChannel extends AbstractOioByteChannel { private InputStream is; private OutputStream os; @@ -43,7 +43,7 @@ public abstract class StreamOioByteChannel extends AbstractOioByteChannel { * {@link} has no parent as it was created by your self. * @param id the id which should be used for this instance or {@code null} if a new one should be generated */ - protected StreamOioByteChannel(Channel parent, Integer id) { + protected OioByteStreamChannel(Channel parent, Integer id) { super(parent, id); } diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java index 7afabd975f..662621114c 100755 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java @@ -35,7 +35,7 @@ import java.net.SocketTimeoutException; /** * A {@link SocketChannel} which is using Old-Blocking-IO */ -public class OioSocketChannel extends StreamOioByteChannel +public class OioSocketChannel extends OioByteStreamChannel implements SocketChannel { private static final InternalLogger logger =