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

fix for EDT assertion in SimpleDataContext

Browse Source
This commit is contained in:
Kirill Kalishev
2011-11-15 22:43:15 +03:00
parent c9a3882bfe
commit bb2e5fd938
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/SimpleDataContext.java
+2 -5
View File
@@ -29,13 +29,10 @@ public class SimpleDataContext implements DataContext {
private final Map<String, Object> myDataId2Data;
private final DataContext myParent;
private WeakReference<Component> myContextComponent;
private SimpleDataContext(String dataId, Object data, DataContext parent) {
myDataId2Data = new HashMap<String, Object>(1);
myDataId2Data.put(dataId, data);
myParent = parent;
myContextComponent = new WeakReference<Component>(IdeFocusManager.getGlobalInstance().getFocusOwner());
}
private SimpleDataContext(Map<String, Object> dataid2data, DataContext parent) {
@@ -48,9 +45,9 @@ public class SimpleDataContext implements DataContext {
myParent == null ? null : myParent.getData(dataId);
if (result == null && PlatformDataKeys.CONTEXT_COMPONENT.getName().equals(dataId)) {
result = myContextComponent.get();
result = IdeFocusManager.getGlobalInstance().getFocusOwner();
}
return result;
}