enhance the condition interface a bit to no longer need to cast in Ht…

…mlUnit
HtmlUnit · Dec 24, 2018 · 43ffb67 · 43ffb67
1 parent fa37068
commit 43ffb67
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 28 deletions.
diff --git a/src/main/java/com/gargoylesoftware/css/parser/condition/AttributeCondition.java b/src/main/java/com/gargoylesoftware/css/parser/condition/AttributeCondition.java
@@ -42,15 +42,18 @@ public ConditionType getConditionType() {
     }
 
     /**
-     * @return the local name
+     * {@inheritDoc}
      */
+    @Override
     public String getLocalName() {
         return localName_;
     }
 
+
     /**
-     * @return the value
+     * {@inheritDoc}
      */
+    @Override
     public String getValue() {
         return value_;
     }

diff --git a/src/main/java/com/gargoylesoftware/css/parser/condition/BeginHyphenAttributeCondition.java b/src/main/java/com/gargoylesoftware/css/parser/condition/BeginHyphenAttributeCondition.java
@@ -42,15 +42,17 @@ public ConditionType getConditionType() {
     }
 
     /**
-     * @return the local name
+     * {@inheritDoc}
      */
+    @Override
     public String getLocalName() {
         return localName_;
     }
 
     /**
-     * @return the value
+     * {@inheritDoc}
      */
+    @Override
     public String getValue() {
         return value_;
     }

diff --git a/src/main/java/com/gargoylesoftware/css/parser/condition/ClassCondition.java b/src/main/java/com/gargoylesoftware/css/parser/condition/ClassCondition.java
@@ -43,15 +43,17 @@ public ConditionType getConditionType() {
     }
 
     /**
-     * @return the local name
+     * {@inheritDoc}
      */
+    @Override
     public String getLocalName() {
         return null;
     }
 
     /**
-     * @return the value
+     * {@inheritDoc}
      */
+    @Override
     public String getValue() {
         return value_;
     }

diff --git a/src/main/java/com/gargoylesoftware/css/parser/condition/Condition.java b/src/main/java/com/gargoylesoftware/css/parser/condition/Condition.java
@@ -41,4 +41,14 @@ enum ConditionType {
      * @return the associated condition type
      */
     ConditionType getConditionType();
+
+    /**
+     * @return the value
+     */
+    public String getValue();
+
+    /**
+     * @return the local name
+     */
+    public String getLocalName();
 }
