209,209c209,209
< 		fListener = FigureChangeEventMulticaster.add(fListener, l);
---
> 		fListener = FigureChangeEventMulticaster.add(listener(), l);
216,216c216,216
< 		fListener = FigureChangeEventMulticaster.remove(fListener, l);
---
> 		fListener = FigureChangeEventMulticaster.remove(listener(), l);
231a232,232
> 		if (listener() != null) {
232,232d231
< 		if (fListener != null) {
233,233c233,233
< 			fListener.figureRemoved(new FigureChangeEvent(this));
---
> 			listener().figureRemoved(new FigureChangeEvent(this));
242a243,244
> 		if (listener() != null) {
> 			Rectangle r = invalidateRectangle(displayBox());
243,245d242
< 		if (fListener != null) {
< 			Rectangle r = displayBox();
< 			r.grow(Handle.HANDLESIZE, Handle.HANDLESIZE);
246,246c245,245
< 			fListener.figureInvalidated(new FigureChangeEvent(this, r));
---
> 			listener().figureInvalidated(new FigureChangeEvent(this, r));
246a246,246
> 		}
247a248,254
> 
> 	/**
> 	 * Hook method to change the rectangle that will be invalidated
> 	 */
> 	protected Rectangle invalidateRectangle(Rectangle r) {
> 		r.grow(Handle.HANDLESIZE, Handle.HANDLESIZE);
> 		return r;
267a275,275
> 		if (listener() != null) {
268,268d274
< 		if (fListener != null) {
269,269c276,276
< 			fListener.figureChanged(new FigureChangeEvent(this));
---
> 			listener().figureChanged(new FigureChangeEvent(this));
326,326d332
< 	 * By default
327,327c333,333
< 	 * figures don't have any attributes getAttribute
---
> 	 * By default figures don't have any attributes so getAttribute
328a335,336
> 	 *
> 	 * @deprecated use getAttribute(FigureAttributeConstant) instead
334a343,352
> 	 * Returns the named attribute or null if a
> 	 * a figure doesn't have an attribute.
> 	 * By default figures don't have any attributes getAttribute
> 	 * returns null.
> 	 */
> 	public Object getAttribute(FigureAttributeConstant attributeConstant) {
> 		return null;
> 	}
> 
> 	/**
336a355,356
> 	 *
> 	 * @deprecated use setAttribute(FigureAttributeConstant, Object) instead
341a362,368
> 	 * Sets the named attribute to the new value. By default
> 	 * figures don't have any attributes and the request is ignored.
> 	 */
> 	public void setAttribute(FigureAttributeConstant attributeConstant, Object value) {
> 	}
> 
> 	/**