From 3bc58139f8f40d92adbcd73348420df1b27fc977 Mon Sep 17 00:00:00 2001 From: "Mars.Ma" Date: Sat, 7 Sep 2019 08:36:18 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-1198=20=E5=8E=BB=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E4=BF=AE=E6=94=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fanruan/api/data/AbstractDataModel.java | 4 ---- .../api/data/AbstractDatabaseConnection.java | 4 ---- .../api/data/AbstractParameterTableData.java | 4 ---- .../com/fanruan/api/data/TableDataKit.java | 7 ------- .../com/fanruan/api/net/http/EntityKit.java | 21 ------------------- .../net/http/message/BasicNameValuePair.java | 9 -------- .../com/fanruan/api/util/ComparatorKit.java | 15 ------------- src/main/java/com/fanruan/api/xml/XmlKit.java | 7 ++++++- 8 files changed, 6 insertions(+), 65 deletions(-) delete mode 100644 src/main/java/com/fanruan/api/data/AbstractDataModel.java delete mode 100644 src/main/java/com/fanruan/api/data/AbstractDatabaseConnection.java delete mode 100644 src/main/java/com/fanruan/api/data/AbstractParameterTableData.java delete mode 100644 src/main/java/com/fanruan/api/net/http/EntityKit.java delete mode 100644 src/main/java/com/fanruan/api/net/http/message/BasicNameValuePair.java delete mode 100644 src/main/java/com/fanruan/api/util/ComparatorKit.java diff --git a/src/main/java/com/fanruan/api/data/AbstractDataModel.java b/src/main/java/com/fanruan/api/data/AbstractDataModel.java deleted file mode 100644 index 7ee273f..0000000 --- a/src/main/java/com/fanruan/api/data/AbstractDataModel.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.fanruan.api.data; - -public abstract class AbstractDataModel extends com.fr.data.AbstractDataModel { -} diff --git a/src/main/java/com/fanruan/api/data/AbstractDatabaseConnection.java b/src/main/java/com/fanruan/api/data/AbstractDatabaseConnection.java deleted file mode 100644 index 925da74..0000000 --- a/src/main/java/com/fanruan/api/data/AbstractDatabaseConnection.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.fanruan.api.data; - -public abstract class AbstractDatabaseConnection extends com.fr.data.impl.AbstractDatabaseConnection { -} diff --git a/src/main/java/com/fanruan/api/data/AbstractParameterTableData.java b/src/main/java/com/fanruan/api/data/AbstractParameterTableData.java deleted file mode 100644 index 23c1f05..0000000 --- a/src/main/java/com/fanruan/api/data/AbstractParameterTableData.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.fanruan.api.data; - -public abstract class AbstractParameterTableData extends com.fr.data.AbstractParameterTableData { -} diff --git a/src/main/java/com/fanruan/api/data/TableDataKit.java b/src/main/java/com/fanruan/api/data/TableDataKit.java index 90eacfb..955bc32 100644 --- a/src/main/java/com/fanruan/api/data/TableDataKit.java +++ b/src/main/java/com/fanruan/api/data/TableDataKit.java @@ -76,11 +76,4 @@ public class TableDataKit { TableDataConfig.getInstance().renameTableData(oldName, newName); } - /** - * 直接预览数据集，没有实际值和显示值 - * @param tableData 数据集 - */ - public static void previewTableData(TableData tableData) { - PreviewTablePane.previewTableData(tableData); - } } diff --git a/src/main/java/com/fanruan/api/net/http/EntityKit.java b/src/main/java/com/fanruan/api/net/http/EntityKit.java deleted file mode 100644 index d1d7b3f..0000000 --- a/src/main/java/com/fanruan/api/net/http/EntityKit.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.fanruan.api.net.http; - -import com.fr.third.org.apache.http.HttpEntity; -import com.fr.third.org.apache.http.ParseException; -import com.fr.third.org.apache.http.util.EntityUtils; - -import java.io.IOException; - -public class EntityKit { - /** - * 利用defaultCharset字符集将HttpEntity对象转化为String对象 - * @param entity 需要转化为String的HttpEntity对象 - * @param defaultCharset 传入的字符集 - * @return HttpEntity对象转化为的String对象 - * @throws IOException - * @throws ParseException - */ - public static String toString(HttpEntity entity, String defaultCharset) throws IOException, ParseException { - return EntityUtils.toString(entity, defaultCharset); - } -} diff --git a/src/main/java/com/fanruan/api/net/http/message/BasicNameValuePair.java b/src/main/java/com/fanruan/api/net/http/message/BasicNameValuePair.java deleted file mode 100644 index 82ffb80..0000000 --- a/src/main/java/com/fanruan/api/net/http/message/BasicNameValuePair.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.fanruan.api.net.http.message; -/** - * 键值对类 - */ -public class BasicNameValuePair extends com.fr.third.org.apache.http.message.BasicNameValuePair { - public BasicNameValuePair(String name, String value) { - super(name, value); - } -} diff --git a/src/main/java/com/fanruan/api/util/ComparatorKit.java b/src/main/java/com/fanruan/api/util/ComparatorKit.java deleted file mode 100644 index 39fddff..0000000 --- a/src/main/java/com/fanruan/api/util/ComparatorKit.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.fanruan.api.util; - -import com.fr.general.ComparatorUtils; - -public class ComparatorKit { - /** - * 比较两个Object对象是否相等 - * @param object1 第一个Object对象 - * @param object2 第二个Object对象 - * @return 相等返回True 不相等返回False - */ - public static boolean equals(Object object1, Object object2){ - return ComparatorUtils.equals(object1, object2); - } -} diff --git a/src/main/java/com/fanruan/api/xml/XmlKit.java b/src/main/java/com/fanruan/api/xml/XmlKit.java index bcc1ae0..dc2cfc1 100644 --- a/src/main/java/com/fanruan/api/xml/XmlKit.java +++ b/src/main/java/com/fanruan/api/xml/XmlKit.java @@ -4,7 +4,12 @@ import com.fr.data.core.DataCoreXmlUtils; import com.fr.data.impl.Connection; import com.fr.general.xml.GeneralXMLTools; import com.fr.stable.ParameterProvider; -import com.fr.stable.xml.*; +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.XMLPrintWriter; +import com.fr.stable.xml.StableXMLUtils; import java.io.InputStream;