From de842c99a39e330dc270219e1a075c159a93ae05 Mon Sep 17 00:00:00 2001 From: zack Date: Fri, 20 May 2016 17:26:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=99=E4=B8=AA=E5=85=A5=E5=8F=A3?= =?UTF-8?q?=E5=88=A0=E6=8E=89=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E5=81=9A?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=95=B0=E6=8D=AE=E9=9B=86=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/data/datapane/ReportTableDataPane.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/designer_base/src/com/fr/design/data/datapane/ReportTableDataPane.java b/designer_base/src/com/fr/design/data/datapane/ReportTableDataPane.java index 3b968f205..c9279ca42 100644 --- a/designer_base/src/com/fr/design/data/datapane/ReportTableDataPane.java +++ b/designer_base/src/com/fr/design/data/datapane/ReportTableDataPane.java @@ -4,9 +4,6 @@ package com.fr.design.data.datapane; import com.fr.data.TableDataSource; -import com.fr.design.DesignModelAdapter; -import com.fr.design.ExtraDesignClassManager; -import com.fr.design.fun.TableDataPaneProcessor; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.frpane.LoadingBasicPane; import com.fr.design.layout.FRGUIPaneFactory; @@ -27,19 +24,13 @@ public class ReportTableDataPane extends LoadingBasicPane { @Override protected void initComponents(JPanel container) { container.setLayout(FRGUIPaneFactory.createBorderLayout()); - TableDataPaneProcessor paneProcessor = ExtraDesignClassManager.getInstance().getTableDataPaneProcessor(); - TableDataPaneController pane = null; - if (paneProcessor != null) { - pane = paneProcessor.createServerTableDataPane(DesignModelAdapter.getCurrentModelAdapter() - ); - } - tdPane = pane == null ? new TableDataPaneListPane() { + tdPane = new TableDataPaneListPane() { @Override public NameableCreator[] createNameableCreators() { return TableDataCreatorProducer.getInstance().createReportTableDataCreator(); } - } : pane; + }; container.add(tdPane.getPanel(), BorderLayout.CENTER); } From 263a699affa7c5d50b653851c34b2513db58a440 Mon Sep 17 00:00:00 2001 From: zack Date: Fri, 20 May 2016 17:27:16 +0800 Subject: [PATCH 2/3] d --- .../src/com/fr/design/data/datapane/ReportTableDataPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/data/datapane/ReportTableDataPane.java b/designer_base/src/com/fr/design/data/datapane/ReportTableDataPane.java index c9279ca42..d78ce45d7 100644 --- a/designer_base/src/com/fr/design/data/datapane/ReportTableDataPane.java +++ b/designer_base/src/com/fr/design/data/datapane/ReportTableDataPane.java @@ -31,7 +31,7 @@ public class ReportTableDataPane extends LoadingBasicPane { return TableDataCreatorProducer.getInstance().createReportTableDataCreator(); } }; - container.add(tdPane.getPanel(), BorderLayout.CENTER); + container.add(tdPane.getPanel(), BorderLayout.CENTER); } @Override From 5bf2b7faa3508d5a0379d47e1546f4a1970bd5cd Mon Sep 17 00:00:00 2001 From: zack Date: Fri, 20 May 2016 17:29:44 +0800 Subject: [PATCH 3/3] d --- .../src/com/fr/design/data/datapane/ReportTableDataPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/data/datapane/ReportTableDataPane.java b/designer_base/src/com/fr/design/data/datapane/ReportTableDataPane.java index d78ce45d7..c9279ca42 100644 --- a/designer_base/src/com/fr/design/data/datapane/ReportTableDataPane.java +++ b/designer_base/src/com/fr/design/data/datapane/ReportTableDataPane.java @@ -31,7 +31,7 @@ public class ReportTableDataPane extends LoadingBasicPane { return TableDataCreatorProducer.getInstance().createReportTableDataCreator(); } }; - container.add(tdPane.getPanel(), BorderLayout.CENTER); + container.add(tdPane.getPanel(), BorderLayout.CENTER); } @Override