# HG changeset patch
# User enebo@netbeans.org
# Date 1385329573 21600
# Node ID 32cac83e9ae773c198a53f90b195a50cb10537ed
# Parent  77cbb671b3440eab458a14f02a9e9d9a1ed86aa9
hmm should have renamed this before last commit

diff -r 77cbb671b344 -r 32cac83e9ae7 ruby.hints/src/org/netbeans/modules/ruby/hints/RailsViews.java
--- a/ruby.hints/src/org/netbeans/modules/ruby/hints/RailsViews.java	Sun Nov 24 15:33:07 2013 -0600
+++ b/ruby.hints/src/org/netbeans/modules/ruby/hints/RailsViews.java	Sun Nov 24 15:46:13 2013 -0600
@@ -91,7 +91,7 @@
         assert file.getName().endsWith("_controller"); // NOI18N
 
         if (!(node instanceof MethodDefNode)) return;
-        if (Arity.getDefArity((MethodDefNode) node).acceptsArgs()) return; // Methods with arguments aren't actions
+        if (Arity.getArity((MethodDefNode) node).acceptsArgs()) return; // Methods with arguments aren't actions
         
         String name = ((INameNode)node).getName();
 
diff -r 77cbb671b344 -r 32cac83e9ae7 ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/RubyElementCtx.java
--- a/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/RubyElementCtx.java	Sun Nov 24 15:33:07 2013 -0600
+++ b/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/RubyElementCtx.java	Sun Nov 24 15:46:13 2013 -0600
@@ -345,14 +345,14 @@
     public Arity getArity() {
         if (arity == null) {
             if (node instanceof MethodDefNode) {
-                arity = Arity.getDefArity((MethodDefNode) node);
+                arity = Arity.getArity((MethodDefNode) node);
             } else if (AstUtilities.isCall(node)) {
                 arity = Arity.getCallArity(node);
             } else if (node instanceof ArgumentNode) {
                 AstPath _path = getPath();
 
                 if (_path.leafParent() instanceof MethodDefNode) {
-                    arity = Arity.getDefArity((MethodDefNode) _path.leafParent());
+                    arity = Arity.getArity((MethodDefNode) _path.leafParent());
                 }
             }
         }
diff -r 77cbb671b344 -r 32cac83e9ae7 ruby/src/org/netbeans/modules/ruby/Arity.java
--- a/ruby/src/org/netbeans/modules/ruby/Arity.java	Sun Nov 24 15:33:07 2013 -0600
+++ b/ruby/src/org/netbeans/modules/ruby/Arity.java	Sun Nov 24 15:46:13 2013 -0600
@@ -48,8 +48,6 @@
 import org.jrubyparser.ast.ArgumentNode;
 import org.jrubyparser.ast.ArrayNode;
 import org.jrubyparser.ast.CallNode;
-import org.jrubyparser.ast.DefnNode;
-import org.jrubyparser.ast.DefsNode;
 import org.jrubyparser.ast.FCallNode;
 import org.jrubyparser.ast.ListNode;
 import org.jrubyparser.ast.LocalAsgnNode;
@@ -188,7 +186,7 @@
         }
     }
 
