From 55d7f86388a17a33150fe80f70e86f6b88dd3b69 Mon Sep 17 00:00:00 2001 From: Sarah CHERCHEM <ls_cherchem@esi.dz> Date: Sun, 17 Nov 2024 19:36:10 +0100 Subject: [PATCH] Create the interface BoardProperties --- src/main/java/model/BoardProperties.java | 4 ++++ src/main/java/model/FirefighterBoard.java | 2 +- src/main/java/util/TargetStrategy.java | 6 +++--- src/main/resources/view/view.fxml | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 src/main/java/model/BoardProperties.java diff --git a/src/main/java/model/BoardProperties.java b/src/main/java/model/BoardProperties.java new file mode 100644 index 0000000..a699ee1 --- /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 c0bd67c..6398ec5 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 5831867..5e2e743 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 336ffa3..2297527 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"/> -- GitLab