diff --git a/src/main/java/shape/Circle.java b/src/main/java/shape/Circle.java index 0bcb2645c453d92699c2ed2053446f09d66db320..e52f4675466719651be3d8259b3d46dd143e63cc 100644 --- a/src/main/java/shape/Circle.java +++ b/src/main/java/shape/Circle.java @@ -1,37 +1,35 @@ package shape; -import javafx.geometry.Point2D; import javafx.scene.canvas.GraphicsContext; -import javafx.scene.paint.Color; public class Circle implements Shape { private Point2D center; private double radius; - private Color color; - public Circle(Color color, double x, double y, double radius) { - this.color = color; + + public Circle(double x, double y, double radius) { this.center = new Point2D(x, y); this.radius = radius; } @Override public int pointsCount() { + return 1; } @Override public Point2D point(int index) { + if (index == 0) { return center; + } else { + throw new IndexOutOfBoundsException("Un cercle n'a qu'un seul point central."); } - throw new IndexOutOfBoundsException("Circle has only one center point."); } @Override public void draw(GraphicsContext context) { - context.setStroke(color); - context.strokeOval(center.getX() - radius, center.getY() - radius, - radius * 2, radius * 2); + context.strokeOval(center.getX() - radius, center.getY() - radius, radius * 2, radius * 2); } } diff --git a/src/main/java/shape/Rectangle.java b/src/main/java/shape/Rectangle.java index 0b18ab3ee56618f0a787e0890239fcb26b35e415..5b9b48ae7081571d71541896afd00c010d8d9247 100644 --- a/src/main/java/shape/Rectangle.java +++ b/src/main/java/shape/Rectangle.java @@ -16,13 +16,11 @@ public class Rectangle implements Shape { @Override public int pointsCount() { - return 0; - return 2; // Un rectangle est défini par deux points + } @Override public Point2D point(int index) { - return null; if (index == 0) { return point0; } else if (index == 1) {