lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikemcc...@apache.org
Subject svn commit: r1159961 - in /lucene/dev/branches/fieldtype_conflicted: lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/ lucene/contrib/misc/src/test/org/apache/lucene/index/ lucene/src/java/org/apache/lucene/analysis/ lucene/...
Date Sun, 21 Aug 2011 10:23:52 GMT
Author: mikemccand
Date: Sun Aug 21 10:23:51 2011
New Revision: 1159961

URL: http://svn.apache.org/viewvc?rev=1159961&view=rev
Log:
LUCENE-2308: fix javadocs; rm Fieldable.java / AbstractField.java

Removed:
    lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/AbstractField.java
    lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/Fieldable.java
Modified:
    lucene/dev/branches/fieldtype_conflicted/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html
    lucene/dev/branches/fieldtype_conflicted/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
    lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/analysis/package.html
    lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/Field.java
    lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/IndexDocValuesField.java
    lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/NumericField.java
    lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/package.html
    lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
    lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/ParallelReader.java
    lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/StoredFieldsWriter.java
    lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/values/PerDocFieldValues.java
    lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/search/TFIDFSimilarity.java
    lucene/dev/branches/fieldtype_conflicted/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
    lucene/dev/branches/fieldtype_conflicted/modules/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java
    lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/DoubleField.java
    lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/FieldType.java
    lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/SortableDoubleField.java
    lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/search/Grouping.java

