16a17,17
> import CH.ifa.draw.contrib.DragNDropTool;
40a42,43
> 	public SelectionTool(DrawingEditor newDrawingEditor) {
> 		super(newDrawingEditor);
41,42d41
< 	public SelectionTool(DrawingView view) {
< 		super(view);
65,65c66,66
< 				fChild = createDragTracker(view(), figure);
---
> 				fChild = createDragTracker(figure);
71,71c72,72
< 				fChild = createAreaTracker(view());
---
> 				fChild = createAreaTracker();
77a79,94
> 	public void activate() {
> 		super.activate();
> 	}
> 
> 	public void deactivate() {
> 		super.deactivate();
> 	}
> 
> 	/**
> 	 * Handles mouse moves (if the mouse button is up).
> 	 * Switches the cursors depending on whats under them.
> 	 */
> 	public void mouseMove(MouseEvent evt, int x, int y) {
> 		DragNDropTool.setCursor(evt.getX(), evt.getY(), view());
> 	}
> 
105,105c122,122
< 		return new HandleTracker(view, new UndoableHandle(handle, view));
---
> 		return new HandleTracker(editor(), new UndoableHandle(handle, view));
110a128,128
> 	protected Tool createDragTracker(Figure f) {
111,111d127
< 	protected Tool createDragTracker(DrawingView view, Figure f) {
112,112c129,129
< 		return new UndoableTool(new DragTracker(view, f));
---
> 		return new UndoableTool(new DragTracker(editor(), f));
118a136,136
> 	protected Tool createAreaTracker() {
119,119d135
< 	protected Tool createAreaTracker(DrawingView view) {
120,120c137,137
< 		return new SelectAreaTracker(view);
---
> 		return new SelectAreaTracker(editor());