changed project heirarchy

src/main/java/controller/Controller.java

@@ -13,8 +13,8 @@ import javafx.scene.control.ToggleGroup;
 import javafx.util.Duration;
 import javafx.util.Pair;
 import model.Board;
-import model.ModelElement;
-import model.FFBoard;
+import model.firefighter.ModelElement;
+import model.firefighter.FFBoard;
 import util.Position;
 import view.Grid;
 import view.ViewElement;

src/main/java/model/BoardData.java

 package model;
 
+import model.firefighter.Cell;
 import util.Position;
 
 import java.util.List;

src/main/java/model/Element.java

 package model;
 
+import model.firefighter.ModelElement;
 import util.Position;
 
 public interface Element {

src/main/java/model/ChargeTarget.java → src/main/java/model/elementTokens/ChargeTarget.java

-package model;
+package model.elementTokens;
 
 public interface ChargeTarget {
     public int getCounter();

src/main/java/model/ConnexElement.java → src/main/java/model/elementTokens/ConnexElement.java

-package model;
+package model.elementTokens;
+
+import model.Element;
+import model.ElementFactory;
 
 public interface ConnexElement extends Element {
     public ElementFactory getFactory();

src/main/java/model/Printable.java → src/main/java/model/elementTokens/Printable.java

-package model;
+package model.elementTokens;
 
 import util.Position;
 

src/main/java/model/Updatable.java → src/main/java/model/elementTokens/Updatable.java

-package model;
+package model.elementTokens;
 
+import model.BoardData;
 import util.Position;
 
 import java.util.List;

src/main/java/model/ZoneDependent.java → src/main/java/model/elementTokens/ZoneDependent.java

-package model;
+package model.elementTokens;
 
+import model.ElementFactory;
 import util.Position;
 
 import java.util.List;

src/main/java/model/Cell.java → src/main/java/model/firefighter/Cell.java

-package model;
+package model.firefighter;
 
 import util.Position;
 
@@ -6,8 +6,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class Cell <E>{
-    List<E> Content;
-    Position position;
+    public List<E> Content;
+    public Position position;
 
     public Cell(Position position) {
         this.position=position;

src/main/java/model/FFBehavior.java → src/main/java/model/firefighter/FFBehavior.java

-package model;
+package model.firefighter;
 
+import model.Behavior;
+import model.Element;
 import util.Position;
 
 import java.util.ArrayList;

src/main/java/model/FFBoard.java → src/main/java/model/firefighter/FFBoard.java

-package model;
+package model.firefighter;
 
+import model.Board;
+import model.BoardData;
+import model.Element;
 import util.Position;
-import util.TargetStrategy;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 
 

src/main/java/model/FFBoardData.java → src/main/java/model/firefighter/FFBoardData.java

-package model;
+package model.firefighter;
 
+import model.BoardData;
+import model.Element;
+import model.genericBehavior.TangibleBehavior;
 import util.Position;
 
 import java.util.*;

src/main/java/model/FFUpdater.java → src/main/java/model/firefighter/FFUpdater.java

-package model;
+package model.firefighter;
 
+import model.BoardData;
+import model.Element;
+import model.elementTokens.Updatable;
+import model.Updater;
 import util.Position;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 public class FFUpdater implements Updater {

src/main/java/model/FFboardFiller.java → src/main/java/model/firefighter/FFboardFiller.java

-package model;
+package model.firefighter;
 
+import model.BoardData;
+import model.elementTokens.ConnexElement;
+import model.Element;
 import util.Position;
 import view.ViewElement;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
-import java.util.Set;
 
 public class FFboardFiller {
     Random random=new Random();
@@ -25,7 +25,7 @@ public class FFboardFiller {
                 }while (!boardData.addElement(element));
                 if (element instanceof ConnexElement) {
                     positions.removeAll(boardData.getElements().get(element.getType().ordinal()).stream().map(x ->x.getPosition()).toList());
-                    System.out.println("0");}
+                }
                 positions.remove(p);
                 counter[ve.ordinal()]--;
             }

src/main/java/model/ModelElement.java → src/main/java/model/firefighter/ModelElement.java

-package model;
+package model.firefighter;
 
+import model.Element;
+import model.elementTokens.Printable;
+import model.elementTokens.Updatable;
+import model.firefighter.elements.*;
 import util.Position;
 
 import java.lang.reflect.InvocationTargetException;

src/main/java/model/CloudBehavior.java → src/main/java/model/firefighter/behaviors/CloudBehavior.java

-package model;
+package model.firefighter.behaviors;
 
 import model.BoardData;
-import model.FFBehavior;
-import model.ModelElement;
-import model.RemoverBehavior;
+import model.Element;
+import model.genericBehavior.RemoverBehavior;
+import model.firefighter.FFBehavior;
+import model.firefighter.ModelElement;
+import model.firefighter.elements.Fire;
 import util.Position;
 
 import java.util.*;

src/main/java/model/FireBehavior.java → src/main/java/model/firefighter/behaviors/FireBehavior.java

-package model;
+package model.firefighter.behaviors;
 
+import model.*;
+import model.elementTokens.ChargeTarget;
+import model.firefighter.FFBehavior;
+import model.firefighter.ModelElement;
+import model.firefighter.elements.Fire;
+import model.genericBehavior.ChargerBehavior;
+import model.genericBehavior.TangibleBehavior;
 import util.Position;
 
 import java.util.ArrayList;

src/main/java/model/FireFighterBehavior.java → src/main/java/model/firefighter/behaviors/FireFighterBehavior.java

-package model;
+package model.firefighter.behaviors;
 
+import model.*;
+import model.elementTokens.ChargeTarget;
+import model.firefighter.FFBehavior;
+import model.firefighter.ModelElement;
+import model.firefighter.elements.Fire;
+import model.firefighter.elements.FireFighter;
+import model.genericBehavior.ChargerBehavior;
+import model.genericBehavior.RemoverBehavior;
+import model.genericBehavior.TangibleBehavior;
 import util.Position;
 import util.TargetStrategy;
 import java.util.*;

src/main/java/model/RockBehavior.java → src/main/java/model/firefighter/behaviors/RockBehavior.java

-package model;
+package model.firefighter.behaviors;
 
+import model.Behavior;
+import model.BoardData;
+import model.elementTokens.ChargeTarget;
+import model.Element;
+import model.firefighter.elements.Fire;
 import util.Position;
 
 import java.util.List;

src/main/java/model/Cloud.java → src/main/java/model/firefighter/elements/Cloud.java

-package model;
+package model.firefighter.elements;
 
+import model.*;
+import model.elementTokens.Printable;
+import model.elementTokens.Updatable;
+import model.firefighter.behaviors.CloudBehavior;
+import model.firefighter.ModelElement;
 import util.Position;
 
 import java.util.ArrayList;