16a17 > import CH.ifa.draw.contrib.DragNDropTool; 41,42c42,43 < public SelectionTool(DrawingView view) { < super(view); --- > public SelectionTool(DrawingEditor newDrawingEditor) { > super(newDrawingEditor); 65c66 < fChild = createDragTracker(view(), figure); --- > fChild = createDragTracker(figure); 71c72 < 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()); > } > 105c122 < return new HandleTracker(view, new UndoableHandle(handle, view)); --- > return new HandleTracker(editor(), new UndoableHandle(handle, view)); 111,112c128,129 < protected Tool createDragTracker(DrawingView view, Figure f) { < return new UndoableTool(new DragTracker(view, f)); --- > protected Tool createDragTracker(Figure f) { > return new UndoableTool(new DragTracker(editor(), f)); 119,120c136,137 < protected Tool createAreaTracker(DrawingView view) { < return new SelectAreaTracker(view); --- > protected Tool createAreaTracker() { > return new SelectAreaTracker(editor());