code cleanup

Author: rbri

src/main/java/com/gargoylesoftware/css/dom/CSSRuleListImpl.java

@@ -27,7 +27,7 @@
  */
 public class CSSRuleListImpl implements Serializable {
 
-    private List<AbstractCSSRuleImpl> rules_ = new ArrayList<>();
+    private final List<AbstractCSSRuleImpl> rules_ = new ArrayList<>();
 
     /**
      * @return the rules

src/main/java/com/gargoylesoftware/css/dom/CSSStyleDeclarationImpl.java

@@ -34,8 +34,8 @@ public class CSSStyleDeclarationImpl implements Serializable {
 
     private static final String PRIORITY_IMPORTANT = "important";
 
-    private AbstractCSSRuleImpl parentRule_;
-    private List<Property> properties_ = new ArrayList<>();
+    private final AbstractCSSRuleImpl parentRule_;
+    private final List<Property> properties_ = new ArrayList<>();
 
     /**
      * Ctor.
@@ -61,7 +61,7 @@ public String getCssText() {
         for (int i = 0; i < properties_.size(); ++i) {
             final Property p = properties_.get(i);
             if (p != null) {
-                sb.append(p.toString());
+                sb.append(p);
             }
             if (i < properties_.size() - 1) {
                 sb.append(";");

src/main/java/com/gargoylesoftware/css/dom/CSSStyleSheetImpl.java

@@ -371,8 +371,8 @@ public void resetRuleIndex() {
      * SelectorEntry.
      */
     public static final class SelectorEntry {
-        private Selector selector_;
-        private CSSStyleRuleImpl rule_;
+        private final Selector selector_;
+        private final CSSStyleRuleImpl rule_;
 
         SelectorEntry(final Selector selector, final CSSStyleRuleImpl rule) {
             selector_ = selector;
@@ -404,11 +404,7 @@ private static final class SelectorIndex {
             private final Map<String, List<SelectorEntry>> keyToSelectors_ = new HashMap<>();
 
             void add(final String key, final SelectorEntry selector) {
-                List<SelectorEntry> entry = keyToSelectors_.get(key);
-                if (entry == null) {
-                    entry = new ArrayList<>();
-                    keyToSelectors_.put(key, entry);
-                }
+                List<SelectorEntry> entry = keyToSelectors_.computeIfAbsent(key, k -> new ArrayList<>());
                 entry.add(selector);
             }
 
@@ -520,7 +516,7 @@ public Iterator<SelectorEntry> getSelectorEntriesIteratorFor(final String elemen
     }
 
     static final class SelectorEntriesIterator implements Iterator<SelectorEntry> {
-        private LinkedList<Iterator<SelectorEntry>> iterators_;
+        private final LinkedList<Iterator<SelectorEntry>> iterators_;
 
         SelectorEntriesIterator(final CSSStyleSheetRuleIndex index,
                 final String elementName,

src/main/java/com/gargoylesoftware/css/dom/CounterImpl.java

@@ -28,7 +28,7 @@
  */
 public class CounterImpl implements Serializable {
 
-    private String identifier_;
+    private final String identifier_;
     private String listStyle_;
     private String separator_;
 

src/main/java/com/gargoylesoftware/css/dom/HSLColorImpl.java

@@ -28,7 +28,7 @@
  * @author Ronald Brill
  */
 public class HSLColorImpl implements Serializable {
-    private String function_;
+    private final String function_;
 
     private CSSValueImpl hue_;
     private CSSValueImpl saturation_;

src/main/java/com/gargoylesoftware/css/dom/MediaListImpl.java

@@ -36,7 +36,7 @@
  */
 public class MediaListImpl extends AbstractLocatable implements Serializable {
 
-    private List<MediaQuery> mediaQueries_;
+    private final List<MediaQuery> mediaQueries_;
 
     /**
      * Creates new MediaList.
@@ -55,7 +55,7 @@ public MediaListImpl(final MediaQueryList mediaList) {
      * @return the media text
      */
     public String getMediaText() {
-        final StringBuilder sb = new StringBuilder("");
+        final StringBuilder sb = new StringBuilder();
         boolean isNotFirst = false;
         for (final MediaQuery mediaQuery : mediaQueries_) {
             if (isNotFirst) {

src/main/java/com/gargoylesoftware/css/dom/Property.java

@@ -97,7 +97,7 @@ public String toString() {
         sb.append(name_);
         if (null != value_) {
             sb.append(": ");
-            sb.append(value_.toString());
+            sb.append(value_);
         }
         if (important_) {
             sb.append(" !important");

src/main/java/com/gargoylesoftware/css/dom/RGBColorImpl.java

@@ -28,7 +28,7 @@
  * @author Ronald Brill
  */
 public class RGBColorImpl implements Serializable {
-    private String function_;
+    private final String function_;
 
     private CSSValueImpl red_;
     private CSSValueImpl green_;

src/main/java/com/gargoylesoftware/css/parser/AbstractCSSParser.java

@@ -215,7 +215,7 @@ protected String addEscapes(final String str) {
                 default:
                     if (ch < 0x20 || ch > 0x7e) {
                         final String s = "0000" + Integer.toString(ch, 16);
-                        sb.append("\\u" + s.substring(s.length() - 4, s.length()));
+                        sb.append("\\u").append(s.substring(s.length() - 4));
                     }
                     else {
                         sb.append(ch);
@@ -264,10 +264,10 @@ protected CSSParseException toCSSParseException(final String key, final ParseExc
         final StringBuilder message = new StringBuilder(getParserMessage(key));
         message.append(" (");
         if (e.expectedTokenSequences.length == 1) {
-            message.append(MessageFormat.format(messagePattern1, new Object[] {invalid, expected}));
+            message.append(MessageFormat.format(messagePattern1, invalid, expected));
         }
         else {
-            message.append(MessageFormat.format(messagePattern2, new Object[] {invalid, expected}));
+            message.append(MessageFormat.format(messagePattern2, invalid, expected));
         }
         message.append(")");
         return new CSSParseException(message.toString(),
@@ -833,7 +833,7 @@ else if (len == 8) {
             else {
                 final String pattern = getParserMessage("invalidColor");
                 throw new CSSParseException(MessageFormat.format(
-                    pattern, new Object[] {t}),
+                    pattern, t),
                     getInputSource().getURI(), t.beginLine,
                     t.beginColumn);
             }
@@ -856,7 +856,7 @@ else if (len == 8) {
         catch (final NumberFormatException ex) {
             final String pattern = getParserMessage("invalidColor");
             throw new CSSParseException(MessageFormat.format(
-                pattern, new Object[] {t}),
+                pattern, t),
                 getInputSource().getURI(), t.beginLine,
                 t.beginColumn, ex);
         }
@@ -936,7 +936,7 @@ public String unescape(final String s, final boolean unescapeDoubleQuotes) {
 
                 if (c == '\\' || (c == '\"')) {
                     buf = new StringBuilder(len);
-                    buf.append(s.substring(0, index));
+                    buf.append(s, 0, index);
                     index--;
                     break;
                 }
@@ -946,7 +946,7 @@ public String unescape(final String s, final boolean unescapeDoubleQuotes) {
             while (index < len) {
                 if ('\\' == s.charAt(++index)) {
                     buf = new StringBuilder(len);
-                    buf.append(s.substring(0, index));
+                    buf.append(s, 0, index);
                     index--;
                     break;
                 }

src/main/java/com/gargoylesoftware/css/parser/CSSOMParser.java

@@ -43,7 +43,7 @@
  */
 public class CSSOMParser {
 
-    private AbstractCSSParser parser_;
+    private final AbstractCSSParser parser_;
     private CSSStyleSheetImpl parentStyleSheet_;
 
     /**
@@ -198,7 +198,7 @@ protected CSSStyleSheetImpl getParentStyleSheet() {
     }
 
     class CSSOMHandler implements DocumentHandler {
-        private Stack<Object> nodeStack_;
+        private final Stack<Object> nodeStack_;
         private Object root_;
         private String href_;