string refactorings

- StringBuffer -> StringBuilder
- use String.repeat() instead of loops
- use String.contains() instead indexOf()

Author: xzel23

odfdom/src/main/java/org/odftoolkit/odfdom/changes/ChangesFileSaxHandler.java

@@ -1325,9 +1325,7 @@ public void startElement(String uri, String localName, String qName, Attributes
           addText(/*mCachedTableOps, */ "\u0020");
           // mCharsForOperation.append('\u0020');
         } else {
-          for (int i = 0; i < quantity; i++) {
-            mCharsForOperation.append('\u0020');
-          }
+          mCharsForOperation.append("\u0020".repeat(Math.max(0, quantity)));
           addText(/*mCachedTableOps, */ mCharsForOperation);
         }
 

odfdom/src/main/java/org/odftoolkit/odfdom/incubator/doc/text/OdfTextExtractor.java

@@ -126,9 +126,7 @@ public void visit(TextSElement ele) {
     if (count == null) {
       count = 1;
     }
-    for (int i = 0; i < count; i++) {
-      mTextBuilder.append(' ');
-    }
+    mTextBuilder.append(" ".repeat(Math.max(0, count)));
   }
 
   /* (non-Javadoc)

odfdom/src/main/java/org/odftoolkit/odfdom/incubator/search/TextSelection.java

@@ -563,7 +563,7 @@ private void delete(int fromindex, int leftLength, Node pNode) {
         // the start index is in this node
         if (node.getNodeType() == Node.TEXT_NODE) {
           String value = node.getNodeValue();
-          StringBuffer buffer = new StringBuffer();
+          StringBuilder buffer = new StringBuilder();
           buffer.append(value.substring(0, fromindex));
           int endLength = fromindex + leftLength;
           int nextLength = value.length() - endLength;
@@ -755,7 +755,7 @@ private void insertSpan(OdfTextSpan textSpan, int fromindex, Node pNode) {
           // after
           // the result node
           String value = node.getNodeValue();
-          StringBuffer buffer = new StringBuffer();
+          StringBuilder buffer = new StringBuilder();
           buffer.append(value.substring(0, fromindex));
           // insert the text span in appropriate position
           node.setNodeValue(buffer.toString());

odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfElement.java

@@ -2640,7 +2640,7 @@ public String getTextContent() {
           buffer.append(((TextSpanElement) node).getTextContent());
         } else if (node.getNodeName().equals("text:s")) {
           Integer count = ((TextSElement) node).getTextCAttribute();
-          for (int j = 0; j < (count != null ? count : 1); j++) buffer.append(' ');
+          buffer.append(" ".repeat(Math.max(0, (count != null ? count : 1))));
         } else if (node.getNodeName().equals("text:tab")) buffer.append('\t');
         else if (node.getNodeName().equals("text:line-break")) {
           String lineseperator = System.getProperty("line.separator");

odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfPackage.java

@@ -2432,20 +2432,20 @@ static String normalizePath(String path) {
       LOG.severe(errMsg);
       throw new IllegalArgumentException(errMsg);
     } else if (!mightBeExternalReference(path)) {
-      if (path.equals(EMPTY_STRING)) {
+      if (path.isEmpty()) {
         path = SLASH;
       } else {
         // exchange all backslash "\" with a slash "/"
-        if (path.indexOf('\\') != -1) {
+        if (path.contains("\\")) {
           path = BACK_SLASH_PATTERN.matcher(path).replaceAll(SLASH);
         }
         // exchange all double slash "//" with a slash "/"
-        while (path.indexOf("//") != -1) {
+        while (path.contains("//")) {
           path = DOUBLE_SLASH_PATTERN.matcher(path).replaceAll(SLASH);
         }
         // if directory replacements (e.g. ..) exist, resolve and remove
         // them
-        if (path.indexOf("/.") != -1 || path.indexOf("./") != -1) {
+        if (path.contains("/.") || path.contains("./")) {
           path = removeChangeDirectories(path);
         }
         if (path.startsWith(SLASH) && !path.equals(SLASH)) {

odfdom/src/main/java/org/odftoolkit/odfdom/pkg/OdfXMLFactory.java

@@ -155,7 +155,7 @@ private static String getOdfIncubatorNodeClassName(String prefix, String localNa
     boolean contains = false;
     StringBuilder className = new StringBuilder();
 
-    if (localName.indexOf(LOCAL_NAME_DELIMITER) != -1) {
+    if (localName.contains(LOCAL_NAME_DELIMITER)) {
       StringTokenizer stok = new StringTokenizer(localName, LOCAL_NAME_DELIMITER);
       while (stok.hasMoreElements()) {
         String substr = stok.nextToken();
@@ -179,7 +179,7 @@ private static String getOdfIncubatorNodeClassName(String prefix, String localNa
 
   private static String getOdfPKGNodeClassName(String prefix, String localName, String nodeType) {
     StringBuilder className = new StringBuilder("org.odftoolkit.odfdom.pkg." + prefix + ".");
-    if (localName.indexOf(LOCAL_NAME_DELIMITER) != -1) {
+    if (localName.contains(LOCAL_NAME_DELIMITER)) {
       StringTokenizer stok = new StringTokenizer(localName, LOCAL_NAME_DELIMITER);
       while (stok.hasMoreElements()) {
         className = className.append(toUpperCaseFirstCharacter(stok.nextToken()));
@@ -195,7 +195,7 @@ private static String getOdfDOMNodeClassName(String prefix, String localName, St
     StringBuilder className =
         new StringBuilder("org.odftoolkit.odfdom.dom." + nodeType + "." + prefix + ".");
     className = className.append(toUpperCaseFirstCharacter(prefix));
-    if (localName.indexOf(LOCAL_NAME_DELIMITER) != -1) {
+    if (localName.contains(LOCAL_NAME_DELIMITER)) {
       StringTokenizer stok = new StringTokenizer(localName, LOCAL_NAME_DELIMITER);
       while (stok.hasMoreElements()) {
         className = className.append(toUpperCaseFirstCharacter(stok.nextToken()));
@@ -230,7 +230,7 @@ public static OdfElement newOdfElement(OdfFileDom dom, OdfName name) throws DOME
         if (oldPrefix != null
             && !oldPrefix.equals(newPrefix)
             // "_1" is the suffix added by OdfFileDom to an existing Namespace
-            && newPrefix.indexOf("__") == -1) {
+            && !newPrefix.contains("__")) {
           // look up again if there is a class registered for this prefix
           element = newOdfElement(dom, adaptedName);
         } else {
@@ -269,7 +269,7 @@ public static OdfAttribute newOdfAttribute(OdfFileDom dom, OdfName name) throws
       OdfName adaptedName = addNamespaceToDom(name, dom);
       String newPrefix = adaptedName.getPrefix();
       // in case the prefix was changed as it existed before
-      if (!prefix.equals(newPrefix) && newPrefix.indexOf("__") == -1) {
+      if (!prefix.equals(newPrefix) && !newPrefix.contains("__")) {
         // look up again if there is a class registered for this prefix
         attr = newOdfAttribute(dom, adaptedName);
       } else {

odfdom/src/main/java/org/odftoolkit/odfdom/type/CURIEs.java

@@ -37,7 +37,7 @@ public CURIEs(List<CURIE> curies) throws IllegalArgumentException {
     if ((curies == null) || (curies.size() == 0)) {
       throw new IllegalArgumentException("parameter can not be null for CURIEs");
     }
-    StringBuffer aRet = new StringBuffer();
+    StringBuilder aRet = new StringBuilder();
     Iterator<CURIE> aIter = curies.iterator();
     while (aIter.hasNext()) {
       if (aRet.length() > 0) {

odfdom/src/main/java/org/odftoolkit/odfdom/type/CellRangeAddressList.java

@@ -47,7 +47,7 @@ public CellRangeAddressList(List<CellRangeAddress> cellRangeAddressList)
       throw new IllegalArgumentException("parameter can not be null for CellRangeAddressList");
     }
 
-    StringBuffer aRet = new StringBuffer();
+    StringBuilder aRet = new StringBuilder();
     Iterator<CellRangeAddress> aIter = cellRangeAddressList.iterator();
     while (aIter.hasNext()) {
       if (aRet.length() > 0) {

odfdom/src/main/java/org/odftoolkit/odfdom/type/IDREFS.java

@@ -42,7 +42,7 @@ public IDREFS(List<IDREF> idRefList) throws IllegalArgumentException {
     if ((idRefList == null) || (idRefList.size() == 0)) {
       throw new IllegalArgumentException("parameter can not be null for IDREFS");
     }
-    StringBuffer aRet = new StringBuffer();
+    StringBuilder aRet = new StringBuilder();
     Iterator<IDREF> aIter = idRefList.iterator();
     while (aIter.hasNext()) {
       if (aRet.length() > 0) {

odfdom/src/main/java/org/odftoolkit/odfdom/type/StyleNameRefs.java

@@ -42,7 +42,7 @@ public StyleNameRefs(List<StyleName> styleNames) throws IllegalArgumentException
     if (styleNames == null) {
       throw new IllegalArgumentException("parameter can not be null for StyleNameRefs");
     }
-    StringBuffer aRet = new StringBuffer();
+    StringBuilder aRet = new StringBuilder();
     Iterator<StyleName> aIter = styleNames.iterator();
     while (aIter.hasNext()) {
       if (aRet.length() > 0) {