From fc8834c739b085845060db31daeae412339daa68 Mon Sep 17 00:00:00 2001
From: "Nikolay.Tropin" <Nikolay.Tropin@jetbrains.com>
Date: Fri, 25 Sep 2015 12:46:24 +0300
Subject: [PATCH] more general constructor for ClassInstanceMethodFilter added

---
 .../debugger/engine/ClassInstanceMethodFilter.java    | 11 +++++++----
 .../debugger/engine/ConstructorStepMethodFilter.java  |  6 +++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/ClassInstanceMethodFilter.java b/java/debugger/impl/src/com/intellij/debugger/engine/ClassInstanceMethodFilter.java
index 2161908c4176..85a655c920a9 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/ClassInstanceMethodFilter.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/ClassInstanceMethodFilter.java
@@ -30,13 +30,16 @@ import com.sun.jdi.request.EventRequest;
  * @author egor
  */
 public class ClassInstanceMethodFilter extends ConstructorStepMethodFilter implements ActionMethodFilter {
-  private final PsiMethod myPsiMethod;
-  private final AnonymousClassMethodFilter myMethodFilter;
+  private final BreakpointStepMethodFilter myMethodFilter;
 
   public ClassInstanceMethodFilter(PsiMethod psiMethod, Range<Integer> lines) {
     super(psiMethod.getContainingClass(), lines);
-    myPsiMethod = psiMethod;
-    myMethodFilter = new AnonymousClassMethodFilter(myPsiMethod, getCallingExpressionLines());
+    myMethodFilter = new AnonymousClassMethodFilter(psiMethod, getCallingExpressionLines());
+  }
+
+  public ClassInstanceMethodFilter(JVMName classJvmName, BreakpointStepMethodFilter methodFilter, Range<Integer> lines) {
+    super(classJvmName, lines);
+    myMethodFilter = methodFilter;
   }
 
   @Override
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/ConstructorStepMethodFilter.java b/java/debugger/impl/src/com/intellij/debugger/engine/ConstructorStepMethodFilter.java
index ec12f24a4750..414881baf2e5 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/ConstructorStepMethodFilter.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/ConstructorStepMethodFilter.java
@@ -22,7 +22,11 @@ import com.intellij.util.Range;
  * @author egor
  */
 public class ConstructorStepMethodFilter extends BasicStepMethodFilter {
+  public ConstructorStepMethodFilter(JVMName classJvmName, Range<Integer> callingExpressionLines) {
+    super(classJvmName, JVMNameUtil.CONSTRUCTOR_NAME, null, callingExpressionLines);
+  }
+
   public ConstructorStepMethodFilter(PsiClass psiClass, Range<Integer> callingExpressionLines) {
-    super(JVMNameUtil.getJVMQualifiedName(psiClass), JVMNameUtil.CONSTRUCTOR_NAME, null, callingExpressionLines);
+    this(JVMNameUtil.getJVMQualifiedName(psiClass), callingExpressionLines);
   }
 }