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/09 18:03:57 UTC
svn commit: r1359238 - in /lucene/dev/trunk:
lucene/core/src/test/org/apache/lucene/search/
lucene/misc/src/java/org/apache/lucene/index/
lucene/misc/src/test/org/apache/lucene/index/ lucene/tools/forbiddenApis/
solr/core/src/java/org/apache/solr/handl...
Author: rmuir
Date: Mon Jul 9 16:03:57 2012
New Revision: 1359238
URL: http://svn.apache.org/viewvc?rev=1359238&view=rev
Log:
LUCENE-4199: add default local DecimalFormat ctors
Modified:
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/IndexSplitter.java
lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java
lucene/dev/trunk/lucene/tools/forbiddenApis/jdk.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java?rev=1359238&r1=1359237&r2=1359238&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java Mon Jul 9 16:03:57 2012
@@ -28,6 +28,8 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
import java.util.Random;
/** Test that BooleanQuery.setMinimumNumberShouldMatch works.
@@ -377,7 +379,7 @@ public class TestBooleanMinShouldMatch e
System.err.println("------- " + test + " -------");
- DecimalFormat f = new DecimalFormat("0.000000");
+ DecimalFormat f = new DecimalFormat("0.000000", DecimalFormatSymbols.getInstance(Locale.ROOT));
for (int i = 0; i < h.length; i++) {
Document d = searcher.doc(h[i].doc);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=1359238&r1=1359237&r2=1359238&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Mon Jul 9 16:03:57 2012
@@ -35,6 +35,8 @@ import org.apache.lucene.search.similari
import org.apache.lucene.store.Directory;
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
import java.io.IOException;
/**
@@ -485,7 +487,7 @@ public class TestDisjunctionMaxQuery ext
System.err.println("------- " + test + " -------");
- DecimalFormat f = new DecimalFormat("0.000000000");
+ DecimalFormat f = new DecimalFormat("0.000000000", DecimalFormatSymbols.getInstance(Locale.ROOT));
for (int i = 0; i < h.length; i++) {
Document d = searcher.doc(h[i].doc);
Modified: lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/IndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/IndexSplitter.java?rev=1359238&r1=1359237&r2=1359238&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/IndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/java/org/apache/lucene/index/IndexSplitter.java Mon Jul 9 16:03:57 2012
@@ -23,9 +23,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Locale;
import org.apache.lucene.store.FSDirectory;
@@ -97,7 +99,7 @@ public class IndexSplitter {
}
public void listSegments() throws IOException {
- DecimalFormat formatter = new DecimalFormat("###,###.###");
+ DecimalFormat formatter = new DecimalFormat("###,###.###", DecimalFormatSymbols.getInstance(Locale.ROOT));
for (int x = 0; x < infos.size(); x++) {
SegmentInfoPerCommit info = infos.info(x);
String sizeStr = formatter.format(info.sizeInBytes());
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java?rev=1359238&r1=1359237&r2=1359238&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java Mon Jul 9 16:03:57 2012
@@ -18,7 +18,9 @@ package org.apache.lucene.index;
*/
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
+import java.util.Locale;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
@@ -32,7 +34,7 @@ import org.apache.lucene.util.LuceneTest
public class TestPKIndexSplitter extends LuceneTestCase {
public void testSplit() throws Exception {
- NumberFormat format = new DecimalFormat("000000000");
+ NumberFormat format = new DecimalFormat("000000000", DecimalFormatSymbols.getInstance(Locale.ROOT));
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false))
Modified: lucene/dev/trunk/lucene/tools/forbiddenApis/jdk.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/tools/forbiddenApis/jdk.txt?rev=1359238&r1=1359237&r2=1359238&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/tools/forbiddenApis/jdk.txt (original)
+++ lucene/dev/trunk/lucene/tools/forbiddenApis/jdk.txt Mon Jul 9 16:03:57 2012
@@ -42,6 +42,8 @@ java.text.DateFormat#getDateTimeInstance
java.text.DateFormat#getInstance()
java.text.DateFormatSymbols#<init>()
java.text.DateFormatSymbols#getInstance()
+java.text.DecimalFormat#<init>()
+java.text.DecimalFormat#<init>(java.lang.String)
java.text.DecimalFormatSymbols#<init>()
java.text.DecimalFormatSymbols#getInstance()
java.text.MessageFormat#<init>(java.lang.String)
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java?rev=1359238&r1=1359237&r2=1359238&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java Mon Jul 9 16:03:57 2012
@@ -28,6 +28,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.charset.Charset;
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
import java.util.Date;
import java.util.Locale;
@@ -210,7 +211,7 @@ public class SystemInfoHandler extends R
jvm.add( "processors", runtime.availableProcessors() );
// not thread safe, but could be thread local
- DecimalFormat df = new DecimalFormat("#.#");
+ DecimalFormat df = new DecimalFormat("#.#", DecimalFormatSymbols.getInstance(Locale.ROOT));
SimpleOrderedMap<Object> mem = new SimpleOrderedMap<Object>();
SimpleOrderedMap<Object> raw = new SimpleOrderedMap<Object>();