From 3d78a5a8aa874e7147dd4edd808a0fa94af1bbb6 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Tue, 25 Apr 2017 21:30:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E6=89=BF=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractIndependentChartUI4Custom.java | 56 +++++-------------- 1 file changed, 13 insertions(+), 43 deletions(-) diff --git a/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI4Custom.java b/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI4Custom.java index 7e44a6908..17451bb87 100644 --- a/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI4Custom.java +++ b/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI4Custom.java @@ -23,72 +23,46 @@ public abstract class AbstractIndependentChartUI4Custom implements IndependentCh int CURRENT_API_LEVEL = 3; - @Override public AbstractTableDataContentPane getTableDataSourcePane(Plot plot, ChartDataPane parent) { - return new PiePlotTableDataContentPane(parent); + return null; } @Override public AbstractReportDataContentPane getReportDataSourcePane(Plot plot, ChartDataPane parent) { - return new PiePlotReportDataContentPane(parent); + return null; } - @Override - public ConditionAttributesPane getPlotConditionPane(Plot plot){ - return new DataSeriesConditionPane(); - } - - @Override public BasicBeanPane getPlotSeriesPane(ChartStylePane parent, Plot plot){ return getPlotSeriesPane(); } -// @Override -// public AbstractChartAttrPane[] getAttrPaneArray(AttributeChangeListener listener) { -// return null; -// } + public BasicBeanPane getPlotSeriesPane(){ + return null; + } + + public boolean equals(Object obj) { + return obj != null && ComparatorUtils.equals(obj.getClass(), this.getClass()); + } -// public abstract BasicBeanPane getChartConfigPane(); + public ConditionAttributesPane getPlotConditionPane(Plot plot){ + return new DataSeriesConditionPane(); + } @Override public ChartDataPane getChartDataPane(AttributeChangeListener listener) { return new ChartDataPane(listener); } - public BasicBeanPane getPlotSeriesPane(){ - return new BasicBeanPane() { - @Override - public void populateBean(Plot ob) { - - } - - @Override - public Plot updateBean() { - return null; - } - - @Override - protected String title4PopupWindow() { - return null; - } - }; - } - - @Override public boolean isUseDefaultPane(){ return false; } - public boolean equals(Object obj) { - return obj != null && ComparatorUtils.equals(obj.getClass(), this.getClass()); - } - @Override public String getIconPath() { - return "com/fr/design/images/form/toolbar/ChartF-Pie.png"; + return "com/fr/solution/plugin/chart/echarts/pie/images/pie.png"; } @Override @@ -105,10 +79,6 @@ public abstract class AbstractIndependentChartUI4Custom implements IndependentCh return CURRENT_API_LEVEL; } } - /** - * 是否使用默认的界面,为了避免界面来回切换 - * @return 是否使用默认的界面 - */