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 61dd27014c7c9888cf9418a65a1648fad963623b..c2b0b84d7f758b70e7bcc0d66675bf954ec9ba64 100644
(file)
--- a/
TP2/Image.java
+++ b/
TP2/Image.java
@@
-1,5
+1,9
@@
import java.util.Comparator;
import java.util.Comparator;
+@ClassPreamble (
+ author = "Jérôme Benoit",
+ date = "09/11/2009"
+)
public class Image extends Forme implements Compactable,
Comparable<Image>,
Comparator<Image> {
public class Image extends Forme implements Compactable,
Comparable<Image>,
Comparator<Image> {
@@
-92,7
+96,7
@@
public class Image extends Forme implements Compactable,
}
public int compare(Image image1, Image image2) {
}
public int compare(Image image1, Image image2) {
- return
image1.getSize() - image2.getSize(
);
+ return
(int)(image1.getpOri().getY() - image2.getpOri().getY()
);
}
}
}
}