From: <ko...@us...> - 2012-01-12 05:55:54
|
Revision: 20757 http://jedit.svn.sourceforge.net/jedit/?rev=20757&view=rev Author: kog13 Date: 2012-01-12 05:55:48 +0000 (Thu, 12 Jan 2012) Log Message: ----------- Cleaning up the bug Modified Paths: -------------- plugins/Console/trunk/console/ConsolePlugin.java Modified: plugins/Console/trunk/console/ConsolePlugin.java =================================================================== --- plugins/Console/trunk/console/ConsolePlugin.java 2012-01-12 05:49:59 UTC (rev 20756) +++ plugins/Console/trunk/console/ConsolePlugin.java 2012-01-12 05:55:48 UTC (rev 20757) @@ -537,14 +537,6 @@ ConsolePane.colorAttributes(console.getInfoColor()), "\n"+cmd+"\n"); systemShell.executeInDir(console, null, state, null, cmd, project.getRootPath()); - - // print the prompt once it's done - ThreadUtilities.runInBackground(new Runnable() { - public void run() { - systemShell.waitFor(console); - //systemShell.printPrompt(console, state); - } - }); } // }}} // {{{ getPackageName() method This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2012-01-28 19:46:06
|
Revision: 20995 http://jedit.svn.sourceforge.net/jedit/?rev=20995&view=rev Author: ezust Date: 2012-01-28 19:46:00 +0000 (Sat, 28 Jan 2012) Log Message: ----------- Brought back the PV API... Works better. Modified Paths: -------------- plugins/Console/trunk/console/ConsolePlugin.java Modified: plugins/Console/trunk/console/ConsolePlugin.java =================================================================== --- plugins/Console/trunk/console/ConsolePlugin.java 2012-01-28 19:37:35 UTC (rev 20994) +++ plugins/Console/trunk/console/ConsolePlugin.java 2012-01-28 19:46:00 UTC (rev 20995) @@ -51,6 +51,7 @@ import console.commando.CommandoToolBar; import errorlist.DefaultErrorSource; +import projectviewer.action.EditProjectAction; // }}} @@ -526,8 +527,9 @@ String cmd = project.getProperty("console."+prop); if (cmd == null) cmd = ""; if (cmd.equals("")) { - EditAction ea = jEdit.getAction("projectviewer_wrapper_edit"); - ea.invoke(view); + EditProjectAction ea = + new EditProjectAction("pv.commands"); + ea.actionPerformed(null); } // Run the command in the project's root, but then return to This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2012-02-08 22:04:56
|
Revision: 21098 http://jedit.svn.sourceforge.net/jedit/?rev=21098&view=rev Author: ezust Date: 2012-02-08 22:04:49 +0000 (Wed, 08 Feb 2012) Log Message: ----------- Get the property after it is set, so we can execute the command too... Modified Paths: -------------- plugins/Console/trunk/console/ConsolePlugin.java Modified: plugins/Console/trunk/console/ConsolePlugin.java =================================================================== --- plugins/Console/trunk/console/ConsolePlugin.java 2012-02-08 21:27:07 UTC (rev 21097) +++ plugins/Console/trunk/console/ConsolePlugin.java 2012-02-08 22:04:49 UTC (rev 21098) @@ -529,6 +529,7 @@ EditProjectAction ea = new EditProjectAction("pv.commands"); ea.actionPerformed(null); + cmd = project.getProperty("console."+prop); } // Run the command in the project's root, but then return to This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2012-02-14 15:41:09
|
Revision: 21134 http://jedit.svn.sourceforge.net/jedit/?rev=21134&view=rev Author: kog13 Date: 2012-02-14 15:41:00 +0000 (Tue, 14 Feb 2012) Log Message: ----------- Updated to use new ProjectOptions.run() API in PV 3.4.1 Modified Paths: -------------- plugins/Console/trunk/console/ConsolePlugin.java Modified: plugins/Console/trunk/console/ConsolePlugin.java =================================================================== --- plugins/Console/trunk/console/ConsolePlugin.java 2012-02-14 11:36:19 UTC (rev 21133) +++ plugins/Console/trunk/console/ConsolePlugin.java 2012-02-14 15:41:00 UTC (rev 21134) @@ -525,7 +525,7 @@ String cmd = project.getProperty("console."+prop); if (cmd == null) cmd = ""; - while (cmd.equals("")) { + if (cmd.equals("")) { // ask the user if they want to define the command now int res = GUIUtilities.confirm(view, "console.pv.no-command", new String[] { prop }, JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE); @@ -533,12 +533,15 @@ if (res != JOptionPane.YES_OPTION) return; - projectviewer.PVActions.pvActionWrapper( - new projectviewer.action.EditProjectAction("pv.commands"), view, true); + project = projectviewer.config.ProjectOptions.run( + project, false, null, "pv.commands"); + if (project == null) + return; + cmd = project.getProperty("console."+prop); - if (cmd == null) - cmd = ""; + if (cmd == null || cmd.trim() == "") + return; } // Run the command in the project's root, but then return to This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ko...@us...> - 2012-02-15 15:42:59
|
Revision: 21137 http://jedit.svn.sourceforge.net/jedit/?rev=21137&view=rev Author: kog13 Date: 2012-02-15 15:42:53 +0000 (Wed, 15 Feb 2012) Log Message: ----------- Reverted call to ProjectOptions.run() and removed a call to the deprecated MiscUtilities.getFileNameNoExtension() Modified Paths: -------------- plugins/Console/trunk/console/ConsolePlugin.java Modified: plugins/Console/trunk/console/ConsolePlugin.java =================================================================== --- plugins/Console/trunk/console/ConsolePlugin.java 2012-02-14 17:13:14 UTC (rev 21136) +++ plugins/Console/trunk/console/ConsolePlugin.java 2012-02-15 15:42:53 UTC (rev 21137) @@ -533,12 +533,9 @@ if (res != JOptionPane.YES_OPTION) return; - project = projectviewer.config.ProjectOptions.run( - project, false, null, "pv.commands"); + projectviewer.PVActions.pvActionWrapper( + new projectviewer.action.EditProjectAction("pv.commands"), view, true); - if (project == null) - return; - cmd = project.getProperty("console."+prop); if (cmd == null || cmd.trim() == "") return; @@ -619,7 +616,7 @@ public static String getClassName(Buffer buffer) { String pkg = getPackageName(buffer); - String clazz = MiscUtilities.getFileNameNoExtension(buffer.getPath()); + String clazz = MiscUtilities.getBaseName(buffer.getPath()); if (pkg == null) return clazz; else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jar...@us...> - 2012-03-28 20:36:56
|
Revision: 21476 http://jedit.svn.sourceforge.net/jedit/?rev=21476&view=rev Author: jarekczek Date: 2012-03-28 20:36:50 +0000 (Wed, 28 Mar 2012) Log Message: ----------- Made project edition code look nicer using new pv 3.4.2 api. As requested by Damien! Modified Paths: -------------- plugins/Console/trunk/console/ConsolePlugin.java Modified: plugins/Console/trunk/console/ConsolePlugin.java =================================================================== --- plugins/Console/trunk/console/ConsolePlugin.java 2012-03-28 19:10:04 UTC (rev 21475) +++ plugins/Console/trunk/console/ConsolePlugin.java 2012-03-28 20:36:50 UTC (rev 21476) @@ -533,8 +533,8 @@ if (res != JOptionPane.YES_OPTION) return; - projectviewer.PVActions.pvActionWrapper( - new projectviewer.action.EditProjectAction("pv.commands"), view, true); + projectviewer.PVActions.editProject(project, + "pv.commands"); cmd = project.getProperty("console."+prop); if (cmd == null || cmd.trim() == "") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2012-11-16 21:49:25
|
Revision: 22484 http://jedit.svn.sourceforge.net/jedit/?rev=22484&view=rev Author: ezust Date: 2012-11-16 21:49:19 +0000 (Fri, 16 Nov 2012) Log Message: ----------- Remove deprecation warning. Modified Paths: -------------- plugins/Console/trunk/console/ConsolePlugin.java Modified: plugins/Console/trunk/console/ConsolePlugin.java =================================================================== --- plugins/Console/trunk/console/ConsolePlugin.java 2012-11-16 12:28:30 UTC (rev 22483) +++ plugins/Console/trunk/console/ConsolePlugin.java 2012-11-16 21:49:19 UTC (rev 22484) @@ -620,9 +620,7 @@ public static String getClassName(Buffer buffer) { String pkg = getPackageName(buffer); - // TODO: update to use jEdit 5.0 API after 5.0 is released. -// String clazz = MiscUtilities.getBaseName(buffer.getPath()); - String clazz = MiscUtilities.getFileNameNoExtension(buffer.getPath()); + String clazz = MiscUtilities.getBaseName(buffer.getPath()); if (pkg == null) return clazz; else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2013-06-09 21:45:39
|
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. |
From: <ez...@us...> - 2014-04-20 18:38:40
|
Revision: 23503 http://sourceforge.net/p/jedit/svn/23503 Author: ezust Date: 2014-04-20 18:38:36 +0000 (Sun, 20 Apr 2014) Log Message: ----------- Remove unused import. Modified Paths: -------------- plugins/Console/trunk/console/ConsolePlugin.java Modified: plugins/Console/trunk/console/ConsolePlugin.java =================================================================== --- plugins/Console/trunk/console/ConsolePlugin.java 2014-04-19 03:50:36 UTC (rev 23502) +++ plugins/Console/trunk/console/ConsolePlugin.java 2014-04-20 18:38:36 UTC (rev 23503) @@ -50,7 +50,6 @@ import console.commando.CommandoToolBar; import errorlist.DefaultErrorSource; -import projectviewer.action.EditProjectAction; // }}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2016-01-20 23:10:52
|
Revision: 24295 http://sourceforge.net/p/jedit/svn/24295 Author: ezust Date: 2016-01-20 23:10:49 +0000 (Wed, 20 Jan 2016) Log Message: ----------- Added a call to propertiesChanged() to make the shortcut actions work sooner Modified Paths: -------------- plugins/Console/trunk/console/ConsolePlugin.java Modified: plugins/Console/trunk/console/ConsolePlugin.java =================================================================== --- plugins/Console/trunk/console/ConsolePlugin.java 2016-01-19 00:17:39 UTC (rev 24294) +++ plugins/Console/trunk/console/ConsolePlugin.java 2016-01-20 23:10:49 UTC (rev 24295) @@ -116,7 +116,7 @@ // systemCommandDirectory = MiscUtilities.constructPath(".", // "commando"); - // Normally plugins don't use this directory. + // Normally plugins don't use this directory. String settings = jEdit.getSettingsDirectory(); if (settings != null) { @@ -166,7 +166,7 @@ allCommands.removeAllActions(); shellSwitchActions.removeAllActions(); getSystemShell().beforeStopping(); - + // ??? Does this really get all the Console objects that are in memory? View[] views = jEdit.getViews(); for (int i = 0; i < views.length; i++) { @@ -308,6 +308,7 @@ jEdit.addActionSet(allCommands); Log.log(Log.DEBUG, ConsolePlugin.class, "Loaded " + allCommands.size() + " Actions"); + jEdit.propertiesChanged(); } // }}} @@ -545,13 +546,13 @@ if (cmd == null || cmd.trim() == "") return; } - + view.getDockableWindowManager().showDockableWindow("console"); final Console console = (Console) getConsole(view); if (jEdit.getBooleanProperty("console.clearBeforeExecute")) console.clear(); String runDir = project.getProperty("console.runDir"); - if (runDir == null) runDir = project.getRootPath(); + if (runDir == null) runDir = project.getRootPath(); console.chDir(runDir, true); console.run(console.getShell(), console.getOutput(), cmd); } // }}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |