You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ry...@apache.org on 2008/10/03 23:26:57 UTC

svn commit: r701539 [3/6] - in /lucene/solr/branches/sandbox/ryan: client/java/solrj/src/org/apache/solr/client/solrj/embedded/ client/java/solrj/src/org/apache/solr/client/solrj/impl/ client/java/solrj/src/org/apache/solr/client/solrj/response/ client...

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/RubyResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/RubyResponseWriter.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/RubyResponseWriter.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/RubyResponseWriter.java Fri Oct  3 14:26:50 2008
@@ -44,7 +44,9 @@
 
 class RubyWriter extends NaNFloatWriter {
 
+  @Override
   protected String getNaN() { return "(0.0/0.0)"; }
+  @Override
   protected String getInf() { return "(1.0/0.0)"; }
 
   public RubyWriter(Writer writer, SolrQueryRequest req, SolrQueryResponse rsp) {

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/ServletSolrParams.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/ServletSolrParams.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/ServletSolrParams.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/ServletSolrParams.java Fri Oct  3 14:26:50 2008
@@ -29,6 +29,7 @@
     super(req.getParameterMap());
   }
 
+  @Override
   public String get(String name) {
     String[] arr = map.get(name);
     if (arr==null) return null;

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/SimpleFacets.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/SimpleFacets.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/SimpleFacets.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/SimpleFacets.java Fri Oct  3 14:26:50 2008
@@ -473,7 +473,7 @@
       }
 
       final String gap = required.getFieldParam(f,FacetParams.FACET_DATE_GAP);
-      final DateMathParser dmp = new DateMathParser(ft.UTC, Locale.US);
+      final DateMathParser dmp = new DateMathParser(DateField.UTC, Locale.US);
       dmp.setNow(NOW);
       
       try {
@@ -571,9 +571,11 @@
     }
     public K key;
     public V val;
+    @Override
     public int hashCode() {
       return key.hashCode() ^ val.hashCode();
     }
+    @Override
     public boolean equals(Object o) {
       return (o instanceof CountPair)
         && (0 == this.compareTo((CountPair<K,V>) o));

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/SolrQueryRequest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/SolrQueryRequest.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/SolrQueryRequest.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/SolrQueryRequest.java Fri Oct  3 14:26:50 2008
@@ -19,7 +19,6 @@
 
 import org.apache.solr.search.SolrIndexSearcher;
 import org.apache.solr.schema.IndexSchema;
-import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.ContentStream;
 import org.apache.solr.core.SolrCore;
@@ -63,50 +62,6 @@
    */
   public void close();
 
-  /**
-   * Returns the input parameter value for the specified name
-   * @return the value, or the first value if the parameter was
-   * specified more then once; may be null.
-   * @deprecated Use {@link #getParams()} instead.
-   */
-  @Deprecated
-  public String getParam(String name);
-
-  /**
-   * Returns the input parameter values for the specified name
-   * @return the values; may be null or empty depending on implementation
-   * @deprecated Use {@link #getParams()} instead.
-   */
-  @Deprecated
-  public String[] getParams(String name);
-
-  /**
-   * Returns the primary query string parameter of the request
-   * @deprecated Use {@link #getParams()} and {@link CommonParams#Q} instead.
-   */
-  @Deprecated
-  public String getQueryString();
-
-  /**
-   * Signifies the syntax and the handler that should be used
-   * to execute this query.
-   * @deprecated Use {@link #getParams()} and {@link CommonParams#QT} instead.
-   */
-  @Deprecated
-  public String getQueryType();
-
-  /** starting position in matches to return to client
-   * @deprecated Use {@link #getParams()} and {@link CommonParams#START} instead.
-   */
-  @Deprecated
-  public int getStart();
-
-  /** number of matching documents to return
-   * @deprecated Use {@link #getParams()} and {@link CommonParams#ROWS} instead.
-   */
-  @Deprecated
-  public int getLimit();
-
   /** The start time of this request in milliseconds */
   public long getStartTime();
 
@@ -124,11 +79,6 @@
    * Suitable for logging.
    */
   public String getParamString();
-
-  /******
-  // Get the current elapsed time in milliseconds
-  public long getElapsedTime();
-  ******/
 }
 
 

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/SolrQueryRequestBase.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/SolrQueryRequestBase.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/SolrQueryRequestBase.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/SolrQueryRequestBase.java Fri Oct  3 14:26:50 2008
@@ -20,8 +20,6 @@
 import org.apache.solr.search.SolrIndexSearcher;
 import org.apache.solr.util.RefCounted;
 import org.apache.solr.schema.IndexSchema;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.ContentStream;
 import org.apache.solr.core.SolrCore;
@@ -42,33 +40,8 @@
  *
  * @version $Id$
  */
-public abstract class SolrQueryRequestBase implements SolrQueryRequest {
-  /**
-   * @deprecated Use org.apache.solr.common.params.CommonParams
-   */
-  @Deprecated
-  public static final String QUERY_NAME="q";
-  /**
-   * @deprecated Use org.apache.solr.common.params.CommonParams
-   */
-  @Deprecated
-  public static final String START_NAME="start";
-  /**
-   * @deprecated Use org.apache.solr.common.params.CommonParams
-   */
-  @Deprecated
-  public static final String ROWS_NAME="rows";
-  /**
-   * @deprecated Use org.apache.solr.common.params.CommonParams
-   */
-  @Deprecated
-  public static final String XSL_NAME="xsl";
-  /**
-   * @deprecated Use org.apache.solr.common.params.CommonParams
-   */
-  @Deprecated
-  public static final String QUERYTYPE_NAME="qt";
-
+public abstract class SolrQueryRequestBase implements SolrQueryRequest 
+{
   protected final SolrCore core;
   protected final SolrParams origParams;
   protected SolrParams params;
@@ -98,99 +71,6 @@
     this.params = params;
   }
 
-  /**
-   * @deprecated Use {@link #getParams()} instead.
-   */
-  @Deprecated
-  public String getParam(String name) {
-    return params.get(name);
-  }
-
-  /**
-   * @deprecated Use {@link #getParams()} instead.
-   */
-  @Deprecated
-  public String[] getParams(String name) {
-    return params.getParams(name);
-  }
-
-  /**
-   * @deprecated use getParams().required().getInt( name ) instead
-   */
-  @Deprecated
-  public int getIntParam(String name) {
-    String s = getParam(name);
-    if (s==null) {
-      throw new SolrException( SolrException.ErrorCode.SERVER_ERROR,"Missing required parameter '"+name+"' from " + this);
-    }
-    return Integer.parseInt(s);
-  }
-
-  /**
-   * @deprecated use getParams().required().getInt( name ) instead
-   */
-  @Deprecated
-  public int getIntParam(String name, int defval) {
-    String s = getParam(name);
-    return s==null ? defval : Integer.parseInt(s);
-  }
-
-  /**
-   * @deprecated use getParams().required().getParam( name ) instead
-   */
-  @Deprecated
-  public String getStrParam(String name) {
-    String s = getParam(name);
-    if (s==null) {
-      throw new SolrException( SolrException.ErrorCode.SERVER_ERROR,"Missing required parameter '"+name+"' from " + this);
-    }
-    return s;
-  }
-
-  /**
-   * @deprecated use getParams().required().getParam( name ) instead
-   */
-  @Deprecated
-  public String getStrParam(String name, String defval) {
-    String s = getParam(name);
-    return s==null ? defval : s;
-  }
-
-  /**
-   * @deprecated Use {@link #getParams()} and {@link CommonParams#Q} instead.
-   */
-  @Deprecated
-  public String getQueryString() {
-    return params.get(CommonParams.Q);
-  }
-
-  /**
-   * @deprecated Use {@link #getParams()} and {@link CommonParams#QT} instead.
-   */
-  @Deprecated
-  public String getQueryType() {
-    return params.get(CommonParams.QT);
-  }
-
-  /**
-   * starting position in matches to return to client
-   * @deprecated Use {@link #getParams()} and {@link CommonParams#START} instead.
-   */
-  @Deprecated
-  public int getStart() {
-    return params.getInt(CommonParams.START, 0);
-  }
-
-  /**
-   * number of matching documents to return
-   * @deprecated Use {@link #getParams()} and {@link CommonParams#ROWS} instead.
-   */
-  @Deprecated
-  public int getLimit() {
-    return params.getInt(CommonParams.ROWS, 10);
-  }
-
-
   protected final long startTime=System.currentTimeMillis();
   // Get the start time of this request in milliseconds
   public long getStartTime() {
@@ -246,6 +126,7 @@
     return origParams.toString();
   }
 
+  @Override
   public String toString() {
     return this.getClass().getSimpleName() + '{' + params + '}';
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/TextResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/TextResponseWriter.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/TextResponseWriter.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/request/TextResponseWriter.java Fri Oct  3 14:26:50 2008
@@ -18,7 +18,6 @@
 package org.apache.solr.request;
 
 import org.apache.lucene.document.Document;
-import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.common.util.FastWriter;
 import org.apache.solr.common.SolrDocument;

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BCDIntField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BCDIntField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BCDIntField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BCDIntField.java Fri Oct  3 14:26:50 2008
@@ -30,22 +30,27 @@
  * @version $Id$
  */
 public class BCDIntField extends FieldType {
+  @Override
   protected void init(IndexSchema schema, Map<String,String> args) {
   }
 
+  @Override
   public SortField getSortField(SchemaField field,boolean reverse) {
     return getStringSort(field,reverse);
   }
 
+  @Override
   public ValueSource getValueSource(SchemaField field) {
     throw new UnsupportedOperationException("ValueSource not implemented");
   }
 
+  @Override
   public String toInternal(String val) {
     // TODO? make sure each character is a digit?
     return BCDUtils.base10toBase10kSortableInt(val);
   }
 
+  @Override
   public String toExternal(Fieldable f) {
     return indexedToReadable(f.stringValue());
   }
@@ -56,14 +61,17 @@
     return Integer.valueOf( toExternal(f) );
   }
 
+  @Override
   public String indexedToReadable(String indexedForm) {
     return BCDUtils.base10kSortableIntToBase10(indexedForm);
   }
 
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     xmlWriter.writeInt(name,toExternal(f));
   }
 
+  @Override
   public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
     writer.writeInt(name,toExternal(f));
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BCDLongField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BCDLongField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BCDLongField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BCDLongField.java Fri Oct  3 14:26:50 2008
@@ -25,6 +25,7 @@
  * @version $Id$
  */
 public class BCDLongField extends BCDIntField {
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     xmlWriter.writeLong(name,toExternal(f));
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BCDStrField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BCDStrField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BCDStrField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BCDStrField.java Fri Oct  3 14:26:50 2008
@@ -25,6 +25,7 @@
  * @version $Id$
  */
 public class BCDStrField extends BCDIntField {
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     xmlWriter.writeStr(name,toExternal(f));
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BoolField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BoolField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BoolField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/BoolField.java Fri Oct  3 14:26:50 2008
@@ -36,13 +36,16 @@
  * @version $Id$
  */
 public class BoolField extends FieldType {
+  @Override
   protected void init(IndexSchema schema, Map<String,String> args) {
   }
 
+  @Override
   public SortField getSortField(SchemaField field,boolean reverse) {
     return getStringSort(field,reverse);
   }
 
+  @Override
   public ValueSource getValueSource(SchemaField field) {
     return new OrdFieldSource(field.name);
   }
@@ -57,9 +60,11 @@
 
 
   protected final static Analyzer boolAnalyzer = new SolrAnalyzer() {
+      @Override
       public TokenStream tokenStream(String fieldName, Reader reader) {
         return new Tokenizer(reader) {
           boolean done=false;
+          @Override
           public Token next() throws IOException {
             if (done) return null;
             done=true;
@@ -71,19 +76,23 @@
       }
     };
 
+  @Override
   public Analyzer getAnalyzer() {
     return boolAnalyzer;
   }
 
+  @Override
   public Analyzer getQueryAnalyzer() {
     return boolAnalyzer;
   }
 
+  @Override
   public String toInternal(String val) {
     char ch = (val!=null && val.length()>0) ? val.charAt(0) : 0;
     return (ch=='1' || ch=='t' || ch=='T') ? "T" : "F";
   }
 
+  @Override
   public String toExternal(Fieldable f) {
     return indexedToReadable(f.stringValue());
   }
@@ -93,15 +102,18 @@
     return Boolean.valueOf( toExternal(f) );
   }
 
+  @Override
   public String indexedToReadable(String indexedForm) {
     char ch = indexedForm.charAt(0);
     return ch=='T' ? "true" : "false";
   }
 
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     xmlWriter.writeBool(name, f.stringValue().charAt(0) =='T');
   }
 
+  @Override
   public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
     writer.writeBool(name, f.stringValue().charAt(0) =='T');
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/ByteField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/ByteField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/ByteField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/ByteField.java Fri Oct  3 14:26:50 2008
@@ -31,24 +31,29 @@
  * @version $Id: LongField.java 555343 2007-07-11 17:46:25Z hossman $
  */
 public class ByteField extends FieldType {
+  @Override
   protected void init(IndexSchema schema, Map<String, String> args) {
     restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
   }
 
   /////////////////////////////////////////////////////////////
+  @Override
   public SortField getSortField(SchemaField field, boolean reverse) {
     return new SortField(field.name, SortField.BYTE, reverse);
   }
 
+  @Override
   public ValueSource getValueSource(SchemaField field) {
     return new ByteFieldSource(field.name);
   }
 
 
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     xmlWriter.writeByte(name, f.stringValue());
   }
 
+  @Override
   public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
     writer.writeByte(name, f.stringValue());
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/CompressableField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/CompressableField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/CompressableField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/CompressableField.java Fri Oct  3 14:26:50 2008
@@ -46,6 +46,7 @@
 
   private static String CT = "compressThreshold";
 
+  @Override
   protected void init(IndexSchema schema, Map<String,String> args) {
     SolrParams p = new MapSolrParams(args);
     compressThreshold = p.getInt(CT, DEFAULT_COMPRESS_THRESHOLD);
@@ -53,10 +54,10 @@
     super.init(schema, args);    
   }
 
-    /* Helpers for field construction */
-  protected Field.Store getFieldStore(SchemaField field,
-                                      String internalVal) {
-    /* compress field if length exceeds threshold */
+  /* Helpers for field construction */
+  @Override
+  protected Field.Store getFieldStore(SchemaField field, String internalVal) {
+    // compress field if length exceeds threshold 
     if(field.isCompressed()) {
       return internalVal.length() >= compressThreshold ? 
         Field.Store.COMPRESS : Field.Store.YES;

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/DateField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/DateField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/DateField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/DateField.java Fri Oct  3 14:26:50 2008
@@ -128,12 +128,14 @@
   // The easiest fix is to simply remove the 'Z' for the internal
   // format.
   
+  @Override
   protected void init(IndexSchema schema, Map<String,String> args) {
   }
 
   protected static String NOW = "NOW";
   protected static char Z = 'Z';
   
+  @Override
   public String toInternal(String val) {
     return toInternal(parseMath(null, val));
   }
@@ -185,10 +187,12 @@
     return formatDate(val);
   }
 
+  @Override
   public String indexedToReadable(String indexedForm) {
     return indexedForm + Z;
   }
 
+  @Override
   public String toExternal(Fieldable f) {
     return indexedToReadable(f.stringValue());
   }
@@ -206,35 +210,27 @@
     }
   }
 
+  @Override
   public SortField getSortField(SchemaField field,boolean reverse) {
     return getStringSort(field,reverse);
   }
 
+  @Override
   public ValueSource getValueSource(SchemaField field) {
     return new OrdFieldSource(field.name);
   }
 
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     xmlWriter.writeDate(name, toExternal(f));
   }
 
+  @Override
   public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
     writer.writeDate(name, toExternal(f));
   }
 
   /**
-   * Returns a formatter that can be use by the current thread if needed to
-   * convert Date objects to the Internal representation.
-   *
-   * Only the <tt>format(Date)</tt> can be used safely.
-   * 
-   * @deprecated - use formatDate(Date) instead
-   */
-  protected DateFormat getThreadLocalDateFormat() {
-    return fmtThreadLocal.get();
-  }
-
-  /**
    * Thread safe method that can be used by subclasses to format a Date
    * using the Internal representation.
    */
@@ -271,6 +267,7 @@
       this.setTimeZone(CANONICAL_TZ);
     }
 
+    @Override
     public Date parse(String i, ParsePosition p) {
       /* delegate to SimpleDateFormat for easy stuff */
       Date d = super.parse(i, p);
@@ -292,6 +289,7 @@
       return d;
     }
 
+    @Override
     public StringBuffer format(Date d, StringBuffer toAppendTo,
                                FieldPosition pos) {
       /* delegate to SimpleDateFormat for easy stuff */
@@ -310,6 +308,7 @@
       return toAppendTo;
     }
 
+    @Override
     public Object clone() {
       ISO8601CanonicalDateFormat c
         = (ISO8601CanonicalDateFormat) super.clone();
@@ -326,6 +325,7 @@
       super();
       proto = d;
     }
+    @Override
     protected DateFormat initialValue() {
       return (DateFormat) proto.clone();
     }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/DoubleField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/DoubleField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/DoubleField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/DoubleField.java Fri Oct  3 14:26:50 2008
@@ -31,24 +31,29 @@
  * @version $Id$
  */
 public class DoubleField extends FieldType {
+  @Override
   protected void init(IndexSchema schema, Map<String, String> args) {
     restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
   }
 
   /////////////////////////////////////////////////////////////
+  @Override
   public SortField getSortField(SchemaField field, boolean reverse) {
     return new SortField(field.name, SortField.DOUBLE, reverse);
   }
 
+  @Override
   public ValueSource getValueSource(SchemaField field) {
     // fieldCache doesn't support double
     return new DoubleFieldSource(field.name);
   }
 
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     xmlWriter.writeDouble(name, f.stringValue());
   }
 
+  @Override
   public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
     writer.writeDouble(name, f.stringValue());
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/ExternalFileField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/ExternalFileField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/ExternalFileField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/ExternalFileField.java Fri Oct  3 14:26:50 2008
@@ -19,7 +19,6 @@
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.document.Fieldable;
 import org.apache.solr.search.function.ValueSource;
-import org.apache.solr.search.function.FloatFieldSource;
 import org.apache.solr.search.function.FileFloatSource;
 import org.apache.solr.search.QParser;
 import org.apache.solr.request.XMLWriter;
@@ -61,6 +60,7 @@
   private IndexSchema schema;
   private float defVal;
 
+  @Override
   protected void init(IndexSchema schema, Map<String,String> args) {
     restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
     String ftypeS = getArg("valType", args);
@@ -76,18 +76,22 @@
     this.schema = schema;
   }
 
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     throw new UnsupportedOperationException();
   }
 
+  @Override
   public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
     throw new UnsupportedOperationException();
   }
 
