code cleanup

Author: rbri

src/main/java/org/htmlunit/Cache.java

@@ -168,7 +168,7 @@ else if (response.getResponseHeaderValue(HttpHeader.LAST_MODIFIED) != null) {
      *
      * @param request the request corresponding to the specified compiled script
      * @param response the response corresponding to the specified compiled script
-     * @param toCache the object that is to be cached, if possible (may be for instance a compiled script or
+     * @param toCache the object that is to be cached, if possible (for instance a compiled script or
      *        simply a WebResponse)
      * @return whether the response was cached or not
      */

src/main/java/org/htmlunit/WebClient.java

@@ -3080,16 +3080,16 @@ public Set<BroadcastChannel> getBroadcastChannels() {
      * Our pool of CSS3Parsers. If you need a parser, get it from here and use the AutoCloseable
      * functionality with a try-with-resource block. If you don't want to do that at all, continue
      * to build CSS3Parsers the old fashioned way.
-     *
+     * <p>
      * Fetching a parser is thread safe. This API is built to minimize synchronization overhead,
      * hence it is possible to miss a returned parser from another thread under heavy pressure,
      * but because that is unlikely, we keep it simple and efficient. Caches are not supposed
      * to give cutting-edge guarantees.
-     *
+     * <p>
      * This concept avoids a resource leak when someone does not close the fetched
      * parser because the pool does not know anything about the parser unless
      * it returns. We are not running a checkout-checkin concept.
-     *
+     * <p>
      * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br>
      */
     static class CSS3ParserPool {
@@ -3130,7 +3130,7 @@ protected void recycle(final PooledCSS3Parser parser) {
      * This is a poolable CSS3Parser which can be reused automatically when closed.
      * A regular CSS3Parser is not thread-safe, hence also our pooled parser
      * is not thread-safe.
-     *
+     * <p>
      * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br>
      */
     public static class PooledCSS3Parser extends CSS3Parser implements AutoCloseable {

src/main/java/org/htmlunit/css/AbstractCssStyleDeclaration.java

@@ -87,7 +87,7 @@ public abstract class AbstractCssStyleDeclaration implements Serializable {
 
     /**
      * Get the value for the style attribute.
-     * This impl ignores the default getDefaultValueIfEmpty flag, but there is a overload
+     * This impl ignores the default getDefaultValueIfEmpty flag, but there is an overload
      * in {@link ComputedCssStyleDeclaration}.
      * @param definition the definition
      * @param getDefaultValueIfEmpty whether to get the default value if empty or not
@@ -113,7 +113,7 @@ public abstract class AbstractCssStyleDeclaration implements Serializable {
      * attributes exists, its value is returned. If neither attribute exists, an empty string
      * is returned.</p>
      *
-     * <p>The second named attribute may be shorthand for a the actual desired property.
+     * <p>The second named attribute may be shorthand for the actual desired property.
      * The following formats are possible:</p>
      * <ol>
      *   <li><code>top right bottom left</code>: All values are explicit.</li>
@@ -833,9 +833,9 @@ public String getOpacity() {
             return "";
         }
 
-        final String trimedOpacity = opacity.trim();
+        final String trimmedOpacity = opacity.trim();
         try {
-            final double value = Double.parseDouble(trimedOpacity);
+            final double value = Double.parseDouble(trimmedOpacity);
             if (value % 1 == 0) {
                 return Integer.toString((int) value);
             }

src/main/java/org/htmlunit/css/ComputedCssStyleDeclaration.java

@@ -2467,7 +2467,7 @@ private String defaultIfEmpty(final String str, final String toReturnIfEmptyOrDe
     /**
      * Returns the specified length value as a pixel length value.
      * This method does <b>NOT</b> handle percentages correctly;
-     * use {@link CssPixelValueConverter#pixelValue(DomElement, CssValue)} if you need percentage support).
+     * use {@link CssPixelValueConverter#pixelValue(DomElement, CssValue)} if you need percentage support.
      * @param value the length value to convert to a pixel length value
      * @return the specified length value as a pixel length value
      * @see CssPixelValueConverter#pixelString(DomElement, CssValue)

src/main/java/org/htmlunit/css/CssPixelValueConverter.java

@@ -57,7 +57,7 @@ public static int pixelValue(final DomElement element, final CssValue value) {
     }
 
     /**
-     * Returns the specified length CSS attribute value value as a pixel length value.
+     * Returns the specified length CSS attribute value as a pixel length value.
      * If the specified CSS attribute value is a percentage, this method
      * uses the specified value object to recursively retrieve the base (parent) CSS attribute value.
      * @param element the element for which the CSS attribute value is to be retrieved
@@ -78,7 +78,7 @@ public static String pixelString(final DomElement element, final CssValue value)
     /**
      * Converts the specified length string value into an integer number of pixels. This method does
      * <b>NOT</b> handle percentages correctly; use {@link #pixelString(DomElement, CssValue)} if you
-     * need percentage support).
+     * need percentage support.
      * @param value the length string value to convert to an integer number of pixels
      * @return the integer number of pixels corresponding to the specified length string value
      * @see <a href="http://htmlhelp.com/reference/css/units.html">CSS Units</a>

src/main/java/org/htmlunit/css/CssStyleSheet.java

@@ -286,8 +286,8 @@ public void setEnabled(final boolean enabled) {
     /**
      * Loads the stylesheet at the specified link or href.
      * @param element the parent DOM element
-     * @param link the stylesheet's link (may be {@code null} if a <code>url</code> is specified)
-     * @param url the stylesheet's url (may be {@code null} if a <code>link</code> is specified)
+     * @param link the stylesheet's link (maybe {@code null} if a <code>url</code> is specified)
+     * @param url the stylesheet's url (maybe {@code null} if a <code>link</code> is specified)
      * @return the loaded stylesheet
      */
     public static CssStyleSheet loadStylesheet(final HtmlElement element, final HtmlLink link, final String url) {
@@ -1553,7 +1553,7 @@ private static double resolutionValue(final CSSValueImpl cssValue) {
      * @param style the style to modify
      * @param element the element to which style rules must apply in order for them to be added to
      *        the specified style
-     * @param pseudoElement a string specifying the pseudo-element to match (may be {@code null})
+     * @param pseudoElement a string specifying the pseudo-element to match (maybe {@code null})
      */
     public void modifyIfNecessary(final ComputedCssStyleDeclaration style, final DomElement element,
             final String pseudoElement) {

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

@@ -77,7 +77,7 @@ protected DomNode getDomNode() {
      * @return the nodes in this node list
      */
     private List<E> getNodes() {
-        // a bit of a hack but i like to avoid synchronization
+        // a bit of a hack but I like to avoid synchronization
         // see https://github.com/HtmlUnit/htmlunit/issues/882
         //
         // there is a small chance that the cachedElements_ are

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

@@ -35,7 +35,7 @@ public class DomAttr extends DomNamespaceNode implements Attr {
      * Instantiate a new attribute.
      *
      * @param page the page that the attribute belongs to
-     * @param namespaceURI the namespace that defines the attribute name (may be {@code null})
+     * @param namespaceURI the namespace that defines the attribute name (maybe {@code null})
      * @param qualifiedName the name of the attribute
      * @param value the value of the attribute
      * @param specified {@code true} if this attribute was explicitly given a value in the source document,

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

@@ -425,7 +425,7 @@ String getQualifiedName(final String namespaceURI, final String localName) {
      * Returns the value of the attribute specified by name or an empty string. If the
      * result is an empty string then it will be either {@link #ATTRIBUTE_NOT_DEFINED}
      * if the attribute wasn't specified or {@link #ATTRIBUTE_VALUE_EMPTY} if the
-     * attribute was specified but it was empty.
+     * attribute was specified, but it was empty.
      *
      * @param attributeName the name of the attribute
      * @return the value of the attribute or {@link #ATTRIBUTE_NOT_DEFINED} or {@link #ATTRIBUTE_VALUE_EMPTY}
@@ -577,7 +577,7 @@ protected boolean isAttributeCaseSensitive() {
      * Returns the value of the attribute specified by namespace and local name or an empty
      * string. If the result is an empty string then it will be either {@link #ATTRIBUTE_NOT_DEFINED}
      * if the attribute wasn't specified or {@link #ATTRIBUTE_VALUE_EMPTY} if the
-     * attribute was specified but it was empty.
+     * attribute was specified, but it was empty.
      *
      * @param namespaceURI the URI that identifies an XML namespace
      * @param localName the name within the namespace

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

@@ -58,10 +58,7 @@ public int getColumnSpan() {
             if (span < 1) {
                 return 1;
             }
-            if (span > 1_000) {
-                return 1_000;
-            }
-            return span;
+            return Math.min(span, 1_000);
         }
         catch (final NumberFormatException e) {
             return 1;
@@ -85,10 +82,7 @@ public int getRowSpan() {
                 return 0;
             }
 
-            if (span > 65_534) {
-                return 65_534;
-            }
-            return span;
+            return Math.min(span, 65_534);
         }
         catch (final NumberFormatException e) {
             return 1;