From 65738ce18386d42050e1f4b800df4b1fc555f936 Mon Sep 17 00:00:00 2001 From: davi-bart Date: Fri, 16 Feb 2024 14:56:27 +0100 Subject: [PATCH] fix typos --- .../resource/ResourceController.java | 46 +++++++++---------- .../controller/turn/TurnControllerImpl.java | 2 +- .../unibo/model/resource/ResourceManager.java | 20 ++++---- .../unibo/model/resource/ResourceOwner.java | 4 +- 4 files changed, 37 insertions(+), 35 deletions(-) diff --git a/src/main/java/it/unibo/controller/resource/ResourceController.java b/src/main/java/it/unibo/controller/resource/ResourceController.java index 26cf469..2c533c9 100644 --- a/src/main/java/it/unibo/controller/resource/ResourceController.java +++ b/src/main/java/it/unibo/controller/resource/ResourceController.java @@ -31,14 +31,14 @@ public interface ResourceController { /** * Modify the resources of the players into the trade. * - * @param proposer is the player that propose the trade - * @param accepter is the player that accept the trade - * @param proposedResouces are the resources that the proposer give to the - * accepter - * @param wantedResources are the resources that the accepter give to the - * proposer + * @param proposer is the player that propose the trade + * @param accepter is the player that accept the trade + * @param proposedResources are the resources that the proposer give to the + * accepter + * @param wantedResources are the resources that the accepter give to the + * proposer */ - void tradeWithPlayer(String proposer, String accepter, Map proposedResouces, + void tradeWithPlayer(String proposer, String accepter, Map proposedResources, Map wantedResources); /** @@ -69,29 +69,29 @@ void tradeWithBank(String proposer, Map proposedResources /** * - * @param proposer is the player that propose the trade - * @param accepter is the player that accept the trade - * @param proposedResouces are the resources that the proposer give to the - * accepter - * @param wantedResources are the resources that the accepter give to the - * proposer - * @return wheter the two player involved in the trade have the resources. + * @param proposer is the player that propose the trade + * @param accepter is the player that accept the trade + * @param proposedResources are the resources that the proposer give to the + * accepter + * @param wantedResources are the resources that the accepter give to the + * proposer + * @return whether the two player involved in the trade have the resources. */ boolean canTradeWithPlayer(String proposer, String accepter, - Map proposedResouces, + Map proposedResources, Map wantedResources); /*** * - * @param proposer is the player that propose the trade - * @param proposedResouces are the resources that the proposer want to give to - * the - * bank - * @param wantedResources are the resources that the bank want to give to the - * proposer - * @return wheter the proposer and the bank have the resources. + * @param proposer is the player that propose the trade + * @param proposedResources are the resources that the proposer want to give to + * the + * bank + * @param wantedResources are the resources that the bank want to give to the + * proposer + * @return whether the proposer and the bank have the resources. */ - boolean canTradeWithBank(String proposer, Map proposedResouces, + boolean canTradeWithBank(String proposer, Map proposedResources, Map wantedResources); /** diff --git a/src/main/java/it/unibo/controller/turn/TurnControllerImpl.java b/src/main/java/it/unibo/controller/turn/TurnControllerImpl.java index 927fe3e..177e44f 100644 --- a/src/main/java/it/unibo/controller/turn/TurnControllerImpl.java +++ b/src/main/java/it/unibo/controller/turn/TurnControllerImpl.java @@ -13,7 +13,7 @@ public final class TurnControllerImpl implements TurnController { private final TurnManager turnManager; /** - * Constructori of TurnControllerImpl. + * Constructor of TurnControllerImpl. * * @param turnManager */ diff --git a/src/main/java/it/unibo/model/resource/ResourceManager.java b/src/main/java/it/unibo/model/resource/ResourceManager.java index 5ebc7ac..ee2f10a 100644 --- a/src/main/java/it/unibo/model/resource/ResourceManager.java +++ b/src/main/java/it/unibo/model/resource/ResourceManager.java @@ -47,14 +47,14 @@ public interface ResourceManager { /** * Modify the resources of the owners into the trade. * - * @param proposer is the owner that propose the trade - * @param accepter is the owner that accept the trade - * @param proposedResouces are the resources that the proposer give to the - * accepter - * @param wantedResources are the resources that the accepter give to the - * proposer + * @param proposer is the owner that propose the trade + * @param accepter is the owner that accept the trade + * @param proposedResources are the resources that the proposer give to the + * accepter + * @param wantedResources are the resources that the accepter give to the + * proposer */ - void trade(ResourceOwner proposer, ResourceOwner accepter, Map proposedResouces, + void trade(ResourceOwner proposer, ResourceOwner accepter, Map proposedResources, Map wantedResources); /** @@ -83,12 +83,12 @@ void trade(ResourceOwner proposer, ResourceOwner accepter, Map proposedResouces, + boolean canTrade(ResourceOwner proposer, ResourceOwner accepter, Map proposedResources, Map wantedResources); /*** @@ -109,7 +109,7 @@ boolean canTrade(ResourceOwner proposer, ResourceOwner accepter, Map getDefaultResources(); }