MUST
* clauses one or more SHOULD clauses must match a document
* for the BooleanQuery to match.
* @see BooleanQuery#setMinimumNumberShouldMatch
*/
- public static final Occur SHOULD = new Occur("SHOULD");
+ SHOULD { public String toString() { return ""; } },
+
/** Use this operator for clauses that must not appear in the matching documents.
* Note that it is not possible to search for queries that only consist
* of a MUST_NOT clause. */
- public static final Occur MUST_NOT = new Occur("MUST_NOT");
-
+ MUST_NOT { public String toString() { return "-"; } };
+
}
/** The query whose matching documents are combined by the boolean query.
@@ -85,11 +74,11 @@
}
public boolean isProhibited() {
- return Occur.MUST_NOT.equals(occur);
+ return Occur.MUST_NOT == occur;
}
public boolean isRequired() {
- return Occur.MUST.equals(occur);
+ return Occur.MUST == occur;
}
@@ -100,12 +89,12 @@
return false;
BooleanClause other = (BooleanClause)o;
return this.query.equals(other.query)
- && this.occur.equals(other.occur);
+ && this.occur == other.occur;
}
/** Returns a hash code value for this object.*/
public int hashCode() {
- return query.hashCode() ^ (Occur.MUST.equals(occur)?1:0) ^ (Occur.MUST_NOT.equals(occur)?2:0);
+ return query.hashCode() ^ (Occur.MUST == occur?1:0) ^ (Occur.MUST_NOT == occur?2:0);
}
Index: src/java/org/apache/lucene/util/Parameter.java
===================================================================
--- src/java/org/apache/lucene/util/Parameter.java (revision 828042)
+++ src/java/org/apache/lucene/util/Parameter.java (working copy)
@@ -25,7 +25,9 @@
/**
* A serializable Enum class.
+ * @deprecated Use Java 5 enum
*/
+@SuppressWarnings("serial")
public abstract class Parameter implements Serializable
{
static MapWARNING: if you use this setting, and then - * upgrade to a newer release of Lucene, sizable changes - * may happen. If precise back compatibility is important - * then you should instead explicitly specify an actual - * version. - */ - public static final Version LUCENE_CURRENT = new Version("LUCENE_CURRENT", 0); - /** Match settings and bugs in Lucene's 2.0 release. */ - public static final Version LUCENE_20 = new Version("LUCENE_20", 2000); + LUCENE_20, /** Match settings and bugs in Lucene's 2.1 release. */ - public static final Version LUCENE_21 = new Version("LUCENE_21", 2100); + LUCENE_21, /** Match settings and bugs in Lucene's 2.2 release. */ - public static final Version LUCENE_22 = new Version("LUCENE_22", 2200); + LUCENE_22, /** Match settings and bugs in Lucene's 2.3 release. */ - public static final Version LUCENE_23 = new Version("LUCENE_23", 2300); + LUCENE_23, /** Match settings and bugs in Lucene's 2.4 release. */ - public static final Version LUCENE_24 = new Version("LUCENE_24", 2400); + LUCENE_24, /** Match settings and bugs in Lucene's 2.9 release. */ - public static final Version LUCENE_29 = new Version("LUCENE_29", 2900); + LUCENE_29, - private final int v; + /** Match settings and bugs in Lucene's 3.0 release. */ + LUCENE_30, + + /* Add new constants for later versions **here** to respect order! */ - public Version(String name, int v) { - super(name); - this.v = v; - } + /** Use this to get the latest & greatest settings, bug + * fixes, etc, for Lucene. + * + *
WARNING: if you use this setting, and then + * upgrade to a newer release of Lucene, sizable changes + * may happen. If precise back compatibility is important + * then you should instead explicitly specify an actual + * version. + */ + LUCENE_CURRENT; public boolean onOrAfter(Version other) { - return v == 0 || v >= other.v; + return compareTo(other) >= 0; } } \ No newline at end of file Index: src/test/org/apache/lucene/util/TestVersion.java =================================================================== --- src/test/org/apache/lucene/util/TestVersion.java (revision 0) +++ src/test/org/apache/lucene/util/TestVersion.java (revision 0) @@ -0,0 +1,33 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.lucene.util; + +import java.util.EnumSet; + +public class TestVersion extends LuceneTestCase { + + public void test() { + for (Version v : Version.values()) { + assertTrue("LUCENE_CURRENT must be always onOrAfter("+v+")", Version.LUCENE_CURRENT.onOrAfter(v)); + } + assertTrue(Version.LUCENE_30.onOrAfter(Version.LUCENE_29)); + assertTrue(Version.LUCENE_30.onOrAfter(Version.LUCENE_30)); + assertFalse(Version.LUCENE_29.onOrAfter(Version.LUCENE_30)); + } + +} Property changes on: src\test\org\apache\lucene\util\TestVersion.java ___________________________________________________________________ Added: svn:keywords + Date Author Id Revision HeadURL Added: svn:eol-style + native