From f3d54815e01da17aa0367cce292fbccef2063386 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Thu, 18 May 2017 21:37:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89glyph=EF=BC=8Cchart?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0chartData=E5=B1=9E=E6=80=A7=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E6=9D=A5=E4=BF=9D=E5=AD=98=E6=95=B0=E6=8D=AE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=91=BD=E5=90=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/mainframe/chart/ThirdChartEditPane.java | 1 - 1 file changed, 1 deletion(-) diff --git a/designer_chart/src/com/fr/design/mainframe/chart/ThirdChartEditPane.java b/designer_chart/src/com/fr/design/mainframe/chart/ThirdChartEditPane.java index 76faee8806..bc67136bb3 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/ThirdChartEditPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/ThirdChartEditPane.java @@ -34,7 +34,6 @@ public class ThirdChartEditPane extends ChartEditPane { */ public void reLayout(Chart currentChart) { if (currentChart != null) { - int chartIndex = getSelectedChartIndex(currentChart); this.removeAll(); this.setLayout(new BorderLayout()); paneList = new ArrayList(); From 69723ae2284041ecbd7f7e3af44a246b5bb2ab03 Mon Sep 17 00:00:00 2001 From: mengao <283296419@qq.com> Date: Fri, 19 May 2017 14:56:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=EF=BC=8C=E7=BB=9F=E4=B8=80=E5=B0=86ThirdChart?= =?UTF-8?q?=E5=92=8CChart4Custom=E4=BF=AE=E6=94=B9=E4=B8=BACharts=EF=BC=88?= =?UTF-8?q?=E4=BB=A3=E8=A1=A8=E7=AC=AC=E4=B8=89=E6=96=B9=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=9A=84=E5=9B=BE=E8=A1=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/ChartTypeInterfaceManager.java | 6 +++--- .../chart/fun/IndependentChartUIProvider.java | 4 ++-- .../chart/fun/impl/AbstractIndependentChartUI.java | 4 ++-- .../AbstractIndependentChartUIWithAPILevel.java | 4 ++-- ...ustom.java => AbstractIndependentChartsUI.java} | 6 +++--- ...dChartConfigPane.java => ChartsConfigPane.java} | 2 +- ...ThirdChartEditPane.java => ChartsEditPane.java} | 14 +++++++------- 7 files changed, 20 insertions(+), 20 deletions(-) rename designer_chart/src/com/fr/design/chart/fun/impl/{AbstractIndependentChartUI4Custom.java => AbstractIndependentChartsUI.java} (93%) rename designer_chart/src/com/fr/design/mainframe/chart/{ThirdChartConfigPane.java => ChartsConfigPane.java} (91%) rename designer_chart/src/com/fr/design/mainframe/chart/{ThirdChartEditPane.java => ChartsEditPane.java} (74%) diff --git a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java index c7baf652fa..c850a4ae5b 100644 --- a/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java +++ b/designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java @@ -16,7 +16,7 @@ import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.ChartEditPane; -import com.fr.design.mainframe.chart.ThirdChartConfigPane; +import com.fr.design.mainframe.chart.ChartsConfigPane; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -432,7 +432,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh return chartTypeInterfaces.get(priority).get(plotID).getChartEditPane(plotID); } - public ThirdChartConfigPane getChartConfigPane(String plotID) { + public ChartsConfigPane getChartConfigPane(String plotID) { Iterator iterator = chartTypeInterfaces.entrySet().iterator(); while (iterator.hasNext()) { Map.Entry entry = (Map.Entry) iterator.next(); @@ -444,7 +444,7 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh return getChartConfigPane(ChartTypeManager.CHART_PRIORITY, plotID); } - private ThirdChartConfigPane getChartConfigPane(String priority, String plotID) { + private ChartsConfigPane getChartConfigPane(String priority, String plotID) { return chartTypeInterfaces.get(priority).get(plotID).getChartConfigPane(plotID); } diff --git a/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java b/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java index fd97d39f0a..70fcc4ca46 100644 --- a/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java +++ b/designer_chart/src/com/fr/design/chart/fun/IndependentChartUIProvider.java @@ -6,7 +6,7 @@ import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.ChartEditPane; -import com.fr.design.mainframe.chart.ThirdChartConfigPane; +import com.fr.design.mainframe.chart.ChartsConfigPane; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -94,6 +94,6 @@ public interface IndependentChartUIProvider extends Level { ChartEditPane getChartEditPane(String plotID); - ThirdChartConfigPane getChartConfigPane(String plotID); + ChartsConfigPane getChartConfigPane(String plotID); } \ No newline at end of file diff --git a/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI.java b/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI.java index 6eef8ad0e1..848fc44367 100644 --- a/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI.java +++ b/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI.java @@ -8,7 +8,7 @@ import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.ChartEditPane; -import com.fr.design.mainframe.chart.ThirdChartConfigPane; +import com.fr.design.mainframe.chart.ChartsConfigPane; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.general.ComparatorUtils; @@ -60,7 +60,7 @@ public abstract class AbstractIndependentChartUI implements IndependentChartUIPr public ChartEditPane getChartEditPane(String plotID){ return StableUtils.construct(ChartEditPane.class);} - public ThirdChartConfigPane getChartConfigPane(String plotID){return null;} + public ChartsConfigPane getChartConfigPane(String plotID){return null;} } \ No newline at end of file diff --git a/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java b/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java index c3db572167..8aa412a6e3 100644 --- a/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java +++ b/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUIWithAPILevel.java @@ -8,7 +8,7 @@ import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.ChartEditPane; -import com.fr.design.mainframe.chart.ThirdChartConfigPane; +import com.fr.design.mainframe.chart.ChartsConfigPane; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.general.ComparatorUtils; @@ -71,5 +71,5 @@ public abstract class AbstractIndependentChartUIWithAPILevel implements Independ public ChartEditPane getChartEditPane(String plotID){ return StableUtils.construct(ChartEditPane.class);} - public ThirdChartConfigPane getChartConfigPane(String plotID){return null;} + public ChartsConfigPane getChartConfigPane(String plotID){return null;} } diff --git a/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI4Custom.java b/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java similarity index 93% rename from designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI4Custom.java rename to designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java index ae9b8176b9..fbd3ce36f1 100644 --- a/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartUI4Custom.java +++ b/designer_chart/src/com/fr/design/chart/fun/impl/AbstractIndependentChartsUI.java @@ -7,7 +7,7 @@ import com.fr.design.condition.ConditionAttributesPane; import com.fr.design.gui.frpane.AttributeChangeListener; import com.fr.design.mainframe.chart.AbstractChartAttrPane; import com.fr.design.mainframe.chart.ChartEditPane; -import com.fr.design.mainframe.chart.ThirdChartEditPane; +import com.fr.design.mainframe.chart.ChartsEditPane; import com.fr.design.mainframe.chart.gui.ChartDataPane; import com.fr.design.mainframe.chart.gui.ChartStylePane; import com.fr.design.mainframe.chart.gui.data.report.AbstractReportDataContentPane; @@ -26,7 +26,7 @@ import com.fr.stable.fun.mark.API; */ @API(level = IndependentChartUIProvider.CURRENT_API_LEVEL) -public abstract class AbstractIndependentChartUI4Custom extends AbstractProvider implements IndependentChartUIProvider { +public abstract class AbstractIndependentChartsUI extends AbstractProvider implements IndependentChartUIProvider { public String mark4Provider() { return getClass().getName(); @@ -97,7 +97,7 @@ public abstract class AbstractIndependentChartUI4Custom extends AbstractProvider @Override public ChartEditPane getChartEditPane(String plotID) { - return new ThirdChartEditPane(); + return new ChartsEditPane(); } } \ No newline at end of file diff --git a/designer_chart/src/com/fr/design/mainframe/chart/ThirdChartConfigPane.java b/designer_chart/src/com/fr/design/mainframe/chart/ChartsConfigPane.java similarity index 91% rename from designer_chart/src/com/fr/design/mainframe/chart/ThirdChartConfigPane.java rename to designer_chart/src/com/fr/design/mainframe/chart/ChartsConfigPane.java index 7cfbb417cf..76e674eb88 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/ThirdChartConfigPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/ChartsConfigPane.java @@ -8,7 +8,7 @@ import javax.swing.*; /** * Created by mengao on 2017/5/16. */ -public class ThirdChartConfigPane extends AbstractChartAttrPane { +public class ChartsConfigPane extends AbstractChartAttrPane { public final static String CHART_STYLE_TITLE = Inter.getLocText("Chart-Style_Name"); diff --git a/designer_chart/src/com/fr/design/mainframe/chart/ThirdChartEditPane.java b/designer_chart/src/com/fr/design/mainframe/chart/ChartsEditPane.java similarity index 74% rename from designer_chart/src/com/fr/design/mainframe/chart/ThirdChartEditPane.java rename to designer_chart/src/com/fr/design/mainframe/chart/ChartsEditPane.java index bc67136bb3..b012e95795 100644 --- a/designer_chart/src/com/fr/design/mainframe/chart/ThirdChartEditPane.java +++ b/designer_chart/src/com/fr/design/mainframe/chart/ChartsEditPane.java @@ -10,20 +10,20 @@ import java.util.ArrayList; /** * Created by mengao on 2017/5/3. */ -public class ThirdChartEditPane extends ChartEditPane { +public class ChartsEditPane extends ChartEditPane { - protected ThirdChartConfigPane thirdChartConfigPane; + protected ChartsConfigPane chartsConfigPane; - public ThirdChartEditPane() { + public ChartsEditPane() { this.setLayout(new BorderLayout()); paneList = new ArrayList(); dataPane4SupportCell = new ChartDataPane(listener); dataPane4SupportCell.setSupportCellData(true); - thirdChartConfigPane= new ThirdChartConfigPane(); + chartsConfigPane = new ChartsConfigPane(); paneList.add(dataPane4SupportCell); - paneList.add(thirdChartConfigPane); + paneList.add(chartsConfigPane); createTabsPane(); } @@ -44,9 +44,9 @@ public class ThirdChartEditPane extends ChartEditPane { } dataPane4SupportCell = createChartDataPane(plotID); - thirdChartConfigPane= ChartTypeInterfaceManager.getInstance().getChartConfigPane(plotID); + chartsConfigPane = ChartTypeInterfaceManager.getInstance().getChartConfigPane(plotID); paneList.add(dataPane4SupportCell); - paneList.add(thirdChartConfigPane); + paneList.add(chartsConfigPane); createTabsPane(); }