refactor structure of controller package

davi-bart · Feb 16, 2024 · f4e3cd0 · f4e3cd0
1 parent 25267c8
commit f4e3cd0
Show file tree

Hide file tree

Showing 19 changed files with 28 additions and 27 deletions.
diff --git a/...unibo/controller/api/BoardController.java → ...ibo/controller/board/BoardController.java b/...unibo/controller/api/BoardController.java → ...ibo/controller/board/BoardController.java
@@ -1,4 +1,4 @@
-package it.unibo.controller.api;
+package it.unibo.controller.board;
 
 import java.util.List;
 import java.util.Set;

diff --git a/.../controller/impl/BoardControllerImpl.java → ...controller/board/BoardControllerImpl.java b/.../controller/impl/BoardControllerImpl.java → ...controller/board/BoardControllerImpl.java
@@ -1,4 +1,4 @@
-package it.unibo.controller.impl;
+package it.unibo.controller.board;
 
 import java.util.List;
 import java.util.Set;
@@ -18,7 +18,6 @@
 import it.unibo.common.road.RoadPositionImpl;
 import it.unibo.common.tile.TerrainType;
 import it.unibo.common.tile.TilePosition;
-import it.unibo.controller.api.BoardController;
 import it.unibo.model.api.Board;
 import it.unibo.model.api.Player;
 import it.unibo.model.api.PropertyManager;

diff --git a/.../unibo/controller/api/MainController.java → ...unibo/controller/main/MainController.java b/.../unibo/controller/api/MainController.java → ...unibo/controller/main/MainController.java
@@ -1,4 +1,4 @@
-package it.unibo.controller.api;
+package it.unibo.controller.main;
 
 import java.util.List;
 import java.util.Map;
@@ -9,6 +9,8 @@
 import it.unibo.common.road.RoadPosition;
 import it.unibo.common.tile.ResourceType;
 import it.unibo.common.tile.TilePosition;
