From 34e3539f93c73d0bd7df49e4d3856fc4c772e840 Mon Sep 17 00:00:00 2001 From: davi-bart Date: Fri, 16 Feb 2024 14:42:51 +0100 Subject: [PATCH] refactor model package structure --- .../controller/board/BoardControllerImpl.java | 8 +++--- .../controller/main/MainControllerImpl.java | 6 ++--- .../resource/ResourceControllerImpl.java | 4 +-- .../unibo/controller/turn/TurnController.java | 2 +- .../controller/turn/TurnControllerImpl.java | 4 +-- .../it/unibo/model/{api => }/GameManager.java | 8 +++++- .../model/{impl => }/GameManagerImpl.java | 27 ++++++++++++------- .../it/unibo/model/{api => board}/Board.java | 2 +- .../model/{impl => board}/BoardImpl.java | 6 ++--- .../it/unibo/model/{api => board}/Tile.java | 2 +- .../unibo/model/{impl => board}/TileImpl.java | 11 +++++--- .../DevelopmentCards.java | 2 +- .../DevelopmentCardsImpl.java | 3 +-- .../BeginnerGameMapGenerator.java | 6 ++--- .../GameMapGenerator.java | 3 ++- .../RandomGameMapGenerator.java | 6 ++--- .../unibo/model/{api => player}/Player.java | 4 ++- .../model/{impl => player}/PlayerImpl.java | 3 +-- .../model/{api => property}/Property.java | 3 ++- .../{impl => property}/PropertyImpl.java | 5 ++-- .../{api => property}/PropertyManager.java | 3 ++- .../PropertyManagerImpl.java | 6 ++--- .../model/{impl => resource}/BankImpl.java | 3 +-- .../{api => resource}/ResourceManager.java | 2 +- .../ResourceManagerImpl.java | 6 ++--- .../{api => resource}/ResourceOwner.java | 2 +- .../it/unibo/model/{api => road}/Road.java | 3 ++- .../unibo/model/{impl => road}/RoadImpl.java | 5 ++-- .../model/{api => road}/RoadManager.java | 3 ++- .../model/{impl => road}/RoadManagerImpl.java | 6 ++--- .../model/{api => turn}/TurnManager.java | 4 ++- .../model/{impl => turn}/TurnManagerImpl.java | 5 ++-- .../java/it/unibo/model/GameManagerTest.java | 8 +++--- .../it/unibo/model/GameMapGeneratorTest.java | 8 +++--- src/test/java/it/unibo/model/PlayerTest.java | 2 +- .../it/unibo/model/ResourceManagerTest.java | 8 +++--- .../java/it/unibo/model/RoadManagerTest.java | 8 +++--- 37 files changed, 104 insertions(+), 93 deletions(-) rename src/main/java/it/unibo/model/{api => }/GameManager.java (92%) rename src/main/java/it/unibo/model/{impl => }/GameManagerImpl.java (94%) rename src/main/java/it/unibo/model/{api => board}/Board.java (97%) rename src/main/java/it/unibo/model/{impl => board}/BoardImpl.java (92%) rename src/main/java/it/unibo/model/{api => board}/Tile.java (89%) rename src/main/java/it/unibo/model/{impl => board}/TileImpl.java (64%) rename src/main/java/it/unibo/model/{api => developmentcard}/DevelopmentCards.java (87%) rename src/main/java/it/unibo/model/{impl => developmentcard}/DevelopmentCardsImpl.java (95%) rename src/main/java/it/unibo/model/{impl => mapgenerator}/BeginnerGameMapGenerator.java (95%) rename src/main/java/it/unibo/model/{api => mapgenerator}/GameMapGenerator.java (79%) rename src/main/java/it/unibo/model/{impl => mapgenerator}/RandomGameMapGenerator.java (97%) rename src/main/java/it/unibo/model/{api => player}/Player.java (88%) rename src/main/java/it/unibo/model/{impl => player}/PlayerImpl.java (96%) rename src/main/java/it/unibo/model/{api => property}/Property.java (87%) rename src/main/java/it/unibo/model/{impl => property}/PropertyImpl.java (92%) rename src/main/java/it/unibo/model/{api => property}/PropertyManager.java (94%) rename src/main/java/it/unibo/model/{impl => property}/PropertyManagerImpl.java (92%) rename src/main/java/it/unibo/model/{impl => resource}/BankImpl.java (92%) rename src/main/java/it/unibo/model/{api => resource}/ResourceManager.java (99%) rename src/main/java/it/unibo/model/{impl => resource}/ResourceManagerImpl.java (97%) rename src/main/java/it/unibo/model/{api => resource}/ResourceOwner.java (90%) rename src/main/java/it/unibo/model/{api => road}/Road.java (79%) rename src/main/java/it/unibo/model/{impl => road}/RoadImpl.java (87%) rename src/main/java/it/unibo/model/{api => road}/RoadManager.java (94%) rename src/main/java/it/unibo/model/{impl => road}/RoadManagerImpl.java (97%) rename src/main/java/it/unibo/model/{api => turn}/TurnManager.java (91%) rename src/main/java/it/unibo/model/{impl => turn}/TurnManagerImpl.java (95%) diff --git a/src/main/java/it/unibo/controller/board/BoardControllerImpl.java b/src/main/java/it/unibo/controller/board/BoardControllerImpl.java index d73238d..f0c8327 100644 --- 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 index 89b36a4..b61c563 100644 --- 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 index 789f83e..1936f6d 100644 --- 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 index c13a6c6..1a9e678 100644 --- 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 index 0eb7f81..62b598d 100644 --- 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/src/main/java/it/unibo/model/api/GameManager.java b/src/main/java/it/unibo/model/GameManager.java similarity index 92% rename from src/main/java/it/unibo/model/api/GameManager.java rename to src/main/java/it/unibo/model/GameManager.java index 18bfbef..21052e9 100644 --- a/src/main/java/it/unibo/model/api/GameManager.java +++ b/src/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/src/main/java/it/unibo/model/impl/GameManagerImpl.java b/src/main/java/it/unibo/model/GameManagerImpl.java similarity index 94% rename from src/main/java/it/unibo/model/impl/GameManagerImpl.java rename to src/main/java/it/unibo/model/GameManagerImpl.java index de0bc14..e26d90a 100644 --- a/src/main/java/it/unibo/model/impl/GameManagerImpl.java +++ b/src/main/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 b/src/main/java/it/unibo/model/board/Board.java similarity index 97% rename from src/main/java/it/unibo/model/api/Board.java rename to src/main/java/it/unibo/model/board/Board.java index ef68de5..5febe58 100644 --- a/src/main/java/it/unibo/model/api/Board.java +++ b/src/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/src/main/java/it/unibo/model/impl/BoardImpl.java b/src/main/java/it/unibo/model/board/BoardImpl.java similarity index 92% rename from src/main/java/it/unibo/model/impl/BoardImpl.java rename to src/main/java/it/unibo/model/board/BoardImpl.java index 8ab4565..456904a 100644 --- a/src/main/java/it/unibo/model/impl/BoardImpl.java +++ b/src/main/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 b/src/main/java/it/unibo/model/board/Tile.java similarity index 89% rename from src/main/java/it/unibo/model/api/Tile.java rename to src/main/java/it/unibo/model/board/Tile.java index bee14d0..7b26f40 100644 --- a/src/main/java/it/unibo/model/api/Tile.java +++ b/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/src/main/java/it/unibo/model/impl/TileImpl.java b/src/main/java/it/unibo/model/board/TileImpl.java similarity index 64% rename from src/main/java/it/unibo/model/impl/TileImpl.java rename to src/main/java/it/unibo/model/board/TileImpl.java index a418a75..04f92b9 100644 --- a/src/main/java/it/unibo/model/impl/TileImpl.java +++ b/src/main/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/src/main/java/it/unibo/model/api/DevelopmentCards.java b/src/main/java/it/unibo/model/developmentcard/DevelopmentCards.java similarity index 87% rename from src/main/java/it/unibo/model/api/DevelopmentCards.java rename to src/main/java/it/unibo/model/developmentcard/DevelopmentCards.java index b76835b..928eeda 100644 --- a/src/main/java/it/unibo/model/api/DevelopmentCards.java +++ b/src/main/java/it/unibo/model/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/src/main/java/it/unibo/model/impl/DevelopmentCardsImpl.java b/src/main/java/it/unibo/model/developmentcard/DevelopmentCardsImpl.java similarity index 95% rename from src/main/java/it/unibo/model/impl/DevelopmentCardsImpl.java rename to src/main/java/it/unibo/model/developmentcard/DevelopmentCardsImpl.java index 1e23e72..e22697a 100644 --- a/src/main/java/it/unibo/model/impl/DevelopmentCardsImpl.java +++ b/src/main/java/it/unibo/model/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/src/main/java/it/unibo/model/impl/BeginnerGameMapGenerator.java b/src/main/java/it/unibo/model/mapgenerator/BeginnerGameMapGenerator.java similarity index 95% rename from src/main/java/it/unibo/model/impl/BeginnerGameMapGenerator.java rename to src/main/java/it/unibo/model/mapgenerator/BeginnerGameMapGenerator.java index cd8413b..8277184 100644 --- a/src/main/java/it/unibo/model/impl/BeginnerGameMapGenerator.java +++ b/src/main/java/it/unibo/model/mapgenerator/BeginnerGameMapGenerator.java @@ -1,4 +1,4 @@ -package it.unibo.model.impl; +package it.unibo.model.mapgenerator; import java.util.HashMap; import java.util.Map; @@ -6,8 +6,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 the suggested beginner's map set-up, diff --git a/src/main/java/it/unibo/model/api/GameMapGenerator.java b/src/main/java/it/unibo/model/mapgenerator/GameMapGenerator.java similarity index 79% rename from src/main/java/it/unibo/model/api/GameMapGenerator.java rename to src/main/java/it/unibo/model/mapgenerator/GameMapGenerator.java index 03e87af..9f58c43 100644 --- a/src/main/java/it/unibo/model/api/GameMapGenerator.java +++ b/src/main/java/it/unibo/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/src/main/java/it/unibo/model/impl/RandomGameMapGenerator.java b/src/main/java/it/unibo/model/mapgenerator/RandomGameMapGenerator.java similarity index 97% rename from src/main/java/it/unibo/model/impl/RandomGameMapGenerator.java rename to src/main/java/it/unibo/model/mapgenerator/RandomGameMapGenerator.java index eea7ac0..682dd3c 100644 --- a/src/main/java/it/unibo/model/impl/RandomGameMapGenerator.java +++ b/src/main/java/it/unibo/model/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 b/src/main/java/it/unibo/model/player/Player.java similarity index 88% rename from src/main/java/it/unibo/model/api/Player.java rename to src/main/java/it/unibo/model/player/Player.java index 44ff76b..fdb85c9 100644 --- a/src/main/java/it/unibo/model/api/Player.java +++ b/src/main/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/src/main/java/it/unibo/model/impl/PlayerImpl.java b/src/main/java/it/unibo/model/player/PlayerImpl.java similarity index 96% rename from src/main/java/it/unibo/model/impl/PlayerImpl.java rename to src/main/java/it/unibo/model/player/PlayerImpl.java index a86b7a6..2510293 100644 --- a/src/main/java/it/unibo/model/impl/PlayerImpl.java +++ b/src/main/java/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/src/main/java/it/unibo/model/api/Property.java b/src/main/java/it/unibo/model/property/Property.java similarity index 87% rename from src/main/java/it/unibo/model/api/Property.java rename to src/main/java/it/unibo/model/property/Property.java index 47f88cf..2704112 100644 --- a/src/main/java/it/unibo/model/api/Property.java +++ b/src/main/java/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/src/main/java/it/unibo/model/impl/PropertyImpl.java b/src/main/java/it/unibo/model/property/PropertyImpl.java similarity index 92% rename from src/main/java/it/unibo/model/impl/PropertyImpl.java rename to src/main/java/it/unibo/model/property/PropertyImpl.java index 948eb05..25ac78b 100644 --- a/src/main/java/it/unibo/model/impl/PropertyImpl.java +++ b/src/main/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/src/main/java/it/unibo/model/api/PropertyManager.java b/src/main/java/it/unibo/model/property/PropertyManager.java similarity index 94% rename from src/main/java/it/unibo/model/api/PropertyManager.java rename to src/main/java/it/unibo/model/property/PropertyManager.java index d355bf6..6d13b00 100644 --- a/src/main/java/it/unibo/model/api/PropertyManager.java +++ b/src/main/java/it/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/src/main/java/it/unibo/model/impl/PropertyManagerImpl.java b/src/main/java/it/unibo/model/property/PropertyManagerImpl.java similarity index 92% rename from src/main/java/it/unibo/model/impl/PropertyManagerImpl.java rename to src/main/java/it/unibo/model/property/PropertyManagerImpl.java index 2d57fc4..d0a5687 100644 --- a/src/main/java/it/unibo/model/impl/PropertyManagerImpl.java +++ b/src/main/java/it/unibo/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/src/main/java/it/unibo/model/impl/BankImpl.java b/src/main/java/it/unibo/model/resource/BankImpl.java similarity index 92% rename from src/main/java/it/unibo/model/impl/BankImpl.java rename to src/main/java/it/unibo/model/resource/BankImpl.java index cd4058c..d154a92 100644 --- a/src/main/java/it/unibo/model/impl/BankImpl.java +++ b/src/main/java/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/src/main/java/it/unibo/model/api/ResourceManager.java b/src/main/java/it/unibo/model/resource/ResourceManager.java similarity index 99% rename from src/main/java/it/unibo/model/api/ResourceManager.java rename to src/main/java/it/unibo/model/resource/ResourceManager.java index 881bb44..5ebc7ac 100644 --- a/src/main/java/it/unibo/model/api/ResourceManager.java +++ b/src/main/java/it/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/src/main/java/it/unibo/model/impl/ResourceManagerImpl.java b/src/main/java/it/unibo/model/resource/ResourceManagerImpl.java similarity index 97% rename from src/main/java/it/unibo/model/impl/ResourceManagerImpl.java rename to src/main/java/it/unibo/model/resource/ResourceManagerImpl.java index db2b878..f8be988 100644 --- a/src/main/java/it/unibo/model/impl/ResourceManagerImpl.java +++ b/src/main/java/it/unibo/model/resource/ResourceManagerImpl.java @@ -1,4 +1,4 @@ -package it.unibo.model.impl; +package it.unibo.model.resource; import java.util.HashMap; import java.util.List; @@ -6,9 +6,7 @@ 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/src/main/java/it/unibo/model/api/ResourceOwner.java b/src/main/java/it/unibo/model/resource/ResourceOwner.java similarity index 90% rename from src/main/java/it/unibo/model/api/ResourceOwner.java rename to src/main/java/it/unibo/model/resource/ResourceOwner.java index 6388f53..9522304 100644 --- a/src/main/java/it/unibo/model/api/ResourceOwner.java +++ b/src/main/java/it/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 b/src/main/java/it/unibo/model/road/Road.java similarity index 79% rename from src/main/java/it/unibo/model/api/Road.java rename to src/main/java/it/unibo/model/road/Road.java index 92ca83d..9e5f837 100644 --- a/src/main/java/it/unibo/model/api/Road.java +++ b/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/src/main/java/it/unibo/model/impl/RoadImpl.java b/src/main/java/it/unibo/model/road/RoadImpl.java similarity index 87% rename from src/main/java/it/unibo/model/impl/RoadImpl.java rename to src/main/java/it/unibo/model/road/RoadImpl.java index b2538c0..6dbfe5a 100644 --- a/src/main/java/it/unibo/model/impl/RoadImpl.java +++ b/src/main/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/src/main/java/it/unibo/model/api/RoadManager.java b/src/main/java/it/unibo/model/road/RoadManager.java similarity index 94% rename from src/main/java/it/unibo/model/api/RoadManager.java rename to src/main/java/it/unibo/model/road/RoadManager.java index d486b05..7169913 100644 --- a/src/main/java/it/unibo/model/api/RoadManager.java +++ b/src/main/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/src/main/java/it/unibo/model/impl/RoadManagerImpl.java b/src/main/java/it/unibo/model/road/RoadManagerImpl.java similarity index 97% rename from src/main/java/it/unibo/model/impl/RoadManagerImpl.java rename to src/main/java/it/unibo/model/road/RoadManagerImpl.java index 8208533..2aced9d 100644 --- a/src/main/java/it/unibo/model/impl/RoadManagerImpl.java +++ b/src/main/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. diff --git a/src/main/java/it/unibo/model/api/TurnManager.java b/src/main/java/it/unibo/model/turn/TurnManager.java similarity index 91% rename from src/main/java/it/unibo/model/api/TurnManager.java rename to src/main/java/it/unibo/model/turn/TurnManager.java index 968caca..1d92446 100644 --- a/src/main/java/it/unibo/model/api/TurnManager.java +++ b/src/main/java/it/unibo/model/turn/TurnManager.java @@ -1,7 +1,9 @@ -package it.unibo.model.api; +package it.unibo.model.turn; import org.apache.commons.lang3.tuple.Pair; +import it.unibo.model.player.Player; + /** * interface of TurnManager. */ diff --git a/src/main/java/it/unibo/model/impl/TurnManagerImpl.java b/src/main/java/it/unibo/model/turn/TurnManagerImpl.java similarity index 95% rename from src/main/java/it/unibo/model/impl/TurnManagerImpl.java rename to src/main/java/it/unibo/model/turn/TurnManagerImpl.java index a237270..f7818da 100644 --- a/src/main/java/it/unibo/model/impl/TurnManagerImpl.java +++ b/src/main/java/it/unibo/model/turn/TurnManagerImpl.java @@ -1,4 +1,4 @@ -package it.unibo.model.impl; +package it.unibo.model.turn; import java.util.ArrayList; import java.util.Collections; @@ -7,8 +7,7 @@ import java.util.Random; import java.util.stream.Stream; -import it.unibo.model.api.Player; -import it.unibo.model.api.TurnManager; +import it.unibo.model.player.Player; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/test/java/it/unibo/model/GameManagerTest.java b/src/test/java/it/unibo/model/GameManagerTest.java index 3c4b34b..06be9e8 100644 --- a/src/test/java/it/unibo/model/GameManagerTest.java +++ b/src/test/java/it/unibo/model/GameManagerTest.java @@ -20,11 +20,9 @@ import it.unibo.common.tile.TerrainType; import it.unibo.common.tile.TilePosition; import it.unibo.common.tile.TilePositionImpl; -import it.unibo.model.api.GameManager; -import it.unibo.model.api.Player; -import it.unibo.model.impl.BeginnerGameMapGenerator; -import it.unibo.model.impl.GameManagerImpl; -import it.unibo.model.impl.PlayerImpl; +import it.unibo.model.mapgenerator.BeginnerGameMapGenerator; +import it.unibo.model.player.Player; +import it.unibo.model.player.PlayerImpl; public class GameManagerTest { diff --git a/src/test/java/it/unibo/model/GameMapGeneratorTest.java b/src/test/java/it/unibo/model/GameMapGeneratorTest.java index db0645d..626430b 100644 --- a/src/test/java/it/unibo/model/GameMapGeneratorTest.java +++ b/src/test/java/it/unibo/model/GameMapGeneratorTest.java @@ -11,10 +11,10 @@ import it.unibo.common.tile.TerrainType; import it.unibo.common.tile.TilePosition; -import it.unibo.model.api.Board; -import it.unibo.model.impl.BeginnerGameMapGenerator; -import it.unibo.model.impl.BoardImpl; -import it.unibo.model.impl.RandomGameMapGenerator; +import it.unibo.model.board.Board; +import it.unibo.model.board.BoardImpl; +import it.unibo.model.mapgenerator.BeginnerGameMapGenerator; +import it.unibo.model.mapgenerator.RandomGameMapGenerator; /** * Test for a trader istance. diff --git a/src/test/java/it/unibo/model/PlayerTest.java b/src/test/java/it/unibo/model/PlayerTest.java index 6fef883..4866fdf 100644 --- a/src/test/java/it/unibo/model/PlayerTest.java +++ b/src/test/java/it/unibo/model/PlayerTest.java @@ -2,7 +2,7 @@ import org.junit.jupiter.api.Test; -import it.unibo.model.impl.PlayerImpl; +import it.unibo.model.player.PlayerImpl; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/it/unibo/model/ResourceManagerTest.java b/src/test/java/it/unibo/model/ResourceManagerTest.java index 38cfdc6..af8c423 100644 --- a/src/test/java/it/unibo/model/ResourceManagerTest.java +++ b/src/test/java/it/unibo/model/ResourceManagerTest.java @@ -11,10 +11,10 @@ import org.junit.jupiter.api.Test; import it.unibo.common.tile.ResourceType; -import it.unibo.model.api.Player; -import it.unibo.model.api.ResourceManager; -import it.unibo.model.impl.PlayerImpl; -import it.unibo.model.impl.ResourceManagerImpl; +import it.unibo.model.player.Player; +import it.unibo.model.player.PlayerImpl; +import it.unibo.model.resource.ResourceManager; +import it.unibo.model.resource.ResourceManagerImpl; // CHECKSTYLE: MagicNumber OFF /** diff --git a/src/test/java/it/unibo/model/RoadManagerTest.java b/src/test/java/it/unibo/model/RoadManagerTest.java index ef3fdd3..9c283dc 100644 --- a/src/test/java/it/unibo/model/RoadManagerTest.java +++ b/src/test/java/it/unibo/model/RoadManagerTest.java @@ -11,10 +11,10 @@ import it.unibo.common.road.RoadDirection; import it.unibo.common.road.RoadPositionImpl; import it.unibo.common.tile.TilePositionImpl; -import it.unibo.model.api.Player; -import it.unibo.model.api.RoadManager; -import it.unibo.model.impl.PlayerImpl; -import it.unibo.model.impl.RoadManagerImpl; +import it.unibo.model.player.Player; +import it.unibo.model.player.PlayerImpl; +import it.unibo.model.road.RoadManager; +import it.unibo.model.road.RoadManagerImpl; class RoadManagerTest {