code style

HtmlUnit · Dec 2, 2023 · b7d5145 · b7d5145
1 parent 039e929
commit b7d5145
Show file tree

Hide file tree

Showing 6 changed files with 211 additions and 270 deletions.
diff --git a/src/main/java/org/htmlunit/xpath/axes/AttributeIterator.java b/src/main/java/org/htmlunit/xpath/axes/AttributeIterator.java
@@ -28,10 +28,10 @@ public class AttributeIterator extends ChildTestIterator {
  *
  * @param compiler A reference to the Compiler that contains the op map.
  * @param opPos The position within the op map, which contains the location path expression for
- * this itterator.
+ * this iterator.
  * @throws javax.xml.transform.TransformerException if any
  */
- AttributeIterator(Compiler compiler, int opPos, int analysis)
+ AttributeIterator(final Compiler compiler, final int opPos, final int analysis)
  throws javax.xml.transform.TransformerException {
  super(compiler, opPos, analysis);
  }

diff --git a/src/main/java/org/htmlunit/xpath/axes/AxesWalker.java b/src/main/java/org/htmlunit/xpath/axes/AxesWalker.java
@@ -258,19 +258,15 @@ public int nextNode() {
 
  // return walker.returnNextNode(nextNode);
  break;
- } else {
- AxesWalker prev = walker;
-
- walker = walker.m_nextWalker;
-
- walker.setRoot(nextNode);
-
- walker.m_prevWalker = prev;
-
- continue;
  }
- } // if(null != nextNode)
- } // while(null != walker)
+
+ AxesWalker prev = walker;
+ walker = walker.m_nextWalker;
+ walker.setRoot(nextNode);
+ walker.m_prevWalker = prev;
+ continue;
+ }
+ }
 
  return nextNode;
  }

diff --git a/src/main/java/org/htmlunit/xpath/axes/BasicTestIterator.java b/src/main/java/org/htmlunit/xpath/axes/BasicTestIterator.java
@@ -35,7 +35,7 @@ public abstract class BasicTestIterator extends LocPathIterator {
  *
  * @param nscontext The namespace context for this iterator, should be OK if null.
  */
- protected BasicTestIterator(PrefixResolver nscontext) {
+ protected BasicTestIterator(final PrefixResolver nscontext) {
 
  super(nscontext);
  }
@@ -48,12 +48,12 @@ protected BasicTestIterator(PrefixResolver nscontext) {
  * @param opPos The position of this iterator in the opcode list from the compiler.
  * @throws javax.xml.transform.TransformerException if any
  */
- protected BasicTestIterator(Compiler compiler, int opPos, int analysis)
+ protected BasicTestIterator(final Compiler compiler, final int opPos, final int analysis)
  throws javax.xml.transform.TransformerException {
  super(analysis);
 
- int firstStepPos = OpMap.getFirstChildPos(opPos);
- int whatToShow = compiler.getWhatToShow(firstStepPos);
+ final int firstStepPos = OpMap.getFirstChildPos(opPos);
+ final int whatToShow = compiler.getWhatToShow(firstStepPos);
 
  if ((0
  == (whatToShow
@@ -96,8 +96,9 @@ public int nextNode() {
 
  if (DTM.NULL != next) {
  if (DTMIterator.FILTER_ACCEPT == acceptNode(next)) break;
- else continue;
- } else break;
+ continue;
+ }
+ break;
  } while (next != DTM.NULL);
 
  if (DTM.NULL != next) {
@@ -114,7 +115,7 @@ public int nextNode() {
  @Override
  public DTMIterator cloneWithReset() throws CloneNotSupportedException {
 
- ChildTestIterator clone = (ChildTestIterator) super.cloneWithReset();
+ final ChildTestIterator clone = (ChildTestIterator) super.cloneWithReset();
 
  clone.resetProximityPositions();