andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix visibility warnings from the inspector.

Browse Source
This commit is contained in:
Trustin Lee 2012-11-12 14:03:43 +09:00
parent 262919b045
commit adee1b4156
8 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java
View File

@ -594,7 +594,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
}
}
DefaultChannelHandlerContext getActualUpstreamContext(DefaultChannelHandlerContext ctx) {
private DefaultChannelHandlerContext getActualUpstreamContext(DefaultChannelHandlerContext ctx) {
if (ctx == null) {
return null;
}
@ -610,7 +610,7 @@ public class DefaultChannelPipeline implements ChannelPipeline {
return realCtx;
}
DefaultChannelHandlerContext getActualDownstreamContext(DefaultChannelHandlerContext ctx) {
private DefaultChannelHandlerContext getActualDownstreamContext(DefaultChannelHandlerContext ctx) {
if (ctx == null) {
return null;
}

12
src/main/java/org/jboss/netty/channel/StaticChannelPipeline.java
View File

@ -15,16 +15,16 @@
*/
package org.jboss.netty.channel;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.logging.InternalLoggerFactory;
import org.jboss.netty.util.internal.ConversionUtil;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.logging.InternalLoggerFactory;
import org.jboss.netty.util.internal.ConversionUtil;
/**
* A {@link ChannelPipeline} that might perform better at the cost of
* disabled dynamic insertion and removal of {@link ChannelHandler}s.
@ -408,7 +408,7 @@ public class StaticChannelPipeline implements ChannelPipeline {
}
}
StaticChannelHandlerContext getActualUpstreamContext(int index) {
private StaticChannelHandlerContext getActualUpstreamContext(int index) {
for (int i = index; i < contexts.length; i ++) {
StaticChannelHandlerContext ctx = contexts[i];
if (ctx.canHandleUpstream()) {
@ -418,7 +418,7 @@ public class StaticChannelPipeline implements ChannelPipeline {
return null;
}
StaticChannelHandlerContext getActualDownstreamContext(int index) {
private StaticChannelHandlerContext getActualDownstreamContext(int index) {
for (int i = index; i >= 0; i --) {
StaticChannelHandlerContext ctx = contexts[i];
if (ctx.canHandleDownstream()) {

46
src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
View File

@ -15,27 +15,6 @@
*/
package org.jboss.netty.channel.socket.nio;
import static org.jboss.netty.channel.Channels.*;
import java.io.IOException;
import java.net.ConnectException;
import java.net.SocketAddress;
import java.nio.channels.CancelledKeyException;
import java.nio.channels.ClosedChannelException;
import java.nio.channels.SocketChannel;
import java.nio.channels.SelectableChannel;
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
import java.util.Iterator;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import org.jboss.netty.channel.ChannelEvent;
import org.jboss.netty.channel.ChannelException;
import org.jboss.netty.channel.ChannelFuture;
@ -46,12 +25,33 @@ import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.logging.InternalLogger;
import org.jboss.netty.logging.InternalLoggerFactory;
import org.jboss.netty.util.ThreadRenamingRunnable;
import org.jboss.netty.util.Timeout;
import org.jboss.netty.util.Timer;
import org.jboss.netty.util.TimerTask;
import org.jboss.netty.util.ThreadRenamingRunnable;
import org.jboss.netty.util.internal.DeadLockProofWorker;
import java.io.IOException;
import java.net.ConnectException;
import java.net.SocketAddress;
import java.nio.channels.CancelledKeyException;
import java.nio.channels.ClosedChannelException;
import java.nio.channels.SelectableChannel;
import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
import java.nio.channels.SocketChannel;
import java.util.Iterator;
import java.util.Queue;
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import static org.jboss.netty.channel.Channels.*;
class NioClientSocketPipelineSink extends AbstractNioChannelSink {
private static final AtomicInteger nextId = new AtomicInteger();
@ -168,7 +168,7 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
}
}
Boss nextBoss() {
private Boss nextBoss() {
return bosses[Math.abs(
bossIndex.getAndIncrement() % bosses.length)];
}

2
src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java
View File

@ -159,7 +159,7 @@ class NioServerSocketPipelineSink extends AbstractNioChannelSink implements Exte
}
}
private final class Boss implements Runnable {
final class Boss implements Runnable {
volatile Selector selector;
private final Executor bossExecutor;
/**

4
src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java
View File

@ -38,8 +38,8 @@ final class SocketSendBufferPool implements ExternalResourceReleasable {
private static final int ALIGN_SHIFT = 4;
private static final int ALIGN_MASK = 15;
PreallocationRef poolHead;
Preallocation current = new Preallocation(DEFAULT_PREALLOCATION_SIZE);
private PreallocationRef poolHead;
private Preallocation current = new Preallocation(DEFAULT_PREALLOCATION_SIZE);
SendBuffer acquire(Object message) {
if (message instanceof ChannelBuffer) {

3
src/test/java/org/jboss/netty/channel/local/LocalAddressTest.java
View File

@ -24,10 +24,9 @@ import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.channel.Channels;
import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.*;
public class LocalAddressTest {
private static final String LOCAL_ADDR_ID = "test.id";

1
src/test/java/org/jboss/netty/channel/socket/nio/DefaultNioDatagramChannelConfigTest.java
View File

@ -16,7 +16,6 @@
package org.jboss.netty.channel.socket.nio;
import org.jboss.netty.util.internal.DetectionUtil;
import org.junit.Assert;
import org.junit.Test;
import java.io.IOException;

1
src/test/java/org/jboss/netty/handler/stream/ChunkedWriteHandlerTest.java
View File

@ -24,7 +24,6 @@ import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelDownstreamHandler;
import org.jboss.netty.handler.codec.embedder.EncoderEmbedder;
import org.jboss.netty.util.CharsetUtil;
import org.junit.Assert;
import org.junit.Test;
import java.io.ByteArrayInputStream;