From fed18c97bffabd94e5f3305a2a27fa7f35517cff Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 21 Jan 2011 19:47:18 +0300 Subject: [PATCH] reverted --- .../usages/impl/rules/MethodGroupingRule.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java b/java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java index 054d4a030cc1..e009b471f795 100644 --- a/java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java +++ b/java/java-impl/src/com/intellij/usages/impl/rules/MethodGroupingRule.java @@ -105,7 +105,7 @@ public class MethodGroupingRule implements UsageGroupingRule { } MethodUsageGroup group = (MethodUsageGroup) object; if (isValid() && group.isValid()) { - return SmartPointerManager.getInstance(myProject).pointToTheSameElement(myMethodPointer, group.myMethodPointer); + return getMethod().getManager().areElementsEquivalent(getMethod(), group.getMethod()); } return Comparing.equal(myName, ((MethodUsageGroup)object).myName); } @@ -151,12 +151,10 @@ public class MethodGroupingRule implements UsageGroupingRule { LOG.error("MethodUsageGroup expected but " + usageGroup.getClass() + " found"); } MethodUsageGroup other = (MethodUsageGroup)usageGroup; - if (!SmartPointerManager.getInstance(myProject).pointToTheSameElement(myMethodPointer, other.myMethodPointer)) { - PsiMethod myMethod = myMethodPointer.getElement(); - PsiMethod otherMethod = other.myMethodPointer.getElement(); - if (myMethod != null && otherMethod != null && !UsageViewSettings.getInstance().IS_SORT_MEMBERS_ALPHABETICALLY) { - return myMethod.getTextOffset() < otherMethod.getTextOffset() ? -1 : 1; - } + PsiMethod myMethod = myMethodPointer.getElement(); + PsiMethod otherMethod = other.myMethodPointer.getElement(); + if (myMethod != null && otherMethod != null && !UsageViewSettings.getInstance().IS_SORT_MEMBERS_ALPHABETICALLY) { + return myMethod.getTextOffset() < otherMethod.getTextOffset() ? -1 : 1; } return myName.compareTo(other.myName);