cleanup

Author: rbri

src/main/java/org/htmlunit/html/HtmlElement.java

@@ -26,7 +26,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
 import org.htmlunit.BrowserVersion;
 import org.htmlunit.ElementNotFoundException;
 import org.htmlunit.Page;
@@ -45,6 +44,7 @@
 import org.htmlunit.javascript.host.event.KeyboardEvent;
 import org.htmlunit.javascript.host.html.HTMLDocument;
 import org.htmlunit.javascript.host.html.HTMLElement;
+import org.htmlunit.util.StringUtils;
 import org.w3c.dom.Attr;
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.Comment;
@@ -1313,9 +1313,6 @@ public DisplayStyle getDefaultStyleDisplay() {
      *         or an empty string if that attribute isn't defined.
      */
     protected final String getSrcAttributeNormalized() {
-        // at the moment StringUtils.replaceChars returns the org string
-        // if nothing to replace was found but the doc implies, that we
-        // can't trust on this in the future
         final String attrib = getAttributeDirect(SRC_ATTRIBUTE);
         if (ATTRIBUTE_NOT_DEFINED == attrib) {
             return attrib;

src/main/java/org/htmlunit/html/HtmlTableCell.java

@@ -16,8 +16,8 @@
 
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
 import org.htmlunit.SgmlPage;
+import org.htmlunit.util.StringUtils;
 
 /**
  * An abstract cell that provides the implementation for HtmlTableDataCell and HtmlTableHeaderCell.

src/main/java/org/htmlunit/javascript/JavaScriptEngine.java

@@ -782,7 +782,7 @@ public Object execute(final HtmlPage page, final Scriptable scope, final Script
         final HtmlUnitContextAction action = new HtmlUnitContextAction(page) {
             @Override
             public Object doRun(final Context cx) {
-                return script.exec(cx, scope);
+                return script.exec(cx, scope, scope);
             }
 
             @Override

src/main/java/org/htmlunit/javascript/host/WindowOrWorkerGlobalScopeMixin.java

@@ -18,7 +18,6 @@
 import java.util.Arrays;
 import java.util.Base64;
 
-import org.apache.commons.lang3.StringUtils;
 import org.htmlunit.Page;
 import org.htmlunit.WebWindow;
 import org.htmlunit.corejs.javascript.Context;
@@ -29,6 +28,7 @@
 import org.htmlunit.javascript.JavaScriptEngine;
 import org.htmlunit.javascript.background.BackgroundJavaScriptFactory;
 import org.htmlunit.javascript.background.JavaScriptJob;
+import org.htmlunit.util.StringUtils;
 
 /**
  * The implementation of {@code WindowOrWorkerGlobalScope}

src/main/java/org/htmlunit/javascript/polyfill/Polyfill.java

@@ -72,7 +72,7 @@ public void apply(final Context context, final Scriptable scriptable) {
         }
 
         if (script_ != null) {
-            script_.exec(context, scriptable);
+            script_.exec(context, scriptable, scriptable);
         }
     }
 }

src/main/java/org/htmlunit/javascript/preprocessor/HtmxTwoZeroSevenScriptPreProcessor.java

@@ -14,7 +14,6 @@
  */
 package org.htmlunit.javascript.preprocessor;
 
-import org.apache.commons.lang3.StringUtils;
 import org.htmlunit.ScriptPreProcessor;
 import org.htmlunit.html.HtmlElement;
 import org.htmlunit.html.HtmlPage;
@@ -78,41 +77,34 @@ public String preProcess(final HtmlPage htmlPage, final String sourceCode, final
         String patchedSourceCode = sourceCode;
 
         if (sourceName.contains("/htmx.js") && !sourceName.contains("/htmx.js#")) {
-            patchedSourceCode = StringUtils.replace(
-                    sourceCode,
+            patchedSourceCode = sourceCode.replace(
                     "result.push(...toArray(rootNode.querySelectorAll(standardSelector)))",
                     "result.push.apply(result, toArray(rootNode.querySelectorAll(standardSelector)))");
 
-            patchedSourceCode = StringUtils.replace(
-                    patchedSourceCode,
+            patchedSourceCode = patchedSourceCode.replace(
                     "result.push(...findAttributeTargets(eltToInheritFrom, attrName))",
                     "result.push.apply(result, findAttributeTargets(eltToInheritFrom, attrName))");
 
-            patchedSourceCode = StringUtils.replace(
-                    patchedSourceCode,
+            patchedSourceCode = patchedSourceCode.replace(
                     "for (const preservedElt of [...pantry.children]) {",
                     "for (const preservedElt of Array.from(pantry.children)) {");
         }
         else if (sourceName.contains("/htmx.min.js") && !sourceName.contains("/htmx.min.js#")) {
             // 2.0.4
-            patchedSourceCode = StringUtils.replace(
-                    sourceCode,
+            patchedSourceCode = sourceCode.replace(
                     "i.push(...M(c.querySelectorAll(e)))",
                     "i.push.apply(i,M(c.querySelectorAll(e)))");
 
             // 2.0.7
-            patchedSourceCode = StringUtils.replace(
-                    patchedSourceCode,
+            patchedSourceCode = patchedSourceCode.replace(
                     "i.push(...F(c.querySelectorAll(e)))",
                     "i.push.apply(i,F(c.querySelectorAll(e)))");
 
-            patchedSourceCode = StringUtils.replace(
-                    patchedSourceCode,
+            patchedSourceCode = patchedSourceCode.replace(
                     "r.push(...we(i,n))",
                     "r.push.apply(r,we(i,n))");
 
-            patchedSourceCode = StringUtils.replace(
-                    patchedSourceCode,
+            patchedSourceCode = patchedSourceCode.replace(
                     "for(const t of[...e.children]){",
                     "for(const t of Array.from(e.children)){");
         }

src/main/java/org/htmlunit/platform/font/AwtFontUtil.java

@@ -48,7 +48,8 @@ public int countLines(final String content, final int pixelWidth, final String f
                 do {
                     lineBreakMeasurer.nextLayout(pixelWidth);
                     lineCount++;
-                } while (lineBreakMeasurer.getPosition() < line.length() && lineCount < 1000);
+                }
+                while (lineBreakMeasurer.getPosition() < line.length() && lineCount < 1000);
             }
         }
         return lineCount;

src/main/java/org/htmlunit/svg/SvgScript.java

@@ -16,11 +16,11 @@
 
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
 import org.htmlunit.SgmlPage;
 import org.htmlunit.html.DomAttr;
 import org.htmlunit.html.ScriptElement;
 import org.htmlunit.html.ScriptElementSupport;
+import org.htmlunit.util.StringUtils;
 
 /**
  * Wrapper for the SVG element {@code script}.
@@ -90,9 +90,6 @@ public final String getScriptSource() {
      *         or an empty string if that attribute isn't defined.
      */
     protected final String getSrcAttributeNormalized() {
-        // at the moment StringUtils.replaceChars returns the org string
-        // if nothing to replace was found but the doc implies, that we
-        // can't trust on this in the future
         final String attrib = getAttributeDirect(SRC_ATTRIBUTE);
         if (ATTRIBUTE_NOT_DEFINED == attrib) {
             return attrib;

src/main/java/org/htmlunit/util/EncodingSniffer.java

@@ -415,7 +415,9 @@ public static Charset extractEncodingFromContentType(final String s) {
             if (i == bytes.length) {
                 return null;
             }
-        } while (bytes[i] == 0x09 || bytes[i] == 0x0A || bytes[i] == 0x0C || bytes[i] == 0x0D || bytes[i] == 0x20);
+        }
+        while (bytes[i] == 0x09 || bytes[i] == 0x0A || bytes[i] == 0x0C || bytes[i] == 0x0D || bytes[i] == 0x20);
+
         if (bytes[i] == '"') {
             if (bytes.length <= i + 1) {
                 return null;