Author: elecharny
Date: Sun Feb 21 00:28:49 2010
New Revision: 912261
URL: http://svn.apache.org/viewvc?rev=912261&view=rev
Log:
o Added some missing JavaDoc
o Moved the getProcessor() method back in the super class
o Added a constructor to initialize this IoProcessor member
o Minor refactoring
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramSession.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSession.java
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java?rev=912261&r1=912260&r2=912261&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/core/session/AbstractIoSession.java
Sun Feb 21 00:28:49 2010
@@ -180,7 +180,7 @@
}
/**
- * TODO Add method documentation
+ * @return The associated IoProcessor for this session
*/
public abstract IoProcessor getProcessor();
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramSession.java?rev=912261&r1=912260&r2=912261&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramSession.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioDatagramSession.java
Sun Feb 21 00:28:49 2010
@@ -55,7 +55,6 @@
private final IoHandler handler;
private final InetSocketAddress localAddress;
private final InetSocketAddress remoteAddress;
- private final IoProcessor<NioSession> processor;
private SelectionKey key;
@@ -65,12 +64,12 @@
NioDatagramSession(IoService service,
DatagramChannel ch, IoProcessor<NioSession> processor,
SocketAddress remoteAddress) {
+ super(processor);
this.service = service;
this.ch = ch;
this.config = new NioDatagramSessionConfig(ch);
this.config.setAll(service.getSessionConfig());
this.handler = service.getHandler();
- this.processor = processor;
this.remoteAddress = (InetSocketAddress) remoteAddress;
this.localAddress = (InetSocketAddress)
ch.socket().getLocalSocketAddress();
}
@@ -78,8 +77,7 @@
/**
* Creates a new connector-side session instance.
*/
- NioDatagramSession(IoService service,
- DatagramChannel ch, IoProcessor<NioSession> processor)
{
+ NioDatagramSession(IoService service, DatagramChannel ch,
IoProcessor<NioSession> processor) {
this(service, ch, processor, ch.socket().getRemoteSocketAddress());
}
@@ -87,11 +85,6 @@
return service;
}
- @Override
- public IoProcessor<NioSession> getProcessor() {
- return processor;
- }
-
public DatagramSessionConfig getConfig() {
return config;
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSession.java?rev=912261&r1=912260&r2=912261&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSession.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSession.java
Sun Feb 21 00:28:49 2010
@@ -22,6 +22,7 @@
import java.nio.channels.ByteChannel;
import java.nio.channels.SelectionKey;
+import org.apache.mina.core.service.IoProcessor;
import org.apache.mina.core.session.AbstractIoSession;
import org.apache.mina.core.session.IoSession;
@@ -31,6 +32,22 @@
* @author <a href="http://mina.apache.org";>Apache MINA Project</a>
*/
public abstract class NioSession extends AbstractIoSession {
+ /** The NioSession processor */
+ protected final IoProcessor<NioSession> processor;
+
+
+ /**
+ *
+ * Creates a new instance of NioSession, with its associated IoProcessor.
+ * <br>
+ * This method is only called by the inherited class.
+ *
+ * @param processor The associated IoProcessor
+ */
+ protected NioSession(IoProcessor<NioSession> processor) {
+ this.processor = processor;
+ }
+
/**
* @return The ByteChannel associated with this {...@link IoSession}
*/
@@ -47,4 +64,11 @@
* @param key The new {...@link SelectionKey}
*/
abstract void setSelectionKey(SelectionKey key);
+
+ /**
+ * {...@inheritdoc}
+ */
+ public IoProcessor<NioSession> getProcessor() {
+ return processor;
+ }
}
Modified:
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java
URL:
http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java?rev=912261&r1=912260&r2=912261&view=diff
==============================================================================
---
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java
(original)
+++
mina/trunk/core/src/main/java/org/apache/mina/transport/socket/nio/NioSocketSession.java
Sun Feb 21 00:28:49 2010
@@ -57,8 +57,6 @@
private final SocketSessionConfig config = new SessionConfigImpl();
- private final IoProcessor<NioSession> processor;
-
private final IoFilterChain filterChain = new DefaultIoFilterChain(this);
private final SocketChannel ch;
@@ -77,8 +75,8 @@
* @param ch the used channel
*/
public NioSocketSession(IoService service, IoProcessor<NioSession>
processor, SocketChannel ch) {
+ super(processor);
this.service = service;
- this.processor = processor;
this.ch = ch;
this.handler = service.getHandler();
this.config.setAll(service.getSessionConfig());
@@ -92,11 +90,6 @@
return config;
}
- @Override
- public IoProcessor<NioSession> getProcessor() {
- return processor;
- }
-
public IoFilterChain getFilterChain() {
return filterChain;
}
