% more selector cleanup

Author: rbri

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

@@ -23,24 +23,17 @@
  */
 public class DirectAdjacentSelector extends AbstractLocatable implements Selector, Serializable {
 
-    private final SelectorType nodeType_;
     private final Selector selector_;  // child
     private final SimpleSelector siblingSelector_; // direct adjacent
 
-    public DirectAdjacentSelector(final SelectorType nodeType,
-            final Selector child, final SimpleSelector directAdjacent) {
-        nodeType_ = nodeType;
+    public DirectAdjacentSelector(final Selector child, final SimpleSelector directAdjacent) {
         selector_ = child;
         if (child != null) {
             setLocator(child.getLocator());
         }
         siblingSelector_ = directAdjacent;
     }
 
-    public SelectorType getNodeType() {
-        return nodeType_;
-    }
-
     @Override
     public SelectorType getSelectorType() {
         return SelectorType.DIRECT_ADJACENT_SELECTOR;

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

@@ -23,24 +23,17 @@
  */
 public class GeneralAdjacentSelector extends AbstractLocatable implements Selector, Serializable {
 
-    private final SelectorType nodeType_;
     private final Selector selector_;
     private final SimpleSelector siblingSelector_;
 
-    public GeneralAdjacentSelector(final SelectorType nodeType,
-            final Selector child, final SimpleSelector directAdjacent) {
-        nodeType_ = nodeType;
+    public GeneralAdjacentSelector(final Selector child, final SimpleSelector directAdjacent) {
         selector_ = child;
         if (child != null) {
             setLocator(child.getLocator());
         }
         siblingSelector_ = directAdjacent;
     }
 
-    public SelectorType getNodeType() {
-        return nodeType_;
-    }
-
     @Override
     public SelectorType getSelectorType() {
         return SelectorType.GENERAL_ADJACENT_SELECTOR;

src/main/javacc/CSS3Parser.jj

@@ -1116,13 +1116,13 @@ Selector simpleSelector(Selector sel, char comb) :
                     sel = new DescendantSelector(sel, simpleSel);
                     break;
                 case '+':
-                    sel = new DirectAdjacentSelector(sel.getSelectorType(), sel, simpleSel);
+                    sel = new DirectAdjacentSelector(sel, simpleSel);
                     break;
                 case '>':
                     sel = new ChildSelector(sel, simpleSel);
                     break;
                 case '~':
-                    sel = new GeneralAdjacentSelector(sel.getSelectorType(), sel, simpleSel);
+                    sel = new GeneralAdjacentSelector(sel, simpleSel);
                     break;
                 }
             }

src/test/java/com/gargoylesoftware/css/parser/selector/DirectAdjacentSelectorTest.java

@@ -30,9 +30,8 @@ public class DirectAdjacentSelectorTest {
      */
     @Test
     public void withoutParentSimple() throws Exception {
-        final DirectAdjacentSelector s = new DirectAdjacentSelector(SelectorType.ANY_NODE_SELECTOR, null, null);
+        final DirectAdjacentSelector s = new DirectAdjacentSelector(null, null);
         Assert.assertEquals(SelectorType.DIRECT_ADJACENT_SELECTOR, s.getSelectorType());
-        Assert.assertEquals(SelectorType.ANY_NODE_SELECTOR, s.getNodeType());
         Assert.assertNull(s.getSelector());
         Assert.assertNull(s.getSiblingSelector());
 
@@ -45,9 +44,8 @@ public void withoutParentSimple() throws Exception {
     @Test
     public void selectorOnly() throws Exception {
         final ElementSelector selector = new ElementSelector("p", null);
-        final DirectAdjacentSelector s = new DirectAdjacentSelector(selector.getSelectorType(), selector, null);
+        final DirectAdjacentSelector s = new DirectAdjacentSelector(selector, null);
         Assert.assertEquals(SelectorType.DIRECT_ADJACENT_SELECTOR, s.getSelectorType());
-        Assert.assertEquals(selector.getSelectorType(), s.getNodeType());
         Assert.assertEquals(selector, s.getSelector());
         Assert.assertNull(s.getSiblingSelector());
 
@@ -60,10 +58,8 @@ public void selectorOnly() throws Exception {
     @Test
     public void simpleOnly() throws Exception {
         final ElementSelector simple = new ElementSelector("c", null);
-        final DirectAdjacentSelector s =
-                new DirectAdjacentSelector(SelectorType.ANY_NODE_SELECTOR, null, simple);
+        final DirectAdjacentSelector s = new DirectAdjacentSelector(null, simple);
         Assert.assertEquals(SelectorType.DIRECT_ADJACENT_SELECTOR, s.getSelectorType());
-        Assert.assertEquals(SelectorType.ANY_NODE_SELECTOR, s.getNodeType());
         Assert.assertNull(s.getSelector());
         Assert.assertEquals(simple, s.getSiblingSelector());
 
@@ -77,10 +73,8 @@ public void simpleOnly() throws Exception {
     public void both() throws Exception {
         final ElementSelector selector = new ElementSelector("p", null);
         final ElementSelector simple = new ElementSelector("c", null);
-        final DirectAdjacentSelector s =
-                    new DirectAdjacentSelector(selector.getSelectorType(), selector, simple);
+        final DirectAdjacentSelector s = new DirectAdjacentSelector(selector, simple);
         Assert.assertEquals(SelectorType.DIRECT_ADJACENT_SELECTOR, s.getSelectorType());
-        Assert.assertEquals(selector.getSelectorType(), s.getNodeType());
         Assert.assertEquals(selector, s.getSelector());
         Assert.assertEquals(simple, s.getSiblingSelector());
 

src/test/java/com/gargoylesoftware/css/parser/selector/GeneralAdjacentSelectorTest.java

@@ -17,8 +17,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.gargoylesoftware.css.parser.selector.Selector.SelectorType;
-
 /**
  * Test cases for {@link GeneralAdjacentSelector}.
  * @author Ronald Brill
@@ -27,8 +25,7 @@ public class GeneralAdjacentSelectorTest {
 
     @Test
     public void withoutParentDescendant() {
-        final GeneralAdjacentSelector selector =
-                new GeneralAdjacentSelector(SelectorType.ANY_NODE_SELECTOR, null, null);
+        final GeneralAdjacentSelector selector = new GeneralAdjacentSelector(null, null);
         Assert.assertNull(selector.getSelector());
         Assert.assertNull(selector.getSiblingSelector());
 
@@ -38,8 +35,7 @@ public void withoutParentDescendant() {
     @Test
     public void withoutParent() {
         final ElementSelector descendant = new ElementSelector("a", null);
-        final GeneralAdjacentSelector selector =
-                new GeneralAdjacentSelector(SelectorType.ANY_NODE_SELECTOR, null, descendant);
+        final GeneralAdjacentSelector selector = new GeneralAdjacentSelector(null, descendant);
         Assert.assertNull(selector.getSelector());
         Assert.assertEquals(descendant, selector.getSiblingSelector());
 
@@ -49,8 +45,7 @@ public void withoutParent() {
     @Test
     public void withoutDescendant() {
         final ElementSelector parent = new ElementSelector("p", null);
-        final GeneralAdjacentSelector selector =
-                new GeneralAdjacentSelector(SelectorType.ANY_NODE_SELECTOR, parent, null);
+        final GeneralAdjacentSelector selector = new GeneralAdjacentSelector(parent, null);
         Assert.assertEquals(parent, selector.getSelector());
         Assert.assertNull(null, selector.getSiblingSelector());
 
@@ -61,8 +56,7 @@ public void withoutDescendant() {
     public void both() {
         final ElementSelector parent = new ElementSelector("p", null);
         final ElementSelector descendant = new ElementSelector("a", null);
-        final GeneralAdjacentSelector selector =
-                new GeneralAdjacentSelector(SelectorType.ANY_NODE_SELECTOR, parent, descendant);
+        final GeneralAdjacentSelector selector = new GeneralAdjacentSelector(parent, descendant);
         Assert.assertEquals(parent, selector.getSelector());
         Assert.assertEquals(descendant, selector.getSiblingSelector());