Add the Compactable interface.

[TP_POO.git] / TP2 / Image.java

diff --git a/TP2/Image.java b/TP2/Image.java
index 5385626a79099f2b5e72ee675c82ef1a65acb273..62a710ca5a3c64d9f347ff1127fe5f2a2a70b8d7 100644 (file)
--- a/TP2/Image.java
+++ b/TP2/Image.java
@@ -46,6 +46,18 @@ class Image extends Forme implements Compactable {
         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() {
         for (int i = 0; i < formeNumber; i++) {
             formeCollection[i].afficher();
@@ -53,7 +65,9 @@ class Image extends Forme implements Compactable {
     }
 
     public void compacter(int nElements) {
-
+        for (int i = formeNumber - 1; (i > formeNumber - nElements && !isEmpty()); i--) {
+            supprimer(i);
+        }
     }
 
 }