proxy progress
This commit is contained in:
parent
93dea17a4e
commit
825ed7b71a
|
@ -50,7 +50,5 @@ public interface IoStream extends WriteStream {
|
||||||
|
|
||||||
void close();
|
void close();
|
||||||
|
|
||||||
void setDataBuffer(IncomingDataBuffer dataBuffer);
|
|
||||||
|
|
||||||
IncomingDataBuffer getDataBuffer();
|
IncomingDataBuffer getDataBuffer();
|
||||||
}
|
}
|
||||||
|
|
|
@ -211,8 +211,6 @@ public class LinkManager {
|
||||||
// error already reported
|
// error already reported
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
IncomingDataBuffer dataBuffer = IncomingDataBuffer.createDataBuffer(stream, logger);
|
|
||||||
stream.setDataBuffer(dataBuffer);
|
|
||||||
return stream;
|
return stream;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -19,7 +19,7 @@ public class SerialIoStreamJSerialComm implements IoStream {
|
||||||
private SerialPort sp;
|
private SerialPort sp;
|
||||||
private final String port;
|
private final String port;
|
||||||
private final Logger logger;
|
private final Logger logger;
|
||||||
private IncomingDataBuffer dataBuffer;
|
private final IncomingDataBuffer dataBuffer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see #openPort(String, Logger)
|
* @see #openPort(String, Logger)
|
||||||
|
@ -28,6 +28,7 @@ public class SerialIoStreamJSerialComm implements IoStream {
|
||||||
this.sp = sp;
|
this.sp = sp;
|
||||||
this.port = port;
|
this.port = port;
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
|
this.dataBuffer = IncomingDataBuffer.createDataBuffer(this, logger);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -61,11 +62,6 @@ public class SerialIoStreamJSerialComm implements IoStream {
|
||||||
return isClosed;
|
return isClosed;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setDataBuffer(IncomingDataBuffer dataBuffer) {
|
|
||||||
this.dataBuffer = dataBuffer;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IncomingDataBuffer getDataBuffer() {
|
public IncomingDataBuffer getDataBuffer() {
|
||||||
return dataBuffer;
|
return dataBuffer;
|
||||||
|
|
|
@ -21,7 +21,7 @@ public class TcpIoStream implements IoStream {
|
||||||
private final OutputStream output;
|
private final OutputStream output;
|
||||||
private final Logger logger;
|
private final Logger logger;
|
||||||
private boolean isClosed;
|
private boolean isClosed;
|
||||||
private IncomingDataBuffer dataBuffer;
|
private final IncomingDataBuffer dataBuffer;
|
||||||
|
|
||||||
public TcpIoStream(Logger logger, Socket socket) throws IOException {
|
public TcpIoStream(Logger logger, Socket socket) throws IOException {
|
||||||
InputStream input = new BufferedInputStream(socket.getInputStream());
|
InputStream input = new BufferedInputStream(socket.getInputStream());
|
||||||
|
@ -34,11 +34,6 @@ public class TcpIoStream implements IoStream {
|
||||||
this.output = output;
|
this.output = output;
|
||||||
this.input = input;
|
this.input = input;
|
||||||
IncomingDataBuffer dataBuffer = IncomingDataBuffer.createDataBuffer(this, logger);
|
IncomingDataBuffer dataBuffer = IncomingDataBuffer.createDataBuffer(this, logger);
|
||||||
setDataBuffer(dataBuffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setDataBuffer(IncomingDataBuffer dataBuffer) {
|
|
||||||
this.dataBuffer = dataBuffer;
|
this.dataBuffer = dataBuffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue