From 8f251d2d13ffd161818a9aaf89dc02857aa7ed81 Mon Sep 17 00:00:00 2001 From: Danila Fedorin Date: Sat, 12 Aug 2017 21:10:43 -0700 Subject: [PATCH] Split the project into separate modules. --- build.gradle | 23 +++++-------------- core/build.gradle | 9 ++++++++ .../main/java/org/nwapw/abacus/Abacus.java | 5 ---- .../nwapw/abacus/config/Configuration.java | 0 .../abacus/function/DocumentationType.java | 0 .../org/nwapw/abacus/function/Function.java | 0 .../function/OperatorAssociativity.java | 0 .../nwapw/abacus/function/OperatorType.java | 0 .../java/org/nwapw/abacus/lexing/Lexer.java | 0 .../nwapw/abacus/lexing/pattern/AnyNode.java | 0 .../nwapw/abacus/lexing/pattern/EndNode.java | 0 .../nwapw/abacus/lexing/pattern/LinkNode.java | 0 .../nwapw/abacus/lexing/pattern/Match.java | 0 .../nwapw/abacus/lexing/pattern/Pattern.java | 0 .../abacus/lexing/pattern/PatternChain.java | 0 .../abacus/lexing/pattern/PatternNode.java | 0 .../abacus/lexing/pattern/RangeNode.java | 0 .../abacus/lexing/pattern/ValueNode.java | 0 .../ComputationInterruptedException.java | 0 .../org/nwapw/abacus/number/NaiveNumber.java | 0 .../nwapw/abacus/number/NumberInterface.java | 0 .../nwapw/abacus/number/PreciseNumber.java | 0 .../nwapw/abacus/parsing/LexerTokenizer.java | 0 .../java/org/nwapw/abacus/parsing/Parser.java | 0 .../abacus/parsing/ShuntingYardParser.java | 0 .../org/nwapw/abacus/parsing/Tokenizer.java | 0 .../org/nwapw/abacus/parsing/TreeBuilder.java | 0 .../org/nwapw/abacus/plugin/ClassFinder.java | 0 .../abacus/plugin/NumberImplementation.java | 0 .../java/org/nwapw/abacus/plugin/Plugin.java | 0 .../nwapw/abacus/plugin/PluginListener.java | 0 .../nwapw/abacus/plugin/PluginManager.java | 0 .../nwapw/abacus/plugin/StandardPlugin.java | 0 .../org/nwapw/abacus/tree/NumberReducer.java | 0 .../java/org/nwapw/abacus/tree/TokenType.java | 0 .../abacus/window/HistoryTableModel.java | 0 .../java/org/nwapw/abacus/window/Window.java | 0 .../nwapw/abacus/function/Documentation.kt | 0 .../org/nwapw/abacus/function/Operator.kt | 0 .../org/nwapw/abacus/fx/HistoryModel.kt | 0 .../org/nwapw/abacus/fx/ToggleablePlugin.kt | 0 .../org/nwapw/abacus/tree/BinaryNode.kt | 0 .../org/nwapw/abacus/tree/FunctionNode.kt | 0 .../org/nwapw/abacus/tree/NumberNode.kt | 0 .../kotlin/org/nwapw/abacus/tree/Reducer.kt | 0 .../kotlin/org/nwapw/abacus/tree/TreeNode.kt | 0 .../kotlin/org/nwapw/abacus/tree/UnaryNode.kt | 0 {src => core/src}/main/resources/abacus.fxml | 0 .../nwapw/abacus/tests/CalculationTests.java | 0 .../org/nwapw/abacus/tests/LexerTests.java | 0 .../nwapw/abacus/tests/TokenizerTests.java | 0 fx/build.gradle | 7 ++++++ .../nwapw/abacus/fx/AbacusApplication.java | 5 ++++ .../org/nwapw/abacus/fx/AbacusController.java | 0 .../org/nwapw/abacus/fx/CopyableCell.java | 0 .../nwapw/abacus/fx/DocumentationCell.java | 0 settings.gradle | 1 + 57 files changed, 28 insertions(+), 22 deletions(-) create mode 100644 core/build.gradle rename {src => core/src}/main/java/org/nwapw/abacus/Abacus.java (96%) rename {src => core/src}/main/java/org/nwapw/abacus/config/Configuration.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/function/DocumentationType.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/function/Function.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/function/OperatorAssociativity.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/function/OperatorType.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/lexing/Lexer.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/lexing/pattern/AnyNode.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/lexing/pattern/EndNode.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/lexing/pattern/LinkNode.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/lexing/pattern/Match.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/lexing/pattern/Pattern.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/lexing/pattern/PatternChain.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/lexing/pattern/PatternNode.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/lexing/pattern/RangeNode.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/lexing/pattern/ValueNode.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/number/ComputationInterruptedException.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/number/NaiveNumber.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/number/NumberInterface.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/number/PreciseNumber.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/parsing/LexerTokenizer.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/parsing/Parser.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/parsing/ShuntingYardParser.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/parsing/Tokenizer.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/parsing/TreeBuilder.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/plugin/ClassFinder.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/plugin/NumberImplementation.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/plugin/Plugin.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/plugin/PluginListener.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/plugin/PluginManager.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/plugin/StandardPlugin.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/tree/NumberReducer.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/tree/TokenType.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/window/HistoryTableModel.java (100%) rename {src => core/src}/main/java/org/nwapw/abacus/window/Window.java (100%) rename {src => core/src}/main/kotlin/org/nwapw/abacus/function/Documentation.kt (100%) rename {src => core/src}/main/kotlin/org/nwapw/abacus/function/Operator.kt (100%) rename {src => core/src}/main/kotlin/org/nwapw/abacus/fx/HistoryModel.kt (100%) rename {src => core/src}/main/kotlin/org/nwapw/abacus/fx/ToggleablePlugin.kt (100%) rename {src => core/src}/main/kotlin/org/nwapw/abacus/tree/BinaryNode.kt (100%) rename {src => core/src}/main/kotlin/org/nwapw/abacus/tree/FunctionNode.kt (100%) rename {src => core/src}/main/kotlin/org/nwapw/abacus/tree/NumberNode.kt (100%) rename {src => core/src}/main/kotlin/org/nwapw/abacus/tree/Reducer.kt (100%) rename {src => core/src}/main/kotlin/org/nwapw/abacus/tree/TreeNode.kt (100%) rename {src => core/src}/main/kotlin/org/nwapw/abacus/tree/UnaryNode.kt (100%) rename {src => core/src}/main/resources/abacus.fxml (100%) rename {src => core/src}/test/java/org/nwapw/abacus/tests/CalculationTests.java (100%) rename {src => core/src}/test/java/org/nwapw/abacus/tests/LexerTests.java (100%) rename {src => core/src}/test/java/org/nwapw/abacus/tests/TokenizerTests.java (100%) create mode 100644 fx/build.gradle rename {src => fx/src}/main/java/org/nwapw/abacus/fx/AbacusApplication.java (93%) rename {src => fx/src}/main/java/org/nwapw/abacus/fx/AbacusController.java (100%) rename {src => fx/src}/main/java/org/nwapw/abacus/fx/CopyableCell.java (100%) rename {src => fx/src}/main/java/org/nwapw/abacus/fx/DocumentationCell.java (100%) diff --git a/build.gradle b/build.gradle index b271dbc..ad0702b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,20 +1,9 @@ -plugins { - id 'java' - id 'application' - id 'org.jetbrains.kotlin.jvm' version '1.1.3' -} -apply plugin: 'java' -apply plugin: 'application' +subprojects { -repositories { - mavenCentral() + apply plugin: 'java' + + repositories { + mavenCentral() + } } -dependencies { - compile 'com.moandjiezana.toml:toml4j:0.7.1' - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8" - testCompile 'junit:junit:4.12' -} - -mainClassName = 'org.nwapw.abacus.Abacus' - diff --git a/core/build.gradle b/core/build.gradle new file mode 100644 index 0000000..8f9277c --- /dev/null +++ b/core/build.gradle @@ -0,0 +1,9 @@ +plugins { + id 'org.jetbrains.kotlin.jvm' version '1.1.3' +} + +dependencies { + compile 'com.moandjiezana.toml:toml4j:0.7.1' + compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:1.1.3" + testCompile 'junit:junit:4.12' +} diff --git a/src/main/java/org/nwapw/abacus/Abacus.java b/core/src/main/java/org/nwapw/abacus/Abacus.java similarity index 96% rename from src/main/java/org/nwapw/abacus/Abacus.java rename to core/src/main/java/org/nwapw/abacus/Abacus.java index fa5f76a..826f266 100644 --- a/src/main/java/org/nwapw/abacus/Abacus.java +++ b/core/src/main/java/org/nwapw/abacus/Abacus.java @@ -1,7 +1,6 @@ package org.nwapw.abacus; import org.nwapw.abacus.config.Configuration; -import org.nwapw.abacus.fx.AbacusApplication; import org.nwapw.abacus.number.NumberInterface; import org.nwapw.abacus.parsing.LexerTokenizer; import org.nwapw.abacus.parsing.ShuntingYardParser; @@ -61,10 +60,6 @@ public class Abacus { pluginManager.addListener(lexerTokenizer); } - public static void main(String[] args) { - AbacusApplication.launch(AbacusApplication.class, args); - } - /** * Gets the current tree builder. * diff --git a/src/main/java/org/nwapw/abacus/config/Configuration.java b/core/src/main/java/org/nwapw/abacus/config/Configuration.java similarity index 100% rename from src/main/java/org/nwapw/abacus/config/Configuration.java rename to core/src/main/java/org/nwapw/abacus/config/Configuration.java diff --git a/src/main/java/org/nwapw/abacus/function/DocumentationType.java b/core/src/main/java/org/nwapw/abacus/function/DocumentationType.java similarity index 100% rename from src/main/java/org/nwapw/abacus/function/DocumentationType.java rename to core/src/main/java/org/nwapw/abacus/function/DocumentationType.java diff --git a/src/main/java/org/nwapw/abacus/function/Function.java b/core/src/main/java/org/nwapw/abacus/function/Function.java similarity index 100% rename from src/main/java/org/nwapw/abacus/function/Function.java rename to core/src/main/java/org/nwapw/abacus/function/Function.java diff --git a/src/main/java/org/nwapw/abacus/function/OperatorAssociativity.java b/core/src/main/java/org/nwapw/abacus/function/OperatorAssociativity.java similarity index 100% rename from src/main/java/org/nwapw/abacus/function/OperatorAssociativity.java rename to core/src/main/java/org/nwapw/abacus/function/OperatorAssociativity.java diff --git a/src/main/java/org/nwapw/abacus/function/OperatorType.java b/core/src/main/java/org/nwapw/abacus/function/OperatorType.java similarity index 100% rename from src/main/java/org/nwapw/abacus/function/OperatorType.java rename to core/src/main/java/org/nwapw/abacus/function/OperatorType.java diff --git a/src/main/java/org/nwapw/abacus/lexing/Lexer.java b/core/src/main/java/org/nwapw/abacus/lexing/Lexer.java similarity index 100% rename from src/main/java/org/nwapw/abacus/lexing/Lexer.java rename to core/src/main/java/org/nwapw/abacus/lexing/Lexer.java diff --git a/src/main/java/org/nwapw/abacus/lexing/pattern/AnyNode.java b/core/src/main/java/org/nwapw/abacus/lexing/pattern/AnyNode.java similarity index 100% rename from src/main/java/org/nwapw/abacus/lexing/pattern/AnyNode.java rename to core/src/main/java/org/nwapw/abacus/lexing/pattern/AnyNode.java diff --git a/src/main/java/org/nwapw/abacus/lexing/pattern/EndNode.java b/core/src/main/java/org/nwapw/abacus/lexing/pattern/EndNode.java similarity index 100% rename from src/main/java/org/nwapw/abacus/lexing/pattern/EndNode.java rename to core/src/main/java/org/nwapw/abacus/lexing/pattern/EndNode.java diff --git a/src/main/java/org/nwapw/abacus/lexing/pattern/LinkNode.java b/core/src/main/java/org/nwapw/abacus/lexing/pattern/LinkNode.java similarity index 100% rename from src/main/java/org/nwapw/abacus/lexing/pattern/LinkNode.java rename to core/src/main/java/org/nwapw/abacus/lexing/pattern/LinkNode.java diff --git a/src/main/java/org/nwapw/abacus/lexing/pattern/Match.java b/core/src/main/java/org/nwapw/abacus/lexing/pattern/Match.java similarity index 100% rename from src/main/java/org/nwapw/abacus/lexing/pattern/Match.java rename to core/src/main/java/org/nwapw/abacus/lexing/pattern/Match.java diff --git a/src/main/java/org/nwapw/abacus/lexing/pattern/Pattern.java b/core/src/main/java/org/nwapw/abacus/lexing/pattern/Pattern.java similarity index 100% rename from src/main/java/org/nwapw/abacus/lexing/pattern/Pattern.java rename to core/src/main/java/org/nwapw/abacus/lexing/pattern/Pattern.java diff --git a/src/main/java/org/nwapw/abacus/lexing/pattern/PatternChain.java b/core/src/main/java/org/nwapw/abacus/lexing/pattern/PatternChain.java similarity index 100% rename from src/main/java/org/nwapw/abacus/lexing/pattern/PatternChain.java rename to core/src/main/java/org/nwapw/abacus/lexing/pattern/PatternChain.java diff --git a/src/main/java/org/nwapw/abacus/lexing/pattern/PatternNode.java b/core/src/main/java/org/nwapw/abacus/lexing/pattern/PatternNode.java similarity index 100% rename from src/main/java/org/nwapw/abacus/lexing/pattern/PatternNode.java rename to core/src/main/java/org/nwapw/abacus/lexing/pattern/PatternNode.java diff --git a/src/main/java/org/nwapw/abacus/lexing/pattern/RangeNode.java b/core/src/main/java/org/nwapw/abacus/lexing/pattern/RangeNode.java similarity index 100% rename from src/main/java/org/nwapw/abacus/lexing/pattern/RangeNode.java rename to core/src/main/java/org/nwapw/abacus/lexing/pattern/RangeNode.java diff --git a/src/main/java/org/nwapw/abacus/lexing/pattern/ValueNode.java b/core/src/main/java/org/nwapw/abacus/lexing/pattern/ValueNode.java similarity index 100% rename from src/main/java/org/nwapw/abacus/lexing/pattern/ValueNode.java rename to core/src/main/java/org/nwapw/abacus/lexing/pattern/ValueNode.java diff --git a/src/main/java/org/nwapw/abacus/number/ComputationInterruptedException.java b/core/src/main/java/org/nwapw/abacus/number/ComputationInterruptedException.java similarity index 100% rename from src/main/java/org/nwapw/abacus/number/ComputationInterruptedException.java rename to core/src/main/java/org/nwapw/abacus/number/ComputationInterruptedException.java diff --git a/src/main/java/org/nwapw/abacus/number/NaiveNumber.java b/core/src/main/java/org/nwapw/abacus/number/NaiveNumber.java similarity index 100% rename from src/main/java/org/nwapw/abacus/number/NaiveNumber.java rename to core/src/main/java/org/nwapw/abacus/number/NaiveNumber.java diff --git a/src/main/java/org/nwapw/abacus/number/NumberInterface.java b/core/src/main/java/org/nwapw/abacus/number/NumberInterface.java similarity index 100% rename from src/main/java/org/nwapw/abacus/number/NumberInterface.java rename to core/src/main/java/org/nwapw/abacus/number/NumberInterface.java diff --git a/src/main/java/org/nwapw/abacus/number/PreciseNumber.java b/core/src/main/java/org/nwapw/abacus/number/PreciseNumber.java similarity index 100% rename from src/main/java/org/nwapw/abacus/number/PreciseNumber.java rename to core/src/main/java/org/nwapw/abacus/number/PreciseNumber.java diff --git a/src/main/java/org/nwapw/abacus/parsing/LexerTokenizer.java b/core/src/main/java/org/nwapw/abacus/parsing/LexerTokenizer.java similarity index 100% rename from src/main/java/org/nwapw/abacus/parsing/LexerTokenizer.java rename to core/src/main/java/org/nwapw/abacus/parsing/LexerTokenizer.java diff --git a/src/main/java/org/nwapw/abacus/parsing/Parser.java b/core/src/main/java/org/nwapw/abacus/parsing/Parser.java similarity index 100% rename from src/main/java/org/nwapw/abacus/parsing/Parser.java rename to core/src/main/java/org/nwapw/abacus/parsing/Parser.java diff --git a/src/main/java/org/nwapw/abacus/parsing/ShuntingYardParser.java b/core/src/main/java/org/nwapw/abacus/parsing/ShuntingYardParser.java similarity index 100% rename from src/main/java/org/nwapw/abacus/parsing/ShuntingYardParser.java rename to core/src/main/java/org/nwapw/abacus/parsing/ShuntingYardParser.java diff --git a/src/main/java/org/nwapw/abacus/parsing/Tokenizer.java b/core/src/main/java/org/nwapw/abacus/parsing/Tokenizer.java similarity index 100% rename from src/main/java/org/nwapw/abacus/parsing/Tokenizer.java rename to core/src/main/java/org/nwapw/abacus/parsing/Tokenizer.java diff --git a/src/main/java/org/nwapw/abacus/parsing/TreeBuilder.java b/core/src/main/java/org/nwapw/abacus/parsing/TreeBuilder.java similarity index 100% rename from src/main/java/org/nwapw/abacus/parsing/TreeBuilder.java rename to core/src/main/java/org/nwapw/abacus/parsing/TreeBuilder.java diff --git a/src/main/java/org/nwapw/abacus/plugin/ClassFinder.java b/core/src/main/java/org/nwapw/abacus/plugin/ClassFinder.java similarity index 100% rename from src/main/java/org/nwapw/abacus/plugin/ClassFinder.java rename to core/src/main/java/org/nwapw/abacus/plugin/ClassFinder.java diff --git a/src/main/java/org/nwapw/abacus/plugin/NumberImplementation.java b/core/src/main/java/org/nwapw/abacus/plugin/NumberImplementation.java similarity index 100% rename from src/main/java/org/nwapw/abacus/plugin/NumberImplementation.java rename to core/src/main/java/org/nwapw/abacus/plugin/NumberImplementation.java diff --git a/src/main/java/org/nwapw/abacus/plugin/Plugin.java b/core/src/main/java/org/nwapw/abacus/plugin/Plugin.java similarity index 100% rename from src/main/java/org/nwapw/abacus/plugin/Plugin.java rename to core/src/main/java/org/nwapw/abacus/plugin/Plugin.java diff --git a/src/main/java/org/nwapw/abacus/plugin/PluginListener.java b/core/src/main/java/org/nwapw/abacus/plugin/PluginListener.java similarity index 100% rename from src/main/java/org/nwapw/abacus/plugin/PluginListener.java rename to core/src/main/java/org/nwapw/abacus/plugin/PluginListener.java diff --git a/src/main/java/org/nwapw/abacus/plugin/PluginManager.java b/core/src/main/java/org/nwapw/abacus/plugin/PluginManager.java similarity index 100% rename from src/main/java/org/nwapw/abacus/plugin/PluginManager.java rename to core/src/main/java/org/nwapw/abacus/plugin/PluginManager.java diff --git a/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java b/core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java similarity index 100% rename from src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java rename to core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java diff --git a/src/main/java/org/nwapw/abacus/tree/NumberReducer.java b/core/src/main/java/org/nwapw/abacus/tree/NumberReducer.java similarity index 100% rename from src/main/java/org/nwapw/abacus/tree/NumberReducer.java rename to core/src/main/java/org/nwapw/abacus/tree/NumberReducer.java diff --git a/src/main/java/org/nwapw/abacus/tree/TokenType.java b/core/src/main/java/org/nwapw/abacus/tree/TokenType.java similarity index 100% rename from src/main/java/org/nwapw/abacus/tree/TokenType.java rename to core/src/main/java/org/nwapw/abacus/tree/TokenType.java diff --git a/src/main/java/org/nwapw/abacus/window/HistoryTableModel.java b/core/src/main/java/org/nwapw/abacus/window/HistoryTableModel.java similarity index 100% rename from src/main/java/org/nwapw/abacus/window/HistoryTableModel.java rename to core/src/main/java/org/nwapw/abacus/window/HistoryTableModel.java diff --git a/src/main/java/org/nwapw/abacus/window/Window.java b/core/src/main/java/org/nwapw/abacus/window/Window.java similarity index 100% rename from src/main/java/org/nwapw/abacus/window/Window.java rename to core/src/main/java/org/nwapw/abacus/window/Window.java diff --git a/src/main/kotlin/org/nwapw/abacus/function/Documentation.kt b/core/src/main/kotlin/org/nwapw/abacus/function/Documentation.kt similarity index 100% rename from src/main/kotlin/org/nwapw/abacus/function/Documentation.kt rename to core/src/main/kotlin/org/nwapw/abacus/function/Documentation.kt diff --git a/src/main/kotlin/org/nwapw/abacus/function/Operator.kt b/core/src/main/kotlin/org/nwapw/abacus/function/Operator.kt similarity index 100% rename from src/main/kotlin/org/nwapw/abacus/function/Operator.kt rename to core/src/main/kotlin/org/nwapw/abacus/function/Operator.kt diff --git a/src/main/kotlin/org/nwapw/abacus/fx/HistoryModel.kt b/core/src/main/kotlin/org/nwapw/abacus/fx/HistoryModel.kt similarity index 100% rename from src/main/kotlin/org/nwapw/abacus/fx/HistoryModel.kt rename to core/src/main/kotlin/org/nwapw/abacus/fx/HistoryModel.kt diff --git a/src/main/kotlin/org/nwapw/abacus/fx/ToggleablePlugin.kt b/core/src/main/kotlin/org/nwapw/abacus/fx/ToggleablePlugin.kt similarity index 100% rename from src/main/kotlin/org/nwapw/abacus/fx/ToggleablePlugin.kt rename to core/src/main/kotlin/org/nwapw/abacus/fx/ToggleablePlugin.kt diff --git a/src/main/kotlin/org/nwapw/abacus/tree/BinaryNode.kt b/core/src/main/kotlin/org/nwapw/abacus/tree/BinaryNode.kt similarity index 100% rename from src/main/kotlin/org/nwapw/abacus/tree/BinaryNode.kt rename to core/src/main/kotlin/org/nwapw/abacus/tree/BinaryNode.kt diff --git a/src/main/kotlin/org/nwapw/abacus/tree/FunctionNode.kt b/core/src/main/kotlin/org/nwapw/abacus/tree/FunctionNode.kt similarity index 100% rename from src/main/kotlin/org/nwapw/abacus/tree/FunctionNode.kt rename to core/src/main/kotlin/org/nwapw/abacus/tree/FunctionNode.kt diff --git a/src/main/kotlin/org/nwapw/abacus/tree/NumberNode.kt b/core/src/main/kotlin/org/nwapw/abacus/tree/NumberNode.kt similarity index 100% rename from src/main/kotlin/org/nwapw/abacus/tree/NumberNode.kt rename to core/src/main/kotlin/org/nwapw/abacus/tree/NumberNode.kt diff --git a/src/main/kotlin/org/nwapw/abacus/tree/Reducer.kt b/core/src/main/kotlin/org/nwapw/abacus/tree/Reducer.kt similarity index 100% rename from src/main/kotlin/org/nwapw/abacus/tree/Reducer.kt rename to core/src/main/kotlin/org/nwapw/abacus/tree/Reducer.kt diff --git a/src/main/kotlin/org/nwapw/abacus/tree/TreeNode.kt b/core/src/main/kotlin/org/nwapw/abacus/tree/TreeNode.kt similarity index 100% rename from src/main/kotlin/org/nwapw/abacus/tree/TreeNode.kt rename to core/src/main/kotlin/org/nwapw/abacus/tree/TreeNode.kt diff --git a/src/main/kotlin/org/nwapw/abacus/tree/UnaryNode.kt b/core/src/main/kotlin/org/nwapw/abacus/tree/UnaryNode.kt similarity index 100% rename from src/main/kotlin/org/nwapw/abacus/tree/UnaryNode.kt rename to core/src/main/kotlin/org/nwapw/abacus/tree/UnaryNode.kt diff --git a/src/main/resources/abacus.fxml b/core/src/main/resources/abacus.fxml similarity index 100% rename from src/main/resources/abacus.fxml rename to core/src/main/resources/abacus.fxml diff --git a/src/test/java/org/nwapw/abacus/tests/CalculationTests.java b/core/src/test/java/org/nwapw/abacus/tests/CalculationTests.java similarity index 100% rename from src/test/java/org/nwapw/abacus/tests/CalculationTests.java rename to core/src/test/java/org/nwapw/abacus/tests/CalculationTests.java diff --git a/src/test/java/org/nwapw/abacus/tests/LexerTests.java b/core/src/test/java/org/nwapw/abacus/tests/LexerTests.java similarity index 100% rename from src/test/java/org/nwapw/abacus/tests/LexerTests.java rename to core/src/test/java/org/nwapw/abacus/tests/LexerTests.java diff --git a/src/test/java/org/nwapw/abacus/tests/TokenizerTests.java b/core/src/test/java/org/nwapw/abacus/tests/TokenizerTests.java similarity index 100% rename from src/test/java/org/nwapw/abacus/tests/TokenizerTests.java rename to core/src/test/java/org/nwapw/abacus/tests/TokenizerTests.java diff --git a/fx/build.gradle b/fx/build.gradle new file mode 100644 index 0000000..9fbded4 --- /dev/null +++ b/fx/build.gradle @@ -0,0 +1,7 @@ +apply plugin: 'application' + +dependencies { + compile project(':core') +} + +mainClassName = 'org.nwapw.abacus.fx.AbacusApplication' diff --git a/src/main/java/org/nwapw/abacus/fx/AbacusApplication.java b/fx/src/main/java/org/nwapw/abacus/fx/AbacusApplication.java similarity index 93% rename from src/main/java/org/nwapw/abacus/fx/AbacusApplication.java rename to fx/src/main/java/org/nwapw/abacus/fx/AbacusApplication.java index e02ed8e..c4d86f9 100644 --- a/src/main/java/org/nwapw/abacus/fx/AbacusApplication.java +++ b/fx/src/main/java/org/nwapw/abacus/fx/AbacusApplication.java @@ -33,4 +33,9 @@ public class AbacusApplication extends Application { super.stop(); controller.performStop(); } + + public static void main(String[] args){ + launch(args); + } + } diff --git a/src/main/java/org/nwapw/abacus/fx/AbacusController.java b/fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java similarity index 100% rename from src/main/java/org/nwapw/abacus/fx/AbacusController.java rename to fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java diff --git a/src/main/java/org/nwapw/abacus/fx/CopyableCell.java b/fx/src/main/java/org/nwapw/abacus/fx/CopyableCell.java similarity index 100% rename from src/main/java/org/nwapw/abacus/fx/CopyableCell.java rename to fx/src/main/java/org/nwapw/abacus/fx/CopyableCell.java diff --git a/src/main/java/org/nwapw/abacus/fx/DocumentationCell.java b/fx/src/main/java/org/nwapw/abacus/fx/DocumentationCell.java similarity index 100% rename from src/main/java/org/nwapw/abacus/fx/DocumentationCell.java rename to fx/src/main/java/org/nwapw/abacus/fx/DocumentationCell.java diff --git a/settings.gradle b/settings.gradle index 2b8d625..9732215 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,2 @@ rootProject.name = 'abacus' +include 'core', 'fx'