115,115c115,115
< 	protected void fireDrawingViewSelectedEvent(final DrawingView oldView, final DrawingView newView) {
---
> 	protected void fireDrawingViewSelectedEvent(final DrawingView dv) {
122,122c122,122
< 					dpe = createDesktopEvent(newView);
---
> 					dpe = createDesktopEvent(dv);
125,125c125,125
< 				dpl.drawingViewSelected(oldView,dpe);
---
> 				dpl.drawingViewSelected(dpe);
151,154d150
<         /**
<          *  I think this is the correct listener for drawingView add/remove events
<          *  but I think it is the wrong listener for Selected/deselected events.
<          */
159,160d154
<                          * does adding a component always make it the selected view?
<                          *
164,164d157
<                                 DrawingView oldView = getActiveDrawingView();
167a161,161
> 					fireDrawingViewSelectedEvent(selectedView);
168,168d160
< 					fireDrawingViewSelectedEvent(oldView, getActiveDrawingView());
175,176d167
<              * why should we assert? dont see a problem with removing a view thats not a selected view
<              * This definitely needs fixing!!! dnoyeb 1/1/2003
180a172,173
> 					selectedView = null;
> 					fireDrawingViewSelectedEvent(selectedView);
181,183d171
<                                     DrawingView oldView = getActiveDrawingView();
<                                     selectedView = null; //mrfloppy investigate NullDrawingView here
<                                     fireDrawingViewSelectedEvent(oldView, getActiveDrawingView());