[ jEdit-commits ] SF.net SVN: jedit:[23046] plugins/Console/trunk/console/ConsolePlugin.java

[<ez...@us...>]

Revision: 23046
          http://jedit.svn.sourceforge.net/jedit/?rev=23046&view=rev
Author:   ezust
Date:     2013-06-09 21:45:33 +0000 (Sun, 09 Jun 2013)
Log Message:
-----------
Fixed an old bug that prevented console from unloading properly. 

Modified Paths:
--------------
    plugins/Console/trunk/console/ConsolePlugin.java

Modified: plugins/Console/trunk/console/ConsolePlugin.java
===================================================================
--- plugins/Console/trunk/console/ConsolePlugin.java	2013-06-09 17:30:10 UTC (rev 23045)
+++ plugins/Console/trunk/console/ConsolePlugin.java	2013-06-09 21:45:33 UTC (rev 23046)
@@ -160,9 +160,15 @@
 	// {{{ stop() method
 	public void stop()
 	{
+		// clean up edit bus
 		EditBus.removeFromBus(this);
+		jEdit.removeActionSet(allCommands);
+		jEdit.removeActionSet(shellSwitchActions);
+		allCommands.removeAllActions();
+		shellSwitchActions.removeAllActions();
 		getSystemShell().beforeStopping();
-		// clean up edit bus
+		
+		// ??? Does this really get all the Console objects that are in memory?
 		View[] views = jEdit.getViews();
 		for (int i = 0; i < views.length; i++) {
 			Console console = getConsole(views[i]);
@@ -171,8 +177,6 @@
 		}
 		BeanShell.getNameSpace().addCommandPath(CMD_PATH, getClass());
 		CommandoToolBar.remove();
-		jEdit.removeActionSet(allCommands);
-		jEdit.removeActionSet(shellSwitchActions);
 	} // }}}
 
 	// {{{ handleViewUpdate() method

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.