diff options
author | pacien | 2018-01-14 22:33:29 +0100 |
---|---|---|
committer | pacien | 2018-01-14 22:33:29 +0100 |
commit | 94f93a26ba6efa6646af02e51f1fd6d75dfc0920 (patch) | |
tree | cdfc223eae1c7e1835aafc8c400fd91aff9482dd | |
parent | e79dd7a94448467b1a5582a47b84cd3dc320f54d (diff) | |
download | wallj-94f93a26ba6efa6646af02e51f1fd6d75dfc0920.tar.gz |
Rename model package to block
Signed-off-by: pacien <pacien.trangirard@pacien.net>
32 files changed, 31 insertions, 35 deletions
diff --git a/src/docs/class.puml b/src/docs/class.puml index dda61b7..8dffde5 100644 --- a/src/docs/class.puml +++ b/src/docs/class.puml | |||
@@ -141,7 +141,7 @@ package board { | |||
141 | } | 141 | } |
142 | } | 142 | } |
143 | 143 | ||
144 | package model { | 144 | package block { |
145 | enum BlockType { | 145 | enum BlockType { |
146 | FREE | 146 | FREE |
147 | WALL | 147 | WALL |
diff --git a/src/main/java/fr/umlv/java/wallj/model/Block.java b/src/main/java/fr/umlv/java/wallj/block/Block.java index 7f32087..d3c349e 100644 --- a/src/main/java/fr/umlv/java/wallj/model/Block.java +++ b/src/main/java/fr/umlv/java/wallj/block/Block.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package fr.umlv.java.wallj.model; | 1 | package fr.umlv.java.wallj.block; |
2 | 2 | ||
3 | import fr.umlv.java.wallj.board.TileVec2; | 3 | import fr.umlv.java.wallj.board.TileVec2; |
4 | import fr.umlv.java.wallj.context.Context; | 4 | import fr.umlv.java.wallj.context.Context; |
diff --git a/src/main/java/fr/umlv/java/wallj/model/BlockFactory.java b/src/main/java/fr/umlv/java/wallj/block/BlockFactory.java index b39b420..951d182 100644 --- a/src/main/java/fr/umlv/java/wallj/model/BlockFactory.java +++ b/src/main/java/fr/umlv/java/wallj/block/BlockFactory.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package fr.umlv.java.wallj.model; | 1 | package fr.umlv.java.wallj.block; |
2 | 2 | ||
3 | import fr.umlv.java.wallj.board.TileVec2; | 3 | import fr.umlv.java.wallj.board.TileVec2; |
4 | import fr.umlv.java.wallj.controller.BlockControllerFactory; | 4 | import fr.umlv.java.wallj.controller.BlockControllerFactory; |
diff --git a/src/main/java/fr/umlv/java/wallj/model/BlockType.java b/src/main/java/fr/umlv/java/wallj/block/BlockType.java index 9c5d4f5..973215c 100644 --- a/src/main/java/fr/umlv/java/wallj/model/BlockType.java +++ b/src/main/java/fr/umlv/java/wallj/block/BlockType.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package fr.umlv.java.wallj.model; | 1 | package fr.umlv.java.wallj.block; |
2 | 2 | ||
3 | /** | 3 | /** |
4 | * Enumeration of the types of blocks handled in the game. | 4 | * Enumeration of the types of blocks handled in the game. |
diff --git a/src/main/java/fr/umlv/java/wallj/model/BombBlock.java b/src/main/java/fr/umlv/java/wallj/block/BombBlock.java index 9ba4a68..de7a3b9 100644 --- a/src/main/java/fr/umlv/java/wallj/model/BombBlock.java +++ b/src/main/java/fr/umlv/java/wallj/block/BombBlock.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package fr.umlv.java.wallj.model; | 1 | package fr.umlv.java.wallj.block; |
2 | 2 | ||
3 | import org.jbox2d.common.Vec2; | 3 | import org.jbox2d.common.Vec2; |
4 | 4 | ||
diff --git a/src/main/java/fr/umlv/java/wallj/model/GarbageBlock.java b/src/main/java/fr/umlv/java/wallj/block/GarbageBlock.java index 9161937..7794daf 100644 --- a/src/main/java/fr/umlv/java/wallj/model/GarbageBlock.java +++ b/src/main/java/fr/umlv/java/wallj/block/GarbageBlock.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package fr.umlv.java.wallj.model; | 1 | package fr.umlv.java.wallj.block; |
2 | 2 | ||
3 | import org.jbox2d.common.Vec2; | 3 | import org.jbox2d.common.Vec2; |
4 | 4 | ||
diff --git a/src/main/java/fr/umlv/java/wallj/model/RobotBlock.java b/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java index 1b012ea..297b846 100644 --- a/src/main/java/fr/umlv/java/wallj/model/RobotBlock.java +++ b/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package fr.umlv.java.wallj.model; | 1 | package fr.umlv.java.wallj.block; |
2 | 2 | ||
3 | import org.jbox2d.common.Vec2; | 3 | import org.jbox2d.common.Vec2; |
4 | 4 | ||
diff --git a/src/main/java/fr/umlv/java/wallj/model/Stage.java b/src/main/java/fr/umlv/java/wallj/block/Stage.java index 4233326..d34af97 100644 --- a/src/main/java/fr/umlv/java/wallj/model/Stage.java +++ b/src/main/java/fr/umlv/java/wallj/block/Stage.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package fr.umlv.java.wallj.model; | 1 | package fr.umlv.java.wallj.block; |
2 | 2 | ||
3 | import fr.umlv.java.wallj.board.Board; | 3 | import fr.umlv.java.wallj.board.Board; |
4 | import fr.umlv.java.wallj.context.Context; | 4 | import fr.umlv.java.wallj.context.Context; |
diff --git a/src/main/java/fr/umlv/java/wallj/model/TrashBlock.java b/src/main/java/fr/umlv/java/wallj/block/TrashBlock.java index 1560381..4503f27 100644 --- a/src/main/java/fr/umlv/java/wallj/model/TrashBlock.java +++ b/src/main/java/fr/umlv/java/wallj/block/TrashBlock.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package fr.umlv.java.wallj.model; | 1 | package fr.umlv.java.wallj.block; |
2 | 2 | ||
3 | import org.jbox2d.common.Vec2; | 3 | import org.jbox2d.common.Vec2; |
4 | 4 | ||
diff --git a/src/main/java/fr/umlv/java/wallj/model/WallBlock.java b/src/main/java/fr/umlv/java/wallj/block/WallBlock.java index 84fb42e..cd0ddad 100644 --- a/src/main/java/fr/umlv/java/wallj/model/WallBlock.java +++ b/src/main/java/fr/umlv/java/wallj/block/WallBlock.java | |||
@@ -1,4 +1,4 @@ | |||
1 | package fr.umlv.java.wallj.model; | 1 | package fr.umlv.java.wallj.block; |
2 | 2 | ||
3 | import org.jbox2d.common.Vec2; | 3 | import org.jbox2d.common.Vec2; |
4 | 4 | ||
diff --git a/src/main/java/fr/umlv/java/wallj/board/Board.java b/src/main/java/fr/umlv/java/wallj/board/Board.java index 112f7a5..ad29fe6 100644 --- a/src/main/java/fr/umlv/java/wallj/board/Board.java +++ b/src/main/java/fr/umlv/java/wallj/board/Board.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package fr.umlv.java.wallj.board; | 1 | package fr.umlv.java.wallj.board; |
2 | 2 | ||
3 | import fr.umlv.java.wallj.model.BlockType; | 3 | import fr.umlv.java.wallj.block.BlockType; |
4 | import fr.umlv.java.wallj.utils.Matrix; | 4 | import fr.umlv.java.wallj.utils.Matrix; |
5 | 5 | ||
6 | import java.util.AbstractMap; | 6 | import java.util.AbstractMap; |
diff --git a/src/main/java/fr/umlv/java/wallj/board/BoardConverter.java b/src/main/java/fr/umlv/java/wallj/board/BoardConverter.java index c4d47cc..064df7a 100644 --- a/src/main/java/fr/umlv/java/wallj/board/BoardConverter.java +++ b/src/main/java/fr/umlv/java/wallj/board/BoardConverter.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package fr.umlv.java.wallj.board; | 1 | package fr.umlv.java.wallj.board; |
2 | 2 | ||
3 | import fr.umlv.java.wallj.model.*; | 3 | import fr.umlv.java.wallj.block.*; |
4 | 4 | ||
5 | import java.util.ArrayList; | 5 | import java.util.ArrayList; |
6 | import java.util.List; | 6 | import java.util.List; |
diff --git a/src/main/java/fr/umlv/java/wallj/board/BoardParser.java b/src/main/java/fr/umlv/java/wallj/board/BoardParser.java index 001bdc8..39adda7 100644 --- a/src/main/java/fr/umlv/java/wallj/board/BoardParser.java +++ b/src/main/java/fr/umlv/java/wallj/board/BoardParser.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package fr.umlv.java.wallj.board; | 1 | package fr.umlv.java.wallj.board; |
2 | 2 | ||
3 | import fr.umlv.java.wallj.model.BlockType; | 3 | import fr.umlv.java.wallj.block.BlockType; |
4 | import fr.umlv.java.wallj.utils.Matrix; | 4 | import fr.umlv.java.wallj.utils.Matrix; |
5 | 5 | ||
6 | import java.io.IOException; | 6 | import java.io.IOException; |
diff --git a/src/main/java/fr/umlv/java/wallj/board/BoardValidator.java b/src/main/java/fr/umlv/java/wallj/board/BoardValidator.java index e95446b..011ca8b 100644 --- a/src/main/java/fr/umlv/java/wallj/board/BoardValidator.java +++ b/src/main/java/fr/umlv/java/wallj/board/BoardValidator.java | |||
@@ -1,6 +1,6 @@ | |||
1 | package fr.umlv.java.wallj.board; | 1 | package fr.umlv.java.wallj.board; |
2 | 2 | ||
3 | import fr.umlv.java.wallj.model.BlockType; | 3 | import fr.umlv.java.wallj.block.BlockType; |
4 | 4 | ||
5 | import java.util.*; | 5 | import java.util.*; |
6 | import java.util.function.Predicate; | 6 | import java.util.function.Predicate; |
diff --git a/src/main/java/fr/umlv/java/wallj/context/Context.java b/src/main/java/fr/umlv/java/wallj/context/Context.java index 01b1f3f..bb684b8 100644 --- a/src/main/java/fr/umlv/java/wallj/context/Context.java +++ b/src/main/java/fr/umlv/java/wallj/context/Context.java | |||
@@ -1,7 +1,6 @@ | |||
1 | package fr.umlv.java.wallj.context; | 1 | package fr.umlv.java.wallj.context; |
2 | 2 | ||
3 | import fr.umlv.java.wallj.event.Event; | 3 | import fr.umlv.java.wallj.event.Event; |
4 | import fr.umlv.java.wallj.model.Stage; | ||
5 | 4 | ||
6 | import java.util.List; | 5 | import java.util.List; |
7 | import java.util.Objects; | 6 | import java.util.Objects; |
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 900ee63..d5f9873 100644 --- a/src/main/java/fr/umlv/java/wallj/context/Game.java +++ b/src/main/java/fr/umlv/java/wallj/context/Game.java | |||
@@ -4,7 +4,7 @@ import fr.umlv.java.wallj.board.Board; | |||
4 | import fr.umlv.java.wallj.controller.Controller; | 4 | import fr.umlv.java.wallj.controller.Controller; |
5 | import fr.umlv.java.wallj.controller.GameController; | 5 | import fr.umlv.java.wallj.controller.GameController; |
6 | import fr.umlv.java.wallj.event.Event; | 6 | import fr.umlv.java.wallj.event.Event; |
7 | import fr.umlv.java.wallj.model.Stage; | 7 | import fr.umlv.java.wallj.block.Stage; |
8 | 8 | ||
9 | import java.u |