Script selector panel UI

shaoxh · Feb 10, 2020 · 7977190 · 7977190
1 parent 54b3423
commit 7977190
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/...ver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java b/...ver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/stream/StreamTransferConsumer.java
@@ -261,7 +261,11 @@ private void closeExporter() {
 
         if (processor != null) {
             // Dispose exporter
-            processor.dispose();
+            try {
+                processor.dispose();
+            } catch (Exception e) {
+                log.debug(e);
+            }
             processor = null;
         }
         closeOutputStreams();

diff --git a/...g.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/controls/ScriptSelectorPanel.java b/...g.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/controls/ScriptSelectorPanel.java
@@ -328,7 +328,7 @@ public void keyPressed(KeyEvent e) {
         columns[1].pack();
         columns[2].setWidth(200 * 8);
 
-        scriptTree.setFocus();
+        UIUtils.asyncExec(scriptTree::setFocus);
 
         return composite;
     }

diff --git a/...editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/handlers/SQLEditorHandlerOpenEditor.java b/...editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/handlers/SQLEditorHandlerOpenEditor.java
@@ -181,6 +181,7 @@ private static SQLNavigatorContext getCurrentContext(ExecutionEvent event) throw
                     context.setDataSourceContainer(dataSourceRegistry.getDataSources().get(0));
                 } else if (!dataSourceRegistry.getDataSources().isEmpty()) {
                     SelectDataSourceDialog dialog = new SelectDataSourceDialog(HandlerUtil.getActiveShell(event), project, null);
+                    dialog.setModeless(true);
                     if (dialog.open() == IDialogConstants.CANCEL_ID) {
                         throw new InterruptedException();
                     }

diff --git a/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/dialogs/AbstractPopupPanel.java b/plugins/org.jkiss.dbeaver.ui/src/org/jkiss/dbeaver/ui/dialogs/AbstractPopupPanel.java
@@ -85,13 +85,7 @@ protected void closeOnFocusLost(Control ... controls) {
                 @Override
                 public void focusLost(FocusEvent e) {
                     UIUtils.asyncExec(() -> {
-                        Shell shell = getShell();
-                        if (shell != null) {
-                            Control focusControl = shell.getDisplay().getFocusControl();
-                            if (focusControl != null && !UIUtils.isParent(shell, focusControl)) {
-                                cancelPressed();
-                            }
-                        }
+                        handleFocusLost();
                     });
                 }
             };
@@ -104,4 +98,16 @@ public void focusLost(FocusEvent e) {
 
     }
 
+    private void handleFocusLost() {
+        Shell shell = getShell();
+        if (shell != null) {
+            Control focusControl = shell.getDisplay().getFocusControl();
+            if (focusControl != null && !UIUtils.isParent(shell, focusControl)) {
+                cancelPressed();
+            }
+        } else {
+            cancelPressed();
+        }
+    }
+
 }