From d914b94977f19a0ff863e948b7e64f1d4c76c538 Mon Sep 17 00:00:00 2001
From: p20006624 <linh.PHAM-THI-NGOC.1@etu.univ-amu.fr>
Date: Thu, 16 Nov 2023 11:43:11 +0100
Subject: [PATCH] abstrac class Element

---
 src/main/java/model/Element.java  |  6 +++++-
 src/main/java/model/Grid.java     |  7 ++++++-
 src/main/java/model/Position.java |  6 ------
 src/main/java/model/Terrain.java  | 12 ------------
 4 files changed, 11 insertions(+), 20 deletions(-)
 delete mode 100644 src/main/java/model/Position.java
 delete mode 100644 src/main/java/model/Terrain.java

diff --git a/src/main/java/model/Element.java b/src/main/java/model/Element.java
index 970a92f..c6f37a3 100644
--- a/src/main/java/model/Element.java
+++ b/src/main/java/model/Element.java
@@ -1,12 +1,15 @@
 package model;
 
+import util.Position;
+
 import java.util.List;
+import java.util.Random;
 
 public abstract class Element {
     public void setPosition(){
 
     }
-    public Position getPosition(){
+    public List<Position> getPosition(){
         return null;
 
     }
@@ -16,4 +19,5 @@ public abstract class Element {
     private List<util.Position> neighbors(util.Position position){
         return null;
     }
+    private final Random randomGenerator = new Random();
 }
diff --git a/src/main/java/model/Grid.java b/src/main/java/model/Grid.java
index e945595..649fa28 100644
--- a/src/main/java/model/Grid.java
+++ b/src/main/java/model/Grid.java
@@ -5,11 +5,16 @@ import java.util.Random;
 public class Grid {
     private final int columnCount;
     private final int rowCount;
+    private int[][] grid ;
     public Grid(int row,int column){
         this.columnCount = column;
         this.rowCount = row;
+        grid = new int[rowCount][columnCount];
     }
-    private final Random randomGenerator = new Random();
+    public State getState(Position position){
+        return null;
+    }
+
     //ham de lay trang thai cua tung vi tri ban dau
     //ham update vi tri sau khi da dap lua
     //ham dap lua:xet vi tri lua;vi tri dia ly, quyet dinh phuong thuc dap lua
diff --git a/src/main/java/model/Position.java b/src/main/java/model/Position.java
deleted file mode 100644
index 8e623ed..0000000
--- a/src/main/java/model/Position.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package model;
-
-public class Position {
-    int row;
-    int column;
-}
diff --git a/src/main/java/model/Terrain.java b/src/main/java/model/Terrain.java
deleted file mode 100644
index f97c754..0000000
--- a/src/main/java/model/Terrain.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package model;
-
-import util.Position;
-
-import java.util.List;
-
-public class Terrain implements StablePosition{
-    @Override
-    public List<Position> stablePosition() {
-        return null;
-    }
-}
-- 
GitLab