Created Logic component

JohnTYH · Nov 7, 2019 · d5c1ebc · d5c1ebc
1 parent c126810
commit d5c1ebc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/src/main/java/farmio/Farmio.java b/src/main/java/farmio/Farmio.java
@@ -54,17 +54,7 @@ private void run() {
                 ui.showWarning(e.getMessage());
             }
             while (!isExit) {
-                try {
-                    if (Stage.noInput.contains(stage)) {
-                        command = Parser.parse(" ", stage);
-                    } else {
-                        command = Parser.parse(ui.getInput(), stage);
-                    }
-                    command.execute(this);
-                } catch (FarmioException e) {
-                    simulation.simulate();
-                    ui.showWarning(e.getMessage());
-                }
+                Logic.execute(stage, this);
             }
         } catch (FarmioFatalException e) {
             ui.showError(e.getMessage());

diff --git a/src/main/java/farmio/Logic.java b/src/main/java/farmio/Logic.java
@@ -0,0 +1,23 @@
+package farmio;
+
+import frontend.Simulation;
+import frontend.Ui;
+import frontend.UiManager;
+import exceptions.FarmioException;
+import exceptions.FarmioFatalException;
+
+public class Logic {
+
+    public static void execute(Farmio.Stage stage, Farmio farmio) throws FarmioFatalException {
+        try {
+            String userInput = "";
+            if (Farmio.Stage.reqInput.contains(stage)) {
+                userInput = farmio.getUi().getInput();
+            }
+            Parser.parse(userInput, stage).execute(farmio);
+        } catch (FarmioException | FarmioFatalException e) {
+            farmio.getSimulation().simulate();
+            farmio.getUi().showWarning(e.getMessage());
+        }
+    }
+}