TP2: add class annotations.

[TP_POO.git] / TP2 / Image.java

diff --git a/TP2/Image.java b/TP2/Image.java
index d508e75d4fc647d58f38bfa97432a46c8d29c4ff..c2b0b84d7f758b70e7bcc0d66675bf954ec9ba64 100644 (file)
--- a/TP2/Image.java
+++ b/TP2/Image.java
@@ -1,6 +1,12 @@
 import java.util.Comparator;
 
-public class Image extends Forme implements Compactable, Comparable<Image>, Comparator<Image> {
+@ClassPreamble (
+    author = "Jérôme Benoit",
+    date = "09/11/2009"
+)
+public class Image extends Forme implements Compactable,
+                                            Comparable<Image>,
+                                            Comparator<Image> {
     final int IMAGE_MAX_SIZE = 100;
     Forme[] formeCollection;
     int formeNumber;
@@ -90,7 +96,7 @@ public class Image extends Forme implements Compactable, Comparable<Image>, Comp
     }
 
     public int compare(Image image1, Image image2) {
-        return image1.getSize() - image2.getSize();
+        return (int)(image1.getpOri().getY() - image2.getpOri().getY());
     }
 
 }