introduce Combinator enum

Author: rbri

src/main/java/org/htmlunit/cssparser/parser/selector/Combinator.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2019-2024 Ronald Brill.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.htmlunit.cssparser.parser.selector;
+
+/**
+ * <p>Combinator enum.</p>
+ *
+ * @author Ronald Brill
+ */
+public enum Combinator {
+
+    /** DESCENDANT_COMBINATOR ( ). */
+    DESCENDANT_COMBINATOR(' '),
+
+    /** CHILD_COMBINATOR (&gt;). */
+    CHILD_COMBINATOR('>'),
+
+    /** NEXT_SIBLING_COMBINATOR (+). */
+    NEXT_SIBLING_COMBINATOR('+'),
+
+    /** SUBSEQUENT_SIBLING_COMBINATOR (~). */
+    SUBSEQUENT_SIBLING_COMBINATOR('~');
+
+    private final char combinatorChar_;
+
+    Combinator(final char combinatorChar) {
+        combinatorChar_ = combinatorChar;
+    }
+
+    char getChar() {
+        return combinatorChar_;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String toString() {
+        return name() + " ('" + getChar() + "')";
+    }
+}

src/main/java/org/htmlunit/cssparser/parser/selector/RelativeSelector.java

@@ -19,15 +19,15 @@
  */
 public class RelativeSelector extends AbstractSelector {
 
-    private final char combinator_;
+    private final Combinator combinator_;
     private final Selector selector_;
 
     /**
      * Ctor.
      * @param combinator the combinator to use
      * @param selector the selector
      */
-    public RelativeSelector(final char combinator, final Selector selector) {
+    public RelativeSelector(final Combinator combinator, final Selector selector) {
         combinator_ = combinator;
         selector_ = selector;
     }
@@ -44,6 +44,13 @@ public SelectorType getSelectorType() {
         return SelectorType.RELATIVE_SELECTOR;
     }
 
+    /**
+     * @return the combinator
+     */
+    public Combinator getCombinator() {
+        return combinator_;
+    }
+
     @Override
     public SimpleSelector getSimpleSelector() {
         return null;
@@ -52,6 +59,6 @@ public SimpleSelector getSimpleSelector() {
     /** {@inheritDoc} */
     @Override
     public String toString() {
-        return combinator_ + " " + selector_.toString();
+        return combinator_.getChar() + " " + selector_.toString();
     }
 }