conditions are now a simple list associated with element selectors

Author: rbri

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

@@ -25,7 +25,6 @@ public interface Condition extends Locatable {
      * ConditionType enum.
      */
     enum ConditionType {
-        AND_CONDITION,
         ATTRIBUTE_CONDITION,
         ID_CONDITION,
         LANG_CONDITION,

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

@@ -15,16 +15,20 @@
 package com.gargoylesoftware.css.parser.selector;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.gargoylesoftware.css.parser.AbstractLocatable;
 import com.gargoylesoftware.css.parser.Locator;
+import com.gargoylesoftware.css.parser.condition.Condition;
 
 /**
  * @author Ronald Brill
  */
 public class ElementSelector extends AbstractLocatable implements SimpleSelector, Serializable {
 
     private final String localName_;
+    private List<Condition> conditions_;
 
     public ElementSelector(final String localName, final Locator locator) {
         localName_ = localName;
@@ -40,11 +44,29 @@ public String getLocalName() {
         return localName_;
     }
 
+    public List<Condition> getConditions() {
+        return conditions_;
+    }
+
+    public void addCondition(final Condition condition) {
+        if (conditions_ == null) {
+            conditions_ = new ArrayList<Condition>();
+        }
+        conditions_.add(condition);
+    }
+
     @Override
     public String toString() {
-        final String localeName = getLocalName();
+        String localeName = getLocalName();
         if (localeName == null) {
-            return "*";
+            localeName = "*";
+        }
+
+        // TODO use StringBuilder
+        if (conditions_ != null) {
+            for (Condition condition : conditions_) {
+                localeName += condition.toString();
+            }
         }
         return localeName;
     }

src/main/java/com/gargoylesoftware/css/parser/selector/ConditionalSelector.java

@@ -24,7 +24,6 @@ public interface Selector extends Locatable {
     enum SelectorType {
         ANY_NODE_SELECTOR,
         CHILD_SELECTOR,
-        CONDITIONAL_SELECTOR,
         DESCENDANT_SELECTOR,
         DIRECT_ADJACENT_SELECTOR,
         ELEMENT_NODE_SELECTOR,