From 5ee98b8786eb7a6feedaaec256b92f78dae75c5d Mon Sep 17 00:00:00 2001
From: Andreas Dangel <adangel@users.sourceforge.net>
Date: Sun, 4 Oct 2015 12:00:24 +0200
Subject: [PATCH] Fix javascript after upgrading rhino library

---
 .../pmd/lang/ecmascript/ast/ASTFunctionNode.java            | 6 +++---
 .../pmd/lang/ecmascript/ast/ASTObjectProperty.java          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNode.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNode.java
index 96492fba8a..08c9fa2434 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNode.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTFunctionNode.java
@@ -50,14 +50,14 @@ public class ASTFunctionNode extends AbstractEcmascriptNode<FunctionNode> {
     }
 
     public boolean isGetter() {
-	return node.isGetter();
+	return node.isGetterMethod();
     }
 
     public boolean isSetter() {
-	return node.isSetter();
+	return node.isSetterMethod();
     }
 
     public boolean isGetterOrSetter() {
-	return node.isGetterOrSetter();
+        return isGetter() || isSetter();
     }
 }
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectProperty.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectProperty.java
index 2969c84bdd..4b91af0444 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectProperty.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/ecmascript/ast/ASTObjectProperty.java
@@ -18,10 +18,10 @@ public class ASTObjectProperty extends AbstractInfixEcmascriptNode<ObjectPropert
     }
 
     public boolean isGetter() {
-	return node.isGetter();
+	return node.isGetterMethod();
     }
 
     public boolean isSetter() {
-	return node.isSetter();
+	return node.isSetterMethod();
     }
 }