removing char boxing

rorygibson · Jan 13, 2011 · 2dd2968 · 2dd2968
1 parent aabd34f
commit 2dd2968
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/src/main/java/org/jsoup/parser/Parser.java b/src/main/java/org/jsoup/parser/Parser.java
@@ -214,7 +214,7 @@ private Attribute parseAttribute() {
     private void parseTextNode() {
         TextNode textNode;
         // special case: handle string like "hello < there". first char will be "<", because of matchStartTag
-        if (tq.peek().equals('<')) {
+        if (tq.peek() =='<') {
             tq.advance();
             textNode = new TextNode("<", baseUri);
         } else {

diff --git a/src/main/java/org/jsoup/parser/TokenQueue.java b/src/main/java/org/jsoup/parser/TokenQueue.java
@@ -36,10 +36,10 @@ private int remainingLength() {
 
     /**
      * Retrieves but does not remove the first character from the queue.
-     * @return First character, or null if empty.
+     * @return First character, or 0 if empty.
      */
-    public Character peek() {
-        return isEmpty() ? null : queue.charAt(pos);
+    public char peek() {
+        return isEmpty() ? 0 : queue.charAt(pos);
     }
 
     /**
@@ -158,8 +158,8 @@ public void advance() {
      * Consume one character off queue.
      * @return first character on queue.
      */
-    public Character consume() {
-        Character c = queue.charAt(pos);
+    public char consume() {
+        char c = queue.charAt(pos);
         pos++;
         return c;
     }

diff --git a/src/main/java/org/jsoup/select/Selector.java b/src/main/java/org/jsoup/select/Selector.java
@@ -106,7 +106,7 @@ private Elements select() {
 
         if (tq.matchesAny(combinators)) { // if starts with a combinator, use root as elements
             elements.add(root);
-            combinator(tq.consume().toString());
+            combinator(tq.consume());
         } else if (tq.matches(":has(")) {
             elements.addAll(root.getAllElements());
         } else {
@@ -123,9 +123,9 @@ private Elements select() {
                     elements.addAll(select(subQuery, root));
                 }
             } else if (tq.matchesAny(combinators)) {
-                combinator(tq.consume().toString());
+                combinator(tq.consume());
             } else if (seenWhite) {
-                combinator(" ");
+                combinator(' ');
             } else { // E.class, E#id, E[attr] etc. AND
                 Elements candidates = findElements(); // take next el, #. etc off queue
                 intersectElements(filterForSelf(elements, candidates));
@@ -134,18 +134,18 @@ private Elements select() {
         return new Elements(elements);
     }
 
-    private void combinator(String combinator) {
+    private void combinator(char combinator) {
         tq.consumeWhitespace();
         String subQuery = tq.consumeToAny(combinators); // support multi > childs
 
         Elements output;
-        if (combinator.equals(">"))
+        if (combinator == '>')
             output = filterForChildren(elements, select(subQuery, elements));
-        else if (combinator.equals(" "))
+        else if (combinator == ' ')
             output = filterForDescendants(elements, select(subQuery, elements));
-        else if (combinator.equals("+"))
+        else if (combinator == '+')
             output = filterForAdjacentSiblings(elements, select(subQuery, root));
-        else if (combinator.equals("~"))
+        else if (combinator == '~')
             output = filterForGeneralSiblings(elements, select(subQuery, root));
         else
             throw new IllegalStateException("Unknown combinator: " + combinator);