Merge branch 'zuul-mcv' into 'master'

Zuul Mcv

4 files changed, 131 insertions, 68 deletions

diff --git a/src/esieequest/view/View.java b/src/esieequest/view/View.java
index 545879a..9ffd7ec 100644
--- a/src/esieequest/view/View.java
+++ b/src/esieequest/view/View.java
@@ -3,8 +3,13 @@
  */
 package esieequest.view;
 
+import java.util.HashMap;
+
 import esieequest.controller.GameEngine;
-import esieequest.model.Game;
+import esieequest.model.Item;
+import esieequest.model.Quest;
+import esieequest.model.Room;
+import esieequest.model.Side;
 
 /**
  * The view interface that describes an user interface.
@@ -14,14 +19,6 @@ import esieequest.model.Game;
 public interface View {
 
         /**
-         * Sets the model to use.
-         * 
-         * @param game
-         *            the Game model
-         */
-        public void setModel(Game game);
-
-        /**
          * Sets the controller to use.
          * 
          * @param gameEngine
@@ -40,21 +37,48 @@ public interface View {
         public void enable();
 
         /**
+         * Displays a message.
+         * 
+         * @param message
+         *            the message
+         */
+        public void echo(String message);
+
+        /**
          * Disables the user interface.
          */
         public void disable();
 
         /**
-         * Refreshes the user interface.
+         * Updates the view to match the current room.
+         * 
+         * @param room
+         *            the room to display
          */
-        public void refresh();
+        public void updateRoom(Room room);
 
         /**
-         * Displays a message.
+         * Updates the view to match a side of a room.
          * 
-         * @param message
-         *            the message
+         * @param side
+         *            the side of a room
          */
-        public void echo(String message);
+        public void updateSide(Side side);
+
+        /**
+         * Updates the view to match the current quest.
+         * 
+         * @param quest
+         *            the current quest to display
+         */
+        public void updateQuest(Quest quest);
+
+        /**
+         * Updates the view to display the items contained in the inventory
+         * 
+         * @param items
+         *            the items
+         */
+        public void updateInventory(HashMap<String, Item> items);
 
 }
diff --git a/src/esieequest/view/app/UserInterface.java b/src/esieequest/view/app/UserInterface.java
index 1fc57bd..28b2f37 100644
--- a/src/esieequest/view/app/UserInterface.java
+++ b/src/esieequest/view/app/UserInterface.java
@@ -18,7 +18,10 @@ import javax.swing.border.EmptyBorder;
 import com.wordpress.tipsforjava.swing.StretchIcon;
 
 import esieequest.controller.GameEngine;
-import esieequest.model.Game;
+import esieequest.model.Item;
+import esieequest.model.Quest;
+import esieequest.model.Room;
+import esieequest.model.Side;
 import esieequest.view.View;
 
 /**
@@ -28,7 +31,6 @@ import esieequest.view.View;
  */
 abstract class UserInterface implements View, ActionListener {
 
-        protected Game game;
         private GameEngine gameEngine;
 
         private JPanel layout;
@@ -127,18 +129,20 @@ abstract class UserInterface implements View, ActionListener {
                 controlPanel.add(topControlPanel, BorderLayout.NORTH);
                 topControlPanel.setLayout(new BorderLayout(0, 0));
 
+                final Font font = new Font("Dialog", Font.BOLD, 19);
+
                 final JButton forwardButton = new JButton("↥");
-                forwardButton.setFont(new Font("Dialog", Font.BOLD, 19));
+                forwardButton.setFont(font);
                 forwardButton.setToolTipText("Go forward");
                 topControlPanel.add(forwardButton, BorderLayout.CENTER);
 
                 final JButton inventoryButton = new JButton("⇱");
-                inventoryButton.setFont(new Font("Dialog", Font.BOLD, 19));
+                inventoryButton.setFont(font);
                 inventoryButton.setToolTipText("Use item");
                 topControlPanel.add(inventoryButton, BorderLayout.WEST);
 
                 final JButton actionButton = new JButton("⇲");
-                actionButton.setFont(new Font("Dialog", Font.BOLD, 19));
+                actionButton.setFont(font);
                 actionButton.setToolTipText("Talk/Take item");
                 topControlPanel.add(actionButton, BorderLayout.EAST);
 
@@ -147,17 +151,17 @@ abstract class UserInterface implements View, ActionListener {
                 bottomControlPanel.setLayout(new BorderLayout(0, 0));
 
                 final JButton backButton = new JButton("↧");
-                backButton.setFont(new Font("Dialog", Font.BOLD, 19));
+                backButton.setFont(font);
                 backButton.setToolTipText("Go back");
                 bottomControlPanel.add(backButton, BorderLayout.CENTER);
 
                 final JButton leftButton = new JButton("↰");
-                leftButton.setFont(new Font("Dialog", Font.BOLD, 19));
+                leftButton.setFont(font);
                 leftButton.setToolTipText("Turn left");
                 bottomControlPanel.add(leftButton, BorderLayout.WEST);
 
                 final JButton rightButton = new JButton("↱");
-                rightButton.setFont(new Font("Dialog", Font.BOLD, 19));
+                rightButton.setFont(font);
                 rightButton.setToolTipText("Turn right");
                 bottomControlPanel.add(rightButton, BorderLayout.EAST);
 
@@ -215,8 +219,7 @@ abstract class UserInterface implements View, ActionListener {
          * @param actionListener
          *            the action listener
          */
-        private void setActionListener(final HashMap<String, JButton> hashMap,
-                        final ActionListener actionListener) {
+        private void setActionListener(final HashMap<String, JButton> hashMap, final ActionListener actionListener) {
                 for (final JButton vButton : hashMap.values()) {
                         vButton.addActionListener(actionListener);
                 }
@@ -260,15 +263,15 @@ abstract class UserInterface implements View, ActionListener {
          * @param quest
          *            the quest title
          */
-        private void setQuest(final String quest) {
-                this.questTextPane.setText(quest);
+        private void setQuestLabel(final String questTitle) {
+                this.questTextPane.setText(questTitle);
         }
 
         /**
          * Updates the room illustration.
          */
-        private void updateIllustration() {
-                String imageName = this.game.getLocationImageName();
+        private void updateIllustration(final String locationImageName) {
+                String imageName = locationImageName;
                 if (imageName == null) {
                         imageName = "res/img/placeholder.jpg";