From 56fbc21b71105fcc5afa695b541bda787f9d3d17 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 20 Dec 2018 00:52:18 -0500 Subject: [PATCH] refactoring --- java_tools/ConfigDefinition.jar | Bin 41639 -> 42295 bytes .../src/com/rusefi/ConfigDefinition.java | 10 +--------- .../src/com/rusefi/JavaFieldsConsumer.java | 16 ++++++++++++++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 378b8f4877d5f0264c3570cf583e015971a12616..ff610960495215743910d4a58b387cf194352a68 100644 GIT binary patch delta 10507 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 E0>lLjn*aa+ diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java index ffe2c4e07c..0d02fc6f1f 100644 --- a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java +++ b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java @@ -22,7 +22,6 @@ public class ConfigDefinition { private static final String ROM_RAIDER_XML_TEMPLATE = "rusefi_template.xml"; private static final String ROM_RAIDER_XML_OUTPUT = "rusefi.xml"; private static final String ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H = "engine_configuration_generated_structures.h"; - private static final String FIELDS_JAVA = "models/src/com/rusefi/config/Fields.java"; public static int totalTsSize; public static StringBuilder settingContextHelp = new StringBuilder(); @@ -60,14 +59,7 @@ public class ConfigDefinition { processFile(state, br, cHeaderConsumer, tsProjectConsumer, javaFieldsConcumer); - BufferedWriter javaFields = new BufferedWriter(new FileWriter(javaConsolePath + File.separator + FIELDS_JAVA)); - javaFields.write("package com.rusefi.config;" + EOL + EOL); - javaFields.write("// this file " + MESSAGE + EOL); - javaFields.write("public class Fields {" + EOL); - javaFields.write(VariableRegistry.INSTANCE.getJavaConstants()); - javaFields.write(javaFieldsWriter.toString()); - javaFields.write("}" + EOL); - javaFields.close(); + JavaFieldsConsumer.writeFields(javaConsolePath, javaFieldsWriter); TSProjectConsumer.writeTunerStudioFile(tsPath, tsWriter.toString()); diff --git a/java_tools/configuration_definition/src/com/rusefi/JavaFieldsConsumer.java b/java_tools/configuration_definition/src/com/rusefi/JavaFieldsConsumer.java index 501a3a8426..2b348df369 100644 --- a/java_tools/configuration_definition/src/com/rusefi/JavaFieldsConsumer.java +++ b/java_tools/configuration_definition/src/com/rusefi/JavaFieldsConsumer.java @@ -1,9 +1,10 @@ package com.rusefi; -import java.io.CharArrayWriter; -import java.io.IOException; +import java.io.*; public class JavaFieldsConsumer implements ConfigurationConsumer { + private static final String FIELDS_JAVA = "models/src/com/rusefi/config/Fields.java"; + private final CharArrayWriter javaFieldsWriter; private final ReaderState state; @@ -12,6 +13,17 @@ public class JavaFieldsConsumer implements ConfigurationConsumer { this.state = state; } + static void writeFields(String javaConsolePath, CharArrayWriter javaFieldsWriter) throws IOException { + BufferedWriter javaFields = new BufferedWriter(new FileWriter(javaConsolePath + File.separator + FIELDS_JAVA)); + javaFields.write("package com.rusefi.config;" + ConfigDefinition.EOL + ConfigDefinition.EOL); + javaFields.write("// this file " + ConfigDefinition.MESSAGE + ConfigDefinition.EOL); + javaFields.write("public class Fields {" + ConfigDefinition.EOL); + javaFields.write(VariableRegistry.INSTANCE.getJavaConstants()); + javaFields.write(javaFieldsWriter.toString()); + javaFields.write("}" + ConfigDefinition.EOL); + javaFields.close(); + } + @Override public void startFile() throws IOException {