[ jEdit-commits ] SF.net SVN: jedit:[16146] plugins/LucenePlugin/trunk

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

Revision: 16146
          http://jedit.svn.sourceforge.net/jedit/?rev=16146&view=rev
Author:   shlomy
Date:     2009-09-02 06:05:42 +0000 (Wed, 02 Sep 2009)

Log Message:
-----------
Do not show multiple search results for the same line.

Modified Paths:
--------------
    plugins/LucenePlugin/trunk/build.xml
    plugins/LucenePlugin/trunk/src/gatchan/jedit/lucene/SearchResults.java

Modified: plugins/LucenePlugin/trunk/build.xml
===================================================================
--- plugins/LucenePlugin/trunk/build.xml	2009-09-01 21:27:27 UTC (rev 16145)
+++ plugins/LucenePlugin/trunk/build.xml	2009-09-02 06:05:42 UTC (rev 16146)
@@ -14,7 +14,7 @@
 	<property name="compiler.source" value="1.5" />
 	<property name="compiler.target" value="1.5" />
 
-	<import file="../../build-support/plugin-build.xml" />
+	<import file="../build-support/plugin-build.xml" />
 	
 	<path id="project.class.path">
 		<pathelement location="${jedit.install.dir}/jedit.jar" />

Modified: plugins/LucenePlugin/trunk/src/gatchan/jedit/lucene/SearchResults.java
===================================================================
--- plugins/LucenePlugin/trunk/src/gatchan/jedit/lucene/SearchResults.java	2009-09-01 21:27:27 UTC (rev 16145)
+++ plugins/LucenePlugin/trunk/src/gatchan/jedit/lucene/SearchResults.java	2009-09-02 06:05:42 UTC (rev 16146)
@@ -163,10 +163,15 @@
 		{
 			SourceLinkParentNode parent = tree.addSourceLinkParent(
 				new SearchRootNode(text));
+			FileMarker prev = null;
 			for (Object o: files)
 			{
 				FileMarker marker = (FileMarker) o;
-				parent.addSourceLink(marker);
+				if (! marker.equals(prev))
+				{
+					parent.addSourceLink(marker);
+					prev = marker;
+				}
 			}
 			((CardLayout) mainPanel.getLayout()).show(mainPanel, "tree");
 		}


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