From 842e71a3d736049f55fdd8d86514715390405606 Mon Sep 17 00:00:00 2001 From: Axel Howind Date: Thu, 20 Feb 2020 15:51:17 +0000 Subject: [PATCH] use indexOf(char) instead of indexOf(String) where possible; replace one more StringBuffer with StringBuilder - bug 63805 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1874262 13f79535-47bb-0310-9956-ffa450edef68 --- src/examples/src/org/apache/poi/ss/examples/ToCSV.java | 2 +- src/java/org/apache/poi/ss/format/CellTextFormatter.java | 2 +- src/java/org/apache/poi/ss/util/CellRangeAddress.java | 2 +- src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java | 2 +- src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java | 2 +- .../java/org/apache/poi/openxml4j/opc/PackagePartName.java | 2 +- .../java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java | 2 +- src/ooxml/java/org/apache/poi/xdgf/util/Util.java | 2 +- .../testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java | 2 +- .../testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/examples/src/org/apache/poi/ss/examples/ToCSV.java b/src/examples/src/org/apache/poi/ss/examples/ToCSV.java index bae9056c95..408a6a3ff3 100644 --- a/src/examples/src/org/apache/poi/ss/examples/ToCSV.java +++ b/src/examples/src/org/apache/poi/ss/examples/ToCSV.java @@ -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 diff --git a/src/java/org/apache/poi/ss/format/CellTextFormatter.java b/src/java/org/apache/poi/ss/format/CellTextFormatter.java index 08736fa584..3537520c46 100644 --- a/src/java/org/apache/poi/ss/format/CellTextFormatter.java +++ b/src/java/org/apache/poi/ss/format/CellTextFormatter.java @@ -47,7 +47,7 @@ public class CellTextFormatter extends CellFormatter { 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; } } diff --git a/src/java/org/apache/poi/ss/util/CellRangeAddress.java b/src/java/org/apache/poi/ss/util/CellRangeAddress.java index c466f275cc..1a3bc11746 100644 --- a/src/java/org/apache/poi/ss/util/CellRangeAddress.java +++ b/src/java/org/apache/poi/ss/util/CellRangeAddress.java @@ -122,7 +122,7 @@ public class CellRangeAddress extends CellRangeAddressBase { * 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) { diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java index ea33402a35..14c0f1b985 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/ContentTypes.java @@ -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)) diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java index c79b682e8d..28ac90f7bb 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java @@ -517,7 +517,7 @@ public abstract class OPCPackage implements RelationshipSource, Closeable { + 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) { diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java index 8bcfb33e92..d2d38b06d5 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java @@ -422,7 +422,7 @@ public final class PackagePartName implements Comparable { 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); } diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java index a80ba95bc5..7825ca8aab 100644 --- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java +++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java @@ -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); diff --git a/src/ooxml/java/org/apache/poi/xdgf/util/Util.java b/src/ooxml/java/org/apache/poi/xdgf/util/Util.java index 0e08294c8a..80ab4a2cc6 100644 --- a/src/ooxml/java/org/apache/poi/xdgf/util/Util.java +++ b/src/ooxml/java/org/apache/poi/xdgf/util/Util.java @@ -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; diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java index bc97bfa2d5..2223f5d169 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java @@ -916,7 +916,7 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues { 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()); diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java index 8ef95b84df..0707f0db9b 100644 --- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java +++ b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug46610.java @@ -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++) {