code style

HtmlUnit · Jun 4, 2024 · 6d9efd0 · 6d9efd0
1 parent e7aecc5
commit 6d9efd0
Show file tree

Hide file tree

Showing 25 changed files with 259 additions and 92 deletions.
diff --git a/src/main/java/org/htmlunit/xpath/Expression.java b/src/main/java/org/htmlunit/xpath/Expression.java
@@ -193,7 +193,9 @@ public boolean isStableNumber() {
  * @return true of the passed in class is the exact same class as this class.
  */
  protected final boolean isSameClass(final Expression expr) {
- if (null == expr) return false;
+ if (null == expr) {
+ return false;
+ }
 
  return getClass() == expr.getClass();
  }
@@ -246,7 +248,9 @@ public void error(final XPathContext xctxt, final String msg, final Object[] arg
  */
  public ExpressionNode getExpressionOwner() {
  ExpressionNode parent = exprGetParent();
- while ((null != parent) && (parent instanceof Expression)) parent = parent.exprGetParent();
+ while ((null != parent) && (parent instanceof Expression)) {
+ parent = parent.exprGetParent();
+ }
  return parent;
  }
 
@@ -268,28 +272,36 @@ public ExpressionNode exprGetParent() {
  /** {@inheritDoc} */
  @Override
  public String getPublicId() {
- if (null == m_parent) return null;
+ if (null == m_parent) {
+ return null;
+ }
  return m_parent.getPublicId();
  }
 
  /** {@inheritDoc} */
  @Override
  public String getSystemId() {
- if (null == m_parent) return null;
+ if (null == m_parent) {
+ return null;
+ }
  return m_parent.getSystemId();
  }
 
  /** {@inheritDoc} */
  @Override
  public int getLineNumber() {
- if (null == m_parent) return 0;
+ if (null == m_parent) {
+ return 0;
+ }
  return m_parent.getLineNumber();
  }
 
  /** {@inheritDoc} */
  @Override
  public int getColumnNumber() {
- if (null == m_parent) return 0;
+ if (null == m_parent) {
+ return 0;
+ }
  return m_parent.getColumnNumber();
  }
 }
diff --git a/src/main/java/org/htmlunit/xpath/axes/BasicTestIterator.java b/src/main/java/org/htmlunit/xpath/axes/BasicTestIterator.java
@@ -61,7 +61,9 @@ protected BasicTestIterator(final Compiler compiler, final int opPos, final int
  | DTMFilter.SHOW_NAMESPACE
  | DTMFilter.SHOW_ELEMENT
  | DTMFilter.SHOW_PROCESSING_INSTRUCTION)))
