Repository: mina Updated Branches: refs/heads/2.0 6f2a0eaeb -> b5e2b0957
Fixed Javadoc issues Project: http://git-wip-us.apache.org/repos/asf/mina/repo Commit: http://git-wip-us.apache.org/repos/asf/mina/commit/b5e2b095 Tree: http://git-wip-us.apache.org/repos/asf/mina/tree/b5e2b095 Diff: http://git-wip-us.apache.org/repos/asf/mina/diff/b5e2b095 Branch: refs/heads/2.0 Commit: b5e2b0957684c0591c9fd459e69b4da24b7a8095 Parents: 6f2a0ea Author: Emmanuel Lécharny <elecha...@symas.com> Authored: Tue Mar 6 12:16:09 2018 +0100 Committer: Emmanuel Lécharny <elecha...@symas.com> Committed: Tue Mar 6 12:16:09 2018 +0100 ---------------------------------------------------------------------- .../java/org/apache/mina/example/chat/ChatProtocolHandler.java | 1 + .../apache/mina/example/chat/client/SwingChatClientHandler.java | 1 + .../org/apache/mina/example/echoserver/EchoProtocolHandler.java | 1 + .../mina/example/imagine/step1/client/GraphicalCharGenClient.java | 1 + .../org/apache/mina/example/imagine/step1/client/ImageClient.java | 1 + .../java/org/apache/mina/example/netcat/NetCatProtocolHandler.java | 1 + .../org/apache/mina/example/reverser/ReverseProtocolHandler.java | 1 + .../java/org/apache/mina/example/sumup/ClientSessionHandler.java | 1 + .../java/org/apache/mina/example/sumup/ServerSessionHandler.java | 1 + .../org/apache/mina/example/sumup/codec/AddMessageDecoder.java | 1 + .../org/apache/mina/example/sumup/codec/AddMessageEncoder.java | 1 + .../org/apache/mina/example/sumup/codec/ResultMessageDecoder.java | 1 + .../org/apache/mina/example/sumup/codec/ResultMessageEncoder.java | 1 + .../main/java/org/apache/mina/example/tapedeck/CommandDecoder.java | 1 + .../main/java/org/apache/mina/example/tcp/perf/TcpSslClient.java | 2 +- .../src/main/java/org/apache/mina/example/tennis/TennisPlayer.java | 1 + 16 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java b/mina-example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java index 56bda0a..5182e32 100644 --- a/mina-example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java +++ b/mina-example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; +import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.logging.MdcInjectionFilter; http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/chat/client/SwingChatClientHandler.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/chat/client/SwingChatClientHandler.java b/mina-example/src/main/java/org/apache/mina/example/chat/client/SwingChatClientHandler.java index 5d549f3..aadaa2b 100644 --- a/mina-example/src/main/java/org/apache/mina/example/chat/client/SwingChatClientHandler.java +++ b/mina-example/src/main/java/org/apache/mina/example/chat/client/SwingChatClientHandler.java @@ -19,6 +19,7 @@ */ package org.apache.mina.example.chat.client; +import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.session.IoSession; import org.apache.mina.example.chat.ChatCommand; http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java b/mina-example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java index f0795fa..4524812 100644 --- a/mina-example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java +++ b/mina-example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java @@ -20,6 +20,7 @@ package org.apache.mina.example.echoserver; import org.apache.mina.core.buffer.IoBuffer; +import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IoSession; http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/imagine/step1/client/GraphicalCharGenClient.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/imagine/step1/client/GraphicalCharGenClient.java b/mina-example/src/main/java/org/apache/mina/example/imagine/step1/client/GraphicalCharGenClient.java index 7208554..7badc19 100644 --- a/mina-example/src/main/java/org/apache/mina/example/imagine/step1/client/GraphicalCharGenClient.java +++ b/mina-example/src/main/java/org/apache/mina/example/imagine/step1/client/GraphicalCharGenClient.java @@ -43,6 +43,7 @@ import javax.swing.UIManager; import javax.swing.WindowConstants; import org.apache.mina.example.imagine.step1.ImageRequest; +import org.apache.mina.example.imagine.step1.server.ImageServer; /** * Swing application that acts as a client of the {@link ImageServer} http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java b/mina-example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java index 916938e..44eb977 100644 --- a/mina-example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java +++ b/mina-example/src/main/java/org/apache/mina/example/imagine/step1/client/ImageClient.java @@ -26,6 +26,7 @@ import org.apache.mina.core.session.IoSession; import org.apache.mina.example.imagine.step1.ImageRequest; import org.apache.mina.example.imagine.step1.ImageResponse; import org.apache.mina.example.imagine.step1.codec.ImageCodecFactory; +import org.apache.mina.example.imagine.step1.server.ImageServer; import org.apache.mina.filter.codec.ProtocolCodecFilter; import org.apache.mina.transport.socket.SocketConnector; import org.apache.mina.transport.socket.nio.NioSocketConnector; http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java b/mina-example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java index 0df0edc..b922b0e 100644 --- a/mina-example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java +++ b/mina-example/src/main/java/org/apache/mina/example/netcat/NetCatProtocolHandler.java @@ -20,6 +20,7 @@ package org.apache.mina.example.netcat; import org.apache.mina.core.buffer.IoBuffer; +import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IoSession; http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java b/mina-example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java index 92259d5..56c0d51 100644 --- a/mina-example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java +++ b/mina-example/src/main/java/org/apache/mina/example/reverser/ReverseProtocolHandler.java @@ -19,6 +19,7 @@ */ package org.apache.mina.example.reverser; +import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.session.IoSession; http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java b/mina-example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java index b9fac5c..cd72252 100644 --- a/mina-example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java +++ b/mina-example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java @@ -19,6 +19,7 @@ */ package org.apache.mina.example.sumup; +import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.session.IoSession; import org.apache.mina.example.sumup.message.AddMessage; http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java b/mina-example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java index 8cdc939..305a7f8 100644 --- a/mina-example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java +++ b/mina-example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java @@ -19,6 +19,7 @@ */ package org.apache.mina.example.sumup; +import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IoSession; http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageDecoder.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageDecoder.java b/mina-example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageDecoder.java index 42a41ca..0e7c3b8 100644 --- a/mina-example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageDecoder.java +++ b/mina-example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageDecoder.java @@ -24,6 +24,7 @@ import org.apache.mina.core.session.IoSession; import org.apache.mina.example.sumup.message.AbstractMessage; import org.apache.mina.example.sumup.message.AddMessage; import org.apache.mina.filter.codec.ProtocolDecoderOutput; +import org.apache.mina.filter.codec.demux.MessageDecoder; /** * A {@link MessageDecoder} that decodes {@link AddMessage}. http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java b/mina-example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java index 538d090..1fefd65 100644 --- a/mina-example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java +++ b/mina-example/src/main/java/org/apache/mina/example/sumup/codec/AddMessageEncoder.java @@ -22,6 +22,7 @@ package org.apache.mina.example.sumup.codec; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession; import org.apache.mina.example.sumup.message.AddMessage; +import org.apache.mina.filter.codec.demux.MessageEncoder; /** * A {@link MessageEncoder} that encodes {@link AddMessage}. http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageDecoder.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageDecoder.java b/mina-example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageDecoder.java index d30389f..280e9d6 100644 --- a/mina-example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageDecoder.java +++ b/mina-example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageDecoder.java @@ -24,6 +24,7 @@ import org.apache.mina.core.session.IoSession; import org.apache.mina.example.sumup.message.AbstractMessage; import org.apache.mina.example.sumup.message.ResultMessage; import org.apache.mina.filter.codec.ProtocolDecoderOutput; +import org.apache.mina.filter.codec.demux.MessageDecoder; /** * A {@link MessageDecoder} that decodes {@link ResultMessage}. http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java b/mina-example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java index f807a57..cef20c5 100644 --- a/mina-example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java +++ b/mina-example/src/main/java/org/apache/mina/example/sumup/codec/ResultMessageEncoder.java @@ -22,6 +22,7 @@ package org.apache.mina.example.sumup.codec; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession; import org.apache.mina.example.sumup.message.ResultMessage; +import org.apache.mina.filter.codec.demux.MessageEncoder; /** * A {@link MessageEncoder} that encodes {@link ResultMessage}. http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/tapedeck/CommandDecoder.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/tapedeck/CommandDecoder.java b/mina-example/src/main/java/org/apache/mina/example/tapedeck/CommandDecoder.java index 9305d8a..6ea3846 100644 --- a/mina-example/src/main/java/org/apache/mina/example/tapedeck/CommandDecoder.java +++ b/mina-example/src/main/java/org/apache/mina/example/tapedeck/CommandDecoder.java @@ -25,6 +25,7 @@ import java.util.LinkedList; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.filterchain.IoFilter.NextFilter; import org.apache.mina.core.session.IoSession; +import org.apache.mina.filter.codec.ProtocolDecoder; import org.apache.mina.filter.codec.ProtocolDecoderOutput; import org.apache.mina.filter.codec.textline.LineDelimiter; import org.apache.mina.filter.codec.textline.TextLineDecoder; http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/tcp/perf/TcpSslClient.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/tcp/perf/TcpSslClient.java b/mina-example/src/main/java/org/apache/mina/example/tcp/perf/TcpSslClient.java index 15337d8..7588c54 100644 --- a/mina-example/src/main/java/org/apache/mina/example/tcp/perf/TcpSslClient.java +++ b/mina-example/src/main/java/org/apache/mina/example/tcp/perf/TcpSslClient.java @@ -62,7 +62,7 @@ public class TcpSslClient extends IoHandlerAdapter { /** * Create the TcpClient's instance - * @throws GeneralSecurityException + * @throws GeneralSecurityException When a SSL error is met */ public TcpSslClient() throws GeneralSecurityException { connector = new NioSocketConnector(); http://git-wip-us.apache.org/repos/asf/mina/blob/b5e2b095/mina-example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java ---------------------------------------------------------------------- diff --git a/mina-example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java b/mina-example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java index 117f144..f281522 100644 --- a/mina-example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java +++ b/mina-example/src/main/java/org/apache/mina/example/tennis/TennisPlayer.java @@ -19,6 +19,7 @@ */ package org.apache.mina.example.tennis; +import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.session.IoSession;
