2c2
<  * @(#)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$>
36c44
<     protected Figure fComponent;
---
>     private Figure fComponent;
67c75
<         return fComponent.connectionInsets();
---
>         return getDecoratedFigure().connectionInsets();
74c82
<         return fComponent.canConnect();
---
>         return getDecoratedFigure().canConnect();
81c89
<         return fComponent.containsPoint(x, y);
---
>         return getDecoratedFigure().containsPoint(x, y);
96c104,108
<         fComponent.removeFromContainer(this); //??? set the container to the listener()?
---
>         getDecoratedFigure().removeFromContainer(this); //??? set the container to the listener()?
>         return getDecoratedFigure();
>     }
> 
> 	public Figure getDecoratedFigure() {
104c116
<         return fComponent.displayBox();
---
>         return getDecoratedFigure().displayBox();
111c123
<         fComponent.basicDisplayBox(origin, corner);
---
>         getDecoratedFigure().basicDisplayBox(origin, corner);
118c130
<         fComponent.draw(g);
---
>         getDecoratedFigure().draw(g);
125c137
<         return fComponent.findFigureInside(x, y);
---
>         return getDecoratedFigure().findFigureInside(x, y);
132c144
<         return fComponent.handles();
---
>         return getDecoratedFigure().handles();
139c151
<         return (super.includes(figure) || fComponent.includes(figure));
---
>         return (super.includes(figure) || getDecoratedFigure().includes(figure));
146c158
<         fComponent.moveBy(x, y);
---
>         getDecoratedFigure().moveBy(x, y);
161,162c173,174
<         fComponent.removeFromContainer(this);
<         fComponent.release();
---
>         getDecoratedFigure().removeFromContainer(this);
>         getDecoratedFigure().release();
170c182
<         if (listener() != null)
---
>         if (listener() != null) {
172a185
>     }
185c198
<         if (listener() != null)
---
>         if (listener() != null) {
187a201
>     }
194c208
<         if (listener() != null)
---
>         if (listener() != null) {
196a211
>     }
202c217
<         return fComponent.figures();
---
>         return getDecoratedFigure().figures();
209c224
<         return fComponent.decompose();
---
>         return getDecoratedFigure().decompose();
216c231
<         fComponent.setAttribute(name, value);
---
>         getDecoratedFigure().setAttribute(name, value);
223c238
<         return fComponent.getAttribute(name);
---
>         return getDecoratedFigure().getAttribute(name);
230c245
<         return fComponent.connectedTextLocator(text);
---
>         return getDecoratedFigure().connectedTextLocator(text);
237c252
<         return fComponent.connectorAt(x, y);
---
>         return getDecoratedFigure().connectorAt(x, y);
244c259
<         fComponent.connectorVisibility(isVisible);
---
>         getDecoratedFigure().connectorVisibility(isVisible);
252c267
<         dw.writeStorable(fComponent);
---
>         dw.writeStorable(getDecoratedFigure());
268c283
<         fComponent.addToContainer(this);
---
>         getDecoratedFigure().addToContainer(this);