diff options
Diffstat (limited to 'src/main/java/fr/umlv')
4 files changed, 3 insertions, 13 deletions
diff --git a/src/main/java/fr/umlv/java/wallj/board/TileVec2.java b/src/main/java/fr/umlv/java/wallj/board/TileVec2.java index 4165c81..26deb0c 100644 --- a/src/main/java/fr/umlv/java/wallj/board/TileVec2.java +++ b/src/main/java/fr/umlv/java/wallj/board/TileVec2.java | |||
@@ -89,12 +89,4 @@ public final class TileVec2 { | |||
89 | public int hashCode() { | 89 | public int hashCode() { |
90 | return Objects.hash(col, row); | 90 | return Objects.hash(col, row); |
91 | } | 91 | } |
92 | |||
93 | @Override | ||
94 | public String toString() { | ||
95 | return "TileVec2{" + | ||
96 | "col=" + col + | ||
97 | ", row=" + row + | ||
98 | '}'; | ||
99 | } | ||
100 | } | 92 | } |
diff --git a/src/main/java/fr/umlv/java/wallj/context/Game.java b/src/main/java/fr/umlv/java/wallj/context/Game.java index 79f00bd..b78bae4 100644 --- a/src/main/java/fr/umlv/java/wallj/context/Game.java +++ b/src/main/java/fr/umlv/java/wallj/context/Game.java | |||
@@ -79,13 +79,14 @@ public final class Game implements Updateable { | |||
79 | currentStage = new Stage(currentStage.getBoard()); | 79 | currentStage = new Stage(currentStage.getBoard()); |
80 | } | 80 | } |
81 | 81 | ||
82 | private void goToNext(){ | 82 | private void goToNext() { |
83 | if (hasNextBoard()) { //continue | 83 | if (hasNextBoard()) { //continue |
84 | nextStage(); | 84 | nextStage(); |
85 | return; | 85 | return; |
86 | } | 86 | } |
87 | setOver(); | 87 | setOver(); |
88 | } | 88 | } |
89 | |||
89 | private void handleEvents(Context context) { | 90 | private void handleEvents(Context context) { |
90 | if (Events.findFirst(context.getEvents(), QuitGameOrder.class).isPresent()) { | 91 | if (Events.findFirst(context.getEvents(), QuitGameOrder.class).isPresent()) { |
91 | context.getGame().setOver(); | 92 | context.getGame().setOver(); |
@@ -100,7 +101,6 @@ public final class Game implements Updateable { | |||
100 | } | 101 | } |
101 | } | 102 | } |
102 | 103 | ||
103 | |||
104 | /** | 104 | /** |
105 | * @param context the current context | 105 | * @param context the current context |
106 | * @return a list of new events | 106 | * @return a list of new events |
@@ -110,6 +110,4 @@ public final class Game implements Updateable { | |||
110 | handleEvents(context); | 110 | handleEvents(context); |
111 | return currentStage.update(context); | 111 | return currentStage.update(context); |
112 | } | 112 | } |
113 | |||
114 | |||
115 | } | 113 | } |
diff --git a/src/main/java/fr/umlv/java/wallj/event/QuitGameOrder.java b/src/main/java/fr/umlv/java/wallj/event/QuitGameOrder.java index 2cabac1..4e28de8 100644 --- a/src/main/java/fr/umlv/java/wallj/event/QuitGameOrder.java +++ b/src/main/java/fr/umlv/java/wallj/event/QuitGameOrder.java | |||
@@ -6,4 +6,5 @@ package fr.umlv.java.wallj.event; | |||
6 | * @author Pacien TRAN-GIRARD | 6 | * @author Pacien TRAN-GIRARD |
7 | */ | 7 | */ |
8 | public final class QuitGameOrder implements InputEvent { | 8 | public final class QuitGameOrder implements InputEvent { |
9 | // void | ||
9 | } | 10 | } |
diff --git a/src/main/java/fr/umlv/java/wallj/viewer/Main.java b/src/main/java/fr/umlv/java/wallj/viewer/Main.java index 291ad58..d2b041e 100644 --- a/src/main/java/fr/umlv/java/wallj/viewer/Main.java +++ b/src/main/java/fr/umlv/java/wallj/viewer/Main.java | |||
@@ -14,7 +14,6 @@ import java.util.*; | |||
14 | import java.util.List; | 14 | import java.util.List; |
15 | 15 | ||
16 | public class Main { | 16 | public class Main { |
17 | |||
18 | private static final String DEFAULT_MAP_NAME = "/maps/level0.txt"; | 17 | private static final String DEFAULT_MAP_NAME = "/maps/level0.txt"; |
19 | 18 | ||
20 | private static FileSystem fileSystemForContext(URI uri) throws URISyntaxException, IOException { | 19 | private static FileSystem fileSystemForContext(URI uri) throws URISyntaxException, IOException { |