32 files changed, 573 insertions, 1871 deletions

diff --git a/.classpath b/.classpath
index 32d0130..8836eed 100644
--- a/.classpath
+++ b/.classpath
@@ -2,6 +2,7 @@
 <classpath>
         <classpathentry kind="src" path="src"/>
         <classpathentry kind="src" path="res"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-        <classpathentry kind="output" path="bin"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+        <classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
+        <classpathentry kind="output" path="war/WEB-INF/classes"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
index a819b04..315195b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ target/
 *.class
  
 # Package Files #
-*.jar
+#*.jar
 *.war
 *.ear
 *.db
@@ -83,4 +83,15 @@ local.properties
 ######################
 
 report/out/**
-report/tmp/**
\ No newline at end of file
+report/tmp/**
+
+######################
+# GWT
+######################
+
+.gwt
+gwt-unitCache
+war/esieequest
+war/WEB-INF/classes
+war/WEB-INF/deploy
+war/WEB-INF/lib
diff --git a/.project b/.project
index fb4b1d7..6b191a9 100644
--- a/.project
+++ b/.project
@@ -11,13 +11,30 @@
                         </arguments>
                 </buildCommand>
                 <buildCommand>
+                        <name>org.eclipse.wst.common.project.facet.core.builder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
                         <name>org.eclipse.jdt.core.javabuilder</name>
                         <arguments>
                         </arguments>
                 </buildCommand>
+                <buildCommand>
+                        <name>com.google.gdt.eclipse.core.webAppProjectValidator</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>com.google.gwt.eclipse.core.gwtProjectValidator</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
         </buildSpec>
         <natures>
                 <nature>net.sourceforge.texlipse.builder.TexlipseNature</nature>
                 <nature>org.eclipse.jdt.core.javanature</nature>
+                <nature>com.google.gwt.eclipse.core.gwtNature</nature>
+                <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
         </natures>
 </projectDescription>
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() {