Skip to content
Snippets Groups Projects
Commit 778b8ee5 authored by YOUSSOUF Ali moussa's avatar YOUSSOUF Ali moussa
Browse files

refactorisation su package View afin qu'il respecte le principe SOLID

parent 296010b0
No related branches found
No related tags found
No related merge requests found
Pipeline #24916 passed
...@@ -16,8 +16,7 @@ import model.Board; ...@@ -16,8 +16,7 @@ import model.Board;
import model.ModelElement; import model.ModelElement;
import model.FirefighterBoard; import model.FirefighterBoard;
import util.Position; import util.Position;
import view.Grid; import view.*;
import view.ViewElement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -83,12 +82,12 @@ public class Controller { ...@@ -83,12 +82,12 @@ public class Controller {
private ViewElement getViewElement(List<ModelElement> squareState) { private ViewElement getViewElement(List<ModelElement> squareState) {
if(squareState.contains(ModelElement.FIREFIGHTER)){ if(squareState.contains(ModelElement.FIREFIGHTER)){
return ViewElement.FIREFIGHTER; return new FIREFIGHTER();
} }
if (squareState.contains(ModelElement.FIRE)){ if (squareState.contains(ModelElement.FIRE)){
return ViewElement.FIRE; return new FIRE();
} }
return ViewElement.EMPTY; return new EMPTY();
} }
private void initializeTimeline() { private void initializeTimeline() {
......
package model; package model;
public class Fire { public class Fire {
} }
package model; package model;
public class FireFighter { public class FireFighter {
} }
package view;
import javafx.scene.paint.Color;
public class EMPTY implements ViewElement {
@Override
public Color getColor() {
return Color.WHITE;
}
}
package view;
import javafx.scene.paint.Color;
public class FIRE implements ViewElement {
@Override
public Color getColor() {
return Color.RED;
}
}
package view;
import javafx.scene.paint.Color;
public class FIREFIGHTER implements ViewElement {
@Override
public Color getColor() {
return Color.BLUE;
}
}
...@@ -10,7 +10,7 @@ import java.util.List; ...@@ -10,7 +10,7 @@ import java.util.List;
public class FirefighterGrid extends Canvas implements Grid<ViewElement>{ public class FirefighterGrid extends Canvas implements Grid<ViewElement>{
private void paintElementAtPosition(ViewElement element, Position position) { private void paintElementAtPosition(ViewElement element, Position position) {
paintBox(position.row(), position.column(), element.color); paintBox(position.row(), position.column(), element.getColor());
} }
private int boxWidth; private int boxWidth;
private int boxHeight; private int boxHeight;
......
...@@ -2,10 +2,6 @@ package view; ...@@ -2,10 +2,6 @@ package view;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
public enum ViewElement { public interface ViewElement {
FIREFIGHTER(Color.BLUE), FIRE(Color.RED), EMPTY(Color.WHITE); Color getColor() ;
final Color color;
ViewElement(Color color) {
this.color = color;
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment