Clean code (auto indent, update author and version)

6 files changed, 315 insertions, 365 deletions

diff --git a/src/esieequest/Command.java b/src/esieequest/Command.java
index 4ebc02a..f6afdea 100644
--- a/src/esieequest/Command.java
+++ b/src/esieequest/Command.java
@@ -4,39 +4,32 @@ package esieequest;
  * Représente une commande tapée au clavier qui provoque une action dans le jeu.
  * 
  * @author Pacien TRAN-GIRARD
- * @version Février 2013
+ * @author Benoit LUBRANO DI SBARAGLIONE
+ * 
+ * @version February 2014
  */
-public class Command
-{
-    private String aCommandWord;
-    private String aSecondWord;
+public class Command {
+        private String aCommandWord;
+        private String aSecondWord;
+
+        public Command(final String pCommandWord, final String pSecondWord) {
+                this.aCommandWord = pCommandWord;
+                this.aSecondWord = pSecondWord;
+        }
+
+        public String getCommandWord() {
+                return this.aCommandWord;
+        }
+
+        public String getSecondWord() {
+                return this.aSecondWord;
+        }
 
-    /**
-     * Constructeur
-     */
-    public Command(final String pCommandWord, final String pSecondWord)
-    {
-        this.aCommandWord = pCommandWord;
-        this.aSecondWord = pSecondWord;
-    }
-    
-    public String getCommandWord()
-    {
-        return this.aCommandWord;
-    }
-    
-    public String getSecondWord()
-    {
-        return this.aSecondWord;
-    }
+        public boolean isUnknown() {
+                return this.aCommandWord == null;
+        }
 
-    public boolean isUnknown()
-    {
-        return this.aCommandWord == null;
-    }
-    
-    public boolean hasSecondWord()
-    {
-        return this.aSecondWord != null;
-    }
+        public boolean hasSecondWord() {
+                return this.aSecondWord != null;
+        }
 }
diff --git a/src/esieequest/CommandWords.java b/src/esieequest/CommandWords.java
index d2dd2f3..3a77015 100644
--- a/src/esieequest/CommandWords.java
+++ b/src/esieequest/CommandWords.java
@@ -1,42 +1,37 @@
 package esieequest;
 
 /**
- * This class is part of the "World of Zuul" application. 
- * "World of Zuul" is a very simple, text based adventure game.  
+ * This class is part of the "World of Zuul" application. "World of Zuul" is a
+ * very simple, text based adventure game.
  * 
  * This class holds an enumeration table of all command words known to the game.
  * It is used to recognise commands as they are typed in.
- *
- * @author  Michael Kolling and David J. Barnes + D.Bureau
+ * 
+ * @author Michael Kolling and David J. Barnes + D.Bureau
  * @version 2008.03.30 + 2013.09.15
  */
-public class CommandWords
-{
-    // a constant array that holds all valid command words
-    private static final String[] sValidCommands = {
-        "go", "quit", "help"
-    };
+public class CommandWords {
+        // a constant array that holds all valid command words
+        private static final String[] sValidCommands = { "go", "quit", "help" };
 
-    /**
-     * Constructor - initialise the command words.
-     */
-    public CommandWords()
-    {
-        // nothing to do at the moment...
-    } // CommandWords()
+        /**
+         * Constructor - initialise the command words.
+         */
+        public CommandWords() {
+                // nothing to do at the moment...
+        } // CommandWords()
 
-    /**
-     * Check whether a given String is a valid command word. 
-     * @return true if a given string is a valid command,
-     * false if it isn't.
-     */
-    public boolean isCommand( final String pString )
-    {
-        for ( int i=0; i<sValidCommands.length; i++ ) {
-            if ( sValidCommands[i].equals( pString ) )
-                return true;
-        } // for
-        // if we get here, the string was not found in the commands
-        return false;
-    } // isCommand()
+        /**
+         * Check whether a given String is a valid command word.
+         * 
+         * @return true if a given string is a valid command, false if it isn't.
+         */
+        public boolean isCommand(final String pString) {
+                for (int i = 0; i < sValidCommands.length; i++) {
+                        if (sValidCommands[i].equals(pString))
+                                return true;
+                } // for
+                        // if we get here, the string was not found in the commands
+                return false;
+        } // isCommand()
 } // CommandWords
diff --git a/src/esieequest/Game.java b/src/esieequest/Game.java
index 263244b..147efc5 100644
--- a/src/esieequest/Game.java
+++ b/src/esieequest/Game.java
@@ -3,195 +3,177 @@ package esieequest;
 /**
  * Moteur du jeu.
  * 
- * @author Pacien TRAN-GIRARD and Benoit LUBRANO DI SBARAGLIONE
- * @version Février 2014
+ * @author Pacien TRAN-GIRARD
+ * @author Benoit LUBRANO DI SBARAGLIONE
+ * 
+ * @version February 2014
  */
-public class Game
-{
-    private Room aCurrentRoom;
-    private Parser aParser;
-
-    /**
-     * Constructor for objects of class Game
-     */
-    public Game()
-    {
-        this.createRooms();
-        this.printWelcome();
-        this.printRoomInfo();
-        this.play();
-    }
-    
-    private void play()
-    {
-        aParser = new Parser();
-        boolean vFinished = false;
-        while (!vFinished) {
-            Command vCommand = this.aParser.getCommand();
-            vFinished = this.processCommand(vCommand);
-        }
-        
-        System.out.println("Thank you for playing.  Good bye.");
-    }
-
-    private void createRooms()
-    {
-        // création des lieux
-        
-        Room vAmphitheaterSeat = new Room("in the amphitheater");
-        Room vAmphitheaterStage = new Room("on the amphitheater stage"); 
-        Room vAmphitheaterEntrance = new Room("at the amphitheater entrance");
-        Room vAmphitheaterFront = new Room("in front of the amphitheater");
-        Room vCafeteria = new Room("in the cafeteria");
-        Room vCafeteriaFront = new Room("in front of the cafeteria");
-        Room vStudentsUnionFront = new Room("in front of the Students' Union");
-        Room vStudentsUnion = new Room("in the Students' Union HQ");
-        Room vStreetEsieespace = new Room("in front of the ESIEEspace HQ");
-        Room vEsieespaceEntrance = new Room("at the ESIEEspace HQ entrance");
-        Room vEsieespace = new Room("in the ESIEEspace HQ");
-        Room vReception = new Room("at the Reception");
-        Room vEntranceStairs = new Room("at the entrance stairs");
-        Room vRoundabout = new Room("at the roundabout");
-        Room vWingFront = new Room("in font of wing 3");
-        Room vCorridorOne = new Room("Corridor 3 main floor");
-        Room vStairsOne = new Room("in the stairwell at floor 1");
-        Room vStairsTwo = new Room("in the stairwell at floor 2");
-        Room vCorridorTwo = new Room("Corridor 3 floor 2");
-        Room vWcOne = new Room("in the WC at floor 1");
-        Room vWcTwo = new Room("in the WC at floor 2");
+public class Game {
+        private Room aCurrentRoom;
+        private Parser aParser;
+
+        public Game() {
+                this.createRooms();
+                this.printWelcome();
+                this.printRoomInfo();
+                this.play();
+        }
+
+        private void play() {
+                aParser = new Parser();
+                boolean vFinished = false;
+                while (!vFinished) {
+                        Command vCommand = this.aParser.getCommand();
+                        vFinished = this.processCommand(vCommand);
+                }
+
+                System.out.println("Thank you for playing.  Good bye.");
+        }
+
+        private void createRooms() {
+                // cr�ation des lieux
+                Room vAmphitheaterSeat = new Room("in the amphitheater");
+                Room vAmphitheaterStage = new Room("on the amphitheater stage");
+                Room vAmphitheaterEntrance = new Room("at the amphitheater entrance");
+                Room vAmphitheaterFront = new Room("in front of the amphitheater");
+                Room vCafeteria = new Room("in the cafeteria");
+                Room vCafeteriaFront = new Room("in front of the cafeteria");
+                Room vStudentsUnionFront = new Room("in front of the Students' Union");
+                Room vStudentsUnion = new Room("in the Students' Union HQ");
+                Room vStreetEsieespace = new Room("in front of the ESIEEspace HQ");
+                Room vEsieespaceEntrance = new Room("at the ESIEEspace HQ entrance");
+                Room vEsieespace = new Room("in the ESIEEspace HQ");
+                Room vReception = new Room("at the Reception");
+                Room vEntranceStairs = new Room("at the entrance stairs");
+                Room vRoundabout = new Room("at the roundabout");
+                Room vWingFront = new Room("in font of wing 3");
+                Room vCorridorOne = new Room("Corridor 3 main floor");
+                Room vStairsOne = new Room("in the stairwell at floor 1");
+                Room vStairsTwo = new Room("in the stairwell at floor 2");
+                Room vCorridorTwo = new Room("Corridor 3 floor 2");
+                Room vWcOne = new Room("in the WC at floor 1");
+                Room vWcTwo = new Room("in the WC at floor 2");
+                Room vCorridorTwoOffice = new Room("in front of the office at floor 2");
+                Room vOffice = new Room("in the office number 3254");
+
+                // positionnement des sorties (N,S,E,W)
+                vAmphitheaterSeat.setExits(vAmphitheaterFront, vAmphitheaterFront, null, null);
+                vAmphitheaterStage.setExits(null, null, vAmphitheaterEntrance, vCafeteria);
+                vAmphitheaterEntrance.setExits(vAmphitheaterFront, null, null, vAmphitheaterStage);
+                vAmphitheaterFront.setExits(null, vAmphitheaterEntrance, vStreetEsieespace, vCafeteriaFront);