From 3eb3d2a88d5f2700bb3502d40ba54b5cb1717a85 Mon Sep 17 00:00:00 2001
From: richie <richie@fanruan.com>
Date: Tue, 24 Sep 2019 11:17:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...urceConstants.java => DataSourceConstants.java} |  2 +-
 .../api/design/work/AbstractTableDataPane.java     |  4 +++-
 .../fanruan/api/design/work/BaseTableDataPane.java | 14 ++++++++++++++
 .../api/design/work/ConnectionComboBoxPanel.java   |  6 +++---
 4 files changed, 21 insertions(+), 5 deletions(-)
 rename src/main/java/com/fanruan/api/design/macro/{DatasourceConstants.java => DataSourceConstants.java} (87%)
 create mode 100644 src/main/java/com/fanruan/api/design/work/BaseTableDataPane.java

diff --git a/src/main/java/com/fanruan/api/design/macro/DatasourceConstants.java b/src/main/java/com/fanruan/api/design/macro/DataSourceConstants.java
similarity index 87%
rename from src/main/java/com/fanruan/api/design/macro/DatasourceConstants.java
rename to src/main/java/com/fanruan/api/design/macro/DataSourceConstants.java
index 197531e..1d58b74 100644
--- a/src/main/java/com/fanruan/api/design/macro/DatasourceConstants.java
+++ b/src/main/java/com/fanruan/api/design/macro/DataSourceConstants.java
@@ -7,7 +7,7 @@ import com.fr.design.gui.NameInspector;
  * @version 10.0
  * Created by richie on 2019/9/24
  */
-public class DatasourceConstants {
+public class DataSourceConstants {
 
     public static final String ILLEGAL_NAME_HOLDER  = NameInspector.ILLEGAL_NAME_HOLDER;
 }
diff --git a/src/main/java/com/fanruan/api/design/work/AbstractTableDataPane.java b/src/main/java/com/fanruan/api/design/work/AbstractTableDataPane.java
index a0bd87a..ee81180 100644
--- a/src/main/java/com/fanruan/api/design/work/AbstractTableDataPane.java
+++ b/src/main/java/com/fanruan/api/design/work/AbstractTableDataPane.java
@@ -7,6 +7,8 @@ import com.fr.base.TableData;
  * @version 10.0
  * Created by richie on 2019-08-30
  * 数据插件继承此抽象类
+ * @see com.fanruan.api.design.work.BaseTableDataPane
  */
-public abstract class AbstractTableDataPane<T extends TableData>  extends com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane<T> {
+@Deprecated
+public abstract class AbstractTableDataPane<T extends TableData> extends BaseTableDataPane<T> {
 }
diff --git a/src/main/java/com/fanruan/api/design/work/BaseTableDataPane.java b/src/main/java/com/fanruan/api/design/work/BaseTableDataPane.java
new file mode 100644
index 0000000..8120550
--- /dev/null
+++ b/src/main/java/com/fanruan/api/design/work/BaseTableDataPane.java
@@ -0,0 +1,14 @@
+package com.fanruan.api.design.work;
+
+import com.fr.base.TableData;
+import com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane;
+
+/**
+ * @author richie
+ * @version 10.0
+ * Created by richie on 2019/9/24
+ * 数据插件界面实现类，都继承此抽象类
+ */
+public abstract class BaseTableDataPane<T extends TableData> extends AbstractTableDataPane<T> {
+
+}
diff --git a/src/main/java/com/fanruan/api/design/work/ConnectionComboBoxPanel.java b/src/main/java/com/fanruan/api/design/work/ConnectionComboBoxPanel.java
index 36284c6..047e38c 100644
--- a/src/main/java/com/fanruan/api/design/work/ConnectionComboBoxPanel.java
+++ b/src/main/java/com/fanruan/api/design/work/ConnectionComboBoxPanel.java
@@ -4,7 +4,7 @@ import com.fanruan.api.conf.ConfigurationKit;
 import com.fanruan.api.data.ConnectionKit;
 import com.fanruan.api.data.open.BaseConnection;
 import com.fanruan.api.design.DesignKit;
-import com.fanruan.api.design.macro.DatasourceConstants;
+import com.fanruan.api.design.macro.DataSourceConstants;
 import com.fanruan.api.generic.Runner;
 import com.fanruan.api.util.AssistKit;
 import com.fanruan.api.util.StringKit;
@@ -171,8 +171,8 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
 
     private int isConnectionMapContainsRename(ConnectionConfig datasourceManager) {
         Map<String, Connection> tableDataMap = datasourceManager.getConnections();
-        if (tableDataMap.containsKey(DatasourceConstants.ILLEGAL_NAME_HOLDER)) {
-            return datasourceManager.getConnectionIndex(DatasourceConstants.ILLEGAL_NAME_HOLDER);
+        if (tableDataMap.containsKey(DataSourceConstants.ILLEGAL_NAME_HOLDER)) {
+            return datasourceManager.getConnectionIndex(DataSourceConstants.ILLEGAL_NAME_HOLDER);
         }
         return -1;
     }