rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring

This commit is contained in:
rusefi 2019-08-14 21:46:43 -04:00
parent 84479cae9a
commit 236bf8c143
1 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
java_console/io/src/com/rusefi/io/serial/PortHolder.java
View File

@ -11,7 +11,6 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.util.Objects;
/** /**
* This class holds the reference to the actual Serial port object * This class holds the reference to the actual Serial port object
@ -51,23 +50,14 @@ public class PortHolder {
* @return true if everything fine * @return true if everything fine
*/ */
private boolean open(String port, final DataListener listener) { private boolean open(String port, final DataListener listener) {
IoStream stream; EstablishConnection establishConnection = new EstablishConnection(port).invoke();
// todo: BUG: Mac version 10 also 'is windows10 == true' at the moment :) if (!establishConnection.isConnected())
boolean windows10 = isWindows10();
FileLog.MAIN.logLine("Is windows10: " + windows10);
if (windows10) {
// this implementation is way simpler but seems to kind of work, keeping just in case
stream = SerialIoStreamJSerialComm.open(port, BAUD_RATE, FileLog.LOGGER);
} else {
stream = SerialIoStreamJSSC.open(port, BAUD_RATE, FileLog.LOGGER);
}
if (stream == null)
return false; return false;
synchronized (portLock) { synchronized (portLock) {
this.serialPort = stream; PortHolder.this.serialPort = establishConnection.stream;
portLock.notifyAll(); portLock.notifyAll();
} }
IoStream stream = establishConnection.getStream();
bp = BinaryProtocolHolder.create(FileLog.LOGGER, stream); bp = BinaryProtocolHolder.create(FileLog.LOGGER, stream);
@ -110,4 +100,41 @@ public class PortHolder {
public static PortHolder getInstance() { public static PortHolder getInstance() {
return instance; return instance;
} }
public static class EstablishConnection {
private boolean isConnected;
private String port;
private IoStream stream;
public EstablishConnection(String port) {
this.port = port;
}
public boolean isConnected() {
return isConnected;
}
public IoStream getStream() {
return stream;
}
public EstablishConnection invoke() {
// todo: BUG: Mac version 10 also 'is windows10 == true' at the moment :)
boolean windows10 = isWindows10();
FileLog.MAIN.logLine("Is windows10: " + windows10);
if (windows10) {
// this implementation is way simpler but seems to kind of work, keeping just in case
stream = SerialIoStreamJSerialComm.open(port, BAUD_RATE, FileLog.LOGGER);
} else {
stream = SerialIoStreamJSSC.open(port, BAUD_RATE, FileLog.LOGGER);
}
if (stream == null) {
isConnected = false;
return this;
}
isConnected = true;
return this;
}
}
} }