Merge branch 'master' of https://github.com/pacien/upem-java-wallj

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
 class Main{
     static void main(String[])
 }
-package utils {
-  class Matrix {
-    static int getWidth(...)
-    static int getHeight(...)
-    static boolean isShapeValid(...)
-  }
-}
 
 package viewer {
   class Viewer {
@@ -146,6 +139,12 @@ package board {
     List<TileVec2> neighbors()
   }
 
+  class Matrix {
+    static int getWidth(...)
+    static int getHeight(...)
+    static boolean isShapeValid(...)
+  }
+
   class PathFinder {
     PathFinder(Board)
     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 @@
 package fr.umlv.java.wallj.board;
 
 import fr.umlv.java.wallj.block.BlockType;
-import fr.umlv.java.wallj.utils.Matrix;
 
 import java.util.AbstractMap;
 import 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 @@
 package fr.umlv.java.wallj.board;
 
 import fr.umlv.java.wallj.block.BlockType;
-import fr.umlv.java.wallj.utils.Matrix;
 
 import java.io.IOException;
 import 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 @@
-package fr.umlv.java.wallj.utils;
+package fr.umlv.java.wallj.board;
 
 import java.util.List;
 
@@ -8,7 +8,6 @@ import java.util.List;
  * @author Pacien TRAN-GIRARD
  */
 public final class Matrix {
-
   /**
    * @param m the matrix (2D array)
    * @return the width of the matrix (0 if null)
@@ -52,5 +51,4 @@ public final class Matrix {
   private Matrix() {
     // static class
   }
-
 }