Skip to content

Commit 8e323e4

Browse files
adamretteradamretter
committed
[ignore] Code cleanup
1 parent bd67ba8 commit 8e323e4

File tree

2 files changed

+62
-58
lines changed

2 files changed

+62
-58
lines changed

‎exist-core/src/main/java/org/exist/xquery/BasicExpressionVisitor.java‎

Lines changed: 59 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,18 @@
2828
* Basic implementation of the {@link ExpressionVisitor} interface.
2929
* This implementation will traverse a PathExpr object if it wraps
3030
* around a single other expression. All other methods are empty.
31-
*
32-
* @author wolf
3331
*
32+
* @author wolf
3433
*/
3534
public class BasicExpressionVisitor implements ExpressionVisitor {
3635

3736
@Override
38-
public void visit(Expression expression) {
37+
public void visit(final Expression expression) {
3938
processWrappers(expression);
4039
}
4140

4241
@Override
43-
public void visitCastExpr(CastExpression expression) {
42+
public void visitCastExpr(final CastExpression expression) {
4443
//Nothing to do
4544
}
4645

@@ -50,69 +49,69 @@ public void visitCastExpr(CastExpression expression) {
5049
* expression object.
5150
*/
5251
@Override
53-
public void visitPathExpr(PathExpr expression) {
52+
public void visitPathExpr(final PathExpr expression) {
5453
if (expression.getLength() == 1) {
5554
final Expression next = expression.getExpression(0);
5655
next.accept(this);
5756
}
5857
}
5958

6059
@Override
61-
public void visitFunctionCall(FunctionCall call) {
60+
public void visitFunctionCall(final FunctionCall call) {
6261
// Nothing to do
6362
}
6463

6564
@Override
66-
public void visitGeneralComparison(GeneralComparison comparison) {
65+
public void visitGeneralComparison(final GeneralComparison comparison) {
6766
//Nothing to do
6867
}
6968

7069
@Override
71-
public void visitUnionExpr(Union union) {
70+
public void visitUnionExpr(final Union union) {
7271
//Nothing to do
7372
}
7473

7574
@Override
76-
public void visitIntersectionExpr(Intersect intersect) {
75+
public void visitIntersectionExpr(final Intersect intersect) {
7776
//Nothing to do
7877
}
7978

8079
@Override
81-
public void visitAndExpr(OpAnd and) {
80+
public void visitAndExpr(final OpAnd and) {
8281
//Nothing to do
8382
}
8483

8584
@Override
86-
public void visitOrExpr(OpOr or) {
85+
public void visitOrExpr(final OpOr or) {
8786
//Nothing to do
8887
}
8988

9089
@Override
91-
public void visitLocationStep(LocationStep locationStep) {
90+
public void visitLocationStep(final LocationStep locationStep) {
9291
//Nothing to do
9392
}
9493

9594
@Override
96-
public void visitFilteredExpr(FilteredExpression filtered) {
95+
public void visitFilteredExpr(final FilteredExpression filtered) {
9796
//Nothing to do
9897
}
9998

10099
@Override
101-
public void visitPredicate(Predicate predicate) {
100+
public void visitPredicate(final Predicate predicate) {
102101
//Nothing to do
103102
}
104103

105104
@Override
106-
public void visitVariableReference(VariableReference ref) {
105+
public void visitVariableReference(final VariableReference ref) {
107106
//Nothing to do
108107
}
109108

110109
@Override
111-
public void visitVariableDeclaration(VariableDeclaration decl) {
112-
// Nothing to do
110+
public void visitVariableDeclaration(final VariableDeclaration decl) {
111+
// Nothing to do
113112
}
114-
115-
protected void processWrappers(Expression expr) {
113+
114+
protected void processWrappers(final Expression expr) {
116115
if (expr instanceof Atomize ||
117116
expr instanceof DynamicCardinalityCheck ||
118117
expr instanceof DynamicNameCheck ||
@@ -122,118 +121,120 @@ protected void processWrappers(Expression expr) {
122121
}
123122
}
124123

125-
public static LocationStep findFirstStep(Expression expr) {
126-
if (expr instanceof LocationStep)
127-
{return (LocationStep) expr;}
124+
public static LocationStep findFirstStep(final Expression expr) {
125+
if (expr instanceof LocationStep) {
126+
return (LocationStep) expr;
127+
}
128128
final FirstStepVisitor visitor = new FirstStepVisitor();
129129
expr.accept(visitor);
130130
return visitor.firstStep;
131131
}
132132

133-
public static List<LocationStep> findLocationSteps(Expression expr) {
133+
public static List<LocationStep> findLocationSteps(final Expression expr) {
134134
final List<LocationStep> steps = new ArrayList<>(5);
135135
if (expr instanceof LocationStep) {
136-
steps.add((LocationStep)expr);
136+
steps.add((LocationStep) expr);
137137
return steps;
138138
}
139139
expr.accept(
140-
new BasicExpressionVisitor() {
141-
@Override
142-
public void visitPathExpr(PathExpr expression) {
143-
for (int i = 0; i < expression.getLength(); i++) {
144-
final Expression next = expression.getExpression(i);
145-
next.accept(this);
146-
if (steps.size() - 1 != i) {
147-
steps.add(null);
140+
new BasicExpressionVisitor() {
141+
@Override
142+
public void visitPathExpr(final PathExpr expression) {
143+
for (int i = 0; i < expression.getLength(); i++) {
144+
final Expression next = expression.getExpression(i);
145+
next.accept(this);
146+
if (steps.size() - 1 != i) {
147+
steps.add(null);
148+
}
148149
}
149150
}
151+
152+
@Override
153+
public void visitLocationStep(final LocationStep locationStep) {
154+
steps.add(locationStep);
155+
}
150156
}
151-
@Override
152-
public void visitLocationStep(LocationStep locationStep) {
153-
steps.add(locationStep);
154-
}
155-
}
156157
);
157158
return steps;
158159
}
159160

160-
public static VariableReference findVariableRef(Expression expr) {
161+
public static VariableReference findVariableRef(final Expression expr) {
161162
final VariableRefVisitor visitor = new VariableRefVisitor();
162163
expr.accept(visitor);
163164
return visitor.ref;
164165
}
165166

166167
@Override
167-
public void visitForExpression(ForExpr forExpr) {
168+
public void visitForExpression(final ForExpr forExpr) {
168169
//Nothing to do
169170
}
170171

171172
@Override
172-
public void visitLetExpression(LetExpr letExpr) {
173+
public void visitLetExpression(final LetExpr letExpr) {
173174
//Nothing to do
174175
}
175176

176177
@Override
177-
public void visitOrderByClause(OrderByClause orderBy) {
178+
public void visitOrderByClause(final OrderByClause orderBy) {
178179
// Nothing to do
179180
}
180181

181182
@Override
182-
public void visitGroupByClause(GroupByClause groupBy) {
183+
public void visitGroupByClause(final GroupByClause groupBy) {
183184
// Nothing to do
184185
}
185186

186187
@Override
187-
public void visitWhereClause(WhereClause where) {
188+
public void visitWhereClause(final WhereClause where) {
188189
// Nothing to do
189190
}
190191

191192
@Override
192-
public void visitBuiltinFunction(Function function) {
193+
public void visitBuiltinFunction(final Function function) {
193194
//Nothing to do
194195
}
195196

196197
@Override
197-
public void visitUserFunction(UserDefinedFunction function) {
198+
public void visitUserFunction(final UserDefinedFunction function) {
198199
//Nothing to do
199200
}
200201

201202
@Override
202-
public void visitConditional(ConditionalExpression conditional) {
203+
public void visitConditional(final ConditionalExpression conditional) {
203204
//Nothing to do
204205
}
205206

206207
@Override
207-
public void visitTryCatch(TryCatchExpression conditional) {
208+
public void visitTryCatch(final TryCatchExpression conditional) {
208209
//Nothing to do
209210
}
210211

211212
@Override
212-
public void visitDocumentConstructor(DocumentConstructor constructor) {
213-
// Nothing to do
213+
public void visitDocumentConstructor(final DocumentConstructor constructor) {
214+
// Nothing to do
214215
}
215-
216-
public void visitElementConstructor(ElementConstructor constructor) {
216+
217+
public void visitElementConstructor(final ElementConstructor constructor) {
217218
//Nothing to do
218219
}
219220

220221
@Override
221-
public void visitTextConstructor(DynamicTextConstructor constructor) {
222+
public void visitTextConstructor(final DynamicTextConstructor constructor) {
222223
//Nothing to do
223224
}
224225

225226
@Override
226-
public void visitAttribConstructor(AttributeConstructor constructor) {
227+
public void visitAttribConstructor(final AttributeConstructor constructor) {
227228
//Nothing to do
228229
}
229230

230231
@Override
231-
public void visitAttribConstructor(DynamicAttributeConstructor constructor) {
232+
public void visitAttribConstructor(final DynamicAttributeConstructor constructor) {
232233
//Nothing to do
233234
}
234235

235236
@Override
236-
public void visitSimpleMapOperator(OpSimpleMap simpleMap) {
237+
public void visitSimpleMapOperator(final OpSimpleMap simpleMap) {
237238
// Nothing to do
238239
}
239240

@@ -246,7 +247,7 @@ public LocationStep getFirstStep() {
246247
}
247248

248249
@Override
249-
public void visitLocationStep(LocationStep locationStep) {
250+
public void visitLocationStep(final LocationStep locationStep) {
250251
firstStep = locationStep;
251252
}
252253
}
@@ -256,12 +257,12 @@ public static class VariableRefVisitor extends BasicExpressionVisitor {
256257
private VariableReference ref = null;
257258

258259
@Override
259-
public void visitVariableReference(VariableReference ref) {
260+
public void visitVariableReference(final VariableReference ref) {
260261
this.ref = ref;
261262
}
262263

263264
@Override
264-
public void visitPathExpr(PathExpr expression) {
265+
public void visitPathExpr(final PathExpr expression) {
265266
for (int i = 0; i < expression.getLength(); i++) {
266267
final Expression next = expression.getExpression(i);
267268
next.accept(this);

‎exist-core/src/main/java/org/exist/xquery/ExtensionExpression.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,12 @@ private void callBefore(final Sequence contextSequence) throws XPathException {
9191
}
9292
}
9393

94+
@Override
9495
public int returnsType() {
9596
return innerExpression.returnsType();
9697
}
9798

99+
@Override
98100
public void analyze(final AnalyzeContextInfo contextInfo) throws XPathException {
99101
final AnalyzeContextInfo newContext = new AnalyzeContextInfo(contextInfo);
100102
for (final Pragma pragma : pragmas) {
@@ -103,6 +105,7 @@ public void analyze(final AnalyzeContextInfo contextInfo) throws XPathException
103105
innerExpression.analyze(newContext);
104106
}
105107

108+
@Override
106109
public void dump(final ExpressionDumper dumper) {
107110
for (final Pragma pragma : pragmas) {
108111
pragma.dump(dumper);

0 commit comments

Comments
 (0)