2,2c2,2
<  * @(#)DecoratorFigure.java 5.2
---
>  * @(#)DecoratorFigure.java
3a4,9
>  * Project:		JHotdraw - a GUI framework for technical drawings
>  *				http://www.jhotdraw.org
>  *				http://jhotdraw.sourceforge.net
>  * Copyright:	© by the original author(s) and all contributors
>  * License:		Lesser GNU Public License (LGPL)
>  *				http://www.opensource.org/licenses/lgpl-license.html
26a33,34
>  *
>  * @version <$CURRENT_VERSION$>
36,36c44,44
<     protected Figure fComponent;
---
>     private Figure fComponent;
67,67c75,75
<         return fComponent.connectionInsets();
---
>         return getDecoratedFigure().connectionInsets();
74,74c82,82
<         return fComponent.canConnect();
---
>         return getDecoratedFigure().canConnect();
81,81c89,89
<         return fComponent.containsPoint(x, y);
---
>         return getDecoratedFigure().containsPoint(x, y);
96a105,108
>         return getDecoratedFigure();
>     }
> 
> 	public Figure getDecoratedFigure() {
96,96c104,104
<         fComponent.removeFromContainer(this); //??? set the container to the listener()?
---
>         getDecoratedFigure().removeFromContainer(this); //??? set the container to the listener()?
104,104c116,116
<         return fComponent.displayBox();
---
>         return getDecoratedFigure().displayBox();
111,111c123,123
<         fComponent.basicDisplayBox(origin, corner);
---
>         getDecoratedFigure().basicDisplayBox(origin, corner);
118,118c130,130
<         fComponent.draw(g);
---
>         getDecoratedFigure().draw(g);
125,125c137,137
<         return fComponent.findFigureInside(x, y);
---
>         return getDecoratedFigure().findFigureInside(x, y);
132,132c144,144
<         return fComponent.handles();
---
>         return getDecoratedFigure().handles();
139,139c151,151
<         return (super.includes(figure) || fComponent.includes(figure));
---
>         return (super.includes(figure) || getDecoratedFigure().includes(figure));
146,146c158,158
<         fComponent.moveBy(x, y);
---
>         getDecoratedFigure().moveBy(x, y);
161,161c173,173
<         fComponent.removeFromContainer(this);
---
>         getDecoratedFigure().removeFromContainer(this);
162,162c174,174
<         fComponent.release();
---
>         getDecoratedFigure().release();
170,170c182,182
<         if (listener() != null)
---
>         if (listener() != null) {
172a185,185
>     }
185,185c198,198
<         if (listener() != null)
---
>         if (listener() != null) {
187a201,201
>     }
194,194c208,208
<         if (listener() != null)
---
>         if (listener() != null) {
196a211,211
>     }
202,202c217,217
<         return fComponent.figures();
---
>         return getDecoratedFigure().figures();
209,209c224,224
<         return fComponent.decompose();
---
>         return getDecoratedFigure().decompose();
216,216c231,231
<         fComponent.setAttribute(name, value);
---
>         getDecoratedFigure().setAttribute(name, value);
223,223c238,238
<         return fComponent.getAttribute(name);
---
>         return getDecoratedFigure().getAttribute(name);
230,230c245,245
<         return fComponent.connectedTextLocator(text);
---
>         return getDecoratedFigure().connectedTextLocator(text);
237,237c252,252
<         return fComponent.connectorAt(x, y);
---
>         return getDecoratedFigure().connectorAt(x, y);
244,244c259,259
<         fComponent.connectorVisibility(isVisible);
---
>         getDecoratedFigure().connectorVisibility(isVisible);
252,252c267,267
<         dw.writeStorable(fComponent);
---
>         dw.writeStorable(getDecoratedFigure());
268,268c283,283
<         fComponent.addToContainer(this);
---
>         getDecoratedFigure().addToContainer(this);