rusefi
/
rusefi
mirror of https://github.com/rusefi/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto-sync

This commit is contained in:
rusEfi 2015-02-16 11:04:58 -06:00
parent 086e779522
commit cad4e6cd1d
81 changed files with 205 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java_console/autotest/src/com/rusefi/IoUtil.java
View File

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

6
java_console/io/src/com/rusefi/file/BaseMap.java
View File

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

2
java_console/io/src/com/rusefi/file/FileUtils.java
View File

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

4
java_console/io/src/com/rusefi/file/TableGenerator.java
View File

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

2
java_console/io/src/com/rusefi/io/CommandQueue.java
View File

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

2
java_console/io/src/com/rusefi/io/LinkManager.java
View File

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

2
java_console/io/src/com/rusefi/io/serial/PortHolder.java
View File

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

2
java_console/io/src/com/rusefi/io/serial/SerialManager.java
View File

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

3
java_console/models/src/com/irnems/Histograms.java → java_console/models/src/com/rusefi/Histograms.java
View File

@ -1,6 +1,5 @@
package com.irnems;
package com.rusefi;
import com.rusefi.FileLog;
import org.jetbrains.annotations.NotNull;
import java.text.FieldPosition;

6
java_console/models/src/com/irnems/ReportLine.java → java_console/models/src/com/rusefi/ReportLine.java
View File

@ -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

11
java_console/models/src/com/irnems/ReportReader.java → java_console/models/src/com/rusefi/ReportReader.java
View File

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

2
java_console/models/src/com/irnems/core/EngineState.java → java_console/models/src/com/rusefi/core/EngineState.java
View File

@ -1,4 +1,4 @@
package com.irnems.core;
package com.rusefi.core;
import com.rusefi.FileLog;
import com.rusefi.SensorConversion;

2
java_console/models/src/com/irnems/core/EngineTimeListener.java → java_console/models/src/com/rusefi/core/EngineTimeListener.java
View File

