diff --git a/src/main/java/latice/application/LaticeApplicationWindow.java b/src/main/java/latice/application/LaticeApplicationWindow.java index 6a8f2dd..108a9ce 100644 --- a/src/main/java/latice/application/LaticeApplicationWindow.java +++ b/src/main/java/latice/application/LaticeApplicationWindow.java @@ -67,8 +67,8 @@ public class LaticeApplicationWindow extends Application { Tile greenLeaf = new Tile(Color.GREEN, Shape.FEATHER); Tile redFlower = new Tile(Color.RED, Shape.FLOWER); - ArrayList listRackTile = Rack.getListRackTile(); - ArrayList listTileImage = Rack.getRackTileImage(); + ArrayList listRackTile; + ArrayList listTileImage; ArrayList listOfTile = new ArrayList(); Map assocRectangleTile = new HashMap(); static StackPane rootLayout; @@ -164,6 +164,7 @@ public class LaticeApplicationWindow extends Application { //deck.displayListTile(); + //Confirm Button Image checkMark = new Image("checkMark.png"); ImageView checkMarkView = new ImageView(checkMark); @@ -186,6 +187,12 @@ public class LaticeApplicationWindow extends Application { rackImage.setMargin(rackImage.getChildren().get(4), new Insets(0,150,0,0)); root.setBottom(rackImage); + //Adding lists to Arraylists + listRackTile = rack2.getListRackTile(); + System.out.println(listRackTile); + listTileImage = rack2.getRackTileImage(); + System.out.println("listTileImge : " + listTileImage); + //------------------------------------------------------------------------ diff --git a/src/main/java/latice/model/Rack.java b/src/main/java/latice/model/Rack.java index e2913aa..94a42e9 100644 --- a/src/main/java/latice/model/Rack.java +++ b/src/main/java/latice/model/Rack.java @@ -40,6 +40,7 @@ public class Rack { } public ArrayList getListRackTile() { + System.out.println(this.listRackTile); return this.listRackTile; } @@ -131,7 +132,7 @@ public class Rack { } public ArrayList getRackTileImage() { - return rackTileImage; + return this.rackTileImage; }