You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2008/04/08 10:38:04 UTC
svn commit: r645790 - in /mina/sandbox/transport-serial: ./
src/main/java/org/apache/mina/transport/serial/
Author: trustin
Date: Tue Apr 8 01:38:03 2008
New Revision: 645790
URL: http://svn.apache.org/viewvc?rev=645790&view=rev
Log:
Fixed compilation errors with transport-serial in the sandbox
Added:
mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialAddressEditor.java
- copied, changed from r645763, mina/sandbox/transport-serial/SerialAddressEditor.java
Removed:
mina/sandbox/transport-serial/SerialAddressEditor.java
Modified:
mina/sandbox/transport-serial/pom.xml
mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/DefaultSerialSessionConfig.java
mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java
mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java
Modified: mina/sandbox/transport-serial/pom.xml
URL: http://svn.apache.org/viewvc/mina/sandbox/transport-serial/pom.xml?rev=645790&r1=645789&r2=645790&view=diff
==============================================================================
--- mina/sandbox/transport-serial/pom.xml (original)
+++ mina/sandbox/transport-serial/pom.xml Tue Apr 8 01:38:03 2008
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.mina</groupId>
<artifactId>build</artifactId>
- <version>2.0.0-M1-SNAPSHOT</version>
+ <version>2.0.0-M2-SNAPSHOT</version>
</parent>
<artifactId>mina-transport-serial</artifactId>
<name>Apache MINA Serial Communication support</name>
@@ -18,8 +18,13 @@
<artifactId>mina-core</artifactId>
</dependency>
<dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>mina-integration-beans</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.rxtx</groupId>
<artifactId>rxtx</artifactId>
+ <version>2.1.7</version>
</dependency>
</dependencies>
</project>
Modified: mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/DefaultSerialSessionConfig.java
URL: http://svn.apache.org/viewvc/mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/DefaultSerialSessionConfig.java?rev=645790&r1=645789&r2=645790&view=diff
==============================================================================
--- mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/DefaultSerialSessionConfig.java (original)
+++ mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/DefaultSerialSessionConfig.java Tue Apr 8 01:38:03 2008
@@ -31,13 +31,11 @@
class DefaultSerialSessionConfig extends AbstractIoSessionConfig implements SerialSessionConfig {
private int receiveThreshold = -1;
-
private int inputBufferSize = 8;
-
private boolean lowLatency = false;
public DefaultSerialSessionConfig() {
-
+ // All default properties were configured above.
}
@Override
@@ -58,7 +56,7 @@
}
public void setInputBufferSize(int bufferSize) {
- this.inputBufferSize = bufferSize;
+ inputBufferSize = bufferSize;
}
public void setLowLatency(boolean lowLatency) {
Copied: mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialAddressEditor.java (from r645763, mina/sandbox/transport-serial/SerialAddressEditor.java)
URL: http://svn.apache.org/viewvc/mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialAddressEditor.java?p2=mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialAddressEditor.java&p1=mina/sandbox/transport-serial/SerialAddressEditor.java&r1=645763&r2=645790&rev=645790&view=diff
==============================================================================
--- mina/sandbox/transport-serial/SerialAddressEditor.java (original)
+++ mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialAddressEditor.java Tue Apr 8 01:38:03 2008
@@ -17,11 +17,11 @@
* under the License.
*
*/
-package org.apache.mina.integration.beans;
+package org.apache.mina.transport.serial;
import java.beans.PropertyEditor;
-import org.apache.mina.transport.serial.SerialAddress;
+import org.apache.mina.integration.beans.AbstractPropertyEditor;
import org.apache.mina.transport.serial.SerialAddress.DataBits;
import org.apache.mina.transport.serial.SerialAddress.FlowControl;
import org.apache.mina.transport.serial.SerialAddress.Parity;
@@ -47,7 +47,7 @@
toText(addr.getParity()) + ':' +
toText(addr.getFlowControl());
}
-
+
private String toText(DataBits bits) {
switch (bits) {
case DATABITS_5:
@@ -75,7 +75,7 @@
throw new IllegalArgumentException("Unknown stopBits: " + bits);
}
}
-
+
private String toText(Parity parity) {
switch (parity) {
case EVEN:
@@ -92,7 +92,7 @@
throw new IllegalArgumentException("Unknown parity: " + parity);
}
}
-
+
private String toText(FlowControl flowControl) {
switch (flowControl) {
case NONE:
@@ -118,7 +118,7 @@
"SerialAddress must have 6 components separated " +
"by colon: " + text);
}
-
+
return new SerialAddress(
components[0].trim(),
toBauds(components[1].trim()),
@@ -127,7 +127,7 @@
toParity(components[4].trim()),
toFlowControl(components[5].trim()));
}
-
+
private int toBauds(String text) {
try {
return Integer.parseInt(text);
@@ -135,7 +135,7 @@
throw new IllegalArgumentException("bauds: " + text);
}
}
-
+
private DataBits toDataBits(String text) {
try {
return DataBits.valueOf("DATABITS_" + Integer.parseInt(text));
@@ -168,7 +168,7 @@
if (normalizedText.endsWith("OUT")) {
normalizedText = normalizedText.substring(0, normalizedText.length() - 3) + "_OUT";
}
-
+
try {
return FlowControl.valueOf(normalizedText);
} catch (IllegalArgumentException e) {
Modified: mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java
URL: http://svn.apache.org/viewvc/mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java?rev=645790&r1=645789&r2=645790&view=diff
==============================================================================
--- mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java (original)
+++ mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialConnector.java Tue Apr 8 01:38:03 2008
@@ -28,10 +28,12 @@
import java.net.SocketAddress;
import java.util.Enumeration;
import java.util.TooManyListenersException;
+import java.util.concurrent.Executor;
import org.apache.mina.common.AbstractIoConnector;
import org.apache.mina.common.ConnectFuture;
import org.apache.mina.common.DefaultConnectFuture;
+import org.apache.mina.common.IdleStatusChecker;
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoFuture;
import org.apache.mina.common.IoSessionInitializer;
@@ -46,10 +48,14 @@
* @version $Rev: 529576 $, $Date: 2007-04-17 14:25:07 +0200 (mar., 17 avr. 2007) $
*/
public final class SerialConnector extends AbstractIoConnector {
- private Logger log;
+ private final Logger log;
public SerialConnector() {
- super(new DefaultSerialSessionConfig());
+ this(null);
+ }
+
+ public SerialConnector(Executor executor) {
+ super(new DefaultSerialSessionConfig(), executor);
log = LoggerFactory.getLogger(SerialConnector.class);
}
@@ -116,7 +122,7 @@
.newFailedFuture(new SerialPortUnavailableException(
"Serial port not found"));
}
-
+
@Override
protected IoFuture dispose0() throws Exception {
return null;
@@ -161,5 +167,9 @@
}
return serialPort;
+ }
+
+ IdleStatusChecker getIdleStatusChecker0() {
+ return super.getIdleStatusChecker();
}
}
Modified: mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java
URL: http://svn.apache.org/viewvc/mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java?rev=645790&r1=645789&r2=645790&view=diff
==============================================================================
--- mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java (original)
+++ mina/sandbox/transport-serial/src/main/java/org/apache/mina/transport/serial/SerialSessionImpl.java Tue Apr 8 01:38:03 2008
@@ -32,7 +32,6 @@
import org.apache.mina.common.DefaultIoFilterChain;
import org.apache.mina.common.DefaultTransportMetadata;
import org.apache.mina.common.ExceptionMonitor;
-import org.apache.mina.common.IdleStatusChecker;
import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoHandler;
@@ -62,7 +61,7 @@
private final IoProcessor<SerialSessionImpl> processor = new SerialIoProcessor();
private final IoHandler ioHandler;
private final IoFilterChain filterChain;
- private final IoService service;
+ private final SerialConnector service;
private final IoServiceListenerSupport serviceListeners;
private final SerialAddress address;
private final SerialPort port;
@@ -72,12 +71,12 @@
private OutputStream outputStream;
SerialSessionImpl(
- IoService service, IoServiceListenerSupport serviceListeners,
+ SerialConnector service, IoServiceListenerSupport serviceListeners,
SerialAddress address, SerialPort port) {
this.service = service;
this.serviceListeners = serviceListeners;
- this.ioHandler = service.getHandler();
- this.filterChain = new DefaultIoFilterChain(this);
+ ioHandler = service.getHandler();
+ filterChain = new DefaultIoFilterChain(this);
this.port = port;
this.address = address;
@@ -129,7 +128,7 @@
ReadWorker w = new ReadWorker();
w.start();
port.addEventListener(this);
- IdleStatusChecker.getInstance().addSession(this);
+ service.getIdleStatusChecker0().addSession(this);
try {
getService().getFilterChainBuilder().buildFilterChain(getFilterChain());
serviceListeners.fireSessionCreated(this);
@@ -139,7 +138,7 @@
}
}
- private Object writeMonitor = new Object();
+ private final Object writeMonitor = new Object();
private WriteWorker writeWorker;
private class WriteWorker extends Thread {
@@ -189,7 +188,7 @@
}
}
- private Object readReadyMonitor = new Object();
+ private final Object readReadyMonitor = new Object();
private class ReadWorker extends Thread {
@Override
@@ -239,9 +238,10 @@
protected IoProcessor<SerialSessionImpl> getProcessor() {
return processor;
}
-
+
private class SerialIoProcessor implements IoProcessor<SerialSessionImpl> {
public void add(SerialSessionImpl session) {
+ // It's already added when the session is constructed.
}
public void flush(SerialSessionImpl session) {
@@ -275,12 +275,13 @@
serviceListeners.fireSessionDestroyed(SerialSessionImpl.this);
}
-
+
public void updateTrafficMask(SerialSessionImpl session) {
throw new UnsupportedOperationException();
}
public void dispose() {
+ // Nothing to dispose
}
public boolean isDisposed() {