-    public static Arity getDefArity(MethodDefNode method) {
+    public static Arity getArity(MethodDefNode method) {
         Arity arity = new Arity(0, 0);
         
         for (Node c : method.childNodes()) {
diff -r 77cbb671b344 -r 32cac83e9ae7 ruby/src/org/netbeans/modules/ruby/AstUtilities.java
--- a/ruby/src/org/netbeans/modules/ruby/AstUtilities.java	Sun Nov 24 15:33:07 2013 -0600
+++ b/ruby/src/org/netbeans/modules/ruby/AstUtilities.java	Sun Nov 24 15:46:13 2013 -0600
@@ -492,7 +492,7 @@
     public static MethodDefNode findMethod(Node node, String name, Arity arity) {
         // Recursively search for methods or method calls that match the name and arity
         if (node instanceof MethodDefNode && (((INameNode) node).getName()).equals(name) && 
-                Arity.matches(arity, Arity.getDefArity((MethodDefNode) node))) return (MethodDefNode) node;
+                Arity.matches(arity, Arity.getArity((MethodDefNode) node))) return (MethodDefNode) node;
 
         for (Node child : node.childNodes()) {
             MethodDefNode match = findMethod(child, name, arity);
@@ -723,7 +723,7 @@
 
         // Simple call today...
         return getDefName(method).equals(getCallName(call)) &&
-        Arity.matches(callArity, Arity.getDefArity((MethodDefNode) method));
+        Arity.matches(callArity, Arity.getArity((MethodDefNode) method));
     }
 
     // TODO: use the structure analyzer data for more accurate traversal?
diff -r 77cbb671b344 -r 32cac83e9ae7 ruby/src/org/netbeans/modules/ruby/RubyDeclarationFinder.java
--- a/ruby/src/org/netbeans/modules/ruby/RubyDeclarationFinder.java	Sun Nov 24 15:33:07 2013 -0600
+++ b/ruby/src/org/netbeans/modules/ruby/RubyDeclarationFinder.java	Sun Nov 24 15:46:13 2013 -0600
@@ -1996,7 +1996,7 @@
         // Recursively search for methods or method calls that match the name and arity
         if (node instanceof MethodDefNode) {
             if (((MethodDefNode)node).getName().equals(name) &&
-                    Arity.matches(arity, Arity.getDefArity((MethodDefNode) node))) {
+                    Arity.matches(arity, Arity.getArity((MethodDefNode) node))) {
                 return getLocation(info, node);
             }
         } else if (!ignoreAlias && node instanceof AliasNode) {
diff -r 77cbb671b344 -r 32cac83e9ae7 ruby/src/org/netbeans/modules/ruby/RubyOccurrencesFinder.java
--- a/ruby/src/org/netbeans/modules/ruby/RubyOccurrencesFinder.java	Sun Nov 24 15:33:07 2013 -0600
+++ b/ruby/src/org/netbeans/modules/ruby/RubyOccurrencesFinder.java	Sun Nov 24 15:46:13 2013 -0600
@@ -301,7 +301,7 @@
 
                 if (range.containsInclusive(astOffset)) {
                     String name = ((MethodDefNode)closest).getName();
-                    highlightMethod(root, name, Collections.singletonList(Arity.getDefArity((MethodDefNode) closest)), highlights);
+                    highlightMethod(root, name, Collections.singletonList(Arity.getArity((MethodDefNode) closest)), highlights);
                 }
             } else if (closest instanceof Colon2Node) {
                 // A Class definition
@@ -656,7 +656,7 @@
         Map<OffsetRange, ColoringAttributes> highlights) {
         // Recursively search for methods or method calls that match the name and arity
         if (node instanceof MethodDefNode && ((MethodDefNode)node).getName().equals(name)) {
-            Arity defArity = Arity.getDefArity((MethodDefNode) node);
+            Arity defArity = Arity.getArity((MethodDefNode) node);
 
             for (Arity arity : arities) {
                 if (Arity.matches(arity, defArity)) {
@@ -694,7 +694,7 @@
     private void findDefArities(List<Arity> defArities, Node node, String name, Arity callArity) {
         // Recursively search for methods or method calls that match the name and arity
         if (node instanceof MethodDefNode && ((MethodDefNode)node).getName().equals(name)) {
-            Arity defArity = Arity.getDefArity((MethodDefNode) node);
+            Arity defArity = Arity.getArity((MethodDefNode) node);
 
             if (Arity.matches(callArity, defArity)) defArities.add(defArity);
         }
diff -r 77cbb671b344 -r 32cac83e9ae7 ruby/src/org/netbeans/modules/ruby/RubyStructureAnalyzer.java
--- a/ruby/src/org/netbeans/modules/ruby/RubyStructureAnalyzer.java	Sun Nov 24 15:33:07 2013 -0600
+++ b/ruby/src/org/netbeans/modules/ruby/RubyStructureAnalyzer.java	Sun Nov 24 15:46:13 2013 -0600
@@ -1189,8 +1189,8 @@
 
             if ((kind == ElementKind.METHOD) || (kind == ElementKind.CONSTRUCTOR)) {
                 // consider also arity (#131134)
-                Arity arity = Arity.getDefArity((MethodDefNode) node.getNode());
-                Arity darity = Arity.getDefArity((MethodDefNode) d.node.getNode());
+                Arity arity = Arity.getArity((MethodDefNode) node.getNode());
+                Arity darity = Arity.getArity((MethodDefNode) d.node.getNode());
                 if (!arity.equals(darity) || !getModifiers().equals(d.getModifiers())) return false;
 
                 // consider parameters names and thus their arity (issue 101508)
@@ -1224,7 +1224,7 @@
 
             if ((kind == ElementKind.METHOD) || (kind == ElementKind.CONSTRUCTOR)) {
                 // consider also arity
-                Arity arity = Arity.getDefArity((MethodDefNode) node.getNode());
+                Arity arity = Arity.getArity((MethodDefNode) node.getNode());
                 hash = 37 * hash + arity.hashCode();
             }
 
diff -r 77cbb671b344 -r 32cac83e9ae7 ruby/test/unit/src/org/netbeans/modules/ruby/ArityTest.java
--- a/ruby/test/unit/src/org/netbeans/modules/ruby/ArityTest.java	Sun Nov 24 15:33:07 2013 -0600
+++ b/ruby/test/unit/src/org/netbeans/modules/ruby/ArityTest.java	Sun Nov 24 15:46:13 2013 -0600
@@ -97,7 +97,7 @@
         for (Node n : nodes) {
             String name = ((INameNode)n).getName();
             if (name.equals(methodName)) {
-                assertEquals(arity, Arity.getDefArity((MethodDefNode) n));
+                assertEquals(arity, Arity.getArity((MethodDefNode) n));
                 return;
             }
         }