From 5fedc4240eea4e3941bb4efcddd35c7c198713d8 Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Thu, 29 Aug 2019 18:17:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BE=9D=E7=85=A7pr=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fanruan/api/database/DatabaseKit.java | 26 ------------------- .../api/design/ui/container/SQLEditPane.java | 11 -------- .../fanruan/api/design/ui/editor/Editor.java | 5 ---- .../ConnectionComboBoxPanel.java | 2 +- .../DatabaseConnectionPane.java | 2 +- .../java/com/fanruan/api/redis/RedisKit.java | 4 --- .../com/fanruan/api/redis/pool/JedisPool.java | 4 --- .../api/redis/pool/JedisPoolConfig.java | 5 ---- src/main/java/com/fanruan/api/xml/XmlKit.java | 19 ++++++++++++++ 9 files changed, 21 insertions(+), 57 deletions(-) delete mode 100644 src/main/java/com/fanruan/api/database/DatabaseKit.java delete mode 100644 src/main/java/com/fanruan/api/design/ui/container/SQLEditPane.java delete mode 100644 src/main/java/com/fanruan/api/design/ui/editor/Editor.java rename src/main/java/com/fanruan/api/design/{ui/container => work}/ConnectionComboBoxPanel.java (84%) rename src/main/java/com/fanruan/api/design/{ui/container => work}/DatabaseConnectionPane.java (75%) delete mode 100644 src/main/java/com/fanruan/api/redis/RedisKit.java delete mode 100644 src/main/java/com/fanruan/api/redis/pool/JedisPool.java delete mode 100644 src/main/java/com/fanruan/api/redis/pool/JedisPoolConfig.java diff --git a/src/main/java/com/fanruan/api/database/DatabaseKit.java b/src/main/java/com/fanruan/api/database/DatabaseKit.java deleted file mode 100644 index 387e46f..0000000 --- a/src/main/java/com/fanruan/api/database/DatabaseKit.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.fanruan.api.database; -import com.fr.data.core.DataCoreXmlUtils; -import com.fr.data.impl.Connection; -import com.fr.stable.xml.XMLPrintWriter; -import com.fr.stable.xml.XMLableReader; -import com.fr.file.DatasourceManager; - -public class DatabaseKit { - /** - * 读取connection对象 - * @param reader XMLableReader对象 - * @return Connection对象 - * - */ - public static Connection readXMLConnectionMap(XMLableReader reader) { - return DataCoreXmlUtils.readXMLConnectionMap(reader); - } - /** - * 写connection对象 - * @param writer XMLPrintWriter对象 - * @param connection Connection对象 - */ - public static void writeXMLConnection(XMLPrintWriter writer, Connection connection) { - DataCoreXmlUtils.writeXMLConnection(writer, connection); - } -} diff --git a/src/main/java/com/fanruan/api/design/ui/container/SQLEditPane.java b/src/main/java/com/fanruan/api/design/ui/container/SQLEditPane.java deleted file mode 100644 index 32677bf..0000000 --- a/src/main/java/com/fanruan/api/design/ui/container/SQLEditPane.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.fanruan.api.design.ui.container; - -public class SQLEditPane extends com.fr.design.data.datapane.sqlpane.SQLEditPane{ - public SQLEditPane(){ - - } - - public SQLEditPane(boolean requestDroptarget) { - super(requestDroptarget); - } -} diff --git a/src/main/java/com/fanruan/api/design/ui/editor/Editor.java b/src/main/java/com/fanruan/api/design/ui/editor/Editor.java deleted file mode 100644 index 7ac8f68..0000000 --- a/src/main/java/com/fanruan/api/design/ui/editor/Editor.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.fanruan.api.design.ui.editor; - -public abstract class Editor extends com.fr.design.editor.editor.Editor{ - -} diff --git a/src/main/java/com/fanruan/api/design/ui/container/ConnectionComboBoxPanel.java b/src/main/java/com/fanruan/api/design/work/ConnectionComboBoxPanel.java similarity index 84% rename from src/main/java/com/fanruan/api/design/ui/container/ConnectionComboBoxPanel.java rename to src/main/java/com/fanruan/api/design/work/ConnectionComboBoxPanel.java index f37bc44..9e3228b 100644 --- a/src/main/java/com/fanruan/api/design/ui/container/ConnectionComboBoxPanel.java +++ b/src/main/java/com/fanruan/api/design/work/ConnectionComboBoxPanel.java @@ -1,4 +1,4 @@ -package com.fanruan.api.design.ui.container; +package com.fanruan.api.design.work; import com.fr.data.impl.Connection; diff --git a/src/main/java/com/fanruan/api/design/ui/container/DatabaseConnectionPane.java b/src/main/java/com/fanruan/api/design/work/DatabaseConnectionPane.java similarity index 75% rename from src/main/java/com/fanruan/api/design/ui/container/DatabaseConnectionPane.java rename to src/main/java/com/fanruan/api/design/work/DatabaseConnectionPane.java index 15282d8..0c5eaf9 100644 --- a/src/main/java/com/fanruan/api/design/ui/container/DatabaseConnectionPane.java +++ b/src/main/java/com/fanruan/api/design/work/DatabaseConnectionPane.java @@ -1,4 +1,4 @@ -package com.fanruan.api.design.ui.container; +package com.fanruan.api.design.work; import javax.swing.*; diff --git a/src/main/java/com/fanruan/api/redis/RedisKit.java b/src/main/java/com/fanruan/api/redis/RedisKit.java deleted file mode 100644 index 3a53b5d..0000000 --- a/src/main/java/com/fanruan/api/redis/RedisKit.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.fanruan.api.redis; - -public class RedisKit { -} diff --git a/src/main/java/com/fanruan/api/redis/pool/JedisPool.java b/src/main/java/com/fanruan/api/redis/pool/JedisPool.java deleted file mode 100644 index 72cf69e..0000000 --- a/src/main/java/com/fanruan/api/redis/pool/JedisPool.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.fanruan.api.redis.pool; - -public class JedisPool extends com.fr.third.redis.clients.jedis.JedisPool{ -} diff --git a/src/main/java/com/fanruan/api/redis/pool/JedisPoolConfig.java b/src/main/java/com/fanruan/api/redis/pool/JedisPoolConfig.java deleted file mode 100644 index ae57a51..0000000 --- a/src/main/java/com/fanruan/api/redis/pool/JedisPoolConfig.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.fanruan.api.redis.pool; -import com.fr.ssh.jsch.Session; - -public class JedisPoolConfig extends com.fr.third.redis.clients.jedis.JedisPoolConfig{ -} diff --git a/src/main/java/com/fanruan/api/xml/XmlKit.java b/src/main/java/com/fanruan/api/xml/XmlKit.java index 610eb5f..a9edb7f 100644 --- a/src/main/java/com/fanruan/api/xml/XmlKit.java +++ b/src/main/java/com/fanruan/api/xml/XmlKit.java @@ -1,5 +1,7 @@ package com.fanruan.api.xml; +import com.fr.data.core.DataCoreXmlUtils; +import com.fr.data.impl.Connection; import com.fr.stable.xml.*; import com.fr.general.xml.GeneralXMLTools; @@ -35,4 +37,21 @@ public class XmlKit { public static void writeXMLable(XMLPrintWriter writer, XMLable xml, String tagName) { GeneralXMLTools.writeXMLable(writer, xml, tagName); } + /** + * 读取connection对象 + * @param reader XMLableReader对象 + * @return Connection对象 + * + */ + public static Connection readXMLConnectionMap(XMLableReader reader) { + return DataCoreXmlUtils.readXMLConnectionMap(reader); + } + /** + * 写connection对象 + * @param writer XMLPrintWriter对象 + * @param connection Connection对象 + */ + public static void writeXMLConnection(XMLPrintWriter writer, Connection connection) { + DataCoreXmlUtils.writeXMLConnection(writer, connection); + } }