repositories
/
TP_POO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TP2: Fix the Compactable implementation in Image class.
[TP_POO.git]
/
TP2
/
Image.java
diff --git
a/TP2/Image.java
b/TP2/Image.java
index 62a710ca5a3c64d9f347ff1127fe5f2a2a70b8d7..37bc6c3fc4d6b724c94db174b78f3e3bd79a8670 100644
(file)
--- a/
TP2/Image.java
+++ b/
TP2/Image.java
@@
-59,13
+59,16
@@
class Image extends Forme implements Compactable {
}
public void afficher() {
}
public void afficher() {
+ String className = this.getClass().getSimpleName();
+ System.out.println("---- " + className + " ----");
for (int i = 0; i < formeNumber; i++) {
formeCollection[i].afficher();
}
}
public void compacter(int nElements) {
for (int i = 0; i < formeNumber; i++) {
formeCollection[i].afficher();
}
}
public void compacter(int nElements) {
- for (int i = formeNumber - 1; (i > formeNumber - nElements && !isEmpty()); i--) {
+ int minIndex = formeNumber - nElements - 1;
+ for (int i = formeNumber - 1; (i > minIndex && !isEmpty()); i--) {
supprimer(i);
}
}
supprimer(i);
}
}