Created a superclass for GameKeyController and LevelEditorKeyController

src/fr/enssat/BoulderDash/controllers/GameKeyController.java

@@ -7,7 +7,6 @@ import fr.enssat.BoulderDash.controllers.BoulderAndDiamondController;
 import fr.enssat.BoulderDash.helpers.AudioLoadHelper;
 
 import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 
 
 /**
@@ -18,8 +17,7 @@ import java.awt.event.KeyListener;
  * @author      Colin Leverger <me@colinleverger.fr>
  * @since       2015-06-19
  */
-public class GameKeyController implements KeyListener {
+public class GameKeyController extends KeyController {
-	private LevelModel levelModel;
 	private RockfordUpdateController updatePosRockford;
     /**
      * Class constructor
@@ -27,18 +25,14 @@ public class GameKeyController implements KeyListener {
      * @param  levelModel  Level model
      */
 	public GameKeyController(LevelModel levelModel, AudioLoadHelper audioLoadHelper) {
-		this.levelModel = levelModel;
+        super(levelModel);
 		new BoulderAndDiamondController(levelModel, audioLoadHelper);
 		this.updatePosRockford = new RockfordUpdateController(levelModel);
 	}
 
-    /**
-     * Handles the 'key pressed' event
-     *
-     * @param  e  Key event
-     */
 	public void keyPressed(KeyEvent e) {
         int keyCode = e.getKeyCode();
+        LevelModel levelModel = getLevelModel();
 
         switch (keyCode) {
             // Direction: UP
@@ -47,7 +41,7 @@ public class GameKeyController implements KeyListener {
 
                 if (upElement.getPriority() < levelModel.getRockford().getPriority()) {
                     this.updatePosRockford.moveRockford(levelModel.getRockfordPositionX(), levelModel.getRockfordPositionY() - 1);
-                    this.levelModel.getRockford().startRunningUp();
+                    levelModel.getRockford().startRunningUp();
                 }
 
                 break;
@@ -58,7 +52,7 @@ public class GameKeyController implements KeyListener {
 
                 if (downElement.getPriority() < levelModel.getRockford().getPriority()) {
                     this.updatePosRockford.moveRockford(levelModel.getRockfordPositionX(), levelModel.getRockfordPositionY() + 1);
-                    this.levelModel.getRockford().startRunningDown();
+                    levelModel.getRockford().startRunningDown();
                 }
 
                 break;
@@ -69,7 +63,7 @@ public class GameKeyController implements KeyListener {
 
                 if (leftElement.getPriority() < levelModel.getRockford().getPriority()) {
                     this.updatePosRockford.moveRockford(levelModel.getRockfordPositionX() - 1, levelModel.getRockfordPositionY());
-                    this.levelModel.getRockford().startRunningLeft();
+                    levelModel.getRockford().startRunningLeft();
                 }
 
                 break;
@@ -80,28 +74,18 @@ public class GameKeyController implements KeyListener {
 
                 if (rightElement.getPriority() < levelModel.getRockford().getPriority()) {
                     this.updatePosRockford.moveRockford(levelModel.getRockfordPositionX() + 1, levelModel.getRockfordPositionY());
-                    this.levelModel.getRockford().startRunningRight();
+                    levelModel.getRockford().startRunningRight();
                 }
 
                 break;
         }
 	}
 
-    /**
-     * Handles the 'key released' event
-     *
-     * @param  e  Key event
-     */
 	@Override
 	public void keyReleased(KeyEvent e) {
-		this.levelModel.getRockford().startStaying();
+		getLevelModel().getRockford().startStaying();
 	}
 
-    /**
-     * Handles the 'key typed' event
-     *
-     * @param  e  Key event
-     */
 	@Override
 	public void keyTyped(KeyEvent e) {
         // Do nothing.

src/fr/enssat/BoulderDash/controllers/KeyController.java

@@ -0,0 +1,41 @@
+package fr.enssat.BoulderDash.controllers;
+
+import fr.enssat.BoulderDash.models.LevelModel;
+
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+
+public abstract class KeyController implements KeyListener {
+    private LevelModel levelModel;
+
+    public KeyController(LevelModel levelModel) {
+        this.levelModel = levelModel;
+    }
+
+    /**
+     * Handles the 'key pressed' event
+     *
+     * @param  e  Key event
+     */
+    public abstract void keyPressed(KeyEvent e);
+
+    /**
+     * Handles the 'key released' event
+     *
+     * @param  e  Key event
+     */
+    @Override
+    public abstract void keyReleased(KeyEvent e);
+
+    /**
+     * Handles the 'key typed' event
+     *
+     * @param  e  Key event
+     */
+    @Override
+    public abstract void keyTyped(KeyEvent e);
+
+    public LevelModel getLevelModel() {
+        return levelModel;
+    }
+}

src/fr/enssat/BoulderDash/controllers/LevelEditorKeyController.java

@@ -4,7 +4,6 @@ import fr.enssat.BoulderDash.models.LevelModel;
 import fr.enssat.BoulderDash.views.LevelEditorView;
 
 import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 
 
 /**
@@ -15,8 +14,7 @@ import java.awt.event.KeyListener;
  * @author      Valerian Saliou <valerian@valeriansaliou.name>
  * @since       2015-06-21
  */
-public class LevelEditorKeyController implements KeyListener {
+public class LevelEditorKeyController extends KeyController {
-    private LevelModel levelModel;
     private LevelEditorView levelEditorView;
 	private boolean capLocks;
 
@@ -27,43 +25,40 @@ public class LevelEditorKeyController implements KeyListener {
      * @param  levelEditorView  Level editor view
      */
     public LevelEditorKeyController(LevelModel levelModel, LevelEditorView levelEditorView) {
-        this.levelModel = levelModel;
+        super(levelModel);
         this.capLocks = false;
         this.levelEditorView = levelEditorView;
     }
 
-    /**
+    @Override
-     * Handles the 'key pressed' event
-     *
-     * @param  e  Key event
-     */
     public void keyPressed(KeyEvent e) {
         int keyCode = e.getKeyCode();
+        LevelModel levelModel = getLevelModel();
 
         switch (keyCode) {
             // Direction: UP
             case KeyEvent.VK_UP:
-                this.levelModel.decrementCursorYPosition();
+                levelModel.decrementCursorYPosition();
                 break;
 
             // Direction: DOWN
             case KeyEvent.VK_DOWN:
-                this.levelModel.incrementCursorYPosition();
+                levelModel.incrementCursorYPosition();
                 break;
 
             // Direction: LEFT
             case KeyEvent.VK_LEFT:
-                this.levelModel.decrementCursorXPosition();
+                levelModel.decrementCursorXPosition();
                 break;
 
             // Direction: RIGHT
             case KeyEvent.VK_RIGHT:
-                this.levelModel.incrementCursorXPosition();
+                levelModel.incrementCursorXPosition();
                 break;
 
             // Key: SPACE
             case KeyEvent.VK_SPACE:
-                this.levelModel.triggerBlockChange(this.levelEditorView.getPickedBlockValue());
+                levelModel.triggerBlockChange(this.levelEditorView.getPickedBlockValue());
                 break;
             
             case 16:
@@ -73,25 +68,15 @@ public class LevelEditorKeyController implements KeyListener {
 
         // Hold block change (quick edit)
         if(capLocks) {
-        	this.levelModel.triggerBlockChange(this.levelEditorView.getPickedBlockValue());
+        	levelModel.triggerBlockChange(this.levelEditorView.getPickedBlockValue());
         }
     }
 
-    /**
-     * Handles the 'key released' event
-     *
-     * @param  e  Key event
-     */
     @Override
     public void keyReleased(KeyEvent e) {
         // Do nothing.
     }
 
-    /**
-     * Handles the 'key typed' event
-     *
-     * @param  e  Key event
-     */
     @Override
     public void keyTyped(KeyEvent e) {
         // Do nothing.