X-Git-Url: https://git.piment-noir.org/?p=TP_POO.git;a=blobdiff_plain;f=TP2%2FImage.java;h=d508e75d4fc647d58f38bfa97432a46c8d29c4ff;hp=ac668701251bdaeb6ea94f7eea76aacee2897e11;hb=36a82657f0caabbe4abcf2153dff10014e2119b8;hpb=145c683db97f23b40efe07e071826591fd7cdbea

diff --git a/TP2/Image.java b/TP2/Image.java
index ac66870..d508e75 100644
--- a/TP2/Image.java
+++ b/TP2/Image.java
@@ -1,22 +1,26 @@
+import java.util.Comparator;
 
-class Image extends Forme {
+public class Image extends Forme implements Compactable, Comparable<Image>, Comparator<Image> {
     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;
     }
 
+    public int getSize() {
+        return formeNumber;
+    }
+
     private boolean isEmpty() {
         return (formeNumber == 0);
     }
@@ -41,10 +45,52 @@ class Image extends Forme {
         boolean rtVal = false;
         if (!isFull()) {
             formeCollection[formeNumber] = forme;
-            formeNumber = 0;
+            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;
+        }
+    }
+
+    public int compareTo(Image image) {
+        return formeNumber - image.getSize();
+    }
+
+    public int compare(Image image1, Image image2) {
+        return image1.getSize() - image2.getSize();
+    }
+
 }