Skip to content

Commit e7aecc5

Browse files
rbrirbri
committed
code style
1 parent 4c63e5d commit e7aecc5

File tree

9 files changed

+264
-92
lines changed

9 files changed

+264
-92
lines changed

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

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,25 +80,35 @@ public Object clone() throws CloneNotSupportedException {
8080
AxesWalker cloneDeep(final WalkingIterator cloneOwner, final Vector<AxesWalker> cloneList)
8181
throws CloneNotSupportedException {
8282
AxesWalker clone = findClone(this, cloneList);
83-
if (null != clone) return clone;
83+
if (null != clone) {
84+
return clone;
85+
}
8486
clone = (AxesWalker) this.clone();
8587
clone.setLocPathIterator(cloneOwner);
8688
if (null != cloneList) {
8789
cloneList.addElement(this);
8890
cloneList.addElement(clone);
8991
}
9092

91-
if (wi().m_lastUsedWalker == this) cloneOwner.m_lastUsedWalker = clone;
93+
if (wi().m_lastUsedWalker == this) {
94+
cloneOwner.m_lastUsedWalker = clone;
95+
}
9296

93-
if (null != m_nextWalker) clone.m_nextWalker = m_nextWalker.cloneDeep(cloneOwner, cloneList);
97+
if (null != m_nextWalker) {
98+
clone.m_nextWalker = m_nextWalker.cloneDeep(cloneOwner, cloneList);
99+
}
94100

95101
// If you don't check for the cloneList here, you'll go into an
96102
// recursive infinate loop.
97103
if (null != cloneList) {
98-
if (null != m_prevWalker) clone.m_prevWalker = m_prevWalker.cloneDeep(cloneOwner, cloneList);
104+
if (null != m_prevWalker) {
105+
clone.m_prevWalker = m_prevWalker.cloneDeep(cloneOwner, cloneList);
106+
}
99107
}
100108
else {
101-
if (null != m_nextWalker) clone.m_nextWalker.m_prevWalker = clone;
109+
if (null != m_nextWalker) {
110+
clone.m_nextWalker.m_prevWalker = clone;
111+
}
102112
}
103113
return clone;
104114
}
@@ -116,7 +126,9 @@ static AxesWalker findClone(final AxesWalker key, final Vector<AxesWalker> clone
116126
// First, look for clone on list.
117127
final int n = cloneList.size();
118128
for (int i = 0; i < n; i += 2) {
119-
if (key == cloneList.elementAt(i)) return cloneList.elementAt(i + 1);
129+
if (key == cloneList.elementAt(i)) {
130+
return cloneList.elementAt(i + 1);
131+
}
120132
}
121133
}
122134
return null;
@@ -210,7 +222,9 @@ public void setPrevWalker(final AxesWalker walker) {
210222
* @return the next node in document order on the axes, or null.
211223
*/
212224
protected int getNextNode() {
213-
if (m_foundLast) return DTM.NULL;
225+
if (m_foundLast) {
226+
return DTM.NULL;
227+
}
214228

215229
if (m_isFresh) {
216230
m_currentNode = m_traverser.first(m_root);
@@ -223,7 +237,9 @@ else if (DTM.NULL != m_currentNode) {
223237
m_currentNode = m_traverser.next(m_root, m_currentNode);
224238
}
225239

226-
if (DTM.NULL == m_currentNode) this.m_foundLast = true;
240+
if (DTM.NULL == m_currentNode) {
241+
this.m_foundLast = true;
242+
}
227243

228244
return m_currentNode;
229245
}
@@ -242,7 +258,9 @@ public int nextNode() {
242258
AxesWalker walker = wi().getLastUsedWalker();
243259

244260
while (true) {
245-
if (null == walker) break;
261+
if (null == walker) {
262+
break;
263+
}
246264

247265
nextNode = walker.getNextNode();
248266

@@ -356,7 +374,9 @@ public void callVisitors(final XPathVisitor visitor) {
356374
/** {@inheritDoc} */
357375
@Override
358376
public boolean deepEquals(final Expression expr) {
359-
if (!super.deepEquals(expr)) return false;
377+
if (!super.deepEquals(expr)) {
378+
return false;
379+
}
360380

361381
final AxesWalker walker = (AxesWalker) expr;
362382
return this.m_axis == walker.m_axis;

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

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ else if (OpCodes.FROM_ROOT == stepType) {
6363
fromRoot = true;
6464
// Ugly code... will go away when AST work is done.
6565
final int nextStepPos = compiler.getNextStepPos(firstStepPos);
66-
if (compiler.getOp(nextStepPos) == OpCodes.FROM_DESCENDANTS_OR_SELF) orSelf = true;
66+
if (compiler.getOp(nextStepPos) == OpCodes.FROM_DESCENDANTS_OR_SELF) {
67+
orSelf = true;
68+
}
6769
// firstStepPos += 8;
6870
}
6971

@@ -73,21 +75,37 @@ else if (OpCodes.FROM_ROOT == stepType) {
7375
nextStepPos = compiler.getNextStepPos(nextStepPos);
7476
if (nextStepPos > 0) {
7577
final int stepOp = compiler.getOp(nextStepPos);
76-
if (OpCodes.ENDOP != stepOp) firstStepPos = nextStepPos;
77-
else break;
78+
if (OpCodes.ENDOP != stepOp) {
79+
firstStepPos = nextStepPos;
80+
}
81+
else {
82+
break;
83+
}
84+
}
85+
else {
86+
break;
7887
}
79-
else break;
8088
}
8189

8290
// Fix for http://nagoya.apache.org/bugzilla/show_bug.cgi?id=1336
83-
if ((analysis & WalkerFactory.BIT_CHILD) != 0) orSelf = false;
91+
if ((analysis & WalkerFactory.BIT_CHILD) != 0) {
92+
orSelf = false;
93+
}
8494

8595
if (fromRoot) {
86-
if (orSelf) m_axis = Axis.DESCENDANTSORSELFFROMROOT;
87-
else m_axis = Axis.DESCENDANTSFROMROOT;
96+
if (orSelf) {
97+
m_axis = Axis.DESCENDANTSORSELFFROMROOT;
98+
}
99+
else {
100+
m_axis = Axis.DESCENDANTSFROMROOT;
101+
}
102+
}
103+
else if (orSelf) {
104+
m_axis = Axis.DESCENDANTORSELF;
105+
}
106+
else {
107+
m_axis = Axis.DESCENDANT;
88108
}
89-
else if (orSelf) m_axis = Axis.DESCENDANTORSELF;
90-
else m_axis = Axis.DESCENDANT;
91109

92110
final int whatToShow = compiler.getWhatToShow(firstStepPos);
93111

@@ -96,7 +114,9 @@ else if (OpCodes.FROM_ROOT == stepType) {
96114
& (DTMFilter.SHOW_ATTRIBUTE
97115
| DTMFilter.SHOW_ELEMENT
98116
| DTMFilter.SHOW_PROCESSING_INSTRUCTION)))
99-
|| (whatToShow == DTMFilter.SHOW_ALL)) initNodeTest(whatToShow);
117+
|| (whatToShow == DTMFilter.SHOW_ALL)) {
118+
initNodeTest(whatToShow);
119+
}
100120
else {
101121
initNodeTest(
102122
whatToShow, compiler.getStepNS(firstStepPos), compiler.getStepLocalName(firstStepPos));
@@ -119,7 +139,9 @@ public DTMIterator cloneWithReset() throws CloneNotSupportedException {
119139
/** {@inheritDoc} */
120140
@Override
121141
public int nextNode() {
122-
if (m_foundLast) return DTM.NULL;
142+
if (m_foundLast) {
143+
return DTM.NULL;
144+
}
123145

124146
if (DTM.NULL == m_lastFetched) {
125147
resetProximityPositions();
@@ -190,7 +212,9 @@ public void setRoot(final int context, final Object environment) {
190212
/** {@inheritDoc} */
191213
@Override
192214
public int asNode(final XPathContext xctxt) throws javax.xml.transform.TransformerException {
193-
if (getPredicateCount() > 0) return super.asNode(xctxt);
215+
if (getPredicateCount() > 0) {
216+
return super.asNode(xctxt);
217+
}
194218

195219
final int current = xctxt.getCurrentNode();
196220

@@ -236,7 +260,9 @@ public int getAxis() {
236260
/** {@inheritDoc} */
237261
@Override
238262
public boolean deepEquals(final Expression expr) {
239-
if (!super.deepEquals(expr)) return false;
263+
if (!super.deepEquals(expr)) {
264+
return false;
265+
}
240266

241267
return m_axis == ((DescendantIterator) expr).m_axis;
242268
}

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

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,9 @@ protected void loadLocationPaths(final Compiler compiler, final int opPos, final
212212
final WalkingIterator iter = new WalkingIterator(compiler.getNamespaceContext());
213213
iter.exprSetParent(this);
214214

215-
if (compiler.getLocationPathDepth() <= 0) iter.setIsTopLevel(true);
215+
if (compiler.getLocationPathDepth() <= 0) {
216+
iter.setIsTopLevel(true);
217+
}
216218

217219
iter.m_firstWalker = new org.htmlunit.xpath.axes.FilterExprWalker(iter);
218220

@@ -229,7 +231,9 @@ protected void loadLocationPaths(final Compiler compiler, final int opPos, final
229231
/** {@inheritDoc} */
230232
@Override
231233
public int nextNode() {
232-
if (m_foundLast) return DTM.NULL;
234+
if (m_foundLast) {
235+
return DTM.NULL;
236+
}
233237

234238
// Loop through the iterators getting the current fetched
235239
// node, and get the earliest occuring in document order
@@ -242,7 +246,9 @@ public int nextNode() {
242246
for (int i = 0; i < n; i++) {
243247
final int node = iterators_[i].getCurrentNode();
244248

245-
if (DTM.NULL == node) continue;
249+
if (DTM.NULL == node) {
250+
continue;
251+
}
246252
else if (DTM.NULL == earliestNode) {
247253
iteratorUsed = i;
248254
earliestNode = node;
@@ -269,7 +275,9 @@ else if (DTM.NULL == earliestNode) {
269275

270276
incrementCurrentPos();
271277
}
272-
else m_foundLast = true;
278+
else {
279+
m_foundLast = true;
280+
}
273281
}
274282

275283
m_lastFetched = earliestNode;
@@ -317,17 +325,23 @@ public void callVisitors(final XPathVisitor visitor) {
317325
/** {@inheritDoc} */
318326
@Override
319327
public boolean deepEquals(final Expression expr) {
320-
if (!super.deepEquals(expr)) return false;
328+
if (!super.deepEquals(expr)) {
329+
return false;
330+
}
321331

322332
final UnionPathIterator upi = (UnionPathIterator) expr;
323333

324334
if (null != exprs_) {
325335
final int n = exprs_.length;
326336

327-
if ((null == upi.exprs_) || (upi.exprs_.length != n)) return false;
337+
if ((null == upi.exprs_) || (upi.exprs_.length != n)) {
338+
return false;
339+
}
328340

329341
for (int i = 0; i < n; i++) {
330-
if (!exprs_[i].deepEquals(upi.exprs_[i])) return false;
342+
if (!exprs_[i].deepEquals(upi.exprs_[i])) {
343+
return false;
344+
}
331345
}
332346
}
333347
else if (null != upi.exprs_) {

0 commit comments

Comments
 (0)