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

EA-35806 fix assert edt

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-05-11 15:28:46 +04:00
parent be1af58c9a
commit a4b045f6f3
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/run/AndroidRunningState.java
+21 -10
View File
@@ -662,20 +662,31 @@ public abstract class AndroidRunningState implements RunProfileState, AndroidDeb
}
}
protected static void clearLogcatAndConsole(@NotNull Project project, @NotNull IDevice device) {
final ToolWindow toolWindow = ToolWindowManager.getInstance(project).getToolWindow(AndroidLogcatToolWindowFactory.TOOL_WINDOW_ID);
if (toolWindow == null) {
return;
}
protected static void clearLogcatAndConsole(@NotNull final Project project, @NotNull final IDevice device) {
final boolean[] result = {true};
for (Content content : toolWindow.getContentManager().getContents()) {
final AndroidLogcatToolWindowView view = content.getUserData(AndroidLogcatToolWindowView.ANDROID_LOGCAT_VIEW_KEY);
ApplicationManager.getApplication().invokeAndWait(new Runnable() {
@Override
public void run() {
final ToolWindow toolWindow = ToolWindowManager.getInstance(project).getToolWindow(AndroidLogcatToolWindowFactory.TOOL_WINDOW_ID);
if (toolWindow == null) {
result[0] = false;
return;
}
if (view != null && device == view.getSelectedDevice()) {
view.getLogConsole().clear();
for (Content content : toolWindow.getContentManager().getContents()) {
final AndroidLogcatToolWindowView view = content.getUserData(AndroidLogcatToolWindowView.ANDROID_LOGCAT_VIEW_KEY);
if (view != null && device == view.getSelectedDevice()) {
view.getLogConsole().clear();
}
}
}
}, ModalityState.defaultModalityState());
if (result[0]) {
AndroidLogcatUtil.clearLogcat(project, device);
}
AndroidLogcatUtil.clearLogcat(project, device);
}
@NotNull