diff --git a/src/main/java/model/BoardProperties.java b/src/main/java/model/BoardProperties.java new file mode 100644 index 0000000000000000000000000000000000000000..a699ee1250c692af090a4f8c9338b8e3c13f1959 --- /dev/null +++ b/src/main/java/model/BoardProperties.java @@ -0,0 +1,4 @@ +package model; + +public interface BoardProperties { +} diff --git a/src/main/java/model/FirefighterBoard.java b/src/main/java/model/FirefighterBoard.java index c0bd67cc4f444a33c41551779b11f3d619412bef..6398ec5a134240db249c4a0bc3adb5237dc73e6d 100644 --- a/src/main/java/model/FirefighterBoard.java +++ b/src/main/java/model/FirefighterBoard.java @@ -1,6 +1,6 @@ package model; - import util.Position; +import util.TargetStrategy; import java.util.*; diff --git a/src/main/java/util/TargetStrategy.java b/src/main/java/util/TargetStrategy.java index 583186787d4d8d47173fbe61cc424f2f7ee384c9..5e2e743affb2795efbf641942452fe0339d5bce9 100644 --- a/src/main/java/util/TargetStrategy.java +++ b/src/main/java/util/TargetStrategy.java @@ -1,4 +1,4 @@ -package model; +package util; import util.Position; @@ -12,8 +12,8 @@ public class TargetStrategy { * @param targets positions that are targeted. * @return the position next to the current position that is on the path to the closest target. */ - Position neighborClosestToFire(Position position, Collection<Position> targets, - Map<Position,List<Position>>neighbors) { + public Position neighborClosestToFire(Position position, Collection<Position> targets, + Map<Position, List<Position>> neighbors) { Set<Position> seen = new HashSet<Position>(); HashMap<Position, Position> firstMove = new HashMap<Position, Position>(); Queue<Position> toVisit = new LinkedList<Position>(neighbors.get(position)); diff --git a/src/main/resources/view/view.fxml b/src/main/resources/view/view.fxml index 336ffa315645baacbe25bf59171d2ff6d867b9c5..2297527af5cf3d4f9cf030c2442da531aea86155 100644 --- a/src/main/resources/view/view.fxml +++ b/src/main/resources/view/view.fxml @@ -10,7 +10,7 @@ <?import javafx.scene.control.Label?> <HBox styleClass="background" stylesheets="@DarkTheme.css" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" - fx:controller="controller.Controller"> + fx:controller="controller.Controller" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"> <VBox> <Separator maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="24.0" prefWidth="200.0"/>