diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java
index 0b16c272cc4b..76887f89f3eb 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/XsltSupport.java
@@ -231,7 +231,7 @@ public class XsltSupport {
         return level != XsltChecker.LanguageLevel.NONE;
     }
 
-    public static XsltChecker.LanguageLevel getXsltLanguageLevel(PsiFile psiFile) {
+    public static XsltChecker.LanguageLevel getXsltLanguageLevel(@NotNull PsiFile psiFile) {
         final CachedValuesManager mgr = CachedValuesManager.getManager(psiFile.getProject());
         return mgr.getParameterizedCachedValue(psiFile, FORCE_XSLT_KEY, XsltSupportProvider.INSTANCE, false, psiFile);
     }
diff --git a/plugins/xslt-debugger/src/META-INF/plugin.xml b/plugins/xslt-debugger/src/META-INF/plugin.xml
index c02c972de3da..2670f2b5e4bf 100644
--- a/plugins/xslt-debugger/src/META-INF/plugin.xml
+++ b/plugins/xslt-debugger/src/META-INF/plugin.xml
@@ -20,8 +20,7 @@
   </change-notes>
 
   <extensions defaultExtensionNs="com.intellij">
-    <xdebugger.breakpointType implementation="org.intellij.plugins.xsltDebugger.XsltBreakpointType$V1"/>
-    <xdebugger.breakpointType implementation="org.intellij.plugins.xsltDebugger.XsltBreakpointType$V2"/>
+    <xdebugger.breakpointType implementation="org.intellij.plugins.xsltDebugger.XsltBreakpointType"/>
 
     <programRunner implementation="org.intellij.plugins.xsltDebugger.XsltDebuggerRunner"/>
   </extensions>
diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltBreakpointType.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltBreakpointType.java
index 65fa36c0ee2b..6b3205e94a1f 100644
--- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltBreakpointType.java
+++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltBreakpointType.java
@@ -8,7 +8,10 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
+import com.intellij.xdebugger.XSourcePosition;
 import com.intellij.xdebugger.breakpoints.XBreakpointProperties;
+import com.intellij.xdebugger.breakpoints.XLineBreakpoint;
 import com.intellij.xdebugger.breakpoints.XLineBreakpointType;
 import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
 import com.intellij.xdebugger.ui.DebuggerIcons;
@@ -24,12 +27,13 @@ import javax.swing.*;
 * User: sweinreuter
 * Date: 03.03.11
 */
-public abstract class XsltBreakpointType extends XLineBreakpointType<XBreakpointProperties> {
+public class XsltBreakpointType extends XLineBreakpointType<XBreakpointProperties> {
 
-  private final XsltDebuggerEditorsProvider myMyEditorsProvider = new XsltDebuggerEditorsProvider(getLanguageLevel());
+  private final XsltDebuggerEditorsProvider myMyEditorsProvider1 = new XsltDebuggerEditorsProvider(XsltChecker.LanguageLevel.V1);
+  private final XsltDebuggerEditorsProvider myMyEditorsProvider2 = new XsltDebuggerEditorsProvider(XsltChecker.LanguageLevel.V2);
 
-  protected XsltBreakpointType(final String id) {
-    super(id, "XSLT Breakpoints");
+  public XsltBreakpointType() {
+    super("xslt", "XSLT Breakpoints");
   }
 
   @Override
@@ -45,14 +49,29 @@ public abstract class XsltBreakpointType extends XLineBreakpointType<XBreakpoint
     if (fileType != StdFileTypes.XML || !XsltSupport.isXsltFile(psiFile)) {
       return false;
     }
-    return getLanguageLevel() == XsltSupport.getXsltLanguageLevel(psiFile);
+    return true;
   }
 
-  protected abstract XsltChecker.LanguageLevel getLanguageLevel();
-
   @Override
-  public XDebuggerEditorsProvider getEditorsProvider() {
-    return myMyEditorsProvider;
+  public XDebuggerEditorsProvider getEditorsProvider(@NotNull XLineBreakpoint<XBreakpointProperties> breakpoint, @NotNull Project project) {
+    final XSourcePosition position = breakpoint.getSourcePosition();
+    if (position == null) {
+      return null;
+    }
+
+    final PsiFile file = PsiManager.getInstance(project).findFile(position.getFile());
+    if (file == null) {
+      return null;
+    }
+
+    final XsltChecker.LanguageLevel level = XsltSupport.getXsltLanguageLevel(file);
+    if (level == XsltChecker.LanguageLevel.V1) {
+      return myMyEditorsProvider1;
+    } else if (level == XsltChecker.LanguageLevel.V2) {
+      return myMyEditorsProvider2;
+    }
+
+    return null;
   }
 
   @NotNull
@@ -71,26 +90,4 @@ public abstract class XsltBreakpointType extends XLineBreakpointType<XBreakpoint
   public XBreakpointProperties createBreakpointProperties(@NotNull VirtualFile file, int line) {
     return null;
   }
-
-  public static final class V1 extends XsltBreakpointType {
-    public V1() {
-      super("xslt");
-    }
-
-    @Override
-    protected XsltChecker.LanguageLevel getLanguageLevel() {
-      return XsltChecker.LanguageLevel.V1;
-    }
-  }
-
-  public static final class V2 extends XsltBreakpointType {
-    public V2() {
-      super("xslt2");
-    }
-
-    @Override
-    protected XsltChecker.LanguageLevel getLanguageLevel() {
-      return XsltChecker.LanguageLevel.V2;
-    }
-  }
 }
diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltDebugProcess.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltDebugProcess.java
index c1ed79d8a064..99ffea5b293b 100644
--- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltDebugProcess.java
+++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltDebugProcess.java
@@ -37,8 +37,7 @@ public class XsltDebugProcess extends XDebugProcess implements Disposable {
   private BreakpointManager myBreakpointManager = new BreakpointManagerImpl();
 
   private final XBreakpointHandler<?>[] myXBreakpointHandlers = new XBreakpointHandler<?>[]{
-    new XsltBreakpointHandler(this, XsltBreakpointType.V1.class),
-    new XsltBreakpointHandler(this, XsltBreakpointType.V2.class)
+    new XsltBreakpointHandler(this, XsltBreakpointType.class),
   };
   private XsltDebuggerSession myDebuggerSession;