Merge remote-tracking branch 'origin/master'

Goetrie · Goetrie · commit 1a98bf438451 · 2019-07-08T09:22:15.000+02:00
diff --git a/client/src/main/java/it/polimi/ingsw/client/controllers/game/ChatViewController.java b/client/src/main/java/it/polimi/ingsw/client/controllers/game/ChatViewController.java
@@ -122,4 +122,5 @@ public boolean isCellEditable(int row, int column) {
     public JComponent $$$getRootComponent$$$() {
         return panel;
     }
+
 }
diff --git a/client/src/main/java/it/polimi/ingsw/client/controllers/game/ExpoViewController.java b/client/src/main/java/it/polimi/ingsw/client/controllers/game/ExpoViewController.java
@@ -124,4 +124,5 @@ private void createRotator(@NotNull Node front, @NotNull Node back) {
     public JComponent $$$getRootComponent$$$() {
         return panel;
     }
+
 }
diff --git a/client/src/main/java/it/polimi/ingsw/client/controllers/game/LeaderBoardViewController.java b/client/src/main/java/it/polimi/ingsw/client/controllers/game/LeaderBoardViewController.java
@@ -81,4 +81,5 @@ public boolean isCellEditable(int row, int column) {
     public JComponent $$$getRootComponent$$$() {
         return panel;
     }
+
 }
diff --git a/client/src/main/java/it/polimi/ingsw/client/controllers/game/PlayersBoardsViewController.java b/client/src/main/java/it/polimi/ingsw/client/controllers/game/PlayersBoardsViewController.java
@@ -60,4 +60,5 @@ public class PlayersBoardsViewController extends BaseViewController {
     public JComponent $$$getRootComponent$$$() {
         return panel;
     }
+
 }
diff --git a/client/src/main/java/it/polimi/ingsw/client/controllers/pregame/NewRoomViewController.java b/client/src/main/java/it/polimi/ingsw/client/controllers/pregame/NewRoomViewController.java
@@ -177,4 +177,5 @@ public NewRoomViewController(@NotNull NavigationController navigationController)
     public JComponent $$$getRootComponent$$$() {
         return panel;
     }
+
 }
diff --git a/client/src/main/java/it/polimi/ingsw/client/controllers/pregame/RoomViewController.java b/client/src/main/java/it/polimi/ingsw/client/controllers/pregame/RoomViewController.java
@@ -250,4 +250,5 @@ public void dispose() {
     public JComponent $$$getRootComponent$$$() {
         return panel;
     }
+
 }
diff --git a/client/src/main/java/it/polimi/ingsw/client/controllers/pregame/RoomsListViewController.java b/client/src/main/java/it/polimi/ingsw/client/controllers/pregame/RoomsListViewController.java
@@ -120,4 +120,5 @@ public boolean isCellEditable(int row, int column) {
     public JComponent $$$getRootComponent$$$() {
         return panel;
     }
+
 }
diff --git a/client/src/main/java/it/polimi/ingsw/client/controllers/startup/ConnTypeViewController.java b/client/src/main/java/it/polimi/ingsw/client/controllers/startup/ConnTypeViewController.java
@@ -148,4 +148,5 @@ private void next() {
     public JComponent $$$getRootComponent$$$() {
         return panel;
     }
+
 }
diff --git a/client/src/main/java/it/polimi/ingsw/client/controllers/startup/LoginViewController.java b/client/src/main/java/it/polimi/ingsw/client/controllers/startup/LoginViewController.java
@@ -122,4 +122,5 @@ public LoginViewController(@NotNull NavigationController navigationController) {
     public JComponent $$$getRootComponent$$$() {
         return panel;
     }
+
 }
diff --git a/client/src/main/java/it/polimi/ingsw/client/controllers/startup/SignupViewController.java b/client/src/main/java/it/polimi/ingsw/client/controllers/startup/SignupViewController.java
@@ -122,4 +122,5 @@ public SignupViewController(@NotNull NavigationController navigationController)
     public JComponent $$$getRootComponent$$$() {
         return panel;
     }
+
 }
