removed usless initialization

davi-bart · Feb 16, 2024 · 5e8034e · 5e8034e
1 parent 7d574dc
commit 5e8034e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/src/main/java/it/unibo/model/resource/ResourceManagerImpl.java b/src/main/java/it/unibo/model/resource/ResourceManagerImpl.java
@@ -96,11 +96,6 @@ public Map<ResourceType, Integer> getResources(final ResourceOwner owner) {
     public boolean canTrade(final ResourceOwner proposer, final ResourceOwner accepter,
             final Map<ResourceType, Integer> proposedResources,
             final Map<ResourceType, Integer> wantedResources) {
-        /**
-         * 
-         */
-        initializeResourceMap(proposedResources);
-        initializeResourceMap(wantedResources);
         if (proposedResources.values().stream().allMatch(amount -> amount == 0)
                 && wantedResources.values().stream().allMatch(amount -> amount == 0)) {
             return false;
@@ -117,10 +112,6 @@ public boolean canTrade(final ResourceOwner proposer, final ResourceOwner accept
                 || wantedResources.values().stream().allMatch(amount -> amount == 0));
     }
 
-    private void initializeResourceMap(final Map<ResourceType, Integer> map) {
-        List.of(ResourceType.values()).forEach(resource -> map.putIfAbsent(resource, 0));
-    }
-
     @Override
     public int getAmountToDiscard(final ResourceOwner player) {
         int amount = getResourcesAmount(player);
@@ -145,7 +136,8 @@ public boolean shouldDiscard(final ResourceOwner player) {
     }
 
     /**
-     * Bank.
+     * Bank. 
+     * 
      */
     private final class Bank implements ResourceOwner {
 

diff --git a/src/main/java/it/unibo/view/board/RobberView.java b/src/main/java/it/unibo/view/board/RobberView.java
@@ -1,7 +1,6 @@
 package it.unibo.view.board;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
 
@@ -59,7 +58,6 @@ private void showDiscardStage(final String player) {
         final HBox discardResourcesBox = new HBox();
         final Button confirm = new Button("Confirm");
         final Map<ResourceType, Integer> discardResources = new HashMap<>();
-        List.of(ResourceType.values()).forEach(resource -> discardResources.put(resource, 0));
 
         final Runnable reloadConfirmButton = () -> {
             confirm.setDisable(!controller.getResourceController().canDiscard(player, discardResources));

diff --git a/src/main/java/it/unibo/view/resource/TradeView.java b/src/main/java/it/unibo/view/resource/TradeView.java
@@ -1,8 +1,7 @@
 package it.unibo.view.resource;
 
 import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+    import java.util.Map;
 import java.util.stream.Stream;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -62,9 +61,7 @@ private void showTradeStage() {
         final HBox wantedResourcesBox = new HBox();
 
         final Map<ResourceType, Integer> wantedResources = new HashMap<>();
-        List.of(ResourceType.values()).forEach(resource -> wantedResources.put(resource, 0));
         final Map<ResourceType, Integer> proposedResources = new HashMap<>();
-        List.of(ResourceType.values()).forEach(resource -> proposedResources.put(resource, 0));
         final Map<Button, Runnable> buttonToAction = new HashMap<>();
         final Runnable reloadBankTradeButton = getBankTradeButtonAction(tradeBank, proposedResources, wantedResources);
         final Map<String, Button> playerToButton = new HashMap<>();