Modified: lucene/dev/branches/fieldtype_conflicted/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html
(original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package.html
Sun Aug 21 10:23:51 2011
@@ -25,7 +25,7 @@ This is an another highlighter implement
 <li>support N-gram fields</li>
 <li>support phrase-unit highlighting with slops</li>
 <li>need Java 1.5</li>
-<li>highlight fields need to be TermVector.WITH_POSITIONS_OFFSETS</li>
+<li>highlight fields need to be stored with Positions and Offsets</li>
 <li>take into account query boost to score fragments</li>
 <li>support colored highlight tags</li>
 <li>pluggable FragListBuilder</li>
@@ -95,7 +95,7 @@ will be generated:</p>
 
 <h3>Step 2.</h3>
 <p>In Step 2, Fast Vector Highlighter generates {@link org.apache.lucene.search.vectorhighlight.FieldTermStack}.
Fast Vector Highlighter uses {@link org.apache.lucene.index.TermFreqVector} data
-(must be stored {@link org.apache.lucene.document.Field.TermVector#WITH_POSITIONS_OFFSETS})
+(must be stored {@link org.apache.lucene.document.FieldType#setStoreTermVectorOffsets(boolean)}
and {@link org.apache.lucene.document.FieldType#setStoreTermVectorPositions(boolean)})
 to generate it. <code>FieldTermStack</code> keeps the terms in the user query.
 Therefore, in this sample case, Fast Vector Highlighter generates the following <code>FieldTermStack</code>:</p>
 <pre>

Modified: lucene/dev/branches/fieldtype_conflicted/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
(original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java
Sun Aug 21 10:23:51 2011
@@ -33,7 +33,6 @@ import java.util.concurrent.atomic.Atomi
 import org.apache.lucene.analysis.MockAnalyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.document.StringField;
 import org.apache.lucene.document.TextField;
 import org.apache.lucene.index.codecs.CodecProvider;

Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/analysis/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/analysis/package.html?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/analysis/package.html
(original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/analysis/package.html
Sun Aug 21 10:23:51 2011
@@ -120,7 +120,7 @@ There are many post tokenization steps t
   Applications usually do not invoke analysis &ndash; Lucene does it for them:
   <ul>
     <li>At indexing, as a consequence of 
-        {@link org.apache.lucene.index.IndexWriter#addDocument(org.apache.lucene.document.Document)
addDocument(doc)},
+        {@link org.apache.lucene.index.IndexWriter#addDocument(Iterable) addDocument(doc)},
         the Analyzer in effect for indexing is invoked for each indexed field of the added
document.
     </li>
     <li>At search, a QueryParser may invoke the Analyzer during parsing.  Note that
for some queries, analysis does not
@@ -170,7 +170,7 @@ the source code of any one of the many s
 </p>
 <h3>Field Section Boundaries</h3>
 <p>
-  When {@link org.apache.lucene.document.Document#add(org.apache.lucene.document.Fieldable)
document.add(field)}
+  When {@link org.apache.lucene.document.Document#add(org.apache.lucene.index.IndexableField)
document.add(field)}
   is called multiple times for the same field name, we could say that each such call creates
a new 
   section for that field in that document. 
   In fact, a separate call to 

Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/Field.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/Field.java?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/Field.java
(original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/Field.java
Sun Aug 21 10:23:51 2011
@@ -237,22 +237,20 @@ public class Field implements IndexableF
   public float boost() {
     return boost;
   }
-  
-  /**
-   * Sets the boost factor hits on this field. This value will be multiplied
-   * into the score of all hits on this this field of this document.
-   * 
-   * <p>
-   * Boost is used to compute the norm factor for the field. By default, in the
-   * {@link org.apache.lucene.search.Similarity#computeNorm(FieldInvertState)}
-   * method, the boost value is multiplied by the length normalization factor
-   * and then rounded by
-   * {@link org.apache.lucene.search.Similarity#encodeNormValue(float)} before
-   * it is stored in the index. One should attempt to ensure that this product
-   * does not overflow the range of that encoding.
-   * 
+
+  /** Sets the boost factor hits on this field.  This value will be
+   * multiplied into the score of all hits on this this field of this
+   * document.
+   *
+   * <p>The boost is used to compute the norm factor for the field.  By
+   * default, in the {@link org.apache.lucene.search.Similarity#computeNorm(FieldInvertState)}
method, 
+   * the boost value is multiplied by the length normalization factor and then
+   * rounded by {@link org.apache.lucene.search.DefaultSimilarity#encodeNormValue(float)}
before it is stored in the
+   * index.  One should attempt to ensure that this product does not overflow
+   * the range of that encoding.
+   *
    * @see org.apache.lucene.search.Similarity#computeNorm(FieldInvertState)
-   * @see org.apache.lucene.search.Similarity#encodeNormValue(float)
+   * @see org.apache.lucene.search.DefaultSimilarity#encodeNormValue(float)
    */
   public void setBoost(float boost) {
     this.boost = boost;

Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/IndexDocValuesField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/IndexDocValuesField.java?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/IndexDocValuesField.java
(original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/IndexDocValuesField.java
Sun Aug 21 10:23:51 2011
@@ -26,7 +26,7 @@ import org.apache.lucene.util.BytesRef;
 
 /**
  * <p>
- * This class provides a {@link AbstractField} that enables storing of typed
+ * This class provides a {@link Field} that enables storing of typed
  * per-document values for scoring, sorting or value retrieval. Here's an
  * example usage, adding an int value:
  * 
@@ -51,9 +51,9 @@ import org.apache.lucene.util.BytesRef;
  * </pre>
  * 
  * <p>
- * If doc values are stored in addition to an indexed ({@link Index}) or stored
- * ({@link Store}) value it's recommended to use the {@link IndexDocValuesField}'s
- * {@link #set(AbstractField)} API:
+ * If doc values are stored in addition to an indexed ({@link FieldType#setIndexed(boolean)})
or stored
+ * ({@link FieldType#setStored(boolean)}) value it's recommended to use the {@link IndexDocValuesField}'s
+ * {@link #set(Field)} API:
  * 
  * <pre>
  *  IndexDocValuesField field = new IndexDocValuesField(name);
@@ -322,7 +322,7 @@ public class IndexDocValuesField extends
   }
 
   /**
-   * Sets this {@link IndexDocValuesField} to the given {@link AbstractField} and
+   * Sets this {@link IndexDocValuesField} to the given {@link Field} and
    * returns the given field. Any modifications to this instance will be visible
    * to the given field.
    */

Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/NumericField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/NumericField.java?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/NumericField.java
(original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/NumericField.java
Sun Aug 21 10:23:51 2011
@@ -76,7 +76,7 @@ import org.apache.lucene.search.FieldCac
  *
  * <p>By default, a <code>NumericField</code>'s value is not stored but
  * is indexed for range filtering and sorting.  You can use
- * the {@link #NumericField(String,Field.Store,boolean)}
+ * the {@link #NumericField(String, FieldType)}
  * constructor if you need to change these defaults.</p>
  *
  * <p>You may add the same field name as a <code>NumericField</code> to
@@ -104,7 +104,7 @@ import org.apache.lucene.search.FieldCac
  * default value, 4, was selected for a reasonable tradeoff
  * of disk space consumption versus performance.  You can
  * use the expert constructor {@link
- * #NumericField(String,int,Field.Store,boolean)} if you'd
+ * #NumericField(String,int,FieldType)} if you'd
  * like to change the value.  Note that you must also
  * specify a congruent value when creating {@link
  * NumericRangeQuery} or {@link NumericRangeFilter}.

Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/package.html?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/package.html
(original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/document/package.html
Sun Aug 21 10:23:51 2011
@@ -22,16 +22,16 @@
 <body>
 <p>The logical representation of a {@link org.apache.lucene.document.Document} for
indexing and searching.</p>
 <p>The document package provides the user level logical representation of content to
be indexed and searched.  The
-package also provides utilities for working with {@link org.apache.lucene.document.Document}s
and {@link org.apache.lucene.document.Fieldable}s.</p>
-<h2>Document and Fieldable</h2>
-<p>A {@link org.apache.lucene.document.Document} is a collection of {@link org.apache.lucene.document.Fieldable}s.
 A
-  {@link org.apache.lucene.document.Fieldable} is a logical representation of a user's content
that needs to be indexed or stored.
-  {@link org.apache.lucene.document.Fieldable}s have a number of properties that tell Lucene
how to treat the content (like indexed, tokenized,
-  stored, etc.)  See the {@link org.apache.lucene.document.Field} implementation of {@link
org.apache.lucene.document.Fieldable}
+package also provides utilities for working with {@link org.apache.lucene.document.Document}s
and {@link org.apache.lucene.index.IndexableField}s.</p>
+<h2>Document and IndexableField</h2>
+<p>A {@link org.apache.lucene.document.Document} is a collection of {@link org.apache.lucene.index.IndexableField}s.
 A
+  {@link org.apache.lucene.index.IndexableField} is a logical representation of a user's
content that needs to be indexed or stored.
+  {@link org.apache.lucene.index.IndexableField}s have a number of properties that tell Lucene
how to treat the content (like indexed, tokenized,
+  stored, etc.)  See the {@link org.apache.lucene.document.Field} implementation of {@link
org.apache.lucene.index.IndexableField}
   for specifics on these properties.
 </p>
 <p>Note: it is common to refer to {@link org.apache.lucene.document.Document}s having
{@link org.apache.lucene.document.Field}s, even though technically they have
-{@link org.apache.lucene.document.Fieldable}s.</p>
+{@link org.apache.lucene.index.IndexableField}s.</p>
 <h2>Working with Documents</h2>
 <p>First and foremost, a {@link org.apache.lucene.document.Document} is something created
by the user application.  It is your job
   to create Documents based on the content of the files you are working with in your application
(Word, txt, PDF, Excel or any other format.)
@@ -45,7 +45,7 @@ package also provides utilities for work
 to simplify indexing of numeric values (and also dates) for fast range range queries with
{@link org.apache.lucene.search.NumericRangeQuery}
 (using a special sortable string representation of numeric values).</p>
 <p>The {@link org.apache.lucene.document.FieldSelector} class provides a mechanism
to tell Lucene how to load Documents from
-storage.  If no FieldSelector is used, all Fieldables on a Document will be loaded.  As an
example of the FieldSelector usage, consider
+storage.  If no FieldSelector is used, all IndexableFields on a Document will be loaded.
 As an example of the FieldSelector usage, consider
   the common use case of
 displaying search results on a web page and then having users click through to see the full
document.  In this scenario, it is often
   the case that there are many small fields and one or two large fields (containing the contents
of the original file). Before the FieldSelector,

Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
(original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
Sun Aug 21 10:23:51 2011
@@ -22,7 +22,6 @@ import java.util.Comparator;
 import java.util.Map;
 
 import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
-import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.index.FieldInfo.IndexOptions;
 import org.apache.lucene.index.codecs.FieldsConsumer;
 import org.apache.lucene.index.codecs.PostingsConsumer;

Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/ParallelReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/ParallelReader.java?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/ParallelReader.java
(original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/ParallelReader.java
Sun Aug 21 10:23:51 2011
@@ -18,7 +18,6 @@ package org.apache.lucene.index;
  */
 
 import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.index.codecs.PerDocValues;
 import org.apache.lucene.index.values.IndexDocValues;
 import org.apache.lucene.util.Bits;

Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/StoredFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/StoredFieldsWriter.java?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/StoredFieldsWriter.java
(original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/StoredFieldsWriter.java
Sun Aug 21 10:23:51 2011
@@ -19,7 +19,6 @@ package org.apache.lucene.index;
 
 import java.io.IOException;
 
-import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.store.IOContext;
 import org.apache.lucene.util.ArrayUtil;
 import org.apache.lucene.util.RamUsageEstimator;

Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/values/PerDocFieldValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/values/PerDocFieldValues.java?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/values/PerDocFieldValues.java
(original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/index/values/PerDocFieldValues.java
Sun Aug 21 10:23:51 2011
@@ -19,14 +19,14 @@ package org.apache.lucene.index.values;
 import java.util.Comparator;
 
 import org.apache.lucene.document.IndexDocValuesField;
-import org.apache.lucene.document.Fieldable;
+import org.apache.lucene.index.IndexableField; // for javadoc
 import org.apache.lucene.index.codecs.DocValuesConsumer;
 import org.apache.lucene.util.BytesRef;
 
 /**
  * Per document and field values consumed by {@link DocValuesConsumer}. 
  * @see IndexDocValuesField
- * @see Fieldable#setDocValues(PerDocFieldValues)
+ * @see IndexableField#setDocValues(PerDocFieldValues)
  * 
  * @lucene.experimental
  */

Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/search/TFIDFSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/search/TFIDFSimilarity.java?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/search/TFIDFSimilarity.java
(original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/java/org/apache/lucene/search/TFIDFSimilarity.java
Sun Aug 21 10:23:51 2011
@@ -454,12 +454,8 @@ import org.apache.lucene.util.SmallFloat
  *      <b><i>norm(t,d)</i></b> encapsulates a few (indexing time)
boost and length factors:
  *
  *      <ul>
- *        <li><b>Document boost</b> - set by calling
- *        {@link org.apache.lucene.document.Document#setBoost(float) doc.setBoost()}
- *        before adding the document to the index.
- *        </li>
  *        <li><b>Field boost</b> - set by calling
- *        {@link org.apache.lucene.document.Fieldable#setBoost(float) field.setBoost()}
+ *        {@link org.apache.lucene.document.Field#setBoost(float) field.setBoost()}
  *        before adding the field to a document.
  *        </li>
  *        <li><b>lengthNorm</b> - computed
@@ -480,8 +476,6 @@ import org.apache.lucene.util.SmallFloat
  *        <tr>
  *          <td valign="middle" align="right" rowspan="1">
  *            norm(t,d) &nbsp; = &nbsp;
- *            {@link org.apache.lucene.document.Document#getBoost() doc.getBoost()}
- *            &nbsp;&middot;&nbsp;
  *            lengthNorm
  *            &nbsp;&middot;&nbsp;
  *          </td>
@@ -489,7 +483,7 @@ import org.apache.lucene.util.SmallFloat
  *            <big><big><big>&prod;</big></big></big>
  *          </td>
  *          <td valign="middle" align="right" rowspan="1">
- *            {@link org.apache.lucene.document.Fieldable#getBoost() f.getBoost}()
+ *            {@link org.apache.lucene.index.IndexableField#boost() f.boost}()
  *          </td>
  *        </tr>
  *        <tr valigh="top">

Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
(original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test-framework/org/apache/lucene/util/_TestUtil.java
Sun Aug 21 10:23:51 2011
@@ -36,7 +36,6 @@ import java.util.zip.ZipFile;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.index.CheckIndex;
 import org.apache.lucene.index.ConcurrentMergeScheduler;
 import org.apache.lucene.index.FieldInfos;

Modified: lucene/dev/branches/fieldtype_conflicted/modules/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/modules/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/modules/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java
(original)
+++ lucene/dev/branches/fieldtype_conflicted/modules/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java
Sun Aug 21 10:23:51 2011
@@ -4,7 +4,6 @@ import org.apache.lucene.analysis.Analyz
 import org.apache.lucene.analysis.MockAnalyzer;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.document.FieldType;
 import org.apache.lucene.document.TextField;
 import org.apache.lucene.index.RandomIndexWriter;

Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/DoubleField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/DoubleField.java?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/DoubleField.java
(original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/DoubleField.java
Sun Aug 21 10:23:51 2011
@@ -17,7 +17,6 @@
 
 package org.apache.solr.schema;
 
-import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.queries.function.ValueSource;
 import org.apache.lucene.queries.function.valuesource.DoubleFieldSource;
 import org.apache.lucene.index.IndexableField;

Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/FieldType.java?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/FieldType.java
(original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/FieldType.java
Sun Aug 21 10:23:51 2011
@@ -268,8 +268,6 @@ public abstract class FieldType extends 
    * Fields per SchemaField
    * @param name The name of the field
    * @param val The _internal_ value to index
-   * @param omitNorms true if norms should be omitted
-   * @param options options for what should be indexed in the postings
    * @param type {@link org.apache.lucene.document.FieldType}
    * @param boost The boost value
    * @return the {@link org.apache.lucene.index.IndexableField}.

Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/SortableDoubleField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/SortableDoubleField.java?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/SortableDoubleField.java
(original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/schema/SortableDoubleField.java
Sun Aug 21 10:23:51 2011
@@ -27,7 +27,6 @@ import org.apache.lucene.util.CharsRef;
 import org.apache.lucene.util.mutable.MutableValue;
 import org.apache.lucene.util.mutable.MutableValueDouble;
 import org.apache.solr.search.QParser;
-import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.index.IndexableField;
 import org.apache.solr.util.NumberUtils;

Modified: lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/search/Grouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/search/Grouping.java?rev=1159961&r1=1159960&r2=1159961&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/search/Grouping.java
(original)
+++ lucene/dev/branches/fieldtype_conflicted/solr/core/src/java/org/apache/solr/search/Grouping.java
Sun Aug 21 10:23:51 2011
@@ -19,7 +19,6 @@ package org.apache.solr.search;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Fieldable;
 import org.apache.lucene.index.IndexReader.AtomicReaderContext;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.queries.function.DocValues;



Mime
View raw message