aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpacien2018-02-02 10:43:27 +0100
committerpacien2018-02-02 10:43:27 +0100
commit8903ba543f2001d1939dbea58dda1f76907835ec (patch)
tree049db70f3a0e0026b4673b26505e0fd2d2a3f41e
parent3b1b7b18189779d9659b7c99f7135fb7dbdf4bd0 (diff)
downloadwallj-8903ba543f2001d1939dbea58dda1f76907835ec.tar.gz
Reorganize classes
Signed-off-by: pacien <pacien.trangirard@pacien.net>
-rw-r--r--build.xml2
-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.java11
5 files changed, 5 insertions, 16 deletions
diff --git a/build.xml b/build.xml
index b900698..18b1a74 100644
--- a/build.xml
+++ b/build.xml
@@ -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 @@
1package fr.umlv.java.wallj.context; 1package fr.umlv.java.wallj.viewer;
2 2
3import fr.umlv.java.wallj.board.TileVec2; 3import fr.umlv.java.wallj.board.TileVec2;
4import fr.umlv.java.wallj.event.BombSetupOrder; 4import 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 @@
1package fr.umlv.java.wallj; 1package fr.umlv.java.wallj.viewer;
2 2
3import fr.umlv.java.wallj.board.Board; 3import fr.umlv.java.wallj.board.Board;
4import fr.umlv.java.wallj.board.BoardParser; 4import fr.umlv.java.wallj.board.BoardParser;
5import fr.umlv.java.wallj.board.BoardValidator; 5import fr.umlv.java.wallj.board.BoardValidator;
6import fr.umlv.java.wallj.viewer.Viewer;
7import fr.umlv.zen5.Application; 6import fr.umlv.zen5.Application;
8 7
9import java.awt.*; 8import 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 @@
1package fr.umlv.java.wallj.context; 1package fr.umlv.java.wallj.viewer;
2 2
3import fr.umlv.java.wallj.context.GraphicsContext;
3import fr.umlv.zen5.ApplicationContext; 4import fr.umlv.zen5.ApplicationContext;
4import fr.umlv.zen5.ScreenInfo; 5import fr.umlv.zen5.ScreenInfo;
5import org.jbox2d.common.Vec2; 6import 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 @@
1package fr.umlv.java.wallj.viewer; 1package fr.umlv.java.wallj.viewer;
2 2
3import fr.umlv.java.wallj.board.Board; 3import fr.umlv.java.wallj.board.Board;
4import fr.umlv.java.wallj.board.BoardParser;
5import fr.umlv.java.wallj.board.BoardValidator;
6import fr.umlv.java.wallj.context.Context; 4import fr.umlv.java.wallj.context.Context;
7import fr.umlv.java.wallj.context.Game; 5import fr.umlv.java.wallj.context.Game;
8import fr.umlv.java.wallj.context.InputHandler;
9import fr.umlv.java.wallj.context.ScreenManager;
10import fr.umlv.java.wallj.event.Event; 6import fr.umlv.java.wallj.event.Event;
11import fr.umlv.zen5.Application;
12import fr.umlv.zen5.ApplicationContext; 7import fr.umlv.zen5.ApplicationContext;
13import sun.awt.image.ImageWatched;
14 8
15import java.awt.*;
16import java.io.IOException;
17import java.net.URISyntaxException;
18import java.nio.file.Path;
19import java.nio.file.Paths;
20import java.time.Duration; 9import java.time.Duration;
21import java.util.LinkedList; 10import java.util.LinkedList;
22import java.util.List; 11import java.util.List;