Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-1478: small cosmetic cleanups 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@724552 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2008-12-08 23:27:34 +00:00
parent d53b6786c9
commit f92d3cc82f
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/java/org/apache/lucene/search/SortField.java
View File

@ -169,34 +169,19 @@ implements Serializable {
* subclass an existing numeric parser, or field is null * subclass an existing numeric parser, or field is null
*/ */
public SortField (String field, FieldCache.Parser parser, boolean reverse) { public SortField (String field, FieldCache.Parser parser, boolean reverse) {
if (parser instanceof FieldCache.IntParser) initFieldType(field, INT);
if (parser instanceof FieldCache.IntParser) this.type=INT; else if (parser instanceof FieldCache.FloatParser) initFieldType(field, FLOAT);
else if (parser instanceof FieldCache.FloatParser) this.type=FLOAT; else if (parser instanceof FieldCache.ShortParser) initFieldType(field, SHORT);
else if (parser instanceof FieldCache.ShortParser) this.type=SHORT; else if (parser instanceof FieldCache.ByteParser) initFieldType(field, BYTE);
else if (parser instanceof FieldCache.ByteParser) this.type=BYTE; else if (parser instanceof ExtendedFieldCache.LongParser) initFieldType(field, LONG);
else if (parser instanceof ExtendedFieldCache.LongParser) this.type=LONG; else if (parser instanceof ExtendedFieldCache.DoubleParser) initFieldType(field, DOUBLE);
else if (parser instanceof ExtendedFieldCache.DoubleParser) this.type=DOUBLE;
else else
throw new IllegalArgumentException("Parser instance does not subclass existing numeric parser from FieldCache or ExtendedFieldCache (got " + parser + ")"); throw new IllegalArgumentException("Parser instance does not subclass existing numeric parser from FieldCache or ExtendedFieldCache (got " + parser + ")");
initFieldType(field, type);
this.reverse = reverse; this.reverse = reverse;
this.parser = parser; this.parser = parser;
} }
// Sets field & type, and ensures field is not NULL unless
// type is SCORE or DOC
private void initFieldType(String field, int type) {
this.type = type;
if (field == null) {
if (type != SCORE && type != DOC)
throw new IllegalArgumentException("field can only be null when type is SCORE or DOC");
} else {
this.field = field.intern();
}
}
/** Creates a sort by terms in the given field sorted /** Creates a sort by terms in the given field sorted
* according to the given locale. * according to the given locale.
* @param field Name of field to sort by, cannot be <code>null</code>. * @param field Name of field to sort by, cannot be <code>null</code>.
@ -238,6 +223,18 @@ implements Serializable {
this.factory = comparator; this.factory = comparator;
} }
// Sets field & type, and ensures field is not NULL unless
// type is SCORE or DOC
private void initFieldType(String field, int type) {
this.type = type;
if (field == null) {
if (type != SCORE && type != DOC)
throw new IllegalArgumentException("field can only be null when type is SCORE or DOC");
} else {
this.field = field.intern();
}
}
/** Returns the name of the field. Could return <code>null</code> /** Returns the name of the field. Could return <code>null</code>
* if the sort is by SCORE or DOC. * if the sort is by SCORE or DOC.
* @return Name of field, possibly <code>null</code>. * @return Name of field, possibly <code>null</code>.