aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/fr/umlv
diff options
context:
space:
mode:
authorAdam NAILI2018-02-01 21:28:05 +0100
committerAdam NAILI2018-02-01 21:28:05 +0100
commitef7e4f09592d43a0d38ab70d920fd29755e0a9f9 (patch)
tree34d92c80f18b81d1631b3f4c73342960f8e70ac3 /src/main/java/fr/umlv
parentf523cd1030de8cc006f41752ea326ae778980820 (diff)
parent52e3e8f8aba5eaf3f2805add3333f2674b81d61a (diff)
downloadwallj-ef7e4f09592d43a0d38ab70d920fd29755e0a9f9.tar.gz
Merge branch 'master' of https://github.com/pacien/upem-java-wallj
Diffstat (limited to 'src/main/java/fr/umlv')
-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
3 files changed, 1 insertions, 5 deletions
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}