Code style tweaks

jhy · Dec 16, 2024 · 8e9f869 · 8e9f869
1 parent dd5eb3b
commit 8e9f869
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/org/jsoup/internal/SoftPool.java b/src/main/java/org/jsoup/internal/SoftPool.java
@@ -2,7 +2,6 @@
 
 import java.lang.ref.SoftReference;
 import java.util.ArrayDeque;
-import java.util.Stack;
 import java.util.function.Supplier;
 
 /**

diff --git a/src/main/java/org/jsoup/parser/HtmlTreeBuilder.java b/src/main/java/org/jsoup/parser/HtmlTreeBuilder.java
@@ -233,11 +233,8 @@ static boolean isHtmlIntegration(Element el) {
             if (encoding.equals("text/html") || encoding.equals("application/xhtml+xml"))
                 return true;
         }
-        if (Parser.NamespaceSvg.equals(el.tag().namespace())
-            && StringUtil.in(el.tagName(), TagSvgHtmlIntegration)) // note using .tagName for case-sensitive hit here of foreignObject
-            return true;
-
-        return false;
+        // note using .tagName for case-sensitive hit here of foreignObject
+        return Parser.NamespaceSvg.equals(el.tag().namespace()) && StringUtil.in(el.tagName(), TagSvgHtmlIntegration);
     }
 
     boolean process(Token token, HtmlTreeBuilderState state) {

diff --git a/src/main/java/org/jsoup/parser/HtmlTreeBuilderState.java b/src/main/java/org/jsoup/parser/HtmlTreeBuilderState.java
@@ -108,6 +108,7 @@ private boolean anythingElse(Token t, HtmlTreeBuilder tb) {
                 tb.insertCharacterNode(t.asCharacter()); // out of spec - include whitespace
                 return true;
             }
+            final String name;
             switch (t.type) {
                 case Comment:
                     tb.insertCommentNode(t.asComment());
@@ -117,7 +118,7 @@ private boolean anythingElse(Token t, HtmlTreeBuilder tb) {
                     return false;
                 case StartTag:
                     Token.StartTag start = t.asStartTag();
-                    String name = start.normalName();
+                    name = start.normalName();
                     if (name.equals("html")) {
                         return InBody.process(t, tb);
                     } else if (inSorted(name, InHeadEmpty)) {
@@ -1236,10 +1237,12 @@ private boolean anythingElse(Token t, HtmlTreeBuilder tb) {
     },
     InTableBody {
         @Override boolean process(Token t, HtmlTreeBuilder tb) {
+            final String name;
+
             switch (t.type) {
                 case StartTag:
                     Token.StartTag startTag = t.asStartTag();
-                    String name = startTag.normalName();
+                    name = startTag.normalName();
                     if (name.equals("tr")) {
                         tb.clearStackToTableBodyContext();
                         tb.insertElementFor(startTag);
@@ -1425,6 +1428,8 @@ private void closeCell(HtmlTreeBuilder tb) {
     },
     InSelect {
         @Override boolean process(Token t, HtmlTreeBuilder tb) {
+            final String name;
+
             switch (t.type) {
                 case Character:
                     Token.Character c = t.asCharacter();
@@ -1443,7 +1448,7 @@ private void closeCell(HtmlTreeBuilder tb) {
                     return false;
                 case StartTag:
                     Token.StartTag start = t.asStartTag();
-                    String name = start.normalName();
+                    name = start.normalName();
                     if (name.equals("html"))
                         return tb.process(start, InBody);
                     else if (name.equals("option")) {