diff --git a/client/src/main/java/it/polimi/ingsw/client/views/cli/ActionManager.java b/client/src/main/java/it/polimi/ingsw/client/views/cli/ActionManager.java
@@ -89,15 +89,11 @@ void actionMenu(@NotNull Game game) throws RemoteException {
     private void selectReborningPowerUp(@NotNull Game game) throws InterruptedException, RemoteException {
         if (Preferences.getToken() == null) throw new InterruptedException();
         if (game.getActualPlayer().getPowerUps().size() == 1) {
-            try {
-                System.out.println("Ops...non hai molta scelta");
-                if (!Client.API.doAction(Preferences.getToken(), Action.Builder.create(game.getUuid())
-                        .buildReborn(game.getActualPlayer().getPowerUps().get(0).getType(), game.getActualPlayer().getPowerUps().get(0).getAmmoColor())))
-                    throw new InterruptedException();
-                return;
-            } catch (RemoteException e) {
-                e.printStackTrace();
-            }
+            System.out.println("Ops...non hai molta scelta");
+            if (!Client.API.doAction(Preferences.getToken(), Action.Builder.create(game.getUuid())
+                    .buildReborn(game.getActualPlayer().getPowerUps().get(0).getType(), game.getActualPlayer().getPowerUps().get(0).getAmmoColor())))
+                throw new InterruptedException();
+            return;
         }
         for (int i = 0; i < game.getActualPlayer().getPowerUps().size(); i++)
             System.out.println((1 + i) + ". " + game.getActualPlayer().getPowerUps().get(i).getAmmoColor().escape() +
@@ -108,14 +104,10 @@ private void selectReborningPowerUp(@NotNull Game game) throws InterruptedExcept
             return;
         }
         if (Integer.parseInt(choice) > 0 && Integer.parseInt(choice) <= game.getActualPlayer().getPowerUps().size()) {
-            try {
-                if (!Client.API.doAction(Preferences.getToken(), Action.Builder.create(game.getUuid())
-                        .buildReborn(game.getActualPlayer().getPowerUps().get(Integer.parseInt(choice) - 1).getType(),
-                                game.getActualPlayer().getPowerUps().get(Integer.parseInt(choice) - 1).getAmmoColor())))
-                    throw new InterruptedException();
-            } catch (RemoteException e) {
-                e.printStackTrace();
-            }
+            if (!Client.API.doAction(Preferences.getToken(), Action.Builder.create(game.getUuid())
+                    .buildReborn(game.getActualPlayer().getPowerUps().get(Integer.parseInt(choice) - 1).getType(),
+                            game.getActualPlayer().getPowerUps().get(Integer.parseInt(choice) - 1).getAmmoColor())))
+                throw new InterruptedException();
         } else {
             System.out.println(invalidChoice);
             selectReborningPowerUp(game);
diff --git a/client/src/main/java/it/polimi/ingsw/client/views/cli/GameCli.java b/client/src/main/java/it/polimi/ingsw/client/views/cli/GameCli.java
@@ -264,7 +264,7 @@ else if (f instanceof Game && ((Game) f).getUuid().equals(game.getUuid())) {
                 }
             });
         } catch (UserRemoteException ex) {
-            ex.printStackTrace();
+            System.out.println(ex.getMessage());
             return Segue.of("login", StartupCli.class);
         } catch (RemoteException ex) {
             System.out.println(ex.getMessage());
@@ -281,7 +281,6 @@ else if (f instanceof Game && ((Game) f).getUuid().equals(game.getUuid())) {
                 Thread.onSpinWait();
                 Thread.sleep(100);
             } catch (InterruptedException e) {
-                e.printStackTrace();
                 Thread.currentThread().interrupt();
             }
         }
