From 60ea1d7b6dab37e6727e5e578260cad86cafad62 Mon Sep 17 00:00:00 2001 From: zt515 Date: Tue, 26 Dec 2017 00:55:30 +0800 Subject: [PATCH] Component: Refactor codegen --- .../neoterm/component/codegen/CodeGenComponent.kt | 2 +- .../component/codegen/generator/ICodeGenerator.kt | 13 ------------- .../{impl => generators}/NeoColorGenerator.kt | 4 ++-- .../{impl => generators}/NeoProfileGenerator.kt | 4 ++-- .../component/codegen/model/CodeGenObject.kt | 2 +- .../neoterm/component/colorscheme/NeoColorScheme.kt | 4 ++-- .../java/io/neoterm/component/profile/NeoProfile.kt | 4 ++-- .../main/java/io/neoterm/ui/setup/SetupActivity.kt | 8 ++++---- 8 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 app/src/main/java/io/neoterm/component/codegen/generator/ICodeGenerator.kt rename app/src/main/java/io/neoterm/component/codegen/{impl => generators}/NeoColorGenerator.kt (95%) rename app/src/main/java/io/neoterm/component/codegen/{impl => generators}/NeoProfileGenerator.kt (78%) diff --git a/app/src/main/java/io/neoterm/component/codegen/CodeGenComponent.kt b/app/src/main/java/io/neoterm/component/codegen/CodeGenComponent.kt index c4ee67d..6eaa72e 100644 --- a/app/src/main/java/io/neoterm/component/codegen/CodeGenComponent.kt +++ b/app/src/main/java/io/neoterm/component/codegen/CodeGenComponent.kt @@ -1,6 +1,6 @@ package io.neoterm.component.codegen -import io.neoterm.component.codegen.generator.ICodeGenerator +import io.neoterm.component.codegen.interfaces.ICodeGenerator import io.neoterm.component.codegen.model.CodeGenObject import io.neoterm.frontend.component.NeoComponent diff --git a/app/src/main/java/io/neoterm/component/codegen/generator/ICodeGenerator.kt b/app/src/main/java/io/neoterm/component/codegen/generator/ICodeGenerator.kt deleted file mode 100644 index 784e260..0000000 --- a/app/src/main/java/io/neoterm/component/codegen/generator/ICodeGenerator.kt +++ /dev/null @@ -1,13 +0,0 @@ -package io.neoterm.component.codegen.generator - -import io.neoterm.component.codegen.CodeGenParameter -import io.neoterm.component.codegen.model.CodeGenObject - -/** - * @author kiva - */ -abstract class ICodeGenerator(parameter: CodeGenParameter) { - abstract fun getGeneratorName(): String - - abstract fun generateCode(codeGenObject: CodeGenObject): String -} diff --git a/app/src/main/java/io/neoterm/component/codegen/impl/NeoColorGenerator.kt b/app/src/main/java/io/neoterm/component/codegen/generators/NeoColorGenerator.kt similarity index 95% rename from app/src/main/java/io/neoterm/component/codegen/impl/NeoColorGenerator.kt rename to app/src/main/java/io/neoterm/component/codegen/generators/NeoColorGenerator.kt index 76244c4..2b720c9 100644 --- a/app/src/main/java/io/neoterm/component/codegen/impl/NeoColorGenerator.kt +++ b/app/src/main/java/io/neoterm/component/codegen/generators/NeoColorGenerator.kt @@ -1,7 +1,7 @@ -package io.neoterm.component.codegen.impl +package io.neoterm.component.codegen.generators import io.neoterm.component.codegen.CodeGenParameter -import io.neoterm.component.codegen.generator.ICodeGenerator +import io.neoterm.component.codegen.interfaces.ICodeGenerator import io.neoterm.component.codegen.model.CodeGenObject import io.neoterm.component.colorscheme.NeoColorScheme import io.neoterm.component.config.ConfigureComponent diff --git a/app/src/main/java/io/neoterm/component/codegen/impl/NeoProfileGenerator.kt b/app/src/main/java/io/neoterm/component/codegen/generators/NeoProfileGenerator.kt similarity index 78% rename from app/src/main/java/io/neoterm/component/codegen/impl/NeoProfileGenerator.kt rename to app/src/main/java/io/neoterm/component/codegen/generators/NeoProfileGenerator.kt index a5edd61..1bf2961 100644 --- a/app/src/main/java/io/neoterm/component/codegen/impl/NeoProfileGenerator.kt +++ b/app/src/main/java/io/neoterm/component/codegen/generators/NeoProfileGenerator.kt @@ -1,7 +1,7 @@ -package io.neoterm.component.codegen.impl +package io.neoterm.component.codegen.generators import io.neoterm.component.codegen.CodeGenParameter -import io.neoterm.component.codegen.generator.ICodeGenerator +import io.neoterm.component.codegen.interfaces.ICodeGenerator import io.neoterm.component.codegen.model.CodeGenObject /** diff --git a/app/src/main/java/io/neoterm/component/codegen/model/CodeGenObject.kt b/app/src/main/java/io/neoterm/component/codegen/model/CodeGenObject.kt index 64eb66f..2122aad 100644 --- a/app/src/main/java/io/neoterm/component/codegen/model/CodeGenObject.kt +++ b/app/src/main/java/io/neoterm/component/codegen/model/CodeGenObject.kt @@ -1,7 +1,7 @@ package io.neoterm.component.codegen.model import io.neoterm.component.codegen.CodeGenParameter -import io.neoterm.component.codegen.generator.ICodeGenerator +import io.neoterm.component.codegen.interfaces.ICodeGenerator /** * @author kiva diff --git a/app/src/main/java/io/neoterm/component/colorscheme/NeoColorScheme.kt b/app/src/main/java/io/neoterm/component/colorscheme/NeoColorScheme.kt index 2e7a39a..4c941d2 100644 --- a/app/src/main/java/io/neoterm/component/colorscheme/NeoColorScheme.kt +++ b/app/src/main/java/io/neoterm/component/colorscheme/NeoColorScheme.kt @@ -4,9 +4,9 @@ import io.neolang.visitor.ConfigVisitor import io.neoterm.backend.TerminalColorScheme import io.neoterm.backend.TerminalColors import io.neoterm.component.codegen.CodeGenParameter -import io.neoterm.component.codegen.generator.ICodeGenerator +import io.neoterm.component.codegen.interfaces.ICodeGenerator import io.neoterm.component.codegen.model.CodeGenObject -import io.neoterm.component.codegen.impl.NeoColorGenerator +import io.neoterm.component.codegen.generators.NeoColorGenerator import io.neoterm.component.config.ConfigureComponent import io.neoterm.frontend.component.ComponentManager import io.neoterm.frontend.component.helper.ConfigFileBasedObject diff --git a/app/src/main/java/io/neoterm/component/profile/NeoProfile.kt b/app/src/main/java/io/neoterm/component/profile/NeoProfile.kt index 8a7540f..2b7500d 100644 --- a/app/src/main/java/io/neoterm/component/profile/NeoProfile.kt +++ b/app/src/main/java/io/neoterm/component/profile/NeoProfile.kt @@ -1,8 +1,8 @@ package io.neoterm.component.profile import io.neoterm.component.codegen.CodeGenParameter -import io.neoterm.component.codegen.generator.ICodeGenerator -import io.neoterm.component.codegen.impl.NeoProfileGenerator +import io.neoterm.component.codegen.interfaces.ICodeGenerator +import io.neoterm.component.codegen.generators.NeoProfileGenerator import io.neoterm.component.codegen.model.CodeGenObject import io.neoterm.frontend.component.helper.ConfigFileBasedObject diff --git a/app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt b/app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt index 8637930..ce8cfe1 100644 --- a/app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt +++ b/app/src/main/java/io/neoterm/ui/setup/SetupActivity.kt @@ -13,10 +13,10 @@ import io.neoterm.frontend.config.NeoTermPath import io.neoterm.setup.ResultListener import io.neoterm.setup.SetupHelper import io.neoterm.setup.SourceConnection -import io.neoterm.setup.connection.AssetsFileConnection -import io.neoterm.setup.connection.BackupFileConnection -import io.neoterm.setup.connection.LocalFileConnection -import io.neoterm.setup.connection.NetworkConnection +import io.neoterm.setup.connections.AssetsFileConnection +import io.neoterm.setup.connections.BackupFileConnection +import io.neoterm.setup.connections.LocalFileConnection +import io.neoterm.setup.connections.NetworkConnection import io.neoterm.setup.helper.URLAvailability import io.neoterm.utils.MediaUtils import io.neoterm.utils.PackageUtils