+  @Override
   public SortField getSortField(SchemaField field,boolean reverse) {
     throw new UnsupportedOperationException();
   }
 
+  @Override
   public ValueSource getValueSource(SchemaField field, QParser parser) {
     // default key field to unique key
     SchemaField keyField = keyFieldName==null ? schema.getUniqueKeyField() : schema.getField(keyFieldName);

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/FieldType.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/FieldType.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/FieldType.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/FieldType.java Fri Oct  3 14:26:50 2008
@@ -140,6 +140,7 @@
     this.typeName = typeName;
   }
 
+  @Override
   public String toString() {
     return typeName + "{class=" + this.getClass().getName()
 //            + propertiesToString(properties)
@@ -307,9 +308,11 @@
       this.maxChars=maxChars;
     }
 
+    @Override
     public TokenStream tokenStream(String fieldName, Reader reader) {
       return new Tokenizer(reader) {
         char[] cbuf = new char[maxChars];
+        @Override
         public Token next() throws IOException {
           int n = input.read(cbuf,0,maxChars);
           if (n<=0) return null;

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/FloatField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/FloatField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/FloatField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/FloatField.java Fri Oct  3 14:26:50 2008
@@ -30,22 +30,27 @@
  * @version $Id$
  */
 public class FloatField extends FieldType {
+  @Override
   protected void init(IndexSchema schema, Map<String,String> args) {
     restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
   }
 
+  @Override
   public SortField getSortField(SchemaField field,boolean reverse) {
     return new SortField(field.name,SortField.FLOAT, reverse);
   }
 
+  @Override
   public ValueSource getValueSource(SchemaField field) {
     return new FloatFieldSource(field.name);
   }
 
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     xmlWriter.writeFloat(name, f.stringValue());
   }
 
+  @Override
   public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
     writer.writeFloat(name, f.stringValue());
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/IndexSchema.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/IndexSchema.java Fri Oct  3 14:26:50 2008
@@ -64,17 +64,6 @@
   private float version;
 
   /**
-   * Constructs a schema using the specified file name using the normal
-   * Config path directory searching rules.
-   *
-   * @see Config#openResource
-   * @deprecated Use {@link #IndexSchema(SolrConfig, String, InputStream)} instead.
-   */
-  @Deprecated
-  public IndexSchema(SolrConfig solrConfig, String name) {
-    this(solrConfig, name, null);
-  }
-    /**
    * Constructs a schema using the specified resource name and stream.
    * If the is stream is null, the resource loader will load the schema resource by name.
    * @see SolrResourceLoader#openSchema
@@ -119,31 +108,6 @@
   float getVersion() {
     return version;
   }
-  
-  /**
-   * Direct access to the InputStream for the schemaFile used by this instance.
-   * @see Config#openResource
-   * @deprecated Use {@link #getSolrConfig()} and open a resource input stream
-   *             for {@link #getResourceName()} instead.
-   */
-  @Deprecated
-  public InputStream getInputStream() {
-    return solrConfig.getResourceLoader().openResource(resourceName);
-  }
-
-  /** Gets the name of the schema file.
-   * @deprecated Use {@link #getResourceName()} instead.
-   */
-  @Deprecated
-  public String getSchemaFile() {
-    return resourceName;
-  }
-
-  /** The Name of this schema (as specified in the schema file)
-   * @deprecated Use {@link #getSchemaName()} instead.
-   */
-  @Deprecated
-  public String getName() { return name; }
 
   private final HashMap<String, SchemaField> fields = new HashMap<String,SchemaField>();
   private final HashMap<String, FieldType> fieldTypes = new HashMap<String,FieldType>();
@@ -344,6 +308,7 @@
       return analyzer!=null ? analyzer : getDynamicFieldType(fieldName).getAnalyzer();
     }
 
+    @Override
     public TokenStream tokenStream(String fieldName, Reader reader)
     {
       return getAnalyzer(fieldName).tokenStream(fieldName,reader);
@@ -527,12 +492,13 @@
     log.trace("Dynamic Field Ordering:" + dFields);
 
     // stuff it in a normal array for faster access
-    dynamicFields = (DynamicField[])dFields.toArray(new DynamicField[dFields.size()]);
+    dynamicFields = dFields.toArray(new DynamicField[dFields.size()]);
 
 
     Node node = (Node) xpath.evaluate("/schema/similarity", document, XPathConstants.NODE);
     if (node==null) {
       similarityFactory = new SimilarityFactory() {
+        @Override
         public Similarity getSimilarity() {
           return Similarity.getDefault();
         }
@@ -548,6 +514,7 @@
       } else {
         // just like always, assume it's a Similarlity and get an ClassCastException - reasonable error handling
         similarityFactory = new SimilarityFactory() {
+          @Override
           public Similarity getSimilarity() {
             return (Similarity) obj;
           }
@@ -851,6 +818,7 @@
       return new SchemaField(prototype, name);
     }
 
+    @Override
     public String toString() {
       return prototype.toString();
     }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/IntField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/IntField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/IntField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/IntField.java Fri Oct  3 14:26:50 2008
@@ -30,22 +30,27 @@
  * @version $Id$
  */
 public class IntField extends FieldType {
+  @Override
   protected void init(IndexSchema schema, Map<String,String> args) {
     restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
   }
 
+  @Override
   public SortField getSortField(SchemaField field,boolean reverse) {
     return new SortField(field.name,SortField.INT, reverse);
   }
 
+  @Override
   public ValueSource getValueSource(SchemaField field) {
     return new IntFieldSource(field.name);
   }
 
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     xmlWriter.writeInt(name, f.stringValue());
   }
 
+  @Override
   public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
     String s = f.stringValue();
     int len = s.length();

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/LongField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/LongField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/LongField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/LongField.java Fri Oct  3 14:26:50 2008
@@ -21,7 +21,6 @@
 import org.apache.lucene.search.SortField;
 import org.apache.solr.request.TextResponseWriter;
 import org.apache.solr.request.XMLWriter;
-import org.apache.solr.search.function.IntFieldSource;
 import org.apache.solr.search.function.ValueSource;
 import org.apache.solr.search.function.LongFieldSource;
 
@@ -31,23 +30,27 @@
  * @version $Id$
  */
 public class LongField extends FieldType {
+  @Override
   protected void init(IndexSchema schema, Map<String,String> args) {
     restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
   }
 
   /////////////////////////////////////////////////////////////
 
+  @Override
   public SortField getSortField(SchemaField field,boolean reverse) {
 
     return new SortField(field.name,SortField.LONG, reverse);
   }
 
+  @Override
   public ValueSource getValueSource(SchemaField field) {
 
     return new LongFieldSource(field.name);
   }
 
 
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     xmlWriter.writeLong(name, f.stringValue());
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/RandomSortField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/RandomSortField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/RandomSortField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/RandomSortField.java Fri Oct  3 14:26:50 2008
@@ -170,22 +170,22 @@
           private final int seed = getSeed(field, reader);
           @Override
           public float floatVal(int doc) {
-            return (float)hash(doc+seed);
+            return hash(doc+seed);
           }
 
           @Override
           public int intVal(int doc) {
-            return (int)hash(doc+seed);
+            return hash(doc+seed);
           }
 
           @Override
           public long longVal(int doc) {
-            return (long)hash(doc+seed);
+            return hash(doc+seed);
           }
 
           @Override
           public double doubleVal(int doc) {
-            return (double)hash(doc+seed);
+            return hash(doc+seed);
           }
 
           @Override

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SchemaField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SchemaField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SchemaField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SchemaField.java Fri Oct  3 14:26:50 2008
@@ -168,7 +168,7 @@
 
     String defaultValue = null;
     if( props.containsKey( "default" ) ) {
-    	defaultValue = (String)props.get( "default" );
+    	defaultValue = props.get( "default" );
     }
     return new SchemaField(name, ft, p, defaultValue );
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/ShortField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/ShortField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/ShortField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/ShortField.java Fri Oct  3 14:26:50 2008
@@ -33,23 +33,27 @@
  *
  **/
 public class ShortField extends FieldType {
+  @Override
   protected void init(IndexSchema schema, Map<String, String> args) {
     restrictProps(SORT_MISSING_FIRST | SORT_MISSING_LAST);
   }
 
   /////////////////////////////////////////////////////////////
 
+  @Override
   public SortField getSortField(SchemaField field, boolean reverse) {
 
     return new SortField(field.name, SortField.SHORT, reverse);
   }
 
+  @Override
   public ValueSource getValueSource(SchemaField field) {
 
     return new ShortFieldSource(field.name);
   }
 
 
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     xmlWriter.writeShort(name, f.stringValue());
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableDoubleField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableDoubleField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableDoubleField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableDoubleField.java Fri Oct  3 14:26:50 2008
@@ -34,21 +34,26 @@
  * @version $Id$
  */
 public class SortableDoubleField extends FieldType {
+  @Override
   protected void init(IndexSchema schema, Map<String,String> args) {
   }
 
+  @Override
   public SortField getSortField(SchemaField field,boolean reverse) {
     return getStringSort(field,reverse);
   }
 
+  @Override
   public ValueSource getValueSource(SchemaField field) {
     return new SortableDoubleFieldSource(field.name);
   }
 
+  @Override
   public String toInternal(String val) {
     return NumberUtils.double2sortableStr(val);
   }
 
+  @Override
   public String toExternal(Fieldable f) {
     return indexedToReadable(f.stringValue());
   }
@@ -58,15 +63,18 @@
     return NumberUtils.SortableStr2double(f.stringValue());
   }
   
+  @Override
   public String indexedToReadable(String indexedForm) {
     return NumberUtils.SortableStr2doubleStr(indexedForm);
   }
 
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     String sval = f.stringValue();
     xmlWriter.writeDouble(name, NumberUtils.SortableStr2double(sval));
   }
 
+  @Override
   public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
     String sval = f.stringValue();
     writer.writeDouble(name, NumberUtils.SortableStr2double(sval));
@@ -88,10 +96,12 @@
     this.defVal = defVal;
   }
 
+  @Override
   public String description() {
     return "sdouble(" + field + ')';
   }
 
+  @Override
   public DocValues getValues(IndexReader reader) throws IOException {
     final FieldCache.StringIndex index = cache.getStringIndex(reader, field);
     final int[] order = index.order;
@@ -99,33 +109,40 @@
     final double def = defVal;
 
     return new DocValues() {
+      @Override
       public float floatVal(int doc) {
         return (float)doubleVal(doc);
       }
 
+      @Override
       public int intVal(int doc) {
         return (int)doubleVal(doc);
       }
 
+      @Override
       public long longVal(int doc) {
         return (long)doubleVal(doc);
       }
 
+      @Override
       public double doubleVal(int doc) {
         int ord=order[doc];
         return ord==0 ? def  : NumberUtils.SortableStr2double(lookup[ord]);
       }
 
+      @Override
       public String strVal(int doc) {
         return Double.toString(doubleVal(doc));
       }
 
+      @Override
       public String toString(int doc) {
         return description() + '=' + doubleVal(doc);
       }
     };
   }
 
+  @Override
   public boolean equals(Object o) {
     return o instanceof SortableDoubleFieldSource
             && super.equals(o)
@@ -133,6 +150,7 @@
   }
 
   private static int hcode = SortableDoubleFieldSource.class.hashCode();
+  @Override
   public int hashCode() {
     long bits = Double.doubleToLongBits(defVal);
     int ibits = (int)(bits ^ (bits>>>32));  // mix upper bits into lower.

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableFloatField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableFloatField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableFloatField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableFloatField.java Fri Oct  3 14:26:50 2008
@@ -34,21 +34,26 @@
  * @version $Id$
  */
 public class SortableFloatField extends FieldType {
+  @Override
   protected void init(IndexSchema schema, Map<String,String> args) {
   }
 
+  @Override
   public SortField getSortField(SchemaField field,boolean reverse) {
     return getStringSort(field,reverse);
   }
 
+  @Override
   public ValueSource getValueSource(SchemaField field) {
     return new SortableFloatFieldSource(field.name);
   }
 
+  @Override
   public String toInternal(String val) {
     return NumberUtils.float2sortableStr(val);
   }
 
+  @Override
   public String toExternal(Fieldable f) {
     return indexedToReadable(f.stringValue());
   }
@@ -58,15 +63,18 @@
     return NumberUtils.SortableStr2float(f.stringValue());
   }
   
+  @Override
   public String indexedToReadable(String indexedForm) {
     return NumberUtils.SortableStr2floatStr(indexedForm);
   }
 
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     String sval = f.stringValue();
     xmlWriter.writeFloat(name, NumberUtils.SortableStr2float(sval));
   }
 
+  @Override
   public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
     String sval = f.stringValue();
     writer.writeFloat(name, NumberUtils.SortableStr2float(sval));
@@ -88,10 +96,12 @@
     this.defVal = defVal;
   }
 
+    @Override
     public String description() {
     return "sfloat(" + field + ')';
   }
 
+  @Override
   public DocValues getValues(IndexReader reader) throws IOException {
     final FieldCache.StringIndex index = cache.getStringIndex(reader, field);
     final int[] order = index.order;
@@ -99,33 +109,40 @@
     final float def = defVal;
 
     return new DocValues() {
+      @Override
       public float floatVal(int doc) {
         int ord=order[doc];
         return ord==0 ? def  : NumberUtils.SortableStr2float(lookup[ord]);
       }
 
+      @Override
       public int intVal(int doc) {
         return (int)floatVal(doc);
       }
 
+      @Override
       public long longVal(int doc) {
         return (long)floatVal(doc);
       }
 
+      @Override
       public double doubleVal(int doc) {
-        return (double)floatVal(doc);
+        return floatVal(doc);
       }
 
+      @Override
       public String strVal(int doc) {
         return Float.toString(floatVal(doc));
       }
 
+      @Override
       public String toString(int doc) {
         return description() + '=' + floatVal(doc);
       }
     };
   }
 
+  @Override
   public boolean equals(Object o) {
     return o instanceof SortableFloatFieldSource
             && super.equals(o)
@@ -133,6 +150,7 @@
   }
 
   private static int hcode = SortableFloatFieldSource.class.hashCode();
+  @Override
   public int hashCode() {
     return hcode + super.hashCode() + Float.floatToIntBits(defVal);
   };

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableIntField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableIntField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableIntField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableIntField.java Fri Oct  3 14:26:50 2008
@@ -34,17 +34,21 @@
  * @version $Id$
  */
 public class SortableIntField extends FieldType {
+  @Override
   protected void init(IndexSchema schema, Map<String,String> args) {
   }
 
+  @Override
   public SortField getSortField(SchemaField field,boolean reverse) {
     return getStringSort(field,reverse);
   }
 
+  @Override
   public ValueSource getValueSource(SchemaField field) {
     return new SortableIntFieldSource(field.name);
   }
 
+  @Override
   public String toInternal(String val) {
     // special case single digits?  years?, etc
     // stringCache?  general stringCache on a
@@ -52,10 +56,12 @@
     return NumberUtils.int2sortableStr(val);
   }
 
+  @Override
   public String toExternal(Fieldable f) {
     return indexedToReadable(f.stringValue());
   }
 
+  @Override
   public String indexedToReadable(String indexedForm) {
     return NumberUtils.SortableStr2int(indexedForm);
   }
@@ -65,6 +71,7 @@
     return NumberUtils.SortableStr2int(f.stringValue(), 0, 3);    
   }
   
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     String sval = f.stringValue();
     // since writeInt an int instead of a String since that may be more efficient
@@ -72,6 +79,7 @@
     xmlWriter.writeInt(name, NumberUtils.SortableStr2int(sval,0,sval.length()));
   }
 
+  @Override
   public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
     String sval = f.stringValue();
     writer.writeInt(name, NumberUtils.SortableStr2int(sval,0,sval.length()));
@@ -92,10 +100,12 @@
     this.defVal = defVal;
   }
 
+  @Override
   public String description() {
     return "sint(" + field + ')';
   }
 
+  @Override
   public DocValues getValues(IndexReader reader) throws IOException {
     final FieldCache.StringIndex index = cache.getStringIndex(reader, field);
     final int[] order = index.order;
@@ -103,33 +113,40 @@
     final int def = defVal;
 
     return new DocValues() {
+      @Override
       public float floatVal(int doc) {
-        return (float)intVal(doc);
+        return intVal(doc);
       }
 
+      @Override
       public int intVal(int doc) {
         int ord=order[doc];
         return ord==0 ? def  : NumberUtils.SortableStr2int(lookup[ord],0,3);
       }
 
+      @Override
       public long longVal(int doc) {
-        return (long)intVal(doc);
+        return intVal(doc);
       }
 
+      @Override
       public double doubleVal(int doc) {
-        return (double)intVal(doc);
+        return intVal(doc);
       }
 
+      @Override
       public String strVal(int doc) {
         return Integer.toString(intVal(doc));
       }
 
+      @Override
       public String toString(int doc) {
         return description() + '=' + intVal(doc);
       }
     };
   }
 
+  @Override
   public boolean equals(Object o) {
     return o instanceof SortableIntFieldSource
             && super.equals(o)
@@ -137,6 +154,7 @@
   }
 
   private static int hcode = SortableIntFieldSource.class.hashCode();
+  @Override
   public int hashCode() {
     return hcode + super.hashCode() + defVal;
   };

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableLongField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableLongField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableLongField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/SortableLongField.java Fri Oct  3 14:26:50 2008
@@ -34,25 +34,31 @@
  * @version $Id$
  */
 public class SortableLongField extends FieldType {
+  @Override
   protected void init(IndexSchema schema, Map<String,String> args) {
   }
 
+  @Override
   public SortField getSortField(SchemaField field,boolean reverse) {
     return getStringSort(field,reverse);
   }
 
+  @Override
   public ValueSource getValueSource(SchemaField field) {
     return new SortableLongFieldSource(field.name);
   }
 
+  @Override
   public String toInternal(String val) {
     return NumberUtils.long2sortableStr(val);
   }
 
+  @Override
   public String indexedToReadable(String indexedForm) {
     return NumberUtils.SortableStr2long(indexedForm);
   }
 
+  @Override
   public String toExternal(Fieldable f) {
     return indexedToReadable(f.stringValue());
   }
@@ -62,11 +68,13 @@
     return NumberUtils.SortableStr2long(f.stringValue(),0,5);
   }
   
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     String sval = f.stringValue();
     xmlWriter.writeLong(name, NumberUtils.SortableStr2long(sval,0,sval.length()));
   }
 
+  @Override
   public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
     String sval = f.stringValue();
     writer.writeLong(name, NumberUtils.SortableStr2long(sval,0,sval.length()));
@@ -89,10 +97,12 @@
     this.defVal = defVal;
   }
 
