TP2: Simplify chained conditions.

[TP_POO.git] / TP2 / Segment.java

diff --git a/TP2/Segment.java b/TP2/Segment.java
index a421af76b303b476559d1cff1bd25d35cc1d5ea0..2ec075c659db70f7720fe77fa39b60c62f0ef98f 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,22 +8,28 @@ 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);
     }
 
+    public void afficher() {
+        String className = this.getClass().getSimpleName();
+        System.out.println("---- " + className + " ----");
+        System.out.println(super.getpOri().toString() + " " + pDest.toString());
+    }
+
 }