From 0cff7b841acdaa721e38267c1b99268da827800d Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Sat, 28 Oct 2017 20:01:07 +0200
Subject: [PATCH] [java] Mark ASTArrayDimsAndInits and ASTVariableDeclaratorId
 as Dimensionable

---
 .../pmd/lang/java/ast/ASTArrayDimsAndInits.java        | 10 ++++++++--
 .../pmd/lang/java/ast/ASTVariableDeclaratorId.java     |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java
index 29a5eb2e57..0f1fa3fa38 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTArrayDimsAndInits.java
@@ -5,7 +5,7 @@
 
 package net.sourceforge.pmd.lang.java.ast;
 
-public class ASTArrayDimsAndInits extends AbstractJavaNode {
+public class ASTArrayDimsAndInits extends AbstractJavaNode implements Dimensionable {
     private int arrayDepth;
     
     public ASTArrayDimsAndInits(int id) {
@@ -26,8 +26,14 @@ public class ASTArrayDimsAndInits extends AbstractJavaNode {
     public void bumpArrayDepth() {
         arrayDepth++;
     }
-    
+
+    @Override
     public int getArrayDepth() {
         return arrayDepth;
     }
+
+    @Override
+    public boolean isArray() {
+        return arrayDepth > 0; // should always be true...
+    }
 }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorId.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorId.java
index 445a59d046..5d6a83e208 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorId.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTVariableDeclaratorId.java
@@ -11,7 +11,7 @@ import net.sourceforge.pmd.lang.ast.Node;
 import net.sourceforge.pmd.lang.java.symboltable.VariableNameDeclaration;
 import net.sourceforge.pmd.lang.symboltable.NameOccurrence;
 
-public class ASTVariableDeclaratorId extends AbstractJavaTypeNode {
+public class ASTVariableDeclaratorId extends AbstractJavaTypeNode implements Dimensionable {
 
     private int arrayDepth;
     private VariableNameDeclaration nameDeclaration;