+import it.unibo.controller.board.BoardController;
+import it.unibo.controller.resource.ResourceController;
 
 /**
  * Main controller.

diff --git a/...o/controller/impl/MainControllerImpl.java → ...o/controller/main/MainControllerImpl.java b/...o/controller/impl/MainControllerImpl.java → ...o/controller/main/MainControllerImpl.java
@@ -1,4 +1,4 @@
-package it.unibo.controller.impl;
+package it.unibo.controller.main;
 
 import java.util.List;
 import java.util.Map;
@@ -11,10 +11,12 @@
 import it.unibo.common.road.RoadPosition;
 import it.unibo.common.tile.ResourceType;
 import it.unibo.common.tile.TilePosition;
-import it.unibo.controller.api.BoardController;
-import it.unibo.controller.api.MainController;
-import it.unibo.controller.api.ResourceController;
-import it.unibo.controller.api.TurnController;
+import it.unibo.controller.board.BoardController;
+import it.unibo.controller.board.BoardControllerImpl;
+import it.unibo.controller.resource.ResourceController;
+import it.unibo.controller.resource.ResourceControllerImpl;
+import it.unibo.controller.turn.TurnController;
+import it.unibo.controller.turn.TurnControllerImpl;
 import it.unibo.model.api.GameManager;
 import it.unibo.model.api.Player;
 import it.unibo.model.impl.GameManagerImpl;

diff --git a/...bo/controller/api/ResourceController.java → ...ntroller/resource/ResourceController.java b/...bo/controller/api/ResourceController.java → ...ntroller/resource/ResourceController.java
@@ -1,4 +1,4 @@
-package it.unibo.controller.api;
+package it.unibo.controller.resource;
 
 import java.util.Map;
 

diff --git a/...ntroller/impl/ResourceControllerImpl.java → ...ller/resource/ResourceControllerImpl.java b/...ntroller/impl/ResourceControllerImpl.java → ...ller/resource/ResourceControllerImpl.java
@@ -1,11 +1,10 @@
-package it.unibo.controller.impl;
+package it.unibo.controller.resource;
 
 import java.util.Map;
 import java.util.function.Function;
 import java.util.HashMap;
 
 import it.unibo.common.tile.ResourceType;
-import it.unibo.controller.api.ResourceController;
 import it.unibo.model.api.Player;
 import it.unibo.model.api.ResourceManager;
 

diff --git a/.../unibo/controller/api/TurnController.java → ...unibo/controller/turn/TurnController.java b/.../unibo/controller/api/TurnController.java → ...unibo/controller/turn/TurnController.java
@@ -1,4 +1,4 @@
-package it.unibo.controller.api;
+package it.unibo.controller.turn;
 
 import org.apache.commons.lang3.tuple.Pair;
 

diff --git a/...o/controller/impl/TurnControllerImpl.java → ...o/controller/turn/TurnControllerImpl.java b/...o/controller/impl/TurnControllerImpl.java → ...o/controller/turn/TurnControllerImpl.java
@@ -1,8 +1,7 @@
-package it.unibo.controller.impl;
+package it.unibo.controller.turn;
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import it.unibo.controller.api.TurnController;
 import it.unibo.model.api.Player;
 import it.unibo.model.api.TurnManager;
 

diff --git a/src/main/java/it/unibo/view/AppViewImpl.java b/src/main/java/it/unibo/view/AppViewImpl.java
@@ -14,8 +14,8 @@
 import java.util.List;
 import java.util.Map;
 
-import it.unibo.controller.api.MainController;
-import it.unibo.controller.impl.MainControllerImpl;
+import it.unibo.controller.main.MainController;
+import it.unibo.controller.main.MainControllerImpl;
 
 /**
  * Application.

diff --git a/src/main/java/it/unibo/view/BankView.java b/src/main/java/it/unibo/view/BankView.java
@@ -1,6 +1,6 @@
 package it.unibo.view;
 
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.layout.HBox;
 
 /**

diff --git a/src/main/java/it/unibo/view/BoardView.java b/src/main/java/it/unibo/view/BoardView.java
@@ -6,7 +6,7 @@
 import java.util.HashMap;
 
 import it.unibo.common.tile.TilePosition;
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.Group;
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;

diff --git a/src/main/java/it/unibo/view/CurrentPlayerView.java b/src/main/java/it/unibo/view/CurrentPlayerView.java
@@ -1,7 +1,7 @@
 package it.unibo.view;
 
 import it.unibo.common.card.CardType;
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;

diff --git a/src/main/java/it/unibo/view/LogView.java b/src/main/java/it/unibo/view/LogView.java
@@ -1,6 +1,6 @@
 package it.unibo.view;
 
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.control.Label;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;

diff --git a/src/main/java/it/unibo/view/PlayersView.java b/src/main/java/it/unibo/view/PlayersView.java
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;

diff --git a/src/main/java/it/unibo/view/PropertyView.java b/src/main/java/it/unibo/view/PropertyView.java
@@ -7,7 +7,7 @@
 
 import it.unibo.common.property.PropertyPosition;
 import it.unibo.common.property.PropertyType;
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonType;

diff --git a/src/main/java/it/unibo/view/RoadView.java b/src/main/java/it/unibo/view/RoadView.java
@@ -6,7 +6,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 
 import it.unibo.common.road.RoadPosition;
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonType;

diff --git a/src/main/java/it/unibo/view/RobberView.java b/src/main/java/it/unibo/view/RobberView.java
@@ -6,7 +6,7 @@
 import java.util.stream.Stream;
 
 import it.unibo.common.tile.ResourceType;
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;

diff --git a/src/main/java/it/unibo/view/TileView.java b/src/main/java/it/unibo/view/TileView.java
@@ -6,7 +6,7 @@
 
 import it.unibo.common.tile.TerrainType;
 import it.unibo.common.tile.TilePosition;
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.event.EventHandler;
 import javafx.geometry.VPos;
 import javafx.scene.Group;

diff --git a/src/main/java/it/unibo/view/TradeView.java b/src/main/java/it/unibo/view/TradeView.java
@@ -6,7 +6,7 @@
 import java.util.stream.Stream;
 
 import it.unibo.common.tile.ResourceType;
-import it.unibo.controller.api.MainController;
+import it.unibo.controller.main.MainController;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;