You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/10/03 18:27:34 UTC
svn commit: r1003990 - in /lucene/dev/trunk:
lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/
lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/
lucene/contrib/queryparser/src/java/org/apache/lucene...
Author: rmuir
Date: Sun Oct 3 16:27:34 2010
New Revision: 1003990
URL: http://svn.apache.org/viewvc?rev=1003990&view=rev
Log:
clear up more warnings in modules/contrib
Modified:
lucene/dev/trunk/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.java
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.jj
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.java
lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java
lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java
Modified: lucene/dev/trunk/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java?rev=1003990&r1=1003989&r2=1003990&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java (original)
+++ lucene/dev/trunk/lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java Sun Oct 3 16:27:34 2010
@@ -319,7 +319,7 @@ public class Config {
String t = st.nextToken();
a.add(t);
}
- return (String[]) a.toArray(new String[a.size()]);
+ return a.toArray(new String[a.size()]);
}
// extract properties to array, e.g. for "10:100:5" return int[]{10,100,5}.
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java?rev=1003990&r1=1003989&r2=1003990&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.java Sun Oct 3 16:27:34 2010
@@ -72,12 +72,7 @@ import org.apache.lucene.util.AttributeS
* href="../../../../../../../queryparsersyntax.html">query syntax
* documentation</a>.
* </p>
- *
- * @author Brian Goetz
- * @author Peter Halacsy
- * @author Tatu Saloranta
*/
-
public class PrecedenceQueryParser implements PrecedenceQueryParserConstants {
private static final int CONJ_NONE = 0;
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj?rev=1003990&r1=1003989&r2=1003990&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj Sun Oct 3 16:27:34 2010
@@ -96,12 +96,7 @@ import org.apache.lucene.util.AttributeS
* href="../../../../../../../queryparsersyntax.html">query syntax
* documentation</a>.
* </p>
- *
- * @author Brian Goetz
- * @author Peter Halacsy
- * @author Tatu Saloranta
*/
-
public class PrecedenceQueryParser {
private static final int CONJ_NONE = 0;
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.java?rev=1003990&r1=1003989&r2=1003990&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.java Sun Oct 3 16:27:34 2010
@@ -48,7 +48,6 @@ import org.apache.lucene.queryParser.cor
import org.apache.lucene.queryParser.core.nodes.QuotedFieldQueryNode;
import org.apache.lucene.queryParser.core.parser.SyntaxParser;
-@SuppressWarnings("all")
public class StandardSyntaxParser implements SyntaxParser, StandardSyntaxParserConstants {
private static final int CONJ_NONE =0;
@@ -167,7 +166,7 @@ public class StandardSyntaxParser implem
// ConjQuery ::= Clause ( AND Clause )*
// Clause ::= [ Modifier ] ...
final public QueryNode Query(CharSequence field) throws ParseException {
- Vector clauses = null;
+ Vector<QueryNode> clauses = null;
QueryNode c, first=null;
first = DisjQuery(field);
label_1:
@@ -191,7 +190,7 @@ public class StandardSyntaxParser implem
}
c = DisjQuery(field);
if (clauses == null) {
- clauses = new Vector();
+ clauses = new Vector<QueryNode>();
clauses.addElement(first);
}
clauses.addElement(c);
@@ -206,7 +205,7 @@ public class StandardSyntaxParser implem
final public QueryNode DisjQuery(CharSequence field) throws ParseException {
QueryNode first, c;
- Vector clauses = null;
+ Vector<QueryNode> clauses = null;
first = ConjQuery(field);
label_2:
while (true) {
@@ -221,7 +220,7 @@ public class StandardSyntaxParser implem
jj_consume_token(OR);
c = ConjQuery(field);
if (clauses == null) {
- clauses = new Vector();
+ clauses = new Vector<QueryNode>();
clauses.addElement(first);
}
clauses.addElement(c);
@@ -236,7 +235,7 @@ public class StandardSyntaxParser implem
final public QueryNode ConjQuery(CharSequence field) throws ParseException {
QueryNode first, c;
- Vector clauses = null;
+ Vector<QueryNode> clauses = null;
first = ModClause(field);
label_3:
while (true) {
@@ -251,7 +250,7 @@ public class StandardSyntaxParser implem
jj_consume_token(AND);
c = ModClause(field);
if (clauses == null) {
- clauses = new Vector();
+ clauses = new Vector<QueryNode>();
clauses.addElement(first);
}
clauses.addElement(c);
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.jj
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.jj?rev=1003990&r1=1003989&r2=1003990&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.jj (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser/StandardSyntaxParser.jj Sun Oct 3 16:27:34 2010
@@ -60,7 +60,6 @@ import org.apache.lucene.queryParser.cor
import org.apache.lucene.queryParser.core.nodes.QuotedFieldQueryNode;
import org.apache.lucene.queryParser.core.parser.SyntaxParser;
-@SuppressWarnings("all")
public class StandardSyntaxParser implements SyntaxParser {
private static final int CONJ_NONE =0;
@@ -208,7 +207,7 @@ QueryNode TopLevelQuery(CharSequence fie
QueryNode Query(CharSequence field) :
{
- Vector clauses = null;
+ Vector<QueryNode> clauses = null;
QueryNode c, first=null;
}
{
@@ -217,7 +216,7 @@ QueryNode Query(CharSequence field) :
c=DisjQuery(field)
{
if (clauses == null) {
- clauses = new Vector();
+ clauses = new Vector<QueryNode>();
clauses.addElement(first);
}
clauses.addElement(c);
@@ -234,7 +233,7 @@ QueryNode Query(CharSequence field) :
QueryNode DisjQuery(CharSequence field) : {
QueryNode first, c;
- Vector clauses = null;
+ Vector<QueryNode> clauses = null;
}
{
first = ConjQuery(field)
@@ -242,7 +241,7 @@ QueryNode DisjQuery(CharSequence field)
<OR> c=ConjQuery(field)
{
if (clauses == null) {
- clauses = new Vector();
+ clauses = new Vector<QueryNode>();
clauses.addElement(first);
}
clauses.addElement(c);
@@ -259,7 +258,7 @@ QueryNode DisjQuery(CharSequence field)
QueryNode ConjQuery(CharSequence field) : {
QueryNode first, c;
- Vector clauses = null;
+ Vector<QueryNode> clauses = null;
}
{
first = ModClause(field)
@@ -267,7 +266,7 @@ QueryNode ConjQuery(CharSequence field)
<AND> c=ModClause(field)
{
if (clauses == null) {
- clauses = new Vector();
+ clauses = new Vector<QueryNode>();
clauses.addElement(first);
}
clauses.addElement(c);
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.java?rev=1003990&r1=1003989&r2=1003990&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.java Sun Oct 3 16:27:34 2010
@@ -56,22 +56,22 @@ public class QueryParser implements Quer
}
protected SrndQuery getFieldsQuery(
- SrndQuery q, ArrayList fieldNames) {
+ SrndQuery q, ArrayList<String> fieldNames) {
/* FIXME: check acceptable subquery: at least one subquery should not be
* a fields query.
*/
return new FieldsQuery(q, fieldNames, fieldOperator);
}
- protected SrndQuery getOrQuery(List queries, boolean infix, Token orToken) {
+ protected SrndQuery getOrQuery(List<SrndQuery> queries, boolean infix, Token orToken) {
return new OrQuery(queries, infix, orToken.image);
}
- protected SrndQuery getAndQuery(List queries, boolean infix, Token andToken) {
+ protected SrndQuery getAndQuery(List<SrndQuery> queries, boolean infix, Token andToken) {
return new AndQuery( queries, infix, andToken.image);
}
- protected SrndQuery getNotQuery(List queries, Token notToken) {
+ protected SrndQuery getNotQuery(List<SrndQuery> queries, Token notToken) {
return new NotQuery( queries, notToken.image);
}
@@ -91,7 +91,7 @@ public class QueryParser implements Quer
}
protected SrndQuery getDistanceQuery(
- List queries,
+ List<SrndQuery> queries,
boolean infix,
Token dToken,
boolean ordered) throws ParseException {
@@ -144,16 +144,16 @@ public class QueryParser implements Quer
final public SrndQuery FieldsQuery() throws ParseException {
SrndQuery q;
- ArrayList fieldNames;
+ ArrayList<String> fieldNames;
fieldNames = OptionalFields();
q = OrQuery();
{if (true) return (fieldNames == null) ? q : getFieldsQuery(q, fieldNames);}
throw new Error("Missing return statement in function");
}
- final public ArrayList OptionalFields() throws ParseException {
+ final public ArrayList<String> OptionalFields() throws ParseException {
Token fieldName;
- ArrayList fieldNames = null;
+ ArrayList<String> fieldNames = null;
label_1:
while (true) {
if (jj_2_1(2)) {
@@ -165,7 +165,7 @@ public class QueryParser implements Quer
fieldName = jj_consume_token(TERM);
jj_consume_token(COLON);
if (fieldNames == null) {
- fieldNames = new ArrayList();
+ fieldNames = new ArrayList<String>();
}
fieldNames.add(fieldName.image);
}
@@ -175,7 +175,7 @@ public class QueryParser implements Quer
final public SrndQuery OrQuery() throws ParseException {
SrndQuery q;
- ArrayList queries = null;
+ ArrayList<SrndQuery> queries = null;
Token oprt = null;
q = AndQuery();
label_2:
@@ -191,7 +191,7 @@ public class QueryParser implements Quer
oprt = jj_consume_token(OR);
/* keep only last used operator */
if (queries == null) {
- queries = new ArrayList();
+ queries = new ArrayList<SrndQuery>();
queries.add(q);
}
q = AndQuery();
@@ -203,7 +203,7 @@ public class QueryParser implements Quer
final public SrndQuery AndQuery() throws ParseException {
SrndQuery q;
- ArrayList queries = null;
+ ArrayList<SrndQuery> queries = null;
Token oprt = null;
q = NotQuery();
label_3:
@@ -219,7 +219,7 @@ public class QueryParser implements Quer
oprt = jj_consume_token(AND);
/* keep only last used operator */
if (queries == null) {
- queries = new ArrayList();
+ queries = new ArrayList<SrndQuery>();
queries.add(q);
}
q = NotQuery();
@@ -231,7 +231,7 @@ public class QueryParser implements Quer
final public SrndQuery NotQuery() throws ParseException {
SrndQuery q;
- ArrayList queries = null;
+ ArrayList<SrndQuery> queries = null;
Token oprt = null;
q = NQuery();
label_4:
@@ -247,7 +247,7 @@ public class QueryParser implements Quer
oprt = jj_consume_token(NOT);
/* keep only last used operator */
if (queries == null) {
- queries = new ArrayList();
+ queries = new ArrayList<SrndQuery>();
queries.add(q);
}
q = NQuery();
@@ -259,7 +259,7 @@ public class QueryParser implements Quer
final public SrndQuery NQuery() throws ParseException {
SrndQuery q;
- ArrayList queries;
+ ArrayList<SrndQuery> queries;
Token dt;
q = WQuery();
label_5:
@@ -273,7 +273,7 @@ public class QueryParser implements Quer
break label_5;
}
dt = jj_consume_token(N);
- queries = new ArrayList();
+ queries = new ArrayList<SrndQuery>();
queries.add(q); /* left associative */
q = WQuery();
@@ -286,7 +286,7 @@ public class QueryParser implements Quer
final public SrndQuery WQuery() throws ParseException {
SrndQuery q;
- ArrayList queries;
+ ArrayList<SrndQuery> queries;
Token wt;
q = PrimaryQuery();
label_6:
@@ -300,7 +300,7 @@ public class QueryParser implements Quer
break label_6;
}
wt = jj_consume_token(W);
- queries = new ArrayList();
+ queries = new ArrayList<SrndQuery>();
queries.add(q); /* left associative */
q = PrimaryQuery();
@@ -345,7 +345,7 @@ public class QueryParser implements Quer
final public SrndQuery PrefixOperatorQuery() throws ParseException {
Token oprt;
- List queries;
+ List<SrndQuery> queries;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case OR:
oprt = jj_consume_token(OR);
@@ -379,9 +379,9 @@ public class QueryParser implements Quer
throw new Error("Missing return statement in function");
}
- final public List FieldsQueryList() throws ParseException {
+ final public List<SrndQuery> FieldsQueryList() throws ParseException {
SrndQuery q;
- ArrayList queries = new ArrayList();
+ ArrayList<SrndQuery> queries = new ArrayList<SrndQuery>();
jj_consume_token(LPAREN);
q = FieldsQuery();
queries.add(q);
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj?rev=1003990&r1=1003989&r2=1003990&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/surround/parser/QueryParser.jj Sun Oct 3 16:27:34 2010
@@ -85,22 +85,22 @@ public class QueryParser {
}
protected SrndQuery getFieldsQuery(
- SrndQuery q, ArrayList fieldNames) {
+ SrndQuery q, ArrayList<String> fieldNames) {
/* FIXME: check acceptable subquery: at least one subquery should not be
* a fields query.
*/
return new FieldsQuery(q, fieldNames, fieldOperator);
}
- protected SrndQuery getOrQuery(List queries, boolean infix, Token orToken) {
+ protected SrndQuery getOrQuery(List<SrndQuery> queries, boolean infix, Token orToken) {
return new OrQuery(queries, infix, orToken.image);
}
- protected SrndQuery getAndQuery(List queries, boolean infix, Token andToken) {
+ protected SrndQuery getAndQuery(List<SrndQuery> queries, boolean infix, Token andToken) {
return new AndQuery( queries, infix, andToken.image);
}
- protected SrndQuery getNotQuery(List queries, Token notToken) {
+ protected SrndQuery getNotQuery(List<SrndQuery> queries, Token notToken) {
return new NotQuery( queries, notToken.image);
}
@@ -120,7 +120,7 @@ public class QueryParser {
}
protected SrndQuery getDistanceQuery(
- List queries,
+ List<SrndQuery> queries,
boolean infix,
Token dToken,
boolean ordered) throws ParseException {
@@ -231,7 +231,7 @@ SrndQuery TopSrndQuery() : {
SrndQuery FieldsQuery() : {
SrndQuery q;
- ArrayList fieldNames;
+ ArrayList<String> fieldNames;
}{
fieldNames = OptionalFields()
q = OrQuery()
@@ -239,15 +239,15 @@ SrndQuery FieldsQuery() : {
}
-ArrayList OptionalFields() : {
+ArrayList<String> OptionalFields() : {
Token fieldName;
- ArrayList fieldNames = null;
+ ArrayList<String> fieldNames = null;
}{
( LOOKAHEAD(2) // to the colon
fieldName = <TERM>
<COLON> {
if (fieldNames == null) {
- fieldNames = new ArrayList();
+ fieldNames = new ArrayList<String>();
}
fieldNames.add(fieldName.image);
}
@@ -258,13 +258,13 @@ ArrayList OptionalFields() : {
SrndQuery OrQuery() : {
SrndQuery q;
- ArrayList queries = null;
+ ArrayList<SrndQuery> queries = null;
Token oprt = null;
}{
q = AndQuery()
( oprt = <OR> { /* keep only last used operator */
if (queries == null) {
- queries = new ArrayList();
+ queries = new ArrayList<SrndQuery>();
queries.add(q);
}
}
@@ -278,13 +278,13 @@ SrndQuery OrQuery() : {
SrndQuery AndQuery() : {
SrndQuery q;
- ArrayList queries = null;
+ ArrayList<SrndQuery> queries = null;
Token oprt = null;
}{
q = NotQuery()
( oprt = <AND> { /* keep only last used operator */
if (queries == null) {
- queries = new ArrayList();
+ queries = new ArrayList<SrndQuery>();
queries.add(q);
}
}
@@ -298,13 +298,13 @@ SrndQuery AndQuery() : {
SrndQuery NotQuery() : {
SrndQuery q;
- ArrayList queries = null;
+ ArrayList<SrndQuery> queries = null;
Token oprt = null;
}{
q = NQuery()
( oprt = <NOT> { /* keep only last used operator */
if (queries == null) {
- queries = new ArrayList();
+ queries = new ArrayList<SrndQuery>();
queries.add(q);
}
}
@@ -318,12 +318,12 @@ SrndQuery NotQuery() : {
SrndQuery NQuery() : {
SrndQuery q;
- ArrayList queries;
+ ArrayList<SrndQuery> queries;
Token dt;
}{
q = WQuery()
( dt = <N> {
- queries = new ArrayList();
+ queries = new ArrayList<SrndQuery>();
queries.add(q); /* left associative */
}
q = WQuery() {
@@ -337,12 +337,12 @@ SrndQuery NQuery() : {
SrndQuery WQuery() : {
SrndQuery q;
- ArrayList queries;
+ ArrayList<SrndQuery> queries;
Token wt;
}{
q = PrimaryQuery()
( wt = <W> {
- queries = new ArrayList();
+ queries = new ArrayList<SrndQuery>();
queries.add(q); /* left associative */
}
q = PrimaryQuery() {
@@ -368,7 +368,7 @@ SrndQuery PrimaryQuery() : { /* brackete
SrndQuery PrefixOperatorQuery() : {
Token oprt;
- List queries;
+ List<SrndQuery> queries;
}{
( oprt = <OR> /* prefix OR */
queries = FieldsQueryList()
@@ -389,9 +389,9 @@ SrndQuery PrefixOperatorQuery() : {
}
-List FieldsQueryList() : {
+List<SrndQuery> FieldsQueryList() : {
SrndQuery q;
- ArrayList queries = new ArrayList();
+ ArrayList<SrndQuery> queries = new ArrayList<SrndQuery>();
}{
<LPAREN>
q = FieldsQuery() {queries.add(q);}
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java?rev=1003990&r1=1003989&r2=1003990&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestMultiFieldQueryParserWrapper.java Sun Oct 3 16:27:34 2010
@@ -45,6 +45,7 @@ import org.apache.lucene.util.LuceneTest
* @deprecated this tests test the deprecated MultiFieldQueryParserWrapper, so
* when the latter is gone, so should this test.
*/
+@Deprecated
public class TestMultiFieldQueryParserWrapper extends LuceneTestCase {
/**
Modified: lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java?rev=1003990&r1=1003989&r2=1003990&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java (original)
+++ lucene/dev/trunk/lucene/contrib/queryparser/src/test/org/apache/lucene/queryParser/standard/TestQueryParserWrapper.java Sun Oct 3 16:27:34 2010
@@ -84,6 +84,7 @@ import org.junit.runner.RunWith;
* deprecated. When QPW is gone, so will the test.
*/
@RunWith(LuceneTestCase.LocalizedTestCaseRunner.class)
+@Deprecated
public class TestQueryParserWrapper extends LuceneTestCase {
public static Analyzer qpAnalyzer = new QPTestAnalyzer();
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java?rev=1003990&r1=1003989&r2=1003990&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java Sun Oct 3 16:27:34 2010
@@ -394,7 +394,7 @@ public class TernaryTree implements Clon
Iterator iter = new Iterator();
while (iter.hasMoreElements()) {
v[i] = iter.getValue();
- k[i++] = (String) iter.nextElement();
+ k[i++] = iter.nextElement();
}
init();
insertBalanced(k, v, 0, n);
@@ -551,7 +551,7 @@ public class TernaryTree implements Clon
boolean climb = true;
while (climb) {
- i = (Item) ns.pop();
+ i = ns.pop();
i.child++;
switch (i.child) {
case 1:
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java?rev=1003990&r1=1003989&r2=1003990&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java Sun Oct 3 16:27:34 2010
@@ -73,7 +73,7 @@ public class SynonymMap {
}
List<Token> superset = currMap.synonyms==null ? replacement :
mergeTokens(Arrays.asList(currMap.synonyms), replacement);
- currMap.synonyms = (Token[])superset.toArray(new Token[superset.size()]);
+ currMap.synonyms = superset.toArray(new Token[superset.size()]);
if (includeOrig) currMap.flags |= INCLUDE_ORIG;
}