diff --git a/java_console/autotest/src/main/java/com/rusefi/TestingUtils.java b/java_console/autotest/src/main/java/com/rusefi/TestingUtils.java index e606d3352b..adc4b0533f 100644 --- a/java_console/autotest/src/main/java/com/rusefi/TestingUtils.java +++ b/java_console/autotest/src/main/java/com/rusefi/TestingUtils.java @@ -105,17 +105,12 @@ public class TestingUtils { } public static EngineChart nextChart(CommandQueue commandQueue) { - long start = System.currentTimeMillis(); - EngineChart chart = EngineChartParser.unpackToMap(getNextWaveChart(commandQueue)); - // FileLog.MAIN.logLine("AUTOTEST nextChart() in " + (System.currentTimeMillis() - start)); - return chart; + return EngineChartParser.unpackToMap(getNextWaveChart(commandQueue)); } static String getNextWaveChart(CommandQueue commandQueue) { IoUtil.sendBlockingCommand(Fields.CMD_RESET_ENGINE_SNIFFER, commandQueue); - String result = getEngineChart(commandQueue); - // FileLog.MAIN.logLine("current chart: " + result); - return result; + return getEngineChart(commandQueue); } /** diff --git a/java_console/inifile/src/main/java/com/rusefi/config/Field.java b/java_console/inifile/src/main/java/com/rusefi/config/Field.java index 3ea7a45b3a..99c4209c7e 100644 --- a/java_console/inifile/src/main/java/com/rusefi/config/Field.java +++ b/java_console/inifile/src/main/java/com/rusefi/config/Field.java @@ -97,10 +97,9 @@ public class Field { public static String niceToString(Number value, int precision) { // not enum field - Number number = value; - if (number instanceof Float) - return niceToString(number.floatValue(), precision); - return number.toString(); + if (value instanceof Float) + return niceToString(value.floatValue(), precision); + return value.toString(); } public static String niceToString(double value, int precision) { diff --git a/java_console/io/src/main/java/com/rusefi/AverageAnglesUtil.java b/java_console/io/src/main/java/com/rusefi/AverageAnglesUtil.java index b1c588d341..365a6f85c0 100644 --- a/java_console/io/src/main/java/com/rusefi/AverageAnglesUtil.java +++ b/java_console/io/src/main/java/com/rusefi/AverageAnglesUtil.java @@ -58,7 +58,7 @@ public class AverageAnglesUtil { continue; line = line.substring(ANALOG_CHART.length()); - String p[] = line.split(","); + String[] p = line.split(","); line = p[0]; aa.add(currentRpm, line); diff --git a/java_console/io/src/main/java/com/rusefi/autodetect/PortDetector.java b/java_console/io/src/main/java/com/rusefi/autodetect/PortDetector.java index cfdc772d00..7fdc7b70d6 100644 --- a/java_console/io/src/main/java/com/rusefi/autodetect/PortDetector.java +++ b/java_console/io/src/main/java/com/rusefi/autodetect/PortDetector.java @@ -35,7 +35,7 @@ public class PortDetector { if (rusEfiAddress != null) { return getSignatureFromPorts(callback, new String[] {rusEfiAddress}); } - String[] serialPorts = getPortNames(); + String[] serialPorts = LinkManager.getCommPorts(); if (serialPorts.length == 0) { log.error("No serial ports detected"); return new SerialAutoChecker.AutoDetectResult(null, null); @@ -93,13 +93,6 @@ public class PortDetector { return autoDetectResult; } - private static String[] getPortNames() { -// long now = System.currentTimeMillis(); - String[] portNames = LinkManager.getCommPorts(); -// log.info("Took " + (System.currentTimeMillis() - now)); - return portNames; - } - @Nullable public static SerialAutoChecker.AutoDetectResult autoDetectPort(JFrame parent) { SerialAutoChecker.AutoDetectResult autoDetectedPort = autoDetectSerial(null); diff --git a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/TcpClientSandbox.java b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/TcpClientSandbox.java index 67edf52290..9f09d79985 100644 --- a/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/TcpClientSandbox.java +++ b/java_console/io/src/test/java/com/rusefi/binaryprotocol/test/TcpClientSandbox.java @@ -23,7 +23,7 @@ public class TcpClientSandbox { for (int i = 0; i < 3; i++) { // warm-up cycles just for fun - String signature = BinaryProtocol.getSignature(tsStream); + BinaryProtocol.getSignature(tsStream); } @@ -32,7 +32,7 @@ public class TcpClientSandbox { long startMs = System.currentTimeMillis(); for (int i = 0; i < count; i++) { // warm-up cycles just for fun - String signature = BinaryProtocol.getSignature(tsStream); + BinaryProtocol.getSignature(tsStream); } long time = System.currentTimeMillis() - startMs; double timePerCommand = 1.0 * time / count; diff --git a/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java b/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java index 4834ca5d3c..1e93552443 100644 --- a/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java +++ b/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java @@ -76,7 +76,6 @@ public class TestHelper extends MockitoTestHelper { } public static BinaryProtocolServer createVirtualController(int controllerPort, ConfigurationImage controllerImage, BinaryProtocolServer.Context context) throws InterruptedException { - CountDownLatch controllerCreated = new CountDownLatch(1); try { return createVirtualController(controllerImage, controllerPort, context); } catch (IOException e) { diff --git a/java_console/models/src/main/java/com/rusefi/AverageAngles.java b/java_console/models/src/main/java/com/rusefi/AverageAngles.java index 8c7e2cbc0d..c0540bfb2a 100644 --- a/java_console/models/src/main/java/com/rusefi/AverageAngles.java +++ b/java_console/models/src/main/java/com/rusefi/AverageAngles.java @@ -65,7 +65,7 @@ public class AverageAngles { count ++; rpmAtPrevChart = rpm; - String v[] = line.split("\\|"); + String[] v = line.split("\\|"); System.out.println("rpm " + rpm + ": " + v.length + " values"); List current = new ArrayList<>(); @@ -102,7 +102,7 @@ public class AverageAngles { for (Map.Entry> e : angleData.entrySet()) { int k = e.getKey(); List v = e.getValue(); - double values[] = new double[v.size()]; + double[] values = new double[v.size()]; for (int i = 0; i < v.size(); i++) values[i] = v.get(i).getAngle(); diff --git a/java_console/models/src/main/java/com/rusefi/CyclicBuffer.java b/java_console/models/src/main/java/com/rusefi/CyclicBuffer.java index 127eee3606..ff364d553d 100644 --- a/java_console/models/src/main/java/com/rusefi/CyclicBuffer.java +++ b/java_console/models/src/main/java/com/rusefi/CyclicBuffer.java @@ -6,7 +6,7 @@ import java.util.Arrays; * Fixed-size array backed buffer */ public class CyclicBuffer implements DataBuffer { - private final double values[]; + private final double[] values; private int size = 0; private int pointer = 0; diff --git a/java_console/models/src/main/java/com/rusefi/waves/EngineReport.java b/java_console/models/src/main/java/com/rusefi/waves/EngineReport.java index 63ad14d862..93576d5dc7 100644 --- a/java_console/models/src/main/java/com/rusefi/waves/EngineReport.java +++ b/java_console/models/src/main/java/com/rusefi/waves/EngineReport.java @@ -125,8 +125,8 @@ public class EngineReport { continue; } - String upString[] = array[index].split("_"); - String downString[] = array[index + 2].split("_"); + String[] upString = array[index].split("_"); + String[] downString = array[index + 2].split("_"); try { int upTime = Integer.parseInt(array[index + 1]); int downTime = Integer.parseInt(array[index + 3]); diff --git a/java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java b/java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java index d69d40bb57..cc7ff57df7 100644 --- a/java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java +++ b/java_console/ui/src/main/java/com/rusefi/SerialPortScanner.java @@ -284,7 +284,6 @@ public enum SerialPortScanner { return false; } - IncomingDataBuffer idb = stream.getDataBuffer(); stream.sendPacket(new byte[]{(byte) Fields.TS_QUERY_BOOTLOADER}); byte[] response = stream.getDataBuffer().getPacket(500, "fomeEcuHasOpenblt"); diff --git a/java_console/ui/src/main/java/com/rusefi/autodetect/PortDetectorSandbox.java b/java_console/ui/src/main/java/com/rusefi/autodetect/PortDetectorSandbox.java deleted file mode 100644 index 8cbf96ee89..0000000000 --- a/java_console/ui/src/main/java/com/rusefi/autodetect/PortDetectorSandbox.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.rusefi.autodetect; - -public class PortDetectorSandbox { - public static void main(String[] args) throws InterruptedException { - while (true) { - String port = PortDetector.autoDetectSerial(null).getSerialPort(); - System.out.println("Detected " + port); - - Thread.sleep(1000); - } - } -} diff --git a/java_console/ui/src/main/java/com/rusefi/ui/FrameHelper.java b/java_console/ui/src/main/java/com/rusefi/ui/FrameHelper.java index e003851166..e2e1ae83bd 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/FrameHelper.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/FrameHelper.java @@ -1,4 +1,4 @@ -package com.rusefi.core.ui; +package com.rusefi.ui; import javax.swing.*; import java.awt.*; diff --git a/java_console/ui/src/main/java/com/rusefi/ui/util/DefaultExceptionHandler.java b/java_console/ui/src/main/java/com/rusefi/ui/util/DefaultExceptionHandler.java index 5eb3c74876..fcb66a1f75 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/util/DefaultExceptionHandler.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/util/DefaultExceptionHandler.java @@ -54,7 +54,7 @@ public class DefaultExceptionHandler implements Thread.UncaughtExceptionHandler content.add(scrollPane, BorderLayout.CENTER); JOptionPane.showConfirmDialog(findActiveFrame(), content, CONSOLE_VERSION + ": Exception Occurred", JOptionPane.DEFAULT_OPTION); - log.info("handleException: " + baos.toString()); + log.info("handleException: " + baos); } private static Frame findActiveFrame() { diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java index 9d1b837b45..e1dda32b23 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java @@ -85,11 +85,10 @@ public class GetOutputValueConsumer implements ConfigurationConsumer { @NotNull static String wrapSwitchStatement(StringBuilder switchBody) { - String fullSwitch = switchBody.length() == 0 ? "" : + return switchBody.length() == 0 ? "" : ("\tint hash = djb2lowerCase(name);\n" + "\tswitch(hash) {\n" + switchBody + "\t}\n"); - return fullSwitch; } @NotNull