From 5430d003623ee9ea1154cd8f24f1f4d6a473d8e2 Mon Sep 17 00:00:00 2001
From: v23014723 <anthony.viola.1@etu.univ-amu.fr>
Date: Thu, 19 Oct 2023 11:52:08 +0200
Subject: [PATCH] Exercice 2 TP3
---
.idea/misc.xml | 3 ++-
src/main/java/shape/AbstractShape.java | 6 ++++++
src/main/java/shape/Decorator.java | 9 +++++++++
src/main/java/shape/Rectangle.java | 2 +-
4 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 src/main/java/shape/AbstractShape.java
create mode 100644 src/main/java/shape/Decorator.java
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6624aa5..480dc8a 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 0000000..18e4010
--- /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 0000000..3a2827d
--- /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 b0e9062..5894c35 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;
--
GitLab