From cb117797a68cf912b2c58d6e61b1e12025baace2 Mon Sep 17 00:00:00 2001 From: loic Date: Fri, 23 Sep 2016 09:37:06 +0200 Subject: Clean code --- src/main/java/adapter/IModelAdapter.java | 12 --------- src/main/java/adapter/ModelAdapter.java | 46 +++++++++++++++++++------------- 2 files changed, 28 insertions(+), 30 deletions(-) delete mode 100644 src/main/java/adapter/IModelAdapter.java (limited to 'src/main/java/adapter') diff --git a/src/main/java/adapter/IModelAdapter.java b/src/main/java/adapter/IModelAdapter.java deleted file mode 100644 index 86139ee..0000000 --- a/src/main/java/adapter/IModelAdapter.java +++ /dev/null @@ -1,12 +0,0 @@ -package adapter; - -/** - * Created by loic on 21/09/16. - */ -public interface IModelAdapter { - void goUp(); - void goDown(); - void goLeft(); - void goRight(); - boolean isLoosed(); -} diff --git a/src/main/java/adapter/ModelAdapter.java b/src/main/java/adapter/ModelAdapter.java index 35eba94..90bba32 100644 --- a/src/main/java/adapter/ModelAdapter.java +++ b/src/main/java/adapter/ModelAdapter.java @@ -1,17 +1,13 @@ package adapter; import model.Board; -import observer.IObservable; -import observer.IObserver; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; +import observer.*; +import java.util.*; /** * Created by loic on 21/09/16. */ -public class ModelAdapter implements IModelAdapter, IObservable{ +public class ModelAdapter implements IObservable{ private Board model; private Collection observers; @@ -21,41 +17,55 @@ public class ModelAdapter implements IModelAdapter, IObservable{ observers = new ArrayList(); } - @Override + + /** + * Add a random number on the board + */ + public void addRandomNumber() { + this.model.addRandomNumber(); + this.notifyObservers(); + } + + /** + * Go up + */ public void goUp() { model.goUp(); this.notifyObservers(); } - @Override + /** + * Go down + */ public void goDown() { model.goDown(); this.notifyObservers(); } - @Override + /** + * Go left + */ public void goLeft() { model.goLeft(); this.notifyObservers(); } - @Override + /** + * Go right + */ public void goRight() { model.goRight(); this.notifyObservers(); } - - @Override + /** + * Return true if the game is loose, false else + * @return + */ public boolean isLoosed() { return this.model.isLoosed(); } - public void addRandomNumber() { - this.model.addRandomNumber(); - this.notifyObservers(); - } - @Override public void addObserver(IObserver observer) { this.observers.add(observer); -- cgit v1.2.3