repositories
/
TP_POO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TP2: add class annotations.
[TP_POO.git]
/
TP2
/
Image.java
diff --git
a/TP2/Image.java
b/TP2/Image.java
index da903147207c2c4c4c9210bbe6699f0c4c36c052..c2b0b84d7f758b70e7bcc0d66675bf954ec9ba64 100644
(file)
--- a/
TP2/Image.java
+++ b/
TP2/Image.java
@@
-1,5
+1,12
@@
+import java.util.Comparator;
-class Image extends Forme implements Compactable, Comparable<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;
final int IMAGE_MAX_SIZE = 100;
Forme[] formeCollection;
int formeNumber;
@@
-88,4
+95,8
@@
class Image extends Forme implements Compactable, Comparable<Image> {
return formeNumber - image.getSize();
}
return formeNumber - image.getSize();
}
+ public int compare(Image image1, Image image2) {
+ return (int)(image1.getpOri().getY() - image2.getpOri().getY());
+ }
+
}
}