You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2011/06/03 21:01:00 UTC

svn commit: r1131142 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/backwards/ lucene/src/java/org/apache/lucene/util/fst/FST.java lucene/src/java/org/apache/lucene/util/fst/NoOutputs.java solr/

Author: dweiss
Date: Fri Jun  3 19:00:59 2011
New Revision: 1131142

URL: http://svn.apache.org/viewvc?rev=1131142&view=rev
Log:
Merging 1130953:1131005 onto branch_3x (making isFinal public, making NO_OUTPUT static).

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/src/java/org/apache/lucene/util/fst/FST.java
    lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/fst/NoOutputs.java
    lucene/dev/branches/branch_3x/solr/   (props changed)

Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/fst/FST.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/fst/FST.java?rev=1131142&r1=1131141&r2=1131142&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/fst/FST.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/fst/FST.java Fri Jun  3 19:00:59 2011
@@ -147,7 +147,7 @@ public class FST<T> {
       return flag(BIT_LAST_ARC);
     }
 
-    boolean isFinal() {
+    public boolean isFinal() {
       return flag(BIT_FINAL_ARC);
     }
   };

Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/fst/NoOutputs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/fst/NoOutputs.java?rev=1131142&r1=1131141&r2=1131142&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/fst/NoOutputs.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/util/fst/NoOutputs.java Fri Jun  3 19:00:59 2011
@@ -28,7 +28,7 @@ import org.apache.lucene.store.DataOutpu
 
 public final class NoOutputs extends Outputs<Object> {
 
-  final Object NO_OUTPUT = new Object() {
+  static final Object NO_OUTPUT = new Object() {
     // NodeHash calls hashCode for this output; we fix this
     // so we get deterministic hashing.
     @Override