From 3049a187940879e4f7dc1a1f892fbcda0a7a0362 Mon Sep 17 00:00:00 2001
From: a23022716 <celia.arezki.1@etu.univ-amu.fr>
Date: Fri, 4 Oct 2024 09:25:11 +0200
Subject: [PATCH] I corrected a few small errors in different classes because
yesterday everything I did was on my own computer using Visual Studio, and I
couldn't see the errors
---
.idea/misc.xml | 3 ++-
src/main/java/shape/App.java | 4 ++--
src/main/java/shape/Circle.java | 1 +
src/main/java/shape/Rectangle.java | 3 ++-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6624aa5..425f004 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="FrameworkDetectionExcludesConfiguration">
<file type="web" url="file://$PROJECT_DIR$" />
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="corretto-16" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
\ No newline at end of file
diff --git a/src/main/java/shape/App.java b/src/main/java/shape/App.java
index 44bf6ab..45baec7 100644
--- a/src/main/java/shape/App.java
+++ b/src/main/java/shape/App.java
@@ -24,14 +24,14 @@ public class App extends Application {
ShapeContainer shapeContainer = new ShapeContainer();
Shape rect = new Rectangle(Color.GRAY, new Point2D(150, 150), new Point2D(250, 250));
- Shape decoratedRect = new BorderDecorator(new CenterDecorator(rect, 5, Color.RED), 5, Color.BLUE);
+ Shape decoratedRect = new BorderDecorator(new CenterDecorator(rect, 5), 5);
shapeContainer.addShape(decoratedRect);
Shape triangle = new Polygon(Color.GRAY,
new Point2D(100, 50),
new Point2D(150, 150),
new Point2D(50, 150));
- Shape decoratedTriangle = new BorderDecorator(new CenterDecorator(triangle, 5, Color.RED), 5, Color.BLUE);
+ Shape decoratedTriangle = new BorderDecorator(new CenterDecorator(triangle, 5), 5);
shapeContainer.addShape(decoratedTriangle);
shapeContainer.draw(graphicsContext);
diff --git a/src/main/java/shape/Circle.java b/src/main/java/shape/Circle.java
index e52f467..d573b26 100644
--- a/src/main/java/shape/Circle.java
+++ b/src/main/java/shape/Circle.java
@@ -1,5 +1,6 @@
package shape;
+import javafx.geometry.Point2D;
import javafx.scene.canvas.GraphicsContext;
public class Circle implements Shape {
diff --git a/src/main/java/shape/Rectangle.java b/src/main/java/shape/Rectangle.java
index 5b9b48a..5651dec 100644
--- a/src/main/java/shape/Rectangle.java
+++ b/src/main/java/shape/Rectangle.java
@@ -1,5 +1,6 @@
package shape;
+import javafx.geometry.Point2D;
import javafx.scene.canvas.GraphicsContext;
import javafx.scene.paint.Color;
@@ -16,7 +17,7 @@ public class Rectangle implements Shape {
@Override
public int pointsCount() {
-
+ return 2;
}
@Override
--
GitLab