fix gui bug

Author: MatteoBriscini

src/main/java/it/polimi/ingsw/gui/GameController.java

@@ -41,7 +41,6 @@
 import static it.polimi.ingsw.shared.Cards.CardColor.BLUE;
 import static it.polimi.ingsw.shared.Cards.CardColor.EMPTY;
 import static javafx.geometry.Pos.CENTER;
-// import static jdk.internal.org.jline.utils.Colors.s;
 
 public class GameController extends GuiView implements Initializable {
 
@@ -95,7 +94,7 @@ public class GameController extends GuiView implements Initializable {
     private Label shelfID3 = new Label();
 
     //images
-    ArrayList<Title> titles = new ArrayList<>();
+
     @FXML
     public ImageView logo = new ImageView();
     @FXML
@@ -294,25 +293,25 @@ public void setMainBoard(){
 
 
         //TO FIX BOARD DIMENSION
-        ImageView card = new ImageView(createImage(0, BLUE, titles));
+        ImageView card = new ImageView(createImage(0, BLUE, helloApplication.getTitles()));
         card.setFitHeight(50);
         card.setFitWidth(50);
         card.setVisible(false);
         GridPane.setConstraints(card,0,0);
         mainBoardGrid.getChildren().add(card);
-        card = new ImageView(createImage(0, BLUE, titles));
+        card = new ImageView(createImage(0, BLUE, helloApplication.getTitles()));
         card.setFitHeight(50);
         card.setFitWidth(50);
         card.setVisible(false);
         GridPane.setConstraints(card,0,8);
         mainBoardGrid.getChildren().add(card);
-        card = new ImageView(createImage(0, BLUE, titles));
+        card = new ImageView(createImage(0, BLUE, helloApplication.getTitles()));
         card.setFitHeight(50);
         card.setFitWidth(50);
         card.setVisible(false);
         GridPane.setConstraints(card,8,8);
         mainBoardGrid.getChildren().add(card);
-        card = new ImageView(createImage(0, BLUE, titles));
+        card = new ImageView(createImage(0, BLUE, helloApplication.getTitles()));
         card.setFitHeight(50);
         card.setFitWidth(50);
         card.setVisible(false);
@@ -322,7 +321,7 @@ public void setMainBoard(){
         Card[][] mainBoard = player.getMainBoard().getBoard();
         for(int x=0;x<player.getMainBoard().getColumns();x++){
             for (int y=0;y<player.getMainBoard().getRows(); y++){
-                    card = new ImageView(createImage(mainBoard[x][y].getSketch(), mainBoard[x][y].getColor(), titles));
+                    card = new ImageView(createImage(mainBoard[x][y].getSketch(), mainBoard[x][y].getColor(), helloApplication.getTitles()));
                     card.setFitHeight(50);
                     card.setFitWidth(50);
                     if(mainBoard[x][y].getColor().equals(EMPTY))card.setVisible(false);
@@ -363,7 +362,7 @@ public void setMyPlayerBoardGrid(){
 
         for(int x=0;x<playerBoard.getColumns();x++){
             for (int y=0;y<playerBoard.getRows(); y++){
-                ImageView card = new ImageView(createImage(cards[x][y].getSketch(), cards[x][y].getColor(), titles));
+                ImageView card = new ImageView(createImage(cards[x][y].getSketch(), cards[x][y].getColor(), helloApplication.getTitles()));
                 card.setFitHeight(42);
                 card.setFitWidth(42);
                 if(cards[x][y].getColor().equals(EMPTY))card.setVisible(false);
@@ -405,7 +404,7 @@ private void updatePlayerBoard(String playerID, int column, Card[] c, GridPane g
         y = y -c.length +1;
 
         for(Card card: c){
-            ImageView cardImg = new ImageView(createImage(card.getSketch(), card.getColor(), titles));
+            ImageView cardImg = new ImageView(createImage(card.getSketch(), card.getColor(), helloApplication.getTitles()));
             cardImg.setFitHeight(size);
             cardImg.setFitWidth(size);
             GridPane.setConstraints(cardImg, column, player.getMainBoard().getColumns()-y);
@@ -436,7 +435,7 @@ public void setOtherPlayerBoard(){
 
             for (int x = 0; x < playerBoard.getColumns(); x++) {
                 for (int y = 0; y < playerBoard.getRows(); y++) {
-                    ImageView card = new ImageView(createImage(cards[x][y].getSketch(),cards[x][y].getColor(), titles));
+                    ImageView card = new ImageView(createImage(cards[x][y].getSketch(),cards[x][y].getColor(), helloApplication.getTitles()));
                     card.setFitHeight(17);
                     card.setFitWidth(17);
                     if(cards[x][y].getColor().equals(EMPTY))card.setVisible(false);
@@ -532,7 +531,7 @@ private void MoveMode(){
     private void insertTails(int x, int y, int pose){
 
         Card[][] mainBoard = player.getMainBoard().getBoard();
-        ImageView card = new ImageView(createImage(mainBoard[x][y].getSketch(), mainBoard[x][y].getColor(), titles));
+        ImageView card = new ImageView(createImage(mainBoard[x][y].getSketch(), mainBoard[x][y].getColor(), helloApplication.getTitles()));
         card.setFitHeight(60);
         card.setFitWidth(60);
         card.setId("takenCard");

src/main/java/it/polimi/ingsw/gui/HelloApplication.java

@@ -7,6 +7,7 @@
 import it.polimi.ingsw.client.View.UserInterface;
 import it.polimi.ingsw.gui.supportClass.Message;
 import it.polimi.ingsw.gui.supportClass.MessageTipe;
+import it.polimi.ingsw.gui.supportClass.Title;
 import it.polimi.ingsw.shared.Cards.Card;
 import it.polimi.ingsw.shared.JsonSupportClasses.PositionWithColor;
 import it.polimi.ingsw.shared.PlayerMode;
@@ -20,6 +21,7 @@
 import javafx.stage.Stage;
 
 import java.io.IOException;
+import java.util.ArrayList;
 
 
 public class HelloApplication extends Application implements UserInterface {
@@ -55,6 +57,10 @@ public void setConnection(ConnectionManager connection) {
     public ConnectionManager getConnection() {
         return connection;
     }
+    private final ArrayList<Title> titles = new ArrayList<>();
+    public ArrayList<Title> getTitles() {
+        return titles;
+    }
 
 
     public void changeView(String viewName) throws IOException {
@@ -137,8 +143,6 @@ public void updateAll() {
         if(guiView instanceof GameController) {
             Platform.runLater(() -> {
                 ((GameController)guiView).setMainBoard();
-                ((GameController)guiView).setMyPlayerBoardGrid();
-                ((GameController)guiView).setOtherPlayerBoard();
             });
             return;
         }

src/main/java/it/polimi/ingsw/gui/HelloController.java

@@ -4,6 +4,7 @@
 import com.google.gson.JsonObject;
 import it.polimi.ingsw.client.Connection.ClientRMI;
 import it.polimi.ingsw.client.Connection.ClientSOCKET;
+import it.polimi.ingsw.gui.supportClass.Title;
 import it.polimi.ingsw.shared.JsonSupportClasses.JsonUrl;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -24,6 +25,7 @@
 
 import java.io.*;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.ResourceBundle;
 
 public class HelloController extends GuiView implements Initializable {
@@ -49,6 +51,8 @@ public class HelloController extends GuiView implements Initializable {
     int RMIPort;
     String serverIP;
     Alert cntAlert = new Alert(Alert.AlertType.ERROR);
+
+
     private void jsonCreate() throws FileNotFoundException{
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(JsonUrl.getUrl("netConfig"));
         if(inputStream == null) throw new FileNotFoundException();