Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
flooding-template_EL-GHAOUTI_AYMANE
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EL GHAOUTI Aymane
flooding-template_EL-GHAOUTI_AYMANE
Commits
e298a24f
Commit
e298a24f
authored
2 years ago
by
dragapsy
Browse files
Options
Downloads
Patches
Plain Diff
Tache 1 (testée)
parent
34dab129
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/src/main/java/view/MatrixPane.java
+2
-2
2 additions, 2 deletions
app/src/main/java/view/MatrixPane.java
app/src/test/java/model/SquareCellTest.java
+1
-4
1 addition, 4 deletions
app/src/test/java/model/SquareCellTest.java
with
3 additions
and
6 deletions
app/src/main/java/view/MatrixPane.java
+
2
−
2
View file @
e298a24f
...
...
@@ -8,6 +8,7 @@ import javafx.scene.layout.GridPane;
import
javafx.scene.paint.Color
;
import
javafx.scene.shape.Rectangle
;
import
javafx.util.Duration
;
import
model.ArrayGrid
;
import
model.Cell
;
import
model.GrayGrid
;
import
model.Grid
;
...
...
@@ -28,8 +29,7 @@ public class MatrixPane extends GridPane {
this
.
tileHeight
=
tileHeight
;
this
.
numberOfColumns
=
numberOfColumns
;
this
.
numberOfRows
=
numberOfRows
;
// TODO replace by new ArrayGrid(numberOfRows, numberOfColumns)
cellGrid
=
new
GrayGrid
(
numberOfRows
,
numberOfColumns
);
cellGrid
=
new
ArrayGrid
(
numberOfRows
,
numberOfColumns
);
initMatrix
();
}
...
...
This diff is collapsed.
Click to expand it.
app/src/test/java/model/SquareCellTest.java
+
1
−
4
View file @
e298a24f
...
...
@@ -11,9 +11,6 @@ import static org.assertj.core.api.Assertions.assertThat;
class
SquareCellTest
{
// TODO
// uncomment
/*
private
final
Cell
northCell
=
new
SquareCell
(
Color
.
NAVY
);
private
final
Cell
southCell
=
new
SquareCell
(
Color
.
SALMON
);
private
final
Cell
westCell
=
new
SquareCell
(
Color
.
WHEAT
);
...
...
@@ -51,5 +48,5 @@ class SquareCellTest {
assertThat
(
centralCell
.
getNeighbours
()).
containsExactlyInAnyOrder
(
northCell
,
southCell
);
}
*/
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment