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 2012/07/08 17:44:42 UTC
svn commit: r1358761 - in /lucene/dev/branches/lucene4199/lucene:
analysis/common/src/java/org/apache/lucene/analysis/br/
analysis/common/src/java/org/apache/lucene/analysis/de/
analysis/common/src/java/org/apache/lucene/analysis/sinks/ analysis/common...
Author: rmuir
Date: Sun Jul 8 15:44:41 2012
New Revision: 1358761
URL: http://svn.apache.org/viewvc?rev=1358761&view=rev
Log:
LUCENE-4199: fix more default Locale uses
Modified:
lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java
lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java
lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java
lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Format.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java
lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SubmissionReport.java
lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/util/encoding/EncodingSpeed.java
lucene/dev/branches/lucene4199/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java
lucene/dev/branches/lucene4199/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
lucene/dev/branches/lucene4199/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
lucene/dev/branches/lucene4199/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java
Modified: lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java?rev=1358761&r1=1358760&r2=1358761&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java Sun Jul 8 15:44:41 2012
@@ -1,5 +1,7 @@
package org.apache.lucene.analysis.br;
+import java.util.Locale;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -21,6 +23,7 @@ package org.apache.lucene.analysis.br;
* A stemmer for Brazilian Portuguese words.
*/
public class BrazilianStemmer {
+ private static final Locale locale = new Locale("pt", "BR");
/**
* Changed term
@@ -243,7 +246,7 @@ public class BrazilianStemmer {
return null ;
}
- value = value.toLowerCase() ;
+ value = value.toLowerCase(locale) ;
for (j=0 ; j < value.length() ; j++) {
if ((value.charAt(j) == 'á') ||
(value.charAt(j) == 'â') ||
Modified: lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java?rev=1358761&r1=1358760&r2=1358761&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java Sun Jul 8 15:44:41 2012
@@ -1,4 +1,7 @@
package org.apache.lucene.analysis.de;
+
+import java.util.Locale;
+
// This file is encoded in UTF-8
/*
@@ -37,6 +40,8 @@ public class GermanStemmer
* Amount of characters that are removed with <tt>substitute()</tt> while stemming.
*/
private int substCount = 0;
+
+ private static final Locale locale = new Locale("de", "DE");
/**
* Stemms the given term to an unique <tt>discriminator</tt>.
@@ -47,7 +52,7 @@ public class GermanStemmer
protected String stem( String term )
{
// Use lowercase for medium stemming.
- term = term.toLowerCase();
+ term = term.toLowerCase(locale);
if ( !isStemmable( term ) )
return term;
// Reset the StringBuilder.
Modified: lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java?rev=1358761&r1=1358760&r2=1358761&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/DateRecognizerSinkFilter.java Sun Jul 8 15:44:41 2012
@@ -20,6 +20,7 @@ package org.apache.lucene.analysis.sinks
import java.text.DateFormat;
import java.text.ParseException;
import java.util.Date;
+import java.util.Locale;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.util.AttributeSource;
@@ -37,10 +38,11 @@ public class DateRecognizerSinkFilter ex
protected CharTermAttribute termAtt;
/**
- * Uses {@link java.text.SimpleDateFormat#getDateInstance()} as the {@link java.text.DateFormat} object.
+ * Uses {@link java.text.SimpleDateFormat#getDateInstance(DateFormat.DEFAULT, Locale.ROOT)} as
+ * the {@link java.text.DateFormat} object.
*/
public DateRecognizerSinkFilter() {
- this(DateFormat.getDateInstance());
+ this(DateFormat.getDateInstance(DateFormat.DEFAULT, Locale.ROOT));
}
public DateRecognizerSinkFilter(DateFormat dateFormat) {
Modified: lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java?rev=1358761&r1=1358760&r2=1358761&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java (original)
+++ lucene/dev/branches/lucene4199/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java Sun Jul 8 15:44:41 2012
@@ -32,7 +32,8 @@ public class TestCharArrayIterator exten
}
public void testConsumeWordInstance() {
- BreakIterator bi = BreakIterator.getWordInstance();
+ // we use the default locale, as its randomized by LuceneTestCase
+ BreakIterator bi = BreakIterator.getWordInstance(Locale.getDefault());
CharArrayIterator ci = CharArrayIterator.newWordInstance();
for (int i = 0; i < 10000; i++) {
char text[] = _TestUtil.randomUnicodeString(random()).toCharArray();
@@ -43,7 +44,8 @@ public class TestCharArrayIterator exten
/* run this to test if your JRE is buggy
public void testWordInstanceJREBUG() {
- BreakIterator bi = BreakIterator.getWordInstance();
+ // we use the default locale, as its randomized by LuceneTestCase
+ BreakIterator bi = BreakIterator.getWordInstance(Locale.getDefault());
Segment ci = new Segment();
for (int i = 0; i < 10000; i++) {
char text[] = _TestUtil.randomUnicodeString(random).toCharArray();
@@ -60,7 +62,8 @@ public class TestCharArrayIterator exten
}
public void testConsumeSentenceInstance() {
- BreakIterator bi = BreakIterator.getSentenceInstance();
+ // we use the default locale, as its randomized by LuceneTestCase
+ BreakIterator bi = BreakIterator.getSentenceInstance(Locale.getDefault());
CharArrayIterator ci = CharArrayIterator.newSentenceInstance();
for (int i = 0; i < 10000; i++) {
char text[] = _TestUtil.randomUnicodeString(random()).toCharArray();
@@ -71,7 +74,8 @@ public class TestCharArrayIterator exten
/* run this to test if your JRE is buggy
public void testSentenceInstanceJREBUG() {
- BreakIterator bi = BreakIterator.getSentenceInstance();
+ // we use the default locale, as its randomized by LuceneTestCase
+ BreakIterator bi = BreakIterator.getSentenceInstance(Locale.getDefault());
Segment ci = new Segment();
for (int i = 0; i < 10000; i++) {
char text[] = _TestUtil.randomUnicodeString(random).toCharArray();
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java?rev=1358761&r1=1358760&r2=1358761&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java Sun Jul 8 15:44:41 2012
@@ -429,7 +429,7 @@ public class TaskSequence extends PerfTa
sb.append(padd);
sb.append(!letChildReport ? ">" : (parallel ? "]" : "}"));
if (fixedTime) {
- sb.append(" " + NumberFormat.getNumberInstance().format(runTimeSec) + "s");
+ sb.append(" " + NumberFormat.getNumberInstance(Locale.ROOT).format(runTimeSec) + "s");
} else if (repetitions>1) {
sb.append(" * " + repetitions);
} else if (repetitions==REPEAT_EXHAUST) {
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Format.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Format.java?rev=1358761&r1=1358760&r2=1358761&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Format.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Format.java Sun Jul 8 15:44:41 2012
@@ -18,6 +18,7 @@ package org.apache.lucene.benchmark.byTa
*/
import java.text.NumberFormat;
+import java.util.Locale;
/**
* Formatting utilities (for reports).
@@ -25,9 +26,9 @@ import java.text.NumberFormat;
public class Format {
private static NumberFormat numFormat [] = {
- NumberFormat.getInstance(),
- NumberFormat.getInstance(),
- NumberFormat.getInstance(),
+ NumberFormat.getInstance(Locale.ROOT),
+ NumberFormat.getInstance(Locale.ROOT),
+ NumberFormat.getInstance(Locale.ROOT),
};
private static final String padd = " ";
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java?rev=1358761&r1=1358760&r2=1358761&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/QualityStats.java Sun Jul 8 15:44:41 2012
@@ -19,6 +19,7 @@ package org.apache.lucene.benchmark.qual
import java.io.PrintWriter;
import java.text.NumberFormat;
import java.util.ArrayList;
+import java.util.Locale;
/**
* Results of quality benchmark run for a single query or for a set of queries.
@@ -141,7 +142,7 @@ public class QualityStats {
logger.println(title);
}
prefix = prefix==null ? "" : prefix;
- NumberFormat nf = NumberFormat.getInstance();
+ NumberFormat nf = NumberFormat.getInstance(Locale.ROOT);
nf.setMaximumFractionDigits(3);
nf.setMinimumFractionDigits(3);
nf.setGroupingUsed(true);
Modified: lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SubmissionReport.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SubmissionReport.java?rev=1358761&r1=1358760&r2=1358761&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SubmissionReport.java (original)
+++ lucene/dev/branches/lucene4199/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/SubmissionReport.java Sun Jul 8 15:44:41 2012
@@ -19,6 +19,7 @@ package org.apache.lucene.benchmark.qual
import java.io.IOException;
import java.io.PrintWriter;
import java.text.NumberFormat;
+import java.util.Locale;
import org.apache.lucene.benchmark.quality.QualityQuery;
import org.apache.lucene.search.ScoreDoc;
@@ -45,7 +46,7 @@ public class SubmissionReport {
public SubmissionReport (PrintWriter logger, String name) {
this.logger = logger;
this.name = name;
- nf = NumberFormat.getInstance();
+ nf = NumberFormat.getInstance(Locale.ROOT);
nf.setMaximumFractionDigits(4);
nf.setMinimumFractionDigits(4);
}
Modified: lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java?rev=1358761&r1=1358760&r2=1358761&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java Sun Jul 8 15:44:41 2012
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import org.apache.lucene.codecs.BlockTreeTermsReader;
@@ -340,7 +341,7 @@ public class CheckIndex {
* you only call this when the index is not opened by any
* writer. */
public Status checkIndex(List<String> onlySegments) throws IOException {
- NumberFormat nf = NumberFormat.getInstance();
+ NumberFormat nf = NumberFormat.getInstance(Locale.ROOT);
SegmentInfos sis = new SegmentInfos();
Status result = new Status();
result.dir = dir;
Modified: lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java?rev=1358761&r1=1358760&r2=1358761&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java (original)
+++ lucene/dev/branches/lucene4199/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java Sun Jul 8 15:44:41 2012
@@ -20,6 +20,7 @@ package org.apache.lucene.index;
import java.io.IOException;
import java.text.NumberFormat;
import java.util.HashSet;
+import java.util.Locale;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.codecs.Codec;
@@ -181,7 +182,7 @@ class DocumentsWriterPerThread {
private int flushedDocCount;
DocumentsWriterDeleteQueue deleteQueue;
DeleteSlice deleteSlice;
- private final NumberFormat nf = NumberFormat.getInstance();
+ private final NumberFormat nf = NumberFormat.getInstance(Locale.ROOT);
final Allocator byteBlockAllocator;
Modified: lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/util/encoding/EncodingSpeed.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/util/encoding/EncodingSpeed.java?rev=1358761&r1=1358760&r2=1358761&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/util/encoding/EncodingSpeed.java (original)
+++ lucene/dev/branches/lucene4199/lucene/facet/src/test/org/apache/lucene/util/encoding/EncodingSpeed.java Sun Jul 8 15:44:41 2012
@@ -157,7 +157,7 @@ public class EncodingSpeed {
}
static {
- nf = NumberFormat.getInstance();
+ nf = NumberFormat.getInstance(Locale.ROOT);
nf.setMaximumFractionDigits(4);
nf.setMinimumFractionDigits(4);
Modified: lucene/dev/branches/lucene4199/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java?rev=1358761&r1=1358760&r2=1358761&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java (original)
+++ lucene/dev/branches/lucene4199/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java Sun Jul 8 15:44:41 2012
@@ -24,6 +24,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import org.apache.lucene.analysis.*;
@@ -385,13 +386,15 @@ public class TestPrecedenceQueryParser e
}
public String getDate(String s) throws Exception {
- DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT);
+ // we use the default Locale since LuceneTestCase randomizes it
+ DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
return DateTools.dateToString(df.parse(s), DateTools.Resolution.DAY);
}
private String getLocalizedDate(int year, int month, int day,
boolean extendLastDate) {
- DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT);
+ // we use the default Locale since LuceneTestCase randomizes it
+ DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
Calendar calendar = new GregorianCalendar();
calendar.set(year, month, day);
if (extendLastDate) {
@@ -441,7 +444,8 @@ public class TestPrecedenceQueryParser e
/** for testing DateTools support */
private String getDate(String s, DateTools.Resolution resolution) throws Exception {
- DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT);
+ // we use the default Locale since LuceneTestCase randomizes it
+ DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
return getDate(df.parse(s), resolution);
}
Modified: lucene/dev/branches/lucene4199/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java?rev=1358761&r1=1358760&r2=1358761&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java (original)
+++ lucene/dev/branches/lucene4199/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java Sun Jul 8 15:44:41 2012
@@ -675,7 +675,8 @@ public class TestQPHelper extends Lucene
/** for testing DateTools support */
private String getDate(String s, DateTools.Resolution resolution)
throws Exception {
- DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT);
+ // we use the default Locale since LuceneTestCase randomizes it
+ DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
return getDate(df.parse(s), resolution);
}
@@ -693,7 +694,8 @@ public class TestQPHelper extends Lucene
}
private String getLocalizedDate(int year, int month, int day) {
- DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT);
+ // we use the default Locale since LuceneTestCase randomizes it
+ DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
Calendar calendar = new GregorianCalendar();
calendar.clear();
calendar.set(year, month, day);
Modified: lucene/dev/branches/lucene4199/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java?rev=1358761&r1=1358760&r2=1358761&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java (original)
+++ lucene/dev/branches/lucene4199/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java Sun Jul 8 15:44:41 2012
@@ -581,7 +581,8 @@ public abstract class QueryParserTestBas
/** for testing DateTools support */
private String getDate(String s, DateTools.Resolution resolution) throws Exception {
- DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT);
+ // we use the default Locale since LuceneTestCase randomizes it
+ DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
return getDate(df.parse(s), resolution);
}
@@ -591,7 +592,8 @@ public abstract class QueryParserTestBas
}
private String getLocalizedDate(int year, int month, int day) {
- DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT);
+ // we use the default Locale since LuceneTestCase randomizes it
+ DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
Calendar calendar = new GregorianCalendar();
calendar.clear();
calendar.set(year, month, day);
Modified: lucene/dev/branches/lucene4199/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4199/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java?rev=1358761&r1=1358760&r2=1358761&view=diff
==============================================================================
--- lucene/dev/branches/lucene4199/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java (original)
+++ lucene/dev/branches/lucene4199/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java Sun Jul 8 15:44:41 2012
@@ -28,6 +28,7 @@ import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Locale;
/**
* @lucene.experimental
@@ -107,7 +108,7 @@ public class QuadPrefixTree extends Spat
}
public void printInfo() {
- NumberFormat nf = NumberFormat.getNumberInstance();
+ NumberFormat nf = NumberFormat.getNumberInstance(Locale.ROOT);
nf.setMaximumFractionDigits(5);
nf.setMinimumFractionDigits(5);
nf.setMinimumIntegerDigits(3);