Author: axh
Date: Thu Feb 20 15:51:17 2020
New Revision: 1874262
URL: http://svn.apache.org/viewvc?rev=1874262&view=rev
Log:
use indexOf(char) instead of indexOf(String) where possible; replace one more
StringBuffer with StringBuilder - bug 63805
Modified:
poi/trunk/src/examples/src/org/apache/poi/ss/examples/ToCSV.java
poi/trunk/src/java/org/apache/poi/ss/format/CellTextFormatter.java
poi/trunk/src/java/org/apache/poi/ss/util/CellRangeAddress.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/Util.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java
Modified: poi/trunk/src/examples/src/org/apache/poi/ss/examples/ToCSV.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/ss/examples/ToCSV.java?rev=1874262&r1=1874261&r2=1874262&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/ss/examples/ToCSV.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/ss/examples/ToCSV.java Thu Feb 20
15:51:17 2020
@@ -346,7 +346,7 @@ public class ToCSV {
// Simply replace the .xls or .xlsx file extension with .csv
destinationFilename = excelFile.getName();
destinationFilename = destinationFilename.substring(
- 0, destinationFilename.lastIndexOf(".")) +
+ 0, destinationFilename.lastIndexOf('.')) +
ToCSV.CSV_FILE_EXTENSION;
// Save the CSV file away using the newly constricted file name
Modified: poi/trunk/src/java/org/apache/poi/ss/format/CellTextFormatter.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/format/CellTextFormatter.java?rev=1874262&r1=1874261&r2=1874262&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/format/CellTextFormatter.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/format/CellTextFormatter.java Thu Feb
20 15:51:17 2020
@@ -47,7 +47,7 @@ public class CellTextFormatter extends C
textPos = new int[numPlaces[0]];
int pos = desc.length() - 1;
for (int i = 0; i < textPos.length; i++) {
- textPos[i] = desc.lastIndexOf("\u0000", pos);
+ textPos[i] = desc.lastIndexOf('\u0000', pos);
pos = textPos[i] - 1;
}
}
Modified: poi/trunk/src/java/org/apache/poi/ss/util/CellRangeAddress.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/util/CellRangeAddress.java?rev=1874262&r1=1874261&r2=1874262&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/util/CellRangeAddress.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/util/CellRangeAddress.java Thu Feb 20
15:51:17 2020
@@ -122,7 +122,7 @@ public class CellRangeAddress extends Ce
* column range (e.g. "C:F")
*/
public static CellRangeAddress valueOf(String ref) {
- int sep = ref.indexOf(":");
+ int sep = ref.indexOf(':');
CellReference a;
CellReference b;
if (sep == -1) {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java?rev=1874262&r1=1874261&r2=1874262&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java Thu
Feb 20 15:51:17 2020
@@ -111,7 +111,7 @@ public final class ContentTypes {
public static final String EXTENSION_XML = "xml";
public static String getContentTypeFromFileExtension(String filename) {
- String extension = filename.substring(filename.lastIndexOf(".")
+ 1)
+ String extension = filename.substring(filename.lastIndexOf('.')
+ 1)
.toLowerCase(Locale.ROOT);
if (extension.equals(EXTENSION_JPG_1)
|| extension.equals(EXTENSION_JPG_2))
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java?rev=1874262&r1=1874261&r2=1874262&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java Thu
Feb 20 15:51:17 2020
@@ -517,7 +517,7 @@ public abstract class OPCPackage impleme
+ filename);
} catch (InvalidFormatException e) {
String partName = "/docProps/thumbnail" +
- filename.substring(filename.lastIndexOf(".") + 1);
+ filename.substring(filename.lastIndexOf('.') + 1);
try {
thumbnailPartName =
PackagingURIHelper.createPartName(partName);
} catch (InvalidFormatException e2) {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java?rev=1874262&r1=1874261&r2=1874262&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
Thu Feb 20 15:51:17 2020
@@ -422,7 +422,7 @@ public final class PackagePartName imple
public String getExtension() {
String fragment = this.partNameURI.getPath();
if (fragment.length() > 0) {
- int i = fragment.lastIndexOf(".");
+ int i = fragment.lastIndexOf('.');
if (i > -1) {
return fragment.substring(i + 1);
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java?rev=1874262&r1=1874261&r2=1874262&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
Thu Feb 20 15:51:17 2020
@@ -193,7 +193,7 @@ public final class PackagingURIHelper {
*/
public static String getFilenameWithoutExtension(URI uri) {
String filename = getFilename(uri);
- int dotIndex = filename.lastIndexOf(".");
+ int dotIndex = filename.lastIndexOf('.');
if (dotIndex == -1)
return filename;
return filename.substring(0, dotIndex);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/Util.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/Util.java?rev=1874262&r1=1874261&r2=1874262&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/Util.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xdgf/util/Util.java Thu Feb 20
15:51:17 2020
@@ -22,7 +22,7 @@ public class Util {
public static int countLines(String str) {
int lines = 1;
int pos = 0;
- while ((pos = str.indexOf("\n", pos) + 1) != 0) {
+ while ((pos = str.indexOf('\n', pos) + 1) != 0) {
lines++;
}
return lines;
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java?rev=1874262&r1=1874261&r2=1874262&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
Thu Feb 20 15:51:17 2020
@@ -916,7 +916,7 @@ public final class TestXSSFBugs extends
assertEquals(text, cell.getStringCellValue());
// Now add a 2nd, and check again
- int fontAt = text.indexOf("\n", 6);
+ int fontAt = text.indexOf('\n', 6);
cell.getRichStringCellValue().applyFont(10, fontAt + 1, font2);
assertEquals(text, cell.getStringCellValue());
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java?rev=1874262&r1=1874261&r2=1874262&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java
Thu Feb 20 15:51:17 2020
@@ -47,7 +47,7 @@ public final class TestBug46610 {
private static String runExtract(String sampleName) throws Exception {
HWPFDocument doc =
HWPFTestDataSamples.openSampleFile(sampleName);
- StringBuffer out = new StringBuffer();
+ StringBuilder out = new StringBuilder();
Range globalRange = doc.getRange();
for (int i = 0; i < globalRange.numParagraphs(); i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
