From 1ad7d521ef73c956bec5063d152771cf06180970 Mon Sep 17 00:00:00 2001 From: Adam NAILI Date: Tue, 9 Jan 2018 01:27:29 +0100 Subject: Changing the implementation of event package (new interfaces GameEvent, InputEvent) and modifying the subclasses in consequence) --- src/main/java/fr/umlv/java/wallj/event/AddBombEvent.java | 2 +- src/main/java/fr/umlv/java/wallj/event/ConfirmEvent.java | 2 +- src/main/java/fr/umlv/java/wallj/event/DropBombEvent.java | 2 +- src/main/java/fr/umlv/java/wallj/event/GameEvent.java | 3 ++- src/main/java/fr/umlv/java/wallj/event/InputEvent.java | 3 ++- src/main/java/fr/umlv/java/wallj/event/MoveRobotEvent.java | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/main/java/fr/umlv') diff --git a/src/main/java/fr/umlv/java/wallj/event/AddBombEvent.java b/src/main/java/fr/umlv/java/wallj/event/AddBombEvent.java index 368171e..e726911 100644 --- a/src/main/java/fr/umlv/java/wallj/event/AddBombEvent.java +++ b/src/main/java/fr/umlv/java/wallj/event/AddBombEvent.java @@ -4,7 +4,7 @@ import fr.umlv.java.wallj.board.TileVec2; import java.util.Objects; -public final class AddBombEvent implements Event { +public final class AddBombEvent implements InputEvent { TileVec2 tileVec2; public AddBombEvent(TileVec2 tileVec2) { diff --git a/src/main/java/fr/umlv/java/wallj/event/ConfirmEvent.java b/src/main/java/fr/umlv/java/wallj/event/ConfirmEvent.java index d948934..4af9884 100644 --- a/src/main/java/fr/umlv/java/wallj/event/ConfirmEvent.java +++ b/src/main/java/fr/umlv/java/wallj/event/ConfirmEvent.java @@ -1,5 +1,5 @@ package fr.umlv.java.wallj.event; -public class ConfirmEvent implements Event { +public class ConfirmEvent implements InputEvent { //TODO Class ConfirmEvent } diff --git a/src/main/java/fr/umlv/java/wallj/event/DropBombEvent.java b/src/main/java/fr/umlv/java/wallj/event/DropBombEvent.java index 3089e7a..5d07622 100644 --- a/src/main/java/fr/umlv/java/wallj/event/DropBombEvent.java +++ b/src/main/java/fr/umlv/java/wallj/event/DropBombEvent.java @@ -1,5 +1,5 @@ package fr.umlv.java.wallj.event; -public final class DropBombEvent implements Event { +public final class DropBombEvent implements InputEvent { //TODO Class DropBombEvent } diff --git a/src/main/java/fr/umlv/java/wallj/event/GameEvent.java b/src/main/java/fr/umlv/java/wallj/event/GameEvent.java index 9145ebd..53381a7 100644 --- a/src/main/java/fr/umlv/java/wallj/event/GameEvent.java +++ b/src/main/java/fr/umlv/java/wallj/event/GameEvent.java @@ -1,4 +1,5 @@ package fr.umlv.java.wallj.event; -public interface GameEvent { +public interface GameEvent extends Event{ + } diff --git a/src/main/java/fr/umlv/java/wallj/event/InputEvent.java b/src/main/java/fr/umlv/java/wallj/event/InputEvent.java index 5ca1a73..3452c66 100644 --- a/src/main/java/fr/umlv/java/wallj/event/InputEvent.java +++ b/src/main/java/fr/umlv/java/wallj/event/InputEvent.java @@ -1,4 +1,5 @@ package fr.umlv.java.wallj.event; -public interface InputEvent { +public interface InputEvent extends Event { + } diff --git a/src/main/java/fr/umlv/java/wallj/event/MoveRobotEvent.java b/src/main/java/fr/umlv/java/wallj/event/MoveRobotEvent.java index 849c0e6..5ccff92 100644 --- a/src/main/java/fr/umlv/java/wallj/event/MoveRobotEvent.java +++ b/src/main/java/fr/umlv/java/wallj/event/MoveRobotEvent.java @@ -4,7 +4,7 @@ import fr.umlv.java.wallj.board.TileVec2; import java.util.Objects; -public class MoveRobotEvent implements Event { +public class MoveRobotEvent implements InputEvent { //TODO Class MoveRobotEvent TileVec2 tileVec2; -- cgit v1.2.3