From 1320c8008268ec268d5d91d7258a6a35e122ab8d Mon Sep 17 00:00:00 2001
From: Yvan <Yvan@fanruan.com>
Date: Tue, 24 Nov 2020 10:18:04 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-6188=20=E4=BF=AE=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8BdoInBackground()=E6=96=B9=E6=B3=95=E4=B8=8Edone()?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=B9=8B=E9=97=B4=E4=BC=A0=E9=80=92=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E7=9A=84=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datapane/connect/DatabaseConnectionPane.java | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
index 3ef5aa8f85..b90fc7f372 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
@@ -131,16 +131,13 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         public void actionPerformed(ActionEvent evt) {
 
             // Try the java connection.
-            final SwingWorker connectionThread = new SwingWorker() {
+            final SwingWorker<Boolean, Void> connectionThread = new SwingWorker<>() {
                 @Override
-                protected Object doInBackground() throws Exception {
+                protected Boolean doInBackground() throws Exception {
                     try {
                         Connection database = DatabaseConnectionPane.this.updateBean();
-                        boolean connect = DataOperator.getInstance().testConnection(database);
-                        Map<String, Object> map = new HashMap<>();
-                        map.put("database", database);
-                        map.put("connect", connect);
-                        return map;
+                        // 返回连接结果
+                        return DataOperator.getInstance().testConnection(database);
                     } catch (Exception exp) {
                         FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
                     }
@@ -150,11 +147,8 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                 @Override
                 protected void done() {
                     try {
-                        Map<String, Object> map = (Map<String, Object>) get();
-                        Connection database = (Connection) map.get("database");
-                        boolean connect = (boolean) map.get("connect");
+                        boolean connect = get();
                         okButton.setEnabled(true);
-                        message.setText(database.connectMessage(connect));
                         if (connect) {
                             uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon"));
                             message.setText(Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));