You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2014/04/18 14:25:00 UTC

svn commit: r1588457 - in /lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix: PrefixTreeStrategy.java RecursivePrefixTreeStrategy.java

Author: dsmiley
Date: Fri Apr 18 12:24:59 2014
New Revision: 1588457

URL: http://svn.apache.org/r1588457
Log:
LUCENE-5608: fix visibility of CellTokenStream from RPT/PT Strategy because of javadoc constraints on package visibility

Modified:
    lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java
    lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java

Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java?rev=1588457&r1=1588456&r2=1588457&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java Fri Apr 18 12:24:59 2014
@@ -133,7 +133,7 @@ public abstract class PrefixTreeStrategy
     return new Field[]{field};
   }
 
-  protected CellTokenStream createTokenStream(Shape shape, int detailLevel) {
+  protected TokenStream createTokenStream(Shape shape, int detailLevel) {
     Iterator<Cell> cells = grid.getTreeCellIterator(shape, detailLevel);
     return new CellTokenStream().setCells(cells);
   }

Modified: lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java?rev=1588457&r1=1588456&r2=1588457&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java (original)
+++ lucene/dev/trunk/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java Fri Apr 18 12:24:59 2014
@@ -19,6 +19,7 @@ package org.apache.lucene.spatial.prefix
 
 import com.spatial4j.core.shape.Point;
 import com.spatial4j.core.shape.Shape;
+import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.search.Filter;
 import org.apache.lucene.spatial.DisjointSpatialFilter;
 import org.apache.lucene.spatial.prefix.tree.Cell;
@@ -112,7 +113,7 @@ public class RecursivePrefixTreeStrategy
   }
 
   @Override
-  protected CellTokenStream createTokenStream(Shape shape, int detailLevel) {
+  protected TokenStream createTokenStream(Shape shape, int detailLevel) {
     if (shape instanceof Point || !pruneLeafyBranches)
       return super.createTokenStream(shape, detailLevel);