Merge branch 'master' into 7.0.x

This commit is contained in:
Clément Fournier 2020-01-19 05:59:09 +01:00
commit aa9a9c2bed
9 changed files with 9 additions and 9 deletions

View File

@ -44,7 +44,7 @@ public abstract class AbstractJjtreeNode<N extends Node> extends AbstractNode {
@Override
@SuppressWarnings("unchecked")
public NodeStream<N> children() {
public NodeStream<? extends N> children() {
return (NodeStream<N>) super.children();
}
}

View File

@ -79,7 +79,7 @@ public interface JavaNode extends ScopedNode, TextAvailableNode {
@Override
NodeStream<JavaNode> children();
NodeStream<? extends JavaNode> children();
@InternalApi

View File

@ -33,5 +33,5 @@ public interface JspNode extends Node {
@Override
NodeStream<JspNode> children();
NodeStream<? extends JspNode> children();
}

View File

@ -36,5 +36,5 @@ public interface ModelicaNode extends Node {
@Override
NodeStream<ModelicaNode> children();
NodeStream<? extends ModelicaNode> children();
}

View File

@ -37,5 +37,5 @@ public interface PLSQLNode extends Node, ScopedNode {
@Override
NodeStream<PLSQLNode> children();
NodeStream<? extends PLSQLNode> children();
}

View File

@ -35,7 +35,7 @@ abstract class AbstractScalaNode<T extends Tree> extends AbstractNode implements
@Override
@SuppressWarnings("unchecked")
public NodeStream<ScalaNode<?>> children() {
public NodeStream<? extends ScalaNode<?>> children() {
return (NodeStream<ScalaNode<?>>) super.children();
}

View File

@ -63,5 +63,5 @@ public interface ScalaNode<T extends Tree> extends Node {
@Override
NodeStream<ScalaNode<?>> children();
NodeStream<? extends ScalaNode<?>> children();
}

View File

@ -35,5 +35,5 @@ public interface VfNode extends Node {
@Override
NodeStream<VfNode> children();
NodeStream<? extends VfNode> children();
}

View File

@ -33,6 +33,6 @@ public interface VmNode extends Node {
@Override
NodeStream<VmNode> children();
NodeStream<? extends VmNode> children();
}