141,142c141 < open(NullDrawingView.getManagedDrawingView(this)); < // open(createDrawingView()); --- > open(createInitialDrawingView()); 153a153,158 > // status line must be created before a tool is set > fStatusLine = createStatusLine(); > getContentPane().add(fStatusLine, BorderLayout.SOUTH); > > // create dummy tool until the default tool is activated during toolDone() > setTool(new NullTool(this), ""); 168d172 < fStatusLine = createStatusLine(); 170d173 < getContentPane().add(fStatusLine, BorderLayout.SOUTH); 522a526,539 > * Create the DrawingView that is active when the application is started. > * This initial DrawingView might be different from DrawingView created > * by the application, so subclasses can override this method to provide > * a special drawing view for application startup time, e.g. a NullDrawingView > * which does not display an internal frame in a multiple document interface > * (MDI) application. > * > * @return drawing view that is active at application startup time > */ > protected DrawingView createInitialDrawingView() { > return createDrawingView(); > } > > /** 682c699 < if (editMenu != null) { --- > if (alignmentMenu != null) { 714,715c731,734 < * Convience method for switching views. This is uneeded in SDI < * environments. --- > * An appropriate event is triggered and all registered observers > * are notified if the drawing view has been changed, e.g. by > * switching between several internal frames. This method is > * usually not needed in SDI environments. 758,760c777,781 < private void setTool(Tool t, String name) { < // We should not really deactivate a tool which was never activated. < if (tool() != null) { --- > public void setTool(Tool t, String name) { > // SF bug-tracker id: #490665 > > // deactivate only those tools that have been activated before > if ((tool() != null) && (tool().isActive())) {