simplify code

Author: rbri

src/main/java/org/htmlunit/xpath/functions/FuncNormalizeSpace.java

@@ -29,6 +29,6 @@ public class FuncNormalizeSpace extends FunctionDef1Arg {
   public XObject execute(final XPathContext xctxt) throws javax.xml.transform.TransformerException {
     final XString s1 = getArg0AsString(xctxt);
 
-    return s1.fixWhiteSpace(true, true, false);
+    return s1.fixWhiteSpace();
   }
 }

src/main/java/org/htmlunit/xpath/objects/XString.java

@@ -396,18 +396,11 @@ private static boolean isSpace(final char ch) {
 
   /**
    * Conditionally trim all leading and trailing whitespace in the specified String. All strings of
-   * white space are replaced by a single space character (#x20), except spaces after punctuation
-   * which receive double spaces if doublePunctuationSpaces is true. This function may be useful to
-   * a formatter, but to get first class results, the formatter should probably do it's own white
-   * space handling based on the semantics of the formatting object.
+   * white space are replaced by a single space character (#x20), except spaces after punctuation.
    *
-   * @param trimHead Trim leading whitespace?
-   * @param trimTail Trim trailing whitespace?
-   * @param doublePunctuationSpaces Use double spaces for punctuation?
    * @return The trimmed string.
    */
-  public XString fixWhiteSpace(
-      final boolean trimHead, final boolean trimTail, final boolean doublePunctuationSpaces) {
+  public XString fixWhiteSpace() {
 
     // %OPT% !!!!!!!
     final int len = this.length();
@@ -439,16 +432,7 @@ public XString fixWhiteSpace(
 
           buf[d++] = ' ';
 
-          if (doublePunctuationSpaces && (s != 0)) {
-            final char prevChar = buf[s - 1];
-
-            if (!((prevChar == '.') || (prevChar == '!') || (prevChar == '?'))) {
-              pres = true;
-            }
-          }
-          else {
-            pres = true;
-          }
+          pres = true;
         }
         else {
           edit = true;
@@ -461,15 +445,15 @@ public XString fixWhiteSpace(
       }
     }
 
-    if (trimTail && 1 <= d && ' ' == buf[d - 1]) {
+    if (1 <= d && ' ' == buf[d - 1]) {
       edit = true;
 
       d--;
     }
 
     int start = 0;
 
-    if (trimHead && 0 < d && ' ' == buf[0]) {
+    if (0 < d && ' ' == buf[0]) {
       edit = true;
 
       start++;