Author: jvermillard
Date: Thu Jan 18 02:40:54 2007
New Revision: 497389
URL: http://svn.apache.org/viewvc?view=rev&rev=497389
Log:
* updated for new TransportType API (DIRMINA16)
* removed the dummy test, preparing a more complete test suite
Removed:
mina/sandbox/jvermillard/serial/src/main/java/TestSerial.java
Modified:
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java
Modified:
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java?view=diff&rev=497389&r1=497388&r2=497389
==============================================================================
---
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java
(original)
+++
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java
Thu Jan 18 02:40:54 2007
@@ -29,23 +29,12 @@
log=LoggerFactory.getLogger(SerialConnector.class);
}
- @Override
- protected Class<? extends SocketAddress> getAddressType() {
- return SerialPortAddress.class;
- }
-
- @Override
- protected Class<? extends IoSessionConfig> getSessionConfigType() {
- return SerialSessionConfig.class;
- }
-
@Override
protected IoServiceListenerSupport getListeners()
{
return super.getListeners();
}
-
@Override
protected ConnectFuture doConnect(SocketAddress remoteAddress,
SocketAddress localAddress) {
if( ! (remoteAddress instanceof SerialPortAddress) )
@@ -87,6 +76,9 @@
// TODO : reveive Timeout
serialPort.enableReceiveTimeout(10); /* milliseconds */
serialPort.notifyOnDataAvailable(true);
+ //serialPort.setLowLatency();
+
serialPort.setInputBufferSize(8);
+
serialPort.enableReceiveTimeout(10);
ConnectFuture future = new
DefaultConnectFuture();
SerialSession session = new
SerialSession(this,portAddress,serialPort);
@@ -114,5 +106,9 @@
}
}
return DefaultConnectFuture.newFailedFuture(new
RuntimeException("Serial port not found"));
+ }
+
+ public TransportType getTransportType() {
+ return SerialSession.serialTransportType;
}
}
Modified:
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java?view=diff&rev=497389&r1=497388&r2=497389
==============================================================================
---
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java
(original)
+++
mina/sandbox/jvermillard/serial/src/main/java/org/apache/mina/transport/serial/SerialSession.java
Thu Jan 18 02:40:54 2007
@@ -21,6 +21,7 @@
import org.apache.mina.common.TransportType;
import org.apache.mina.common.IoFilter.WriteRequest;
import org.apache.mina.common.support.BaseIoSession;
+import org.apache.mina.common.support.DefaultTransportType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,6 +47,10 @@
private SerialPort port;
private Logger log;
+
+
+ public static final TransportType serialTransportType = new
DefaultTransportType( "serial communication", false, SerialPortAddress.class,
+ ByteBuffer.class, SerialSessionConfig.class );
SerialSession(IoService service, SerialPortAddress address, SerialPort
port) {
this.service = service;
@@ -109,7 +114,7 @@
}
public TransportType getTransportType() {
- return TransportType.getInstance("SERIAL");
+ return serialTransportType;
}
protected void close0()
