From e8c8835cfb5b45f5916d45b8ed4455ae2ce4d3e8 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Mon, 7 Oct 2013 10:11:36 +0400
Subject: [PATCH] xdebugger: method renamed

---
 .../xdebugger/breakpoints/XBreakpointType.java | 11 +++++++++++
 .../xdebugger/impl/XDebugSessionImpl.java      | 18 +++++++++---------
 .../impl/breakpoints/XBreakpointBase.java      |  6 +++---
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XBreakpointType.java b/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XBreakpointType.java
index fe797fbdb429..74bc38e37439 100644
--- a/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XBreakpointType.java
+++ b/platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XBreakpointType.java
@@ -103,6 +103,17 @@ public abstract class XBreakpointType<B extends XBreakpoint<P>, P extends XBreak
     return AllIcons.Debugger.Db_disabled_breakpoint;
   }
 
+  /**
+   * @return the icon which is shown for a dependent breakpoint until its master breakpoint is reached
+   */
+  @NotNull
+  public Icon getInactiveDependentIcon() {
+    return getDisabledDependentIcon();
+  }
+
+  /**
+   * @deprecated override {@link #getInactiveDependentIcon()} instead
+   */
   @NotNull
   public Icon getDisabledDependentIcon() {
     return AllIcons.Debugger.Db_dep_line_breakpoint;
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
index a6ccd1c3272b..905e7f92b6d2 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
@@ -81,7 +81,7 @@ public class XDebugSessionImpl implements XDebugSession {
   private XDebugProcess myDebugProcess;
   private final Map<XBreakpoint<?>, CustomizedBreakpointPresentation> myRegisteredBreakpoints =
     new HashMap<XBreakpoint<?>, CustomizedBreakpointPresentation>();
-  private final Set<XBreakpoint<?>> myDisabledSlaveBreakpoints = new HashSet<XBreakpoint<?>>();
+  private final Set<XBreakpoint<?>> myInactiveSlaveBreakpoints = new HashSet<XBreakpoint<?>>();
   private boolean myBreakpointsMuted;
   private boolean myBreakpointsDisabled;
   private final XDebuggerManagerImpl myDebuggerManager;
@@ -296,7 +296,7 @@ public class XDebugSessionImpl implements XDebugSession {
     }
     for (XBreakpoint<?> slaveBreakpoint : slaveBreakpoints) {
       if (breakpointTypes.contains(slaveBreakpoint.getType())) {
-        myDisabledSlaveBreakpoints.add(slaveBreakpoint);
+        myInactiveSlaveBreakpoints.add(slaveBreakpoint);
       }
     }
   }
@@ -378,7 +378,7 @@ public class XDebugSessionImpl implements XDebugSession {
   }
 
   private boolean isBreakpointActive(final XBreakpoint<?> b) {
-    return !myBreakpointsMuted && b.isEnabled() && !myDisabledSlaveBreakpoints.contains(b);
+    return !myBreakpointsMuted && b.isEnabled() && !myInactiveSlaveBreakpoints.contains(b);
   }
 
   @Override
@@ -677,13 +677,13 @@ public class XDebugSessionImpl implements XDebugSession {
     if (!dependentBreakpointManager.isMasterOrSlave(breakpoint)) return;
 
     List<XBreakpoint<?>> breakpoints = dependentBreakpointManager.getSlaveBreakpoints(breakpoint);
-    myDisabledSlaveBreakpoints.removeAll(breakpoints);
+    myInactiveSlaveBreakpoints.removeAll(breakpoints);
     for (XBreakpoint<?> slaveBreakpoint : breakpoints) {
       processAllHandlers(slaveBreakpoint, true);
     }
 
     if (dependentBreakpointManager.getMasterBreakpoint(breakpoint) != null && !dependentBreakpointManager.isLeaveEnabled(breakpoint)) {
-      boolean added = myDisabledSlaveBreakpoints.add(breakpoint);
+      boolean added = myInactiveSlaveBreakpoints.add(breakpoint);
       if (added) {
         processAllHandlers(breakpoint, false);
         myDebuggerManager.getBreakpointManager().getLineBreakpointManager().queueBreakpointUpdate(breakpoint);
@@ -776,8 +776,8 @@ public class XDebugSessionImpl implements XDebugSession {
     myDispatcher.getMulticaster().sessionStopped();
   }
 
-  public boolean isDisabledSlaveBreakpoint(final XBreakpoint<?> breakpoint) {
-    return myDisabledSlaveBreakpoints.contains(breakpoint);
+  public boolean isInactiveSlaveBreakpoint(final XBreakpoint<?> breakpoint) {
+    return myInactiveSlaveBreakpoints.contains(breakpoint);
   }
 
   @Override
@@ -837,7 +837,7 @@ public class XDebugSessionImpl implements XDebugSession {
   private class MyDependentBreakpointListener implements XDependentBreakpointListener {
     @Override
     public void dependencySet(final XBreakpoint<?> slave, final XBreakpoint<?> master) {
-      boolean added = myDisabledSlaveBreakpoints.add(slave);
+      boolean added = myInactiveSlaveBreakpoints.add(slave);
       if (added) {
         processAllHandlers(slave, false);
       }
@@ -845,7 +845,7 @@ public class XDebugSessionImpl implements XDebugSession {
 
     @Override
     public void dependencyCleared(final XBreakpoint<?> breakpoint) {
-      boolean removed = myDisabledSlaveBreakpoints.remove(breakpoint);
+      boolean removed = myInactiveSlaveBreakpoints.remove(breakpoint);
       if (removed) {
         processAllHandlers(breakpoint, true);
       }
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointBase.java
index fe2bfea10f00..6722c38841be 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointBase.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointBase.java
@@ -284,15 +284,15 @@ public class XBreakpointBase<Self extends XBreakpoint<P>, P extends XBreakpointP
     XDebugSessionImpl session = getBreakpointManager().getDebuggerManager().getCurrentSession();
     if (session == null) {
       if (getBreakpointManager().getDependentBreakpointManager().getMasterBreakpoint(this) != null) {
-        return getType().getDisabledDependentIcon();
+        return getType().getInactiveDependentIcon();
       }
     }
     else {
       if (session.areBreakpointsMuted()) {
         return AllIcons.Debugger.Db_muted_breakpoint;
       }
-      if (session.isDisabledSlaveBreakpoint(this)) {
-        return getType().getDisabledDependentIcon();
+      if (session.isInactiveSlaveBreakpoint(this)) {
+        return getType().getInactiveDependentIcon();
       }
       CustomizedBreakpointPresentation presentation = session.getBreakpointPresentation(this);
       if (presentation != null) {