On Thu, Oct 25, 2012 at 12:09 PM, <[email protected]> wrote: > Author: romseygeek > Date: Thu Oct 25 10:09:33 2012 > New Revision: 1402078 > > URL: http://svn.apache.org/viewvc?rev=1402078&view=rev > Log: > Move IntervalFilter and IntervalCollector to top-level classes; add javadocs > > Added: > > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalCollector.java > > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilter.java > Modified: > > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PhraseScorer.java > > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilterQuery.java > > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalIterator.java > > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/NonOverlappingQuery.java > > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/OrderedNearQuery.java > > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/RangeIntervalIterator.java > > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/SnapshotPositionCollector.java > > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/UnorderedNearQuery.java > > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinIntervalIterator.java > > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinOrderedFilter.java > > lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBasicIntervals.java > > lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBlockIntervalIterator.java > > lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestOrderedConjunctionIntervalIterator.java > > lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/ArrayIntervalIterator.java > > lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/HighlightingIntervalCollector.java > > lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/positions/IntervalHighlighterTest.java > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PhraseScorer.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PhraseScorer.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PhraseScorer.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/PhraseScorer.java > Thu Oct 25 10:09:33 2012 > @@ -20,7 +20,7 @@ package org.apache.lucene.search; > import org.apache.lucene.index.DocsAndPositionsEnum; > import org.apache.lucene.search.positions.Interval; > import org.apache.lucene.search.positions.IntervalIterator; > -import org.apache.lucene.search.positions.IntervalIterator.IntervalCollector; > +import org.apache.lucene.search.positions.IntervalCollector; > import org.apache.lucene.search.similarities.Similarity; > > import java.io.IOException; > > Added: > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalCollector.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalCollector.java?rev=1402078&view=auto > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalCollector.java > (added) > +++ > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalCollector.java > Thu Oct 25 10:09:33 2012 > @@ -0,0 +1,43 @@ > +package org.apache.lucene.search.positions; > + > +/* > + * Licensed to the Apache Software Foundation (ASF) under one or more > + * contributor license agreements. See the NOTICE file distributed with > + * this work for additional information regarding copyright ownership. > + * The ASF licenses this file to You under the Apache License, Version 2.0 > + * (the "License"); you may not use this file except in compliance with > + * the License. You may obtain a copy of the License at > + * > + * http://www.apache.org/licenses/LICENSE-2.0 > + * > + * Unless required by applicable law or agreed to in writing, software > + * distributed under the License is distributed on an "AS IS" BASIS, > + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > + * See the License for the specific language governing permissions and > + * limitations under the License. > + */ > + > +import org.apache.lucene.search.Scorer; > + > +/** > + * Used for collecting matching {@link Interval}s from a search > + */ > +public interface IntervalCollector { > + > + /** > + * Collects an individual term match > + * @param scorer the parent scorer > + * @param interval the interval to collect > + * @param docID the docID of the document matched > + */ > + public void collectLeafPosition(Scorer scorer, Interval interval, int > docID); > + > + /** > + * Collects a composite interval that may have sub-intervals > + * @param scorer the parent scorer > + * @param interval the interval to collect > + * @param docID the docID of the document matched > + */ > + public void collectComposite(Scorer scorer, Interval interval, int docID); > + > +} > > Added: > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilter.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilter.java?rev=1402078&view=auto > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilter.java > (added) > +++ > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilter.java > Thu Oct 25 10:09:33 2012 > @@ -0,0 +1,33 @@ > +package org.apache.lucene.search.positions; > +
the license header below seems to be wrong :) Alan is it possible that you added the wrong header here? simon > +/** > +* Copyright (c) 2012 Lemur Consulting Ltd. > +* <p/> > +* Licensed under the Apache License, Version 2.0 (the "License"); > +* you may not use this file except in compliance with the License. > +* You may obtain a copy of the License at > +* <p/> > +* http://www.apache.org/licenses/LICENSE-2.0 > +* <p/> > +* Unless required by applicable law or agreed to in writing, software > +* distributed under the License is distributed on an "AS IS" BASIS, > +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. > +* See the License for the specific language governing permissions and > +* limitations under the License. > +*/ > + > +/** > + * Filters an {@link IntervalIterator} > + */ > +public interface IntervalFilter { > + > + /** > + * Filter the passed in IntervalIterator > + * @param collectPositions true if the returned {@link IntervalIterator} > will > + * be passed to an {@link IntervalCollector} > + * @param iter the {@link IntervalIterator} to filter > + * @return a filtered {@link IntervalIterator} > + */ > + public abstract IntervalIterator filter(boolean collectPositions, > IntervalIterator iter); > + > +} > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilterQuery.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilterQuery.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilterQuery.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalFilterQuery.java > Thu Oct 25 10:09:33 2012 > @@ -27,7 +27,6 @@ import org.apache.lucene.search.Query; > import org.apache.lucene.search.Scorer; > import org.apache.lucene.search.Weight; > import org.apache.lucene.search.Weight.PostingFeatures; > -import org.apache.lucene.search.positions.IntervalIterator.IntervalFilter; > import org.apache.lucene.util.Bits; > > import java.io.IOException; > @@ -37,6 +36,10 @@ import java.util.Set; > * A Query that filters the results of an inner {@link Query} using an > * {@link IntervalFilter}. > * > + * @see OrderedNearQuery > + * @see UnorderedNearQuery > + * @see NonOverlappingQuery > + * > * @lucene.experimental > */ > public class IntervalFilterQuery extends Query implements Cloneable { > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalIterator.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalIterator.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalIterator.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/IntervalIterator.java > Thu Oct 25 10:09:33 2012 > @@ -21,19 +21,29 @@ import org.apache.lucene.search.Scorer; > import java.io.IOException; > > /** > - * > + * Iterator over the matching {@link Interval}s of a {@link Scorer} > + * > * @lucene.experimental > */ > -// nocommit - javadoc > public abstract class IntervalIterator { > - > + > + /** An empty array of IntervalIterators */ > public static final IntervalIterator[] EMPTY = new IntervalIterator[0]; > + > + /** An IntervalIterator containing no further Intervals */ > public static final IntervalIterator NO_MORE_POSITIONS = new > EmptyIntervalIterator(); > + > + /** Integer representing no more documents */ > public static final int NO_MORE_DOCS = Integer.MAX_VALUE; > > protected final Scorer scorer; > protected final boolean collectPositions; > - > + > + /** > + * Constructs an IntervalIterator over a {@link Scorer} > + * @param scorer the {@link Scorer} to pull positions from > + * @param collectPositions true if positions will be collected > + */ > public IntervalIterator(Scorer scorer, boolean collectPositions) { > this.scorer = scorer; > this.collectPositions = collectPositions; > @@ -58,37 +68,44 @@ public abstract class IntervalIterator { > public abstract Interval next() throws IOException; > > /** > - * Called once for each positional match on a document > - * @param collector > + * If positions are to be collected, this will be called once > + * for each Interval returned by the iterator. The constructor > + * must have been called with collectPositions=true. > + * @param collector an {@link IntervalCollector} to collect the > + * Interval positions > */ > public abstract void collect(IntervalCollector collector); > - > + > + /** > + * Get any subiterators > + * @param inOrder true if the subiterators should be returned in order > + * @return > + */ > public abstract IntervalIterator[] subs(boolean inOrder); > - > + > + /** > + * Get the distance between matching subintervals > + */ > public abstract int matchDistance(); > - > + > + /** > + * Get the current docID > + */ > public int docID() { > return scorer.docID(); > } > - > + > + /** > + * Get this iterator's {@link Scorer} > + * @return > + */ > public Scorer getScorer() { > return scorer; > } > - > - public static interface IntervalFilter { > - public abstract IntervalIterator filter( > - boolean collectPositions, IntervalIterator iter); > - } > - > - public static interface IntervalCollector { > - public void collectLeafPosition(Scorer scorer, Interval interval, > - int docID); > - > - public void collectComposite(Scorer scorer, Interval interval, > - int docID); > - > - } > - > + > + /** > + * An iterator that is always exhausted > + */ > private static final class EmptyIntervalIterator extends > IntervalIterator { > > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/NonOverlappingQuery.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/NonOverlappingQuery.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/NonOverlappingQuery.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/NonOverlappingQuery.java > Thu Oct 25 10:09:33 2012 > @@ -53,9 +53,12 @@ import java.util.Set; > * will match "the quick fox is brown", because here "brown" is outside > * the minuend's interval. > * > + * N.B. Positions must be included in the index for this query to work > + * > * Implements the Brouwerian operator as defined in <a href= > * > "http://vigna.dsi.unimi.it/ftp/papers/EfficientAlgorithmsMinimalIntervalSemantics"; > * >"Efficient Optimally Lazy Algorithms for Minimal-Interval Semantic</a> > + * > * @lucene.experimental > */ > public final class NonOverlappingQuery extends Query implements Cloneable { > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/OrderedNearQuery.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/OrderedNearQuery.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/OrderedNearQuery.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/OrderedNearQuery.java > Thu Oct 25 10:09:33 2012 > @@ -26,9 +26,13 @@ import org.apache.lucene.search.Query; > * a given distance of each other within the document. The subqueries > * must appear in the document in order. > * > + * N.B. Positions must be included in the index for this query to work > + * > * Implements the AND< operator as defined in <a href= > * > "http://vigna.dsi.unimi.it/ftp/papers/EfficientAlgorithmsMinimalIntervalSemantics"; > * >"Efficient Optimally Lazy Algorithms for Minimal-Interval Semantic</a> > + * > + * @lucene.experimental > */ > > public class OrderedNearQuery extends IntervalFilterQuery { > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/RangeIntervalIterator.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/RangeIntervalIterator.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/RangeIntervalIterator.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/RangeIntervalIterator.java > Thu Oct 25 10:09:33 2012 > @@ -18,8 +18,6 @@ package org.apache.lucene.search.positio > > import java.io.IOException; > > -import org.apache.lucene.search.positions.IntervalIterator.IntervalFilter; > - > /** > * > * @lucene.experimental > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/SnapshotPositionCollector.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/SnapshotPositionCollector.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/SnapshotPositionCollector.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/SnapshotPositionCollector.java > Thu Oct 25 10:09:33 2012 > @@ -30,7 +30,7 @@ import org.apache.lucene.util.RamUsageEs > * are required. > */ > final class SnapshotPositionCollector implements > - IntervalIterator.IntervalCollector { > + IntervalCollector { > private SingleSnapshot[] snapshots; > private int index = 0; > > @@ -66,7 +66,7 @@ final class SnapshotPositionCollector im > collect(scorer, interval, docID, false); > } > > - void replay(IntervalIterator.IntervalCollector collector) { > + void replay(IntervalCollector collector) { > for (int i = 0; i < index; i++) { > SingleSnapshot singleSnapshot = snapshots[i]; > if (singleSnapshot.isLeaf) { > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/UnorderedNearQuery.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/UnorderedNearQuery.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/UnorderedNearQuery.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/UnorderedNearQuery.java > Thu Oct 25 10:09:33 2012 > @@ -25,9 +25,13 @@ import org.apache.lucene.search.Query; > * a given distance of each other within the document. The subqueries > * may appear in the document in any order. > * > + * N.B. Positions must be included in the index for this query to work > + * > * Implements the LOWPASS<sub>k</sub> operator as defined in <a href= > * > "http://vigna.dsi.unimi.it/ftp/papers/EfficientAlgorithmsMinimalIntervalSemantics"; > * >"Efficient Optimally Lazy Algorithms for Minimal-Interval Semantic</a> > + * > + * @lucene.experimental > */ > > public class UnorderedNearQuery extends IntervalFilterQuery { > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinIntervalIterator.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinIntervalIterator.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinIntervalIterator.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinIntervalIterator.java > Thu Oct 25 10:09:33 2012 > @@ -17,8 +17,6 @@ package org.apache.lucene.search.positio > */ > import java.io.IOException; > > -import org.apache.lucene.search.positions.IntervalIterator.IntervalFilter; > - > > /** > * @lucene.experimental > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinOrderedFilter.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinOrderedFilter.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinOrderedFilter.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/positions/WithinOrderedFilter.java > Thu Oct 25 10:09:33 2012 > @@ -17,7 +17,7 @@ package org.apache.lucene.search.positio > * limitations under the License. > */ > > -public class WithinOrderedFilter implements IntervalIterator.IntervalFilter { > +public class WithinOrderedFilter implements IntervalFilter { > > private int slop; > > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBasicIntervals.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBasicIntervals.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBasicIntervals.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBasicIntervals.java > Thu Oct 25 10:09:33 2012 > @@ -27,7 +27,6 @@ import org.apache.lucene.index.Term; > import org.apache.lucene.search.*; > import org.apache.lucene.search.BooleanClause.Occur; > import org.apache.lucene.search.Weight.PostingFeatures; > -import org.apache.lucene.search.positions.IntervalIterator.IntervalFilter; > import org.apache.lucene.store.Directory; > import org.apache.lucene.util.LuceneTestCase; > > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBlockIntervalIterator.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBlockIntervalIterator.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBlockIntervalIterator.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestBlockIntervalIterator.java > Thu Oct 25 10:09:33 2012 > @@ -22,7 +22,6 @@ import org.apache.lucene.index.*; > import org.apache.lucene.search.*; > import org.apache.lucene.search.BooleanClause.Occur; > import org.apache.lucene.search.Weight.PostingFeatures; > -import org.apache.lucene.search.positions.IntervalIterator.IntervalFilter; > import org.apache.lucene.store.Directory; > import org.apache.lucene.util.LuceneTestCase; > > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestOrderedConjunctionIntervalIterator.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestOrderedConjunctionIntervalIterator.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestOrderedConjunctionIntervalIterator.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/core/src/test/org/apache/lucene/search/positions/TestOrderedConjunctionIntervalIterator.java > Thu Oct 25 10:09:33 2012 > @@ -7,7 +7,6 @@ import org.apache.lucene.index.*; > import org.apache.lucene.search.*; > import org.apache.lucene.search.BooleanClause.Occur; > import org.apache.lucene.search.Weight.PostingFeatures; > -import org.apache.lucene.search.positions.IntervalIterator.IntervalFilter; > import org.apache.lucene.store.Directory; > import org.apache.lucene.util.LuceneTestCase; > > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/ArrayIntervalIterator.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/ArrayIntervalIterator.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/ArrayIntervalIterator.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/ArrayIntervalIterator.java > Thu Oct 25 10:09:33 2012 > @@ -19,6 +19,7 @@ package org.apache.lucene.search.highlig > > import java.io.IOException; > > +import org.apache.lucene.search.positions.IntervalCollector; > import org.apache.lucene.search.positions.IntervalIterator; > import org.apache.lucene.search.positions.Interval; > > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/HighlightingIntervalCollector.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/HighlightingIntervalCollector.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/HighlightingIntervalCollector.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/java/org/apache/lucene/search/highlight/positions/HighlightingIntervalCollector.java > Thu Oct 25 10:09:33 2012 > @@ -23,7 +23,7 @@ import org.apache.lucene.search.Collecto > import org.apache.lucene.search.Scorer; > import org.apache.lucene.search.Weight.PostingFeatures; > import org.apache.lucene.search.positions.IntervalIterator; > -import org.apache.lucene.search.positions.IntervalIterator.IntervalCollector; > +import org.apache.lucene.search.positions.IntervalCollector; > import org.apache.lucene.search.positions.Interval; > > /** > > Modified: > lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/positions/IntervalHighlighterTest.java > URL: > http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/positions/IntervalHighlighterTest.java?rev=1402078&r1=1402077&r2=1402078&view=diff > ============================================================================== > --- > lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/positions/IntervalHighlighterTest.java > (original) > +++ > lucene/dev/branches/LUCENE-2878/lucene/highlighter/src/test/org/apache/lucene/search/highlight/positions/IntervalHighlighterTest.java > Thu Oct 25 10:09:33 2012 > @@ -53,7 +53,7 @@ import org.apache.lucene.search.position > import org.apache.lucene.search.positions.NonOverlappingQuery; > import org.apache.lucene.search.positions.IntervalFilterQuery; > import org.apache.lucene.search.positions.IntervalIterator; > -import org.apache.lucene.search.positions.IntervalIterator.IntervalFilter; > +import org.apache.lucene.search.positions.IntervalFilter; > import org.apache.lucene.search.positions.OrderedNearQuery; > import org.apache.lucene.store.Directory; > import org.apache.lucene.util.LuceneTestCase; > > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
