diff --git a/.idea/misc.xml b/.idea/misc.xml index 6624aa5239bd87293312b297feabe77375fc86df..425f004247d255d14dc902059e0243b1f1acae6e 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 44bf6abe36f200089789a514eb10e2d5e1df8d13..45baec7a94932af54d2fe6087214dc014d978c03 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 e52f4675466719651be3d8259b3d46dd143e63cc..d573b2633688a6a4d979d6c24ca265726590b0bf 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 5b9b48ae7081571d71541896afd00c010d8d9247..5651dec44cd19889a2ae310a311a2fedc01087e9 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