diff --git a/src/main/java/com/tptj/demo/hg/table/data/Demo.java b/src/main/java/com/tptj/demo/hg/table/data/Demo.java index 01c23b8..e43baa3 100644 --- a/src/main/java/com/tptj/demo/hg/table/data/Demo.java +++ b/src/main/java/com/tptj/demo/hg/table/data/Demo.java @@ -18,7 +18,7 @@ public class Demo extends AbstractTableDataDefineProvider { @Override public Class classForInitTableData() { - return null; + return DemoTableData.class; } @Override diff --git a/src/main/java/com/tptj/demo/hg/table/data/DemoDataModel.java b/src/main/java/com/tptj/demo/hg/table/data/DemoDataModel.java index 3d11ce7..9b05b2d 100644 --- a/src/main/java/com/tptj/demo/hg/table/data/DemoDataModel.java +++ b/src/main/java/com/tptj/demo/hg/table/data/DemoDataModel.java @@ -1,7 +1,8 @@ package com.tptj.demo.hg.table.data; -import com.fanruan.api.data.open.BaseDataModel; -import com.fanruan.api.err.TableDataException; + +import com.fr.data.AbstractDataModel; +import com.fr.general.data.TableDataException; import com.fr.script.Calculator; import com.fr.stable.ParameterProvider; @@ -10,7 +11,7 @@ import com.fr.stable.ParameterProvider; * @version 10.0 * Created by 秃破天际 on 2021-03-29 **/ -public class DemoDataModel extends BaseDataModel { +public class DemoDataModel extends AbstractDataModel { private String config; private ParameterProvider[] parameters; diff --git a/src/main/java/com/tptj/demo/hg/table/data/DemoTableData.java b/src/main/java/com/tptj/demo/hg/table/data/DemoTableData.java index 613f18c..8d122f4 100644 --- a/src/main/java/com/tptj/demo/hg/table/data/DemoTableData.java +++ b/src/main/java/com/tptj/demo/hg/table/data/DemoTableData.java @@ -1,8 +1,8 @@ package com.tptj.demo.hg.table.data; -import com.fanruan.api.data.open.BaseTableData; import com.fr.config.holder.Conf; import com.fr.config.holder.factory.Holders; +import com.fr.data.AbstractParameterTableData; import com.fr.general.data.DataModel; import com.fr.general.xml.GeneralXMLTools; import com.fr.intelli.record.Focus; @@ -19,7 +19,7 @@ import com.fr.stable.xml.XMLableReader; * Created by 秃破天际 on 2021-03-29 **/ @EnableMetrics -public class DemoTableData extends BaseTableData { +public class DemoTableData extends AbstractParameterTableData { /** * 自定义一些配置 */ diff --git a/src/main/java/com/tptj/demo/hg/table/data/server/Demo.java b/src/main/java/com/tptj/demo/hg/table/data/server/Demo.java index f97b860..3ee437e 100644 --- a/src/main/java/com/tptj/demo/hg/table/data/server/Demo.java +++ b/src/main/java/com/tptj/demo/hg/table/data/server/Demo.java @@ -19,7 +19,7 @@ public class Demo extends AbstractServerTableDataDefineProvider { @Override public Class classForInitTableData() { - return null; + return DemoTableData.class; } @Override diff --git a/src/main/java/com/tptj/demo/hg/table/data/ui/DemoTableDataPane.java b/src/main/java/com/tptj/demo/hg/table/data/ui/DemoTableDataPane.java index 92418c2..3cf5522 100644 --- a/src/main/java/com/tptj/demo/hg/table/data/ui/DemoTableDataPane.java +++ b/src/main/java/com/tptj/demo/hg/table/data/ui/DemoTableDataPane.java @@ -1,16 +1,16 @@ package com.tptj.demo.hg.table.data.ui; -import com.fanruan.api.design.work.BaseTableDataPane; -import com.fanruan.api.design.ui.component.UITextArea; -import com.fanruan.api.design.ui.container.UIScrollPane; import com.fr.base.BaseUtils; import com.fr.base.Parameter; import com.fr.design.data.datapane.preview.PreviewTablePane; +import com.fr.design.data.tabledata.tabledatapane.AbstractTableDataPane; import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itableeditorpane.ParameterTableModel; import com.fr.design.gui.itableeditorpane.UITableEditorPane; import com.fr.design.gui.itableeditorpane.UITableModelAdapter; +import com.fr.design.gui.itextarea.UITextArea; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.script.Calculator; @@ -27,12 +27,13 @@ import java.awt.event.ActionListener; * @version 10.0 * Created by 秃破天际 on 2021-03-29 **/ -public class DemoTableDataPane extends BaseTableDataPane { +public class DemoTableDataPane extends AbstractTableDataPane { - private UITextArea config = new UITextArea(); + private UITextArea config; private UITableEditorPane parameterTableEditorPane; public DemoTableDataPane(){ + config = new UITextArea(); setLayout(new BorderLayout()); UIButton preview = new UIButton(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png"));