Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some Forbidden APIs errors 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1700642 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2015-09-01 19:01:36 +00:00
parent e54f105bc0
commit 1c21c4efc6
10 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/apache/poi/dev/RecordGenerator.java
View File

@ -22,6 +22,7 @@ import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FileReader; import java.io.FileReader;
import java.io.Reader; import java.io.Reader;
import java.util.Locale;
import java.util.Properties; import java.util.Properties;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
@ -92,7 +93,8 @@ public class RecordGenerator {
File destinationPathFile = new File(destinationPath); File destinationPathFile = new File(destinationPath);
destinationPathFile.mkdirs(); destinationPathFile.mkdirs();
String destinationFilepath = destinationPath + "/" + recordName + suffix + ".java"; 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); System.out.println("Generated " + suffix + ": " + destinationFilepath);
// Generate test (if not already generated) // Generate test (if not already generated)
@ -101,7 +103,7 @@ public class RecordGenerator {
destinationPathFile.mkdirs(); destinationPathFile.mkdirs();
destinationFilepath = destinationPath + "/Test" + recordName + suffix + ".java"; destinationFilepath = destinationPath + "/Test" + recordName + suffix + ".java";
if (new File(destinationFilepath).exists() == false) { 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)); transform(file, new File(destinationFilepath), new File(temp));
System.out.println("Generated test: " + destinationFilepath); System.out.println("Generated test: " + destinationFilepath);
} else { } else {

5
src/java/org/apache/poi/ss/format/CellElapsedFormatter.java
View File

@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Formatter; import java.util.Formatter;
import java.util.List; import java.util.List;
import java.util.ListIterator; import java.util.ListIterator;
import java.util.Locale;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -85,7 +86,7 @@ public class CellElapsedFormatter extends CellFormatter {
if (topmost != null) if (topmost != null)
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Duplicate '[' times in format"); "Duplicate '[' times in format");
part = part.toLowerCase(); part = part.toLowerCase(Locale.ROOT);
int specLen = part.length() - 2; int specLen = part.length() - 2;
topmost = assignSpec(part.charAt(1), pos, specLen); topmost = assignSpec(part.charAt(1), pos, specLen);
return part.substring(1, 1 + specLen); return part.substring(1, 1 + specLen);
@ -94,7 +95,7 @@ public class CellElapsedFormatter extends CellFormatter {
case 'm': case 'm':
case 's': case 's':
case '0': case '0':
part = part.toLowerCase(); part = part.toLowerCase(Locale.ROOT);
assignSpec(part.charAt(0), pos, part.length()); assignSpec(part.charAt(0), pos, part.length());
return part; return part;

9
src/java/org/apache/poi/ss/formula/functions/TextFunction.java
View File

@ -17,6 +17,7 @@
package org.apache.poi.ss.formula.functions; package org.apache.poi.ss.formula.functions;
import java.util.Locale;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.poi.ss.formula.eval.BoolEval; 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() { public static final Function LOWER = new SingleArgTextFunc() {
protected ValueEval evaluate(String arg) { protected ValueEval evaluate(String arg) {
return new StringEval(arg.toLowerCase()); return new StringEval(arg.toLowerCase(Locale.ROOT));
} }
}; };
public static final Function UPPER = new SingleArgTextFunc() { public static final Function UPPER = new SingleArgTextFunc() {
protected ValueEval evaluate(String arg) { 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) { protected ValueEval evaluate(String text) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
boolean shouldMakeUppercase = true; boolean shouldMakeUppercase = true;
String lowercaseText = text.toLowerCase(); String lowercaseText = text.toLowerCase(Locale.ROOT);
String uppercaseText = text.toUpperCase(); String uppercaseText = text.toUpperCase(Locale.ROOT);
for(int i = 0; i < text.length(); ++i) { for(int i = 0; i < text.length(); ++i) {
if (shouldMakeUppercase) { if (shouldMakeUppercase) {
sb.append(uppercaseText.charAt(i)); sb.append(uppercaseText.charAt(i));

3
src/java/org/apache/poi/ss/util/CellUtil.java
View File

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

2
src/java/org/apache/poi/ss/util/DateFormatConverter.java
View File

@ -331,7 +331,7 @@ public class DateFormatConverter {
} }
public static String getPrefixForLocale( Locale locale ) { public static String getPrefixForLocale( Locale locale ) {
String localeString = locale.toString().toLowerCase(); String localeString = locale.toString().toLowerCase(locale);
String result = localePrefixes.get( localeString ); String result = localePrefixes.get( localeString );
if( result == null ) { if( result == null ) {
result = localePrefixes.get( localeString.substring( 0, 2 ) ); result = localePrefixes.get( localeString.substring( 0, 2 ) );

5
src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlideMaster.java
View File

@ -18,6 +18,7 @@ package org.apache.poi.xslf.usermodel;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import org.apache.poi.POIXMLDocumentPart; import org.apache.poi.POIXMLDocumentPart;
@ -94,7 +95,7 @@ import org.openxmlformats.schemas.presentationml.x2006.main.SldMasterDocument;
for (POIXMLDocumentPart p : getRelations()) { for (POIXMLDocumentPart p : getRelations()) {
if (p instanceof XSLFSlideLayout){ if (p instanceof XSLFSlideLayout){
XSLFSlideLayout layout = (XSLFSlideLayout)p; 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 * @return the layout found or null on failure
*/ */
public XSLFSlideLayout getLayout(String name) { public XSLFSlideLayout getLayout(String name) {
return getLayouts().get(name.toLowerCase()); return getLayouts().get(name.toLowerCase(Locale.ROOT));
} }

9
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSimpleShape.java
View File

@ -20,6 +20,7 @@ package org.apache.poi.xssf.usermodel;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale;
import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.ss.usermodel.VerticalAlignment; 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_BOTH:
case ALPHA_LC_PARENT_R: case ALPHA_LC_PARENT_R:
if(scheme == ListAutoNumber.ALPHA_LC_PARENT_BOTH) out.append('('); if(scheme == ListAutoNumber.ALPHA_LC_PARENT_BOTH) out.append('(');
out.append(valueToAlpha(value).toLowerCase()); out.append(valueToAlpha(value).toLowerCase(Locale.ROOT));
out.append(')'); out.append(')');
break; break;
case ALPHA_UC_PARENT_BOTH: case ALPHA_UC_PARENT_BOTH:
@ -264,7 +265,7 @@ public class XSSFSimpleShape extends XSSFShape implements Iterable<XSSFTextParag
out.append(')'); out.append(')');
break; break;
case ALPHA_LC_PERIOD: case ALPHA_LC_PERIOD:
out.append(valueToAlpha(value).toLowerCase()); out.append(valueToAlpha(value).toLowerCase(Locale.ROOT));
out.append('.'); out.append('.');
break; break;
case ALPHA_UC_PERIOD: 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_BOTH:
case ROMAN_LC_PARENT_R: case ROMAN_LC_PARENT_R:
if(scheme == ListAutoNumber.ROMAN_LC_PARENT_BOTH) out.append('('); if(scheme == ListAutoNumber.ROMAN_LC_PARENT_BOTH) out.append('(');
out.append(valueToRoman(value).toLowerCase()); out.append(valueToRoman(value).toLowerCase(Locale.ROOT));
out.append(')'); out.append(')');
break; break;
case ROMAN_UC_PARENT_BOTH: case ROMAN_UC_PARENT_BOTH:
@ -297,7 +298,7 @@ public class XSSFSimpleShape extends XSSFShape implements Iterable<XSSFTextParag
out.append(')'); out.append(')');
break; break;
case ROMAN_LC_PERIOD: case ROMAN_LC_PERIOD:
out.append(valueToRoman(value).toLowerCase()); out.append(valueToRoman(value).toLowerCase(Locale.ROOT));
out.append('.'); out.append('.');
break; break;
case ROMAN_UC_PERIOD: case ROMAN_UC_PERIOD:

3
src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java
View File

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

3
src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
View File

@ -20,6 +20,7 @@ package org.apache.poi.hslf.extractor;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.InputStream; import java.io.InputStream;
import java.util.List; import java.util.List;
import java.util.Locale;
import org.apache.poi.POIDataSamples; import org.apache.poi.POIDataSamples;
import org.apache.poi.POITestCase; import org.apache.poi.POITestCase;
@ -314,7 +315,7 @@ public final class TestExtractor extends POITestCase {
ppe = new PowerPointExtractor(hslf); ppe = new PowerPointExtractor(hslf);
text = ppe.getText(); text = ppe.getText();
assertContains(text.toLowerCase(), "master"); assertContains(text.toLowerCase(Locale.ROOT), "master");
assertContains(text, masterText); assertContains(text, masterText);
} }

3
src/scratchpad/testcases/org/apache/poi/hwpf/sprm/TestSprms.java
View File

@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Locale;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.poi.POIDataSamples; import org.apache.poi.POIDataSamples;
@ -62,7 +63,7 @@ public class TestSprms extends TestCase
for ( int p = 0; p < range.numParagraphs(); p++ ) for ( int p = 0; p < range.numParagraphs(); p++ )
{ {
Paragraph paragraph = range.getParagraph( p ); Paragraph paragraph = range.getParagraph( p );
char first = paragraph.text().toLowerCase().charAt( 0 ); char first = paragraph.text().toLowerCase(Locale.ROOT).charAt( 0 );
if ( '1' <= first && first < '4' ) if ( '1' <= first && first < '4' )
{ {
assertTrue( paragraph.isInTable() ); assertTrue( paragraph.isInTable() );