X-Git-Url: https://git.piment-noir.org/?p=TP_POO.git;a=blobdiff_plain;f=TP2%2FImage.java;h=65d0929e69f9cadae3daa7096ad43b3f9d5d2edf;hp=d508e75d4fc647d58f38bfa97432a46c8d29c4ff;hb=a8276a31e5cfa00657738bb5803438fa82752d15;hpb=36a82657f0caabbe4abcf2153dff10014e2119b8 diff --git a/TP2/Image.java b/TP2/Image.java index d508e75..65d0929 100644 --- a/TP2/Image.java +++ b/TP2/Image.java @@ -1,6 +1,8 @@ import java.util.Comparator; -public class Image extends Forme implements Compactable, Comparable, Comparator { +public class Image extends Forme implements Compactable, + Comparable, + Comparator { final int IMAGE_MAX_SIZE = 100; Forme[] formeCollection; int formeNumber; @@ -90,7 +92,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()); } }