X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=TP2%2FImage.java;h=61dd27014c7c9888cf9418a65a1648fad963623b;hb=600e6ac65a3879827a1f728581a1107ebee040c8;hp=5385626a79099f2b5e72ee675c82ef1a65acb273;hpb=979297754a1c307ecbd003a745c4586f04f0c81a;p=TP_POO.git

diff --git a/TP2/Image.java b/TP2/Image.java
index 5385626..61dd270 100644
--- a/TP2/Image.java
+++ b/TP2/Image.java
@@ -1,5 +1,8 @@
+import java.util.Comparator;
 
-class Image extends Forme implements Compactable {
+public class Image extends Forme implements Compactable,
+                                            Comparable<Image>,
+                                            Comparator<Image> {
     final int IMAGE_MAX_SIZE = 100;
     Forme[] formeCollection;
     int formeNumber;
@@ -16,6 +19,10 @@ class Image extends Forme implements Compactable {
         formeNumber = 0;
     }
 
+    public int getSize() {
+        return formeNumber;
+    }
+
     private boolean isEmpty() {
         return (formeNumber == 0);
     }
@@ -46,14 +53,46 @@ 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() {
+        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;
+        }
+    }
+
+    public int compareTo(Image image) {
+        return formeNumber - image.getSize();
+    }
 
+    public int compare(Image image1, Image image2) {
+        return image1.getSize() - image2.getSize();
     }
 
 }