From c3e1eca726685a431cb87bb997e3b18f627acd05 Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Thu, 29 Aug 2019 16:39:10 +0800 Subject: [PATCH 01/11] =?UTF-8?q?feat:=20ui=E7=BB=84=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 24 +++++++++++++ .../com/fanruan/api/data/ConnectionKit.java | 16 +++++++++ .../com/fanruan/api/database/DatabaseKit.java | 26 ++++++++++++++ .../nameDatabase/NameDatabaseConnection.java | 4 +++ .../ui/component/UIDescriptionTextArea.java | 4 +++ .../api/design/ui/component/UIToolbar.java | 17 +++++++++ .../design/ui/container/BasicBeanPane.java | 4 +++ .../api/design/ui/container/BasicDialog.java | 36 +++++++++++++++++++ .../ui/container/ConnectionComboBoxPanel.java | 9 +++++ .../ui/container/DatabaseConnectionPane.java | 7 ++++ .../ui/container/DialogActionAdapter.java | 8 +++++ .../api/design/ui/container/SQLEditPane.java | 11 ++++++ .../fanruan/api/design/ui/editor/Editor.java | 5 +++ .../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 | 26 +++++++++++--- 17 files changed, 206 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/fanruan/api/data/ConnectionKit.java create mode 100644 src/main/java/com/fanruan/api/database/DatabaseKit.java create mode 100644 src/main/java/com/fanruan/api/database/nameDatabase/NameDatabaseConnection.java create mode 100644 src/main/java/com/fanruan/api/design/ui/component/UIDescriptionTextArea.java create mode 100644 src/main/java/com/fanruan/api/design/ui/component/UIToolbar.java create mode 100644 src/main/java/com/fanruan/api/design/ui/container/BasicBeanPane.java create mode 100644 src/main/java/com/fanruan/api/design/ui/container/BasicDialog.java create mode 100644 src/main/java/com/fanruan/api/design/ui/container/ConnectionComboBoxPanel.java create mode 100644 src/main/java/com/fanruan/api/design/ui/container/DatabaseConnectionPane.java create mode 100644 src/main/java/com/fanruan/api/design/ui/container/DialogActionAdapter.java create mode 100644 src/main/java/com/fanruan/api/design/ui/container/SQLEditPane.java create mode 100644 src/main/java/com/fanruan/api/design/ui/editor/Editor.java create mode 100644 src/main/java/com/fanruan/api/redis/RedisKit.java create mode 100644 src/main/java/com/fanruan/api/redis/pool/JedisPool.java create mode 100644 src/main/java/com/fanruan/api/redis/pool/JedisPoolConfig.java diff --git a/pom.xml b/pom.xml index 10510ae..61f3b48 100644 --- a/pom.xml +++ b/pom.xml @@ -168,4 +168,28 @@ + + + fanruan + fanruan + http://mvn.finedevelop.com/repository/maven-public/ + + true + always + warn + + + + + + fanruan + fanruan + http://mvn.finedevelop.com/repository/maven-public/ + + true + always + warn + + + \ No newline at end of file diff --git a/src/main/java/com/fanruan/api/data/ConnectionKit.java b/src/main/java/com/fanruan/api/data/ConnectionKit.java new file mode 100644 index 0000000..e670505 --- /dev/null +++ b/src/main/java/com/fanruan/api/data/ConnectionKit.java @@ -0,0 +1,16 @@ +package com.fanruan.api.data; +import com.fr.data.impl.Connection; +import com.fr.file.DatasourceManager; + +public class ConnectionKit { + /** + * 获取指定名字和指定类型的数据连接 + * @param name 数据连接的名字 + * @param type 类型 + * @return 数据连接 + * + */ + public T getConnection(String name, Class type) { + return DatasourceManager.getInstance().getConnection(name, type); + } +} diff --git a/src/main/java/com/fanruan/api/database/DatabaseKit.java b/src/main/java/com/fanruan/api/database/DatabaseKit.java new file mode 100644 index 0000000..387e46f --- /dev/null +++ b/src/main/java/com/fanruan/api/database/DatabaseKit.java @@ -0,0 +1,26 @@ +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/database/nameDatabase/NameDatabaseConnection.java b/src/main/java/com/fanruan/api/database/nameDatabase/NameDatabaseConnection.java new file mode 100644 index 0000000..6a4a23e --- /dev/null +++ b/src/main/java/com/fanruan/api/database/nameDatabase/NameDatabaseConnection.java @@ -0,0 +1,4 @@ +package com.fanruan.api.database.nameDatabase; + +public class NameDatabaseConnection extends com.fr.data.impl.NameDatabaseConnection{ +} diff --git a/src/main/java/com/fanruan/api/design/ui/component/UIDescriptionTextArea.java b/src/main/java/com/fanruan/api/design/ui/component/UIDescriptionTextArea.java new file mode 100644 index 0000000..9cf38e8 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/component/UIDescriptionTextArea.java @@ -0,0 +1,4 @@ +package com.fanruan.api.design.ui.component; + +public class UIDescriptionTextArea extends com.fr.design.gui.itextarea.DescriptionTextArea{ +} diff --git a/src/main/java/com/fanruan/api/design/ui/component/UIToolbar.java b/src/main/java/com/fanruan/api/design/ui/component/UIToolbar.java new file mode 100644 index 0000000..8d73e6d --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/component/UIToolbar.java @@ -0,0 +1,17 @@ +package com.fanruan.api.design.ui.component; + +import com.fr.design.gui.itoolbar.UIToolBarUI; + +public class UIToolbar extends com.fr.design.gui.itoolbar.UIToolbar{ + public UIToolbar(){ + + } + + public UIToolbar(int align) { + super(align); + } + + public UIToolbar(int align, UIToolBarUI uiToolBarUI) { + super(align, uiToolBarUI); + } +} diff --git a/src/main/java/com/fanruan/api/design/ui/container/BasicBeanPane.java b/src/main/java/com/fanruan/api/design/ui/container/BasicBeanPane.java new file mode 100644 index 0000000..ec72cbf --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/container/BasicBeanPane.java @@ -0,0 +1,4 @@ +package com.fanruan.api.design.ui.container; + +public abstract class BasicBeanPane extends com.fr.design.beans.BasicBeanPane{ +} diff --git a/src/main/java/com/fanruan/api/design/ui/container/BasicDialog.java b/src/main/java/com/fanruan/api/design/ui/container/BasicDialog.java new file mode 100644 index 0000000..5a65107 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/container/BasicDialog.java @@ -0,0 +1,36 @@ +package com.fanruan.api.design.ui.container; + +import com.fanruan.api.design.ui.container.BasicPane; + +import java.awt.*; + +public class BasicDialog extends com.fr.design.dialog.BasicDialog{ + public BasicDialog(Dialog parent){ + super(parent); + } + + public BasicDialog(Dialog parent, BasicPane pane){ + super(parent, pane); + } + + public BasicDialog(Dialog parent, BasicPane pane, boolean isNeedButton){ + super(parent, pane, isNeedButton); + } + + public BasicDialog(Frame parent){ + super(parent); + } + + public BasicDialog(Frame parent, BasicPane pane){ + super(parent, pane); + } + + public BasicDialog(Frame parent, BasicPane pane, boolean isNedButtonPane){ + super(parent, pane, isNedButtonPane); + } + + @Override + public void checkValid(){ + + } +} diff --git a/src/main/java/com/fanruan/api/design/ui/container/ConnectionComboBoxPanel.java b/src/main/java/com/fanruan/api/design/ui/container/ConnectionComboBoxPanel.java new file mode 100644 index 0000000..f37bc44 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/container/ConnectionComboBoxPanel.java @@ -0,0 +1,9 @@ +package com.fanruan.api.design.ui.container; + +import com.fr.data.impl.Connection; + +public class ConnectionComboBoxPanel extends com.fr.design.data.datapane.connect.ConnectionComboBoxPanel{ + public ConnectionComboBoxPanel(Class cls) { + super(cls); + } +} diff --git a/src/main/java/com/fanruan/api/design/ui/container/DatabaseConnectionPane.java b/src/main/java/com/fanruan/api/design/ui/container/DatabaseConnectionPane.java new file mode 100644 index 0000000..15282d8 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/container/DatabaseConnectionPane.java @@ -0,0 +1,7 @@ +package com.fanruan.api.design.ui.container; + + +import javax.swing.*; +public abstract class DatabaseConnectionPane extends com.fr.design.data.datapane.connect.DatabaseConnectionPane{ + +} diff --git a/src/main/java/com/fanruan/api/design/ui/container/DialogActionAdapter.java b/src/main/java/com/fanruan/api/design/ui/container/DialogActionAdapter.java new file mode 100644 index 0000000..c7a5db5 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/container/DialogActionAdapter.java @@ -0,0 +1,8 @@ +package com.fanruan.api.design.ui.container; +import com.fr.design.layout.FRGUIPaneFactory; + +public class DialogActionAdapter extends com.fr.design.dialog.DialogActionAdapter{ + public DialogActionAdapter(){ + + } +} 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 new file mode 100644 index 0000000..32677bf --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/container/SQLEditPane.java @@ -0,0 +1,11 @@ +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 new file mode 100644 index 0000000..7ac8f68 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/editor/Editor.java @@ -0,0 +1,5 @@ +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/redis/RedisKit.java b/src/main/java/com/fanruan/api/redis/RedisKit.java new file mode 100644 index 0000000..3a53b5d --- /dev/null +++ b/src/main/java/com/fanruan/api/redis/RedisKit.java @@ -0,0 +1,4 @@ +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 new file mode 100644 index 0000000..72cf69e --- /dev/null +++ b/src/main/java/com/fanruan/api/redis/pool/JedisPool.java @@ -0,0 +1,4 @@ +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 new file mode 100644 index 0000000..ae57a51 --- /dev/null +++ b/src/main/java/com/fanruan/api/redis/pool/JedisPoolConfig.java @@ -0,0 +1,5 @@ +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 548b788..610eb5f 100644 --- a/src/main/java/com/fanruan/api/xml/XmlKit.java +++ b/src/main/java/com/fanruan/api/xml/XmlKit.java @@ -1,9 +1,7 @@ package com.fanruan.api.xml; -import com.fr.stable.xml.XMLReadable; -import com.fr.stable.xml.XMLTools; -import com.fr.stable.xml.XMLableReader; -import com.fr.stable.xml.XMLPrintWriter; +import com.fr.stable.xml.*; +import com.fr.general.xml.GeneralXMLTools; import java.io.InputStream; @@ -17,4 +15,24 @@ public class XmlKit { public static void readInputStreamXML(XMLReadable xmlReadable, InputStream inputStream) throws Exception { XMLTools.readInputStreamXML(xmlReadable, inputStream); } + /** + * 从输入源中读取xml + * @param reader 输入源 + * @return xml文件 + * + */ + public static XMLable readXMLable(XMLableReader reader) { + return GeneralXMLTools.readXMLable(reader); + } + /** + * 写XMLable + * @param writer 输出源 + * @param xml xml文件 + * @param tagName 标签名 + * @return 节点名 + * + */ + public static void writeXMLable(XMLPrintWriter writer, XMLable xml, String tagName) { + GeneralXMLTools.writeXMLable(writer, xml, tagName); + } } 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 02/11] =?UTF-8?q?feat:=20=E4=BE=9D=E7=85=A7pr=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=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); + } } From 9462a4b3cb543ea109c6cd1c9298ec341c19e046 Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Thu, 29 Aug 2019 18:22:42 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fanruan/api/xml/XmlKit.java | 56 ++++++++----------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/fanruan/api/xml/XmlKit.java b/src/main/java/com/fanruan/api/xml/XmlKit.java index a9edb7f..c416cfa 100644 --- a/src/main/java/com/fanruan/api/xml/XmlKit.java +++ b/src/main/java/com/fanruan/api/xml/XmlKit.java @@ -1,57 +1,47 @@ 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; +import com.fr.stable.xml.XMLPrintWriter; +import com.fr.stable.xml.XMLReadable; +import com.fr.stable.xml.XMLTools; +import com.fr.stable.xml.XMLable; +import com.fr.stable.xml.XMLableReader; import java.io.InputStream; +/** + * xml读写相关类 + */ public class XmlKit { /** * 从输入流中读取对象 - * @param xmlReadable xml读取对象 - * @param inputStream xml输入流 * + * @param read xml读取对象 + * @param in xml输入流 */ - public static void readInputStreamXML(XMLReadable xmlReadable, InputStream inputStream) throws Exception { - XMLTools.readInputStreamXML(xmlReadable, inputStream); + public static void readInputStreamXML(XMLReadable read, InputStream in) throws Exception { + XMLTools.readInputStreamXML(read, in); } + + /** - * 从输入源中读取xml - * @param reader 输入源 - * @return xml文件 + * 将xml读取为具体的java对象 * + * @param reader xml读取器 + * @return java对象 */ public static XMLable readXMLable(XMLableReader reader) { return GeneralXMLTools.readXMLable(reader); } + /** - * 写XMLable - * @param writer 输出源 - * @param xml xml文件 - * @param tagName 标签名 - * @return 节点名 + * 将java对象写为xml文件 * + * @param writer xml写入器 + * @param xml 实际java对象 + * @param tagName xml标签名 */ 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); - } -} +} \ No newline at end of file From 9389b5a552331734891491a85f6554e8f9069f76 Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Thu, 29 Aug 2019 18:27:17 +0800 Subject: [PATCH 04/11] =?UTF-8?q?feat:=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fanruan/api/xml/XmlKit.java | 37 +++++++------------ 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/fanruan/api/xml/XmlKit.java b/src/main/java/com/fanruan/api/xml/XmlKit.java index c416cfa..610eb5f 100644 --- a/src/main/java/com/fanruan/api/xml/XmlKit.java +++ b/src/main/java/com/fanruan/api/xml/XmlKit.java @@ -1,47 +1,38 @@ package com.fanruan.api.xml; +import com.fr.stable.xml.*; import com.fr.general.xml.GeneralXMLTools; -import com.fr.stable.xml.XMLPrintWriter; -import com.fr.stable.xml.XMLReadable; -import com.fr.stable.xml.XMLTools; -import com.fr.stable.xml.XMLable; -import com.fr.stable.xml.XMLableReader; import java.io.InputStream; -/** - * xml读写相关类 - */ public class XmlKit { /** * 从输入流中读取对象 + * @param xmlReadable xml读取对象 + * @param inputStream xml输入流 * - * @param read xml读取对象 - * @param in xml输入流 */ - public static void readInputStreamXML(XMLReadable read, InputStream in) throws Exception { - XMLTools.readInputStreamXML(read, in); + public static void readInputStreamXML(XMLReadable xmlReadable, InputStream inputStream) throws Exception { + XMLTools.readInputStreamXML(xmlReadable, inputStream); } - - /** - * 将xml读取为具体的java对象 + * 从输入源中读取xml + * @param reader 输入源 + * @return xml文件 * - * @param reader xml读取器 - * @return java对象 */ public static XMLable readXMLable(XMLableReader reader) { return GeneralXMLTools.readXMLable(reader); } - /** - * 将java对象写为xml文件 + * 写XMLable + * @param writer 输出源 + * @param xml xml文件 + * @param tagName 标签名 + * @return 节点名 * - * @param writer xml写入器 - * @param xml 实际java对象 - * @param tagName xml标签名 */ public static void writeXMLable(XMLPrintWriter writer, XMLable xml, String tagName) { GeneralXMLTools.writeXMLable(writer, xml, tagName); } -} \ No newline at end of file +} From 49a9c4f5d45272b60652b2e1040c08bd15d9bd2d Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Thu, 29 Aug 2019 18:31:41 +0800 Subject: [PATCH 05/11] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0xmlkit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fanruan/api/xml/XmlKit.java | 39 ++++++++++++------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/fanruan/api/xml/XmlKit.java b/src/main/java/com/fanruan/api/xml/XmlKit.java index 610eb5f..e8fb413 100644 --- a/src/main/java/com/fanruan/api/xml/XmlKit.java +++ b/src/main/java/com/fanruan/api/xml/XmlKit.java @@ -1,38 +1,49 @@ package com.fanruan.api.xml; -import com.fr.stable.xml.*; import com.fr.general.xml.GeneralXMLTools; +import com.fr.stable.xml.XMLPrintWriter; +import com.fr.stable.xml.XMLReadable; +import com.fr.stable.xml.XMLTools; +import com.fr.stable.xml.XMLable; +import com.fr.stable.xml.XMLableReader; import java.io.InputStream; +/** + * xml读写相关类 + */ public class XmlKit { /** * 从输入流中读取对象 - * @param xmlReadable xml读取对象 - * @param inputStream xml输入流 * + * @param read xml读取对象 + * @param in xml输入流 */ - public static void readInputStreamXML(XMLReadable xmlReadable, InputStream inputStream) throws Exception { - XMLTools.readInputStreamXML(xmlReadable, inputStream); + public static void readInputStreamXML(XMLReadable read, InputStream in) throws Exception { + XMLTools.readInputStreamXML(read, in); } + + /** - * 从输入源中读取xml - * @param reader 输入源 - * @return xml文件 + * 将xml读取为具体的java对象 * + * @param reader xml读取器 + * @return java对象 */ public static XMLable readXMLable(XMLableReader reader) { return GeneralXMLTools.readXMLable(reader); } + /** - * 写XMLable - * @param writer 输出源 - * @param xml xml文件 - * @param tagName 标签名 - * @return 节点名 + * 将java对象写为xml文件 * + * @param writer xml写入器 + * @param xml 实际java对象 + * @param tagName xml标签名 */ public static void writeXMLable(XMLPrintWriter writer, XMLable xml, String tagName) { GeneralXMLTools.writeXMLable(writer, xml, tagName); } -} + + +} \ No newline at end of file From dc8d8da047f6d279958a2caefee38169eb9d6c43 Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Thu, 29 Aug 2019 18:33:20 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fanruan/api/xml/XmlKit.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/fanruan/api/xml/XmlKit.java b/src/main/java/com/fanruan/api/xml/XmlKit.java index e8fb413..c416cfa 100644 --- a/src/main/java/com/fanruan/api/xml/XmlKit.java +++ b/src/main/java/com/fanruan/api/xml/XmlKit.java @@ -44,6 +44,4 @@ public class XmlKit { public static void writeXMLable(XMLPrintWriter writer, XMLable xml, String tagName) { GeneralXMLTools.writeXMLable(writer, xml, tagName); } - - } \ No newline at end of file From c37f23a5605ed2c6932aa75dffa710cb4f0b5a5f Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Thu, 29 Aug 2019 19:04:18 +0800 Subject: [PATCH 07/11] update --- src/main/java/com/fanruan/api/xml/XmlKit.java | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/fanruan/api/xml/XmlKit.java b/src/main/java/com/fanruan/api/xml/XmlKit.java index c416cfa..066747d 100644 --- a/src/main/java/com/fanruan/api/xml/XmlKit.java +++ b/src/main/java/com/fanruan/api/xml/XmlKit.java @@ -6,42 +6,46 @@ import com.fr.stable.xml.XMLReadable; import com.fr.stable.xml.XMLTools; import com.fr.stable.xml.XMLable; import com.fr.stable.xml.XMLableReader; +import com.fr.stable.xml.*; +import com.fr.general.xml.GeneralXMLTools; import java.io.InputStream; -/** - * xml读写相关类 - */ public class XmlKit { /** * 从输入流中读取对象 + * @param xmlReadable xml读取对象 + * @param inputStream xml输入流 + * + */ + /** + * 将java对象写为xml文件 * - * @param read xml读取对象 - * @param in xml输入流 + * @param writer xml写入器 + * @param xml 实际java对象 + * @param tagName xml标签名 */ - public static void readInputStreamXML(XMLReadable read, InputStream in) throws Exception { - XMLTools.readInputStreamXML(read, in); + public static void readInputStreamXML(XMLReadable xmlReadable, InputStream inputStream) throws Exception { + XMLTools.readInputStreamXML(xmlReadable, inputStream); } - - /** - * 将xml读取为具体的java对象 + * 从输入源中读取xml + * @param reader 输入源 + * @return xml文件 * - * @param reader xml读取器 - * @return java对象 */ public static XMLable readXMLable(XMLableReader reader) { return GeneralXMLTools.readXMLable(reader); } - /** - * 将java对象写为xml文件 + * 写XMLable + * @param writer 输出源 + * @param xml xml文件 + * @param tagName 标签名 + * @return 节点名 * - * @param writer xml写入器 - * @param xml 实际java对象 - * @param tagName xml标签名 */ public static void writeXMLable(XMLPrintWriter writer, XMLable xml, String tagName) { GeneralXMLTools.writeXMLable(writer, xml, tagName); } -} \ No newline at end of file +} From d29966bf31105a2100ea9d7a223cf194b011d72f Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Thu, 29 Aug 2019 19:09:33 +0800 Subject: [PATCH 08/11] update --- src/main/java/com/fanruan/api/xml/XmlKit.java | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/fanruan/api/xml/XmlKit.java b/src/main/java/com/fanruan/api/xml/XmlKit.java index 066747d..d472ac4 100644 --- a/src/main/java/com/fanruan/api/xml/XmlKit.java +++ b/src/main/java/com/fanruan/api/xml/XmlKit.java @@ -6,18 +6,38 @@ import com.fr.stable.xml.XMLReadable; import com.fr.stable.xml.XMLTools; import com.fr.stable.xml.XMLable; import com.fr.stable.xml.XMLableReader; + import com.fr.stable.xml.*; import com.fr.general.xml.GeneralXMLTools; + import java.io.InputStream; +/** + * xml读写相关类 + */ public class XmlKit { /** * 从输入流中读取对象 - * @param xmlReadable xml读取对象 - * @param inputStream xml输入流 * + XMLTools.readInputStreamXML(read, in); + } + + + /** + * 将xml读取为具体的java对象 + * + * @param reader xml读取器 + * @return java对象 */ + + + /** + * 将java对象写为xml文件 + * + * @param writer xml写入器 + * @param xml 实际java对象 + * @param tagName xml标签名 /** * 将java对象写为xml文件 * @@ -48,4 +68,7 @@ public class XmlKit { public static void writeXMLable(XMLPrintWriter writer, XMLable xml, String tagName) { GeneralXMLTools.writeXMLable(writer, xml, tagName); } -} + + + +} \ No newline at end of file From 3d0bb235a45002a82d8be3f1177fc407c37ddcdb Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Thu, 29 Aug 2019 19:13:49 +0800 Subject: [PATCH 09/11] update --- .../database/{nameDatabase => }/NameDatabaseConnection.java | 2 +- .../java/com/fanruan/api/design/ui/component/UIToolbar.java | 3 --- src/main/java/com/fanruan/api/xml/XmlKit.java | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) rename src/main/java/com/fanruan/api/database/{nameDatabase => }/NameDatabaseConnection.java (65%) diff --git a/src/main/java/com/fanruan/api/database/nameDatabase/NameDatabaseConnection.java b/src/main/java/com/fanruan/api/database/NameDatabaseConnection.java similarity index 65% rename from src/main/java/com/fanruan/api/database/nameDatabase/NameDatabaseConnection.java rename to src/main/java/com/fanruan/api/database/NameDatabaseConnection.java index 6a4a23e..287f81b 100644 --- a/src/main/java/com/fanruan/api/database/nameDatabase/NameDatabaseConnection.java +++ b/src/main/java/com/fanruan/api/database/NameDatabaseConnection.java @@ -1,4 +1,4 @@ -package com.fanruan.api.database.nameDatabase; +package com.fanruan.api.database; public class NameDatabaseConnection extends com.fr.data.impl.NameDatabaseConnection{ } diff --git a/src/main/java/com/fanruan/api/design/ui/component/UIToolbar.java b/src/main/java/com/fanruan/api/design/ui/component/UIToolbar.java index 8d73e6d..ddd8efb 100644 --- a/src/main/java/com/fanruan/api/design/ui/component/UIToolbar.java +++ b/src/main/java/com/fanruan/api/design/ui/component/UIToolbar.java @@ -11,7 +11,4 @@ public class UIToolbar extends com.fr.design.gui.itoolbar.UIToolbar{ super(align); } - public UIToolbar(int align, UIToolBarUI uiToolBarUI) { - super(align, uiToolBarUI); - } } diff --git a/src/main/java/com/fanruan/api/xml/XmlKit.java b/src/main/java/com/fanruan/api/xml/XmlKit.java index d472ac4..03bd282 100644 --- a/src/main/java/com/fanruan/api/xml/XmlKit.java +++ b/src/main/java/com/fanruan/api/xml/XmlKit.java @@ -30,7 +30,7 @@ public class XmlKit { * @param reader xml读取器 * @return java对象 */ - + /** * 将java对象写为xml文件 From 1e2b1445cf0b0e004c5e94f8c5e6bef059e1c573 Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Thu, 29 Aug 2019 19:15:19 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{database => data/connection}/NameDatabaseConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/main/java/com/fanruan/api/{database => data/connection}/NameDatabaseConnection.java (68%) diff --git a/src/main/java/com/fanruan/api/database/NameDatabaseConnection.java b/src/main/java/com/fanruan/api/data/connection/NameDatabaseConnection.java similarity index 68% rename from src/main/java/com/fanruan/api/database/NameDatabaseConnection.java rename to src/main/java/com/fanruan/api/data/connection/NameDatabaseConnection.java index 287f81b..408e9e8 100644 --- a/src/main/java/com/fanruan/api/database/NameDatabaseConnection.java +++ b/src/main/java/com/fanruan/api/data/connection/NameDatabaseConnection.java @@ -1,4 +1,4 @@ -package com.fanruan.api.database; +package com.fanruan.api.data.connection; public class NameDatabaseConnection extends com.fr.data.impl.NameDatabaseConnection{ } From 3d0f568ed223c82684f5d49b3bccd5fdd5892095 Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Thu, 29 Aug 2019 19:20:31 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E8=A6=86=E7=9B=96xmlkit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fanruan/api/xml/XmlKit.java | 47 +++++-------------- 1 file changed, 11 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/fanruan/api/xml/XmlKit.java b/src/main/java/com/fanruan/api/xml/XmlKit.java index 03bd282..37efb56 100644 --- a/src/main/java/com/fanruan/api/xml/XmlKit.java +++ b/src/main/java/com/fanruan/api/xml/XmlKit.java @@ -7,10 +7,6 @@ import com.fr.stable.xml.XMLTools; import com.fr.stable.xml.XMLable; import com.fr.stable.xml.XMLableReader; -import com.fr.stable.xml.*; -import com.fr.general.xml.GeneralXMLTools; - - import java.io.InputStream; /** @@ -20,24 +16,24 @@ public class XmlKit { /** * 从输入流中读取对象 * - XMLTools.readInputStreamXML(read, in); - } + * @param read xml读取对象 + * @param in xml输入流 + */ + public static void readInputStreamXML(XMLReadable read, InputStream in) throws Exception { + XMLTools.readInputStreamXML(read, in); + } - /** + /** * 将xml读取为具体的java对象 * * @param reader xml读取器 * @return java对象 */ - + public static XMLable readXMLable(XMLableReader reader) { + return GeneralXMLTools.readXMLable(reader); + } - /** - * 将java对象写为xml文件 - * - * @param writer xml写入器 - * @param xml 实际java对象 - * @param tagName xml标签名 /** * 将java对象写为xml文件 * @@ -45,30 +41,9 @@ public class XmlKit { * @param xml 实际java对象 * @param tagName xml标签名 */ - public static void readInputStreamXML(XMLReadable xmlReadable, InputStream inputStream) throws Exception { - XMLTools.readInputStreamXML(xmlReadable, inputStream); - } - /** - * 从输入源中读取xml - * @param reader 输入源 - * @return xml文件 - * - */ - public static XMLable readXMLable(XMLableReader reader) { - return GeneralXMLTools.readXMLable(reader); - } - /** - * 写XMLable - * @param writer 输出源 - * @param xml xml文件 - * @param tagName 标签名 - * @return 节点名 - * - */ public static void writeXMLable(XMLPrintWriter writer, XMLable xml, String tagName) { GeneralXMLTools.writeXMLable(writer, xml, tagName); } - -} \ No newline at end of file +}