From 122cb21e98a035491d0bc2aeba3d86953cac0b4d Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 1 Mar 2017 17:51:35 -0500 Subject: [PATCH] refactoring --- java_console/io/src/com/rusefi/io/LinkConnector.java | 7 ------- java_console/io/src/com/rusefi/io/LinkManager.java | 5 +++-- java_console/io/src/com/rusefi/io/tcp/TcpConnector.java | 9 +-------- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/java_console/io/src/com/rusefi/io/LinkConnector.java b/java_console/io/src/com/rusefi/io/LinkConnector.java index b72a7d099a..b151bdd7c9 100644 --- a/java_console/io/src/com/rusefi/io/LinkConnector.java +++ b/java_console/io/src/com/rusefi/io/LinkConnector.java @@ -27,11 +27,6 @@ public interface LinkConnector extends LinkDecoder { public String unpack(String packet) { return LinkDecoder.TEXT_PROTOCOL_DECODER.unpack(packet); } - - @Override - public String unpackConfirmation(String message) { - return message; - } }; void connect(ConnectionStateListener listener); @@ -41,6 +36,4 @@ public interface LinkConnector extends LinkDecoder { void restart(); boolean hasError(); - - String unpackConfirmation(String message); } diff --git a/java_console/io/src/com/rusefi/io/LinkManager.java b/java_console/io/src/com/rusefi/io/LinkManager.java index d86a5f5aa8..801f38a7ae 100644 --- a/java_console/io/src/com/rusefi/io/LinkManager.java +++ b/java_console/io/src/com/rusefi/io/LinkManager.java @@ -122,7 +122,8 @@ public class LinkManager { } public static String unpackConfirmation(String message) { - return connector.unpackConfirmation(message); + if (message.startsWith(CommandQueue.CONFIRMATION_PREFIX)) + return message.substring(CommandQueue.CONFIRMATION_PREFIX.length()); + return null; } - } diff --git a/java_console/io/src/com/rusefi/io/tcp/TcpConnector.java b/java_console/io/src/com/rusefi/io/tcp/TcpConnector.java index dbe8e09923..3fcd035001 100644 --- a/java_console/io/src/com/rusefi/io/tcp/TcpConnector.java +++ b/java_console/io/src/com/rusefi/io/tcp/TcpConnector.java @@ -147,14 +147,7 @@ public class TcpConnector implements LinkConnector { // e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. // } } - - @Override - public String unpackConfirmation(String message) { - if (message.startsWith(CommandQueue.CONFIRMATION_PREFIX)) - return message.substring(CommandQueue.CONFIRMATION_PREFIX.length()); - return null; - } - + public static Collection getAvailablePorts() { return isTcpPortOpened() ? Collections.singletonList("" + DEFAULT_PORT) : Collections.emptyList(); }