support case-insensitively syntax for attribute values (https://www.w3.org/TR/selectors-4/#attribute-case)

Author: rbri

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

@@ -81,6 +81,9 @@ public abstract class AbstractCSSParser {
         parserMessages_.put("invalidPagePseudoClass",
                 "Invalid page pseudo class \"{0}\"; valid values are \"blank\", \"first\", \"left\", and \"right\".");
 
+        parserMessages_.put("invalidCaseInSensitivelyIdentifier",
+                "Invalid case-insensitively identifier \"{0}\" found; valid values are \"i\", and \"s\".");
+
         parserMessages_.put("ignoringRule", "Ignoring the whole rule.");
         parserMessages_.put("ignoringFollowingDeclarations", "Ignoring the following declarations in this rule.");
 

src/main/java/com/gargoylesoftware/css/parser/condition/AttributeCondition.java

@@ -25,15 +25,18 @@ public class AttributeCondition extends AbstractLocatable implements Condition,
 
     private final String localName_;
     private final String value_;
+    private final Boolean caseInSensitive_;
 
     /**
      * Ctor.
      * @param localName the local value
      * @param value the value
+     * @param caseInSensitive null if not set, true/false for i/s
      */
-    public AttributeCondition(final String localName, final String value) {
+    public AttributeCondition(final String localName, final String value, final Boolean caseInSensitive) {
         localName_ = localName;
         value_ = value;
+        caseInSensitive_ = caseInSensitive;
     }
 
     @Override
@@ -57,12 +60,33 @@ public String getValue() {
         return value_;
     }
 
+    /**
+     * @return true if the caseInsensitive option was set
+     */
+    public boolean isCaseInSensitive() {
+        return caseInSensitive_ != null && caseInSensitive_.booleanValue();
+    }
+
+    public String getOperator() {
+        return "=";
+    }
+
     @Override
     public String toString() {
+        String insensitive = "";
+        if (caseInSensitive_ != null) {
+            if (caseInSensitive_.booleanValue()) {
+                insensitive = " i";
+            }
+            else {
+                insensitive = " s";
+            }
+        }
+
         final String value = getValue();
         if (value != null) {
-            return "[" + getLocalName() + "=\"" + value + "\"]";
+            return "[" + getLocalName() + getOperator() + "\"" + value + "\"" + insensitive + "]";
         }
-        return "[" + getLocalName() + "]";
+        return "[" + getLocalName() + "" + insensitive + "]";
     }
 }

src/main/java/com/gargoylesoftware/css/parser/condition/BeginHyphenAttributeCondition.java

@@ -14,56 +14,29 @@
  */
 package com.gargoylesoftware.css.parser.condition;
 
-import java.io.Serializable;
-
-import com.gargoylesoftware.css.parser.AbstractLocatable;
-
 /**
  * @author Ronald Brill
  */
-public class BeginHyphenAttributeCondition extends AbstractLocatable implements Condition, Serializable {
-
-    private final String localName_;
-    private final String value_;
+public class BeginHyphenAttributeCondition extends AttributeCondition {
 
     /**
      * Ctor.
-     * @param localName the local name
+     * @param localName the local value
      * @param value the value
+     * @param caseInSensitive null if not set, true/false for i/s
      */
-    public BeginHyphenAttributeCondition(final String localName, final String value) {
-        localName_ = localName;
-        value_ = value;
+    public BeginHyphenAttributeCondition(final String localName, final String value, final Boolean caseInSensitive) {
+        super(localName, value, caseInSensitive);
     }
 
     @Override
     public ConditionType getConditionType() {
         return ConditionType.BEGIN_HYPHEN_ATTRIBUTE_CONDITION;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getLocalName() {
-        return localName_;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getValue() {
-        return value_;
-    }
-
     @Override
-    public String toString() {
-        final String value = getValue();
-        if (value != null) {
-            return "[" + getLocalName() + "|=\"" + value + "\"]";
-        }
-        return "[" + getLocalName() + "]";
+    public String getOperator() {
+        return "|=";
     }
 }
 

src/main/java/com/gargoylesoftware/css/parser/condition/OneOfAttributeCondition.java

@@ -14,55 +14,28 @@
  */
 package com.gargoylesoftware.css.parser.condition;
 
-import java.io.Serializable;
-
-import com.gargoylesoftware.css.parser.AbstractLocatable;
-
 /**
  * @author Ronald Brill
  */
-public class OneOfAttributeCondition extends AbstractLocatable implements Condition, Serializable {
-
-    private final String localName_;
-    private final String value_;
+public class OneOfAttributeCondition extends AttributeCondition {
 
     /**
      * Ctor.
-     * @param localName the local name
+     * @param localName the local value
      * @param value the value
+     * @param caseInSensitive null if not set, true/false for i/s
      */
-    public OneOfAttributeCondition(final String localName, final String value) {
-        localName_ = localName;
-        value_ = value;
+    public OneOfAttributeCondition(final String localName, final String value, final Boolean caseInSensitive) {
+        super(localName, value, caseInSensitive);
     }
 
     @Override
     public ConditionType getConditionType() {
         return ConditionType.ONE_OF_ATTRIBUTE_CONDITION;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getLocalName() {
-        return localName_;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getValue() {
-        return value_;
-    }
-
     @Override
-    public String toString() {
-        final String value = getValue();
-        if (value != null) {
-            return "[" + getLocalName() + "~=\"" + value + "\"]";
-        }
-        return "[" + getLocalName() + "]";
+    public String getOperator() {
+        return "~=";
     }
 }

src/main/java/com/gargoylesoftware/css/parser/condition/PrefixAttributeCondition.java

@@ -14,55 +14,28 @@
  */
 package com.gargoylesoftware.css.parser.condition;
 
-import java.io.Serializable;
-
-import com.gargoylesoftware.css.parser.AbstractLocatable;
-
 /**
  * @author Ronlad Brill
  */
-public class PrefixAttributeCondition extends AbstractLocatable implements Condition, Serializable {
-
-    private final String localName_;
-    private final String value_;
+public class PrefixAttributeCondition extends AttributeCondition {
 
     /**
      * Ctor.
-     * @param localName the loacl value
+     * @param localName the local value
      * @param value the value
+     * @param caseInSensitive null if not set, true/false for i/s
      */
-    public PrefixAttributeCondition(final String localName, final String value) {
-        localName_ = localName;
-        value_ = value;
+    public PrefixAttributeCondition(final String localName, final String value, final Boolean caseInSensitive) {
+        super(localName, value, caseInSensitive);
     }
 
     @Override
     public ConditionType getConditionType() {
         return ConditionType.PREFIX_ATTRIBUTE_CONDITION; //for now
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getLocalName() {
-        return localName_;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getValue() {
-        return value_;
-    }
-
     @Override
-    public String toString() {
-        final String value = getValue();
-        if (value != null) {
-            return "[" + getLocalName() + "^=\"" + value + "\"]";
-        }
-        return "[" + getLocalName() + "]";
+    public String getOperator() {
+        return "^=";
     }
 }

src/main/java/com/gargoylesoftware/css/parser/condition/SubstringAttributeCondition.java

@@ -14,55 +14,28 @@
  */
 package com.gargoylesoftware.css.parser.condition;
 
-import java.io.Serializable;
-
-import com.gargoylesoftware.css.parser.AbstractLocatable;
-
 /**
  * @author Ronald Brill
  */
-public class SubstringAttributeCondition extends AbstractLocatable implements Condition, Serializable {
-
-    private final String localName_;
-    private final String value_;
+public class SubstringAttributeCondition extends AttributeCondition {
 
     /**
      * Ctor.
-     * @param localName the loacl value
+     * @param localName the local value
      * @param value the value
+     * @param caseInSensitive null if not set, true/false for i/s
      */
-    public SubstringAttributeCondition(final String localName, final String value) {
-        localName_ = localName;
-        value_ = value;
+    public SubstringAttributeCondition(final String localName, final String value, final Boolean caseInSensitive) {
+        super(localName, value, caseInSensitive);
     }
 
     @Override
     public ConditionType getConditionType() {
         return ConditionType.SUBSTRING_ATTRIBUTE_CONDITION; //for now
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getLocalName() {
-        return localName_;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getValue() {
-        return value_;
-    }
-
     @Override
-    public String toString() {
-        final String value = getValue();
-        if (value != null) {
-            return "[" + getLocalName() + "*=\"" + value + "\"]";
-        }
-        return "[" + getLocalName() + "]";
+    public String getOperator() {
+        return "*=";
     }
 }

src/main/java/com/gargoylesoftware/css/parser/condition/SuffixAttributeCondition.java

@@ -14,55 +14,28 @@
  */
 package com.gargoylesoftware.css.parser.condition;
 
-import java.io.Serializable;
-
-import com.gargoylesoftware.css.parser.AbstractLocatable;
-
 /**
  * @author Ronald Brill
  */
-public class SuffixAttributeCondition extends AbstractLocatable implements Condition, Serializable {
-
-    private final String localName_;
-    private final String value_;
+public class SuffixAttributeCondition extends AttributeCondition {
 
     /**
      * Ctor.
-     * @param localName the loacl value
+     * @param localName the local value
      * @param value the value
+     * @param caseInSensitive null if not set, true/false for i/s
      */
-    public SuffixAttributeCondition(final String localName, final String value) {
-        localName_ = localName;
-        value_ = value;
+    public SuffixAttributeCondition(final String localName, final String value, final Boolean caseInSensitive) {
+        super(localName, value, caseInSensitive);
     }
 
     @Override
     public ConditionType getConditionType() {
         return ConditionType.SUFFIX_ATTRIBUTE_CONDITION; //for now
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getLocalName() {
-        return localName_;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getValue() {
-        return value_;
-    }
-
     @Override
-    public String toString() {
-        final String value = getValue();
-        if (value != null) {
-            return "[" + getLocalName() + "$=\"" + value + "\"]";
-        }
-        return "[" + getLocalName() + "]";
+    public String getOperator() {
+        return "$=";
     }
 }