% unify naming

Author: rbri

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

@@ -44,6 +44,7 @@ public Selector getAncestorSelector() {
         return ancestorSelector_;
     }
 
+    @Override
     public SimpleSelector getSimpleSelector() {
         return simpleSelector_;
     }

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

@@ -44,6 +44,7 @@ public Selector getAncestorSelector() {
         return ancestorSelector_;
     }
 
+    @Override
     public SimpleSelector getSimpleSelector() {
         return simpleSelector_;
     }

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

@@ -24,14 +24,14 @@
 public class DirectAdjacentSelector extends AbstractLocatable implements Selector, Serializable {
 
     private final Selector selector_;  // child
-    private final SimpleSelector siblingSelector_; // direct adjacent
+    private final SimpleSelector simpleSelector_;
 
-    public DirectAdjacentSelector(final Selector child, final SimpleSelector directAdjacent) {
+    public DirectAdjacentSelector(final Selector child, final SimpleSelector simpleSelector) {
         selector_ = child;
         if (child != null) {
             setLocator(child.getLocator());
         }
-        siblingSelector_ = directAdjacent;
+        simpleSelector_ = simpleSelector;
     }
 
     @Override
@@ -43,8 +43,9 @@ public Selector getSelector() {
         return selector_;
     }
 
-    public SimpleSelector getSiblingSelector() {
-        return siblingSelector_;
+    @Override
+    public SimpleSelector getSimpleSelector() {
+        return simpleSelector_;
     }
 
     @Override
@@ -57,8 +58,8 @@ public String toString() {
 
         sb.append(" + ");
 
-        if (null != siblingSelector_) {
-            sb.append(siblingSelector_.toString());
+        if (null != simpleSelector_) {
+            sb.append(simpleSelector_.toString());
         }
 
         return sb.toString();

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

@@ -40,6 +40,11 @@ public SelectorType getSelectorType() {
         return SelectorType.ELEMENT_NODE_SELECTOR;
     }
 
+    @Override
+    public SimpleSelector getSimpleSelector() {
+        return this;
+    }
+
     public String getLocalName() {
         return localName_;
     }

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

@@ -24,14 +24,14 @@
 public class GeneralAdjacentSelector extends AbstractLocatable implements Selector, Serializable {
 
     private final Selector selector_;
-    private final SimpleSelector siblingSelector_;
+    private final SimpleSelector simpleSelector_;
 
-    public GeneralAdjacentSelector(final Selector child, final SimpleSelector directAdjacent) {
+    public GeneralAdjacentSelector(final Selector child, final SimpleSelector simpleSelector) {
         selector_ = child;
         if (child != null) {
             setLocator(child.getLocator());
         }
-        siblingSelector_ = directAdjacent;
+        simpleSelector_ = simpleSelector;
     }
 
     @Override
@@ -43,8 +43,9 @@ public Selector getSelector() {
         return selector_;
     }
 
-    public SimpleSelector getSiblingSelector() {
-        return siblingSelector_;
+    @Override
+    public SimpleSelector getSimpleSelector() {
+        return simpleSelector_;
     }
 
     @Override
@@ -57,8 +58,8 @@ public String toString() {
 
         sb.append(" ~ ");
 
-        if (null != siblingSelector_) {
-            sb.append(siblingSelector_.toString());
+        if (null != simpleSelector_) {
+            sb.append(simpleSelector_.toString());
         }
 
         return sb.toString();

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

@@ -39,6 +39,11 @@ public SelectorType getSelectorType() {
         return SelectorType.PSEUDO_ELEMENT_SELECTOR;
     }
 
+    @Override
+    public SimpleSelector getSimpleSelector() {
+        return this;
+    }
+
     public String getLocalName() {
         return localName_;
     }

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

@@ -34,4 +34,9 @@ enum SelectorType {
      * @return the associated selector type
      */
     SelectorType getSelectorType();
+
+    /**
+     * @return the simple selector part
+     */
+    SimpleSelector getSimpleSelector();
 }

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

@@ -33,7 +33,7 @@ public void withoutParentSimple() throws Exception {
         final DirectAdjacentSelector s = new DirectAdjacentSelector(null, null);
         Assert.assertEquals(SelectorType.DIRECT_ADJACENT_SELECTOR, s.getSelectorType());
         Assert.assertNull(s.getSelector());
-        Assert.assertNull(s.getSiblingSelector());
+        Assert.assertNull(s.getSimpleSelector());
 
         Assert.assertEquals(" + ", s.toString());
     }
@@ -47,7 +47,7 @@ public void selectorOnly() throws Exception {
         final DirectAdjacentSelector s = new DirectAdjacentSelector(selector, null);
         Assert.assertEquals(SelectorType.DIRECT_ADJACENT_SELECTOR, s.getSelectorType());
         Assert.assertEquals(selector, s.getSelector());
-        Assert.assertNull(s.getSiblingSelector());
+        Assert.assertNull(s.getSimpleSelector());
 
         Assert.assertEquals("p + ", s.toString());
     }
@@ -61,7 +61,7 @@ public void simpleOnly() throws Exception {
         final DirectAdjacentSelector s = new DirectAdjacentSelector(null, simple);
         Assert.assertEquals(SelectorType.DIRECT_ADJACENT_SELECTOR, s.getSelectorType());
         Assert.assertNull(s.getSelector());
-        Assert.assertEquals(simple, s.getSiblingSelector());
+        Assert.assertEquals(simple, s.getSimpleSelector());
 
         Assert.assertEquals(" + c", s.toString());
     }
@@ -76,7 +76,7 @@ public void both() throws Exception {
         final DirectAdjacentSelector s = new DirectAdjacentSelector(selector, simple);
         Assert.assertEquals(SelectorType.DIRECT_ADJACENT_SELECTOR, s.getSelectorType());
         Assert.assertEquals(selector, s.getSelector());
-        Assert.assertEquals(simple, s.getSiblingSelector());
+        Assert.assertEquals(simple, s.getSimpleSelector());
 
         Assert.assertEquals("p + c", s.toString());
     }

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

@@ -27,7 +27,7 @@ public class GeneralAdjacentSelectorTest {
     public void withoutParentDescendant() {
         final GeneralAdjacentSelector selector = new GeneralAdjacentSelector(null, null);
         Assert.assertNull(selector.getSelector());
-        Assert.assertNull(selector.getSiblingSelector());
+        Assert.assertNull(selector.getSimpleSelector());
 
         Assert.assertEquals(" ~ ", selector.toString());
     }
@@ -37,7 +37,7 @@ public void withoutParent() {
         final ElementSelector descendant = new ElementSelector("a", null);
         final GeneralAdjacentSelector selector = new GeneralAdjacentSelector(null, descendant);
         Assert.assertNull(selector.getSelector());
-        Assert.assertEquals(descendant, selector.getSiblingSelector());
+        Assert.assertEquals(descendant, selector.getSimpleSelector());
 
         Assert.assertEquals(" ~ a", selector.toString());
     }
@@ -47,7 +47,7 @@ public void withoutDescendant() {
         final ElementSelector parent = new ElementSelector("p", null);
         final GeneralAdjacentSelector selector = new GeneralAdjacentSelector(parent, null);
         Assert.assertEquals(parent, selector.getSelector());
-        Assert.assertNull(null, selector.getSiblingSelector());
+        Assert.assertNull(null, selector.getSimpleSelector());
 
         Assert.assertEquals("p ~ ", selector.toString());
     }
@@ -58,7 +58,7 @@ public void both() {
         final ElementSelector descendant = new ElementSelector("a", null);
         final GeneralAdjacentSelector selector = new GeneralAdjacentSelector(parent, descendant);
         Assert.assertEquals(parent, selector.getSelector());
-        Assert.assertEquals(descendant, selector.getSiblingSelector());
+        Assert.assertEquals(descendant, selector.getSimpleSelector());
 
         Assert.assertEquals("p ~ a", selector.toString());
     }