svn commit: r1144793 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/backwards/ lucene/backwards/src/test-framework/ lucene/backwards/src/test/ lucene/src/java/org/apache/lucene/index/IndexReader.java solr/

[us...@apache.org]

Author: uschindler
Date: Sun Jul 10 09:11:05 2011
New Revision: 1144793

URL: http://svn.apache.org/viewvc?rev=1144793&view=rev
Log:
LUCENE-3302: Replace legacy pre-java5-enum

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test-framework/   (props changed)
    lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexReader.java
    lucene/dev/branches/branch_3x/solr/   (props changed)

Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexReader.java?rev=1144793&r1=1144792&r2=1144793&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexReader.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexReader.java Sun Jul 10 09:11:05 2011
@@ -137,38 +137,29 @@ public abstract class IndexReader implem
    * Constants describing field properties, for example used for
    * {@link IndexReader#getFieldNames(FieldOption)}.
    */
-  public static final class FieldOption {
-    private String option;
-    private FieldOption() { }
-    private FieldOption(String option) {
-      this.option = option;
-    }
-    @Override
-    public String toString() {
-      return this.option;
-    }
+  public static enum FieldOption {
     /** All fields */
-    public static final FieldOption ALL = new FieldOption ("ALL");
+    ALL,
     /** All indexed fields */
-    public static final FieldOption INDEXED = new FieldOption ("INDEXED");
+    INDEXED,
     /** All fields that store payloads */
-    public static final FieldOption STORES_PAYLOADS = new FieldOption ("STORES_PAYLOADS");
+    STORES_PAYLOADS,
     /** All fields that omit tf */
-    public static final FieldOption OMIT_TERM_FREQ_AND_POSITIONS = new FieldOption ("OMIT_TERM_FREQ_AND_POSITIONS");
+    OMIT_TERM_FREQ_AND_POSITIONS,
     /** All fields which are not indexed */
-    public static final FieldOption UNINDEXED = new FieldOption ("UNINDEXED");
+    UNINDEXED,
     /** All fields which are indexed with termvectors enabled */
-    public static final FieldOption INDEXED_WITH_TERMVECTOR = new FieldOption ("INDEXED_WITH_TERMVECTOR");
+    INDEXED_WITH_TERMVECTOR,
     /** All fields which are indexed but don't have termvectors enabled */
-    public static final FieldOption INDEXED_NO_TERMVECTOR = new FieldOption ("INDEXED_NO_TERMVECTOR");
+    INDEXED_NO_TERMVECTOR,
     /** All fields with termvectors enabled. Please note that only standard termvector fields are returned */
-    public static final FieldOption TERMVECTOR = new FieldOption ("TERMVECTOR");
+    TERMVECTOR,
     /** All fields with termvectors with position values enabled */
-    public static final FieldOption TERMVECTOR_WITH_POSITION = new FieldOption ("TERMVECTOR_WITH_POSITION");
+    TERMVECTOR_WITH_POSITION,
     /** All fields with termvectors with offset values enabled */
-    public static final FieldOption TERMVECTOR_WITH_OFFSET = new FieldOption ("TERMVECTOR_WITH_OFFSET");
+    TERMVECTOR_WITH_OFFSET,
     /** All fields with termvectors with offset values and position values enabled */
-    public static final FieldOption TERMVECTOR_WITH_POSITION_OFFSET = new FieldOption ("TERMVECTOR_WITH_POSITION_OFFSET");
+    TERMVECTOR_WITH_POSITION_OFFSET,
   }
 
   private boolean closed;