From b3cb4d399c814b67d0232692fe976632dd2dd361 Mon Sep 17 00:00:00 2001
From: richie <richie@fanruan.com>
Date: Fri, 30 Aug 2019 17:48:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/redis/ui/RedisConnectionPane.java      | 21 +++++++++----------
 .../pool/RedisConnectionPoolConfigPane.java   | 13 ++++++------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/fr/plugin/db/redis/ui/RedisConnectionPane.java b/src/main/java/com/fr/plugin/db/redis/ui/RedisConnectionPane.java
index ae7aa89..c559d82 100755
--- a/src/main/java/com/fr/plugin/db/redis/ui/RedisConnectionPane.java
+++ b/src/main/java/com/fr/plugin/db/redis/ui/RedisConnectionPane.java
@@ -1,19 +1,18 @@
 package com.fr.plugin.db.redis.ui;
 
-import com.fr.design.border.UITitledBorder;
-import com.fanruan.api.design.ui.container.DatabaseConnectionPane;
-import com.fanruan.api.design.ui.container.BasicDialog;
-import com.fanruan.api.design.ui.container.DialogActionAdapter;
-import com.fanruan.api.design.ui.component.UIPasswordField;
-import com.fanruan.api.design.component.UIActionLabel;
-import com.fanruan.api.design.ui.component.UILabel;
+import com.fanruan.api.design.DesignKit;
+import com.fanruan.api.design.ui.component.UIActionLabel;
 import com.fanruan.api.design.ui.component.UIIntNumberField;
-import com.fanruan.api.design.ui.component.UINumberField;
+import com.fanruan.api.design.ui.component.UILabel;
+import com.fanruan.api.design.ui.component.UIPasswordField;
 import com.fanruan.api.design.ui.component.UITextField;
-import com.fanruan.api.design.DesignKit;
-import com.fanruan.api.design.util.GUICoreKit;
+import com.fanruan.api.design.ui.container.BasicDialog;
+
+import com.fanruan.api.design.ui.container.DialogActionAdapter;
 import com.fanruan.api.design.ui.layout.TableLayoutKit;
 import com.fanruan.api.design.util.GUICoreKit;
+import com.fr.design.border.UITitledBorder;
+import com.fr.design.data.datapane.connect.DatabaseConnectionPane;
 import com.fr.plugin.db.redis.core.RedisDatabaseConnection;
 import com.fr.plugin.db.redis.core.pool.RedisConnectionPoolConfig;
 import com.fr.plugin.db.redis.core.pool.RedisConnectionProxyConfig;
@@ -28,7 +27,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 
-public class RedisConnectionPane extends DatabaseConnectionPane<com.fr.plugin.db.redis.core.RedisDatabaseConnection> {
+public class RedisConnectionPane extends DatabaseConnectionPane<RedisDatabaseConnection> {
 
     private UITextField hostTextField;
     private UIIntNumberField portNumberField;
diff --git a/src/main/java/com/fr/plugin/db/redis/ui/pool/RedisConnectionPoolConfigPane.java b/src/main/java/com/fr/plugin/db/redis/ui/pool/RedisConnectionPoolConfigPane.java
index af2352c..9c35f0b 100644
--- a/src/main/java/com/fr/plugin/db/redis/ui/pool/RedisConnectionPoolConfigPane.java
+++ b/src/main/java/com/fr/plugin/db/redis/ui/pool/RedisConnectionPoolConfigPane.java
@@ -1,13 +1,12 @@
 package com.fr.plugin.db.redis.ui.pool;
 
-import com.fanruan.api.design.ui.container.BasicPane;
-import com.fanruan.api.layout.TableLayoutKit;
-import com.fanruan.api.design.util.GUICoreKit;
+import com.fanruan.api.design.DesignKit;
 import com.fanruan.api.design.ui.component.UICheckBox;
-import com.fanruan.api.design.ui.component.UILabel;
 import com.fanruan.api.design.ui.component.UIIntNumberField;
+import com.fanruan.api.design.ui.component.UILabel;
 import com.fanruan.api.design.ui.component.UINumberField;
-import com.fanruan.api.design.DesignKit;
+import com.fanruan.api.design.ui.container.BasicPane;
+import com.fanruan.api.design.ui.layout.TableLayoutKit;
 import com.fr.plugin.db.redis.core.pool.RedisConnectionPoolConfig;
 
 import javax.swing.*;
@@ -55,7 +54,7 @@ public class RedisConnectionPoolConfigPane extends BasicPane {
 
         double[] rowSize = new double[]{p, p, p, p, p, p};
         double[] columnSize = new double[]{p, f};
-        add(GUICoreKit.createTableLayoutPane(comps, rowSize, columnSize), BorderLayout.CENTER);
+        add(TableLayoutKit.createTableLayoutPane(comps, rowSize, columnSize), BorderLayout.CENTER);
     }
 
     @Override
@@ -73,7 +72,7 @@ public class RedisConnectionPoolConfigPane extends BasicPane {
     }
 
     public void update(RedisConnectionPoolConfig config) {
-        config.setMaxTotal((int)maxTotalNumberFiled.getValue());
+        config.setMaxTotal((int) maxTotalNumberFiled.getValue());
         config.setMaxWait((int) maxWaitNumberField.getValue());
         config.setMaxIdle((int) maxIdleNumberField.getValue());
         config.setBlockWhenExhausted(blockWhenExhaustedCheckBox.isSelected());