Author: adc
Date: Fri Aug 19 11:52:01 2011
New Revision: 1159603
URL: http://svn.apache.org/viewvc?rev=1159603&view=rev
Log:
Updated IoChannelState so send/recieve have no return types
Modified:
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoChannelState.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/link/DownState.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/link/Link.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/link/UpState.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/ClosedChannelState.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/ClosingChannelState.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/FinishedChannelState.java
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/HandshakeChannelState.java
Modified:
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoChannelState.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoChannelState.java?rev=1159603&r1=1159602&r2=1159603&view=diff
==============================================================================
---
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoChannelState.java
(original)
+++
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/core/IoChannelState.java
Fri Aug 19 11:52:01 2011
@@ -31,9 +31,9 @@ public interface IoChannelState<U, D, S
void destroy();
- U send(Context<S> context, D message) throws Exception;
+ void send(Context<S> context, D message) throws Exception;
- D receive(Context<S> context, U message) throws Exception;
+ void receive(Context<S> context, U message) throws Exception;
void handle(Context<S> context, E event) throws Exception;
}
Modified:
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/link/DownState.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/link/DownState.java?rev=1159603&r1=1159602&r2=1159603&view=diff
==============================================================================
---
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/link/DownState.java
(original)
+++
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/link/DownState.java
Fri Aug 19 11:52:01 2011
@@ -58,21 +58,21 @@ public class DownState extends BaseChann
this.numTokens = numTokens;
}
- @IoProperty(name = "child", scope = IoPropertyScope.MINA)
+ @IoProperty(name = "child", scope = IoPropertyScope.PRIVATE)
public void setChild(IoDown<Token> child)
{
this.child = child;
}
@Override
- public Token send(Context<State> stateContext, Token message) throws
Exception
+ public void send(Context<State> stateContext, Token message) throws
Exception
{
LOG.error("Should not have been sent a token");
throw new UnsupportedOperationException("Link state channel does not
support message sending");
}
@Override
- public Token receive(Context<State> stateContext, Token message) throws
Exception
+ public void receive(Context<State> stateContext, Token message) throws
Exception
{
LOG.debug("Received token, tokens={}", numTokens);
@@ -94,8 +94,6 @@ public class DownState extends BaseChann
{
numTokens++;
}
-
- return null;
}
@Override
Modified:
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/link/Link.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/link/Link.java?rev=1159603&r1=1159602&r2=1159603&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/link/Link.java
(original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/link/Link.java Fri
Aug 19 11:52:01 2011
@@ -20,6 +20,7 @@ package org.apache.mina.link;
import java.util.Set;
+import org.apache.mina.core.api.IoDown;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,8 +41,9 @@ import org.apache.mina.core.state.StateM
public class Link extends StateMachineChannel<Token, Token, State,
TimeoutEvent>
{
static final Logger LOG = LoggerFactory.getLogger(Link.class);
- private Set<LinkListener> listeners;
+ private IoDown<Token> child;
private int numTokens;
+ private Set<LinkListener> listeners;
public Link()
{
@@ -49,6 +51,18 @@ public class Link extends StateMachineCh
register(State.UP, new DownState());
}
+ @IoProperty(name = "child", scope = IoPropertyScope.PRIVATE)
+ public IoDown<Token> getChild()
+ {
+ return child;
+ }
+
+ @IoProperty(name = "child", scope = IoPropertyScope.PRIVATE)
+ public void setChild(IoDown<Token> child)
+ {
+ this.child = child;
+ }
+
@IoProperty(name = "numTokens", scope = IoPropertyScope.PRIVATE)
public int getNumTokens()
{
Modified:
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/link/UpState.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/link/UpState.java?rev=1159603&r1=1159602&r2=1159603&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/link/UpState.java
(original)
+++ mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/link/UpState.java
Fri Aug 19 11:52:01 2011
@@ -58,21 +58,21 @@ public class UpState extends BaseChannel
this.numTokens = numTokens;
}
- @IoProperty(name = "child", scope = IoPropertyScope.MINA)
+ @IoProperty(name = "child", scope = IoPropertyScope.PRIVATE)
public void setChild(IoDown<Token> child)
{
this.child = child;
}
@Override
- public Token send(Context<State> stateContext, Token message) throws
Exception
+ public void send(Context<State> stateContext, Token message) throws
Exception
{
LOG.error("Should not have been sent a token");
throw new UnsupportedOperationException("Link state channel does not
support message sending");
}
@Override
- public Token receive(Context<State> stateContext, Token message) throws
Exception
+ public void receive(Context<State> stateContext, Token message) throws
Exception
{
LOG.debug("Received token, tokens={}", numTokens);
@@ -87,8 +87,6 @@ public class UpState extends BaseChannel
{
numTokens++;
}
-
- return null;
}
@Override
Modified:
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/ClosedChannelState.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/ClosedChannelState.java?rev=1159603&r1=1159602&r2=1159603&view=diff
==============================================================================
---
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/ClosedChannelState.java
(original)
+++
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/ClosedChannelState.java
Fri Aug 19 11:52:01 2011
@@ -39,15 +39,15 @@ public class ClosedChannelState implemen
}
@Override
- public IoByteBuffer send(Context<SslStates> sslStatesPContext,
IoByteBuffer message) throws Exception
+ public void send(Context<SslStates> sslStatesPContext, IoByteBuffer
message) throws Exception
{
- return null; //Todo change body of implemented methods use File |
Settings | File Templates.
+ //Todo change body of implemented methods use File | Settings | File
Templates.
}
@Override
- public IoByteBuffer receive(Context<SslStates> sslStatesContext,
IoByteBuffer message) throws Exception
+ public void receive(Context<SslStates> sslStatesContext, IoByteBuffer
message) throws Exception
{
- return null; //Todo change body of implemented methods use File |
Settings | File Templates.
+ //Todo change body of implemented methods use File | Settings | File
Templates.
}
@Override
Modified:
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/ClosingChannelState.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/ClosingChannelState.java?rev=1159603&r1=1159602&r2=1159603&view=diff
==============================================================================
---
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/ClosingChannelState.java
(original)
+++
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/ClosingChannelState.java
Fri Aug 19 11:52:01 2011
@@ -39,15 +39,15 @@ public class ClosingChannelState impleme
}
@Override
- public IoByteBuffer send(Context<SslStates> sslStatesPContext,
IoByteBuffer message) throws Exception
+ public void send(Context<SslStates> sslStatesPContext, IoByteBuffer
message) throws Exception
{
- return null; //Todo change body of implemented methods use File |
Settings | File Templates.
+ //Todo change body of implemented methods use File | Settings | File
Templates.
}
@Override
- public IoByteBuffer receive(Context<SslStates> sslStatesPContext,
IoByteBuffer message) throws Exception
+ public void receive(Context<SslStates> sslStatesPContext, IoByteBuffer
message) throws Exception
{
- return null; //Todo change body of implemented methods use File |
Settings | File Templates.
+ //Todo change body of implemented methods use File | Settings | File
Templates.
}
@Override
Modified:
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/FinishedChannelState.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/FinishedChannelState.java?rev=1159603&r1=1159602&r2=1159603&view=diff
==============================================================================
---
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/FinishedChannelState.java
(original)
+++
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/FinishedChannelState.java
Fri Aug 19 11:52:01 2011
@@ -54,15 +54,15 @@ public class FinishedChannelState extend
}
@Override
- public IoByteBuffer send(Context<SslStates> context, IoByteBuffer message)
throws Exception
+ public void send(Context<SslStates> context, IoByteBuffer message) throws
Exception
{
- return null; //Todo change body of implemented methods use File |
Settings | File Templates.
+ //Todo change body of implemented methods use File | Settings | File
Templates.
}
@Override
- public IoByteBuffer receive(Context<SslStates> context, IoByteBuffer
message) throws Exception
+ public void receive(Context<SslStates> context, IoByteBuffer message)
throws Exception
{
- return null; //Todo change body of implemented methods use File |
Settings | File Templates.
+ //Todo change body of implemented methods use File | Settings | File
Templates.
}
@Override
Modified:
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/HandshakeChannelState.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/HandshakeChannelState.java?rev=1159603&r1=1159602&r2=1159603&view=diff
==============================================================================
---
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/HandshakeChannelState.java
(original)
+++
mina/sandbox/adc/ahc/mina3/src/main/java/org/apache/mina/ssl/HandshakeChannelState.java
Fri Aug 19 11:52:01 2011
@@ -52,7 +52,7 @@ public class HandshakeChannelState exten
this.engine = engine;
}
- public IoByteBuffer send(Context<SslStates> context, IoByteBuffer message)
throws Exception
+ public void send(Context<SslStates> context, IoByteBuffer message) throws
Exception
{
IoByteBuffer ioByteBuffer = (IoByteBuffer)message;
@@ -76,11 +76,9 @@ public class HandshakeChannelState exten
// LOGGER.trace("handshake status: " + status);
// }
// factory.recycle(message);
-
- return byteBuffer;
}
- public IoByteBuffer receive(Context<SslStates> context, IoByteBuffer
message) throws Exception
+ public void receive(Context<SslStates> context, IoByteBuffer message)
throws Exception
{
IoByteBuffer byteBuffer =
factory.allocate(engine.getSession().getPacketBufferSize()).get();
// SSLEngineResult result = engine.unwrap(message.getMessages()[0],
byteBuffer);
@@ -111,8 +109,6 @@ public class HandshakeChannelState exten
// stateMachine.setState(SslStates.FINISHED);
// }
// factory.recycle(message);
-
- return byteBuffer;
}
@Override
