code cleanup

Author: rbri

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

@@ -1173,7 +1173,7 @@ else if (previousSibling_ != null && previousSibling_.nextSibling_ == this) {
 
     private void fireRemoval(final DomNode exParent) {
         final SgmlPage page = getPage();
-        if (page != null && page instanceof HtmlPage) {
+        if (page instanceof HtmlPage) {
             // some actions executed on removal need an intact parent relationship (e.g. for the
             // DocumentPositionComparator) so we have to restore it temporarily
             parent_ = exParent;

src/main/java/org/htmlunit/html/xpath/XPathAdapter.java

@@ -45,14 +45,6 @@ private enum STATE {
     }
 
     private final Expression mainExp_;
-    private FunctionTable funcTable_;
-
-    /**
-     * Initiates the function table.
-     */
-    private void initFunctionTable() {
-        funcTable_ = new FunctionTable();
-    }
 
     /**
      * Constructor.
@@ -64,11 +56,9 @@ private void initFunctionTable() {
     public XPathAdapter(final String exprString, final PrefixResolver prefixResolver, final boolean caseSensitive)
                 throws TransformerException {
 
-        initFunctionTable();
-
         final ErrorListener errorHandler = new DefaultErrorHandler();
         final XPathParser parser = new XPathParser(errorHandler);
-        final Compiler compiler = new Compiler(errorHandler, funcTable_);
+        final Compiler compiler = new Compiler(errorHandler, new FunctionTable());
 
         final String expression = preProcessXPath(exprString, caseSensitive);
         parser.initXPath(compiler, expression, prefixResolver);

src/main/java/org/htmlunit/javascript/host/dom/DOMException.java

@@ -140,7 +140,7 @@ public class DOMException extends HtmlUnitScriptable {
     @JsxConstant
     public static final int DATA_CLONE_ERR = 25;
 
-    private static final List<String> COMMON_ERROR_NAMES = Arrays.asList(new String[] {
+    private static final List<String> COMMON_ERROR_NAMES = Arrays.asList(
         "IndexSizeError",
         null,
         "HierarchyRequestError",
@@ -165,7 +165,7 @@ public class DOMException extends HtmlUnitScriptable {
         "QuotaExceededError",
         "TimeoutError",
         "InvalidNodeTypeError",
-        "DataCloneError"});
+        "DataCloneError");
 
     private int code_;
     private String name_;

src/main/java/org/htmlunit/javascript/host/file/FileList.java

@@ -59,8 +59,8 @@ public FileList(final java.io.File[] array) {
         super();
         files_ = new ArrayList<>();
 
-        for (int i = 0; i < array.length; i++) {
-            files_.add(new File(array[i].getAbsolutePath()));
+        for (final java.io.File f : array) {
+            files_.add(new File(f.getAbsolutePath()));
         }
     }
 

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

@@ -29,22 +29,21 @@ private ArrayUtils() {
     }
 
     /**
-     * @param s the string[] to check
+     * @param strings the string[] to check
      * @param expected the string that we expect
      * @return true if at least one element of the array equalsIgnoreCase to the expected string
      */
-    public static boolean containsIgnoreCase(final String[] s, final String expected) {
+    public static boolean containsIgnoreCase(final String[] strings, final String expected) {
         if (expected == null) {
             throw new IllegalArgumentException("Expected string can't be null");
         }
 
-        if (s == null) {
+        if (strings == null) {
             return false;
         }
 
-        for (int i = 0; i < s.length; i++) {
-            final String string = s[i];
-            if (expected.equalsIgnoreCase(string)) {
+        for (final String s : strings) {
+            if (expected.equalsIgnoreCase(s)) {
                 return true;
             }
         }

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

@@ -475,7 +475,7 @@ public static Charset sniffEncodingFromXmlDeclaration(final InputStream is) thro
                 int start = declaration.indexOf("encoding");
                 if (start != -1) {
                     start += 8;
-                    char delimiter;
+                    final char delimiter;
                 outer:
                     while (true) {
                         switch (declaration.charAt(start)) {

src/main/java/org/htmlunit/xml/XmlPage.java

@@ -127,7 +127,8 @@ public XmlPage(final WebResponse webResponse, final WebWindow enclosingWindow, f
                     LOG.warn("Failed parsing XML document '" + webResponse.getWebRequest().getUrl() + "'", e);
                 }
                 if (!ignoreSAXException) {
-                    throw new IOException(e.getMessage());
+                    throw new IOException(
+                            "Failed parsing XML document '" + webResponse.getWebRequest().getUrl() + "'", e);
                 }
             }
         }