refactor model package structure

davi-bart · Feb 16, 2024 · 34e3539 · 34e3539
1 parent f4e3cd0
commit 34e3539
Show file tree

Hide file tree

Showing 37 changed files with 104 additions and 93 deletions.
diff --git a/src/main/java/it/unibo/controller/board/BoardControllerImpl.java b/src/main/java/it/unibo/controller/board/BoardControllerImpl.java
@@ -18,10 +18,10 @@
 import it.unibo.common.road.RoadPositionImpl;
 import it.unibo.common.tile.TerrainType;
 import it.unibo.common.tile.TilePosition;
-import it.unibo.model.api.Board;
-import it.unibo.model.api.Player;
-import it.unibo.model.api.PropertyManager;
-import it.unibo.model.api.RoadManager;
+import it.unibo.model.board.Board;
+import it.unibo.model.player.Player;
+import it.unibo.model.property.PropertyManager;
+import it.unibo.model.road.RoadManager;
 
 /**
  * Board controller implementation.

diff --git a/src/main/java/it/unibo/controller/main/MainControllerImpl.java b/src/main/java/it/unibo/controller/main/MainControllerImpl.java
@@ -17,9 +17,9 @@
 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;
+import it.unibo.model.GameManager;
+import it.unibo.model.GameManagerImpl;
+import it.unibo.model.player.Player;
 import it.unibo.view.AppView;
 
 /**

diff --git a/src/main/java/it/unibo/controller/resource/ResourceControllerImpl.java b/src/main/java/it/unibo/controller/resource/ResourceControllerImpl.java
@@ -5,8 +5,8 @@
 import java.util.HashMap;
 
 import it.unibo.common.tile.ResourceType;
-import it.unibo.model.api.Player;
-import it.unibo.model.api.ResourceManager;
+import it.unibo.model.player.Player;
+import it.unibo.model.resource.ResourceManager;
 
 /**
  * Resource controller implementation.

diff --git a/src/main/java/it/unibo/controller/turn/TurnController.java b/src/main/java/it/unibo/controller/turn/TurnController.java
@@ -2,7 +2,7 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import it.unibo.model.api.Player;
+import it.unibo.model.player.Player;
 
 /**
  * interface of TurnController.

diff --git a/src/main/java/it/unibo/controller/turn/TurnControllerImpl.java b/src/main/java/it/unibo/controller/turn/TurnControllerImpl.java
@@ -2,8 +2,8 @@
 
 import org.apache.commons.lang3.tuple.Pair;
 
-import it.unibo.model.api.Player;
-import it.unibo.model.api.TurnManager;
+import it.unibo.model.player.Player;
+import it.unibo.model.turn.TurnManager;
 
 /**
  * Turn controller implementation.

diff --git a/.../java/it/unibo/model/api/GameManager.java → ...main/java/it/unibo/model/GameManager.java b/.../java/it/unibo/model/api/GameManager.java → ...main/java/it/unibo/model/GameManager.java
@@ -1,10 +1,16 @@
-package it.unibo.model.api;
+package it.unibo.model;
 
 import java.util.List;
 
 import it.unibo.common.card.CardType;
 import it.unibo.common.property.PropertyPosition;
 import it.unibo.common.road.RoadPosition;
+import it.unibo.model.board.Board;
+import it.unibo.model.player.Player;
+import it.unibo.model.property.PropertyManager;
+import it.unibo.model.resource.ResourceManager;
+import it.unibo.model.road.RoadManager;
+import it.unibo.model.turn.TurnManager;
 
 /**
  * GameManager.

diff --git a/.../it/unibo/model/impl/GameManagerImpl.java → .../java/it/unibo/model/GameManagerImpl.java b/.../it/unibo/model/impl/GameManagerImpl.java → .../java/it/unibo/model/GameManagerImpl.java
@@ -1,4 +1,4 @@
-package it.unibo.model.impl;
+package it.unibo.model;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -13,15 +13,22 @@
 import it.unibo.common.road.RoadPosition;
 import it.unibo.common.tile.ResourceType;
 import it.unibo.common.tile.TerrainType;
-import it.unibo.model.api.Board;
-import it.unibo.model.api.DevelopmentCards;
-import it.unibo.model.api.GameManager;
-import it.unibo.model.api.GameMapGenerator;
-import it.unibo.model.api.Player;
-import it.unibo.model.api.PropertyManager;
-import it.unibo.model.api.ResourceManager;
-import it.unibo.model.api.RoadManager;
-import it.unibo.model.api.TurnManager;
+import it.unibo.model.board.Board;
+import it.unibo.model.board.BoardImpl;
+import it.unibo.model.developmentcard.DevelopmentCards;
+import it.unibo.model.developmentcard.DevelopmentCardsImpl;
+import it.unibo.model.mapgenerator.GameMapGenerator;
+import it.unibo.model.mapgenerator.RandomGameMapGenerator;
+import it.unibo.model.player.Player;
+import it.unibo.model.player.PlayerImpl;
+import it.unibo.model.property.PropertyManager;
+import it.unibo.model.property.PropertyManagerImpl;
+import it.unibo.model.resource.ResourceManager;
+import it.unibo.model.resource.ResourceManagerImpl;
+import it.unibo.model.road.RoadManager;
+import it.unibo.model.road.RoadManagerImpl;
+import it.unibo.model.turn.TurnManager;
+import it.unibo.model.turn.TurnManagerImpl;
 
 /**
  * Implementation of GameManager.

diff --git a/src/main/java/it/unibo/model/api/Board.java → ...main/java/it/unibo/model/board/Board.java b/src/main/java/it/unibo/model/api/Board.java → ...main/java/it/unibo/model/board/Board.java
@@ -1,4 +1,4 @@
-package it.unibo.model.api;
+package it.unibo.model.board;
 
 import java.util.List;
 

diff --git a/...n/java/it/unibo/model/impl/BoardImpl.java → .../java/it/unibo/model/board/BoardImpl.java b/...n/java/it/unibo/model/impl/BoardImpl.java → .../java/it/unibo/model/board/BoardImpl.java
@@ -1,13 +1,11 @@
-package it.unibo.model.impl;
+package it.unibo.model.board;
 
 import java.util.List;
 import java.util.Map;
 
 import it.unibo.common.tile.TerrainType;
 import it.unibo.common.tile.TilePosition;
-import it.unibo.model.api.Board;
-import it.unibo.model.api.GameMapGenerator;
-import it.unibo.model.api.Tile;
+import it.unibo.model.mapgenerator.GameMapGenerator;
 
 /**
  * Board implementation.

diff --git a/src/main/java/it/unibo/model/api/Tile.java → src/main/java/it/unibo/model/board/Tile.java b/src/main/java/it/unibo/model/api/Tile.java → src/main/java/it/unibo/model/board/Tile.java
@@ -1,4 +1,4 @@
-package it.unibo.model.api;
+package it.unibo.model.board;
 
 import it.unibo.common.tile.TerrainType;
 

diff --git a/...in/java/it/unibo/model/impl/TileImpl.java → ...n/java/it/unibo/model/board/TileImpl.java b/...in/java/it/unibo/model/impl/TileImpl.java → ...n/java/it/unibo/model/board/TileImpl.java
@@ -1,7 +1,6 @@
-package it.unibo.model.impl;
+package it.unibo.model.board;
 
 import it.unibo.common.tile.TerrainType;
-import it.unibo.model.api.Tile;
 
 /**
  * Tile implementation.
@@ -10,7 +9,13 @@ public final class TileImpl implements Tile {
     private final int number;
     private final TerrainType terrainType;
 
-    TileImpl(final TerrainType terrainType, final int number) {
+    /**
+     * Constructor of the tile.
+     * 
+     * @param terrainType the terrain type
+     * @param number      the number on the tile
+     */
+    public TileImpl(final TerrainType terrainType, final int number) {
         this.terrainType = terrainType;
         this.number = number;
     }

