From a9cd24916660d176c0133a1b072ce994e0db92ec Mon Sep 17 00:00:00 2001
From: rusefi <rusefi@users.noreply.github.com>
Date: Wed, 1 Mar 2017 19:04:10 -0500
Subject: [PATCH] extracting opensr5

---
 .../io/src/com/rusefi/binaryprotocol/BinaryProtocol.java      | 1 +
 .../io/src/com/rusefi/binaryprotocol/IncomingDataBuffer.java  | 2 +-
 java_console/io/src/com/rusefi/io/serial/SerialIoStream.java  | 2 +-
 java_console/logging/src/com/rusefi/FileLog.java              | 1 +
 java_console/models/src/com/rusefi/AverageAnglesUtil.java     | 2 ++
 .../src/com/rusefi => opensr5/src/com/opensr5}/Logger.java    | 4 ++--
 java_console/ui/src/com/rusefi/UploadChanges.java             | 1 +
 .../ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmd.java   | 1 +
 8 files changed, 10 insertions(+), 4 deletions(-)
 rename java_console/{logging/src/com/rusefi => opensr5/src/com/opensr5}/Logger.java (89%)

diff --git a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java
index 81f0cd336e..7acaa889ef 100644
--- a/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java
+++ b/java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java
@@ -1,6 +1,7 @@
 package com.rusefi.binaryprotocol;
 
 import com.opensr5.ConfigurationImage;
+import com.opensr5.Logger;
 import com.opensr5.io.DataListener;
 import com.rusefi.*;
 import com.rusefi.config.FieldType;
diff --git a/java_console/io/src/com/rusefi/binaryprotocol/IncomingDataBuffer.java b/java_console/io/src/com/rusefi/binaryprotocol/IncomingDataBuffer.java
index bd7e6884c7..f5e79efdd2 100644
--- a/java_console/io/src/com/rusefi/binaryprotocol/IncomingDataBuffer.java
+++ b/java_console/io/src/com/rusefi/binaryprotocol/IncomingDataBuffer.java
@@ -1,6 +1,6 @@
 package com.rusefi.binaryprotocol;
 
-import com.rusefi.Logger;
+import com.opensr5.Logger;
 import com.rusefi.Timeouts;
 import etch.util.CircularByteBuffer;
 import net.jcip.annotations.ThreadSafe;
diff --git a/java_console/io/src/com/rusefi/io/serial/SerialIoStream.java b/java_console/io/src/com/rusefi/io/serial/SerialIoStream.java
index efa944c048..cbeb3acd75 100644
--- a/java_console/io/src/com/rusefi/io/serial/SerialIoStream.java
+++ b/java_console/io/src/com/rusefi/io/serial/SerialIoStream.java
@@ -1,7 +1,7 @@
 package com.rusefi.io.serial;
 
 import com.rusefi.FileLog;
-import com.rusefi.Logger;
+import com.opensr5.Logger;
 import com.opensr5.io.DataListener;
 import com.rusefi.io.IoStream;
 import jssc.SerialPort;
diff --git a/java_console/logging/src/com/rusefi/FileLog.java b/java_console/logging/src/com/rusefi/FileLog.java
index bff4f2f73b..a5aeaaa136 100644
--- a/java_console/logging/src/com/rusefi/FileLog.java
+++ b/java_console/logging/src/com/rusefi/FileLog.java
@@ -1,5 +1,6 @@
 package com.rusefi;
 
+import com.opensr5.Logger;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.*;
diff --git a/java_console/models/src/com/rusefi/AverageAnglesUtil.java b/java_console/models/src/com/rusefi/AverageAnglesUtil.java
index 23ab97c9e6..c2e77e7418 100644
--- a/java_console/models/src/com/rusefi/AverageAnglesUtil.java
+++ b/java_console/models/src/com/rusefi/AverageAnglesUtil.java
@@ -1,5 +1,7 @@
 package com.rusefi;
 
+import com.opensr5.Logger;
+
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
diff --git a/java_console/logging/src/com/rusefi/Logger.java b/java_console/opensr5/src/com/opensr5/Logger.java
similarity index 89%
rename from java_console/logging/src/com/rusefi/Logger.java
rename to java_console/opensr5/src/com/opensr5/Logger.java
index dc9f8a1ef7..78bb0add8a 100644
--- a/java_console/logging/src/com/rusefi/Logger.java
+++ b/java_console/opensr5/src/com/opensr5/Logger.java
@@ -1,4 +1,4 @@
-package com.rusefi;
+package com.opensr5;
 
 /**
  * (c) Andrey Belomutskiy
@@ -18,7 +18,7 @@ public interface Logger {
 
         @Override
         public void error(String msg) {
-            System.out.println(msg);
+            System.err.println(msg);
         }
     };
 
diff --git a/java_console/ui/src/com/rusefi/UploadChanges.java b/java_console/ui/src/com/rusefi/UploadChanges.java
index ee79b7d0d0..c571ce27da 100644
--- a/java_console/ui/src/com/rusefi/UploadChanges.java
+++ b/java_console/ui/src/com/rusefi/UploadChanges.java
@@ -1,6 +1,7 @@
 package com.rusefi;
 
 import com.opensr5.ConfigurationImage;
+import com.opensr5.Logger;
 import com.rusefi.binaryprotocol.BinaryProtocol;
 import com.opensr5.io.ConfigurationImageFile;
 import com.rusefi.io.LinkManager;
diff --git a/java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmd.java b/java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmd.java
index 0dfd95cb0d..c12342d95b 100644
--- a/java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmd.java
+++ b/java_console/ui/src/com/rusefi/binaryprotocol/BinaryProtocolCmd.java
@@ -1,6 +1,7 @@
 package com.rusefi.binaryprotocol;
 
 import com.opensr5.ConfigurationImage;
+import com.opensr5.Logger;
 import com.romraider.editor.ecu.ECUEditor;
 import com.rusefi.*;
 import com.opensr5.io.ConfigurationImageFile;