From 256738680f6fceb418a568dee89c06b323372f2a Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 11 Dec 2021 13:00:33 -0500 Subject: [PATCH] refactoring --- .../output/AbstractConfigurationConsumer.java | 14 ++++++++++++++ .../com/rusefi/output/BaseCHeaderConsumer.java | 6 +----- .../java/com/rusefi/output/DataLogConsumer.java | 14 +------------- .../main/java/com/rusefi/output/GaugeConsumer.java | 14 +------------- .../com/rusefi/output/OutputsSectionConsumer.java | 10 +--------- .../java/com/rusefi/output/SignatureConsumer.java | 10 +--------- 6 files changed, 19 insertions(+), 49 deletions(-) create mode 100644 java_tools/configuration_definition/src/main/java/com/rusefi/output/AbstractConfigurationConsumer.java diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/AbstractConfigurationConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/AbstractConfigurationConsumer.java new file mode 100644 index 0000000000..61b3f45268 --- /dev/null +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/AbstractConfigurationConsumer.java @@ -0,0 +1,14 @@ +package com.rusefi.output; + +import java.io.IOException; + +public abstract class AbstractConfigurationConsumer implements ConfigurationConsumer { + + @Override + public void startFile() throws IOException { + } + + @Override + public void endFile() throws IOException { + } +} diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java index fb0dcc62e0..fb2d1a13e9 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java @@ -4,7 +4,7 @@ import com.rusefi.*; import static com.rusefi.ToolUtil.EOL; -public abstract class BaseCHeaderConsumer implements ConfigurationConsumer { +public abstract class BaseCHeaderConsumer extends AbstractConfigurationConsumer { private static final String BOOLEAN_TYPE = "bool"; private final StringBuilder content = new StringBuilder(); @@ -63,8 +63,4 @@ public abstract class BaseCHeaderConsumer implements ConfigurationConsumer { public StringBuilder getContent() { return content; } - - @Override - public void startFile() { - } } diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java index d9de403447..6f85f43207 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java @@ -14,7 +14,7 @@ import java.util.TreeSet; import static com.rusefi.ConfigField.unquote; import static org.abego.treelayout.internal.util.java.lang.string.StringUtil.quote; -public class DataLogConsumer implements ConfigurationConsumer { +public class DataLogConsumer extends AbstractConfigurationConsumer { private final String fileName; private final ReaderState state; private final CharArrayWriter tsWriter = new CharArrayWriter(); @@ -25,18 +25,6 @@ public class DataLogConsumer implements ConfigurationConsumer { this.state = state; } - @Override - public void startFile() throws IOException { - System.out.println("startFile"); - - } - - @Override - public void endFile() throws IOException { - System.out.println("endFile"); - - } - @Override public void handleEndStruct(ConfigStructure structure) throws IOException { if (state.stack.isEmpty()) { diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GaugeConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GaugeConsumer.java index 7f01f7f5f0..ae1650cd0b 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GaugeConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GaugeConsumer.java @@ -10,7 +10,7 @@ import java.io.IOException; import static com.rusefi.output.DataLogConsumer.getComment; import static org.abego.treelayout.internal.util.java.lang.string.StringUtil.quote; -public class GaugeConsumer implements ConfigurationConsumer { +public class GaugeConsumer extends AbstractConfigurationConsumer { private final String fileName; private final ReaderState state; private final CharArrayWriter charArrayWriter = new CharArrayWriter(); @@ -20,18 +20,6 @@ public class GaugeConsumer implements ConfigurationConsumer { this.state = state; } - @Override - public void startFile() throws IOException { - System.out.println("startFile"); - - } - - @Override - public void endFile() throws IOException { - System.out.println("endFile"); - - } - @Override public void handleEndStruct(ConfigStructure structure) throws IOException { if (state.stack.isEmpty()) { diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/OutputsSectionConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/OutputsSectionConsumer.java index 3c2268b89d..f7ec3352fc 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/OutputsSectionConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/OutputsSectionConsumer.java @@ -4,7 +4,7 @@ import com.rusefi.ReaderState; import java.io.*; -public class OutputsSectionConsumer implements ConfigurationConsumer { +public class OutputsSectionConsumer extends AbstractConfigurationConsumer { private final String tsOutputsSectionFileName; private final TsOutput tsOutput; private final ReaderState state; @@ -16,18 +16,10 @@ public class OutputsSectionConsumer implements ConfigurationConsumer { this.state = state; } - @Override - public void startFile() throws IOException { - } - public CharArrayWriter getTsWriter() { return tsWriter; } - @Override - public void endFile() throws IOException { - } - @Override public void handleEndStruct(ConfigStructure structure) throws IOException { System.out.println("handleEndStruct"); diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/SignatureConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/SignatureConsumer.java index 8c93858513..ddff5adde3 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/SignatureConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/SignatureConsumer.java @@ -8,7 +8,7 @@ import java.io.IOException; /** * Configuration consumer which writes Signature header file */ -public class SignatureConsumer implements ConfigurationConsumer { +public class SignatureConsumer extends AbstractConfigurationConsumer { private final String destHeader; VariableRegistry registry; @@ -18,16 +18,8 @@ public class SignatureConsumer implements ConfigurationConsumer { this.registry = vregistry; } - @Override - public void startFile() { - } - @Override public void handleEndStruct(ConfigStructure structure) throws IOException { ConfigDefinition.writeDefinesToFile(registry, destHeader); } - - @Override - public void endFile() throws IOException { - } }