From 843f759941f73eed9fd88176a8f93cee8a7e1ef4 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Thu, 20 Dec 2018 00:59:33 -0500
Subject: [PATCH] refactoring

---
 java_tools/ConfigDefinition.jar               | Bin 42295 -> 42199 bytes
 .../src/com/rusefi/CHeaderConsumer.java       |   5 -----
 .../src/com/rusefi/ConfigDefinition.java      |   6 +++---
 .../src/com/rusefi/ConfigurationConsumer.java |   2 --
 .../src/com/rusefi/JavaFieldsConsumer.java    |  13 +++++--------
 .../src/com/rusefi/TSProjectConsumer.java     |   5 -----
 6 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar
index ff610960495215743910d4a58b387cf194352a68..b3284edd419a3ca286d20c90b94e3648a75b5ac6 100644
GIT binary patch
delta 15913
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
Z;HfFX{Y_!}C%KgxVElJQnP>jf`yWq?S+)QG

delta 15935
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
BLZtuz

diff --git a/java_tools/configuration_definition/src/com/rusefi/CHeaderConsumer.java b/java_tools/configuration_definition/src/com/rusefi/CHeaderConsumer.java
index aeb850d840..375dd808b7 100644
--- a/java_tools/configuration_definition/src/com/rusefi/CHeaderConsumer.java
+++ b/java_tools/configuration_definition/src/com/rusefi/CHeaderConsumer.java
@@ -35,9 +35,4 @@ public class CHeaderConsumer implements ConfigurationConsumer {
     public void handleEndStruct(ConfigStructure structure) throws IOException {
         ConfigStructure.headerWrite(structure, cHeader);
     }
-
-    @Override
-    public void onTotalEnd() {
-
-    }
 }
diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
index 0d02fc6f1f..87450d6672 100644
--- a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
+++ b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
@@ -55,11 +55,10 @@ public class ConfigDefinition {
 
         ConfigurationConsumer cHeaderConsumer = new CHeaderConsumer(cHeader);
         ConfigurationConsumer tsProjectConsumer = new TSProjectConsumer(tsWriter, tsPath, state);
-        ConfigurationConsumer javaFieldsConcumer = new JavaFieldsConsumer(javaFieldsWriter, state);
+        ConfigurationConsumer javaFieldsConsumer = new JavaFieldsConsumer(javaFieldsWriter, state, javaConsolePath);
 
-        processFile(state, br, cHeaderConsumer, tsProjectConsumer, javaFieldsConcumer);
+        processFile(state, br, cHeaderConsumer, tsProjectConsumer, javaFieldsConsumer);
 
-        JavaFieldsConsumer.writeFields(javaConsolePath, javaFieldsWriter);
 
 
         TSProjectConsumer.writeTunerStudioFile(tsPath, tsWriter.toString());
@@ -136,6 +135,7 @@ public class ConfigDefinition {
             }
         }
         cHeaderConsumer.endFile();
+        javaFieldsConcumer.endFile();
     }
 
     private static void handleCustomLine(ReaderState state, String line) {
diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigurationConsumer.java b/java_tools/configuration_definition/src/com/rusefi/ConfigurationConsumer.java
index cc428771d3..a6b02ca29b 100644
--- a/java_tools/configuration_definition/src/com/rusefi/ConfigurationConsumer.java
+++ b/java_tools/configuration_definition/src/com/rusefi/ConfigurationConsumer.java
@@ -8,6 +8,4 @@ public interface ConfigurationConsumer {
     void endFile() throws IOException;
 
     void handleEndStruct(ConfigStructure structure) throws IOException;
-
-    void onTotalEnd();
 }
diff --git a/java_tools/configuration_definition/src/com/rusefi/JavaFieldsConsumer.java b/java_tools/configuration_definition/src/com/rusefi/JavaFieldsConsumer.java
index 2b348df369..7e701f3e03 100644
--- a/java_tools/configuration_definition/src/com/rusefi/JavaFieldsConsumer.java
+++ b/java_tools/configuration_definition/src/com/rusefi/JavaFieldsConsumer.java
@@ -7,13 +7,15 @@ public class JavaFieldsConsumer implements ConfigurationConsumer {
 
     private final CharArrayWriter javaFieldsWriter;
     private final ReaderState state;
+    private final String javaConsolePath;
 
-    public JavaFieldsConsumer(CharArrayWriter javaFieldsWriter, ReaderState state) {
+    public JavaFieldsConsumer(CharArrayWriter javaFieldsWriter, ReaderState state, String javaConsolePath) {
         this.javaFieldsWriter = javaFieldsWriter;
         this.state = state;
+        this.javaConsolePath = javaConsolePath;
     }
 
-    static void writeFields(String javaConsolePath, CharArrayWriter javaFieldsWriter) throws IOException {
+    private 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);
@@ -31,7 +33,7 @@ public class JavaFieldsConsumer implements ConfigurationConsumer {
 
     @Override
     public void endFile() throws IOException {
-
+        JavaFieldsConsumer.writeFields(javaConsolePath, javaFieldsWriter);
     }
 
     @Override
@@ -40,9 +42,4 @@ public class JavaFieldsConsumer implements ConfigurationConsumer {
             structure.writeJavaFields(state,"", javaFieldsWriter, 0);
         }
     }
-
-    @Override
-    public void onTotalEnd() {
-
-    }
 }
diff --git a/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java b/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java
index 1d41f34a88..3140e6bb7d 100644
--- a/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java
+++ b/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java
@@ -89,9 +89,4 @@ public class TSProjectConsumer implements ConfigurationConsumer {
  //           TSProjectConsumer.writeTunerStudioFile(tsPath, tsWriter.toString());
         }
     }
-
-    @Override
-    public void onTotalEnd() {
-
-    }
 }