X-Git-Url: https://git.piment-noir.org/?p=TP_POO.git;a=blobdiff_plain;f=TP2%2FImage.java;h=c2b0b84d7f758b70e7bcc0d66675bf954ec9ba64;hp=d508e75d4fc647d58f38bfa97432a46c8d29c4ff;hb=78c725c5e287068ee24d4abb950de2ab9520d76a;hpb=36a82657f0caabbe4abcf2153dff10014e2119b8 diff --git a/TP2/Image.java b/TP2/Image.java index d508e75..c2b0b84 100644 --- a/TP2/Image.java +++ b/TP2/Image.java @@ -1,6 +1,12 @@ import java.util.Comparator; -public class Image extends Forme implements Compactable, Comparable, Comparator { +@ClassPreamble ( + author = "Jérôme Benoit", + date = "09/11/2009" +) +public class Image extends Forme implements Compactable, + Comparable, + Comparator { final int IMAGE_MAX_SIZE = 100; Forme[] formeCollection; int formeNumber; @@ -90,7 +96,7 @@ public class Image extends Forme implements Compactable, Comparable, Comp } public int compare(Image image1, Image image2) { - return image1.getSize() - image2.getSize(); + return (int)(image1.getpOri().getY() - image2.getpOri().getY()); } }