Fix some Forbidden APIs errors

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1700642 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/dev/RecordGenerator.java b/src/java/org/apache/poi/dev/RecordGenerator.java
index 9aa074de25f4a38b0297bd681c9c6ac59d6c7ff9..588724d06f75f3be5e71d5ca97807a5cd4a53479 100644 (file)
--- a/src/java/org/apache/poi/dev/RecordGenerator.java
+++ b/src/java/org/apache/poi/dev/RecordGenerator.java
@@ -22,6 +22,7 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.Reader;
+import java.util.Locale;
 import java.util.Properties;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -92,7 +93,8 @@ public class RecordGenerator {
                 File destinationPathFile = new File(destinationPath);
                 destinationPathFile.mkdirs();
                 String destinationFilepath = destinationPath + "/" + recordName + suffix + ".java";
-                transform(file, new File(destinationFilepath), new File(recordStyleDir + "/" + extendstg.toLowerCase() + ".xsl"));
+                transform(file, new File(destinationFilepath), 
+                          new File(recordStyleDir + "/" + extendstg.toLowerCase(Locale.ROOT) + ".xsl"));
                 System.out.println("Generated " + suffix + ": " + destinationFilepath);
 
                 // Generate test (if not already generated)
@@ -101,7 +103,7 @@ public class RecordGenerator {
                 destinationPathFile.mkdirs();
                 destinationFilepath = destinationPath + "/Test" + recordName + suffix + ".java";
                 if (new File(destinationFilepath).exists() == false) {
-                    String temp = (recordStyleDir + "/" + extendstg.toLowerCase() + "_test.xsl");
+                    String temp = (recordStyleDir + "/" + extendstg.toLowerCase(Locale.ROOT) + "_test.xsl");
                     transform(file, new File(destinationFilepath), new File(temp));
                     System.out.println("Generated test: " + destinationFilepath);
                 } else {

diff --git a/src/java/org/apache/poi/ss/format/CellElapsedFormatter.java b/src/java/org/apache/poi/ss/format/CellElapsedFormatter.java
index 716ade906586932e05d4372076104c198e0a91f9..72a9a1fd1e6fbb334d76c11c83c6f9df1da6bcda 100644 (file)
--- a/src/java/org/apache/poi/ss/format/CellElapsedFormatter.java
+++ b/src/java/org/apache/poi/ss/format/CellElapsedFormatter.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.Formatter;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -85,7 +86,7 @@ public class CellElapsedFormatter extends CellFormatter {
                 if (topmost != null)
                     throw new IllegalArgumentException(
                             "Duplicate '[' times in format");
-                part = part.toLowerCase();
+                part = part.toLowerCase(Locale.ROOT);
                 int specLen = part.length() - 2;
                 topmost = assignSpec(part.charAt(1), pos, specLen);
                 return part.substring(1, 1 + specLen);
@@ -94,7 +95,7 @@ public class CellElapsedFormatter extends CellFormatter {
             case 'm':
             case 's':
             case '0':
-                part = part.toLowerCase();
+                part = part.toLowerCase(Locale.ROOT);
                 assignSpec(part.charAt(0), pos, part.length());
                 return part;
 
@@ -216,4 +217,4 @@ public class CellElapsedFormatter extends CellFormatter {
     public void simpleValue(StringBuffer toAppendTo, Object value) {
         formatValue(toAppendTo, value);
     }
-}
\ No newline at end of file
+}

diff --git a/src/java/org/apache/poi/ss/formula/functions/TextFunction.java b/src/java/org/apache/poi/ss/formula/functions/TextFunction.java
index ca69b27f7232940b8676d73d8deeadad27b51cf7..eddd7aaa458a0005ef8beace1c0449b10e6da048 100644 (file)
--- a/src/java/org/apache/poi/ss/formula/functions/TextFunction.java
+++ b/src/java/org/apache/poi/ss/formula/functions/TextFunction.java
@@ -17,6 +17,7 @@
 
 package org.apache.poi.ss.formula.functions;
 
+import java.util.Locale;
 import java.util.regex.Pattern;
 
 import org.apache.poi.ss.formula.eval.BoolEval;
@@ -106,12 +107,12 @@ public abstract class TextFunction implements Function {
        };
        public static final Function LOWER = new SingleArgTextFunc() {
                protected ValueEval evaluate(String arg) {
-                       return new StringEval(arg.toLowerCase());
+                       return new StringEval(arg.toLowerCase(Locale.ROOT));
                }
        };
        public static final Function UPPER = new SingleArgTextFunc() {
                protected ValueEval evaluate(String arg) {
-                       return new StringEval(arg.toUpperCase());
+                       return new StringEval(arg.toUpperCase(Locale.ROOT));
                }
        };
 
@@ -125,8 +126,8 @@ public abstract class TextFunction implements Function {
                protected ValueEval evaluate(String text) {
                        StringBuilder sb = new StringBuilder();
                        boolean shouldMakeUppercase = true;
-                       String lowercaseText = text.toLowerCase();
-                       String uppercaseText = text.toUpperCase();
+                       String lowercaseText = text.toLowerCase(Locale.ROOT);
+                       String uppercaseText = text.toUpperCase(Locale.ROOT);
                        for(int i = 0; i < text.length(); ++i) {
                                if (shouldMakeUppercase) {
                                        sb.append(uppercaseText.charAt(i));

diff --git a/src/java/org/apache/poi/ss/util/CellUtil.java b/src/java/org/apache/poi/ss/util/CellUtil.java
index 7a1ce9e63bda82b457553b4d2a422aac38517ef0..f3ef6fd59ad2ed3b8d378165ae14d71ad71e202f 100644 (file)
--- a/src/java/org/apache/poi/ss/util/CellUtil.java
+++ b/src/java/org/apache/poi/ss/util/CellUtil.java
@@ -18,6 +18,7 @@
 package org.apache.poi.ss.util;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import org.apache.poi.ss.usermodel.Cell;
@@ -336,7 +337,7 @@ public final class CellUtil {
 
                String s = cell.getRichStringCellValue().getString();
                boolean foundUnicode = false;
-               String lowerCaseStr = s.toLowerCase();
+               String lowerCaseStr = s.toLowerCase(Locale.ROOT);
 
                for (int i = 0; i < unicodeMappings.length; i++) {
                        UnicodeMapping entry = unicodeMappings[i];

diff --git a/src/java/org/apache/poi/ss/util/DateFormatConverter.java b/src/java/org/apache/poi/ss/util/DateFormatConverter.java
index bca998e806d263592a59ff5c55e988f8cc4b068c..7d9248b164db9f973c702de816be4c6c87bd811b 100644 (file)
--- a/src/java/org/apache/poi/ss/util/DateFormatConverter.java
+++ b/src/java/org/apache/poi/ss/util/DateFormatConverter.java
@@ -331,7 +331,7 @@ public class DateFormatConverter  {
        }\r
        \r
        public static String getPrefixForLocale( Locale locale ) {\r
-               String localeString = locale.toString().toLowerCase();\r
+               String localeString = locale.toString().toLowerCase(locale);\r
                String result = localePrefixes.get( localeString );\r
                if( result == null ) {\r
                        result = localePrefixes.get( localeString.substring( 0, 2 ) );\r

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
index 776cbf6772e6e8c36b8ccf99b61b746b2c634273..e16b48031bcc3e2d58c951bbd27064053076ee5d 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
@@ -18,6 +18,7 @@ package org.apache.poi.xslf.usermodel;
 
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import org.apache.poi.POIXMLDocumentPart;
@@ -94,7 +95,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.SldMasterDocument;
             for (POIXMLDocumentPart p : getRelations()) {
                 if (p instanceof XSLFSlideLayout){
                     XSLFSlideLayout layout = (XSLFSlideLayout)p;
-                    _layouts.put(layout.getName().toLowerCase(), layout);
+                    _layouts.put(layout.getName().toLowerCase(Locale.ROOT), layout);
                 }
             }
         }
@@ -133,7 +134,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.SldMasterDocument;
      * @return the layout found or null on failure
      */
     public XSLFSlideLayout getLayout(String name) {
-        return getLayouts().get(name.toLowerCase());
+        return getLayouts().get(name.toLowerCase(Locale.ROOT));
     }
 
 
@@ -198,4 +199,4 @@ import org.openxmlformats.schemas.presentationml.x2006.main.SldMasterDocument;
             return null;
         }
     }
-}
\ No newline at end of file
+}

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
index 03754e8218d891acc917fb0351e3e2abd7d2aa6d..3d5899340450fbbda3136e4bc55c7d390ec95822 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
@@ -20,6 +20,7 @@ package org.apache.poi.xssf.usermodel;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 
 import org.apache.poi.hssf.util.HSSFColor;
 import org.apache.poi.ss.usermodel.VerticalAlignment;
@@ -254,7 +255,7 @@ public class XSSFSimpleShape extends XSSFShape implements Iterable<XSSFTextParag
         case ALPHA_LC_PARENT_BOTH:
         case ALPHA_LC_PARENT_R:
             if(scheme == ListAutoNumber.ALPHA_LC_PARENT_BOTH) out.append('(');
-            out.append(valueToAlpha(value).toLowerCase());
+            out.append(valueToAlpha(value).toLowerCase(Locale.ROOT));
             out.append(')');
             break;
         case ALPHA_UC_PARENT_BOTH:
@@ -264,7 +265,7 @@ public class XSSFSimpleShape extends XSSFShape implements Iterable<XSSFTextParag
             out.append(')');
             break;        
         case ALPHA_LC_PERIOD:
-            out.append(valueToAlpha(value).toLowerCase());
+            out.append(valueToAlpha(value).toLowerCase(Locale.ROOT));
             out.append('.');
             break;
         case ALPHA_UC_PERIOD:
@@ -287,7 +288,7 @@ public class XSSFSimpleShape extends XSSFShape implements Iterable<XSSFTextParag
         case ROMAN_LC_PARENT_BOTH:
         case ROMAN_LC_PARENT_R:
             if(scheme == ListAutoNumber.ROMAN_LC_PARENT_BOTH) out.append('(');
-            out.append(valueToRoman(value).toLowerCase());
+            out.append(valueToRoman(value).toLowerCase(Locale.ROOT));
             out.append(')');
             break;
         case ROMAN_UC_PARENT_BOTH:
@@ -297,7 +298,7 @@ public class XSSFSimpleShape extends XSSFShape implements Iterable<XSSFTextParag
             out.append(')');
             break;        
         case ROMAN_LC_PERIOD:
-            out.append(valueToRoman(value).toLowerCase());
+            out.append(valueToRoman(value).toLowerCase(Locale.ROOT));
             out.append('.');
             break;
         case ROMAN_UC_PERIOD:

diff --git a/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java b/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
index 4cdaf16f82d661a859b9f1fd6ed983758f1099fd..69e726f0f0a4a8c98f45f92177d0d14bec99244d 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
+++ b/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
@@ -20,6 +20,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
+import java.util.Locale;
 import java.util.TimeZone;
 
 import org.apache.poi.POIOLE2TextExtractor;
@@ -127,7 +128,7 @@ public class OutlookTextExtactor extends POIOLE2TextExtractor {
             // Failing that try via the raw headers 
             String[] headers = msg.getHeaders();
             for(String header: headers) {
-               if(header.toLowerCase().startsWith("date:")) {
+               if(header.toLowerCase(Locale.ROOT).startsWith("date:")) {
                   s.append(
                         "Date:" + 
                         header.substring(header.indexOf(':')+1) +

diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java b/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
index e17e2bea9a1883c004a1ce44f8f0a8febcd13598..8ab581edeb72fd9caedb6de5a7ba141d10d976f2 100644 (file)
--- a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
@@ -20,6 +20,7 @@ package org.apache.poi.hslf.extractor;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.List;
+import java.util.Locale;
 
 import org.apache.poi.POIDataSamples;
 import org.apache.poi.POITestCase;
@@ -314,7 +315,7 @@ public final class TestExtractor extends POITestCase {
        ppe = new PowerPointExtractor(hslf);
        
        text = ppe.getText();
-       assertContains(text.toLowerCase(), "master");
+       assertContains(text.toLowerCase(Locale.ROOT), "master");
        assertContains(text, masterText);
     }
 

diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java b/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java
index bc00b2ffd47c1692e5132cce3bdee76a115b5aa2..e5c94d00b9dae500101a610180d3b5304b4014ec 100644 (file)
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java
+++ b/src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java
@@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;\r
 import java.io.IOException;\r
 import java.io.InputStream;\r
+import java.util.Locale;\r
 \r
 import junit.framework.TestCase;\r
 import org.apache.poi.POIDataSamples;\r
@@ -62,7 +63,7 @@ public class TestSprms extends TestCase
         for ( int p = 0; p < range.numParagraphs(); p++ )\r
         {\r
             Paragraph paragraph = range.getParagraph( p );\r
-            char first = paragraph.text().toLowerCase().charAt( 0 );\r
+            char first = paragraph.text().toLowerCase(Locale.ROOT).charAt( 0 );\r
             if ( '1' <= first && first < '4' )\r
             {\r
                 assertTrue( paragraph.isInTable() );\r