- || (whatToShow == DTMFilter.SHOW_ALL)) initNodeTest(whatToShow);
+ || (whatToShow == DTMFilter.SHOW_ALL)) {
+ initNodeTest(whatToShow);
+ }
  else {
  initNodeTest(
  whatToShow, compiler.getStepNS(firstStepPos), compiler.getStepLocalName(firstStepPos));
@@ -95,7 +97,9 @@ public int nextNode() {
  next = getNextNode();
 
  if (DTM.NULL != next) {
- if (DTMIterator.FILTER_ACCEPT == acceptNode(next)) break;
+ if (DTMIterator.FILTER_ACCEPT == acceptNode(next)) {
+ break;
+ }
  continue;
  }
  break;

diff --git a/src/main/java/org/htmlunit/xpath/axes/ChildIterator.java b/src/main/java/org/htmlunit/xpath/axes/ChildIterator.java
@@ -55,7 +55,9 @@ public int asNode(final XPathContext xctxt) {
  /** {@inheritDoc} */
  @Override
  public int nextNode() {
- if (m_foundLast) return DTM.NULL;
+ if (m_foundLast) {
+ return DTM.NULL;
+ }
 
  final int next;
 

diff --git a/src/main/java/org/htmlunit/xpath/axes/FilterExprWalker.java b/src/main/java/org/htmlunit/xpath/axes/FilterExprWalker.java
@@ -118,7 +118,9 @@ public static XNodeSet executeFilterExpr(
  result = (org.htmlunit.xpath.objects.XNodeSet) expr.execute(xctxt);
  result.setShouldCacheNodes(true);
  }
- else result = (org.htmlunit.xpath.objects.XNodeSet) expr.execute(xctxt);
+ else {
+ result = (org.htmlunit.xpath.objects.XNodeSet) expr.execute(xctxt);
+ }
 
  }
  catch (final javax.xml.transform.TransformerException se) {
@@ -139,7 +141,9 @@ public Object clone() throws CloneNotSupportedException {
 
  final FilterExprWalker clone = (FilterExprWalker) super.clone();
 
- if (null != m_exprObj) clone.m_exprObj = (XNodeSet) m_exprObj.clone();
+ if (null != m_exprObj) {
+ clone.m_exprObj = (XNodeSet) m_exprObj.clone();
+ }
 
  return clone;
  }
@@ -152,7 +156,9 @@ public short acceptNode(final int n) {
  if (getPredicateCount() > 0) {
  countProximityPosition(0);
 
- if (!executePredicates(n, m_lpi.getXPathContext())) return DTMIterator.FILTER_SKIP;
+ if (!executePredicates(n, m_lpi.getXPathContext())) {
+ return DTMIterator.FILTER_SKIP;
+ }
  }
 
  return DTMIterator.FILTER_ACCEPT;
@@ -214,7 +220,9 @@ public void callPredicateVisitors(final XPathVisitor visitor) {
  /** {@inheritDoc} */
  @Override
  public boolean deepEquals(final Expression expr) {
- if (!super.deepEquals(expr)) return false;
+ if (!super.deepEquals(expr)) {
+ return false;
+ }
 
  final FilterExprWalker walker = (FilterExprWalker) expr;
  return m_expr.deepEquals(walker.m_expr);

diff --git a/src/main/java/org/htmlunit/xpath/axes/HasPositionalPredChecker.java b/src/main/java/org/htmlunit/xpath/axes/HasPositionalPredChecker.java
@@ -50,7 +50,9 @@ public static boolean check(final LocPathIterator path) {
  /** {@inheritDoc} */
  @Override
  public boolean visitFunction(final Function func) {
- if ((func instanceof FuncPosition) || (func instanceof FuncLast)) m_hasPositionalPred = true;
+ if ((func instanceof FuncPosition) || (func instanceof FuncLast)) {
+ m_hasPositionalPred = true;
+ }
  return true;
  }
 
@@ -67,8 +69,12 @@ public boolean visitPredicate(final Expression pred) {
  || (pred instanceof Mod)
  || (pred instanceof Mult)
  || (pred instanceof org.htmlunit.xpath.operations.Number)
- || (pred instanceof Function)) m_hasPositionalPred = true;
- else pred.callVisitors(this);
+ || (pred instanceof Function)) {
+ m_hasPositionalPred = true;
+ }
+ else {
+ pred.callVisitors(this);
+ }
  }
 
  m_predDepth--;

diff --git a/src/main/java/org/htmlunit/xpath/compiler/Lexer.java b/src/main/java/org/htmlunit/xpath/compiler/Lexer.java
@@ -117,8 +117,8 @@ void tokenize(final String pat, final List<String> targetStrings)
 
  startSubstring = i;
 
- for (i++; (i < nChars) && ((c = pat.charAt(i)) != '\"'); i++)
-  ;
+ for (i++; (i < nChars) && ((c = pat.charAt(i)) != '\"'); i++) {
+ }
 
  if (c == '\"' && i < nChars) {
  addToTokenQueue(pat.substring(startSubstring, i + 1));
@@ -146,8 +146,8 @@ void tokenize(final String pat, final List<String> targetStrings)
 
  startSubstring = i;
 
- for (i++; (i < nChars) && ((c = pat.charAt(i)) != '\''); i++)
-  ;
+ for (i++; (i < nChars) && ((c = pat.charAt(i)) != '\''); i++) {
+ }
 
  if (c == '\'' && i < nChars) {
  addToTokenQueue(pat.substring(startSubstring, i + 1));

diff --git a/src/main/java/org/htmlunit/xpath/compiler/OpMap.java b/src/main/java/org/htmlunit/xpath/compiler/OpMap.java
@@ -271,9 +271,15 @@ public String getStepNS(final int opPosOfStep) {
  if (argLenOfStep == 3) {
  final int index = m_opMap.elementAt(opPosOfStep + 4);
 
- if (index >= 0) return (String) m_tokenQueue.get(index);
- else if (OpCodes.ELEMWILDCARD == index) return NodeTest.WILD;
- else return null;
+ if (index >= 0) {
+ return (String) m_tokenQueue.get(index);
+ }
+ else if (OpCodes.ELEMWILDCARD == index) {
+ return NodeTest.WILD;
+ }
+ else {
+ return null;
+ }
  }
  return null;
  }
@@ -309,8 +315,14 @@ public String getStepLocalName(final int opPosOfStep) {
  break; // Should assert error
  }
 
- if (index >= 0) return m_tokenQueue.get(index).toString();
- else if (OpCodes.ELEMWILDCARD == index) return NodeTest.WILD;
- else return null;
+ if (index >= 0) {
+ return m_tokenQueue.get(index).toString();
+ }
+ else if (OpCodes.ELEMWILDCARD == index) {
+ return NodeTest.WILD;
+ }
+ else {
+ return null;
+ }
  }
 }
diff --git a/src/main/java/org/htmlunit/xpath/functions/FuncConcat.java b/src/main/java/org/htmlunit/xpath/functions/FuncConcat.java
@@ -35,7 +35,9 @@ public XObject execute(final XPathContext xctxt) throws javax.xml.transform.Tran
  sb.append(m_arg0.execute(xctxt).str());
  sb.append(m_arg1.execute(xctxt).str());
 
- if (null != arg2_) sb.append(arg2_.execute(xctxt).str());
+ if (null != arg2_) {
+ sb.append(arg2_.execute(xctxt).str());
+ }
 
  if (null != args_) {
  for (final org.htmlunit.xpath.Expression arg : args_) {
@@ -49,7 +51,9 @@ public XObject execute(final XPathContext xctxt) throws javax.xml.transform.Tran
  /** {@inheritDoc} */
  @Override
  public void checkNumberArgs(final int argNum) throws WrongNumberArgsException {
- if (argNum < 2) reportWrongNumberArgs();
+ if (argNum < 2) {
+ reportWrongNumberArgs();
+ }
  }
 
  /** {@inheritDoc} */

diff --git a/src/main/java/org/htmlunit/xpath/functions/FuncContains.java b/src/main/java/org/htmlunit/xpath/functions/FuncContains.java
@@ -32,7 +32,9 @@ public XObject execute(final XPathContext xctxt) throws javax.xml.transform.Tran
  final String s2 = m_arg1.execute(xctxt).str();
 
  // Add this check for JDK consistency for empty strings.
- if (s1.length() == 0 && s2.length() == 0) return XBoolean.S_TRUE;
+ if (s1.length() == 0 && s2.length() == 0) {
+ return XBoolean.S_TRUE;
+ }
 
  final int index = s1.indexOf(s2);
 

diff --git a/src/main/java/org/htmlunit/xpath/functions/FuncId.java b/src/main/java/org/htmlunit/xpath/functions/FuncId.java
@@ -66,10 +66,14 @@ private List<String> getNodesByID(
 
  final int node = dtm.getElementById(ref);
 
- if (DTM.NULL != node) nodeSet.addNodeInDocOrder(node, xctxt);
+ if (DTM.NULL != node) {
+ nodeSet.addNodeInDocOrder(node, xctxt);
+ }
 
  if ((null != ref) && (hasMore || mayBeMore)) {
- if (null == usedrefs) usedrefs = new ArrayList<>();
+ if (null == usedrefs) {
+ usedrefs = new ArrayList<>();
+ }
 
  usedrefs.add(ref);
  }
@@ -87,7 +91,9 @@ public XObject execute(final XPathContext xctxt) throws javax.xml.transform.Tran
  final DTM dtm = xctxt.getDTM(context);
  final int docContext = dtm.getDocument();
 
- if (DTM.NULL == docContext) error(xctxt, XPATHErrorResources.ER_CONTEXT_HAS_NO_OWNERDOC, null);
+ if (DTM.NULL == docContext) {
+ error(xctxt, XPATHErrorResources.ER_CONTEXT_HAS_NO_OWNERDOC, null);
+ }
 
  final XObject arg = m_arg0.execute(xctxt);
  final int argType = arg.getType();

diff --git a/src/main/java/org/htmlunit/xpath/functions/FuncLocalPart.java b/src/main/java/org/htmlunit/xpath/functions/FuncLocalPart.java
@@ -30,10 +30,14 @@ public class FuncLocalPart extends FunctionDef1Arg {
  public XObject execute(final XPathContext xctxt) throws javax.xml.transform.TransformerException {
 
  final int context = getArg0AsNode(xctxt);
- if (DTM.NULL == context) return XString.EMPTYSTRING;
+ if (DTM.NULL == context) {
+ return XString.EMPTYSTRING;
+ }
  final DTM dtm = xctxt.getDTM(context);
  final String s = (context != DTM.NULL) ? dtm.getLocalName(context) : "";
- if (s.startsWith("#") || s.equals("xmlns")) return XString.EMPTYSTRING;
+ if (s.startsWith("#") || s.equals("xmlns")) {
+ return XString.EMPTYSTRING;
+ }
 
  return new XString(s);
  }

diff --git a/src/main/java/org/htmlunit/xpath/functions/FuncRound.java b/src/main/java/org/htmlunit/xpath/functions/FuncRound.java
@@ -29,8 +29,12 @@ public class FuncRound extends FunctionOneArg {
  public XObject execute(final XPathContext xctxt) throws javax.xml.transform.TransformerException {
  final XObject obj = m_arg0.execute(xctxt);
  final double val = obj.num();
- if (val >= -0.5 && val < 0) return new XNumber(-0.0);
- if (val == 0.0) return new XNumber(val);
+ if (val >= -0.5 && val < 0) {
+ return new XNumber(-0.0);
+ }
+ if (val == 0.0) {
+ return new XNumber(val);
+ }
  return new XNumber(java.lang.Math.floor(val + 0.5));
  }
 }
diff --git a/src/main/java/org/htmlunit/xpath/functions/FuncSubstring.java b/src/main/java/org/htmlunit/xpath/functions/FuncSubstring.java
@@ -62,15 +62,23 @@ public XObject execute(final XPathContext xctxt) throws javax.xml.transform.Tran
  int end = (int) (Math.round(len) + start) - 1;
 
  // Normalize end index.
- if (end < 0) end = 0;
- else if (end > lenOfS1) end = lenOfS1;
+ if (end < 0) {
+ end = 0;
+ }
+ else if (end > lenOfS1) {
+ end = lenOfS1;
+ }
 
- if (startIndex > lenOfS1) startIndex = lenOfS1;
+ if (startIndex > lenOfS1) {
+ startIndex = lenOfS1;
+ }
 
  substr = s1.substring(startIndex, end);
  }
  else {
- if (startIndex > lenOfS1) startIndex = lenOfS1;
+ if (startIndex > lenOfS1) {
+ startIndex = lenOfS1;
+ }
  substr = s1.substring(startIndex);
  }
 
@@ -80,7 +88,9 @@ public XObject execute(final XPathContext xctxt) throws javax.xml.transform.Tran
  /** {@inheritDoc} */
  @Override
  public void checkNumberArgs(final int argNum) throws WrongNumberArgsException {
- if (argNum < 2) reportWrongNumberArgs();
+ if (argNum < 2) {
+ reportWrongNumberArgs();
+ }
  }
 
  /** {@inheritDoc} */

diff --git a/src/main/java/org/htmlunit/xpath/functions/FuncSum.java b/src/main/java/org/htmlunit/xpath/functions/FuncSum.java
@@ -45,7 +45,9 @@ public XObject execute(final XPathContext xctxt) throws javax.xml.transform.Tran
  final DTM dtm = nodes.getDTM(pos);
  final XString s = dtm.getStringValue(pos);
 
- if (null != s) sum += s.toDouble();
+ if (null != s) {
+ sum += s.toDouble();
+ }
  }
  nodes.detach();
 

diff --git a/src/main/java/org/htmlunit/xpath/functions/Function.java b/src/main/java/org/htmlunit/xpath/functions/Function.java
@@ -53,7 +53,9 @@ public void setArg(final Expression arg, final int argNum) throws WrongNumberArg
  * @throws WrongNumberArgsException if any
  */
  public void checkNumberArgs(final int argNum) throws WrongNumberArgsException {
- if (argNum != 0) reportWrongNumberArgs();
+ if (argNum != 0) {
+ reportWrongNumberArgs();
+ }
  }
 
  /**