From: <sh...@us...> - 2009-12-26 06:09:02
|
Revision: 16735 http://jedit.svn.sourceforge.net/jedit/?rev=16735&view=rev Author: shlomy Date: 2009-12-26 06:08:54 +0000 (Sat, 26 Dec 2009) Log Message: ----------- Updated the plugin to use the new edit bus API wherever possible. Modified Paths: -------------- plugins/Console/trunk/console/ConsolePlugin.java plugins/Console/trunk/console/commando/CommandoToolBar.java Modified: plugins/Console/trunk/console/ConsolePlugin.java =================================================================== --- plugins/Console/trunk/console/ConsolePlugin.java 2009-12-25 22:48:52 UTC (rev 16734) +++ plugins/Console/trunk/console/ConsolePlugin.java 2009-12-26 06:08:54 UTC (rev 16735) @@ -36,6 +36,7 @@ import javax.swing.JOptionPane; import org.gjt.sp.jedit.*; +import org.gjt.sp.jedit.EditBus.EBHandler; import org.gjt.sp.jedit.gui.DockableWindowManager; import org.gjt.sp.jedit.msg.DynamicMenuChanged; import org.gjt.sp.jedit.msg.PluginUpdate; @@ -55,7 +56,7 @@ * @version $Id$ */ -public class ConsolePlugin extends EBPlugin +public class ConsolePlugin extends EditPlugin { // {{{ Instance and static variables @@ -128,6 +129,7 @@ rescanCommands(); CommandoToolBar.init(); + EditBus.addToBus(this); } // }}} @@ -153,6 +155,7 @@ // {{{ stop() method public void stop() { + EditBus.removeFromBus(this); // clean up edit bus View[] views = jEdit.getViews(); for (int i = 0; i < views.length; i++) { @@ -166,24 +169,26 @@ jEdit.removeActionSet(shellSwitchActions); } // }}} - // {{{ handleMessage() method - public void handleMessage(EBMessage msg) + // {{{ handleViewUpdate() method + @EBHandler + public void handleViewUpdate(ViewUpdate vmsg) { - if (msg instanceof ViewUpdate) + if (vmsg.getWhat() == ViewUpdate.CREATED) { - ViewUpdate vmsg = (ViewUpdate) msg; - if (vmsg.getWhat() == ViewUpdate.CREATED) - { - View v = vmsg.getView(); - CommandoToolBar.create(v); - } + View v = vmsg.getView(); + CommandoToolBar.create(v); } - if (msg instanceof PluginUpdate) { - rescanShells(); - } } // }}} + // {{{ handlePluginUpdate() method + @EBHandler + public void handlePluginUpdate(PluginUpdate msg) + { + rescanShells(); + } + // }}} + // {{{ getConsoleSettingsDirectory() method public static String getConsoleSettingsDirectory() { Modified: plugins/Console/trunk/console/commando/CommandoToolBar.java =================================================================== --- plugins/Console/trunk/console/commando/CommandoToolBar.java 2009-12-25 22:48:52 UTC (rev 16734) +++ plugins/Console/trunk/console/commando/CommandoToolBar.java 2009-12-26 06:08:54 UTC (rev 16735) @@ -34,19 +34,18 @@ import javax.swing.BoxLayout; import javax.swing.JToolBar; -import org.gjt.sp.jedit.EBComponent; -import org.gjt.sp.jedit.EBMessage; import org.gjt.sp.jedit.EditAction; import org.gjt.sp.jedit.EditBus; import org.gjt.sp.jedit.View; import org.gjt.sp.jedit.jEdit; +import org.gjt.sp.jedit.EditBus.EBHandler; import org.gjt.sp.jedit.msg.DynamicMenuChanged; import console.ConsolePlugin; // }}} // {{{ CommandoToolBar class -public class CommandoToolBar extends JToolBar implements EBComponent +public class CommandoToolBar extends JToolBar { // {{{ init() @@ -119,14 +118,11 @@ // }}} // {{{ handleMessage() method - public void handleMessage(EBMessage msg) + @EBHandler + public void handleMessage(DynamicMenuChanged msg) { - if (msg instanceof DynamicMenuChanged - && ConsolePlugin.MENU.equals(((DynamicMenuChanged) msg) - .getMenuName())) - { + if (ConsolePlugin.MENU.equals(msg.getMenuName())) updateButtons(); - } } // }}} // {{{ updateButtons() method This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |