Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2019-01-11 12:15:36 -0500
committerEugene Tarassov2019-01-11 12:15:36 -0500
commitdcc027336271b93ccfa4cb175b81e21a1e00c3eb (patch)
tree42be1ded44ba87f5a036bb38518c80efb2517618
parentb89d1f9d7a3464e46d3c5b76dffd59f561ff43e4 (diff)
downloadorg.eclipse.tcf-dcc027336271b93ccfa4cb175b81e21a1e00c3eb.tar.gz
org.eclipse.tcf-dcc027336271b93ccfa4cb175b81e21a1e00c3eb.tar.xz
org.eclipse.tcf-dcc027336271b93ccfa4cb175b81e21a1e00c3eb.zip
TCF Debugger: fixed: annotations update can block GUI for long time
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFAnnotationManager.java18
1 files changed, 4 insertions, 14 deletions
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFAnnotationManager.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFAnnotationManager.java
index 9fcad10f2..061ba6148 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFAnnotationManager.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFAnnotationManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2017 Wind River Systems, Inc. and others.
+ * Copyright (c) 2008-2019 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,11 +20,8 @@ import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
@@ -807,16 +804,9 @@ public class TCFAnnotationManager {
if (update_task != win_info.update_task) return;
assert win_info.update_node == node;
win_info.update_task = null;
- try {
- ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- updateAnnotations(window, node, res);
- }
- }, null);
- }
- catch (Exception e) {
- Activator.log(e);
- }
+ // Note: don't call ResourcesPlugin.getWorkspace().run() here,
+ // otherwise display thread is blocked for too long
+ updateAnnotations(window, node, res);
}
});
}

Back to the top