Skip to content
Snippets Groups Projects
Commit 0b6499fe authored by BACHTARZI Imed eddine's avatar BACHTARZI Imed eddine
Browse files

changed project heirarchy

parent aecf9ee3
No related branches found
No related tags found
No related merge requests found
Pipeline #41871 failed
Showing
with 88 additions and 40 deletions
...@@ -13,8 +13,8 @@ import javafx.scene.control.ToggleGroup; ...@@ -13,8 +13,8 @@ import javafx.scene.control.ToggleGroup;
import javafx.util.Duration; import javafx.util.Duration;
import javafx.util.Pair; import javafx.util.Pair;
import model.Board; import model.Board;
import model.ModelElement; import model.firefighter.ModelElement;
import model.FFBoard; import model.firefighter.FFBoard;
import util.Position; import util.Position;
import view.Grid; import view.Grid;
import view.ViewElement; import view.ViewElement;
......
package model; package model;
import model.firefighter.Cell;
import util.Position; import util.Position;
import java.util.List; import java.util.List;
......
package model; package model;
import model.firefighter.ModelElement;
import util.Position; import util.Position;
public interface Element { public interface Element {
......
package model; package model.elementTokens;
public interface ChargeTarget { public interface ChargeTarget {
public int getCounter(); public int getCounter();
......
package model; package model.elementTokens;
import model.Element;
import model.ElementFactory;
public interface ConnexElement extends Element { public interface ConnexElement extends Element {
public ElementFactory getFactory(); public ElementFactory getFactory();
......
package model; package model.elementTokens;
import util.Position; import util.Position;
......
package model; package model.elementTokens;
import model.BoardData;
import util.Position; import util.Position;
import java.util.List; import java.util.List;
......
package model; package model.elementTokens;
import model.ElementFactory;
import util.Position; import util.Position;
import java.util.List; import java.util.List;
......
package model; package model.firefighter;
import util.Position; import util.Position;
...@@ -6,8 +6,8 @@ import java.util.ArrayList; ...@@ -6,8 +6,8 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class Cell <E>{ public class Cell <E>{
List<E> Content; public List<E> Content;
Position position; public Position position;
public Cell(Position position) { public Cell(Position position) {
this.position=position; this.position=position;
......
package model; package model.firefighter;
import model.Behavior;
import model.Element;
import util.Position; import util.Position;
import java.util.ArrayList; import java.util.ArrayList;
......
package model; package model.firefighter;
import model.Board;
import model.BoardData;
import model.Element;
import util.Position; import util.Position;
import util.TargetStrategy;
import java.lang.reflect.InvocationTargetException;
import java.util.*; import java.util.*;
......
package model; package model.firefighter;
import model.BoardData;
import model.Element;
import model.genericBehavior.TangibleBehavior;
import util.Position; import util.Position;
import java.util.*; import java.util.*;
......
package model; package model.firefighter;
import model.BoardData;
import model.Element;
import model.elementTokens.Updatable;
import model.Updater;
import util.Position; import util.Position;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
public class FFUpdater implements Updater { public class FFUpdater implements Updater {
......
package model; package model.firefighter;
import model.BoardData;
import model.elementTokens.ConnexElement;
import model.Element;
import util.Position; import util.Position;
import view.ViewElement; import view.ViewElement;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Modifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import java.util.Set;
public class FFboardFiller { public class FFboardFiller {
Random random=new Random(); Random random=new Random();
...@@ -25,7 +25,7 @@ public class FFboardFiller { ...@@ -25,7 +25,7 @@ public class FFboardFiller {
}while (!boardData.addElement(element)); }while (!boardData.addElement(element));
if (element instanceof ConnexElement) { if (element instanceof ConnexElement) {
positions.removeAll(boardData.getElements().get(element.getType().ordinal()).stream().map(x ->x.getPosition()).toList()); positions.removeAll(boardData.getElements().get(element.getType().ordinal()).stream().map(x ->x.getPosition()).toList());
System.out.println("0");} }
positions.remove(p); positions.remove(p);
counter[ve.ordinal()]--; counter[ve.ordinal()]--;
} }
......
package model; package model.firefighter;
import model.Element;
import model.elementTokens.Printable;
import model.elementTokens.Updatable;
import model.firefighter.elements.*;
import util.Position; import util.Position;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
......
package model; package model.firefighter.behaviors;
import model.BoardData; import model.BoardData;
import model.FFBehavior; import model.Element;
import model.ModelElement; import model.genericBehavior.RemoverBehavior;
import model.RemoverBehavior; import model.firefighter.FFBehavior;
import model.firefighter.ModelElement;
import model.firefighter.elements.Fire;
import util.Position; import util.Position;
import java.util.*; import java.util.*;
......
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 util.Position;
import java.util.ArrayList; import java.util.ArrayList;
......
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.Position;
import util.TargetStrategy; import util.TargetStrategy;
import java.util.*; import java.util.*;
......
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 util.Position;
import java.util.List; import java.util.List;
......
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 util.Position;
import java.util.ArrayList; import java.util.ArrayList;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment