[ jEdit-commits ] SF.net SVN: jedit: [8922] plugins/ProjectViewer/trunk

[<va...@us...>]

Revision: 8922
          http://svn.sourceforge.net/jedit/?rev=8922&view=rev
Author:   vanza
Date:     2007-02-07 21:54:55 -0800 (Wed, 07 Feb 2007)

Log Message:
-----------
Allow search to be started when a leaf node is selected. When this happens, the parent node is automatically selected as the source of the search.

Modified Paths:
--------------
    plugins/ProjectViewer/trunk/ProjectViewer.props
    plugins/ProjectViewer/trunk/docs/CHANGELOG
    plugins/ProjectViewer/trunk/projectviewer/action/SearchAction.java

Modified: plugins/ProjectViewer/trunk/ProjectViewer.props
===================================================================
--- plugins/ProjectViewer/trunk/ProjectViewer.props	2007-02-08 05:18:36 UTC (rev 8921)
+++ plugins/ProjectViewer/trunk/ProjectViewer.props	2007-02-08 05:54:55 UTC (rev 8922)
@@ -238,6 +238,7 @@
 projectviewer.action.expand_all=Expand all nodes
 projectviewer.action.collapse_all=Collapse all nodes
 projectviewer.action.hypersearch_dir=Search in directory
+projectviewer.action.hypersearch_parent=Search in parent directory
 projectviewer.action.hypersearch_project=Search in project root
 projectviewer.action.archive=Archive project
 projectviewer.action.archive.filter=Project "{0}" files

Modified: plugins/ProjectViewer/trunk/docs/CHANGELOG
===================================================================
--- plugins/ProjectViewer/trunk/docs/CHANGELOG	2007-02-08 05:18:36 UTC (rev 8921)
+++ plugins/ProjectViewer/trunk/docs/CHANGELOG	2007-02-08 05:54:55 UTC (rev 8922)
@@ -46,6 +46,8 @@
 		  in jEdit (be it because the view is closing or because the
 		  editor is exiting).
 		- move ModalJFileChooser to CommonControls and use it from there.
+		- allow search to work on file nodes directly (choose parent
+		  node automatically when that happens).
 
 Version 2.1.3.5 requires JDK 1.4
     [Alan Ezust]

Modified: plugins/ProjectViewer/trunk/projectviewer/action/SearchAction.java
===================================================================
--- plugins/ProjectViewer/trunk/projectviewer/action/SearchAction.java	2007-02-08 05:18:36 UTC (rev 8921)
+++ plugins/ProjectViewer/trunk/projectviewer/action/SearchAction.java	2007-02-08 05:54:55 UTC (rev 8922)
@@ -87,6 +87,8 @@
 				if (!mgr.isLoaded(node.getName())) {
 					node = mgr.getProject(node.getName());
 				}
+			} else if (node.isLeaf()) {
+				node = (VPTNode) node.getParent();
 			}
 
 			SearchAndReplace.setSearchFileSet(new NodeFileSet(node));
@@ -103,17 +105,16 @@
 	//{{{ +prepareForNode(VPTNode) : void
 	/** Enable action only for the root node. */
 	public void prepareForNode(VPTNode node) {
-		if (node != null && (node.isDirectory() || node.isProject())) {
-			cmItem.setVisible(true);
-			if (node.isDirectory()) {
-				((JMenuItem)cmItem).setText(
-					jEdit.getProperty("projectviewer.action.hypersearch_dir"));
-			} else {
-				((JMenuItem)cmItem).setText(
-					jEdit.getProperty("projectviewer.action.hypersearch_project"));
-			}
+		cmItem.setVisible(true);
+		if (node.isDirectory()) {
+			((JMenuItem)cmItem).setText(
+				jEdit.getProperty("projectviewer.action.hypersearch_dir"));
+		} else if (node.isProject()) {
+			((JMenuItem)cmItem).setText(
+				jEdit.getProperty("projectviewer.action.hypersearch_project"));
 		} else {
-			cmItem.setVisible(false);
+			((JMenuItem)cmItem).setText(
+				jEdit.getProperty("projectviewer.action.hypersearch_parent"));
 		}
 	} //}}}
 


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