Add the abstract class Forme that Cercle and Segment extend.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/TP2/Cercle.java b/TP2/Cercle.java
index fe17b443d7d1d937ad322234b9cbc63a25030588..f13be696a5bd3966dd1226c0de8a53524cd22fac 100644 (file)
--- a/TP2/Cercle.java
+++ b/TP2/Cercle.java
@@ -1,5 +1,5 @@
 
-class Cercle {
+class Cercle extends Forme {
     private Point pOri;
     private double rayon;
 

diff --git a/TP2/Forme.java b/TP2/Forme.java
new file mode 100644 (file)
index 0000000..df9fc44
--- /dev/null
+++ b/TP2/Forme.java
@@ -0,0 +1,7 @@
+
+abstract class Forme {
+
+    abstract public void dessiner(Piletransformations pile);
+    abstract public void deplacer(Point p);
+
+}

diff --git a/TP2/Makefile b/TP2/Makefile
index 40b372fe5e8960cc597bab14cfd4a7b70b23a0ac..14f1b59dd1af0fa7ff4e0ad52cdd7db7c3bcce7c 100644 (file)
--- a/TP2/Makefile
+++ b/TP2/Makefile
@@ -47,6 +47,7 @@ JVM = java
 
 CLASSES = \
         Point.java \
+               Forme.java \
                Segment.java \
                Cercle.java \
                Piletransformations.java \

diff --git a/TP2/Segment.java b/TP2/Segment.java
index e1691723aa7895e0d67ba8b834d4c3fa8f6af373..25dc5e47e50c2b6d41b66a55a632bdc4a8bd13e6 100644 (file)
--- a/TP2/Segment.java
+++ b/TP2/Segment.java
@@ -1,5 +1,5 @@
 
-class Segment {
+class Segment extends Forme {
     private Point pOri;
     private Point pDest;