TP2: Simplify the compacter method in the image class.

[TP_POO.git] / TP2 / Image.java

diff --git a/TP2/Image.java b/TP2/Image.java
index 807e11b2aec81d9a3ed836c6fb548fe468209604..8289930d309e5e9f9bb18b5014386ac55b5b4f1d 100644 (file)
--- a/TP2/Image.java
+++ b/TP2/Image.java
@@ -1,18 +1,17 @@
 
-class Image extends Forme {
+class Image extends Forme implements Compactable {
     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;
     }
@@ -38,7 +37,47 @@ class Image extends Forme {
     }
 
     public boolean ajouter(Forme forme) {
-        return false;
+        boolean rtVal = false;
+        if (!isFull()) {
+            formeCollection[formeNumber] = forme;
+            formeNumber++;
+            rtVal = true;
+        }
+        return rtVal;
+    }
+
+    public boolean supprimer(int index) {
+        boolean rtVal = false;
+        if (!isEmpty()) {
+            for (int j = index; (j < formeNumber - 1 && index < formeNumber); j++) {
+                formeCollection[j] = formeCollection[j + 1];
+            }
+            rtVal = true;
+            formeNumber--;
+        }
+        return rtVal;
+    }
+
+    public void afficher() {
+        String className = this.getClass().getSimpleName();
+        System.out.println("---- " + className + " ----");
+        for (int i = 0; i < formeNumber; i++) {
+            formeCollection[i].afficher();
+        }
+    }
+
+    public void compacter(int nElements) {
+        // Heavy solution
+        /* int minIndex = formeNumber - nElements - 1;
+        for (int i = formeNumber - 1; (i > minIndex && !isEmpty()); i--) {
+            supprimer(i);
+        } */
+        // Lightweight solution
+        if (formeNumber - nElements > 0) {
+            formeNumber -= nElements;
+        } else {
+            formeNumber = 0;
+        }
     }
 
 }