TP2: Factor out common code in the abstract class.

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

diff --git a/TP2/Cercle.java b/TP2/Cercle.java
index f13be696a5bd3966dd1226c0de8a53524cd22fac..62772da71506b8bba3f1a6423c4f5b405039405c 100644 (file)
--- a/TP2/Cercle.java
+++ b/TP2/Cercle.java
@@ -1,22 +1,17 @@
 
 class Cercle extends Forme {
-    private Point pOri;
     private double rayon;
 
     Cercle(Point pO, double r) {
-        pOri = pO;
+        super(pO);
         rayon = r;
     }
 
     public void dessiner(Piletransformations pile) {
         String className = this.getClass().getSimpleName();
         Point pTrans = pile.getCurrentTransformation();
-        Point pOriTrans = pOri.additionner(pTrans);
-        System.out.println(className + " " + pOri.toString() + "->" + pOriTrans.toString() + " " + rayon);
-    }
-
-    public void deplacer(Point p) {
-        pOri = pOri.additionner(p);
+        Point pOriTrans = super.getpOri().additionner(pTrans);
+        System.out.println(className + " " + super.getpOri().toString() + "->" + pOriTrans.toString() + " " + rayon);
     }
 
 }

diff --git a/TP2/Forme.java b/TP2/Forme.java
index df9fc4434f94fbda3504828594ff63e8ddc7ec26..0e08ddf730273f68c5411c8bfe43fefccf39cd62 100644 (file)
--- a/TP2/Forme.java
+++ b/TP2/Forme.java
@@ -1,7 +1,22 @@
 
-abstract class Forme {
+public abstract class Forme {
+    private Point pOri;
 
-    abstract public void dessiner(Piletransformations pile);
-    abstract public void deplacer(Point p);
+    public abstract void dessiner(Piletransformations pile);
 
+    Forme() {
+        pOri = new Point();
+    }
+
+    Forme(Point p) {
+        pOri = p;
+    }
+
+    public Point getpOri() {
+        return pOri;
+    }
+
+    public void deplacer(Point p) {
+        pOri = pOri.additionner(p);
+    }
 }

diff --git a/TP2/Image.java b/TP2/Image.java
index 8f10393af96d0bdb2787af1598d26ea9effc8818..6ec38bfd9331fd72d073f5e474f72fd99af518a3 100644 (file)
--- a/TP2/Image.java
+++ b/TP2/Image.java
@@ -1,18 +1,17 @@
 
 class Image extends Forme {
     final int IMAGE_MAX_SIZE = 100;
-    Point pOri;
     Forme[] formeCollection;
     int formeNumber;
 
     Image() {
-        pOri = new Point();
+        super();
         formeCollection = new Forme[IMAGE_MAX_SIZE];
         formeNumber = 0;
     }
 
     Image(Point p) {
-        pOri = p;
+        super(p);
         formeCollection = new Forme[IMAGE_MAX_SIZE];
         formeNumber = 0;
     }

diff --git a/TP2/Segment.java b/TP2/Segment.java
index a421af76b303b476559d1cff1bd25d35cc1d5ea0..5fd0d735500ca44e6500358aafa525ef0ed85ad4 100644 (file)
--- a/TP2/Segment.java
+++ b/TP2/Segment.java
@@ -1,6 +1,5 @@
 
 class Segment extends Forme {
-    private Point pOri;
     private Point pDest;
 
     /* Segment() {
@@ -9,21 +8,21 @@ class Segment extends Forme {
     } */
 
     Segment(Point pO, Point pD) {
-        pOri = pO;
+        super(pO);
         pDest = pD;
     }
 
     public void dessiner(Piletransformations pile) {
         String className = this.getClass().getSimpleName();
         Point pTrans = pile.getCurrentTransformation();
-        Point pOriTrans = pOri.additionner(pTrans);
+        Point pOriTrans = super.getpOri().additionner(pTrans);
         Point pDestTrans = pDest.additionner(pTrans);
-        System.out.println(className + " " + pOri.toString()+ "->" + pOriTrans.toString() + " " +
+        System.out.println(className + " " + super.getpOri().toString()+ "->" + pOriTrans.toString() + " " +
                            pDest.toString() + "->" + pDestTrans.toString());
     }
 
     public void deplacer(Point p) {
-        pOri = pOri.additionner(p);
+        super.deplacer(p);
         pDest = pDest.additionner(p);
     }