diff --git a/src/main/java/com/gargoylesoftware/css/parser/condition/IdCondition.java b/src/main/java/com/gargoylesoftware/css/parser/condition/IdCondition.java
@@ -36,21 +36,26 @@ public IdCondition(final String value, final Locator locator) {
         setLocator(locator);
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public ConditionType getConditionType() {
         return ConditionType.ID_CONDITION;
     }
 
     /**
-     * @return the local name
+     * {@inheritDoc}
      */
+    @Override
     public String getLocalName() {
         return null;
     }
 
     /**
-     * @return the value
+     * {@inheritDoc}
      */
+    @Override
     public String getValue() {
         return value_;
     }

diff --git a/src/main/java/com/gargoylesoftware/css/parser/condition/LangCondition.java b/src/main/java/com/gargoylesoftware/css/parser/condition/LangCondition.java
@@ -42,10 +42,19 @@ public ConditionType getConditionType() {
         return ConditionType.LANG_CONDITION;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getLocalName() {
+        return null;
+    }
+
     /**
      * @return the language
      */
-    public String getLang() {
+    @Override
+    public String getValue() {
         return lang_;
     }
 
@@ -54,7 +63,7 @@ public String toString() {
         final StringBuilder result = new StringBuilder();
         result.append(":lang(");
 
-        final String lang = getLang();
+        final String lang = getValue();
         if (null != lang) {
             result.append(lang);
         }

diff --git a/src/main/java/com/gargoylesoftware/css/parser/condition/OneOfAttributeCondition.java b/src/main/java/com/gargoylesoftware/css/parser/condition/OneOfAttributeCondition.java
@@ -28,7 +28,7 @@ public class OneOfAttributeCondition extends AbstractLocatable implements Condit
 
     /**
      * Ctor.
-     * @param localName the local value
+     * @param localName the local name
      * @param value the value
      */
     public OneOfAttributeCondition(final String localName, final String value) {
@@ -42,15 +42,17 @@ public ConditionType getConditionType() {
     }
 
     /**
-     * @return the local name
+     * {@inheritDoc}
      */
+    @Override
     public String getLocalName() {
         return localName_;
     }
 
     /**
-     * @return the value
+     * {@inheritDoc}
      */
+    @Override
     public String getValue() {
         return value_;
     }

diff --git a/src/main/java/com/gargoylesoftware/css/parser/condition/PrefixAttributeCondition.java b/src/main/java/com/gargoylesoftware/css/parser/condition/PrefixAttributeCondition.java
@@ -42,15 +42,17 @@ public ConditionType getConditionType() {
     }
 
     /**
-     * @return the local name
+     * {@inheritDoc}
      */
+    @Override
     public String getLocalName() {
         return localName_;
     }
 
     /**
-     * @return the value
+     * {@inheritDoc}
      */
+    @Override
     public String getValue() {
         return value_;
     }

diff --git a/src/main/java/com/gargoylesoftware/css/parser/condition/PseudoClassCondition.java b/src/main/java/com/gargoylesoftware/css/parser/condition/PseudoClassCondition.java
@@ -46,15 +46,17 @@ public ConditionType getConditionType() {
     }
 
     /**
-     * @return the local name
+     * {@inheritDoc}
      */
+    @Override
     public String getLocalName() {
         return null;
     }
 
     /**
-     * @return the value
+     * {@inheritDoc}
      */
+    @Override
     public String getValue() {
         return value_;
     }

diff --git a/src/main/java/com/gargoylesoftware/css/parser/condition/SubstringAttributeCondition.java b/src/main/java/com/gargoylesoftware/css/parser/condition/SubstringAttributeCondition.java
@@ -42,15 +42,17 @@ public ConditionType getConditionType() {
     }
 
     /**
-     * @return the local name
+     * {@inheritDoc}
      */
+    @Override
     public String getLocalName() {
         return localName_;
     }
 
     /**
-     * @return the value
+     * {@inheritDoc}
      */
+    @Override
     public String getValue() {
         return value_;
     }

diff --git a/src/main/java/com/gargoylesoftware/css/parser/condition/SuffixAttributeCondition.java b/src/main/java/com/gargoylesoftware/css/parser/condition/SuffixAttributeCondition.java
@@ -42,15 +42,17 @@ public ConditionType getConditionType() {
     }
 
     /**
-     * @return the local name
+     * {@inheritDoc}
      */
+    @Override
     public String getLocalName() {
         return localName_;
     }
 
     /**
-     * @return the value
+     * {@inheritDoc}
      */
+    @Override
     public String getValue() {
         return value_;
     }

diff --git a/src/test/java/com/gargoylesoftware/css/parser/CSS3ParserTest.java b/src/test/java/com/gargoylesoftware/css/parser/CSS3ParserTest.java
@@ -157,27 +157,27 @@ public void selectorLang() throws Exception {
         Assert.assertEquals("html:lang(fr-ca) { }", rule.getCssText());
         ElementSelector selector = (ElementSelector) ((CSSStyleRuleImpl) rule).getSelectors().get(0);
         Assert.assertEquals(ConditionType.LANG_CONDITION, selector.getConditions().get(0).getConditionType());
-        Assert.assertEquals("fr-ca", ((LangCondition) selector.getConditions().get(0)).getLang());
+        Assert.assertEquals("fr-ca", ((LangCondition) selector.getConditions().get(0)).getValue());
 
         rule = rules.getRules().get(1);
         Assert.assertEquals("html:lang(de) { }", rule.getCssText());
         selector = (ElementSelector) ((CSSStyleRuleImpl) rule).getSelectors().get(0);
         Assert.assertEquals(ConditionType.LANG_CONDITION, selector.getConditions().get(0).getConditionType());
-        Assert.assertEquals("de", ((LangCondition) selector.getConditions().get(0)).getLang());
+        Assert.assertEquals("de", ((LangCondition) selector.getConditions().get(0)).getValue());
 
         rule = rules.getRules().get(2);
         Assert.assertEquals("*:lang(fr) > Q { }", rule.getCssText());
         ChildSelector childSelector = (ChildSelector) ((CSSStyleRuleImpl) rule).getSelectors().get(0);
         selector = (ElementSelector) childSelector.getAncestorSelector();
         Assert.assertEquals(ConditionType.LANG_CONDITION, selector.getConditions().get(0).getConditionType());
-        Assert.assertEquals("fr", ((LangCondition) selector.getConditions().get(0)).getLang());
+        Assert.assertEquals("fr", ((LangCondition) selector.getConditions().get(0)).getValue());
 
         rule = rules.getRules().get(3);
         Assert.assertEquals("*:lang(de) > Q { }", rule.getCssText());
         childSelector = (ChildSelector) ((CSSStyleRuleImpl) rule).getSelectors().get(0);
         selector = (ElementSelector) childSelector.getAncestorSelector();
         Assert.assertEquals(ConditionType.LANG_CONDITION, selector.getConditions().get(0).getConditionType());
-        Assert.assertEquals("de", ((LangCondition) selector.getConditions().get(0)).getLang());
+        Assert.assertEquals("de", ((LangCondition) selector.getConditions().get(0)).getValue());
     }
 
     /**

diff --git a/src/test/java/com/gargoylesoftware/css/parser/condition/LangConditionTest.java b/src/test/java/com/gargoylesoftware/css/parser/condition/LangConditionTest.java
@@ -32,7 +32,7 @@ public class LangConditionTest {
     public void withoutValue() throws Exception {
         final LangCondition c = new LangCondition(null, null);
         Assert.assertEquals(ConditionType.LANG_CONDITION, c.getConditionType());
-        Assert.assertNull(c.getLang());
+        Assert.assertNull(c.getValue());
 
         Assert.assertEquals(":lang()", c.toString());
     }
@@ -44,7 +44,7 @@ public void withoutValue() throws Exception {
     public void emptyValue() throws Exception {
         final LangCondition c = new LangCondition("", null);
         Assert.assertEquals(ConditionType.LANG_CONDITION, c.getConditionType());
-        Assert.assertEquals("", c.getLang());
+        Assert.assertEquals("", c.getValue());
 
         Assert.assertEquals(":lang()", c.toString());
     }
@@ -56,7 +56,7 @@ public void emptyValue() throws Exception {
     public void withValue() throws Exception {
         final LangCondition c = new LangCondition("value", null);
         Assert.assertEquals(ConditionType.LANG_CONDITION, c.getConditionType());
-        Assert.assertEquals("value", c.getLang());
+        Assert.assertEquals("value", c.getValue());
 
         Assert.assertEquals(":lang(value)", c.toString());
     }