From 240b1fe68aca8d9d4cc8cd2bcad1d3455df09ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 17 Jan 2020 14:48:43 +0100
Subject: [PATCH] Fix build

---
 .../net/sourceforge/pmd/lang/ast/AbstractNode.java  | 10 +++-------
 .../java/net/sourceforge/pmd/lang/ast/Node.java     | 13 -------------
 .../pmd/lang/ast/xpath/AttributeAxisIterator.java   |  2 +-
 .../pmd/lang/scala/ast/AbstractScalaNode.java       |  5 +++--
 .../sourceforge/pmd/lang/vf/ast/AbstractVFNode.java |  2 +-
 .../sourceforge/pmd/lang/vm/ast/AbstractVmNode.java |  2 +-
 6 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AbstractNode.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AbstractNode.java
index 6f0b70fb10..9f527d6bdb 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AbstractNode.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/AbstractNode.java
@@ -82,7 +82,7 @@ public abstract class AbstractNode implements Node {
 
     @Override
     public int getIndexInParent() {
-        return jjtGetChildIndex();
+        return childIndex;
     }
 
     @Override
@@ -128,6 +128,7 @@ public abstract class AbstractNode implements Node {
         this.parent = parent;
     }
 
+    @Override
     @Deprecated
     public Node jjtGetParent() {
         return parent;
@@ -154,13 +155,8 @@ public abstract class AbstractNode implements Node {
         childIndex = index;
     }
 
+
     @Override
-    @Deprecated
-    public int jjtGetChildIndex() {
-        return childIndex;
-    }
-
-
     @Deprecated
     public Node jjtGetChild(final int index) {
         return children[index];
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
index ce6342601e..aebe05551f 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/Node.java
@@ -137,19 +137,6 @@ public interface Node {
     }
 
 
-    /**
-     * Gets the index of this node in the children of its parent.
-     *
-     * @return The index of the node
-     *
-     * @deprecated Use {@link #getIndexInParent()}
-     */
-    @Deprecated
-    default int jjtGetChildIndex() {
-        return getIndexInParent();
-    }
-
-
     /**
      * This method returns a child node. The children are numbered from zero, left to right.
      *
diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AttributeAxisIterator.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AttributeAxisIterator.java
index c5985deda9..4f6787b707 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AttributeAxisIterator.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/xpath/AttributeAxisIterator.java
@@ -43,7 +43,7 @@ public class AttributeAxisIterator implements Iterator<Attribute> {
                     Long.TYPE, Character.TYPE, Float.TYPE));
 
     private static final Set<String> FILTERED_OUT_NAMES
-        = new HashSet<>(Arrays.asList("toString", "getNumChildren", "getIndexInParent", "getParent", "getClass", "getRuleIndex", "getXPathNodeName", "isFindBoundary", "altNumber", "toStringTree", "getTypeNameNode", "hashCode", "getImportedNameNode", "getScope"));
+        = new HashSet<>(Arrays.asList("toString", "getNumChildren", "getIndexInParent", "getParent", "getClass", "getRuleIndex", "getXPathNodeName", "altNumber", "toStringTree", "getTypeNameNode", "hashCode", "getImportedNameNode", "getScope"));
 
     /* Iteration variables */
     private final Iterator<MethodWrapper> iterator;
diff --git a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
index 587d962da4..a6596a24b1 100644
--- a/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
+++ b/pmd-scala/src/main/java/net/sourceforge/pmd/lang/scala/ast/AbstractScalaNode.java
@@ -5,6 +5,7 @@
 package net.sourceforge.pmd.lang.scala.ast;
 
 import net.sourceforge.pmd.lang.ast.AbstractNode;
+import net.sourceforge.pmd.lang.ast.NodeStream;
 
 import scala.meta.Tree;
 import scala.meta.inputs.Position;
@@ -34,8 +35,8 @@ abstract class AbstractScalaNode<T extends Tree> extends AbstractNode implements
 
     @Override
     @SuppressWarnings("unchecked")
-    public Iterable<ScalaNode<?>> children() {
-        return (Iterable<ScalaNode<?>>) super.children();
+    public NodeStream<ScalaNode<?>> children() {
+        return (NodeStream<ScalaNode<?>>) super.children();
     }
 
     @Override
diff --git a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/AbstractVFNode.java b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/AbstractVFNode.java
index 4b822c5cca..c43a95aa9a 100644
--- a/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/AbstractVFNode.java
+++ b/pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/ast/AbstractVFNode.java
@@ -4,8 +4,8 @@
 
 package net.sourceforge.pmd.lang.vf.ast;
 
-import net.sourceforge.pmd.lang.ast.impl.javacc.AbstractJjtreeNode;
 import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.ast.impl.javacc.AbstractJjtreeNode;
 
 public class AbstractVFNode extends AbstractJjtreeNode<VfNode> implements VfNode {
 
diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/AbstractVmNode.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/AbstractVmNode.java
index 56608c7de3..328ead1059 100644
--- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/AbstractVmNode.java
+++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/ast/AbstractVmNode.java
@@ -26,8 +26,8 @@ import java.io.Writer;
 import org.apache.commons.lang3.text.StrBuilder;
 
 import net.sourceforge.pmd.annotation.InternalApi;
-import net.sourceforge.pmd.lang.ast.impl.javacc.AbstractJjtreeNode;
 import net.sourceforge.pmd.lang.ast.Node;
+import net.sourceforge.pmd.lang.ast.impl.javacc.AbstractJjtreeNode;
 
 /**
  *