Cemal
/
Latice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

working after merge

master
Cemal Odabasioglu 2022-05-26 23:26:05 +02:00
parent 4c1292bacf
commit 8060aa88e8
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/latice/application/LaticeApplicationWindow.java
View File

@ -67,8 +67,8 @@ public class LaticeApplicationWindow extends Application {
Tile greenLeaf = new Tile(Color.GREEN, Shape.FEATHER); Tile greenLeaf = new Tile(Color.GREEN, Shape.FEATHER);
Tile redFlower = new Tile(Color.RED, Shape.FLOWER); Tile redFlower = new Tile(Color.RED, Shape.FLOWER);
ArrayList<Tile> listRackTile = Rack.getListRackTile(); ArrayList<Tile> listRackTile;
ArrayList<Image> listTileImage = Rack.getRackTileImage(); ArrayList<Image> listTileImage;
ArrayList<Tile> listOfTile = new ArrayList<Tile>(); ArrayList<Tile> listOfTile = new ArrayList<Tile>();
Map<Rectangle, Tile> assocRectangleTile = new HashMap<Rectangle, Tile>(); Map<Rectangle, Tile> assocRectangleTile = new HashMap<Rectangle, Tile>();
static StackPane rootLayout; static StackPane rootLayout;
@ -164,6 +164,7 @@ public class LaticeApplicationWindow extends Application {
//deck.displayListTile(); //deck.displayListTile();
//Confirm Button //Confirm Button
Image checkMark = new Image("checkMark.png"); Image checkMark = new Image("checkMark.png");
ImageView checkMarkView = new ImageView(checkMark); 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)); rackImage.setMargin(rackImage.getChildren().get(4), new Insets(0,150,0,0));
root.setBottom(rackImage); root.setBottom(rackImage);
//Adding lists to Arraylists
listRackTile = rack2.getListRackTile();
System.out.println(listRackTile);
listTileImage = rack2.getRackTileImage();
System.out.println("listTileImge : " + listTileImage);
//------------------------------------------------------------------------ //------------------------------------------------------------------------

3
src/main/java/latice/model/Rack.java
View File

@ -40,6 +40,7 @@ public class Rack {
} }
public ArrayList<Tile> getListRackTile() { public ArrayList<Tile> getListRackTile() {
System.out.println(this.listRackTile);
return this.listRackTile; return this.listRackTile;
} }
@ -131,7 +132,7 @@ public class Rack {
} }
public ArrayList<Image> getRackTileImage() { public ArrayList<Image> getRackTileImage() {
return rackTileImage; return this.rackTileImage;
} }