22 files changed, 427 insertions, 505 deletions

diff --git a/src/esieequest/Main.java b/src/esieequest/Main.java
index add0fb1..5a08f1d 100755
--- a/src/esieequest/Main.java
+++ b/src/esieequest/Main.java
@@ -1,13 +1,15 @@
 package esieequest;
 
+import java.util.Arrays;
+
 import javax.swing.JApplet;
 
 import esieequest.controller.GameEngine;
 import esieequest.model.Game;
-import esieequest.view.Applet;
-import esieequest.view.Console;
 import esieequest.view.View;
-import esieequest.view.Window;
+import esieequest.view.app.Applet;
+import esieequest.view.app.Window;
+import esieequest.view.console.Console;
 
 /**
  * This class instantiates the game and makes it possible to run it via the
@@ -28,9 +30,8 @@ public class Main extends JApplet {
         public void init() {
                 // applet
                 Game vGame = new Game();
-                Applet vApplet = new Applet(vGame, this);
-                vGame.addObserver(vApplet);
-                GameEngine vGameEngine = new GameEngine(vGame, vApplet);
+                Applet vApplet = new Applet(this);
+                new GameEngine(vGame, vApplet);
         }
 
         public static void main(final String[] pArgs) {
@@ -38,15 +39,14 @@ public class Main extends JApplet {
                 Game vGame = new Game();
                 View vView;
 
-                if (pArgs.length != 0) {
-                        vView = new Console(vGame);
+                if (Arrays.asList(pArgs).contains("--nogui")) {
+                        vView = new Console();
 
                 } else {
-                        vView = new Window(vGame);
+                        vView = new Window();
                 }
 
-                vGame.addObserver(vView);
-                GameEngine vGameEngine = new GameEngine(vGame, vView);
+                new GameEngine(vGame, vView);
         }
 
 }
diff --git a/src/esieequest/controller/GameEngine.java b/src/esieequest/controller/GameEngine.java
index 72de63a..3999cd0 100644
--- a/src/esieequest/controller/GameEngine.java
+++ b/src/esieequest/controller/GameEngine.java
@@ -1,8 +1,5 @@
 package esieequest.controller;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
 import esieequest.model.Game;
 import esieequest.view.View;
 
@@ -15,7 +12,7 @@ import esieequest.view.View;
  * 
  * @version February 2014
  */
-public class GameEngine implements ActionListener {
+public class GameEngine {
 
         private Game aGame;
         private View aView;
@@ -26,9 +23,10 @@ public class GameEngine implements ActionListener {
                 this.aGame = pGame;
                 this.aView = pView;
 
-                this.aInterpreter = new Interpreter(this.aGame, this.aView);
+                this.aView.setModel(pGame);
+                this.aView.setController(this);
 
-                this.aView.setActionListener(this);
+                this.aInterpreter = new Interpreter(this.aGame, this.aView);
 
                 this.startGame();
                 this.startView();
@@ -40,12 +38,11 @@ public class GameEngine implements ActionListener {
         }
 
         private void startView() {
-                this.aView.start();
+                this.aView.enable();
         }
 
-        @Override
-        public void actionPerformed(final ActionEvent pActionEvent) {
-                this.aInterpreter.interpret(pActionEvent.getActionCommand());
+        public void interpret(final String pCommandString) {
+                this.aInterpreter.interpret(pCommandString);
         }
 
 }
diff --git a/src/esieequest/controller/Interpreter.java b/src/esieequest/controller/Interpreter.java
index 1e2937b..b4fbb3e 100644
--- a/src/esieequest/controller/Interpreter.java
+++ b/src/esieequest/controller/Interpreter.java
@@ -3,10 +3,6 @@
  */
 package esieequest.controller;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.StringTokenizer;
-
 import esieequest.model.Game;
 import esieequest.model.command.Command;
 import esieequest.view.View;
@@ -62,7 +58,7 @@ public class Interpreter {
                                 return;
                         }
                 }
-                this.aPerformer.showMessage("Unknown command.");
+                this.aPerformer.echo("Unknown command.");
                 return;
         }
 }
diff --git a/src/esieequest/controller/Parser.java b/src/esieequest/controller/Parser.java
index bd36041..c9095fe 100644
--- a/src/esieequest/controller/Parser.java
+++ b/src/esieequest/controller/Parser.java
@@ -1,7 +1,5 @@
 package esieequest.controller;
 
-import java.util.StringTokenizer;
-
 import esieequest.model.command.Command;
 
 public class Parser {
@@ -10,22 +8,23 @@ public class Parser {
         }
 
         public Command getCommand(final String pCommandString) {
-                StringTokenizer vTokenizer = new StringTokenizer(pCommandString);
+                String[] vElements = pCommandString.split(" ");
 
                 String vAction = null;
                 String vOption = null;
 
-                if (vTokenizer.hasMoreTokens()) {
-                        vAction = vTokenizer.nextToken();
-                        if (vTokenizer.hasMoreTokens()) {
-                                vOption = vTokenizer.nextToken();
-                        }
+                if (vElements.length > 0) {
+                        vAction = vElements[0];
+                }
+                if (vElements.length > 1) {
+                        vOption = vElements[1];
                 }
+
                 return new Command(vAction, vOption);
         }
-        
+
         private void validateCommand() {
-                
+                // TODO
         }
 
 }
diff --git a/src/esieequest/controller/Performer.java b/src/esieequest/controller/Performer.java
index db52c4f..c56ef39 100644
--- a/src/esieequest/controller/Performer.java
+++ b/src/esieequest/controller/Performer.java
@@ -21,53 +21,52 @@ public class Performer {