From 99454064dd1d169f3bfcd7e82adce8a448f2143c Mon Sep 17 00:00:00 2001
From: "andrey.zaytsev" <andrey.zaytsev@jetbrains.com>
Date: Thu, 31 May 2012 20:20:20 +0400
Subject: [PATCH] AnyExceptionBreakpoint properties and category fixed

---
 .../ui/XBreakpointGroupingByCategoryRule.java         | 11 +++++++++--
 .../ui/breakpoints/AnyExceptionBreakpointFactory.java |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/XBreakpointGroupingByCategoryRule.java b/java/debugger/impl/src/com/intellij/debugger/ui/XBreakpointGroupingByCategoryRule.java
index 7b8fe5d4b767..f3cf9b9d5eb8 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/XBreakpointGroupingByCategoryRule.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/XBreakpointGroupingByCategoryRule.java
@@ -15,8 +15,11 @@
  */
 package com.intellij.debugger.ui;
 
+import com.intellij.debugger.ui.breakpoints.AnyExceptionBreakpoint;
 import com.intellij.debugger.ui.breakpoints.Breakpoint;
 import com.intellij.debugger.ui.breakpoints.BreakpointFactory;
+import com.intellij.debugger.ui.breakpoints.ExceptionBreakpoint;
+import com.intellij.openapi.util.Key;
 import com.intellij.xdebugger.breakpoints.ui.XBreakpointGroupingRule;
 import org.jetbrains.annotations.NotNull;
 
@@ -36,12 +39,16 @@ class XBreakpointGroupingByCategoryRule<B> extends XBreakpointGroupingRule<B, XB
   public XBreakpointCategoryGroup getGroup(@NotNull B b, @NotNull Collection<XBreakpointCategoryGroup> groups) {
     if (b instanceof Breakpoint) {
       final Breakpoint breakpoint = (Breakpoint)b;
+      Key<? extends Breakpoint> category = breakpoint.getCategory();
+      if (category.equals(AnyExceptionBreakpoint.ANY_EXCEPTION_BREAKPOINT)) {
+        category = ExceptionBreakpoint.CATEGORY;
+      }
       for (XBreakpointCategoryGroup group : groups) {
-        if (group.getCategory().equals(breakpoint.getCategory())) {
+        if (group.getCategory().equals(category)) {
           return group;
         }
       }
-      final BreakpointFactory factory = BreakpointFactory.getInstance(breakpoint.getCategory());
+      final BreakpointFactory factory = BreakpointFactory.getInstance(category);
       if (factory != null) {
         return new XBreakpointCategoryGroup(factory);
       }
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AnyExceptionBreakpointFactory.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AnyExceptionBreakpointFactory.java
index 69e72b01342e..617ae160efa6 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AnyExceptionBreakpointFactory.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AnyExceptionBreakpointFactory.java
@@ -54,7 +54,7 @@ public class AnyExceptionBreakpointFactory extends BreakpointFactory{
 
   @Override
   public BreakpointPropertiesPanel createBreakpointPropertiesPanel(Project project, boolean compact) {
-    return null;  //To change body of implemented methods use File | Settings | File Templates.
+    return new ExceptionBreakpointPropertiesPanel(project, compact);
   }
 
   @Override