use indexOf(char) instead of indexOf(String) where possible; replace one more StringB...

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

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 bae9056c950b76addc7b5c34dc053c95730f1734..408a6a3ff378297e79176c7d268ce2a069c3a476 100644 (file)
--- 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 08736fa584dc0c423814e6d0f4a0908d987a3744..3537520c46abc71bf27bb57c525be6f8d46f9bdb 100644 (file)
--- 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 c466f275cc4f53a47cbd755757c4f93a1cab2601..1a3bc11746a0057366bb20b62235dbc0d363a591 100644 (file)
--- 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 ea33402a35847c87d250b358c21fdbcbe48ff1ca..14c0f1b985865ed490c2c3b598096e49209cdb65 100644 (file)
--- 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 c79b682e8d4308bd36d523295f425456a408d793..28ac90f7bbecf51cd217cbbcf23b73d3593e848b 100644 (file)
--- 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 8bcfb33e92481119c604f921b893979b26fe48f2..d2d38b06d5f4684a1463ecb60712e6c5ae959d40 100644 (file)
--- 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<PackagePartName> {
        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 a80ba95bc5288a261df8f9e9e89f2205d4152c5e..7825ca8aab2e15b41cfd70917e9eebc3e5d0296e 100644 (file)
--- 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 0e08294c8a0c7d5e52cd2b548dca8666a5fb61e4..80ab4a2cc660a965fd2fe9f4ce66e17154af255a 100644 (file)
--- 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 bc97bfa2d56b9d22796b5d806e0561a02067ce15..2223f5d169f11f91f55eb2140284ff3a8deecee2 100644 (file)
--- 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 8ef95b84df5393dc5d37e9df3c452652c623754a..0707f0db9b8f5e231f230455ee435966a3491e9d 100644 (file)
--- 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++) {