140a141,141
> 		open(createInitialDrawingView());
141,142d140
< 		open(NullDrawingView.getManagedDrawingView(this));
< //		open(createDrawingView());
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), "");
168,168d172
< 		fStatusLine = createStatusLine();
170,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();
> 	}
> 
> 	/**
682,682c699,699
< 		if (editMenu != null) {
---
> 		if (alignmentMenu != null) {
713a731,734
> 	 * 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.
714,715d730
< 	 * Convience method for switching views.  This is uneeded in SDI
< 	 * environments.
758a778,780
> 		// SF bug-tracker id: #490665
> 
> 		// deactivate only those tools that have been activated before
758,758c777,777
< 	private void setTool(Tool t, String name) {
---
> 	public void setTool(Tool t, String name) {
759,759d777
< 		// We should not really deactivate a tool which was never activated.
760,760c781,781
< 		if (tool() != null) {
---
> 		if ((tool() != null) && (tool().isActive())) {