From f5d5862ad4b4aca7845578f4173277197c84214f Mon Sep 17 00:00:00 2001 From: richie Date: Tue, 27 Aug 2019 18:25:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A8=8D=E5=BE=AE=E4=B8=80=E4=BA=9B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UITableEditAction.java | 2 +- .../{component => action}/UpdateAction.java | 2 +- .../api/design/ui/component/BasicPane.java | 8 ------ .../ui/component/ParameterTableModel.java | 4 --- .../design/ui/component/UIIntNumberField.java | 2 +- .../api/design/ui/container/BasicPane.java | 5 ++++ .../api/design/ui/editor/ValueEditorPane.java | 25 +++++++++++++++++ .../design/ui/model/ParameterTableModel.java | 28 +++++++++++++++++++ .../{xml => }/component/XMLFileManager.java | 10 +++---- 9 files changed, 65 insertions(+), 21 deletions(-) rename src/main/java/com/fanruan/api/design/ui/{component => action}/UITableEditAction.java (85%) rename src/main/java/com/fanruan/api/design/ui/{component => action}/UpdateAction.java (79%) delete mode 100644 src/main/java/com/fanruan/api/design/ui/component/BasicPane.java delete mode 100644 src/main/java/com/fanruan/api/design/ui/component/ParameterTableModel.java create mode 100644 src/main/java/com/fanruan/api/design/ui/container/BasicPane.java create mode 100644 src/main/java/com/fanruan/api/design/ui/editor/ValueEditorPane.java create mode 100644 src/main/java/com/fanruan/api/design/ui/model/ParameterTableModel.java rename src/main/java/com/fanruan/api/xml/{xml => }/component/XMLFileManager.java (55%) diff --git a/src/main/java/com/fanruan/api/design/ui/component/UITableEditAction.java b/src/main/java/com/fanruan/api/design/ui/action/UITableEditAction.java similarity index 85% rename from src/main/java/com/fanruan/api/design/ui/component/UITableEditAction.java rename to src/main/java/com/fanruan/api/design/ui/action/UITableEditAction.java index 86d5af3..a1894fc 100644 --- a/src/main/java/com/fanruan/api/design/ui/component/UITableEditAction.java +++ b/src/main/java/com/fanruan/api/design/ui/action/UITableEditAction.java @@ -1,4 +1,4 @@ -package com.fanruan.api.design.ui.component; +package com.fanruan.api.design.ui.action; import java.awt.event.ActionEvent; diff --git a/src/main/java/com/fanruan/api/design/ui/component/UpdateAction.java b/src/main/java/com/fanruan/api/design/ui/action/UpdateAction.java similarity index 79% rename from src/main/java/com/fanruan/api/design/ui/component/UpdateAction.java rename to src/main/java/com/fanruan/api/design/ui/action/UpdateAction.java index 2c8fc33..ce788ba 100644 --- a/src/main/java/com/fanruan/api/design/ui/component/UpdateAction.java +++ b/src/main/java/com/fanruan/api/design/ui/action/UpdateAction.java @@ -1,4 +1,4 @@ -package com.fanruan.api.design.ui.component; +package com.fanruan.api.design.ui.action; import java.awt.event.ActionEvent; 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 deleted file mode 100644 index fcf02a3..0000000 --- a/src/main/java/com/fanruan/api/design/ui/component/BasicPane.java +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 15166ee..0000000 --- a/src/main/java/com/fanruan/api/design/ui/component/ParameterTableModel.java +++ /dev/null @@ -1,4 +0,0 @@ -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 index 3b759e8..15b5c26 100644 --- a/src/main/java/com/fanruan/api/design/ui/component/UIIntNumberField.java +++ b/src/main/java/com/fanruan/api/design/ui/component/UIIntNumberField.java @@ -1,5 +1,5 @@ package com.fanruan.api.design.ui.component; -public class UIIntNumberField extends com.fr.design.gui.itextfield.UIIntNumberField{ +public class UIIntNumberField extends com.fr.design.gui.itextfield.UIIntNumberField { } diff --git a/src/main/java/com/fanruan/api/design/ui/container/BasicPane.java b/src/main/java/com/fanruan/api/design/ui/container/BasicPane.java new file mode 100644 index 0000000..c089e0c --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/container/BasicPane.java @@ -0,0 +1,5 @@ +package com.fanruan.api.design.ui.container; + +public abstract class BasicPane extends com.fr.design.dialog.BasicPane { + +} diff --git a/src/main/java/com/fanruan/api/design/ui/editor/ValueEditorPane.java b/src/main/java/com/fanruan/api/design/ui/editor/ValueEditorPane.java new file mode 100644 index 0000000..db95245 --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/editor/ValueEditorPane.java @@ -0,0 +1,25 @@ +package com.fanruan.api.design.ui.editor; + +import com.fr.design.editor.editor.Editor; + +/** + * @author richie + * @version 10.0 + * Created by richie on 2019-08-27 + * 多指选择器 + * com.fr.design.editor.editor.Editor是一个可靠的API类 + */ +public class ValueEditorPane extends com.fr.design.editor.ValueEditorPane { + + public ValueEditorPane(Editor[] editors) { + super(editors); + } + + public ValueEditorPane(Editor[] editors, String popupName, String textEditorValue) { + super(editors, popupName, textEditorValue); + } + + public ValueEditorPane(Editor[] editors, String popupName, String textEditorValue, int centerPaneWidth) { + super(editors, popupName, textEditorValue, centerPaneWidth); + } +} diff --git a/src/main/java/com/fanruan/api/design/ui/model/ParameterTableModel.java b/src/main/java/com/fanruan/api/design/ui/model/ParameterTableModel.java new file mode 100644 index 0000000..2c9745c --- /dev/null +++ b/src/main/java/com/fanruan/api/design/ui/model/ParameterTableModel.java @@ -0,0 +1,28 @@ +package com.fanruan.api.design.ui.model; + + +import com.fanruan.api.design.ui.editor.ValueEditorPane; + +import java.awt.*; + +/** + * 表格模型 + */ +public class ParameterTableModel extends com.fr.design.gui.itableeditorpane.ParameterTableModel { + + public ParameterTableModel() { + super(); + } + + public ParameterTableModel(int paraUseType) { + super(paraUseType); + } + + public ParameterTableModel(int paraUseType, Component component) { + super(paraUseType, component); + } + + public ParameterTableModel(ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane, Component component) { + super(valueEditorPane, valueRenderPane, component); + } +} diff --git a/src/main/java/com/fanruan/api/xml/xml/component/XMLFileManager.java b/src/main/java/com/fanruan/api/xml/component/XMLFileManager.java similarity index 55% rename from src/main/java/com/fanruan/api/xml/xml/component/XMLFileManager.java rename to src/main/java/com/fanruan/api/xml/component/XMLFileManager.java index 3939c89..003b589 100644 --- a/src/main/java/com/fanruan/api/xml/xml/component/XMLFileManager.java +++ b/src/main/java/com/fanruan/api/xml/component/XMLFileManager.java @@ -1,18 +1,16 @@ -package com.fanruan.api.xml.xml.component; +package com.fanruan.api.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 ""; - } +public abstract class XMLFileManager extends com.fr.file.XMLFileManager { + @Override public void writeXML(XMLPrintWriter writer) { } @Override public void readXML(XMLableReader reader) { + } }