From 618e21244492d9f3ce5c2ca8a9824cb23b45c198 Mon Sep 17 00:00:00 2001
From: s22029480 <nahlane-ghina.SAYEH@etu.univ-amu.fr>
Date: Fri, 4 Oct 2024 11:28:58 +0200
Subject: [PATCH] modification de ShapeContainer
---
src/main/java/shape/Shape.java | 1 +
src/main/java/shape/ShapeContainer.java | 18 +++++++++++-------
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/shape/Shape.java b/src/main/java/shape/Shape.java
index 16766e4..4f631db 100644
--- a/src/main/java/shape/Shape.java
+++ b/src/main/java/shape/Shape.java
@@ -4,6 +4,7 @@ import javafx.geometry.Point2D;
import javafx.scene.canvas.GraphicsContext;
public interface Shape {
+
int pointsCount();
Point2D point(int index);
void draw(GraphicsContext context);
diff --git a/src/main/java/shape/ShapeContainer.java b/src/main/java/shape/ShapeContainer.java
index 91c7d29..ffafdf8 100644
--- a/src/main/java/shape/ShapeContainer.java
+++ b/src/main/java/shape/ShapeContainer.java
@@ -1,18 +1,22 @@
package shape;
import javafx.scene.canvas.GraphicsContext;
-
import java.util.ArrayList;
import java.util.List;
-public class ShapeContainer{
-
- private List<Shape> shapes = new ArrayList<>();
+public class ShapeContainer {
+ private List<Shape> shapes = new ArrayList<>(); // Liste des formes
- public void addShape(Shape shape){}
+ // Méthode pour ajouter une forme au conteneur
+ public void add(Shape shape) {
+ shapes.add(shape);
+ }
- public void draw(GraphicsContext context){
- for(Shape shape : shapes)
+ // Méthode pour dessiner toutes les formes sur le canvas
+ public void draw(GraphicsContext context) {
+ for (Shape shape : shapes) {
shape.draw(context);
+ }
}
}
+
--
GitLab