Skip to content

Commit f6bcd0f

Browse files
committed
cleanup
1 parent 434fffe commit f6bcd0f

30 files changed

Lines changed: 70 additions & 710 deletions

src/main/java/net/sourceforge/htmlunit/xpath/Expression.java

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public DTMIterator asIterator(XPathContext xctxt, int contextNode)
167167
throws javax.xml.transform.TransformerException {
168168

169169
try {
170-
xctxt.pushCurrentNodeAndExpression(contextNode, contextNode);
170+
xctxt.pushCurrentNodeAndExpression(contextNode);
171171

172172
return execute(xctxt).iter();
173173
} finally {
@@ -236,7 +236,6 @@ public void warn(XPathContext xctxt, String msg, Object[] args)
236236
* @param b If false, a runtime exception will be thrown.
237237
* @param msg The assertion message, which should be informative.
238238
* @throws RuntimeException if the b argument is false.
239-
* @throws javax.xml.transform.TransformerException
240239
*/
241240
public void assertion(boolean b, java.lang.String msg) {
242241

@@ -298,24 +297,6 @@ public ExpressionNode exprGetParent() {
298297
return m_parent;
299298
}
300299

301-
/** This method tells the node to add its argument to the node's list of children. */
302-
@Override
303-
public void exprAddChild(ExpressionNode n, int i) {
304-
assertion(false, "exprAddChild method not implemented!");
305-
}
306-
307-
/** This method returns a child node. The children are numbered from zero, left to right. */
308-
@Override
309-
public ExpressionNode exprGetChild(int i) {
310-
return null;
311-
}
312-
313-
/** Return the number of children the node has. */
314-
@Override
315-
public int exprGetNumChildren() {
316-
return 0;
317-
}
318-
319300
/**
320301
* Return the public identifier for the current document event.
321302
*

src/main/java/net/sourceforge/htmlunit/xpath/ExpressionNode.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,8 @@
2929
*/
3030
public interface ExpressionNode extends SourceLocator {
3131
/** This pair of methods are used to inform the node of its parent. */
32-
public void exprSetParent(ExpressionNode n);
32+
void exprSetParent(ExpressionNode n);
3333

34-
public ExpressionNode exprGetParent();
34+
ExpressionNode exprGetParent();
3535

36-
/** This method tells the node to add its argument to the node's list of children. */
37-
public void exprAddChild(ExpressionNode n, int i);
38-
39-
/** This method returns a child node. The children are numbered from zero, left to right. */
40-
public ExpressionNode exprGetChild(int i);
41-
42-
/** Return the number of children the node has. */
43-
public int exprGetNumChildren();
4436
}

src/main/java/net/sourceforge/htmlunit/xpath/ExpressionOwner.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ public interface ExpressionOwner {
2424
*
2525
* @return the raw Expression object, which should not normally be null.
2626
*/
27-
public Expression getExpression();
27+
Expression getExpression();
2828

2929
/**
3030
* Set the raw expression object for this object.
3131
*
3232
* @param exp the raw Expression object, which should not normally be null.
3333
*/
34-
public void setExpression(Expression exp);
34+
void setExpression(Expression exp);
3535
}

0 commit comments

Comments
 (0)