% selectorlistimpl is no a real list

Author: rbri

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

@@ -14,24 +14,15 @@
  */
 package com.gargoylesoftware.css.parser.selector;
 
+import java.util.List;
+
 /**
  * The SelectorList interface provides the abstraction of an ordered collection
  * of selectors, without defining or constraining how this collection is
  * implemented.
  *
  * @author Ronald Brill
  */
-public interface SelectorList {
-
-    /**
-     * Returns the length of this selector list
-     */
-    int getLength();
-
-    /**
-     * Returns the selector at the specified index, or <code>null</code> if this
-     * is not a valid index.
-     */
-    Selector item(int index);
+public interface SelectorList extends List<Selector> {
 }
 

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

@@ -16,7 +16,11 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
+import java.util.ListIterator;
+import java.util.stream.Collectors;
 
 import com.gargoylesoftware.css.parser.AbstractLocatable;
 
@@ -27,41 +31,131 @@
  */
 public class SelectorListImpl extends AbstractLocatable implements SelectorList, Serializable {
 
-    private List<Selector> selectors_ = new ArrayList<Selector>(10);
+    private List<Selector> selectors_ = new ArrayList<Selector>();
 
     public List<Selector> getSelectors() {
         return selectors_;
     }
 
-    public void setSelectors(final List<Selector> selectors) {
-        selectors_ = selectors;
+    @Override
+    public String toString() {
+        return selectors_.stream()
+                .map(n -> n.toString())
+                .collect(Collectors.joining(", "));
     }
 
     @Override
-    public int getLength() {
+    public int size() {
         return selectors_.size();
     }
 
     @Override
-    public Selector item(final int index) {
+    public boolean isEmpty() {
+        return selectors_.isEmpty();
+    }
+
+    @Override
+    public boolean contains(final Object o) {
+        return selectors_.contains(o);
+    }
+
+    @Override
+    public Iterator<Selector> iterator() {
+        return selectors_.iterator();
+    }
+
+    @Override
+    public Object[] toArray() {
+        return selectors_.toArray();
+    }
+
+    @Override
+    public <T> T[] toArray(final T[] a) {
+        return selectors_.toArray(a);
+    }
+
+    @Override
+    public boolean add(final Selector e) {
+        return selectors_.add(e);
+    }
+
+    @Override
+    public boolean remove(final Object o) {
+        return selectors_.remove(o);
+    }
+
+    @Override
+    public boolean containsAll(final Collection<?> c) {
+        return selectors_.containsAll(c);
+    }
+
+    @Override
+    public boolean addAll(final Collection<? extends Selector> c) {
+        return selectors_.addAll(c);
+    }
+
+    @Override
+    public boolean addAll(final int index, final Collection<? extends Selector> c) {
+        return selectors_.addAll(index, c);
+    }
+
+    @Override
+    public boolean removeAll(final Collection<?> c) {
+        return selectors_.removeAll(c);
+    }
+
+    @Override
+    public boolean retainAll(final Collection<?> c) {
+        return selectors_.retainAll(c);
+    }
+
+    @Override
+    public void clear() {
+        selectors_.clear();
+    }
+
+    @Override
+    public Selector get(final int index) {
         return selectors_.get(index);
     }
 
-    public void add(final Selector sel) {
-        selectors_.add(sel);
+    @Override
+    public Selector set(final int index, final Selector element) {
+        return selectors_.set(index, element);
     }
 
     @Override
-    public String toString() {
-        final int len = getLength();
-
-        final StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < len; i++) {
-            sb.append(item(i).toString());
-            if (i < len - 1) {
-                sb.append(", ");
-            }
-        }
-        return sb.toString();
+    public void add(final int index, final Selector element) {
+        selectors_.add(index, element);
+    }
+
+    @Override
+    public Selector remove(final int index) {
+        return selectors_.remove(index);
+    }
+
+    @Override
+    public int indexOf(final Object o) {
+        return selectors_.indexOf(o);
+    }
+
+    @Override
+    public int lastIndexOf(final Object o) {
+        return selectors_.lastIndexOf(o);
+    }
+
+    @Override
+    public ListIterator<Selector> listIterator() {
+        return selectors_.listIterator();
+    }
+
+    @Override
+    public ListIterator<Selector> listIterator(final int index) {
+        return selectors_.listIterator(index);
+    }
+
+    @Override
+    public List<Selector> subList(final int fromIndex, final int toIndex) {
+        return selectors_.subList(fromIndex, toIndex);
     }
 }

src/test/java/com/gargoylesoftware/css/parser/AbstractCSSParserTest.java

@@ -136,7 +136,7 @@ protected SelectorList createSelectors(final String cssText) throws Exception {
 
     protected List<Condition> createConditions(final String cssText) throws Exception {
         final SelectorList selectors = createSelectors(cssText);
-        final Selector selector = selectors.item(0);
+        final Selector selector = selectors.get(0);
         final ElementSelector elementSelector = (ElementSelector) selector;
         return elementSelector.getConditions();
     }
@@ -212,12 +212,12 @@ protected void conditionAssert(final String cssText, final String name,
 
     protected void selectorList(final String cssText, final int length) throws Exception {
         final SelectorList selectors = createSelectors(cssText);
-        Assert.assertEquals(length, selectors.getLength());
+        Assert.assertEquals(length, selectors.size());
     }
 
     protected void selectorType(final String cssText, final SelectorType... selectorTypes) throws Exception {
         final SelectorList selectors = createSelectors(cssText);
-        final Selector selector = selectors.item(0);
+        final Selector selector = selectors.get(0);
         Assert.assertEquals(selectorTypes[0], selector.getSelectorType());
         if (selectorTypes[0] == SelectorType.DESCENDANT_SELECTOR) {
             final DescendantSelector descendantSelector = (DescendantSelector) selector;