+  @Override
   public String description() {
     return "slong(" + field + ')';
   }
 
+  @Override
   public DocValues getValues(IndexReader reader) throws IOException {
     final FieldCache.StringIndex index = cache.getStringIndex(reader, field);
     final int[] order = index.order;
@@ -100,33 +110,40 @@
     final long def = defVal;
 
     return new DocValues() {
+      @Override
       public float floatVal(int doc) {
-        return (float)longVal(doc);
+        return longVal(doc);
       }
 
+      @Override
       public int intVal(int doc) {
         return (int)longVal(doc);
       }
 
+      @Override
       public long longVal(int doc) {
         int ord=order[doc];
         return ord==0 ? def  : NumberUtils.SortableStr2long(lookup[ord],0,5);
       }
 
+      @Override
       public double doubleVal(int doc) {
-        return (double)longVal(doc);
+        return longVal(doc);
       }
 
+      @Override
       public String strVal(int doc) {
         return Long.toString(longVal(doc));
       }
 
+      @Override
       public String toString(int doc) {
         return description() + '=' + longVal(doc);
       }
     };
   }
 
+  @Override
   public boolean equals(Object o) {
     return o instanceof SortableLongFieldSource
             && super.equals(o)
@@ -134,6 +151,7 @@
   }
 
   private static int hcode = SortableLongFieldSource.class.hashCode();
