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

IDEA-156761 'Show watches in variables tab' button moves to Server tab

Browse Source
This commit is contained in:
Egor.Ushakov
2016-05-31 13:08:12 +03:00
parent d86754db74
commit 8ae75b60f4
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
+13 -7
View File
@@ -330,6 +330,7 @@ public class XDebugSessionTab extends DebuggerSessionTabBase {
addVariablesAndWatches(mySession);
attachViewToSession(mySession, myViews.get(DebuggerContentInfo.VARIABLES_CONTENT));
attachViewToSession(mySession, myViews.get(DebuggerContentInfo.WATCHES_CONTENT));
myUi.selectAndFocus(myUi.findContent(DebuggerContentInfo.VARIABLES_CONTENT), true, false);
rebuildViews();
}
}
@@ -340,13 +341,7 @@ public class XDebugSessionTab extends DebuggerSessionTabBase {
if (tab != null) {
tab.toFront(false, null);
// restore watches tab if minimized
JComponent component = tab.getUi().getComponent();
if (component instanceof DataProvider) {
RunnerContentUi ui = RunnerContentUi.KEY.getData(((DataProvider)component));
if (ui != null) {
ui.restoreContent(tab.getWatchesContentId());
}
}
tab.restoreContent(tab.getWatchesContentId());
}
}
@@ -394,10 +389,21 @@ public class XDebugSessionTab extends DebuggerSessionTabBase {
}
private void removeContent(String contentId) {
restoreContent(contentId); //findContent returns null if content is minimized
myUi.removeContent(myUi.findContent(contentId), true);
XDebugView view = myViews.remove(contentId);
if (view != null) {
Disposer.dispose(view);
}
}
private void restoreContent(String contentId) {
JComponent component = myUi.getComponent();
if (component instanceof DataProvider) {
RunnerContentUi ui = RunnerContentUi.KEY.getData(((DataProvider)component));
if (ui != null) {
ui.restoreContent(contentId);
}
}
}
}