From 0b5d9ac6854a9a20fb427dd866c5a522b21ac3d8 Mon Sep 17 00:00:00 2001 From: zjz1993 <1429595365@qq.com> Date: Tue, 27 Aug 2019 15:43:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=92=88=E5=AF=B9pr=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E8=BF=9B=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/design/DesignKit.java | 23 ------------------- .../api/design/ui/component/BasicPane.java | 8 +++++++ .../ui/component/ParameterTableModel.java | 4 ++++ .../design/ui/component/UIIntNumberField.java | 5 ++++ .../ui/component/UITableEditAction.java | 13 +++++++++++ .../api/design/ui/component/UpdateAction.java | 8 +++++++ .../java/com/fanruan/api/util/GeneralKit.java | 23 ------------------- src/main/java/com/fanruan/api/xml/XmlKit.java | 13 ----------- .../api/xml/xml/component/XMLFileManager.java | 18 +++++++++++++++ 9 files changed, 56 insertions(+), 59 deletions(-) create mode 100644 src/main/java/com/fanruan/api/design/ui/component/BasicPane.java create mode 100644 src/main/java/com/fanruan/api/design/ui/component/ParameterTableModel.java create mode 100644 src/main/java/com/fanruan/api/design/ui/component/UIIntNumberField.java create mode 100644 src/main/java/com/fanruan/api/design/ui/component/UITableEditAction.java create mode 100644 src/main/java/com/fanruan/api/design/ui/component/UpdateAction.java create mode 100644 src/main/java/com/fanruan/api/xml/xml/component/XMLFileManager.java diff --git a/src/main/java/com/fanruan/api/design/DesignKit.java b/src/main/java/com/fanruan/api/design/DesignKit.java index 212a761..491586b 100644 --- a/src/main/java/com/fanruan/api/design/DesignKit.java +++ b/src/main/java/com/fanruan/api/design/DesignKit.java @@ -10,10 +10,6 @@ import java.awt.*; import java.awt.event.ActionEvent; public class DesignKit { - public static class UpdateAction extends com.fr.design.actions.UpdateAction{ - @Override - public void actionPerformed(ActionEvent evt) {} - } /** * 直接预览数据集，没有实际值及显示值 * @param tableData 数据集 @@ -21,25 +17,6 @@ public class DesignKit { public static void previewTableData(TableData tableData){ PreviewTablePane.previewTableData(tableData, -1, -1); } - public static class ParameterTableModel extends com.fr.design.gui.itableeditorpane.ParameterTableModel{ - - } - public static class UITableEditAction extends com.fr.design.gui.itableeditorpane.UITableEditAction{ - @Override - public void checkEnabled() { - } - @Override - public void actionPerformed(ActionEvent e) { - - } - - } - public static class BasicPane extends com.fr.design.dialog.BasicPane{ - @Override - protected String title4PopupWindow() { - return ""; - } - } /** * 标题布局 * @param components 组件 diff --git a/src/main/java/com/fanruan/api/design/ui/component/BasicPane.java b/src/main/java/com/fanruan/api/design/ui/component/BasicPane.java new file mode 100644 index 0000000..fcf02a3 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/component/BasicPane.java @@ -0,0 +1,8 @@ +package com.fanruan.api.design.ui.component; + +public class BasicPane extends com.fr.design.dialog.BasicPane{ + @Override + protected String title4PopupWindow() { + return ""; + } +} diff --git a/src/main/java/com/fanruan/api/design/ui/component/ParameterTableModel.java b/src/main/java/com/fanruan/api/design/ui/component/ParameterTableModel.java new file mode 100644 index 0000000..15166ee --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/component/ParameterTableModel.java @@ -0,0 +1,4 @@ +package com.fanruan.api.design.ui.component; + +public class ParameterTableModel extends com.fr.design.gui.itableeditorpane.ParameterTableModel{ +} diff --git a/src/main/java/com/fanruan/api/design/ui/component/UIIntNumberField.java b/src/main/java/com/fanruan/api/design/ui/component/UIIntNumberField.java new file mode 100644 index 0000000..3b759e8 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/component/UIIntNumberField.java @@ -0,0 +1,5 @@ +package com.fanruan.api.design.ui.component; + +public class UIIntNumberField extends com.fr.design.gui.itextfield.UIIntNumberField{ + +} diff --git a/src/main/java/com/fanruan/api/design/ui/component/UITableEditAction.java b/src/main/java/com/fanruan/api/design/ui/component/UITableEditAction.java new file mode 100644 index 0000000..86d5af3 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/component/UITableEditAction.java @@ -0,0 +1,13 @@ +package com.fanruan.api.design.ui.component; + +import java.awt.event.ActionEvent; + +public class UITableEditAction extends com.fr.design.gui.itableeditorpane.UITableEditAction{ + @Override + public void checkEnabled() { + } + @Override + public void actionPerformed(ActionEvent e) { + + } +} diff --git a/src/main/java/com/fanruan/api/design/ui/component/UpdateAction.java b/src/main/java/com/fanruan/api/design/ui/component/UpdateAction.java new file mode 100644 index 0000000..2c8fc33 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/component/UpdateAction.java @@ -0,0 +1,8 @@ +package com.fanruan.api.design.ui.component; + +import java.awt.event.ActionEvent; + +public class UpdateAction extends com.fr.design.actions.UpdateAction{ + @Override + public void actionPerformed(ActionEvent evt) {} +} diff --git a/src/main/java/com/fanruan/api/util/GeneralKit.java b/src/main/java/com/fanruan/api/util/GeneralKit.java index fa0fd44..99950e2 100644 --- a/src/main/java/com/fanruan/api/util/GeneralKit.java +++ b/src/main/java/com/fanruan/api/util/GeneralKit.java @@ -15,29 +15,6 @@ import java.util.Map; * Created by richie on 2019-08-09 */ public class GeneralKit { - /** - * 返回多个属性合并计算的哈希值 - * @param args 对象列表 - * @return 哈希值 - */ - public static int hashCode(Object... args) { - return Objects.hashCode(args); - } - /** - * 判断两个对象是否相等 - * @param source 对象1 - * @param des 对象2 - * @return 如果两个对象相等，则返回true，否则返回false - */ - public static boolean equals(Object source, Object des) { - if (source == null && des == null) { - return true; - } else if (source == null) { - return false; - } else { - return source!=null && source.equals(des); - } - } /** * 返回系统的首选MAC地址 * diff --git a/src/main/java/com/fanruan/api/xml/XmlKit.java b/src/main/java/com/fanruan/api/xml/XmlKit.java index bea0a76..548b788 100644 --- a/src/main/java/com/fanruan/api/xml/XmlKit.java +++ b/src/main/java/com/fanruan/api/xml/XmlKit.java @@ -14,19 +14,6 @@ public class XmlKit { * @param inputStream xml输入流 * */ - public static class XMLFileManager extends com.fr.file.XMLFileManager { - @Override - public String fileName() { - return ""; - } - @Override - public void writeXML(XMLPrintWriter writer) { - - } - @Override - public void readXML(XMLableReader reader) { - } - } public static void readInputStreamXML(XMLReadable xmlReadable, InputStream inputStream) throws Exception { XMLTools.readInputStreamXML(xmlReadable, inputStream); } diff --git a/src/main/java/com/fanruan/api/xml/xml/component/XMLFileManager.java b/src/main/java/com/fanruan/api/xml/xml/component/XMLFileManager.java new file mode 100644 index 0000000..3939c89 --- /dev/null +++ b/src/main/java/com/fanruan/api/xml/xml/component/XMLFileManager.java @@ -0,0 +1,18 @@ +package com.fanruan.api.xml.xml.component; + +import com.fr.stable.xml.XMLPrintWriter; +import com.fr.stable.xml.XMLableReader; + +public class XMLFileManager extends com.fr.file.XMLFileManager { + @Override + public String fileName() { + return ""; + } + @Override + public void writeXML(XMLPrintWriter writer) { + + } + @Override + public void readXML(XMLableReader reader) { + } +}