From 958ffa50e363580b3e33b02fe100170674f3aef2 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Fri, 13 Jan 2012 18:04:06 +0900 Subject: [PATCH] Make ChannelUp/DownstreamEventRunnable non-final / Move the classes in execution.filter to execution --- .../java/io/netty/handler/execution/ChainedExecutor.java | 1 - .../handler/execution/ChannelDownstreamEventRunnable.java | 2 +- .../{filter => }/ChannelDownstreamEventRunnableFilter.java | 5 +---- .../execution/{filter => }/ChannelEventRunnableFilter.java | 2 +- .../handler/execution/ChannelUpstreamEventRunnable.java | 2 +- .../{filter => }/ChannelUpstreamEventRunnableFilter.java | 5 +---- 6 files changed, 5 insertions(+), 12 deletions(-) rename handler/src/main/java/io/netty/handler/execution/{filter => }/ChannelDownstreamEventRunnableFilter.java (83%) rename handler/src/main/java/io/netty/handler/execution/{filter => }/ChannelEventRunnableFilter.java (93%) rename handler/src/main/java/io/netty/handler/execution/{filter => }/ChannelUpstreamEventRunnableFilter.java (83%) diff --git a/handler/src/main/java/io/netty/handler/execution/ChainedExecutor.java b/handler/src/main/java/io/netty/handler/execution/ChainedExecutor.java index 8fd95c958d..525fe9899a 100644 --- a/handler/src/main/java/io/netty/handler/execution/ChainedExecutor.java +++ b/handler/src/main/java/io/netty/handler/execution/ChainedExecutor.java @@ -16,7 +16,6 @@ package io.netty.handler.execution; -import io.netty.handler.execution.filter.ChannelEventRunnableFilter; import io.netty.util.ExternalResourceReleasable; import io.netty.util.internal.ExecutorUtil; diff --git a/handler/src/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnable.java b/handler/src/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnable.java index de48f1db1a..b4743e2c1d 100644 --- a/handler/src/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnable.java +++ b/handler/src/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnable.java @@ -22,7 +22,7 @@ import io.netty.channel.ChannelHandlerContext; /** * A {@link ChannelEventRunnable} which sends the specified {@link ChannelEvent} downstream. */ -public final class ChannelDownstreamEventRunnable extends ChannelEventRunnable { +public class ChannelDownstreamEventRunnable extends ChannelEventRunnable { public ChannelDownstreamEventRunnable(ChannelHandlerContext ctx, ChannelEvent e) { super(ctx, e); diff --git a/handler/src/main/java/io/netty/handler/execution/filter/ChannelDownstreamEventRunnableFilter.java b/handler/src/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnableFilter.java similarity index 83% rename from handler/src/main/java/io/netty/handler/execution/filter/ChannelDownstreamEventRunnableFilter.java rename to handler/src/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnableFilter.java index 54629c6c0e..46c498bbfe 100644 --- a/handler/src/main/java/io/netty/handler/execution/filter/ChannelDownstreamEventRunnableFilter.java +++ b/handler/src/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnableFilter.java @@ -13,10 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.handler.execution.filter; - -import io.netty.handler.execution.ChannelDownstreamEventRunnable; -import io.netty.handler.execution.ChannelEventRunnable; +package io.netty.handler.execution; /** * {@link ChannelEventRunnableFilter} implementation which matches {@link ChannelDownstreamEventRunnable} diff --git a/handler/src/main/java/io/netty/handler/execution/filter/ChannelEventRunnableFilter.java b/handler/src/main/java/io/netty/handler/execution/ChannelEventRunnableFilter.java similarity index 93% rename from handler/src/main/java/io/netty/handler/execution/filter/ChannelEventRunnableFilter.java rename to handler/src/main/java/io/netty/handler/execution/ChannelEventRunnableFilter.java index 99e42c30e8..849b4ff60d 100644 --- a/handler/src/main/java/io/netty/handler/execution/filter/ChannelEventRunnableFilter.java +++ b/handler/src/main/java/io/netty/handler/execution/ChannelEventRunnableFilter.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.handler.execution.filter; +package io.netty.handler.execution; import java.util.concurrent.Executor; diff --git a/handler/src/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnable.java b/handler/src/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnable.java index 4ee72e1cd7..0aa67bea14 100644 --- a/handler/src/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnable.java +++ b/handler/src/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnable.java @@ -25,7 +25,7 @@ import io.netty.channel.ChannelHandlerContext; * Most users will not see this type at all because it is used by * {@link Executor} implementers only */ -public final class ChannelUpstreamEventRunnable extends ChannelEventRunnable { +public class ChannelUpstreamEventRunnable extends ChannelEventRunnable { /** diff --git a/handler/src/main/java/io/netty/handler/execution/filter/ChannelUpstreamEventRunnableFilter.java b/handler/src/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnableFilter.java similarity index 83% rename from handler/src/main/java/io/netty/handler/execution/filter/ChannelUpstreamEventRunnableFilter.java rename to handler/src/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnableFilter.java index bca5ea7767..222aa78983 100644 --- a/handler/src/main/java/io/netty/handler/execution/filter/ChannelUpstreamEventRunnableFilter.java +++ b/handler/src/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnableFilter.java @@ -13,10 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.handler.execution.filter; - -import io.netty.handler.execution.ChannelDownstreamEventRunnable; -import io.netty.handler.execution.ChannelEventRunnable; +package io.netty.handler.execution; /** * {@link ChannelEventRunnableFilter} which matches {@link ChannelDownstreamEventRunnable}