repositories
/
TP_POO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TP2: Finally make all Affichable implemented classes uniform.
[TP_POO.git]
/
TP2
/
Image.java
diff --git
a/TP2/Image.java
b/TP2/Image.java
index 807e11b2aec81d9a3ed836c6fb548fe468209604..b2efe6e06bc603dc4f7a1d78c8838b109880186d 100644
(file)
--- a/
TP2/Image.java
+++ b/
TP2/Image.java
@@
-1,18
+1,17
@@
class Image extends Forme {
final int IMAGE_MAX_SIZE = 100;
class Image extends Forme {
final int IMAGE_MAX_SIZE = 100;
- Point pOri;
Forme[] formeCollection;
int formeNumber;
Image() {
Forme[] formeCollection;
int formeNumber;
Image() {
-
pOri = new Point
();
+
super
();
formeCollection = new Forme[IMAGE_MAX_SIZE];
formeNumber = 0;
}
Image(Point p) {
formeCollection = new Forme[IMAGE_MAX_SIZE];
formeNumber = 0;
}
Image(Point p) {
-
pOri = p
;
+
super(p)
;
formeCollection = new Forme[IMAGE_MAX_SIZE];
formeNumber = 0;
}
formeCollection = new Forme[IMAGE_MAX_SIZE];
formeNumber = 0;
}
@@
-38,7
+37,19
@@
class Image extends Forme {
}
public boolean ajouter(Forme forme) {
}
public boolean ajouter(Forme forme) {
- return false;
+ boolean rtVal = false;
+ if (!isFull()) {
+ formeCollection[formeNumber] = forme;
+ formeNumber++;
+ rtVal = true;
+ }
+ return rtVal;
+ }
+
+ public void afficher() {
+ for (int i = 0; i < formeNumber; i++) {
+ formeCollection[i].afficher();
+ }
}
}
}
}