[ jEdit-commits ] SF.net SVN: jedit:[14798] jEdit/trunk/org/gjt/sp/jedit/search

[<sh...@us...>]

Revision: 14798
          http://jedit.svn.sourceforge.net/jedit/?rev=14798&view=rev
Author:   shlomy
Date:     2009-03-19 11:50:45 +0000 (Thu, 19 Mar 2009)

Log Message:
-----------
Fixed SF bug #2688862: "Redo HyperSearch" uses title of last search
The "Redo HyperSearch" action used to read the search string from the Search & Replace dialog, instead of using the one that's stored in the tree node.

Modified Paths:
--------------
    jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchOperationNode.java
    jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchRequest.java
    jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchResults.java

Modified: jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchOperationNode.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchOperationNode.java	2009-03-19 06:39:41 UTC (rev 14797)
+++ jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchOperationNode.java	2009-03-19 11:50:45 UTC (rev 14798)
@@ -222,8 +222,15 @@
 	}//}}}
 
 	//{{{ getSearchMatcher() method
-	SearchMatcher getSearchMatcher()
+	public SearchMatcher getSearchMatcher()
 	{
 		return searchMatcher;
 	}//}}}
+
+	//{{{ getSearchString() method
+	public String getSearchString()
+	{
+		return searchString;
+	}//}}}
+
 }

Modified: jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchRequest.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchRequest.java	2009-03-19 06:39:41 UTC (rev 14797)
+++ jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchRequest.java	2009-03-19 11:50:45 UTC (rev 14798)
@@ -79,7 +79,7 @@
 
 		setMaximum(fileset.getFileCount(view));
 
-		// to minimise synchronization and stuff like that, we only
+		// to minimize synchronization and stuff like that, we only
 		// show a status message at most twice a second
 
 		// initially zero, so that we always show the first message

Modified: jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchResults.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchResults.java	2009-03-19 06:39:41 UTC (rev 14797)
+++ jEdit/trunk/org/gjt/sp/jedit/search/HyperSearchResults.java	2009-03-19 11:50:45 UTC (rev 14798)
@@ -822,6 +822,7 @@
 		 */
 		public void actionPerformed(ActionEvent e)
 		{
+			SearchAndReplace.setSearchString(hyperSearchOperationNode.getSearchString());
 			SearchAndReplace.setSearchMatcher(hyperSearchOperationNode.getSearchMatcher());
 			removeSelectedNode();
 			SearchAndReplace.hyperSearch(view, false);


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