From ad1227ac983207458257313505888e3d5b59b2e6 Mon Sep 17 00:00:00 2001
From: schrom01 <schrom01@students.zhaw.ch>
Date: Wed, 24 Nov 2021 17:03:55 +0100
Subject: [PATCH] completed method getFieldsForDiceValue in SiedlerBoard

---
 .../ch/zhaw/catan/SiedlerBoard.class          | Bin 1000 -> 5398 bytes
 .../ch/zhaw/catan/SiedlerBoardTextView.class  | Bin 681 -> 681 bytes
 src/ch/zhaw/catan/SiedlerBoard.java           |  33 +++++++++++++-----
 src/ch/zhaw/catan/SiedlerBoardTextView.java   |   3 ++
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoard.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoard.class
index d79c503c161dd5f21baa4c38c86a0701231694be..ae45f03e38f43bebf7762b40714443a82423af0a 100644
GIT binary patch
literal 5398
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
S{)E5mi_otXJMh;)>Hh$IBp)OI

delta 389
zcma)%O-jR16otQ6+oX9-wQ8(M{f+gHPBLu~u?uh@2<kKgDHW+uq7F-!AP-!JjuZ!i
zQ+LoExC-$m70J-aIrnnU`5y1F^=0eN@3(j0ko^bUu4>9SHrl0vYc8ygWizX2m~pvb
zCf1obcRJcR?e_+8ayz^<6X)8i9bd(FaTMPt(aBAJkQ^wEjITq}(;vlcMPSA%5YDc`
zlhHHXiajEvN<kim85AWf(K*>7aV1`Ay`Y|DC{Pnk&!CwXb*BLqSd>kuEJ-RYw`EJA
z#aHYn@qE|My7lRO^jnrFb(W>(XYoL$1}p!-HS@R}ZI!h@+PeI0%H3cy<A-dCYaB(B
I9rn7x58O~GC;$Ke

diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoardTextView.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoardTextView.class
index c8c8e588f43d23ab1535485a4b31a2a0974ddf68..fd38f027ff1bd27d5b16552c99dd8824201047dd 100644
GIT binary patch
delta 17
YcmZ3<x{`H68WSrI11kgX<ZLE804Qby)&Kwi

delta 17
YcmZ3<x{`H68WSrg11kg9<ZLE804O{I&;S4c

diff --git a/src/ch/zhaw/catan/SiedlerBoard.java b/src/ch/zhaw/catan/SiedlerBoard.java
index aca0679..06119e9 100644
--- a/src/ch/zhaw/catan/SiedlerBoard.java
+++ b/src/ch/zhaw/catan/SiedlerBoard.java
@@ -5,10 +5,8 @@ import ch.zhaw.hexboard.HexBoard;
 import ch.zhaw.hexboard.Label;
 
 import java.awt.*;
-import java.util.Collections;
-import java.util.HashMap;
+import java.util.*;
 import java.util.List;
-import java.util.Map;
 
 public class SiedlerBoard extends HexBoard<Land, String, String, String> {
 
@@ -35,6 +33,21 @@ public class SiedlerBoard extends HexBoard<Land, String, String, String> {
 
     }
 
+
+    private int getDiceNumber(Point field) {
+        Label label = lowerFieldLabel.get(field);
+        return Integer.parseInt(label.toString());
+    }
+
+
+    public SiedlerBoardTextView getTextView () {
+        SiedlerBoardTextView view = new SiedlerBoardTextView(this);
+        for (Map.Entry<Point, Label> e : lowerFieldLabel.entrySet()) {
+            view.setLowerFieldLabel(e.getKey(), e.getValue());
+        }
+        return view;
+    }
+
     private void placeFieldWithoutLabel(Land fieldType, Integer[][] fieldCoordinates) {
         for(Integer[] coordinates : fieldCoordinates) {
             addField(new Point(coordinates[0], coordinates[1]), fieldType);
@@ -53,14 +66,10 @@ public class SiedlerBoard extends HexBoard<Land, String, String, String> {
     }
 
 
-
-
-
-
-
     //TODO: Add fields, constructors and methods as you see fit. Do NOT change the signature
     //      of the methods below.
 
+
     /**
      * Returns the fields associated with the specified dice value.
      *
@@ -69,7 +78,13 @@ public class SiedlerBoard extends HexBoard<Land, String, String, String> {
      */
     public List<Point> getFieldsForDiceValue(int dice) {
         //TODO: Implement.
-        return Collections.emptyList();
+        ArrayList<Point> fields = new ArrayList<>();
+        for(Point field : lowerFieldLabel.keySet()){
+            if(getDiceNumber(field) == dice){
+               fields.add(field);
+            }
+        }
+        return fields;
     }
 
     /**
diff --git a/src/ch/zhaw/catan/SiedlerBoardTextView.java b/src/ch/zhaw/catan/SiedlerBoardTextView.java
index d8e3206..68836b1 100644
--- a/src/ch/zhaw/catan/SiedlerBoardTextView.java
+++ b/src/ch/zhaw/catan/SiedlerBoardTextView.java
@@ -2,6 +2,9 @@ package ch.zhaw.catan;
 
 import ch.zhaw.catan.Config.Land;
 import ch.zhaw.hexboard.HexBoardTextView;
+import ch.zhaw.hexboard.Label;
+
+import java.awt.*;
 
 public class SiedlerBoardTextView extends HexBoardTextView<Land, String, String, String> {