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

correct fix "frames not available"

Browse Source 
This solution should be reviewed and moved to platorfm data manager.
This commit is contained in:
Vladimir Krivosheev
2014-08-14 18:04:23 +02:00
parent 845c022e07
commit c717f89274
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XDebugView.java
+13 -1
View File
@@ -15,8 +15,11 @@
*/
package com.intellij.xdebugger.impl.frame;
import com.intellij.execution.ui.layout.ViewContext;
import com.intellij.ide.DataManager;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.ui.content.ContentManager;
import com.intellij.util.SingleAlarm;
import com.intellij.xdebugger.XDebugSession;
import com.intellij.xdebugger.impl.ui.XDebugSessionTab;
@@ -64,6 +67,15 @@ public abstract class XDebugView implements Disposable {
@Nullable
public static XDebugSession getSession(@NotNull Component component) {
return XDebugSessionTab.SESSION_KEY.getData(DataManager.getInstance().getDataContext(component));
DataContext dataContext = DataManager.getInstance().getDataContext(component);
ViewContext viewContext = ViewContext.CONTEXT_KEY.getData(dataContext);
ContentManager contentManager = viewContext == null ? null : viewContext.getContentManager();
if (contentManager != null) {
XDebugSession session = XDebugSessionTab.SESSION_KEY.getData(DataManager.getInstance().getDataContext(contentManager.getComponent()));
if (session != null) {
return session;
}
}
return XDebugSessionTab.SESSION_KEY.getData(dataContext);
}
}
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
-1
View File
@@ -184,7 +184,6 @@ public class XDebugSessionTab extends DebuggerSessionTabBase {
Content framesContent = myUi.createContent(DebuggerContentInfo.FRAME_CONTENT, framesView.getMainPanel(),
XDebuggerBundle.message("debugger.session.tab.frames.title"), AllIcons.Debugger.Frame, null);
framesContent.setCloseable(false);
DataManager.registerDataProvider(framesView.getMainPanel(), this);
return framesContent;
}