diff options
author | pacien | 2018-02-02 10:43:27 +0100 |
---|---|---|
committer | pacien | 2018-02-02 10:43:27 +0100 |
commit | 8903ba543f2001d1939dbea58dda1f76907835ec (patch) | |
tree | 049db70f3a0e0026b4673b26505e0fd2d2a3f41e | |
parent | 3b1b7b18189779d9659b7c99f7135fb7dbdf4bd0 (diff) | |
download | wallj-8903ba543f2001d1939dbea58dda1f76907835ec.tar.gz |
Reorganize classes
Signed-off-by: pacien <pacien.trangirard@pacien.net>
-rw-r--r-- | build.xml | 2 | ||||
-rw-r--r-- | src/main/java/fr/umlv/java/wallj/viewer/InputHandler.java (renamed from src/main/java/fr/umlv/java/wallj/context/InputHandler.java) | 2 | ||||
-rw-r--r-- | src/main/java/fr/umlv/java/wallj/viewer/Main.java (renamed from src/main/java/fr/umlv/java/wallj/Main.java) | 3 | ||||
-rw-r--r-- | src/main/java/fr/umlv/java/wallj/viewer/ScreenManager.java (renamed from src/main/java/fr/umlv/java/wallj/context/ScreenManager.java) | 3 | ||||
-rw-r--r-- | src/main/java/fr/umlv/java/wallj/viewer/Viewer.java | 11 |
5 files changed, 5 insertions, 16 deletions
@@ -17,7 +17,7 @@ | |||
17 | <property name="file.ant" value="build.xml"/> | 17 | <property name="file.ant" value="build.xml"/> |
18 | <property name="file.readme" value="readme.md"/> | 18 | <property name="file.readme" value="readme.md"/> |
19 | 19 | ||
20 | <property name="class.entry" value="fr.umlv.java.wallj.Main"/> | 20 | <property name="class.entry" value="fr.umlv.java.wallj.viewer.Main"/> |
21 | 21 | ||
22 | <target name="compile"> | 22 | <target name="compile"> |
23 | <mkdir dir="${dir.classes}"/> | 23 | <mkdir dir="${dir.classes}"/> |
diff --git a/src/main/java/fr/umlv/java/wallj/context/InputHandler.java b/src/main/java/fr/umlv/java/wallj/viewer/InputHandler.java index b137061..a8f53d3 100644 --- a/src/main/java/fr/umlv/java/wallj/context/InputHandler.java +++ b/src/main/java/fr/umlv/java/wallj/viewer/InputHandler.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package fr.umlv.java.wallj.context; | 1 | package fr.umlv.java.wallj.viewer; |
2 | 2 | ||
3 | import fr.umlv.java.wallj.board.TileVec2; | 3 | import fr.umlv.java.wallj.board.TileVec2; |
4 | import fr.umlv.java.wallj.event.BombSetupOrder; | 4 | import fr.umlv.java.wallj.event.BombSetupOrder; |
diff --git a/src/main/java/fr/umlv/java/wallj/Main.java b/src/main/java/fr/umlv/java/wallj/viewer/Main.java index 946a61c..ac1a088 100644 --- a/src/main/java/fr/umlv/java/wallj/Main.java +++ b/src/main/java/fr/umlv/java/wallj/viewer/Main.java | |||
@@ -1,9 +1,8 @@ | |||
1 | package fr.umlv.java.wallj; | 1 | package fr.umlv.java.wallj.viewer; |
2 | 2 | ||
3 | import fr.umlv.java.wallj.board.Board; | 3 | import fr.umlv.java.wallj.board.Board; |
4 | import fr.umlv.java.wallj.board.BoardParser; | 4 | import fr.umlv.java.wallj.board.BoardParser; |
5 | import fr.umlv.java.wallj.board.BoardValidator; | 5 | import fr.umlv.java.wallj.board.BoardValidator; |
6 | import fr.umlv.java.wallj.viewer.Viewer; | ||
7 | import fr.umlv.zen5.Application; | 6 | import fr.umlv.zen5.Application; |
8 | 7 | ||
9 | import java.awt.*; | 8 | import java.awt.*; |
diff --git a/src/main/java/fr/umlv/java/wallj/context/ScreenManager.java b/src/main/java/fr/umlv/java/wallj/viewer/ScreenManager.java index 1e73674..70377ba 100644 --- a/src/main/java/fr/umlv/java/wallj/context/ScreenManager.java +++ b/src/main/java/fr/umlv/java/wallj/viewer/ScreenManager.java | |||
@@ -1,5 +1,6 @@ | |||
1 | package fr.umlv.java.wallj.context; | 1 | package fr.umlv.java.wallj.viewer; |
2 | 2 | ||
3 | import fr.umlv.java.wallj.context.GraphicsContext; | ||
3 | import fr.umlv.zen5.ApplicationContext; | 4 | import fr.umlv.zen5.ApplicationContext; |
4 | import fr.umlv.zen5.ScreenInfo; | 5 | import fr.umlv.zen5.ScreenInfo; |
5 | import org.jbox2d.common.Vec2; | 6 | import org.jbox2d.common.Vec2; |
diff --git a/src/main/java/fr/umlv/java/wallj/viewer/Viewer.java b/src/main/java/fr/umlv/java/wallj/viewer/Viewer.java index 430bff7..01a6468 100644 --- a/src/main/java/fr/umlv/java/wallj/viewer/Viewer.java +++ b/src/main/java/fr/umlv/java/wallj/viewer/Viewer.java | |||
@@ -1,22 +1,11 @@ | |||
1 | package fr.umlv.java.wallj.viewer; | 1 | package fr.umlv.java.wallj.viewer; |
2 | 2 | ||
3 | import fr.umlv.java.wallj.board.Board; | 3 | import fr.umlv.java.wallj.board.Board; |
4 | import fr.umlv.java.wallj.board.BoardParser; | ||
5 | import fr.umlv.java.wallj.board.BoardValidator; | ||
6 | import fr.umlv.java.wallj.context.Context; | 4 | import fr.umlv.java.wallj.context.Context; |
7 | import fr.umlv.java.wallj.context.Game; | 5 | import fr.umlv.java.wallj.context.Game; |
8 | import fr.umlv.java.wallj.context.InputHandler; | ||
9 | import fr.umlv.java.wallj.context.ScreenManager; | ||
10 | import fr.umlv.java.wallj.event.Event; | 6 | import fr.umlv.java.wallj.event.Event; |
11 | import fr.umlv.zen5.Application; | ||
12 | import fr.umlv.zen5.ApplicationContext; | 7 | import fr.umlv.zen5.ApplicationContext; |
13 | import sun.awt.image.ImageWatched; | ||
14 | 8 | ||
15 | import java.awt.*; | ||
16 | import java.io.IOException; | ||
17 | import java.net.URISyntaxException; | ||
18 | import java.nio.file.Path; | ||
19 | import java.nio.file.Paths; | ||
20 | import java.time.Duration; | 9 | import java.time.Duration; |
21 | import java.util.LinkedList; | 10 | import java.util.LinkedList; |
22 | import java.util.List; | 11 | import java.util.List; |