@@ -294,7 +293,7 @@ else if (f instanceof Game && ((Game) f).getUuid().equals(game.getUuid())) {
             Client.API.removeListener(Preferences.getOptionalToken().get());
             return Segue.of("mainMenu", PregameCli.class);
         } catch (UserRemoteException ex) {
-            ex.printStackTrace();
+            System.out.println(ex.getMessage());
             return Segue.of("login", StartupCli.class);
         } catch (RemoteException ex) {
             System.out.println(ex.getMessage());
@@ -366,8 +365,7 @@ public static void printGame(@NotNull Game game) {
         if (game.getActualPlayer().getUuid().equals(Preferences.getUuid())) {
             try {
                 new ActionManager().actionMenu(game);
-            } catch (RemoteException e) {
-                e.printStackTrace();
+            } catch (RemoteException ignored) {
             }
         } else {
             System.out.print(game.getActualPlayer().getBoardType().escape() + game.getActualPlayer().getNickname());
diff --git a/client/src/main/java/it/polimi/ingsw/client/views/cli/PregameCli.java b/client/src/main/java/it/polimi/ingsw/client/views/cli/PregameCli.java
@@ -119,8 +119,7 @@ public class PregameCli {
             System.out.println("gioco creato correttamente!");
             return Segue.of("preLobby", room);
         } catch (RemoteException e) {
-            System.out.println("errore nella creazione della partita!");
-            e.printStackTrace();
+            System.out.println(e.getMessage());
             return Segue.of("newGame");
         }
         return Segue.of("newGame");
@@ -198,7 +197,7 @@ public class PregameCli {
                 if (f instanceof Room && ((Room) f).getUuid().equals(room.getUuid())) PregameCli.room = (Room) f;
             });
         } catch (UserRemoteException ex) {
-            ex.printStackTrace();
+            System.out.println(ex.getMessage());
             return Segue.of("login", StartupCli.class);
         } catch (RemoteException ex) {
             System.out.println(ex.getMessage());
@@ -226,7 +225,6 @@ public class PregameCli {
                 Thread.onSpinWait();
                 Thread.sleep(100);
             } catch (InterruptedException e) {
-                e.printStackTrace();
                 Thread.currentThread().interrupt();
             }
         }
@@ -244,7 +242,7 @@ public class PregameCli {
             Client.API.removeListener(Preferences.getOptionalToken().get());
             return Segue.of("preGame", GameCli.class, Client.API.getActiveGame(Preferences.getOptionalToken().get()));
         } catch (UserRemoteException ex) {
-            ex.printStackTrace();
+            System.out.println(ex.getMessage());
             return Segue.of("login", StartupCli.class);
         } catch (RemoteException ex) {
             System.out.println(ex.getMessage());
diff --git a/client/src/main/java/it/polimi/ingsw/client/views/cli/StartupCli.java b/client/src/main/java/it/polimi/ingsw/client/views/cli/StartupCli.java
@@ -34,7 +34,7 @@ public class StartupCli {
         var input = 0;
         try {
             input = Integer.parseInt(in.nextLine());
-        } catch (NumberFormatException e) {
+        } catch (NumberFormatException ignored) {
         }
         if (input > 3 || input < 1) {
             return Segue.of("connType");

Original file line number	Diff line number	Diff line change
`@@ -122,4 +122,5 @@ public boolean isCellEditable(int row, int column) {`
`122`	`122`	`public JComponent $$$getRootComponent$$$() {`
`123`	`123`	`return panel;`
`124`	`124`	`}`
	`125`	`+`
`125`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,4 +124,5 @@ private void createRotator(@NotNull Node front, @NotNull Node back) {`
`124`	`124`	`public JComponent $$$getRootComponent$$$() {`
`125`	`125`	`return panel;`
`126`	`126`	`}`
	`127`	`+`
`127`	`128`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,4 +81,5 @@ public boolean isCellEditable(int row, int column) {`
`81`	`81`	`public JComponent $$$getRootComponent$$$() {`
`82`	`82`	`return panel;`
`83`	`83`	`}`
	`84`	`+`
`84`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,4 +60,5 @@ public class PlayersBoardsViewController extends BaseViewController {`
`60`	`60`	`public JComponent $$$getRootComponent$$$() {`
`61`	`61`	`return panel;`
`62`	`62`	`}`
	`63`	`+`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -177,4 +177,5 @@ public NewRoomViewController(@NotNull NavigationController navigationController)`
`177`	`177`	`public JComponent $$$getRootComponent$$$() {`
`178`	`178`	`return panel;`
`179`	`179`	`}`
	`180`	`+`
`180`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -250,4 +250,5 @@ public void dispose() {`
`250`	`250`	`public JComponent $$$getRootComponent$$$() {`
`251`	`251`	`return panel;`
`252`	`252`	`}`
	`253`	`+`
`253`	`254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,4 +120,5 @@ public boolean isCellEditable(int row, int column) {`
`120`	`120`	`public JComponent $$$getRootComponent$$$() {`
`121`	`121`	`return panel;`
`122`	`122`	`}`
	`123`	`+`
`123`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,4 +148,5 @@ private void next() {`
`148`	`148`	`public JComponent $$$getRootComponent$$$() {`
`149`	`149`	`return panel;`
`150`	`150`	`}`
	`151`	`+`
`151`	`152`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,4 +122,5 @@ public LoginViewController(@NotNull NavigationController navigationController) {`
`122`	`122`	`public JComponent $$$getRootComponent$$$() {`
`123`	`123`	`return panel;`
`124`	`124`	`}`
	`125`	`+`
`125`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,4 +122,5 @@ public SignupViewController(@NotNull NavigationController navigationController)`
`122`	`122`	`public JComponent $$$getRootComponent$$$() {`
`123`	`123`	`return panel;`
`124`	`124`	`}`
	`125`	`+`
`125`	`126`	`}`