Merge branch 'zuul-with-tests' into 'master'

Zuul With Tests

5 files changed, 91 insertions, 22 deletions

diff --git a/src/esieequest/Main.java b/src/esieequest/Main.java
index 2ad11b1..59ac568 100755
--- a/src/esieequest/Main.java
+++ b/src/esieequest/Main.java
@@ -1,6 +1,7 @@
 package esieequest;
 
 import java.util.Arrays;
+import java.util.List;
 
 import javax.swing.JApplet;
 
@@ -9,7 +10,8 @@ import esieequest.model.Game;
 import esieequest.view.View;
 import esieequest.view.app.Applet;
 import esieequest.view.app.Window;
-import esieequest.view.console.Console;
+import esieequest.view.text.Console;
+import esieequest.view.text.FileReader;
 
 /**
  * The main class of the program.
@@ -44,10 +46,17 @@ public class Main extends JApplet {
          *            the command line arguments
          */
         public static void main(final String[] args) {
+                final List<String> arguments = Arrays.asList(args);
                 final Game game = new Game();
                 View view;
 
-                if (Arrays.asList(args).contains("--nogui")) {
+                if (arguments.contains("--file")) {
+                        if (arguments.size() < 2) {
+                                System.out.println("Error: no input file specified.");
+                                return;
+                        }
+                        view = new FileReader(arguments.get(1));
+                } else if (arguments.contains("--console")) {
                         view = new Console();
                 } else {
                         view = new Window();
diff --git a/src/esieequest/view/text/Console.java b/src/esieequest/view/text/Console.java
new file mode 100644
index 0000000..e7a71dd
--- /dev/null
+++ b/src/esieequest/view/text/Console.java
@@ -0,0 +1,25 @@
+package esieequest.view.text;
+
+import java.util.Scanner;
+
+/**
+ * The textual console view.
+ * 
+ * @author Pacien TRAN-GIRARD
+ */
+public class Console extends TextInterface {
+
+        /**
+         * Runs the console input scanner.
+         */
+        @Override
+        protected void run() {
+                final Scanner scanner = new Scanner(System.in);
+                while (this.running) {
+                        System.out.print("> ");
+                        this.gameEngine.interpret(scanner.nextLine());
+                }
+                scanner.close();
+        }
+
+}
diff --git a/src/esieequest/view/text/FileReader.java b/src/esieequest/view/text/FileReader.java
new file mode 100644
index 0000000..0bf3d3d
--- /dev/null
+++ b/src/esieequest/view/text/FileReader.java
@@ -0,0 +1,45 @@
+package esieequest.view.text;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.Scanner;
+
+/**
+ * The textual file reader view.
+ * 
+ * @author Pacien TRAN-GIRARD
+ */
+public class FileReader extends TextInterface {
+
+        private File file;
+
+        /**
+         * The FileReader initialiser.
+         * 
+         * @param filePath
+         *            the path of the file to read
+         */
+        public FileReader(final String filePath) {
+                super();
+                this.file = new File(filePath);
+        }
+
+        /**
+         * Runs the text file input scanner.
+         */
+        @Override
+        protected void run() {
+                try {
+                        final Scanner scanner = new Scanner(file);
+                        while (this.running && scanner.hasNextLine()) {
+                                String line = scanner.nextLine();
+                                System.out.println("> " + line);
+                                this.gameEngine.interpret(line);
+                        }
+                        scanner.close();
+                } catch (FileNotFoundException exception) {
+                        System.out.println("Error: file not found.");
+                }
+        }
+
+}
diff --git a/src/esieequest/view/console/Console.java b/src/esieequest/view/text/TextInterface.java
index 6faaced..e2de893 100644
--- a/src/esieequest/view/console/Console.java
+++ b/src/esieequest/view/text/TextInterface.java
@@ -1,4 +1,4 @@
-package esieequest.view.console;
+package esieequest.view.text;
 
 import java.util.Scanner;
 
@@ -7,35 +7,25 @@ import esieequest.model.Game;
 import esieequest.view.View;
 
 /**
- * The textual console view.
+ * The textual view.
  * 
  * @author Pacien TRAN-GIRARD
  */
-public class Console implements View {
+abstract class TextInterface implements View {
 
-        private Game game;
-        private GameEngine gameEngine;
+        protected Game game;
+        protected GameEngine gameEngine;
 
-        private boolean running;
+        protected boolean running;
 
         /**
          * The default constructor.
          */
-        public Console() {
+        public TextInterface() {
                 this.running = false;
         }
-
-        /**
-         * Runs the input scanner.
-         */
-        private void run() {
-                final Scanner scanner = new Scanner(System.in);
-                while (this.running) {
-                        System.out.print("> ");
-                        this.gameEngine.interpret(scanner.nextLine());
-                }
-                scanner.close();
-        }
+        
+        protected abstract void run();
 
         @Override
         public void setModel(final Game game) {
diff --git a/src/esieequest/view/console/package-info.java b/src/esieequest/view/text/package-info.java
index 24089ab..614ff9f 100644
--- a/src/esieequest/view/console/package-info.java
+++ b/src/esieequest/view/text/package-info.java
@@ -1,5 +1,5 @@
 /**
  * The console view package. Contains the textual user interface and its associated input stream processor.
  */
-package esieequest.view.console;
+package esieequest.view.text;