auto-sync

java_console/autotest/src/com/rusefi/IoUtil.java

@@ -1,9 +1,8 @@
 package com.rusefi;
 
-import com.rusefi.FileLog;
+import com.rusefi.core.EngineState;
-import com.irnems.core.EngineState;
+import com.rusefi.core.Sensor;
-import com.irnems.core.Sensor;
+import com.rusefi.core.SensorCentral;
-import com.irnems.core.SensorCentral;
 import com.rusefi.io.CommandQueue;
 import com.rusefi.io.InvocationConfirmationListener;
 import com.rusefi.io.LinkManager;

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.rusefi.core.EngineState;
-import com.irnems.models.Point3D;
+import com.rusefi.models.Point3D;
-import com.irnems.models.XYData;
+import com.rusefi.models.XYData;
 
 import java.util.HashMap;
 import java.util.Map;

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;

java_console/io/src/com/rusefi/file/TableGenerator.java

@@ -1,7 +1,7 @@
 package com.rusefi.file;
 
-import com.irnems.models.XYData;
+import com.rusefi.models.XYData;
-import com.irnems.models.XYDataReader;
+import com.rusefi.models.XYDataReader;
 
 import java.io.BufferedWriter;
 import java.io.FileWriter;

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;

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;
 

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;

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;
 

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;

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.rusefi.models.MafValue;
-import com.irnems.models.RpmValue;
+import com.rusefi.models.RpmValue;
 
 /**
  * @author Andrey Belomutskiy

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.rusefi.models.Factory;
-import com.irnems.models.MafValue;
+import com.rusefi.models.MafValue;
-import com.irnems.models.RpmValue;
+import com.rusefi.models.RpmValue;
-import com.irnems.models.Utils;
+import com.rusefi.models.Utils;
-import com.rusefi.FileLog;
 
 import java.io.*;
 import java.util.*;

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;

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

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;

java_console/models/src/com/rusefi/core/Pair.java

@@ -1,4 +1,4 @@
-package com.irnems.core;
+package com.rusefi.core;
 
 /**
  * @author Andrey Belomutskiy

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;
 
 /**

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;
 

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"),

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;

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;

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.rusefi.core.SensorCentral;
-import com.irnems.core.EngineState;
+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.*;
 
 /**

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<String> currentReference = new AtomicReference<String>();
+        final AtomicReference<String> currentReference = new AtomicReference<>();
 
         ResponseBuffer rb = new ResponseBuffer(new ResponseBuffer.ResponseListener() {
             public void onResponse(String response) {

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;
 

java_console/models/src/com/rusefi/models/Factory.java

@@ -1,4 +1,4 @@
-package com.irnems.models;
+package com.rusefi.models;
 
 /**
  * @author Andrey Belomutskiy

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;
 

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

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

java_console/models/src/com/rusefi/models/RpmValue.java

@@ -1,4 +1,4 @@
-package com.irnems.models;
+package com.rusefi.models;
 
 /**
  * @author Andrey Belomutskiy

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;

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;

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;
 

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;
 

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<Integer, Object> map = new TreeMap<Integer, Object>();
+        TreeMap<Integer, Object> 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));
-
+    }
 }

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

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 {
 

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

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;

java_console/models/src/com/rusefi/waves/ZoomProvider.java

@@ -1,4 +1,4 @@
-package com.irnems.waves;
+package com.rusefi.waves;
 
 /**
  * 7/7/13

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;

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;
 

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.*;

java_console/ui/src/com/rusefi/EcuStimulator.java

@@ -1,14 +1,13 @@
 package com.rusefi;
 
-import com.rusefi.FileLog;
+import com.rusefi.core.MessagesCentral;
-import com.irnems.core.MessagesCentral;
+import com.rusefi.core.Sensor;
-import com.irnems.core.Sensor;
+import com.rusefi.core.EngineTimeListener;
-import com.irnems.core.EngineTimeListener;
+import com.rusefi.core.SensorCentral;
-import com.irnems.core.SensorCentral;
 import com.rusefi.file.TableGenerator;
-import com.irnems.models.Point3D;
+import com.rusefi.models.Point3D;
-import com.irnems.models.Range;
+import com.rusefi.models.Range;
-import com.irnems.models.XYData;
+import com.rusefi.models.XYData;
 import com.rusefi.test.EcuStimulatorSandbox;
 import com.rusefi.ui.ChartHelper;
 import com.rusefi.ui.RpmModel;

java_console/ui/src/com/rusefi/Launcher.java

@@ -1,13 +1,16 @@
 package com.rusefi;
 
-import com.irnems.core.EngineState;
+import com.rusefi.core.EngineState;
-import com.irnems.core.MessagesCentral;
+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.*;

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;

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));

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.*;

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

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

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;
 

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.rusefi.models.Range;
-import com.irnems.models.XYData;
+import com.rusefi.models.XYData;
 import com.rusefi.ui.engine.EngineSnifferPanel;
 import com.rusefi.ui.util.UiUtils;
 import com.rusefi.ui.util.JTextFieldWithWidth;

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<Listener> 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);
+    }
 }

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;

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.rusefi.core.MessagesCentral;
-import com.irnems.models.Point3D;
+import com.rusefi.models.Point3D;
-import com.irnems.models.Range;
+import com.rusefi.models.Range;
-import com.irnems.models.XYData;
+import com.rusefi.models.XYData;
 import net.ericaro.surfaceplotter.DefaultSurfaceModel;
 
 import javax.swing.*;

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;

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
- *
+ * <p/>
  * 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) {
+            public void onConnectionStatus(boolean isConnected) {
-                rpmValue.setText(NO_CONNECTION);
+                if (isConnected) {
-                rpmValue.setForeground(Color.red);
+                    rpmValue.setForeground(Color.green);
-            }
+                } else {
-        });
+                    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();
             }
         });
     }

java_console/ui/src/com/rusefi/ui/RpmModel.java

@@ -1,7 +1,7 @@
 package com.rusefi.ui;
 
-import com.irnems.core.Sensor;
+import com.rusefi.core.Sensor;
-import com.irnems.core.SensorCentral;
+import com.rusefi.core.SensorCentral;
 
 import java.util.ArrayList;
 import java.util.List;

java_console/ui/src/com/rusefi/ui/RpmPanel.java

@@ -1,7 +1,7 @@
 package com.rusefi.ui;
 
-import com.irnems.core.EngineTimeListener;
+import com.rusefi.core.EngineTimeListener;
-import com.irnems.core.Sensor;
+import com.rusefi.core.Sensor;
 import com.rusefi.ui.storage.Node;
 import com.rusefi.ui.widgets.*;
 import com.rusefi.io.LinkManager;

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.*;
 

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.*;

java_console/ui/src/com/rusefi/ui/Wizard.java

@@ -1,7 +1,7 @@
 package com.rusefi.ui;
 
-import com.irnems.core.Sensor;
+import com.rusefi.core.Sensor;
-import com.irnems.core.SensorCentral;
+import com.rusefi.core.SensorCentral;
 import com.rusefi.OutputChannel;
 import com.rusefi.io.CommandQueue;
 import com.rusefi.io.InvocationConfirmationListener;

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.rusefi.core.EngineState;
-import com.irnems.core.Sensor;
+import com.rusefi.core.Sensor;
-import com.irnems.core.SensorCentral;
+import com.rusefi.core.SensorCentral;
 import com.rusefi.io.LinkManager;
 import com.rusefi.ui.*;
 import com.rusefi.ui.storage.Node;

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.*;

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.rusefi.core.Sensor;
-import com.irnems.core.SensorCentral;
+import com.rusefi.core.SensorCentral;
-import com.irnems.waves.TimeAxisTranslator;
+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.*;

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.*;

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.*;

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;
 

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;
     }
 

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<FIleItem> fileListModel = new DefaultListModel<FIleItem>();
+    private final DefaultListModel<FileItem> fileListModel = new DefaultListModel<FileItem>();
-    private final JList<FIleItem> fileList = new JList<FIleItem>(fileListModel);
+    private final JList<FileItem> fileList = new JList<FileItem>(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) {
+    private FileItem getFileDesc(File file) {
-        return new FIleItem(file);
+        return new FileItem(file);
     }
 
 

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.fsio.FlexibleControls;
-import com.rusefi.ui.FrameHelper;
+import com.rusefi.ui.util.FrameHelper;
 
 /**
  * (c) Andrey Belomutskiy

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;

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;
 

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;
 

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.*;

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

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.rusefi.core.Sensor;
-import com.irnems.core.SensorCentral;
+import com.rusefi.core.SensorCentral;
 import com.rusefi.io.CommandQueue;
 import net.miginfocom.swing.MigLayout;
 

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;

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.rusefi.core.Sensor;
-import com.irnems.core.SensorCentral;
+import com.rusefi.core.SensorCentral;
 
 import javax.swing.*;
 

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

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;

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.rusefi.core.MessagesCentral;
-import com.irnems.core.Sensor;
+import com.rusefi.core.Sensor;
-import com.irnems.core.SensorCentral;
+import com.rusefi.core.SensorCentral;
 import com.rusefi.EcuStimulator;
 import com.rusefi.io.CommandQueue;
 

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.rusefi.core.Sensor;
-import com.irnems.core.SensorCategory;
+import com.rusefi.core.SensorCategory;
-import com.irnems.core.SensorCentral;
+import com.rusefi.core.SensorCentral;
 import com.rusefi.ui.util.UiUtils;
 import eu.hansolo.steelseries.gauges.Radial;
 import eu.hansolo.steelseries.tools.ColorDef;