MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

do not replace default xdebugger icons with the same icons in java breakpoints, this also speeds up gutter icon repaint when enabling/disabling a breakpoint

Browse Source
This commit is contained in:
Egor.Ushakov
2016-03-29 17:11:04 +03:00
parent cf0432f876
commit 6045ea45eb
4 changed files with 13 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointWithHighlighter.java
+3 -1
View File
@@ -79,7 +79,9 @@ public abstract class BreakpointWithHighlighter<P extends JavaBreakpointProperti
protected abstract Icon getInvalidIcon(boolean isMuted);
protected abstract Icon getSetIcon(boolean isMuted);
protected Icon getSetIcon(boolean isMuted) {
return null;
}
protected abstract Icon getVerifiedIcon(boolean isMuted);
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpoint.java
+3 -11
View File
@@ -84,18 +84,10 @@ public class FieldBreakpoint extends BreakpointWithHighlighter<JavaFieldBreakpoi
@Override
protected Icon getDisabledIcon(boolean isMuted) {
final Breakpoint master = DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().findMasterBreakpoint(this);
if (isMuted) {
return master == null? AllIcons.Debugger.Db_muted_disabled_field_breakpoint : AllIcons.Debugger.Db_muted_dep_field_breakpoint;
if (DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().findMasterBreakpoint(this) != null) {
return isMuted ? AllIcons.Debugger.Db_muted_dep_field_breakpoint : AllIcons.Debugger.Db_dep_field_breakpoint;
}
else {
return master == null? AllIcons.Debugger.Db_disabled_field_breakpoint : AllIcons.Debugger.Db_dep_field_breakpoint;
}
}
@Override
protected Icon getSetIcon(boolean isMuted) {
return isMuted? AllIcons.Debugger.Db_muted_field_breakpoint : AllIcons.Debugger.Db_field_breakpoint;
return null;
}
@Override
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java
+3 -14
View File
@@ -81,21 +81,10 @@ public class LineBreakpoint<P extends JavaBreakpointProperties> extends Breakpoi
@Override
protected Icon getDisabledIcon(boolean isMuted) {
final Breakpoint master = DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().findMasterBreakpoint(this);
if (isMuted) {
return master == null? AllIcons.Debugger.Db_muted_disabled_breakpoint : AllIcons.Debugger.Db_muted_dep_line_breakpoint;
if (DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().findMasterBreakpoint(this) != null) {
return isMuted ? AllIcons.Debugger.Db_muted_dep_line_breakpoint : AllIcons.Debugger.Db_dep_line_breakpoint;
}
else {
return master == null? AllIcons.Debugger.Db_disabled_breakpoint : AllIcons.Debugger.Db_dep_line_breakpoint;
}
}
@Override
protected Icon getSetIcon(boolean isMuted) {
if (isRemoveAfterHit()) {
return isMuted ? AllIcons.Debugger.Db_muted_temporary_breakpoint : AllIcons.Debugger.Db_temporary_breakpoint;
}
return isMuted? AllIcons.Debugger.Db_muted_breakpoint : AllIcons.Debugger.Db_set_breakpoint;
return null;
}
@Override
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
+4 -12
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -216,20 +216,12 @@ public class MethodBreakpoint extends BreakpointWithHighlighter<JavaMethodBreakp
return getPsiClass();
}
@NotNull
protected Icon getDisabledIcon(boolean isMuted) {
final Breakpoint master = DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().findMasterBreakpoint(this);
if (isMuted) {
return master == null? AllIcons.Debugger.Db_muted_disabled_method_breakpoint : AllIcons.Debugger.Db_muted_dep_method_breakpoint;
if (master != null) {
return isMuted ? AllIcons.Debugger.Db_muted_dep_method_breakpoint : AllIcons.Debugger.Db_dep_method_breakpoint;
}
else {
return master == null? AllIcons.Debugger.Db_disabled_method_breakpoint : AllIcons.Debugger.Db_dep_method_breakpoint;
}
}
@NotNull
protected Icon getSetIcon(boolean isMuted) {
return isMuted? AllIcons.Debugger.Db_muted_method_breakpoint : AllIcons.Debugger.Db_method_breakpoint;
return null;
}
@NotNull