diff --git a/.idea/misc.xml b/.idea/misc.xml index 6624aa5239bd87293312b297feabe77375fc86df..480dc8a7b94017006a3c6b6c36395e0fff6eaa41 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="11" 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/AbstractShape.java b/src/main/java/shape/AbstractShape.java new file mode 100644 index 0000000000000000000000000000000000000000..18e40103d9edef9220290bbf1b60c6aa230942b3 --- /dev/null +++ b/src/main/java/shape/AbstractShape.java @@ -0,0 +1,6 @@ +package shape; + +abstract public class AbstractShape implements Shape { + + +} diff --git a/src/main/java/shape/Decorator.java b/src/main/java/shape/Decorator.java new file mode 100644 index 0000000000000000000000000000000000000000..3a2827d8814928169e3f080286d8f25929505a8b --- /dev/null +++ b/src/main/java/shape/Decorator.java @@ -0,0 +1,9 @@ +package shape; + +abstract public class Decorator implements Shape{ + private Shape decoratedShape; + + Decorator(){ + + } +} diff --git a/src/main/java/shape/Rectangle.java b/src/main/java/shape/Rectangle.java index b0e90627b6345f22ac31ab8bf5fb40f81e4d4f66..5894c35d444559a59b5c042c47dc012cc56df6ec 100644 --- a/src/main/java/shape/Rectangle.java +++ b/src/main/java/shape/Rectangle.java @@ -4,7 +4,7 @@ import javafx.geometry.Point2D; import javafx.scene.canvas.GraphicsContext; import javafx.scene.paint.Color; -public class Rectangle implements Shape{ +public class Rectangle extends AbstractShape{ Color color; Rectangle(Color color, Point2D point0, Point2D point1){ this.color = color;