79,81c79,81
< 	public ConnectionTool(DrawingView view, ConnectionFigure prototype) {
< 		super(view);
< 		fPrototype = prototype;
---
> 	public ConnectionTool(DrawingEditor newDrawingEditor, ConnectionFigure newPrototype) {
> 		super(newDrawingEditor);
> 		fPrototype = newPrototype;
100,102c100,102
< 		setTarget(findConnectionStart(ex, ey, drawing()));
< 		if (getTarget() != null) {
< 			setStartConnector(findConnector(ex, ey, getTarget()));
---
> 		setTargetFigure(findConnectionStart(ex, ey, drawing()));
> 		if (getTargetFigure() != null) {
> 			setStartConnector(findConnector(ex, ey, getTargetFigure()));
171a172
> 		setAddedFigure(null);
177,178c178,179
< 		if (getTarget() != null) {
< 			getTarget().connectorVisibility(false);
---
> 		if (getTargetFigure() != null) {
> 			getTargetFigure().connectorVisibility(false);
234c235
< 	 * Gets the currently created figure
---
> 	 * Gets the connection which is created by this tool
251,257c252,258
< 		if (c != getTarget()) {
< 			if (getTarget() != null) {
< 				getTarget().connectorVisibility(false);
< 			}
< 			setTarget(c);
< 			if (getTarget() != null) {
< 				getTarget().connectorVisibility(true);
---
> 		if (c != getTargetFigure()) {
> 			if (getTargetFigure() != null) {
> 				getTargetFigure().connectorVisibility(false);
> 			}
> 			setTargetFigure(c);
> 			if (getTargetFigure() != null) {
> 				getTargetFigure().connectorVisibility(true);
323c324
< 	private void setTarget(Figure newTarget) {
---
> 	private void setTargetFigure(Figure newTarget) {
327c328
< 	protected Figure getTarget() {
---
> 	protected Figure getTargetFigure() {