code review fixes

Author: subes

src/matlabcontrol/MatlabProxyFactoryOptions.java

@@ -33,7 +33,7 @@ public class MatlabProxyFactoryOptions {
 	private final String _licenseFile;
 	private final boolean _useSingleCompThread;
 	private final int _port;
-	private final Writer _inputWriter;
+	private final Writer _outputWriter;
 	private final Writer _errorWriter;
 
 	private MatlabProxyFactoryOptions(Builder options) {
@@ -49,7 +49,7 @@ private MatlabProxyFactoryOptions(Builder options) {
 		_licenseFile = options._licenseFile;
 		_useSingleCompThread = options._useSingleCompThread;
 		_port = options._port;
-		_inputWriter = options._inputWriter;
+		_outputWriter = options._outputWriter;
 		_errorWriter = options._errorWriter;
 	}
 
@@ -101,8 +101,8 @@ int getPort() {
 		return _port;
 	}
 
-	Writer getInputWriter() {
-		return _inputWriter;
+	Writer getOutputWriter() {
+		return _outputWriter;
 	}
 
 	Writer getErrorWriter() {
@@ -140,8 +140,8 @@ public static class Builder {
 		private volatile String _licenseFile = null;
 		private volatile boolean _useSingleCompThread = false;
 		private volatile int _port = 2100;
-		private volatile Writer _inputWriter;
-		private volatile Writer _errorWriter;
+		private volatile Writer _outputWriter = null;
+		private volatile Writer _errorWriter = null;
 
 		//Assigning to a long is not atomic, so use an AtomicLong so that a thread always sees an intended value
 		private final AtomicLong _proxyTimeout = new AtomicLong(180000L);
@@ -403,13 +403,13 @@ public final Builder setPort(int port) {
 		}
 
 		/**
-		 * Sets the input writer where the standard output of the created matlab process is written to.
+		 * Sets the output writer where the standard output of the created matlab process is written to.
 		 * This is only used when an actual process is spawned for the matlab proxy instance.
 		 * 
-		 * @param inputWriter
+		 * @param outputWriter
 		 */
-		public final Builder setInputWriter(Writer inputWriter) {
-			_inputWriter = inputWriter;
+		public final Builder setOutputWriter(Writer outputWriter) {
+			_outputWriter = outputWriter;
 
 			return this;
 		}
@@ -418,7 +418,7 @@ public final Builder setInputWriter(Writer inputWriter) {
 		 * Sets the error writer where the error output of the created matlab process is written to. 
 		 * This is only used when an actual process is spawned for the matlab proxy instance.
 		 * 
-		 * @param inputWriter
+		 * @param errorWriter
 		 */
 		public final Builder setErrorWriter(Writer errorWriter) {
 			_errorWriter = errorWriter;

src/matlabcontrol/RemoteMatlabProxyFactory.java

@@ -274,7 +274,7 @@ private Process createProcess(RemoteRequestReceiver receiver) throws MatlabConne
 
 			//If running under UNIX and MATLAB is hidden these streams need to be read so that MATLAB does not block
 			if (_options.getHidden() && !Configuration.isWindows()) {
-				new ProcessStreamDrainer(process.getInputStream(), "Input", _options.getInputWriter()).start();
+				new ProcessStreamDrainer(process.getInputStream(), "Output", _options.getOutputWriter()).start();
 				new ProcessStreamDrainer(process.getErrorStream(), "Error", _options.getErrorWriter()).start();
 			}