@ -1,4 +1,4 @@
package com.irnems.core;
package com.rusefi.core;
/**
* Date: 3/26/13

2
java_console/models/src/com/irnems/core/MessagesCentral.java → java_console/models/src/com/rusefi/core/MessagesCentral.java
View File

@ -1,4 +1,4 @@
package com.irnems.core;
package com.rusefi.core;
import com.rusefi.FileLog;
import com.rusefi.io.serial.PortHolder;

2
java_console/models/src/com/irnems/core/Pair.java → java_console/models/src/com/rusefi/core/Pair.java
View File

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

4
java_console/models/src/com/irnems/core/ResponseBuffer.java → java_console/models/src/com/rusefi/core/ResponseBuffer.java
View File

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

2
java_console/models/src/com/irnems/core/Sensor.java → java_console/models/src/com/rusefi/core/Sensor.java
View File

@ -1,4 +1,4 @@
package com.irnems.core;
package com.rusefi.core;
import eu.hansolo.steelseries.tools.BackgroundColor;

2
java_console/models/src/com/irnems/core/SensorCategory.java → java_console/models/src/com/rusefi/core/SensorCategory.java
View File

@ -1,4 +1,4 @@
package com.irnems.core;
package com.rusefi.core;
public enum SensorCategory {
OPERATIONS("Operations"),

2
java_console/models/src/com/irnems/core/SensorCentral.java → java_console/models/src/com/rusefi/core/SensorCentral.java
View File

@ -1,4 +1,4 @@
package com.irnems.core;
package com.rusefi.core;
import java.util.EnumMap;
import java.util.List;

2
java_console/models/src/com/irnems/core/SensorStats.java → java_console/models/src/com/rusefi/core/SensorStats.java
View File

@ -1,4 +1,4 @@
package com.irnems.core;
package com.rusefi.core;
import com.rusefi.CyclicBuffer;
import com.rusefi.SensorConversion;

8
java_console/models/src/com/irnems/core/test/EngineStateTest.java → java_console/models/src/com/rusefi/core/test/EngineStateTest.java
View File

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

6
java_console/models/src/com/irnems/core/test/ResponseBufferTest.java → java_console/models/src/com/rusefi/core/test/ResponseBufferTest.java
View File

@ -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) {

2
java_console/models/src/com/irnems/models/AverageData.java → java_console/models/src/com/rusefi/models/AverageData.java
View File

@ -1,4 +1,4 @@
package com.irnems.models;
package com.rusefi.models;
import com.rusefi.FileLog;

2
java_console/models/src/com/irnems/models/Factory.java → java_console/models/src/com/rusefi/models/Factory.java
View File

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

2
java_console/models/src/com/irnems/models/MafValue.java → java_console/models/src/com/rusefi/models/MafValue.java
View File

@ -1,4 +1,4 @@
package com.irnems.models;
package com.rusefi.models;
import com.rusefi.io.tcp.TcpConnector;

2
java_console/models/src/com/irnems/models/Point3D.java → java_console/models/src/com/rusefi/models/Point3D.java
View File

@ -1,4 +1,4 @@
package com.irnems.models;
package com.rusefi.models;
/**
* Date: 3/24/13

2
java_console/models/src/com/irnems/models/Range.java → java_console/models/src/com/rusefi/models/Range.java
View File

@ -1,4 +1,4 @@
package com.irnems.models;
package com.rusefi.models;
/**
* Date: 3/24/13

2
java_console/models/src/com/irnems/models/RpmValue.java → java_console/models/src/com/rusefi/models/RpmValue.java
View File

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

2
java_console/models/src/com/irnems/models/Utils.java → java_console/models/src/com/rusefi/models/Utils.java
View File

@ -1,4 +1,4 @@
package com.irnems.models;
package com.rusefi.models;
import java.util.Map;
import java.util.SortedMap;

2
java_console/models/src/com/irnems/models/XYData.java → java_console/models/src/com/rusefi/models/XYData.java
View File

@ -1,4 +1,4 @@
package com.irnems.models;
package com.rusefi.models;
import com.rusefi.FileLog;
import org.jetbrains.annotations.NotNull;

2
java_console/models/src/com/irnems/models/XYDataReader.java → java_console/models/src/com/rusefi/models/XYDataReader.java
View File

@ -1,4 +1,4 @@
package com.irnems.models;
package com.rusefi.models;
import com.rusefi.FileLog;

2
java_console/models/src/com/irnems/models/YAxisData.java → java_console/models/src/com/rusefi/models/YAxisData.java
View File

@ -1,4 +1,4 @@
package com.irnems.models;
package com.rusefi.models;
import com.rusefi.FileLog;

11
java_console/models/src/com/irnems/models/test/UtilTest.java → java_console/models/src/com/rusefi/models/test/UtilTest.java
View File

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

4
java_console/models/src/com/irnems/models/test/XYDataSandbox.java → java_console/models/src/com/rusefi/models/test/XYDataSandbox.java
View File

@ -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

6
java_console/models/src/com/irnems/test/HistogramsTest.java → java_console/models/src/com/rusefi/test/HistogramsTest.java
View File

@ -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 {

2
java_console/models/src/com/irnems/waves/TimeAxisTranslator.java → java_console/models/src/com/rusefi/waves/TimeAxisTranslator.java
View File

@ -1,4 +1,4 @@
package com.irnems.waves;
package com.rusefi.waves;
/**
* Date: 6/25/13

2
java_console/models/src/com/rusefi/waves/WaveReport.java
View File

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

2
java_console/models/src/com/irnems/waves/ZoomProvider.java → java_console/models/src/com/rusefi/waves/ZoomProvider.java
View File

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

2
java_console/models/src/com/rusefi/waves/test/WaveReportTest.java
View File

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

3
java_console/ui/src/com/rusefi/AnalogChartCentral.java
View File

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

2
java_console/ui/src/com/rusefi/AverageAnglePanel.java
View File

@ -1,6 +1,6 @@
package com.rusefi;
import com.irnems.core.MessagesCentral;
import com.rusefi.core.MessagesCentral;
import javax.swing.*;
import java.awt.*;

15
java_console/ui/src/com/rusefi/EcuStimulator.java
View File

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

7
java_console/ui/src/com/rusefi/Launcher.java
View File

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

1
java_console/ui/src/com/rusefi/StartupFrame.java
View File

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

1
java_console/ui/src/com/rusefi/ValueRangeControl.java
View File

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

2
java_console/ui/src/com/rusefi/maintenance/FirmwareFlasher.java
View File

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

2
java_console/ui/src/com/rusefi/test/AnalogChartPanelSandbox.java
View File

@ -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

2
java_console/ui/src/com/rusefi/test/EcuStimulatorSandbox.java
View File

@ -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

2
java_console/ui/src/com/rusefi/test/MsgPanelSandbox.java
View File

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

4
java_console/ui/src/com/rusefi/ui/ChartHelper.java
View File

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

54
java_console/ui/src/com/rusefi/ui/ConnectionStatus.java
View File

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

3
java_console/ui/src/com/rusefi/ui/GaugesPanel.java
View File

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

8
java_console/ui/src/com/rusefi/ui/Live3DReport.java
View File

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

2
java_console/ui/src/com/rusefi/ui/MessagesPanel.java
View File

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

31
java_console/ui/src/com/rusefi/ui/RpmLabel.java
View File

@ -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) {
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);
}
}
});
}

4
java_console/ui/src/com/rusefi/ui/RpmModel.java
View File

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

4
java_console/ui/src/com/rusefi/ui/RpmPanel.java
View File

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

3
java_console/ui/src/com/rusefi/ui/ShowMap.java
View File

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

2
java_console/ui/src/com/rusefi/ui/WarningPanel.java
View File

@ -1,6 +1,6 @@
package com.rusefi.ui;
import com.irnems.core.MessagesCentral;
import com.rusefi.core.MessagesCentral;
import javax.swing.*;
import java.awt.*;

4
java_console/ui/src/com/rusefi/ui/Wizard.java
View File

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

6
java_console/ui/src/com/rusefi/ui/engine/EngineSnifferPanel.java
View File

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

4
java_console/ui/src/com/rusefi/ui/engine/EngineSnifferStatusPanel.java
View File

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

8
java_console/ui/src/com/rusefi/ui/engine/UpDownImage.java
View File

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

2
java_console/ui/src/com/rusefi/ui/engine/ZoomControl.java
View File

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

2
java_console/ui/src/com/rusefi/ui/engine/test/UpDownSandbox.java
View File

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

2
java_console/ui/src/com/rusefi/ui/FlexibleControls.java → java_console/ui/src/com/rusefi/ui/fsio/FlexibleControls.java
View File

@ -1,4 +1,4 @@
package com.rusefi.ui;
package com.rusefi.ui.fsio;
import com.autsia.bracer.BracerParser;

6
java_console/ui/src/com/rusefi/FIleItem.java → java_console/ui/src/com/rusefi/ui/logview/FileItem.java
View File

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

16
java_console/ui/src/com/rusefi/ui/LogViewer.java → java_console/ui/src/com/rusefi/ui/logview/LogViewer.java
View File

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

4
java_console/ui/src/com/rusefi/ui/test/FlexibleControlsSandbox.java
View File

@ -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

2
java_console/ui/src/com/irnems/ui/test/RpmModelTest.java → java_console/ui/src/com/rusefi/ui/test/RpmModelTest.java
View File

@ -1,4 +1,4 @@
package com.irnems.ui.test;
package com.rusefi.ui.test;
import com.rusefi.ui.RpmModel;
import org.junit.Assert;

4
java_console/ui/src/com/irnems/ui/test/WavePanelSandbox.java → java_console/ui/src/com/rusefi/ui/test/WavePanelSandbox.java
View File

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

2
java_console/ui/src/com/rusefi/ui/FrameHelper.java → java_console/ui/src/com/rusefi/ui/util/FrameHelper.java
View File

@ -1,4 +1,4 @@
package com.rusefi.ui;
package com.rusefi.ui.util;
import com.rusefi.FileLog;

2
java_console/ui/src/com/rusefi/HorizontalLine.java → java_console/ui/src/com/rusefi/ui/util/HorizontalLine.java
View File

@ -1,4 +1,4 @@
package com.rusefi;
package com.rusefi.ui.util;
import javax.swing.*;
import java.awt.*;

2
java_console/ui/src/com/rusefi/ui/widgets/AdcDebugControl.java
View File

@ -1,6 +1,6 @@
package com.rusefi.ui.widgets;
import com.irnems.core.Sensor;
import com.rusefi.core.Sensor;
/**
* 7/11/13

4
java_console/ui/src/com/rusefi/ui/widgets/BooleanFlagControlPanel.java
View File

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

2
java_console/ui/src/com/rusefi/ui/widgets/DetachedSensor.java
View File

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

4
java_console/ui/src/com/rusefi/ui/widgets/IdleLabel.java
View File

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

2
java_console/ui/src/com/rusefi/ui/widgets/InjectorControl.java
View File

@ -1,6 +1,6 @@
package com.rusefi.ui.widgets;
import com.irnems.core.Sensor;
import com.rusefi.core.Sensor;
/**
* 7/13/13

2
java_console/ui/src/com/rusefi/ui/widgets/MafCommand.java
View File

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

6
java_console/ui/src/com/rusefi/ui/widgets/PotCommand.java
View File

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

6
java_console/ui/src/com/rusefi/ui/widgets/SensorGauge.java
View File

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