+  @Override
   public int hashCode() {
     return hcode + super.hashCode() + (int)defVal;
   };

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/StrField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/StrField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/StrField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/StrField.java Fri Oct  3 14:26:50 2008
@@ -28,18 +28,22 @@
  * @version $Id$
  */
 public class StrField extends CompressableField {
+  @Override
   protected void init(IndexSchema schema, Map<String,String> args) {
     super.init(schema, args);    
   }
 
+  @Override
   public SortField getSortField(SchemaField field,boolean reverse) {
     return getStringSort(field,reverse);
   }
 
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     xmlWriter.writeStr(name, f.stringValue());
   }
 
+  @Override
   public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
     writer.writeStr(name, f.stringValue(), true);
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/TextField.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/TextField.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/TextField.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/schema/TextField.java Fri Oct  3 14:26:50 2008
@@ -30,19 +30,23 @@
  * @version $Id$
  */
 public class TextField extends CompressableField {
+  @Override
   protected void init(IndexSchema schema, Map<String,String> args) {
     properties |= TOKENIZED;
     super.init(schema, args);    
   }
 
+  @Override
   public SortField getSortField(SchemaField field, boolean reverse) {
     return getStringSort(field, reverse);
   }
 
+  @Override
   public void write(XMLWriter xmlWriter, String name, Fieldable f) throws IOException {
     xmlWriter.writeStr(name, f.stringValue());
   }
 
+  @Override
   public void write(TextResponseWriter writer, String name, Fieldable f) throws IOException {
     writer.writeStr(name, f.stringValue(), true);
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/BitDocSet.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/BitDocSet.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/BitDocSet.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/BitDocSet.java Fri Oct  3 14:26:50 2008
@@ -112,15 +112,18 @@
    *
    * @return the <b>internal</b> OpenBitSet that should <b>not</b> be modified.
    */
+  @Override
   public OpenBitSet getBits() {
     return bits;
   }
 
+  @Override
   public void add(int doc) {
     bits.set(doc);
     size=-1;  // invalidate size
   }
 
+  @Override
   public void addUnique(int doc) {
     bits.set(doc);
     size=-1;  // invalidate size

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/BoostQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/BoostQParserPlugin.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/BoostQParserPlugin.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/BoostQParserPlugin.java Fri Oct  3 14:26:50 2008
@@ -40,12 +40,14 @@
   public void init(NamedList args) {
   }
 
+  @Override
   public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
     return new QParser(qstr, localParams, params, req) {
       QParser baseParser;
       ValueSource vs;
       String b;
 
+      @Override
       public Query parse() throws ParseException {
         b = localParams.get(BOOSTFUNC);
         baseParser = subQuery(localParams.get(QueryParsing.V), null);
@@ -62,14 +64,17 @@
       }
 
 
+      @Override
       public String[] getDefaultHighlightFields() {
         return baseParser.getDefaultHighlightFields();
       }
 
+      @Override
       public Query getHighlightQuery() throws ParseException {
         return baseParser.getHighlightQuery();
       }
 
+      @Override
       public void addDebugInfo(NamedList<Object> debugInfo) {
         // encapsulate base debug info in a sub-list?
         baseParser.addDebugInfo(debugInfo);

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/CacheConfig.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/CacheConfig.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/CacheConfig.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/CacheConfig.java Fri Oct  3 14:26:50 2008
@@ -22,7 +22,6 @@
 
 import java.util.Map;
 
-import org.apache.solr.common.ResourceLoader;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.util.DOMUtil;
 import org.apache.solr.core.SolrConfig;
@@ -69,7 +68,7 @@
 
 
   public static CacheConfig getConfig(SolrConfig solrConfig, String xpath) {
-    Node node = (Node)solrConfig.getNode(xpath, false);
+    Node node = solrConfig.getNode(xpath, false);
     return getConfig(solrConfig, node);
   }
 
@@ -79,14 +78,14 @@
     CacheConfig config = new CacheConfig();
     config.nodeName = node.getNodeName();
     config.args = DOMUtil.toMap(node.getAttributes());
-    String nameAttr = (String)config.args.get("name");  // OPTIONAL
+    String nameAttr = config.args.get("name");  // OPTIONAL
     if (nameAttr==null) {
       config.args.put("name",config.nodeName);
     }
 
     SolrResourceLoader loader = solrConfig.getResourceLoader();
-    config.cacheImpl = (String)config.args.get("class");
-    config.regenImpl = (String)config.args.get("regenerator");
+    config.cacheImpl = config.args.get("class");
+    config.regenImpl = config.args.get("regenerator");
     config.clazz = loader.findClass(config.cacheImpl);
     if (config.regenImpl != null) {
       config.regenerator = (CacheRegenerator) loader.newInstance(config.regenImpl);

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/ConstantScorePrefixQuery.java Fri Oct  3 14:26:50 2008
@@ -37,6 +37,7 @@
   /** Returns the prefix  for this query */
   public Term getPrefix() { return prefix; }
 
+  @Override
   public Query rewrite(IndexReader reader) throws IOException {
     // TODO: if number of terms are low enough, rewrite to a BooleanQuery
     // for potentially faster execution.
@@ -47,6 +48,7 @@
   }
 
   /** Prints a user-readable version of this query. */
+  @Override
   public String toString(String field)
   {
     StringBuffer buffer = new StringBuffer();
@@ -64,6 +66,7 @@
   }
 
     /** Returns true if <code>o</code> is equal to this. */
+    @Override
     public boolean equals(Object o) {
       if (this == o) return true;
       if (!(o instanceof ConstantScorePrefixQuery)) return false;
@@ -72,6 +75,7 @@
     }
 
     /** Returns a hash code value for this object.*/
+    @Override
     public int hashCode() {
       int h = prefix.hashCode() ^ Float.floatToIntBits(getBoost());
       h ^= (h << 14) | (h >>> 19);  // reversible (1 to 1) transformation unique to ConstantScorePrefixQuery

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/DisMaxQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/DisMaxQParserPlugin.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/DisMaxQParserPlugin.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/DisMaxQParserPlugin.java Fri Oct  3 14:26:50 2008
@@ -46,6 +46,7 @@
   public void init(NamedList args) {
   }
 
+  @Override
   public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
     return new DismaxQParser(qstr, localParams, params, req);
   }
@@ -76,6 +77,7 @@
   private QParser altQParser;
   
 
+  @Override
   public Query parse() throws ParseException {
     SolrParams solrParams = localParams == null ? params : new DefaultSolrParams(localParams, params);
 
@@ -229,6 +231,7 @@
     return parsedUserQuery;
   }
 
+  @Override
   public void addDebugInfo(NamedList<Object> debugInfo) {
     super.addDebugInfo(debugInfo);
     debugInfo.add("altquerystring", altUserQuery);

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/DocSet.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/DocSet.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/DocSet.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/DocSet.java Fri Oct  3 14:26:50 2008
@@ -141,6 +141,7 @@
 abstract class DocSetBase implements DocSet {
 
   // Not implemented efficiently... for testing purposes only
+  @Override
   public boolean equals(Object obj) {
     if (!(obj instanceof DocSet)) return false;
     DocSet other = (DocSet)obj;

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/DocSetHitCollector.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/DocSetHitCollector.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/DocSetHitCollector.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/DocSetHitCollector.java Fri Oct  3 14:26:50 2008
@@ -19,7 +19,6 @@
 
 import org.apache.lucene.search.HitCollector;
 import org.apache.solr.util.OpenBitSet;
-import org.apache.solr.core.SolrConfig;
 
 /**
  * @version $Id$
@@ -47,6 +46,7 @@
     scratch = new int[HASHDOCSET_MAXSIZE];
   }
 
+  @Override
   public void collect(int doc, float score) {
     // optimistically collect the first docs in an array
     // in case the total number will be small enough to represent

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/FieldQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/FieldQParserPlugin.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/FieldQParserPlugin.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/FieldQParserPlugin.java Fri Oct  3 14:26:50 2008
@@ -46,8 +46,10 @@
   public void init(NamedList args) {
   }
 
+  @Override
   public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
     return new QParser(qstr, localParams, params, req) {
+      @Override
       public Query parse() throws ParseException {
         String field = localParams.get(QueryParsing.F);
         String queryText = localParams.get(QueryParsing.V);
@@ -104,7 +106,7 @@
               // no phrase query:
               BooleanQuery q = new BooleanQuery(true);
               for (int i = 0; i < lst.size(); i++) {
-                t = (org.apache.lucene.analysis.Token) lst.get(i);
+                t = lst.get(i);
                 TermQuery currentQuery = new TermQuery(
                         new Term(field, new String(t.termBuffer(), 0, t.termLength())));
                 q.add(currentQuery, BooleanClause.Occur.SHOULD);
@@ -117,7 +119,7 @@
               mpq.setSlop(phraseSlop);
               ArrayList multiTerms = new ArrayList();
               for (int i = 0; i < lst.size(); i++) {
-                t = (org.apache.lucene.analysis.Token) lst.get(i);
+                t = lst.get(i);
                 if (t.getPositionIncrement() == 1 && multiTerms.size() > 0) {
                   mpq.add((Term[])multiTerms.toArray(new Term[0]));
                   multiTerms.clear();

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/FunctionQParser.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/FunctionQParser.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/FunctionQParser.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/FunctionQParser.java Fri Oct  3 14:26:50 2008
@@ -35,6 +35,7 @@
     super(qstr, localParams, params, req);
   }
 
+  @Override
   public Query parse() throws ParseException {
     sp = new QueryParsing.StrParser(getString());
     ValueSource vs = parseValueSource();

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/FunctionQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/FunctionQParserPlugin.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/FunctionQParserPlugin.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/FunctionQParserPlugin.java Fri Oct  3 14:26:50 2008
@@ -31,6 +31,7 @@
   public void init(NamedList args) {
   }
 
+  @Override
   public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
     return new FunctionQParser(qstr, localParams, params, req);
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/LRUCache.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/LRUCache.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/LRUCache.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/LRUCache.java Fri Oct  3 14:26:50 2008
@@ -80,6 +80,7 @@
     description += ')';
 
     map = new LinkedHashMap(initialSize, 0.75f, true) {
+        @Override
         protected boolean removeEldestEntry(Map.Entry eldest) {
           if (size() > limit) {
             // increment evictions regardless of state.
@@ -279,6 +280,7 @@
     return lst;
   }
 
+  @Override
   public String toString() {
     return name + getStatistics().toString();
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/LuceneQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/LuceneQParserPlugin.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/LuceneQParserPlugin.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/LuceneQParserPlugin.java Fri Oct  3 14:26:50 2008
@@ -42,6 +42,7 @@
   public void init(NamedList args) {
   }
 
+  @Override
   public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
     return new LuceneQParser(qstr, localParams, params, req);
   }
@@ -56,6 +57,7 @@
   }
 
 
+  @Override
   public Query parse() throws ParseException {
     String qstr = getString();
 
@@ -80,6 +82,7 @@
   }
 
 
+  @Override
   public String[] getDefaultHighlightFields() {
     return new String[]{lparser.getField()};
   }
@@ -94,6 +97,7 @@
     super(qstr, localParams, params, req);
   }
 
+  @Override
   public Query parse() throws ParseException {
     // handle legacy "query;sort" syntax
     if (getLocalParams() == null) {

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/LuceneQueryOptimizer.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/LuceneQueryOptimizer.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/LuceneQueryOptimizer.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/LuceneQueryOptimizer.java Fri Oct  3 14:26:50 2008
@@ -47,6 +47,7 @@
    */
   public LuceneQueryOptimizer(final int cacheSize, float threshold) {
     this.cache = new LinkedHashMap(cacheSize, 0.75f, true) {
+        @Override
         protected boolean removeEldestEntry(Map.Entry eldest) {
           return size() > cacheSize;              // limit size of cache
         }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/NestedQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/NestedQParserPlugin.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/NestedQParserPlugin.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/NestedQParserPlugin.java Fri Oct  3 14:26:50 2008
@@ -21,9 +21,6 @@
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.search.function.BoostedQuery;
-import org.apache.solr.search.function.FunctionQuery;
-import org.apache.solr.search.function.QueryValueSource;
 import org.apache.solr.search.function.ValueSource;
 
 /**
@@ -41,25 +38,30 @@
   public void init(NamedList args) {
   }
 
+  @Override
   public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
     return new QParser(qstr, localParams, params, req) {
       QParser baseParser;
       ValueSource vs;
       String b;
 
+      @Override
       public Query parse() throws ParseException {
         baseParser = subQuery(localParams.get(QueryParsing.V), null);
         return baseParser.getQuery();
       }
 
+      @Override
       public String[] getDefaultHighlightFields() {
         return baseParser.getDefaultHighlightFields();
       }
 
+      @Override
       public Query getHighlightQuery() throws ParseException {
         return baseParser.getHighlightQuery();
       }
 
+      @Override
       public void addDebugInfo(NamedList<Object> debugInfo) {
         // encapsulate base debug info in a sub-list?
         baseParser.addDebugInfo(debugInfo);

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java Fri Oct  3 14:26:50 2008
@@ -31,6 +31,7 @@
   public void init(NamedList args) {
   }
 
+  @Override
   public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
     return new OldLuceneQParser(qstr, localParams, params, req);
   }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/PrefixQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/PrefixQParserPlugin.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/PrefixQParserPlugin.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/PrefixQParserPlugin.java Fri Oct  3 14:26:50 2008
@@ -36,8 +36,10 @@
   public void init(NamedList args) {
   }
 
+  @Override
   public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
     return new QParser(qstr, localParams, params, req) {
+      @Override
       public Query parse() throws ParseException {
         return new PrefixQuery(new Term(localParams.get(QueryParsing.F), localParams.get(QueryParsing.V)));
       }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/QueryParsing.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/QueryParsing.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/QueryParsing.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/QueryParsing.java Fri Oct  3 14:26:50 2008
@@ -600,6 +600,7 @@
       return pos<end ? val.charAt(pos) : 0;  
     }
 
+    @Override
     public String toString() {
       return "'" + val + "'" + ", pos=" + pos;
     }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/QueryResultKey.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/QueryResultKey.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/QueryResultKey.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/QueryResultKey.java Fri Oct  3 14:26:50 2008
@@ -64,10 +64,12 @@
     hc = h;
   }
 
+  @Override
   public int hashCode() {
     return hc;
   }
 
+  @Override
   public boolean equals(Object o) {
     if (o==this) return true;
     if (!(o instanceof QueryResultKey)) return false;

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/RawQParserPlugin.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/RawQParserPlugin.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/RawQParserPlugin.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/RawQParserPlugin.java Fri Oct  3 14:26:50 2008
@@ -35,8 +35,10 @@
   public void init(NamedList args) {
   }
 
+  @Override
   public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) {
     return new QParser(qstr, localParams, params, req) {
+      @Override
       public Query parse() throws ParseException {
         return new TermQuery(new Term(localParams.get(QueryParsing.F), localParams.get(QueryParsing.V)));
       }

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/SolrIndexSearcher.java Fri Oct  3 14:26:50 2008
@@ -162,6 +162,7 @@
   }
 
 
+  @Override
   public String toString() {
     return name;
   }
@@ -185,6 +186,7 @@
    *
    * In particular, the underlying reader and any cache's in use are closed.
    */
+  @Override
   public void close() throws IOException {
     if (cachingEnabled) {
       StringBuilder sb = new StringBuilder();
@@ -270,6 +272,7 @@
     return qr;
   }
 
+  @Override
   public Hits search(Query query, Filter filter, Sort sort) throws IOException {
     // todo - when Solr starts accepting filters, need to
     // change this conditional check (filter!=null) and create a new filter
@@ -287,26 +290,32 @@
     }
   }
 
+  @Override
   public Hits search(Query query, Filter filter) throws IOException {
     return searcher.search(query, filter);
   }
 
+  @Override
   public Hits search(Query query, Sort sort) throws IOException {
     return searcher.search(query, sort);
   }
 
+  @Override
   public void search(Query query, HitCollector results) throws IOException {
     searcher.search(query, results);
   }
 
+  @Override
   public void setSimilarity(Similarity similarity) {
     searcher.setSimilarity(similarity);
   }
 
+  @Override
   public Similarity getSimilarity() {
     return searcher.getSimilarity();
   }
 
+  @Override
   public int docFreq(Term term) throws IOException {
     return searcher.docFreq(term);
   }
@@ -340,6 +349,7 @@
   /**
    * Retrieve the {@link Document} instance corresponding to the document id.
    */
+  @Override
   public Document doc(int i) throws IOException {
     return doc(i, (Set<String>)null);
   }
@@ -401,26 +411,32 @@
 
   /* ********************** end document retrieval *************************/
 
+  @Override
   public int maxDoc() throws IOException {
     return searcher.maxDoc();
   }
 
+  @Override
   public TopDocs search(Weight weight, Filter filter, int i) throws IOException {
     return searcher.search(weight, filter, i);
   }
 
+  @Override
   public void search(Weight weight, Filter filter, HitCollector hitCollector) throws IOException {
     searcher.search(weight, filter, hitCollector);
   }
 
+  @Override
   public Query rewrite(Query original) throws IOException {
     return searcher.rewrite(original);
   }
 
+  @Override
   public Explanation explain(Weight weight, int i) throws IOException {
     return searcher.explain(weight, i);
   }
 
+  @Override
   public TopFieldDocs search(Weight weight, Filter filter, int i, Sort sort) throws IOException {
     return searcher.search(weight, filter, i, sort);
   }
@@ -607,6 +623,7 @@
       final DocSetHitCollector hc = new DocSetHitCollector(HASHSET_INVERSE_LOAD_FACTOR, HASHDOCSET_MAXSIZE, maxDoc());
       final DocSet filt = filter;
       searcher.search(query, null, new HitCollector() {
+        @Override
         public void collect(int doc, float score) {
           if (filt.exists(doc)) hc.collect(doc,score);
         }
@@ -875,6 +892,7 @@
       final int[] numHits = new int[1];
 
       HitCollector hc = new HitCollector() {
+        @Override
         public void collect(int doc, float score) {
           if (filt!=null && !filt.exists(doc)) return;
           numHits[0]++;
@@ -907,6 +925,7 @@
       final FieldSortedHitQueue hq = new FieldSortedHitQueue(reader, cmd.getSort().getSort(), len);
 
       HitCollector hc = new HitCollector() {
+        @Override
         public void collect(int doc, float score) {
           if (filt!=null && !filt.exists(doc)) return;
           numHits[0]++;
@@ -947,6 +966,7 @@
       final int[] numHits = new int[1];
       HitCollector hc = new HitCollector() {
         float minScore=Float.NEGATIVE_INFINITY;  // minimum score in the priority queue
+        @Override
         public void collect(int doc, float score) {
           if (filt!=null && !filt.exists(doc)) return;
           if (numHits[0]++ < lastDocRequested || score >= minScore) {
@@ -1079,6 +1099,7 @@
 
       try {
         searcher.search(query, new HitCollector() {
+          @Override
           public void collect(int doc, float score) {
             hitCollector.collect(doc,score);
             if (filt!=null && !filt.exists(doc)) return;
@@ -1109,6 +1130,7 @@
 
       try {
         searcher.search(query, new HitCollector() {
+          @Override
           public void collect(int doc, float score) {
             hitCollector.collect(doc,score);
             if (filt!=null && !filt.exists(doc)) return;
@@ -1147,6 +1169,7 @@
       try {
         searcher.search(query, new HitCollector() {
           float minScore=Float.NEGATIVE_INFINITY;  // minimum score in the priority queue
+          @Override
           public void collect(int doc, float score) {
             hitCollector.collect(doc,score);
             if (filt!=null && !filt.exists(doc)) return;
@@ -1749,6 +1772,7 @@
     initialize(size);
   }
 
+  @Override
   protected final boolean lessThan(Object o1, Object o2) {
     ScoreDoc sd1 = (ScoreDoc)o1;
     ScoreDoc sd2 = (ScoreDoc)o2;

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/SolrQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/SolrQueryParser.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/SolrQueryParser.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/SolrQueryParser.java Fri Oct  3 14:26:50 2008
@@ -95,6 +95,7 @@
     }
   }
 
+  @Override
   protected Query getFieldQuery(String field, String queryText) throws ParseException {
     checkNullField(field);
     // intercept magic field name of "_" to use as a hook for our
@@ -116,6 +117,7 @@
     return super.getFieldQuery(field, queryText);
   }
 
+  @Override
   protected Query getRangeQuery(String field, String part1, String part2, boolean inclusive) throws ParseException {
     checkNullField(field);
     FieldType ft = schema.getFieldType(field);
@@ -126,6 +128,7 @@
       inclusive, inclusive);
   }
 
+  @Override
   protected Query getPrefixQuery(String field, String termStr) throws ParseException {
     checkNullField(field);
     if (getLowercaseExpandedTerms()) {
@@ -146,6 +149,7 @@
     return new ConstantScorePrefixQuery(t);
   }
 
+  @Override
   protected Query getWildcardQuery(String field, String termStr) throws ParseException {
     Query q = super.getWildcardQuery(field, termStr);
     if (q instanceof WildcardQuery) {

Modified: lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/SolrSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/SolrSimilarity.java?rev=701539&r1=701538&r2=701539&view=diff
==============================================================================
--- lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/SolrSimilarity.java (original)
+++ lucene/solr/branches/sandbox/ryan/src/java/org/apache/solr/search/SolrSimilarity.java Fri Oct  3 14:26:50 2008
@@ -29,6 +29,7 @@
 class SolrSimilarity extends DefaultSimilarity {
   private final HashMap<String,Float> lengthNormConfig = new HashMap<String,Float>();
 
+  @Override
   public float lengthNorm(String fieldName, int numTerms) {
     // Float f = lengthNormConfig.
     // if (lengthNormDisabled.)