repositories
/
TP_POO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TP2: Factor out common code in the abstract class.
[TP_POO.git]
/
TP2
/
Image.java
diff --git
a/TP2/Image.java
b/TP2/Image.java
index ac668701251bdaeb6ea94f7eea76aacee2897e11..6ec38bfd9331fd72d073f5e474f72fd99af518a3 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;
}
@@
-41,7
+40,7
@@
class Image extends Forme {
boolean rtVal = false;
if (!isFull()) {
formeCollection[formeNumber] = forme;
boolean rtVal = false;
if (!isFull()) {
formeCollection[formeNumber] = forme;
- formeNumber
= 0
;
+ formeNumber
++
;
rtVal = true;
}
return rtVal;
rtVal = true;
}
return rtVal;