diff --git a/python-impl/src/main/java/com/jetbrains/python/impl/debugger/PyExceptionBreakpointType.java b/python-impl/src/main/java/com/jetbrains/python/impl/debugger/PyExceptionBreakpointType.java index ca449db2..bc4bbfe8 100644 --- a/python-impl/src/main/java/com/jetbrains/python/impl/debugger/PyExceptionBreakpointType.java +++ b/python-impl/src/main/java/com/jetbrains/python/impl/debugger/PyExceptionBreakpointType.java @@ -21,7 +21,6 @@ import com.jetbrains.python.impl.psi.stubs.PyClassNameIndex; import com.jetbrains.python.psi.PyClass; import consulo.annotation.component.ExtensionImpl; -import consulo.application.AllIcons; import consulo.application.ApplicationManager; import consulo.application.WriteAction; import consulo.application.util.function.Computable; @@ -184,11 +183,10 @@ private static PyExceptionBreakpointProperties createDefaultBreakpointProperties } @Override - public XBreakpointCustomPropertiesPanel<XBreakpoint<PyExceptionBreakpointProperties>> createCustomPropertiesPanel() { + public XBreakpointCustomPropertiesPanel<XBreakpoint<PyExceptionBreakpointProperties>> createCustomPropertiesPanel(Project project) { return new PyExceptionBreakpointPropertiesPanel(); } - private static class PyExceptionBreakpointPropertiesPanel extends XBreakpointCustomPropertiesPanel<XBreakpoint<PyExceptionBreakpointProperties>> { private JCheckBox myNotifyOnTerminateCheckBox; diff --git a/python-impl/src/main/java/com/jetbrains/python/impl/debugger/PyStackFrame.java b/python-impl/src/main/java/com/jetbrains/python/impl/debugger/PyStackFrame.java index f61d6bc8..e5ab84b8 100644 --- a/python-impl/src/main/java/com/jetbrains/python/impl/debugger/PyStackFrame.java +++ b/python-impl/src/main/java/com/jetbrains/python/impl/debugger/PyStackFrame.java @@ -22,7 +22,6 @@ import com.jetbrains.python.debugger.PyStackFrameInfo; import com.jetbrains.python.impl.PythonIcons; import com.jetbrains.python.impl.debugger.settings.PyDebuggerSettings; -import consulo.application.AllIcons; import consulo.application.ApplicationManager; import consulo.application.ReadAction; import consulo.document.Document; @@ -30,9 +29,9 @@ import consulo.execution.debug.XSourcePosition; import consulo.execution.debug.evaluation.XDebuggerEvaluator; import consulo.execution.debug.frame.*; +import consulo.execution.debug.icon.ExecutionDebugIconGroup; import consulo.logging.Logger; import consulo.module.content.ProjectRootManager; -import consulo.platform.base.icon.PlatformIconGroup; import consulo.project.Project; import consulo.ui.ex.ColoredTextContainer; import consulo.ui.ex.SimpleTextAttributes; @@ -215,7 +214,7 @@ public void computeChildren(@Nonnull XCompositeNode node) { @Nullable @Override public Image getIcon() { - return AllIcons.Debugger.WatchLastReturnValue; + return ExecutionDebugIconGroup.nodeMethodlevelwatch(); } }); node.addChildren(XValueChildrenList.topGroups(group), true);