diff --git a/java_console/io/src/com/rusefi/file/BaseMap.java b/java_console/io/src/com/rusefi/file/BaseMap.java index 1f3153df14..3291dcac53 100644 --- a/java_console/io/src/com/rusefi/file/BaseMap.java +++ b/java_console/io/src/com/rusefi/file/BaseMap.java @@ -1,13 +1,7 @@ package com.rusefi.file; import com.rusefi.FileLog; -import com.rusefi.core.EngineState; -import com.rusefi.models.Point3D; import com.rusefi.models.XYData; -import com.rusefi.waves.EngineReport; - -import java.util.HashMap; -import java.util.Map; /** * 7/18/13 @@ -23,6 +17,7 @@ public class BaseMap { FileLog.MAIN.logLine("Loading " + key + ">" + value); final XYData data = new XYData(); + /* EngineState.EngineStateListener listener = new EngineState.EngineStateListenerImpl() { Map values = new HashMap(); @@ -58,6 +53,7 @@ public class BaseMap { }); FileUtils.readFile2(filename, engineState); //return AverageData.average(data, 8); + */ return data; } } diff --git a/java_console/io/src/com/rusefi/io/ConnectionStatusLogic.java b/java_console/io/src/com/rusefi/io/ConnectionStatusLogic.java index f86f7518a3..66a8e5b5ae 100644 --- a/java_console/io/src/com/rusefi/io/ConnectionStatusLogic.java +++ b/java_console/io/src/com/rusefi/io/ConnectionStatusLogic.java @@ -35,14 +35,6 @@ public class ConnectionStatusLogic { private List listeners = new CopyOnWriteArrayList<>(); private ConnectionStatusLogic() { - - LinkManager.engineState.timeListeners.add(new EngineTimeListener() { - @Override - public void onTime(double time) { - markConnected(); - } - }); - SensorCentral.getInstance().addListener(Sensor.TIME_SECONDS, new SensorCentral.SensorListener() { @Override public void onSensorUpdate(double value) { diff --git a/java_console/models/src/com/rusefi/core/EngineState.java b/java_console/models/src/com/rusefi/core/EngineState.java index 57caa87f2e..e6de5ef77c 100644 --- a/java_console/models/src/com/rusefi/core/EngineState.java +++ b/java_console/models/src/com/rusefi/core/EngineState.java @@ -253,7 +253,7 @@ public class EngineState { void onUpdate(V value); } - public interface EngineStateListener extends EngineTimeListener { + public interface EngineStateListener { void beforeLine(String fullLine); void onKeyValue(String key, String value); @@ -271,8 +271,5 @@ public class EngineState { public void afterLine(String fullLine) { } - - public void onTime(double time) { - } } } diff --git a/java_console/ui/src/com/rusefi/EcuStimulator.java b/java_console/ui/src/com/rusefi/EcuStimulator.java index 5c1f4f000c..32b089cdb2 100644 --- a/java_console/ui/src/com/rusefi/EcuStimulator.java +++ b/java_console/ui/src/com/rusefi/EcuStimulator.java @@ -2,7 +2,6 @@ package com.rusefi; import com.rusefi.core.MessagesCentral; import com.rusefi.core.Sensor; -import com.rusefi.core.EngineTimeListener; import com.rusefi.core.SensorCentral; import com.rusefi.file.TableGenerator; import com.rusefi.models.Point3D; @@ -13,14 +12,15 @@ import com.rusefi.ui.ChartHelper; import com.rusefi.ui.RpmModel; import com.rusefi.ui.widgets.PotCommand; import com.rusefi.ui.widgets.RpmCommand; -import com.rusefi.io.LinkManager; import net.ericaro.surfaceplotter.DefaultSurfaceModel; import javax.swing.*; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.*; +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -283,6 +283,7 @@ public class EcuStimulator { final CountDownLatch latch = new CountDownLatch(MEASURES); + /* EngineTimeListener listener = new EngineTimeListener() { @Override public void onTime(double time) { @@ -303,6 +304,7 @@ public class EcuStimulator { throw new IllegalStateException(e); } LinkManager.engineState.timeListeners.remove(listener); + */ return result; }