From 51e4b484d966d1de8659d8384d17e5f1d45387ff Mon Sep 17 00:00:00 2001 From: rusEfi Date: Mon, 16 Feb 2015 11:04:58 -0600 Subject: [PATCH] auto-sync --- .../autotest/src/com/rusefi/IoUtil.java | 7 ++- .../io/src/com/rusefi/file/BaseMap.java | 6 +-- .../io/src/com/rusefi/file/FileUtils.java | 2 +- .../src/com/rusefi/file/TableGenerator.java | 4 +- .../io/src/com/rusefi/io/CommandQueue.java | 2 +- .../io/src/com/rusefi/io/LinkManager.java | 2 +- .../src/com/rusefi/io/serial/PortHolder.java | 2 +- .../com/rusefi/io/serial/SerialManager.java | 2 +- .../com/{irnems => rusefi}/Histograms.java | 3 +- .../com/{irnems => rusefi}/ReportLine.java | 6 +-- .../com/{irnems => rusefi}/ReportReader.java | 11 ++-- .../{irnems => rusefi}/core/EngineState.java | 2 +- .../core/EngineTimeListener.java | 2 +- .../core/MessagesCentral.java | 2 +- .../src/com/{irnems => rusefi}/core/Pair.java | 2 +- .../core/ResponseBuffer.java | 4 +- .../com/{irnems => rusefi}/core/Sensor.java | 2 +- .../core/SensorCategory.java | 2 +- .../core/SensorCentral.java | 2 +- .../{irnems => rusefi}/core/SensorStats.java | 2 +- .../core/test/EngineStateTest.java | 8 +-- .../core/test/ResponseBufferTest.java | 6 +-- .../models/AverageData.java | 2 +- .../{irnems => rusefi}/models/Factory.java | 2 +- .../{irnems => rusefi}/models/MafValue.java | 2 +- .../{irnems => rusefi}/models/Point3D.java | 2 +- .../com/{irnems => rusefi}/models/Range.java | 2 +- .../{irnems => rusefi}/models/RpmValue.java | 2 +- .../com/{irnems => rusefi}/models/Utils.java | 2 +- .../com/{irnems => rusefi}/models/XYData.java | 2 +- .../models/XYDataReader.java | 2 +- .../{irnems => rusefi}/models/YAxisData.java | 2 +- .../models/test/UtilTest.java | 11 ++-- .../models/test/XYDataSandbox.java | 4 +- .../test/HistogramsTest.java | 6 +-- .../waves/TimeAxisTranslator.java | 2 +- .../src/com/rusefi/waves/WaveReport.java | 2 - .../waves/ZoomProvider.java | 2 +- .../com/rusefi/waves/test/WaveReportTest.java | 2 +- .../ui/src/com/rusefi/AnalogChartCentral.java | 3 +- .../ui/src/com/rusefi/AverageAnglePanel.java | 2 +- .../ui/src/com/rusefi/EcuStimulator.java | 15 +++--- java_console/ui/src/com/rusefi/Launcher.java | 7 ++- .../ui/src/com/rusefi/StartupFrame.java | 1 + .../ui/src/com/rusefi/ValueRangeControl.java | 1 - .../rusefi/maintenance/FirmwareFlasher.java | 2 +- .../rusefi/test/AnalogChartPanelSandbox.java | 2 +- .../com/rusefi/test/EcuStimulatorSandbox.java | 2 +- .../src/com/rusefi/test/MsgPanelSandbox.java | 2 +- .../ui/src/com/rusefi/ui/ChartHelper.java | 4 +- .../src/com/rusefi/ui/ConnectionStatus.java | 54 ++++++++++++++++++- .../ui/src/com/rusefi/ui/GaugesPanel.java | 3 +- .../ui/src/com/rusefi/ui/Live3DReport.java | 8 +-- .../ui/src/com/rusefi/ui/MessagesPanel.java | 2 +- .../ui/src/com/rusefi/ui/RpmLabel.java | 31 ++++------- .../ui/src/com/rusefi/ui/RpmModel.java | 4 +- .../ui/src/com/rusefi/ui/RpmPanel.java | 4 +- .../ui/src/com/rusefi/ui/ShowMap.java | 3 +- .../ui/src/com/rusefi/ui/WarningPanel.java | 2 +- java_console/ui/src/com/rusefi/ui/Wizard.java | 4 +- .../rusefi/ui/engine/EngineSnifferPanel.java | 6 +-- .../ui/engine/EngineSnifferStatusPanel.java | 4 +- .../src/com/rusefi/ui/engine/UpDownImage.java | 8 +-- .../src/com/rusefi/ui/engine/ZoomControl.java | 2 +- .../rusefi/ui/engine/test/UpDownSandbox.java | 2 +- .../ui/{ => fsio}/FlexibleControls.java | 2 +- .../logview/FileItem.java} | 6 +-- .../rusefi/ui/{ => logview}/LogViewer.java | 16 +++--- .../ui/test/FlexibleControlsSandbox.java | 4 +- .../ui/test/RpmModelTest.java | 2 +- .../ui/test/WavePanelSandbox.java | 4 +- .../com/rusefi/ui/{ => util}/FrameHelper.java | 2 +- .../rusefi/{ => ui/util}/HorizontalLine.java | 2 +- .../rusefi/ui/widgets/AdcDebugControl.java | 2 +- .../ui/widgets/BooleanFlagControlPanel.java | 4 +- .../com/rusefi/ui/widgets/DetachedSensor.java | 2 +- .../src/com/rusefi/ui/widgets/IdleLabel.java | 4 +- .../rusefi/ui/widgets/InjectorControl.java | 2 +- .../src/com/rusefi/ui/widgets/MafCommand.java | 2 +- .../src/com/rusefi/ui/widgets/PotCommand.java | 6 +-- .../com/rusefi/ui/widgets/SensorGauge.java | 6 +-- 81 files changed, 205 insertions(+), 169 deletions(-) rename java_console/models/src/com/{irnems => rusefi}/Histograms.java (99%) rename java_console/models/src/com/{irnems => rusefi}/ReportLine.java (90%) rename java_console/models/src/com/{irnems => rusefi}/ReportReader.java (96%) rename java_console/models/src/com/{irnems => rusefi}/core/EngineState.java (99%) rename java_console/models/src/com/{irnems => rusefi}/core/EngineTimeListener.java (82%) rename java_console/models/src/com/{irnems => rusefi}/core/MessagesCentral.java (98%) rename java_console/models/src/com/{irnems => rusefi}/core/Pair.java (94%) rename java_console/models/src/com/{irnems => rusefi}/core/ResponseBuffer.java (95%) rename java_console/models/src/com/{irnems => rusefi}/core/Sensor.java (99%) rename java_console/models/src/com/{irnems => rusefi}/core/SensorCategory.java (92%) rename java_console/models/src/com/{irnems => rusefi}/core/SensorCentral.java (99%) rename java_console/models/src/com/{irnems => rusefi}/core/SensorStats.java (99%) rename java_console/models/src/com/{irnems => rusefi}/core/test/EngineStateTest.java (90%) rename java_console/models/src/com/{irnems => rusefi}/core/test/ResponseBufferTest.java (90%) rename java_console/models/src/com/{irnems => rusefi}/models/AverageData.java (98%) rename java_console/models/src/com/{irnems => rusefi}/models/Factory.java (80%) rename java_console/models/src/com/{irnems => rusefi}/models/MafValue.java (95%) rename java_console/models/src/com/{irnems => rusefi}/models/Point3D.java (97%) rename java_console/models/src/com/{irnems => rusefi}/models/Range.java (94%) rename java_console/models/src/com/{irnems => rusefi}/models/RpmValue.java (94%) rename java_console/models/src/com/{irnems => rusefi}/models/Utils.java (98%) rename java_console/models/src/com/{irnems => rusefi}/models/XYData.java (99%) rename java_console/models/src/com/{irnems => rusefi}/models/XYDataReader.java (97%) rename java_console/models/src/com/{irnems => rusefi}/models/YAxisData.java (99%) rename java_console/models/src/com/{irnems => rusefi}/models/test/UtilTest.java (68%) rename java_console/models/src/com/{irnems => rusefi}/models/test/XYDataSandbox.java (82%) rename java_console/models/src/com/{irnems => rusefi}/test/HistogramsTest.java (91%) rename java_console/models/src/com/{irnems => rusefi}/waves/TimeAxisTranslator.java (91%) rename java_console/models/src/com/{irnems => rusefi}/waves/ZoomProvider.java (92%) rename java_console/ui/src/com/rusefi/ui/{ => fsio}/FlexibleControls.java (97%) rename java_console/ui/src/com/rusefi/{FIleItem.java => ui/logview/FileItem.java} (78%) rename java_console/ui/src/com/rusefi/ui/{ => logview}/LogViewer.java (92%) rename java_console/ui/src/com/{irnems => rusefi}/ui/test/RpmModelTest.java (95%) rename java_console/ui/src/com/{irnems => rusefi}/ui/test/WavePanelSandbox.java (97%) rename java_console/ui/src/com/rusefi/ui/{ => util}/FrameHelper.java (98%) rename java_console/ui/src/com/rusefi/{ => ui/util}/HorizontalLine.java (95%) diff --git a/java_console/autotest/src/com/rusefi/IoUtil.java b/java_console/autotest/src/com/rusefi/IoUtil.java index a79a144f3e..737bc2033a 100644 --- a/java_console/autotest/src/com/rusefi/IoUtil.java +++ b/java_console/autotest/src/com/rusefi/IoUtil.java @@ -1,9 +1,8 @@ package com.rusefi; -import com.rusefi.FileLog; -import com.irnems.core.EngineState; -import com.irnems.core.Sensor; -import com.irnems.core.SensorCentral; +import com.rusefi.core.EngineState; +import com.rusefi.core.Sensor; +import com.rusefi.core.SensorCentral; import com.rusefi.io.CommandQueue; import com.rusefi.io.InvocationConfirmationListener; import com.rusefi.io.LinkManager; diff --git a/java_console/io/src/com/rusefi/file/BaseMap.java b/java_console/io/src/com/rusefi/file/BaseMap.java index eb4be7bf14..1c68cf4ff4 100644 --- a/java_console/io/src/com/rusefi/file/BaseMap.java +++ b/java_console/io/src/com/rusefi/file/BaseMap.java @@ -1,9 +1,9 @@ package com.rusefi.file; import com.rusefi.FileLog; -import com.irnems.core.EngineState; -import com.irnems.models.Point3D; -import com.irnems.models.XYData; +import com.rusefi.core.EngineState; +import com.rusefi.models.Point3D; +import com.rusefi.models.XYData; import java.util.HashMap; import java.util.Map; diff --git a/java_console/io/src/com/rusefi/file/FileUtils.java b/java_console/io/src/com/rusefi/file/FileUtils.java index 91dffb4793..ad8e4b4b89 100644 --- a/java_console/io/src/com/rusefi/file/FileUtils.java +++ b/java_console/io/src/com/rusefi/file/FileUtils.java @@ -1,6 +1,6 @@ package com.rusefi.file; -import com.irnems.core.EngineState; +import com.rusefi.core.EngineState; import java.io.*; import java.util.List; diff --git a/java_console/io/src/com/rusefi/file/TableGenerator.java b/java_console/io/src/com/rusefi/file/TableGenerator.java index 39af5b1409..1ab79b39ac 100644 --- a/java_console/io/src/com/rusefi/file/TableGenerator.java +++ b/java_console/io/src/com/rusefi/file/TableGenerator.java @@ -1,7 +1,7 @@ package com.rusefi.file; -import com.irnems.models.XYData; -import com.irnems.models.XYDataReader; +import com.rusefi.models.XYData; +import com.rusefi.models.XYDataReader; import java.io.BufferedWriter; import java.io.FileWriter; diff --git a/java_console/io/src/com/rusefi/io/CommandQueue.java b/java_console/io/src/com/rusefi/io/CommandQueue.java index 8c0bcbc01c..95720c2c63 100644 --- a/java_console/io/src/com/rusefi/io/CommandQueue.java +++ b/java_console/io/src/com/rusefi/io/CommandQueue.java @@ -1,6 +1,6 @@ package com.rusefi.io; -import com.irnems.core.MessagesCentral; +import com.rusefi.core.MessagesCentral; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/java_console/io/src/com/rusefi/io/LinkManager.java b/java_console/io/src/com/rusefi/io/LinkManager.java index dc524b37bb..9efe5b5497 100644 --- a/java_console/io/src/com/rusefi/io/LinkManager.java +++ b/java_console/io/src/com/rusefi/io/LinkManager.java @@ -1,7 +1,7 @@ package com.rusefi.io; import com.rusefi.FileLog; -import com.irnems.core.EngineState; +import com.rusefi.core.EngineState; import com.rusefi.io.serial.SerialConnector; import com.rusefi.io.tcp.TcpConnector; diff --git a/java_console/io/src/com/rusefi/io/serial/PortHolder.java b/java_console/io/src/com/rusefi/io/serial/PortHolder.java index 04063b13b3..b38c5f3356 100644 --- a/java_console/io/src/com/rusefi/io/serial/PortHolder.java +++ b/java_console/io/src/com/rusefi/io/serial/PortHolder.java @@ -1,7 +1,7 @@ package com.rusefi.io.serial; import com.rusefi.FileLog; -import com.irnems.core.EngineState; +import com.rusefi.core.EngineState; import com.rusefi.io.DataListener; import jssc.SerialPort; import jssc.SerialPortException; diff --git a/java_console/io/src/com/rusefi/io/serial/SerialManager.java b/java_console/io/src/com/rusefi/io/serial/SerialManager.java index 4025be3676..0dd0c7c9d0 100644 --- a/java_console/io/src/com/rusefi/io/serial/SerialManager.java +++ b/java_console/io/src/com/rusefi/io/serial/SerialManager.java @@ -1,7 +1,7 @@ package com.rusefi.io.serial; import com.rusefi.FileLog; -import com.irnems.core.MessagesCentral; +import com.rusefi.core.MessagesCentral; import com.rusefi.io.DataListener; import com.rusefi.io.LinkManager; diff --git a/java_console/models/src/com/irnems/Histograms.java b/java_console/models/src/com/rusefi/Histograms.java similarity index 99% rename from java_console/models/src/com/irnems/Histograms.java rename to java_console/models/src/com/rusefi/Histograms.java index 0955a91981..656668cd7c 100644 --- a/java_console/models/src/com/irnems/Histograms.java +++ b/java_console/models/src/com/rusefi/Histograms.java @@ -1,6 +1,5 @@ -package com.irnems; +package com.rusefi; -import com.rusefi.FileLog; import org.jetbrains.annotations.NotNull; import java.text.FieldPosition; diff --git a/java_console/models/src/com/irnems/ReportLine.java b/java_console/models/src/com/rusefi/ReportLine.java similarity index 90% rename from java_console/models/src/com/irnems/ReportLine.java rename to java_console/models/src/com/rusefi/ReportLine.java index 6dfd4a7a95..6dde3c5f78 100644 --- a/java_console/models/src/com/irnems/ReportLine.java +++ b/java_console/models/src/com/rusefi/ReportLine.java @@ -1,7 +1,7 @@ -package com.irnems; +package com.rusefi; -import com.irnems.models.MafValue; -import com.irnems.models.RpmValue; +import com.rusefi.models.MafValue; +import com.rusefi.models.RpmValue; /** * @author Andrey Belomutskiy diff --git a/java_console/models/src/com/irnems/ReportReader.java b/java_console/models/src/com/rusefi/ReportReader.java similarity index 96% rename from java_console/models/src/com/irnems/ReportReader.java rename to java_console/models/src/com/rusefi/ReportReader.java index 03e36a9bd4..b7fac9c122 100644 --- a/java_console/models/src/com/irnems/ReportReader.java +++ b/java_console/models/src/com/rusefi/ReportReader.java @@ -1,10 +1,9 @@ -package com.irnems; +package com.rusefi; -import com.irnems.models.Factory; -import com.irnems.models.MafValue; -import com.irnems.models.RpmValue; -import com.irnems.models.Utils; -import com.rusefi.FileLog; +import com.rusefi.models.Factory; +import com.rusefi.models.MafValue; +import com.rusefi.models.RpmValue; +import com.rusefi.models.Utils; import java.io.*; import java.util.*; diff --git a/java_console/models/src/com/irnems/core/EngineState.java b/java_console/models/src/com/rusefi/core/EngineState.java similarity index 99% rename from java_console/models/src/com/irnems/core/EngineState.java rename to java_console/models/src/com/rusefi/core/EngineState.java index 0d5e0189b6..baee086a5f 100644 --- a/java_console/models/src/com/irnems/core/EngineState.java +++ b/java_console/models/src/com/rusefi/core/EngineState.java @@ -1,4 +1,4 @@ -package com.irnems.core; +package com.rusefi.core; import com.rusefi.FileLog; import com.rusefi.SensorConversion; diff --git a/java_console/models/src/com/irnems/core/EngineTimeListener.java b/java_console/models/src/com/rusefi/core/EngineTimeListener.java similarity index 82% rename from java_console/models/src/com/irnems/core/EngineTimeListener.java rename to java_console/models/src/com/rusefi/core/EngineTimeListener.java index d7cb4dd098..200380512b 100644 --- a/java_console/models/src/com/irnems/core/EngineTimeListener.java +++ b/java_console/models/src/com/rusefi/core/EngineTimeListener.java @@ -1,4 +1,4 @@ -package com.irnems.core; +package com.rusefi.core; /** * Date: 3/26/13 diff --git a/java_console/models/src/com/irnems/core/MessagesCentral.java b/java_console/models/src/com/rusefi/core/MessagesCentral.java similarity index 98% rename from java_console/models/src/com/irnems/core/MessagesCentral.java rename to java_console/models/src/com/rusefi/core/MessagesCentral.java index 447e11b811..1d0e68782d 100644 --- a/java_console/models/src/com/irnems/core/MessagesCentral.java +++ b/java_console/models/src/com/rusefi/core/MessagesCentral.java @@ -1,4 +1,4 @@ -package com.irnems.core; +package com.rusefi.core; import com.rusefi.FileLog; import com.rusefi.io.serial.PortHolder; diff --git a/java_console/models/src/com/irnems/core/Pair.java b/java_console/models/src/com/rusefi/core/Pair.java similarity index 94% rename from java_console/models/src/com/irnems/core/Pair.java rename to java_console/models/src/com/rusefi/core/Pair.java index f21c18b0a0..742304c115 100644 --- a/java_console/models/src/com/irnems/core/Pair.java +++ b/java_console/models/src/com/rusefi/core/Pair.java @@ -1,4 +1,4 @@ -package com.irnems.core; +package com.rusefi.core; /** * @author Andrey Belomutskiy diff --git a/java_console/models/src/com/irnems/core/ResponseBuffer.java b/java_console/models/src/com/rusefi/core/ResponseBuffer.java similarity index 95% rename from java_console/models/src/com/irnems/core/ResponseBuffer.java rename to java_console/models/src/com/rusefi/core/ResponseBuffer.java index 3be30fe8ad..f9356fc7da 100644 --- a/java_console/models/src/com/irnems/core/ResponseBuffer.java +++ b/java_console/models/src/com/rusefi/core/ResponseBuffer.java @@ -1,6 +1,6 @@ -package com.irnems.core; +package com.rusefi.core; -import com.irnems.core.test.ResponseBufferTest; +import com.rusefi.core.test.ResponseBufferTest; import org.jetbrains.annotations.NotNull; /** diff --git a/java_console/models/src/com/irnems/core/Sensor.java b/java_console/models/src/com/rusefi/core/Sensor.java similarity index 99% rename from java_console/models/src/com/irnems/core/Sensor.java rename to java_console/models/src/com/rusefi/core/Sensor.java index a64707f521..abdbbc64bc 100644 --- a/java_console/models/src/com/irnems/core/Sensor.java +++ b/java_console/models/src/com/rusefi/core/Sensor.java @@ -1,4 +1,4 @@ -package com.irnems.core; +package com.rusefi.core; import eu.hansolo.steelseries.tools.BackgroundColor; diff --git a/java_console/models/src/com/irnems/core/SensorCategory.java b/java_console/models/src/com/rusefi/core/SensorCategory.java similarity index 92% rename from java_console/models/src/com/irnems/core/SensorCategory.java rename to java_console/models/src/com/rusefi/core/SensorCategory.java index ddddde533c..a70de4478f 100644 --- a/java_console/models/src/com/irnems/core/SensorCategory.java +++ b/java_console/models/src/com/rusefi/core/SensorCategory.java @@ -1,4 +1,4 @@ -package com.irnems.core; +package com.rusefi.core; public enum SensorCategory { OPERATIONS("Operations"), diff --git a/java_console/models/src/com/irnems/core/SensorCentral.java b/java_console/models/src/com/rusefi/core/SensorCentral.java similarity index 99% rename from java_console/models/src/com/irnems/core/SensorCentral.java rename to java_console/models/src/com/rusefi/core/SensorCentral.java index db225b5d7d..aff75a9cfb 100644 --- a/java_console/models/src/com/irnems/core/SensorCentral.java +++ b/java_console/models/src/com/rusefi/core/SensorCentral.java @@ -1,4 +1,4 @@ -package com.irnems.core; +package com.rusefi.core; import java.util.EnumMap; import java.util.List; diff --git a/java_console/models/src/com/irnems/core/SensorStats.java b/java_console/models/src/com/rusefi/core/SensorStats.java similarity index 99% rename from java_console/models/src/com/irnems/core/SensorStats.java rename to java_console/models/src/com/rusefi/core/SensorStats.java index 011189dc04..fd65f13f7f 100644 --- a/java_console/models/src/com/irnems/core/SensorStats.java +++ b/java_console/models/src/com/rusefi/core/SensorStats.java @@ -1,4 +1,4 @@ -package com.irnems.core; +package com.rusefi.core; import com.rusefi.CyclicBuffer; import com.rusefi.SensorConversion; diff --git a/java_console/models/src/com/irnems/core/test/EngineStateTest.java b/java_console/models/src/com/rusefi/core/test/EngineStateTest.java similarity index 90% rename from java_console/models/src/com/irnems/core/test/EngineStateTest.java rename to java_console/models/src/com/rusefi/core/test/EngineStateTest.java index eef34de0f3..591a3ca706 100644 --- a/java_console/models/src/com/irnems/core/test/EngineStateTest.java +++ b/java_console/models/src/com/rusefi/core/test/EngineStateTest.java @@ -1,12 +1,12 @@ -package com.irnems.core.test; +package com.rusefi.core.test; -import com.irnems.core.SensorCentral; -import com.irnems.core.EngineState; +import com.rusefi.core.SensorCentral; +import com.rusefi.core.EngineState; import org.junit.Test; import java.util.concurrent.atomic.AtomicInteger; -import static com.irnems.core.EngineState.SEPARATOR; +import static com.rusefi.core.EngineState.SEPARATOR; import static junit.framework.Assert.*; /** diff --git a/java_console/models/src/com/irnems/core/test/ResponseBufferTest.java b/java_console/models/src/com/rusefi/core/test/ResponseBufferTest.java similarity index 90% rename from java_console/models/src/com/irnems/core/test/ResponseBufferTest.java rename to java_console/models/src/com/rusefi/core/test/ResponseBufferTest.java index 2febc24d9d..47c057e188 100644 --- a/java_console/models/src/com/irnems/core/test/ResponseBufferTest.java +++ b/java_console/models/src/com/rusefi/core/test/ResponseBufferTest.java @@ -1,6 +1,6 @@ -package com.irnems.core.test; +package com.rusefi.core.test; -import com.irnems.core.ResponseBuffer; +import com.rusefi.core.ResponseBuffer; import org.junit.Test; import java.util.concurrent.atomic.AtomicReference; @@ -15,7 +15,7 @@ import static org.junit.Assert.*; public class ResponseBufferTest { @Test public void testSingleLine() { - final AtomicReference currentReference = new AtomicReference(); + final AtomicReference currentReference = new AtomicReference<>(); ResponseBuffer rb = new ResponseBuffer(new ResponseBuffer.ResponseListener() { public void onResponse(String response) { diff --git a/java_console/models/src/com/irnems/models/AverageData.java b/java_console/models/src/com/rusefi/models/AverageData.java similarity index 98% rename from java_console/models/src/com/irnems/models/AverageData.java rename to java_console/models/src/com/rusefi/models/AverageData.java index 9e07ac1b02..f350229509 100644 --- a/java_console/models/src/com/irnems/models/AverageData.java +++ b/java_console/models/src/com/rusefi/models/AverageData.java @@ -1,4 +1,4 @@ -package com.irnems.models; +package com.rusefi.models; import com.rusefi.FileLog; diff --git a/java_console/models/src/com/irnems/models/Factory.java b/java_console/models/src/com/rusefi/models/Factory.java similarity index 80% rename from java_console/models/src/com/irnems/models/Factory.java rename to java_console/models/src/com/rusefi/models/Factory.java index 0284a5fab2..45764d59cb 100644 --- a/java_console/models/src/com/irnems/models/Factory.java +++ b/java_console/models/src/com/rusefi/models/Factory.java @@ -1,4 +1,4 @@ -package com.irnems.models; +package com.rusefi.models; /** * @author Andrey Belomutskiy diff --git a/java_console/models/src/com/irnems/models/MafValue.java b/java_console/models/src/com/rusefi/models/MafValue.java similarity index 95% rename from java_console/models/src/com/irnems/models/MafValue.java rename to java_console/models/src/com/rusefi/models/MafValue.java index 01cf1834c3..b96918f85b 100644 --- a/java_console/models/src/com/irnems/models/MafValue.java +++ b/java_console/models/src/com/rusefi/models/MafValue.java @@ -1,4 +1,4 @@ -package com.irnems.models; +package com.rusefi.models; import com.rusefi.io.tcp.TcpConnector; diff --git a/java_console/models/src/com/irnems/models/Point3D.java b/java_console/models/src/com/rusefi/models/Point3D.java similarity index 97% rename from java_console/models/src/com/irnems/models/Point3D.java rename to java_console/models/src/com/rusefi/models/Point3D.java index 64a040b188..e2cad7b338 100644 --- a/java_console/models/src/com/irnems/models/Point3D.java +++ b/java_console/models/src/com/rusefi/models/Point3D.java @@ -1,4 +1,4 @@ -package com.irnems.models; +package com.rusefi.models; /** * Date: 3/24/13 diff --git a/java_console/models/src/com/irnems/models/Range.java b/java_console/models/src/com/rusefi/models/Range.java similarity index 94% rename from java_console/models/src/com/irnems/models/Range.java rename to java_console/models/src/com/rusefi/models/Range.java index 0edca6c285..5023064e7e 100644 --- a/java_console/models/src/com/irnems/models/Range.java +++ b/java_console/models/src/com/rusefi/models/Range.java @@ -1,4 +1,4 @@ -package com.irnems.models; +package com.rusefi.models; /** * Date: 3/24/13 diff --git a/java_console/models/src/com/irnems/models/RpmValue.java b/java_console/models/src/com/rusefi/models/RpmValue.java similarity index 94% rename from java_console/models/src/com/irnems/models/RpmValue.java rename to java_console/models/src/com/rusefi/models/RpmValue.java index 5124a33330..d7704bf71a 100644 --- a/java_console/models/src/com/irnems/models/RpmValue.java +++ b/java_console/models/src/com/rusefi/models/RpmValue.java @@ -1,4 +1,4 @@ -package com.irnems.models; +package com.rusefi.models; /** * @author Andrey Belomutskiy diff --git a/java_console/models/src/com/irnems/models/Utils.java b/java_console/models/src/com/rusefi/models/Utils.java similarity index 98% rename from java_console/models/src/com/irnems/models/Utils.java rename to java_console/models/src/com/rusefi/models/Utils.java index 18012e5033..21814f30b1 100644 --- a/java_console/models/src/com/irnems/models/Utils.java +++ b/java_console/models/src/com/rusefi/models/Utils.java @@ -1,4 +1,4 @@ -package com.irnems.models; +package com.rusefi.models; import java.util.Map; import java.util.SortedMap; diff --git a/java_console/models/src/com/irnems/models/XYData.java b/java_console/models/src/com/rusefi/models/XYData.java similarity index 99% rename from java_console/models/src/com/irnems/models/XYData.java rename to java_console/models/src/com/rusefi/models/XYData.java index cab3ac941b..f18b57eade 100644 --- a/java_console/models/src/com/irnems/models/XYData.java +++ b/java_console/models/src/com/rusefi/models/XYData.java @@ -1,4 +1,4 @@ -package com.irnems.models; +package com.rusefi.models; import com.rusefi.FileLog; import org.jetbrains.annotations.NotNull; diff --git a/java_console/models/src/com/irnems/models/XYDataReader.java b/java_console/models/src/com/rusefi/models/XYDataReader.java similarity index 97% rename from java_console/models/src/com/irnems/models/XYDataReader.java rename to java_console/models/src/com/rusefi/models/XYDataReader.java index fa9d40fe23..d4ae8d6f03 100644 --- a/java_console/models/src/com/irnems/models/XYDataReader.java +++ b/java_console/models/src/com/rusefi/models/XYDataReader.java @@ -1,4 +1,4 @@ -package com.irnems.models; +package com.rusefi.models; import com.rusefi.FileLog; diff --git a/java_console/models/src/com/irnems/models/YAxisData.java b/java_console/models/src/com/rusefi/models/YAxisData.java similarity index 99% rename from java_console/models/src/com/irnems/models/YAxisData.java rename to java_console/models/src/com/rusefi/models/YAxisData.java index c877a99ee0..ecd2d1fda9 100644 --- a/java_console/models/src/com/irnems/models/YAxisData.java +++ b/java_console/models/src/com/rusefi/models/YAxisData.java @@ -1,4 +1,4 @@ -package com.irnems.models; +package com.rusefi.models; import com.rusefi.FileLog; diff --git a/java_console/models/src/com/irnems/models/test/UtilTest.java b/java_console/models/src/com/rusefi/models/test/UtilTest.java similarity index 68% rename from java_console/models/src/com/irnems/models/test/UtilTest.java rename to java_console/models/src/com/rusefi/models/test/UtilTest.java index 479413a901..296c4e7cae 100644 --- a/java_console/models/src/com/irnems/models/test/UtilTest.java +++ b/java_console/models/src/com/rusefi/models/test/UtilTest.java @@ -1,11 +1,10 @@ -package com.irnems.models.test; +package com.rusefi.models.test; -import com.irnems.models.Utils; import org.junit.Test; import java.util.TreeMap; -import static com.irnems.models.Utils.findClosest; +import static com.rusefi.models.Utils.findClosest; import static junit.framework.Assert.assertEquals; /** @@ -15,7 +14,7 @@ import static junit.framework.Assert.assertEquals; public class UtilTest { @Test public void testClosest() { - TreeMap map = new TreeMap(); + TreeMap map = new TreeMap<>(); map.put(0, "0"); map.put(1, "1"); map.put(10, "10"); @@ -25,6 +24,6 @@ public class UtilTest { assertEquals(0, findClosest(map, 0)); assertEquals(1, findClosest(map, 1)); assertEquals(1, findClosest(map, 3)); - assertEquals(10, findClosest(map, 10)); } - + assertEquals(10, findClosest(map, 10)); + } } diff --git a/java_console/models/src/com/irnems/models/test/XYDataSandbox.java b/java_console/models/src/com/rusefi/models/test/XYDataSandbox.java similarity index 82% rename from java_console/models/src/com/irnems/models/test/XYDataSandbox.java rename to java_console/models/src/com/rusefi/models/test/XYDataSandbox.java index 114b017f9a..616ff71d71 100644 --- a/java_console/models/src/com/irnems/models/test/XYDataSandbox.java +++ b/java_console/models/src/com/rusefi/models/test/XYDataSandbox.java @@ -1,6 +1,6 @@ -package com.irnems.models.test; +package com.rusefi.models.test; -import com.irnems.models.XYData; +import com.rusefi.models.XYData; /** * 7/24/13 diff --git a/java_console/models/src/com/irnems/test/HistogramsTest.java b/java_console/models/src/com/rusefi/test/HistogramsTest.java similarity index 91% rename from java_console/models/src/com/irnems/test/HistogramsTest.java rename to java_console/models/src/com/rusefi/test/HistogramsTest.java index 6c2c959e18..792cda6a01 100644 --- a/java_console/models/src/com/irnems/test/HistogramsTest.java +++ b/java_console/models/src/com/rusefi/test/HistogramsTest.java @@ -1,6 +1,6 @@ -package com.irnems.test; +package com.rusefi.test; -import com.irnems.Histograms; +import com.rusefi.Histograms; import org.junit.Test; import java.util.Random; @@ -8,7 +8,7 @@ import java.util.Random; import static junit.framework.Assert.assertEquals; /** - * Created by pc on 12/18/13. + * 12/18/13 */ public class HistogramsTest { diff --git a/java_console/models/src/com/irnems/waves/TimeAxisTranslator.java b/java_console/models/src/com/rusefi/waves/TimeAxisTranslator.java similarity index 91% rename from java_console/models/src/com/irnems/waves/TimeAxisTranslator.java rename to java_console/models/src/com/rusefi/waves/TimeAxisTranslator.java index fc14f9ac7c..40efa65272 100644 --- a/java_console/models/src/com/irnems/waves/TimeAxisTranslator.java +++ b/java_console/models/src/com/rusefi/waves/TimeAxisTranslator.java @@ -1,4 +1,4 @@ -package com.irnems.waves; +package com.rusefi.waves; /** * Date: 6/25/13 diff --git a/java_console/models/src/com/rusefi/waves/WaveReport.java b/java_console/models/src/com/rusefi/waves/WaveReport.java index 7ad28a57a1..f6b4644361 100644 --- a/java_console/models/src/com/rusefi/waves/WaveReport.java +++ b/java_console/models/src/com/rusefi/waves/WaveReport.java @@ -1,7 +1,5 @@ package com.rusefi.waves; -import com.irnems.waves.TimeAxisTranslator; -import com.irnems.waves.ZoomProvider; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/java_console/models/src/com/irnems/waves/ZoomProvider.java b/java_console/models/src/com/rusefi/waves/ZoomProvider.java similarity index 92% rename from java_console/models/src/com/irnems/waves/ZoomProvider.java rename to java_console/models/src/com/rusefi/waves/ZoomProvider.java index 0d0bac0ceb..1090d0cd07 100644 --- a/java_console/models/src/com/irnems/waves/ZoomProvider.java +++ b/java_console/models/src/com/rusefi/waves/ZoomProvider.java @@ -1,4 +1,4 @@ -package com.irnems.waves; +package com.rusefi.waves; /** * 7/7/13 diff --git a/java_console/models/src/com/rusefi/waves/test/WaveReportTest.java b/java_console/models/src/com/rusefi/waves/test/WaveReportTest.java index 26cf8189f8..2a17a94f9d 100644 --- a/java_console/models/src/com/rusefi/waves/test/WaveReportTest.java +++ b/java_console/models/src/com/rusefi/waves/test/WaveReportTest.java @@ -1,7 +1,7 @@ package com.rusefi.waves.test; import com.rusefi.waves.WaveReport; -import com.irnems.waves.ZoomProvider; +import com.rusefi.waves.ZoomProvider; import org.junit.Test; import static junit.framework.Assert.assertEquals; diff --git a/java_console/ui/src/com/rusefi/AnalogChartCentral.java b/java_console/ui/src/com/rusefi/AnalogChartCentral.java index 0a1157bed9..99d873c9fb 100644 --- a/java_console/ui/src/com/rusefi/AnalogChartCentral.java +++ b/java_console/ui/src/com/rusefi/AnalogChartCentral.java @@ -1,9 +1,8 @@ package com.rusefi; -import com.irnems.core.EngineState; +import com.rusefi.core.EngineState; import com.rusefi.io.LinkManager; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/java_console/ui/src/com/rusefi/AverageAnglePanel.java b/java_console/ui/src/com/rusefi/AverageAnglePanel.java index 3627e81cc2..7cd37c3be4 100644 --- a/java_console/ui/src/com/rusefi/AverageAnglePanel.java +++ b/java_console/ui/src/com/rusefi/AverageAnglePanel.java @@ -1,6 +1,6 @@ package com.rusefi; -import com.irnems.core.MessagesCentral; +import com.rusefi.core.MessagesCentral; import javax.swing.*; import java.awt.*; diff --git a/java_console/ui/src/com/rusefi/EcuStimulator.java b/java_console/ui/src/com/rusefi/EcuStimulator.java index 0b0522d549..a1a836bb68 100644 --- a/java_console/ui/src/com/rusefi/EcuStimulator.java +++ b/java_console/ui/src/com/rusefi/EcuStimulator.java @@ -1,14 +1,13 @@ package com.rusefi; -import com.rusefi.FileLog; -import com.irnems.core.MessagesCentral; -import com.irnems.core.Sensor; -import com.irnems.core.EngineTimeListener; -import com.irnems.core.SensorCentral; +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.irnems.models.Point3D; -import com.irnems.models.Range; -import com.irnems.models.XYData; +import com.rusefi.models.Point3D; +import com.rusefi.models.Range; +import com.rusefi.models.XYData; import com.rusefi.test.EcuStimulatorSandbox; import com.rusefi.ui.ChartHelper; import com.rusefi.ui.RpmModel; diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index ba3f426ee5..0ad9ec38f7 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -1,13 +1,16 @@ package com.rusefi; -import com.irnems.core.EngineState; -import com.irnems.core.MessagesCentral; +import com.rusefi.core.EngineState; +import com.rusefi.core.MessagesCentral; import com.rusefi.io.LinkManager; import com.rusefi.maintenance.VersionChecker; import com.rusefi.ui.*; import com.rusefi.ui.engine.EngineSnifferPanel; +import com.rusefi.ui.fsio.FlexibleControls; +import com.rusefi.ui.logview.LogViewer; import com.rusefi.ui.storage.Node; import com.rusefi.ui.util.DefaultExceptionHandler; +import com.rusefi.ui.util.FrameHelper; import jssc.SerialPortList; import javax.swing.*; diff --git a/java_console/ui/src/com/rusefi/StartupFrame.java b/java_console/ui/src/com/rusefi/StartupFrame.java index 3d1321f815..b7770c6d0d 100644 --- a/java_console/ui/src/com/rusefi/StartupFrame.java +++ b/java_console/ui/src/com/rusefi/StartupFrame.java @@ -3,6 +3,7 @@ package com.rusefi; import com.rusefi.io.LinkManager; import com.rusefi.io.tcp.TcpConnector; import com.rusefi.maintenance.FirmwareFlasher; +import com.rusefi.ui.util.HorizontalLine; import com.rusefi.ui.util.UiUtils; import com.rusefi.ui.util.URLLabel; import jssc.SerialPortList; diff --git a/java_console/ui/src/com/rusefi/ValueRangeControl.java b/java_console/ui/src/com/rusefi/ValueRangeControl.java index f6366e5067..d471c143a8 100644 --- a/java_console/ui/src/com/rusefi/ValueRangeControl.java +++ b/java_console/ui/src/com/rusefi/ValueRangeControl.java @@ -10,7 +10,6 @@ public class ValueRangeControl { private final JPanel panel = new JPanel(new FlowLayout()); private final double increment; - public ValueRangeControl(String title, double min, double increment, double max) { this.increment = increment; minSpinner = new JSpinner(new SpinnerNumberModel(min, min, max, increment)); diff --git a/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java b/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java index 9adb02485d..818646ca4c 100644 --- a/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java +++ b/java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java @@ -1,6 +1,6 @@ package com.rusefi.maintenance; -import com.rusefi.ui.FrameHelper; +import com.rusefi.ui.util.FrameHelper; import com.rusefi.ui.util.UiUtils; import javax.swing.*; diff --git a/java_console/ui/src/com/rusefi/test/AnalogChartPanelSandbox.java b/java_console/ui/src/com/rusefi/test/AnalogChartPanelSandbox.java index 4e876999e3..e8a18e868d 100644 --- a/java_console/ui/src/com/rusefi/test/AnalogChartPanelSandbox.java +++ b/java_console/ui/src/com/rusefi/test/AnalogChartPanelSandbox.java @@ -1,7 +1,7 @@ package com.rusefi.test; import com.rusefi.AnalogChartPanel; -import com.rusefi.ui.FrameHelper; +import com.rusefi.ui.util.FrameHelper; /** * 2/16/15 diff --git a/java_console/ui/src/com/rusefi/test/EcuStimulatorSandbox.java b/java_console/ui/src/com/rusefi/test/EcuStimulatorSandbox.java index 91cb96f892..2dab9685cf 100644 --- a/java_console/ui/src/com/rusefi/test/EcuStimulatorSandbox.java +++ b/java_console/ui/src/com/rusefi/test/EcuStimulatorSandbox.java @@ -1,7 +1,7 @@ package com.rusefi.test; import com.rusefi.EcuStimulator; -import com.rusefi.ui.FrameHelper; +import com.rusefi.ui.util.FrameHelper; /** * 8/13/14 diff --git a/java_console/ui/src/com/rusefi/test/MsgPanelSandbox.java b/java_console/ui/src/com/rusefi/test/MsgPanelSandbox.java index df8e08e834..8ed037c417 100644 --- a/java_console/ui/src/com/rusefi/test/MsgPanelSandbox.java +++ b/java_console/ui/src/com/rusefi/test/MsgPanelSandbox.java @@ -1,6 +1,6 @@ package com.rusefi.test; -import com.rusefi.ui.FrameHelper; +import com.rusefi.ui.util.FrameHelper; import com.rusefi.ui.MessagesPane; import com.rusefi.ui.storage.PersistentConfiguration; diff --git a/java_console/ui/src/com/rusefi/ui/ChartHelper.java b/java_console/ui/src/com/rusefi/ui/ChartHelper.java index 727f2836a6..b2e963532b 100644 --- a/java_console/ui/src/com/rusefi/ui/ChartHelper.java +++ b/java_console/ui/src/com/rusefi/ui/ChartHelper.java @@ -1,8 +1,8 @@ package com.rusefi.ui; import com.rusefi.FileLog; -import com.irnems.models.Range; -import com.irnems.models.XYData; +import com.rusefi.models.Range; +import com.rusefi.models.XYData; import com.rusefi.ui.engine.EngineSnifferPanel; import com.rusefi.ui.util.UiUtils; import com.rusefi.ui.util.JTextFieldWithWidth; diff --git a/java_console/ui/src/com/rusefi/ui/ConnectionStatus.java b/java_console/ui/src/com/rusefi/ui/ConnectionStatus.java index 01bdc77448..969d5392cd 100644 --- a/java_console/ui/src/com/rusefi/ui/ConnectionStatus.java +++ b/java_console/ui/src/com/rusefi/ui/ConnectionStatus.java @@ -1,5 +1,57 @@ package com.rusefi.ui; -public class ConnectionStatus { +import com.rusefi.core.EngineTimeListener; +import com.rusefi.io.LinkManager; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; + +public class ConnectionStatus { + private boolean isConnected; + + public static ConnectionStatus INSTANCE = new ConnectionStatus(); + private List listeners = new CopyOnWriteArrayList<>(); + + private ConnectionStatus() { + final Timer timer1 = new Timer(2000, new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + setConnected(false); + } + }); + + LinkManager.engineState.timeListeners.add(new EngineTimeListener() { + @Override + public void onTime(double time) { + setConnected(true); + /** + * this timer will catch engine inactivity and display a warning + */ + timer1.restart(); + } + }); + } + + private void setConnected(boolean isConnected) { + if (isConnected == this.isConnected) + return; + this.isConnected = isConnected; + for (Listener listener : listeners) + listener.onConnectionStatus(isConnected); + } + + public boolean isConnected() { + return isConnected; + } + + public void addListener(Listener listener) { + listeners.add(listener); + } + + public interface Listener { + void onConnectionStatus(boolean isConnected); + } } \ No newline at end of file diff --git a/java_console/ui/src/com/rusefi/ui/GaugesPanel.java b/java_console/ui/src/com/rusefi/ui/GaugesPanel.java index e7c7dd052a..b33852f478 100644 --- a/java_console/ui/src/com/rusefi/ui/GaugesPanel.java +++ b/java_console/ui/src/com/rusefi/ui/GaugesPanel.java @@ -1,6 +1,7 @@ package com.rusefi.ui; -import com.irnems.core.Sensor; +import com.rusefi.core.Sensor; +import com.rusefi.ui.util.FrameHelper; import com.rusefi.ui.widgets.MafCommand; import com.rusefi.ui.widgets.RpmCommand; import com.rusefi.ui.widgets.SensorGauge; diff --git a/java_console/ui/src/com/rusefi/ui/Live3DReport.java b/java_console/ui/src/com/rusefi/ui/Live3DReport.java index 9506248536..8e5d01ed72 100644 --- a/java_console/ui/src/com/rusefi/ui/Live3DReport.java +++ b/java_console/ui/src/com/rusefi/ui/Live3DReport.java @@ -1,10 +1,10 @@ package com.rusefi.ui; import com.rusefi.EcuStimulator; -import com.irnems.core.MessagesCentral; -import com.irnems.models.Point3D; -import com.irnems.models.Range; -import com.irnems.models.XYData; +import com.rusefi.core.MessagesCentral; +import com.rusefi.models.Point3D; +import com.rusefi.models.Range; +import com.rusefi.models.XYData; import net.ericaro.surfaceplotter.DefaultSurfaceModel; import javax.swing.*; diff --git a/java_console/ui/src/com/rusefi/ui/MessagesPanel.java b/java_console/ui/src/com/rusefi/ui/MessagesPanel.java index c32786bcb9..74cdb6a0bc 100644 --- a/java_console/ui/src/com/rusefi/ui/MessagesPanel.java +++ b/java_console/ui/src/com/rusefi/ui/MessagesPanel.java @@ -1,6 +1,6 @@ package com.rusefi.ui; -import com.irnems.core.MessagesCentral; +import com.rusefi.core.MessagesCentral; import com.rusefi.io.CommandQueue; import com.rusefi.io.serial.PortHolder; import com.rusefi.ui.storage.Node; diff --git a/java_console/ui/src/com/rusefi/ui/RpmLabel.java b/java_console/ui/src/com/rusefi/ui/RpmLabel.java index 1d07bf18c3..06ce3fc396 100644 --- a/java_console/ui/src/com/rusefi/ui/RpmLabel.java +++ b/java_console/ui/src/com/rusefi/ui/RpmLabel.java @@ -1,16 +1,11 @@ package com.rusefi.ui; -import com.rusefi.io.LinkManager; -import com.irnems.core.EngineTimeListener; - import javax.swing.*; import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; /** * Digital RPM gauge which stays green while rusEfi is connected - * + *

* 9/17/13 * (c) Andrey Belomutskiy */ @@ -39,23 +34,15 @@ public class RpmLabel { } }); - final Timer timer1 = new Timer(2000, new ActionListener() { + ConnectionStatus.INSTANCE.addListener(new ConnectionStatus.Listener() { @Override - public void actionPerformed(ActionEvent e) { - rpmValue.setText(NO_CONNECTION); - rpmValue.setForeground(Color.red); - } - }); - - - LinkManager.engineState.timeListeners.add(new EngineTimeListener() { - @Override - public void onTime(double time) { - rpmValue.setForeground(Color.green); - /** - * this timer will catch engine inactivity and display a warning - */ - timer1.restart(); + public void onConnectionStatus(boolean isConnected) { + if (isConnected) { + rpmValue.setForeground(Color.green); + } else { + rpmValue.setText(NO_CONNECTION); + rpmValue.setForeground(Color.red); + } } }); } diff --git a/java_console/ui/src/com/rusefi/ui/RpmModel.java b/java_console/ui/src/com/rusefi/ui/RpmModel.java index 6ad8966f75..eded16deb2 100644 --- a/java_console/ui/src/com/rusefi/ui/RpmModel.java +++ b/java_console/ui/src/com/rusefi/ui/RpmModel.java @@ -1,7 +1,7 @@ package com.rusefi.ui; -import com.irnems.core.Sensor; -import com.irnems.core.SensorCentral; +import com.rusefi.core.Sensor; +import com.rusefi.core.SensorCentral; import java.util.ArrayList; import java.util.List; diff --git a/java_console/ui/src/com/rusefi/ui/RpmPanel.java b/java_console/ui/src/com/rusefi/ui/RpmPanel.java index 95e09191b5..a6fc20a7d0 100644 --- a/java_console/ui/src/com/rusefi/ui/RpmPanel.java +++ b/java_console/ui/src/com/rusefi/ui/RpmPanel.java @@ -1,7 +1,7 @@ package com.rusefi.ui; -import com.irnems.core.EngineTimeListener; -import com.irnems.core.Sensor; +import com.rusefi.core.EngineTimeListener; +import com.rusefi.core.Sensor; import com.rusefi.ui.storage.Node; import com.rusefi.ui.widgets.*; import com.rusefi.io.LinkManager; diff --git a/java_console/ui/src/com/rusefi/ui/ShowMap.java b/java_console/ui/src/com/rusefi/ui/ShowMap.java index 515efc6374..4ec3b7033d 100644 --- a/java_console/ui/src/com/rusefi/ui/ShowMap.java +++ b/java_console/ui/src/com/rusefi/ui/ShowMap.java @@ -1,7 +1,8 @@ package com.rusefi.ui; import com.rusefi.file.BaseMap; -import com.irnems.models.XYData; +import com.rusefi.models.XYData; +import com.rusefi.ui.util.FrameHelper; import javax.swing.*; diff --git a/java_console/ui/src/com/rusefi/ui/WarningPanel.java b/java_console/ui/src/com/rusefi/ui/WarningPanel.java index a94fb5b484..4ea5709840 100644 --- a/java_console/ui/src/com/rusefi/ui/WarningPanel.java +++ b/java_console/ui/src/com/rusefi/ui/WarningPanel.java @@ -1,6 +1,6 @@ package com.rusefi.ui; -import com.irnems.core.MessagesCentral; +import com.rusefi.core.MessagesCentral; import javax.swing.*; import java.awt.*; diff --git a/java_console/ui/src/com/rusefi/ui/Wizard.java b/java_console/ui/src/com/rusefi/ui/Wizard.java index 1a2e836380..1461259fd1 100644 --- a/java_console/ui/src/com/rusefi/ui/Wizard.java +++ b/java_console/ui/src/com/rusefi/ui/Wizard.java @@ -1,7 +1,7 @@ package com.rusefi.ui; -import com.irnems.core.Sensor; -import com.irnems.core.SensorCentral; +import com.rusefi.core.Sensor; +import com.rusefi.core.SensorCentral; import com.rusefi.OutputChannel; import com.rusefi.io.CommandQueue; import com.rusefi.io.InvocationConfirmationListener; diff --git a/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java b/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java index 802b7ec004..8df87c85b5 100644 --- a/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java +++ b/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java @@ -1,9 +1,9 @@ package com.rusefi.ui.engine; import com.rusefi.FileLog; -import com.irnems.core.EngineState; -import com.irnems.core.Sensor; -import com.irnems.core.SensorCentral; +import com.rusefi.core.EngineState; +import com.rusefi.core.Sensor; +import com.rusefi.core.SensorCentral; import com.rusefi.io.LinkManager; import com.rusefi.ui.*; import com.rusefi.ui.storage.Node; diff --git a/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferStatusPanel.java b/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferStatusPanel.java index 68bdfb77ab..c46c22e451 100644 --- a/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferStatusPanel.java +++ b/java_console/ui/src/com/rusefi/ui/engine/EngineSnifferStatusPanel.java @@ -1,8 +1,8 @@ package com.rusefi.ui.engine; -import com.irnems.waves.TimeAxisTranslator; +import com.rusefi.waves.TimeAxisTranslator; import com.rusefi.waves.WaveReport; -import com.irnems.waves.ZoomProvider; +import com.rusefi.waves.ZoomProvider; import com.rusefi.waves.RevolutionLog; import javax.swing.*; diff --git a/java_console/ui/src/com/rusefi/ui/engine/UpDownImage.java b/java_console/ui/src/com/rusefi/ui/engine/UpDownImage.java index d73a2c20e4..04ece13ff8 100644 --- a/java_console/ui/src/com/rusefi/ui/engine/UpDownImage.java +++ b/java_console/ui/src/com/rusefi/ui/engine/UpDownImage.java @@ -1,11 +1,11 @@ package com.rusefi.ui.engine; -import com.irnems.core.Sensor; -import com.irnems.core.SensorCentral; -import com.irnems.waves.TimeAxisTranslator; +import com.rusefi.core.Sensor; +import com.rusefi.core.SensorCentral; +import com.rusefi.waves.TimeAxisTranslator; import com.rusefi.ui.util.UiUtils; import com.rusefi.waves.WaveReport; -import com.irnems.waves.ZoomProvider; +import com.rusefi.waves.ZoomProvider; import com.rusefi.waves.RevolutionLog; import javax.swing.*; diff --git a/java_console/ui/src/com/rusefi/ui/engine/ZoomControl.java b/java_console/ui/src/com/rusefi/ui/engine/ZoomControl.java index 1efd052e6d..5a9d6f1632 100644 --- a/java_console/ui/src/com/rusefi/ui/engine/ZoomControl.java +++ b/java_console/ui/src/com/rusefi/ui/engine/ZoomControl.java @@ -1,6 +1,6 @@ package com.rusefi.ui.engine; -import com.irnems.waves.ZoomProvider; +import com.rusefi.waves.ZoomProvider; import com.rusefi.KeyStrokeShortcut; import javax.swing.*; diff --git a/java_console/ui/src/com/rusefi/ui/engine/test/UpDownSandbox.java b/java_console/ui/src/com/rusefi/ui/engine/test/UpDownSandbox.java index 708bb8c4fd..21ce1ea637 100644 --- a/java_console/ui/src/com/rusefi/ui/engine/test/UpDownSandbox.java +++ b/java_console/ui/src/com/rusefi/ui/engine/test/UpDownSandbox.java @@ -2,7 +2,7 @@ package com.rusefi.ui.engine.test; import com.rusefi.waves.WaveReport; import com.rusefi.waves.test.WaveReportTest; -import com.rusefi.ui.FrameHelper; +import com.rusefi.ui.util.FrameHelper; import com.rusefi.ui.engine.UpDownImage; import javax.swing.*; diff --git a/java_console/ui/src/com/rusefi/ui/FlexibleControls.java b/java_console/ui/src/com/rusefi/ui/fsio/FlexibleControls.java similarity index 97% rename from java_console/ui/src/com/rusefi/ui/FlexibleControls.java rename to java_console/ui/src/com/rusefi/ui/fsio/FlexibleControls.java index 85e9e6416e..8915b09225 100644 --- a/java_console/ui/src/com/rusefi/ui/FlexibleControls.java +++ b/java_console/ui/src/com/rusefi/ui/fsio/FlexibleControls.java @@ -1,4 +1,4 @@ -package com.rusefi.ui; +package com.rusefi.ui.fsio; import com.autsia.bracer.BracerParser; diff --git a/java_console/ui/src/com/rusefi/FIleItem.java b/java_console/ui/src/com/rusefi/ui/logview/FileItem.java similarity index 78% rename from java_console/ui/src/com/rusefi/FIleItem.java rename to java_console/ui/src/com/rusefi/ui/logview/FileItem.java index 9a1fd3571f..d556ac4007 100644 --- a/java_console/ui/src/com/rusefi/FIleItem.java +++ b/java_console/ui/src/com/rusefi/ui/logview/FileItem.java @@ -1,4 +1,4 @@ -package com.rusefi; +package com.rusefi.ui.logview; import java.io.File; @@ -6,10 +6,10 @@ import java.io.File; * 4/7/14 * (c) Andrey Belomutskiy */ -public class FIleItem { +class FileItem { private final File file; - public FIleItem(File file) { + public FileItem(File file) { this.file = file; } diff --git a/java_console/ui/src/com/rusefi/ui/LogViewer.java b/java_console/ui/src/com/rusefi/ui/logview/LogViewer.java similarity index 92% rename from java_console/ui/src/com/rusefi/ui/LogViewer.java rename to java_console/ui/src/com/rusefi/ui/logview/LogViewer.java index 2466cbf0b9..50bc87d52e 100644 --- a/java_console/ui/src/com/rusefi/ui/LogViewer.java +++ b/java_console/ui/src/com/rusefi/ui/logview/LogViewer.java @@ -1,11 +1,11 @@ -package com.rusefi.ui; +package com.rusefi.ui.logview; import com.rusefi.FileLog; -import com.irnems.core.EngineState; +import com.rusefi.core.EngineState; import com.rusefi.file.FileUtils; +import com.rusefi.ui.ChartRepository; import com.rusefi.ui.engine.EngineSnifferPanel; import com.rusefi.ui.util.UiUtils; -import com.rusefi.FIleItem; import com.rusefi.io.LinkManager; import javax.swing.*; @@ -35,8 +35,8 @@ public class LogViewer extends JPanel { public static final String DEFAULT_LOG_LOCATION = "out"; private final JLabel folderLabel = new JLabel(); private final JLabel fileLabel = new JLabel(); - private final DefaultListModel fileListModel = new DefaultListModel(); - private final JList fileList = new JList(fileListModel); + private final DefaultListModel fileListModel = new DefaultListModel(); + private final JList fileList = new JList(fileListModel); private final EngineSnifferPanel engineSnifferPanel; private String currentFolder; private static JPanel descPanel = new JPanel(); @@ -85,7 +85,7 @@ public class LogViewer extends JPanel { @Override public void mouseClicked(MouseEvent e) { if (e.getClickCount() == 2) { - FIleItem selectedItem = fileList.getSelectedValue(); + FileItem selectedItem = fileList.getSelectedValue(); openFile(selectedItem.getFile()); } } @@ -124,8 +124,8 @@ public class LogViewer extends JPanel { openFile(files[0]); } - private FIleItem getFileDesc(File file) { - return new FIleItem(file); + private FileItem getFileDesc(File file) { + return new FileItem(file); } diff --git a/java_console/ui/src/com/rusefi/ui/test/FlexibleControlsSandbox.java b/java_console/ui/src/com/rusefi/ui/test/FlexibleControlsSandbox.java index 7d6ba94fb7..6314fe76c3 100644 --- a/java_console/ui/src/com/rusefi/ui/test/FlexibleControlsSandbox.java +++ b/java_console/ui/src/com/rusefi/ui/test/FlexibleControlsSandbox.java @@ -1,7 +1,7 @@ package com.rusefi.ui.test; -import com.rusefi.ui.FlexibleControls; -import com.rusefi.ui.FrameHelper; +import com.rusefi.ui.fsio.FlexibleControls; +import com.rusefi.ui.util.FrameHelper; /** * (c) Andrey Belomutskiy diff --git a/java_console/ui/src/com/irnems/ui/test/RpmModelTest.java b/java_console/ui/src/com/rusefi/ui/test/RpmModelTest.java similarity index 95% rename from java_console/ui/src/com/irnems/ui/test/RpmModelTest.java rename to java_console/ui/src/com/rusefi/ui/test/RpmModelTest.java index c49f652f40..a5816aad47 100644 --- a/java_console/ui/src/com/irnems/ui/test/RpmModelTest.java +++ b/java_console/ui/src/com/rusefi/ui/test/RpmModelTest.java @@ -1,4 +1,4 @@ -package com.irnems.ui.test; +package com.rusefi.ui.test; import com.rusefi.ui.RpmModel; import org.junit.Assert; diff --git a/java_console/ui/src/com/irnems/ui/test/WavePanelSandbox.java b/java_console/ui/src/com/rusefi/ui/test/WavePanelSandbox.java similarity index 97% rename from java_console/ui/src/com/irnems/ui/test/WavePanelSandbox.java rename to java_console/ui/src/com/rusefi/ui/test/WavePanelSandbox.java index 81426bd6d1..842ba2bd5a 100644 --- a/java_console/ui/src/com/irnems/ui/test/WavePanelSandbox.java +++ b/java_console/ui/src/com/rusefi/ui/test/WavePanelSandbox.java @@ -1,6 +1,6 @@ -package com.irnems.ui.test; +package com.rusefi.ui.test; -import com.rusefi.ui.FrameHelper; +import com.rusefi.ui.util.FrameHelper; import com.rusefi.ui.engine.EngineSnifferPanel; import com.rusefi.ui.storage.PersistentConfiguration; diff --git a/java_console/ui/src/com/rusefi/ui/FrameHelper.java b/java_console/ui/src/com/rusefi/ui/util/FrameHelper.java similarity index 98% rename from java_console/ui/src/com/rusefi/ui/FrameHelper.java rename to java_console/ui/src/com/rusefi/ui/util/FrameHelper.java index 820cf1b957..3246c23280 100644 --- a/java_console/ui/src/com/rusefi/ui/FrameHelper.java +++ b/java_console/ui/src/com/rusefi/ui/util/FrameHelper.java @@ -1,4 +1,4 @@ -package com.rusefi.ui; +package com.rusefi.ui.util; import com.rusefi.FileLog; diff --git a/java_console/ui/src/com/rusefi/HorizontalLine.java b/java_console/ui/src/com/rusefi/ui/util/HorizontalLine.java similarity index 95% rename from java_console/ui/src/com/rusefi/HorizontalLine.java rename to java_console/ui/src/com/rusefi/ui/util/HorizontalLine.java index dd170ea01f..5c18a19b0c 100644 --- a/java_console/ui/src/com/rusefi/HorizontalLine.java +++ b/java_console/ui/src/com/rusefi/ui/util/HorizontalLine.java @@ -1,4 +1,4 @@ -package com.rusefi; +package com.rusefi.ui.util; import javax.swing.*; import java.awt.*; diff --git a/java_console/ui/src/com/rusefi/ui/widgets/AdcDebugControl.java b/java_console/ui/src/com/rusefi/ui/widgets/AdcDebugControl.java index 420bf14e2c..64d2b01b96 100644 --- a/java_console/ui/src/com/rusefi/ui/widgets/AdcDebugControl.java +++ b/java_console/ui/src/com/rusefi/ui/widgets/AdcDebugControl.java @@ -1,6 +1,6 @@ package com.rusefi.ui.widgets; -import com.irnems.core.Sensor; +import com.rusefi.core.Sensor; /** * 7/11/13 diff --git a/java_console/ui/src/com/rusefi/ui/widgets/BooleanFlagControlPanel.java b/java_console/ui/src/com/rusefi/ui/widgets/BooleanFlagControlPanel.java index 1a427c04b9..6a55b5d55e 100644 --- a/java_console/ui/src/com/rusefi/ui/widgets/BooleanFlagControlPanel.java +++ b/java_console/ui/src/com/rusefi/ui/widgets/BooleanFlagControlPanel.java @@ -1,7 +1,7 @@ package com.rusefi.ui.widgets; -import com.irnems.core.Sensor; -import com.irnems.core.SensorCentral; +import com.rusefi.core.Sensor; +import com.rusefi.core.SensorCentral; import com.rusefi.io.CommandQueue; import net.miginfocom.swing.MigLayout; diff --git a/java_console/ui/src/com/rusefi/ui/widgets/DetachedSensor.java b/java_console/ui/src/com/rusefi/ui/widgets/DetachedSensor.java index a53ecb41c5..f5f9e57d65 100644 --- a/java_console/ui/src/com/rusefi/ui/widgets/DetachedSensor.java +++ b/java_console/ui/src/com/rusefi/ui/widgets/DetachedSensor.java @@ -1,6 +1,6 @@ package com.rusefi.ui.widgets; -import com.irnems.core.Sensor; +import com.rusefi.core.Sensor; import com.rusefi.io.CommandQueue; import com.rusefi.io.LinkManager; import com.rusefi.ui.util.UiUtils; diff --git a/java_console/ui/src/com/rusefi/ui/widgets/IdleLabel.java b/java_console/ui/src/com/rusefi/ui/widgets/IdleLabel.java index 9935a742c1..772cd25511 100644 --- a/java_console/ui/src/com/rusefi/ui/widgets/IdleLabel.java +++ b/java_console/ui/src/com/rusefi/ui/widgets/IdleLabel.java @@ -1,7 +1,7 @@ package com.rusefi.ui.widgets; -import com.irnems.core.Sensor; -import com.irnems.core.SensorCentral; +import com.rusefi.core.Sensor; +import com.rusefi.core.SensorCentral; import javax.swing.*; diff --git a/java_console/ui/src/com/rusefi/ui/widgets/InjectorControl.java b/java_console/ui/src/com/rusefi/ui/widgets/InjectorControl.java index 9d7241f98e..9946eff547 100644 --- a/java_console/ui/src/com/rusefi/ui/widgets/InjectorControl.java +++ b/java_console/ui/src/com/rusefi/ui/widgets/InjectorControl.java @@ -1,6 +1,6 @@ package com.rusefi.ui.widgets; -import com.irnems.core.Sensor; +import com.rusefi.core.Sensor; /** * 7/13/13 diff --git a/java_console/ui/src/com/rusefi/ui/widgets/MafCommand.java b/java_console/ui/src/com/rusefi/ui/widgets/MafCommand.java index e2a0d33281..76bed71311 100644 --- a/java_console/ui/src/com/rusefi/ui/widgets/MafCommand.java +++ b/java_console/ui/src/com/rusefi/ui/widgets/MafCommand.java @@ -1,7 +1,7 @@ package com.rusefi.ui.widgets; import com.rusefi.EcuStimulator; -import com.irnems.core.Sensor; +import com.rusefi.core.Sensor; import javax.swing.*; import javax.swing.event.ChangeEvent; diff --git a/java_console/ui/src/com/rusefi/ui/widgets/PotCommand.java b/java_console/ui/src/com/rusefi/ui/widgets/PotCommand.java index ec6efb02a8..364d1081a7 100644 --- a/java_console/ui/src/com/rusefi/ui/widgets/PotCommand.java +++ b/java_console/ui/src/com/rusefi/ui/widgets/PotCommand.java @@ -1,8 +1,8 @@ package com.rusefi.ui.widgets; -import com.irnems.core.MessagesCentral; -import com.irnems.core.Sensor; -import com.irnems.core.SensorCentral; +import com.rusefi.core.MessagesCentral; +import com.rusefi.core.Sensor; +import com.rusefi.core.SensorCentral; import com.rusefi.EcuStimulator; import com.rusefi.io.CommandQueue; diff --git a/java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java b/java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java index 79377c7fa4..a978fed4ee 100644 --- a/java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java +++ b/java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java @@ -1,8 +1,8 @@ package com.rusefi.ui.widgets; -import com.irnems.core.Sensor; -import com.irnems.core.SensorCategory; -import com.irnems.core.SensorCentral; +import com.rusefi.core.Sensor; +import com.rusefi.core.SensorCategory; +import com.rusefi.core.SensorCentral; import com.rusefi.ui.util.UiUtils; import eu.hansolo.steelseries.gauges.Radial; import eu.hansolo.steelseries.tools.ColorDef;