diff --git a/.../it/unibo/model/api/DevelopmentCards.java → ...del/developmentcard/DevelopmentCards.java b/.../it/unibo/model/api/DevelopmentCards.java → ...del/developmentcard/DevelopmentCards.java
@@ -1,4 +1,4 @@
-package it.unibo.model.api;
+package it.unibo.model.developmentcard;
 
 import it.unibo.common.card.CardType;
 

diff --git a/...nibo/model/impl/DevelopmentCardsImpl.java → ...developmentcard/DevelopmentCardsImpl.java b/...nibo/model/impl/DevelopmentCardsImpl.java → ...developmentcard/DevelopmentCardsImpl.java
@@ -1,4 +1,4 @@
-package it.unibo.model.impl;
+package it.unibo.model.developmentcard;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,7 +8,6 @@
 import java.util.Map;
 
 import it.unibo.common.card.CardType;
-import it.unibo.model.api.DevelopmentCards;
 
 /**
  * Development cards implementation.

diff --git a/.../model/impl/BeginnerGameMapGenerator.java → ...apgenerator/BeginnerGameMapGenerator.java b/.../model/impl/BeginnerGameMapGenerator.java → ...apgenerator/BeginnerGameMapGenerator.java
@@ -1,13 +1,13 @@
-package it.unibo.model.impl;
+package it.unibo.model.mapgenerator;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import it.unibo.common.tile.TerrainType;
 import it.unibo.common.tile.TilePosition;
 import it.unibo.common.tile.TilePositionImpl;
-import it.unibo.model.api.GameMapGenerator;
-import it.unibo.model.api.Tile;
+import it.unibo.model.board.Tile;
+import it.unibo.model.board.TileImpl;
 
 /**
  * A generator which generates the suggested beginner's map set-up,

diff --git a/.../it/unibo/model/api/GameMapGenerator.java → .../model/mapgenerator/GameMapGenerator.java b/.../it/unibo/model/api/GameMapGenerator.java → .../model/mapgenerator/GameMapGenerator.java
@@ -1,8 +1,9 @@
-package it.unibo.model.api;
+package it.unibo.model.mapgenerator;
 
 import java.util.Map;
 
 import it.unibo.common.tile.TilePosition;
+import it.unibo.model.board.Tile;
 
 /**
  * Game map generator.

diff --git a/...bo/model/impl/RandomGameMapGenerator.java → .../mapgenerator/RandomGameMapGenerator.java b/...bo/model/impl/RandomGameMapGenerator.java → .../mapgenerator/RandomGameMapGenerator.java
@@ -1,4 +1,4 @@
-package it.unibo.model.impl;
+package it.unibo.model.mapgenerator;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -13,8 +13,8 @@
 import it.unibo.common.tile.TerrainType;
 import it.unibo.common.tile.TilePosition;
 import it.unibo.common.tile.TilePositionImpl;
-import it.unibo.model.api.GameMapGenerator;
-import it.unibo.model.api.Tile;
+import it.unibo.model.board.Tile;
+import it.unibo.model.board.TileImpl;
 
 /**
  * A generator which generates a random game map.

diff --git a/src/main/java/it/unibo/model/api/Player.java → ...in/java/it/unibo/model/player/Player.java b/src/main/java/it/unibo/model/api/Player.java → ...in/java/it/unibo/model/player/Player.java
@@ -1,4 +1,6 @@
-package it.unibo.model.api;
+package it.unibo.model.player;
+
+import it.unibo.model.resource.ResourceOwner;
 
 /**
  * Player.

diff --git a/.../java/it/unibo/model/impl/PlayerImpl.java → ...ava/it/unibo/model/player/PlayerImpl.java b/.../java/it/unibo/model/impl/PlayerImpl.java → ...ava/it/unibo/model/player/PlayerImpl.java
@@ -1,10 +1,9 @@
-package it.unibo.model.impl;
+package it.unibo.model.player;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import it.unibo.common.tile.ResourceType;
-import it.unibo.model.api.Player;
 
 /**
  * Implementation of Player.

diff --git a/...ain/java/it/unibo/model/api/Property.java → ...ava/it/unibo/model/property/Property.java b/...ain/java/it/unibo/model/api/Property.java → ...ava/it/unibo/model/property/Property.java
@@ -1,7 +1,8 @@
-package it.unibo.model.api;
+package it.unibo.model.property;
 
 import it.unibo.common.property.PropertyPosition;
 import it.unibo.common.property.PropertyType;
+import it.unibo.model.player.Player;
 
 /**
  * Property.

diff --git a/...ava/it/unibo/model/impl/PropertyImpl.java → ...it/unibo/model/property/PropertyImpl.java b/...ava/it/unibo/model/impl/PropertyImpl.java → ...it/unibo/model/property/PropertyImpl.java
@@ -1,9 +1,8 @@
-package it.unibo.model.impl;
+package it.unibo.model.property;
 
 import it.unibo.common.property.PropertyPosition;
 import it.unibo.common.property.PropertyType;
-import it.unibo.model.api.Player;
-import it.unibo.model.api.Property;
+import it.unibo.model.player.Player;
 
 /**
  * Property implementation.

diff --git a/...a/it/unibo/model/api/PropertyManager.java → ...unibo/model/property/PropertyManager.java b/...a/it/unibo/model/api/PropertyManager.java → ...unibo/model/property/PropertyManager.java
@@ -1,10 +1,11 @@
-package it.unibo.model.api;
+package it.unibo.model.property;
 
 import java.util.List;
 import java.util.Set;
 
 import it.unibo.common.property.PropertyPosition;
 import it.unibo.common.property.PropertyType;
+import it.unibo.model.player.Player;
 
 /**
  * Property manager.

diff --git a/...unibo/model/impl/PropertyManagerImpl.java → ...o/model/property/PropertyManagerImpl.java b/...unibo/model/impl/PropertyManagerImpl.java → ...o/model/property/PropertyManagerImpl.java
@@ -1,4 +1,4 @@
-package it.unibo.model.impl;
+package it.unibo.model.property;
 
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -9,9 +9,7 @@
 
 import it.unibo.common.property.PropertyPosition;
 import it.unibo.common.property.PropertyType;
-import it.unibo.model.api.Player;
-import it.unibo.model.api.Property;
-import it.unibo.model.api.PropertyManager;
+import it.unibo.model.player.Player;
 
 /**
  * Property manager implementation.

diff --git a/...in/java/it/unibo/model/impl/BankImpl.java → ...ava/it/unibo/model/resource/BankImpl.java b/...in/java/it/unibo/model/impl/BankImpl.java → ...ava/it/unibo/model/resource/BankImpl.java
@@ -1,10 +1,9 @@
-package it.unibo.model.impl;
+package it.unibo.model.resource;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import it.unibo.common.tile.ResourceType;
-import it.unibo.model.api.ResourceOwner;
 
 /**
  * Implementation of the bank.

diff --git a/...a/it/unibo/model/api/ResourceManager.java → ...unibo/model/resource/ResourceManager.java b/...a/it/unibo/model/api/ResourceManager.java → ...unibo/model/resource/ResourceManager.java
@@ -1,4 +1,4 @@
-package it.unibo.model.api;
+package it.unibo.model.resource;
 
 import java.util.Map;
 

diff --git a/...unibo/model/impl/ResourceManagerImpl.java → ...o/model/resource/ResourceManagerImpl.java b/...unibo/model/impl/ResourceManagerImpl.java → ...o/model/resource/ResourceManagerImpl.java
@@ -1,14 +1,12 @@
-package it.unibo.model.impl;
+package it.unibo.model.resource;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
 import it.unibo.common.tile.ResourceType;
-import it.unibo.model.api.Player;
-import it.unibo.model.api.ResourceManager;
-import it.unibo.model.api.ResourceOwner;
+import it.unibo.model.player.Player;
 
 /**
  * An implementation of ResourceManager.

diff --git a/...ava/it/unibo/model/api/ResourceOwner.java → ...t/unibo/model/resource/ResourceOwner.java b/...ava/it/unibo/model/api/ResourceOwner.java → ...t/unibo/model/resource/ResourceOwner.java
@@ -1,5 +1,5 @@
 
-package it.unibo.model.api;
+package it.unibo.model.resource;
 
 import java.util.Map;
 

diff --git a/src/main/java/it/unibo/model/api/Road.java → src/main/java/it/unibo/model/road/Road.java b/src/main/java/it/unibo/model/api/Road.java → src/main/java/it/unibo/model/road/Road.java
@@ -1,6 +1,7 @@
-package it.unibo.model.api;
+package it.unibo.model.road;
 
 import it.unibo.common.road.RoadPosition;
+import it.unibo.model.player.Player;
 
 /**
  * Road.

diff --git a/...in/java/it/unibo/model/impl/RoadImpl.java → ...in/java/it/unibo/model/road/RoadImpl.java b/...in/java/it/unibo/model/impl/RoadImpl.java → ...in/java/it/unibo/model/road/RoadImpl.java
@@ -1,8 +1,7 @@
-package it.unibo.model.impl;
+package it.unibo.model.road;
 
 import it.unibo.common.road.RoadPosition;
-import it.unibo.model.api.Player;
-import it.unibo.model.api.Road;
+import it.unibo.model.player.Player;
 
 /**
  * Road implementation.

diff --git a/.../java/it/unibo/model/api/RoadManager.java → ...java/it/unibo/model/road/RoadManager.java b/.../java/it/unibo/model/api/RoadManager.java → ...java/it/unibo/model/road/RoadManager.java
@@ -1,9 +1,10 @@
-package it.unibo.model.api;
+package it.unibo.model.road;
 
 import java.util.Optional;
 import java.util.Set;
 
 import it.unibo.common.road.RoadPosition;
+import it.unibo.model.player.Player;
 
 /**
  * Road manager.

diff --git a/.../it/unibo/model/impl/RoadManagerImpl.java → .../it/unibo/model/road/RoadManagerImpl.java b/.../it/unibo/model/impl/RoadManagerImpl.java → .../it/unibo/model/road/RoadManagerImpl.java
@@ -1,4 +1,4 @@
-package it.unibo.model.impl;
+package it.unibo.model.road;
 
 import java.util.LinkedHashSet;
 import java.util.Optional;
@@ -12,9 +12,7 @@
 
 import it.unibo.common.property.PropertyPosition;
 import it.unibo.common.road.RoadPosition;
-import it.unibo.model.api.Player;
-import it.unibo.model.api.Road;
-import it.unibo.model.api.RoadManager;
+import it.unibo.model.player.Player;
 
 /**
  * Road manager implementation.