aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpacien2018-02-01 21:00:06 +0100
committerpacien2018-02-01 21:00:06 +0100
commit2e2e281265e62f7621ae7094c680000edaddf64a (patch)
treee437c39ffe43148abbf90e2c80cb832418906bc1
parent735be27e8802740cf0986bb6d14e720234889aae (diff)
downloadwallj-2e2e281265e62f7621ae7094c680000edaddf64a.tar.gz
Move Matrix util
Signed-off-by: pacien <pacien.trangirard@pacien.net>
-rw-r--r--src/docs/class.puml13
-rw-r--r--src/main/java/fr/umlv/java/wallj/board/Board.java1
-rw-r--r--src/main/java/fr/umlv/java/wallj/board/BoardParser.java1
-rw-r--r--src/main/java/fr/umlv/java/wallj/board/Matrix.java (renamed from src/main/java/fr/umlv/java/wallj/utils/Matrix.java)4
4 files changed, 7 insertions, 12 deletions
diff --git a/src/docs/class.puml b/src/docs/class.puml
index 151e334..779f764 100644
--- a/src/docs/class.puml
+++ b/src/docs/class.puml
@@ -7,13 +7,6 @@ skinparam backgroundColor #FFFFFF
7class Main{ 7class Main{
8 static void main(String[]) 8 static void main(String[])
9} 9}
10package utils {
11 class Matrix {
12 static int getWidth(...)
13 static int getHeight(...)
14 static boolean isShapeValid(...)
15 }
16}
17 10
18package viewer { 11package viewer {
19 class Viewer { 12 class Viewer {
@@ -146,6 +139,12 @@ package board {
146 List<TileVec2> neighbors() 139 List<TileVec2> neighbors()
147 } 140 }
148 141
142 class Matrix {
143 static int getWidth(...)
144 static int getHeight(...)
145 static boolean isShapeValid(...)
146 }
147
149 class PathFinder { 148 class PathFinder {
150 PathFinder(Board) 149 PathFinder(Board)
151 List<TileVec2> findPath(TileVec2 origin, TileVec2 target) 150 List<TileVec2> findPath(TileVec2 origin, TileVec2 target)
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 ad29fe6..5677c39 100644
--- a/src/main/java/fr/umlv/java/wallj/board/Board.java
+++ b/src/main/java/fr/umlv/java/wallj/board/Board.java
@@ -1,7 +1,6 @@
1package fr.umlv.java.wallj.board; 1package fr.umlv.java.wallj.board;
2 2
3import fr.umlv.java.wallj.block.BlockType; 3import fr.umlv.java.wallj.block.BlockType;
4import fr.umlv.java.wallj.utils.Matrix;
5 4
6import java.util.AbstractMap; 5import java.util.AbstractMap;
7import java.util.Arrays; 6import java.util.Arrays;
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 39adda7..3b77767 100644
--- a/src/main/java/fr/umlv/java/wallj/board/BoardParser.java
+++ b/src/main/java/fr/umlv/java/wallj/board/BoardParser.java
@@ -1,7 +1,6 @@
1package fr.umlv.java.wallj.board; 1package fr.umlv.java.wallj.board;
2 2
3import fr.umlv.java.wallj.block.BlockType; 3import fr.umlv.java.wallj.block.BlockType;
4import fr.umlv.java.wallj.utils.Matrix;
5 4
6import java.io.IOException; 5import java.io.IOException;
7import java.nio.file.Files; 6import java.nio.file.Files;
diff --git a/src/main/java/fr/umlv/java/wallj/utils/Matrix.java b/src/main/java/fr/umlv/java/wallj/board/Matrix.java
index 83dfc11..c6a2528 100644
--- a/src/main/java/fr/umlv/java/wallj/utils/Matrix.java
+++ b/src/main/java/fr/umlv/java/wallj/board/Matrix.java
@@ -1,4 +1,4 @@
1package fr.umlv.java.wallj.utils; 1package fr.umlv.java.wallj.board;
2 2
3import java.util.List; 3import java.util.List;
4 4
@@ -8,7 +8,6 @@ import java.util.List;
8 * @author Pacien TRAN-GIRARD 8 * @author Pacien TRAN-GIRARD
9 */ 9 */
10public final class Matrix { 10public final class Matrix {
11
12 /** 11 /**
13 * @param m the matrix (2D array) 12 * @param m the matrix (2D array)
14 * @return the width of the matrix (0 if null) 13 * @return the width of the matrix (0 if null)
@@ -52,5 +51,4 @@ public final class Matrix {
52 private Matrix() { 51 private Matrix() {
53 // static class 52 // static class
54 } 53 }
55
56} 54}