From 9ec116608539dbb0b4c3b53783ec39a8b9821f1d Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 20 Dec 2018 00:44:53 -0500 Subject: [PATCH] refactoring --- .../src/com/rusefi/ConfigDefinition.java | 8 ++++---- .../src/com/rusefi/TSProjectConsumer.java | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java index f336fa60f4..6e54d830e6 100644 --- a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java +++ b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java @@ -57,7 +57,7 @@ public class ConfigDefinition { ConfigurationConsumer cHeaderConsumer = new CHeaderConsumer(cHeader); ConfigurationConsumer tsProjectConsumer = new TSProjectConsumer(tsWriter, tsPath, state); - processFile(state, br, cHeaderConsumer, tsWriter, javaFieldsWriter, tsProjectConsumer); + processFile(state, br, cHeaderConsumer, javaFieldsWriter, tsProjectConsumer); BufferedWriter javaFields = new BufferedWriter(new FileWriter(javaConsolePath + File.separator + FIELDS_JAVA)); javaFields.write("package com.rusefi.config;" + EOL + EOL); @@ -104,7 +104,7 @@ public class ConfigDefinition { } private static void processFile(ReaderState state, BufferedReader br, ConfigurationConsumer cHeaderConsumer, - Writer tsHeader, CharArrayWriter javaFieldsWriter, ConfigurationConsumer tsProjectConsumer) throws IOException { + CharArrayWriter javaFieldsWriter, ConfigurationConsumer tsProjectConsumer) throws IOException { String line; cHeaderConsumer.startFile(); @@ -123,7 +123,7 @@ public class ConfigDefinition { } else if (line.startsWith(STRUCT_NO_PREFIX)) { handleStartStructure(state, line.substring(STRUCT_NO_PREFIX.length()), false); } else if (line.startsWith(END_STRUCT)) { - handleEndStruct(state, cHeaderConsumer, tsHeader, javaFieldsWriter, tsProjectConsumer); + handleEndStruct(state, cHeaderConsumer, javaFieldsWriter, tsProjectConsumer); } else if (line.startsWith(BIT)) { handleBitLine(state, line); @@ -202,7 +202,7 @@ public class ConfigDefinition { } private static void handleEndStruct(ReaderState state, ConfigurationConsumer cHeaderConsumer, - Writer tsHeader, CharArrayWriter javaFieldsWriter, ConfigurationConsumer tsProjectConsumer) throws IOException { + CharArrayWriter javaFieldsWriter, ConfigurationConsumer tsProjectConsumer) throws IOException { if (state.stack.isEmpty()) throw new IllegalStateException("Unexpected end_struct"); ConfigStructure structure = state.stack.pop(); diff --git a/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java b/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java index 9bf98c6a73..1d41f34a88 100644 --- a/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java +++ b/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java @@ -86,6 +86,7 @@ public class TSProjectConsumer implements ConfigurationConsumer { ConfigDefinition.totalTsSize = structure.writeTunerStudio("", tsWriter, 0); tsWriter.write("; total TS size = " + ConfigDefinition.totalTsSize + EOL); VariableRegistry.INSTANCE.register("TOTAL_CONFIG_SIZE", ConfigDefinition.totalTsSize); + // TSProjectConsumer.writeTunerStudioFile(tsPath, tsWriter.toString()); } }