18,18d17
< import CH.ifa.draw.standard.SimpleUpdateStrategy;
49,49c372,372
< 	private Rectangle damagedArea = null;
---
> 		Rectangle damagedArea = getDamage();
50,50d372
< 
192a190,190
> 		}
193,193c191,191
< 		} else
---
> 		else {
196a195,195
> 	}
246a246,246
> 		}
247,247c247,247
< 		} else
---
> 		else {
250a251,251
> 	}
322a324,324
> 			for (FigureEnumeration fe = d.figures(); fe.hasNextFigure();) {
323,323d323
< 			for (FigureEnumeration k = d.figures(); k.hasMoreElements();) {
324,324c325,325
< 				k.nextFigure().moveBy(diffX, diffY);
---
> 				fe.nextFigure().moveBy(diffX, diffY);
376,376c378,378
< 			damagedArea = null;
---
> 			setDamage(null);
385,385c387,387
< 		if (damagedArea == null) {
---
> 		if (getDamage() == null) {
386,386c388,388
< 			damagedArea = r;
---
> 			setDamage(r);
388a391,391
> 			Rectangle damagedArea = getDamage();
389a393,394
> 			// the returned rectange may be a clone so we better set it again
> 			setDamage(damagedArea);