Skip to content

Commit 6d9efd0

Browse files
rbrirbri
committed
code style
1 parent e7aecc5 commit 6d9efd0

25 files changed

+259
-92
lines changed

‎src/main/java/org/htmlunit/xpath/Expression.java

+18-6
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,9 @@ public boolean isStableNumber() {
193193
* @return true of the passed in class is the exact same class as this class.
194194
*/
195195
protected final boolean isSameClass(final Expression expr) {
196-
if (null == expr) return false;
196+
if (null == expr) {
197+
return false;
198+
}
197199

198200
return getClass() == expr.getClass();
199201
}
@@ -246,7 +248,9 @@ public void error(final XPathContext xctxt, final String msg, final Object[] arg
246248
*/
247249
public ExpressionNode getExpressionOwner() {
248250
ExpressionNode parent = exprGetParent();
249-
while ((null != parent) && (parent instanceof Expression)) parent = parent.exprGetParent();
251+
while ((null != parent) && (parent instanceof Expression)) {
252+
parent = parent.exprGetParent();
253+
}
250254
return parent;
251255
}
252256

@@ -268,28 +272,36 @@ public ExpressionNode exprGetParent() {
268272
/** {@inheritDoc} */
269273
@Override
270274
public String getPublicId() {
271-
if (null == m_parent) return null;
275+
if (null == m_parent) {
276+
return null;
277+
}
272278
return m_parent.getPublicId();
273279
}
274280

275281
/** {@inheritDoc} */
276282
@Override
277283
public String getSystemId() {
278-
if (null == m_parent) return null;
284+
if (null == m_parent) {
285+
return null;
286+
}
279287
return m_parent.getSystemId();
280288
}
281289

282290
/** {@inheritDoc} */
283291
@Override
284292
public int getLineNumber() {
285-
if (null == m_parent) return 0;
293+
if (null == m_parent) {
294+
return 0;
295+
}
286296
return m_parent.getLineNumber();
287297
}
288298

289299
/** {@inheritDoc} */
290300
@Override
291301
public int getColumnNumber() {
292-
if (null == m_parent) return 0;
302+
if (null == m_parent) {
303+
return 0;
304+
}
293305
return m_parent.getColumnNumber();
294306
}
295307
}

‎src/main/java/org/htmlunit/xpath/axes/BasicTestIterator.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ protected BasicTestIterator(final Compiler compiler, final int opPos, final int
6161
| DTMFilter.SHOW_NAMESPACE
6262
| DTMFilter.SHOW_ELEMENT
6363
| DTMFilter.SHOW_PROCESSING_INSTRUCTION)))
64-
|| (whatToShow == DTMFilter.SHOW_ALL)) initNodeTest(whatToShow);
64+
|| (whatToShow == DTMFilter.SHOW_ALL)) {
65+
initNodeTest(whatToShow);
66+
}
6567
else {
6668
initNodeTest(
6769
whatToShow, compiler.getStepNS(firstStepPos), compiler.getStepLocalName(firstStepPos));
@@ -95,7 +97,9 @@ public int nextNode() {
9597
next = getNextNode();
9698

9799
if (DTM.NULL != next) {
98-
if (DTMIterator.FILTER_ACCEPT == acceptNode(next)) break;
100+
if (DTMIterator.FILTER_ACCEPT == acceptNode(next)) {
101+
break;
102+
}
99103
continue;
100104
}
101105
break;

‎src/main/java/org/htmlunit/xpath/axes/ChildIterator.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ public int asNode(final XPathContext xctxt) {
5555
/** {@inheritDoc} */
5656
@Override
5757
public int nextNode() {
58-
if (m_foundLast) return DTM.NULL;
58+
if (m_foundLast) {
59+
return DTM.NULL;
60+
}
5961

6062
final int next;
6163

‎src/main/java/org/htmlunit/xpath/axes/FilterExprWalker.java

+12-4
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ public static XNodeSet executeFilterExpr(
118118
result = (org.htmlunit.xpath.objects.XNodeSet) expr.execute(xctxt);
119119
result.setShouldCacheNodes(true);
120120
}
121-
else result = (org.htmlunit.xpath.objects.XNodeSet) expr.execute(xctxt);
121+
else {
122+
result = (org.htmlunit.xpath.objects.XNodeSet) expr.execute(xctxt);
123+
}
122124

123125
}
124126
catch (final javax.xml.transform.TransformerException se) {
@@ -139,7 +141,9 @@ public Object clone() throws CloneNotSupportedException {
139141

140142
final FilterExprWalker clone = (FilterExprWalker) super.clone();
141143

142-
if (null != m_exprObj) clone.m_exprObj = (XNodeSet) m_exprObj.clone();
144+
if (null != m_exprObj) {
145+
clone.m_exprObj = (XNodeSet) m_exprObj.clone();
146+
}
143147

144148
return clone;
145149
}
@@ -152,7 +156,9 @@ public short acceptNode(final int n) {
152156
if (getPredicateCount() > 0) {
153157
countProximityPosition(0);
154158

155-
if (!executePredicates(n, m_lpi.getXPathContext())) return DTMIterator.FILTER_SKIP;
159+
if (!executePredicates(n, m_lpi.getXPathContext())) {
160+
return DTMIterator.FILTER_SKIP;
161+
}
156162
}
157163

158164
return DTMIterator.FILTER_ACCEPT;
@@ -214,7 +220,9 @@ public void callPredicateVisitors(final XPathVisitor visitor) {
214220
/** {@inheritDoc} */
215221
@Override
216222
public boolean deepEquals(final Expression expr) {
217-
if (!super.deepEquals(expr)) return false;
223+
if (!super.deepEquals(expr)) {
224+
return false;
225+
}
218226

219227
final FilterExprWalker walker = (FilterExprWalker) expr;
220228
return m_expr.deepEquals(walker.m_expr);

‎src/main/java/org/htmlunit/xpath/axes/HasPositionalPredChecker.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ public static boolean check(final LocPathIterator path) {
5050
/** {@inheritDoc} */
5151
@Override
5252
public boolean visitFunction(final Function func) {
53-
if ((func instanceof FuncPosition) || (func instanceof FuncLast)) m_hasPositionalPred = true;
53+
if ((func instanceof FuncPosition) || (func instanceof FuncLast)) {
54+
m_hasPositionalPred = true;
55+
}
5456
return true;
5557
}
5658

@@ -67,8 +69,12 @@ public boolean visitPredicate(final Expression pred) {
6769
|| (pred instanceof Mod)
6870
|| (pred instanceof Mult)
6971
|| (pred instanceof org.htmlunit.xpath.operations.Number)
70-
|| (pred instanceof Function)) m_hasPositionalPred = true;
71-
else pred.callVisitors(this);
72+
|| (pred instanceof Function)) {
73+
m_hasPositionalPred = true;
74+
}
75+
else {
76+
pred.callVisitors(this);
77+
}
7278
}
7379

7480
m_predDepth--;

‎src/main/java/org/htmlunit/xpath/compiler/Lexer.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ void tokenize(final String pat, final List<String> targetStrings)
117117

118118
startSubstring = i;
119119

120-
for (i++; (i < nChars) && ((c = pat.charAt(i)) != '\"'); i++)
121-
;
120+
for (i++; (i < nChars) && ((c = pat.charAt(i)) != '\"'); i++) {
121+
}
122122

123123
if (c == '\"' && i < nChars) {
124124
addToTokenQueue(pat.substring(startSubstring, i + 1));
@@ -146,8 +146,8 @@ void tokenize(final String pat, final List<String> targetStrings)
146146

147147
startSubstring = i;
148148

149-
for (i++; (i < nChars) && ((c = pat.charAt(i)) != '\''); i++)
150-
;
149+
for (i++; (i < nChars) && ((c = pat.charAt(i)) != '\''); i++) {
150+
}
151151

152152
if (c == '\'' && i < nChars) {
153153
addToTokenQueue(pat.substring(startSubstring, i + 1));

‎src/main/java/org/htmlunit/xpath/compiler/OpMap.java

+18-6
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,15 @@ public String getStepNS(final int opPosOfStep) {
271271
if (argLenOfStep == 3) {
272272
final int index = m_opMap.elementAt(opPosOfStep + 4);
273273

274-
if (index >= 0) return (String) m_tokenQueue.get(index);
275-
else if (OpCodes.ELEMWILDCARD == index) return NodeTest.WILD;
276-
else return null;
274+
if (index >= 0) {
275+
return (String) m_tokenQueue.get(index);
276+
}
277+
else if (OpCodes.ELEMWILDCARD == index) {
278+
return NodeTest.WILD;
279+
}
280+
else {
281+
return null;
282+
}
277283
}
278284
return null;
279285
}
@@ -309,8 +315,14 @@ public String getStepLocalName(final int opPosOfStep) {
309315
break; // Should assert error
310316
}
311317

312-
if (index >= 0) return m_tokenQueue.get(index).toString();
313-
else if (OpCodes.ELEMWILDCARD == index) return NodeTest.WILD;
314-
else return null;
318+
if (index >= 0) {
319+
return m_tokenQueue.get(index).toString();
320+
}
321+
else if (OpCodes.ELEMWILDCARD == index) {
322+
return NodeTest.WILD;
323+
}
324+
else {
325+
return null;
326+
}
315327
}
316328
}

‎src/main/java/org/htmlunit/xpath/functions/FuncConcat.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ public XObject execute(final XPathContext xctxt) throws javax.xml.transform.Tran
3535
sb.append(m_arg0.execute(xctxt).str());
3636
sb.append(m_arg1.execute(xctxt).str());
3737

38-
if (null != arg2_) sb.append(arg2_.execute(xctxt).str());
38+
if (null != arg2_) {
39+
sb.append(arg2_.execute(xctxt).str());
40+
}
3941

4042
if (null != args_) {
4143
for (final org.htmlunit.xpath.Expression arg : args_) {
@@ -49,7 +51,9 @@ public XObject execute(final XPathContext xctxt) throws javax.xml.transform.Tran
4951
/** {@inheritDoc} */
5052
@Override
5153
public void checkNumberArgs(final int argNum) throws WrongNumberArgsException {
52-
if (argNum < 2) reportWrongNumberArgs();
54+
if (argNum < 2) {
55+
reportWrongNumberArgs();
56+
}
5357
}
5458

5559
/** {@inheritDoc} */

‎src/main/java/org/htmlunit/xpath/functions/FuncContains.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ public XObject execute(final XPathContext xctxt) throws javax.xml.transform.Tran
3232
final String s2 = m_arg1.execute(xctxt).str();
3333

3434
// Add this check for JDK consistency for empty strings.
35-
if (s1.length() == 0 && s2.length() == 0) return XBoolean.S_TRUE;
35+
if (s1.length() == 0 && s2.length() == 0) {
36+
return XBoolean.S_TRUE;
37+
}
3638

3739
final int index = s1.indexOf(s2);
3840

‎src/main/java/org/htmlunit/xpath/functions/FuncId.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,14 @@ private List<String> getNodesByID(
6666

6767
final int node = dtm.getElementById(ref);
6868

69-
if (DTM.NULL != node) nodeSet.addNodeInDocOrder(node, xctxt);
69+
if (DTM.NULL != node) {
70+
nodeSet.addNodeInDocOrder(node, xctxt);
71+
}
7072

7173
if ((null != ref) && (hasMore || mayBeMore)) {
72-
if (null == usedrefs) usedrefs = new ArrayList<>();
74+
if (null == usedrefs) {
75+
usedrefs = new ArrayList<>();
76+
}
7377

7478
usedrefs.add(ref);
7579
}
@@ -87,7 +91,9 @@ public XObject execute(final XPathContext xctxt) throws javax.xml.transform.Tran
8791
final DTM dtm = xctxt.getDTM(context);
8892
final int docContext = dtm.getDocument();
8993

90-
if (DTM.NULL == docContext) error(xctxt, XPATHErrorResources.ER_CONTEXT_HAS_NO_OWNERDOC, null);
94+
if (DTM.NULL == docContext) {
95+
error(xctxt, XPATHErrorResources.ER_CONTEXT_HAS_NO_OWNERDOC, null);
96+
}
9197

9298
final XObject arg = m_arg0.execute(xctxt);
9399
final int argType = arg.getType();

‎src/main/java/org/htmlunit/xpath/functions/FuncLocalPart.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,14 @@ public class FuncLocalPart extends FunctionDef1Arg {
3030
public XObject execute(final XPathContext xctxt) throws javax.xml.transform.TransformerException {
3131

3232
final int context = getArg0AsNode(xctxt);
33-
if (DTM.NULL == context) return XString.EMPTYSTRING;
33+
if (DTM.NULL == context) {
34+
return XString.EMPTYSTRING;
35+
}
3436
final DTM dtm = xctxt.getDTM(context);
3537
final String s = (context != DTM.NULL) ? dtm.getLocalName(context) : "";
36-
if (s.startsWith("#") || s.equals("xmlns")) return XString.EMPTYSTRING;
38+
if (s.startsWith("#") || s.equals("xmlns")) {
39+
return XString.EMPTYSTRING;
40+
}
3741

3842
return new XString(s);
3943
}

‎src/main/java/org/htmlunit/xpath/functions/FuncRound.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,12 @@ public class FuncRound extends FunctionOneArg {
2929
public XObject execute(final XPathContext xctxt) throws javax.xml.transform.TransformerException {
3030
final XObject obj = m_arg0.execute(xctxt);
3131
final double val = obj.num();
32-
if (val >= -0.5 && val < 0) return new XNumber(-0.0);
33-
if (val == 0.0) return new XNumber(val);
32+
if (val >= -0.5 && val < 0) {
33+
return new XNumber(-0.0);
34+
}
35+
if (val == 0.0) {
36+
return new XNumber(val);
37+
}
3438
return new XNumber(java.lang.Math.floor(val + 0.5));
3539
}
3640
}

‎src/main/java/org/htmlunit/xpath/functions/FuncSubstring.java

+15-5
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,23 @@ public XObject execute(final XPathContext xctxt) throws javax.xml.transform.Tran
6262
int end = (int) (Math.round(len) + start) - 1;
6363

6464
// Normalize end index.
65-
if (end < 0) end = 0;
66-
else if (end > lenOfS1) end = lenOfS1;
65+
if (end < 0) {
66+
end = 0;
67+
}
68+
else if (end > lenOfS1) {
69+
end = lenOfS1;
70+
}
6771

68-
if (startIndex > lenOfS1) startIndex = lenOfS1;
72+
if (startIndex > lenOfS1) {
73+
startIndex = lenOfS1;
74+
}
6975

7076
substr = s1.substring(startIndex, end);
7177
}
7278
else {
73-
if (startIndex > lenOfS1) startIndex = lenOfS1;
79+
if (startIndex > lenOfS1) {
80+
startIndex = lenOfS1;
81+
}
7482
substr = s1.substring(startIndex);
7583
}
7684

@@ -80,7 +88,9 @@ public XObject execute(final XPathContext xctxt) throws javax.xml.transform.Tran
8088
/** {@inheritDoc} */
8189
@Override
8290
public void checkNumberArgs(final int argNum) throws WrongNumberArgsException {
83-
if (argNum < 2) reportWrongNumberArgs();
91+
if (argNum < 2) {
92+
reportWrongNumberArgs();
93+
}
8494
}
8595

8696
/** {@inheritDoc} */

‎src/main/java/org/htmlunit/xpath/functions/FuncSum.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ public XObject execute(final XPathContext xctxt) throws javax.xml.transform.Tran
4545
final DTM dtm = nodes.getDTM(pos);
4646
final XString s = dtm.getStringValue(pos);
4747

48-
if (null != s) sum += s.toDouble();
48+
if (null != s) {
49+
sum += s.toDouble();
50+
}
4951
}
5052
nodes.detach();
5153

‎src/main/java/org/htmlunit/xpath/functions/Function.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ public void setArg(final Expression arg, final int argNum) throws WrongNumberArg
5353
* @throws WrongNumberArgsException if any
5454
*/
5555
public void checkNumberArgs(final int argNum) throws WrongNumberArgsException {
56-
if (argNum != 0) reportWrongNumberArgs();
56+
if (argNum != 0) {
57+
reportWrongNumberArgs();
58+
}
5759
}
5860

5961
/**

0 commit comments

Comments
 (0)