.idea/gradle.xml

@@ -4,11 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="true" />
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="openjdk-21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

.idea/misc.xml

+<?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" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file

src/main/java/shape/AbstractShape.java

+package shape;
+
+import javafx.geometry.Point2D;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+
+public abstract class AbstractShape implements Shape {
+    private ArrayList<Point2D> points ;
+    public AbstractShape(){
+        points = new ArrayList<>();
+    }
+
+    public void addPoints(Point2D... points){
+        Collections.addAll(this.points, points);
+
+    }
+}

src/main/java/shape/App.java

@@ -24,10 +24,19 @@ public class App extends Application {
         Canvas canvas = new Canvas(130, 110);
         GraphicsContext graphicsContext = canvas.getGraphicsContext2D();
         ShapeContainer shapeContainer = new ShapeContainer();
-        graphicsContext.setFill(Color.AQUAMARINE);
+        graphicsContext.setFill(Color.PAPAYAWHIP);
         graphicsContext.fillOval(10,10,10,10);
-        shapeContainer.addShape(new Rectangle(Color.BLUE,new Point2D(10,10), new Point2D(40,40)));
+        Rectangle rec = new Rectangle(Color.BLUE,new Point2D(10,10), new Point2D(40,40));
+        BorderDecorator borderDecorator = new BorderDecorator(rec,5) ;
+        shapeContainer.addShape(rec);
+        shapeContainer.addShape(borderDecorator);
+        Polygon polygon = new Polygon(Color.RED,new Point2D(40,40), new Point2D(60,60), new Point2D(80,40));
+        CenterDecorator centerDecorator = new CenterDecorator(polygon, 5);
+        shapeContainer.addShape(polygon);
+        shapeContainer.addShape(centerDecorator);
+
         shapeContainer.draw(graphicsContext);
+
         root.getChildren().add(canvas);
         primaryStage.setScene(new Scene(root));
         primaryStage.show();

src/main/java/shape/BorderDecorator.java

+package shape;
+
+import javafx.geometry.Point2D;
+import javafx.scene.canvas.GraphicsContext;
+
+public class BorderDecorator extends Decorator {
+    private final double radius;
+
+    protected BorderDecorator(Shape decoratedShape, double radius) {
+        super(decoratedShape);
+        this.radius = radius;
+    }
+
+    @Override
+    protected void drawDecoration(GraphicsContext graphicsContext) {
+        for (int i = 0; i < decoratedShape.pointsCount(); i++) {
+            double x = decoratedShape.point(i).getX();
+            double y = decoratedShape.point(i).getY();
+            graphicsContext.fillOval(x-radius,y-radius,radius*2,radius*2);
+
+        }
+    }
+
+
+
+
+}

src/main/java/shape/CenterDecorator.java

+package shape;
+
+import javafx.geometry.Point2D;
+import javafx.scene.canvas.GraphicsContext;
+
+public class CenterDecorator extends Decorator{
+
+    private final double radius;
+
+    protected CenterDecorator(Shape decoratedShape, double radius) {
+        super(decoratedShape);
+        this.radius = radius;
+    }
+
+    @Override
+    protected void drawDecoration(GraphicsContext graphicsContext) {
+        double xAll = 0, yAll = 0;
+        for (int i = 0; i < decoratedShape.pointsCount(); i++) {
+            xAll += decoratedShape.point(i).getX();
+            yAll += decoratedShape.point(i).getY();
+        }
+
+        graphicsContext.fillOval((xAll/pointsCount())-radius,(yAll/pointsCount())-radius,radius*2,radius*2);
+
+    }
+
+
+}

src/main/java/shape/Circle.java

@@ -5,21 +5,28 @@ import javafx.scene.canvas.GraphicsContext;
 
 public class Circle implements Shape {
 
-    public Circle(double x, double y, double sqrt) {
+    private final double centerX;
+    private final double centerY;
+    private final double radius;
+
+    public Circle(double centerX, double centerY, double radius) {
+        this.centerX = centerX;
+        this.centerY = centerY;
+        this.radius = radius;
     }
 
     @Override
     public int pointsCount() {
-        return 0;
+        return 1;
     }
 
     @Override
     public Point2D point(int index) {
-        return null;
+        return new Point2D(centerX, centerY);
     }
 
     @Override
     public void draw(GraphicsContext context) {
-
+        context.fillOval(centerX-radius,centerY-radius,radius*2,radius*2);
     }
 }

src/main/java/shape/Decorator.java

+package shape;
+
+import javafx.geometry.Point2D;
+import javafx.scene.canvas.GraphicsContext;
+
+public abstract class Decorator implements Shape{
+    protected Shape decoratedShape;
+
+    protected Decorator(Shape decoratedShape){
+        this.decoratedShape = decoratedShape;
+    }
+
+    @Override
+    public void draw(GraphicsContext context) {
+        drawDecoration(context);
+    }
+    abstract void drawDecoration(GraphicsContext graphicsContext);
+
+    public int pointsCount() {
+        return decoratedShape.pointsCount();
+    }
+
+    @Override
+    public Point2D point(int index) {
+        return decoratedShape.point(index);
+    }
+}

src/main/java/shape/Polygon.java

+package shape;
+
+import javafx.geometry.Point2D;
+import javafx.scene.canvas.GraphicsContext;
+import javafx.scene.paint.Color;
+
+public class Polygon implements Shape{
+    private final Point2D[] points;
+    private final Color color;
+
+    Polygon(Color color, Point2D... points){
+        this.color = color;
+        this.points = points;
+    }
+
+    @Override
+    public int pointsCount() {
+        return points.length;
+    }
+
+    @Override
+    public Point2D point(int index) {
+        return points[index];
+    }
+
+    @Override
+    public void draw(GraphicsContext context) {
+
+        context.setFill(color);
+        double[] xPoints = new double[points.length];
+        double[] yPoints = new double[points.length];
+
+        for (int i = 0; i < points.length; i++) {
+            xPoints[i] = points[i].getX();
+            yPoints[i] = points[i].getY();
+        }
+
+        context.fillPolygon(xPoints, yPoints, points.length);
+        context.setFill(Color.BLACK);
+
+    }
+}

src/main/java/shape/Rectangle.java

@@ -6,22 +6,32 @@ import javafx.scene.paint.Color;
 
 public class Rectangle implements Shape{
     Color color;
+    private final Point2D[] points = new Point2D[2];
+
     Rectangle(Color color, Point2D point0, Point2D point1){
         this.color = color;
+        this.points[0] = point0;
+        this.points[1] = point1;
     }
 
     @Override
     public int pointsCount() {
-        return 0;
+        return 2;
     }
 
     @Override
     public Point2D point(int index) {
-        return null;
+        return points[index];
     }
 
     @Override
     public void draw(GraphicsContext context) {
-
+        double x = points[0].getX();
+        double y = points[0].getY();
+        double w = points[1].getX() - x;
+        double h = points[1].getY() - y;
+        context.setFill(color);
+        context.fillRect(x,y,w,h);
+        context.setFill(Color.BLACK);
     }
 }

src/main/java/shape/ShapeContainer.java

@@ -9,7 +9,9 @@ public class ShapeContainer{
 
     private List<Shape> shapes = new ArrayList<>();
 
-    public void addShape(Shape shape){}
+    public void addShape(Shape shape) {
+        shapes.add(shape);
+    }
 
     public void  draw(GraphicsContext context){
         for(Shape shape : shapes)