IDEA project update

Former-commit-id: 55b31ef5

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java

@@ -1007,17 +1007,19 @@ public class ResultSetViewer extends Viewer
     @Override
     public <T> T getAdapter(Class<T> adapter)
     {
-        if (UIUtils.hasFocus(filtersPanel)) {
-            T result = filtersPanel.getAdapter(adapter);
-            if (result != null) {
-                return result;
-            }
-        } else if (UIUtils.hasFocus(panelFolder)) {
-            IResultSetPanel visiblePanel = getVisiblePanel();
-            if (visiblePanel instanceof IAdaptable) {
-                T adapted = ((IAdaptable) visiblePanel).getAdapter(adapter);
-                if (adapted != null) {
-                    return adapted;
+        if (UIUtils.isUIThread()) {
+            if (UIUtils.hasFocus(filtersPanel)) {
+                T result = filtersPanel.getAdapter(adapter);
+                if (result != null) {
+                    return result;
+                }
+            } else if (UIUtils.hasFocus(panelFolder)) {
+                IResultSetPanel visiblePanel = getVisiblePanel();
+                if (visiblePanel instanceof IAdaptable) {
+                    T adapted = ((IAdaptable) visiblePanel).getAdapter(adapter);
+                    if (adapted != null) {
+                        return adapted;
+                    }
                 }
             }
         }

plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/UIUtils.java

@@ -1100,6 +1100,10 @@ public class UIUtils {
         }
     }
 
+    public static boolean isUIThread() {
+        return Display.getDefault().getThread() == Thread.currentThread();
+    }
+
     /**
      * Determine whether this control or any of it's child has focus
      *