X-Git-Url: https://git.piment-noir.org/?p=TP_POO.git;a=blobdiff_plain;f=TP2%2FImage.java;h=65d0929e69f9cadae3daa7096ad43b3f9d5d2edf;hp=8289930d309e5e9f9bb18b5014386ac55b5b4f1d;hb=a8276a31e5cfa00657738bb5803438fa82752d15;hpb=38098a56346bfafe27f9be0fa1af916268105b8d

diff --git a/TP2/Image.java b/TP2/Image.java
index 8289930..65d0929 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);
     }
@@ -80,4 +87,12 @@ class Image extends Forme implements Compactable {
         }
     }
 
+    public int compareTo(Image image) {
+        return formeNumber - image.getSize();
+    }
+
+    public int compare(Image image1, Image image2) {
+        return (int)(image1.getpOri().getY() - image2.getpOri().getY());
+    }
+
 }