From 05b73996958c0fbf1f4dd42abd7bc5de5e5027ac Mon Sep 17 00:00:00 2001
From: cstamas <cstamas@2aa8b3fc-8ebb-4439-a84f-95066eaea8ab>
Date: Wed, 19 May 2010 11:46:26 +0000
Subject: [PATCH] Improving highlighting

git-svn-id: file:///opt/svn/repositories/sonatype.org/nexus/trunk/nexus-indexer@6479 2aa8b3fc-8ebb-4439-a84f-95066eaea8ab
---
 .../org/sonatype/nexus/index/DefaultIteratorResultSet.java  | 6 +++---
 .../org/sonatype/nexus/index/context/IndexingContext.java   | 1 -
 .../org/sonatype/nexus/index/context/NexusAnalyzer.java     | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/sonatype/nexus/index/DefaultIteratorResultSet.java b/src/main/java/org/sonatype/nexus/index/DefaultIteratorResultSet.java
index dd30179a3a..1b2fc07d2f 100644
--- a/src/main/java/org/sonatype/nexus/index/DefaultIteratorResultSet.java
+++ b/src/main/java/org/sonatype/nexus/index/DefaultIteratorResultSet.java
@@ -13,14 +13,13 @@
 import org.apache.lucene.search.highlight.Formatter;
 import org.apache.lucene.search.highlight.Highlighter;
 import org.apache.lucene.search.highlight.QueryScorer;
-import org.apache.lucene.search.highlight.SimpleFragmenter;
 import org.apache.lucene.search.highlight.SimpleHTMLFormatter;
 import org.sonatype.nexus.index.context.IndexUtils;
 import org.sonatype.nexus.index.context.IndexingContext;
 import org.sonatype.nexus.index.context.NexusIndexSearcher;
 
 /**
- * Default implementation of IteratorResultSet.
+ * Default implementation of IteratorResultSet. TODO: there is too much of logic, refactor this!
  * 
  * @author cstamas
  */
@@ -283,7 +282,8 @@ protected String highlightField( IndexingContext context, MatchHighlightRequest
 
         tokenStream.reset();
 
-        String rv = highlighter.getBestFragments( tokenStream, text, 1, "..." );
+        // TODO: this is okay for now, since (see above) we "support" HTML mode only, but later...
+        String rv = highlighter.getBestFragments( tokenStream, text, 3, "<BR/>" );
 
         return rv.length() == 0 ? null : rv;
     }
diff --git a/src/main/java/org/sonatype/nexus/index/context/IndexingContext.java b/src/main/java/org/sonatype/nexus/index/context/IndexingContext.java
index 8420cfc7a8..1b3084159e 100644
--- a/src/main/java/org/sonatype/nexus/index/context/IndexingContext.java
+++ b/src/main/java/org/sonatype/nexus/index/context/IndexingContext.java
@@ -176,7 +176,6 @@ IndexWriter getIndexWriter()
      * creates a new instance of analyzer!
      * 
      * @return
-     * @deprecated Should not be used directly, since NexusAnalyzer is not thread-safe! Create a new instance if needed.
      */
     Analyzer getAnalyzer();
 
diff --git a/src/main/java/org/sonatype/nexus/index/context/NexusAnalyzer.java b/src/main/java/org/sonatype/nexus/index/context/NexusAnalyzer.java
index 61c6b0799e..a991f143f9 100644
--- a/src/main/java/org/sonatype/nexus/index/context/NexusAnalyzer.java
+++ b/src/main/java/org/sonatype/nexus/index/context/NexusAnalyzer.java
@@ -59,6 +59,7 @@ protected boolean isTokenChar( char c )
         }
     }
 
+    @Deprecated
     public static class DeprecatedClassnamesTokenizer
         extends CharTokenizer
     {