From: <ez...@us...> - 2006-09-06 21:05:20
|
Revision: 6899 http://svn.sourceforge.net/jedit/?rev=6899&view=rev Author: ezust Date: 2006-09-06 14:05:17 -0700 (Wed, 06 Sep 2006) Log Message: ----------- Small bugfix with call to loadMenuItem, and some folding fixes.. Modified Paths: -------------- plugins/Console/trunk/console/ConsoleMenuProvider.java plugins/Console/trunk/console/commando/CommandoThread.java plugins/Console/trunk/console/commando/CommandoToolBar.java Modified: plugins/Console/trunk/console/ConsoleMenuProvider.java =================================================================== --- plugins/Console/trunk/console/ConsoleMenuProvider.java 2006-09-06 17:26:58 UTC (rev 6898) +++ plugins/Console/trunk/console/ConsoleMenuProvider.java 2006-09-06 21:05:17 UTC (rev 6899) @@ -50,7 +50,7 @@ commands = ConsolePlugin.getSwitchActions(); for(int i = 0; i < commands.length; i++) { - menu.add(GUIUtilities.loadMenuItem(commands[i].getName())); + menu.add(GUIUtilities.loadMenuItem(commands[i], false)); } superMenu.add(menu); } //}}} Modified: plugins/Console/trunk/console/commando/CommandoThread.java =================================================================== --- plugins/Console/trunk/console/commando/CommandoThread.java 2006-09-06 17:26:58 UTC (rev 6898) +++ plugins/Console/trunk/console/commando/CommandoThread.java 2006-09-06 21:05:17 UTC (rev 6899) @@ -29,7 +29,7 @@ import org.gjt.sp.jedit.io.VFSManager; import org.gjt.sp.jedit.*; //}}} - +// {{{ commandothread class class CommandoThread extends Thread { //{{{ CommandoThread constructor @@ -98,7 +98,7 @@ } //}}} Output out = console.getOutput(); - if (command.toBuffer) + if (command.toBuffer) out = new BufferOutput(console, command.mode); console.run(shell, null, out, null, command.command); } @@ -112,7 +112,8 @@ lastCommand[0] = command; } } //}}} - + // {{{ Data Members private Console console; private Vector commands; -} + // }}} +}// }}} Modified: plugins/Console/trunk/console/commando/CommandoToolBar.java =================================================================== --- plugins/Console/trunk/console/commando/CommandoToolBar.java 2006-09-06 17:26:58 UTC (rev 6898) +++ plugins/Console/trunk/console/commando/CommandoToolBar.java 2006-09-06 21:05:17 UTC (rev 6899) @@ -47,7 +47,7 @@ import console.ConsolePlugin; // }}} - +// {{{ CommandoToolBar class public class CommandoToolBar extends JToolBar implements EBComponent { @@ -56,14 +56,14 @@ public static void init() { remove(); View views[] = jEdit.getViews(); - + for (int i=0; i<views.length; ++i) { create(views[i]); } } - - public static CommandoToolBar create(View view) + + public static CommandoToolBar create(View view) { if (!jEdit.getBooleanProperty("commando.toolbar.enabled")) return null; @@ -74,13 +74,13 @@ } // }}} - + // {{{ remove() /** Remove the instance from the view */ public static void remove() { Iterator itr = smToolBarMap.keySet().iterator(); - while (itr.hasNext()) + while (itr.hasNext()) { View v = (View) itr.next(); if (v == null) continue; @@ -101,7 +101,7 @@ setFloatable(true); updateButtons(); - } + } // }}} // {{{ addNotify() method @@ -109,7 +109,7 @@ { super.addNotify(); EditBus.addToBus(this); - } + } // }}} // {{{ removeNotify() method @@ -157,16 +157,17 @@ } add(Box.createGlue()); - } + } // }}} + // {{{ Data members private View view; - + /** * For each view, we might add a toolbar. * This map keeps track of what * views had toolbars added to them. */ static HashMap smToolBarMap = new HashMap(); - -} + // }}} +} // }}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |