From 87cadd7049ee6db85fff76b02e026f28c28354b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=B2=B3?= <445798420@qq.com>
Date: Fri, 27 Sep 2019 17:30:01 +0800
Subject: [PATCH] =?UTF-8?q?CHART-10247=20=E6=89=A9=E5=B1=95=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/ChartTypeInterfaceManager.java     | 8 ++++----
 .../src/main/java/com/fr/design/chart/ChartTypePane.java  | 2 +-
 .../com/fr/design/mainframe/chart/gui/ChartTypePane.java  | 2 +-
 .../main/java/com/fr/extended/chart/ExtendedTypePane.java | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
index b9950256f3..f6f674ba95 100644
--- a/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
+++ b/designer-chart/src/main/java/com/fr/design/ChartTypeInterfaceManager.java
@@ -165,7 +165,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
         ChartWidgetOption[] child = new ChartWidgetOption[chartIDs.length];
         int index = 0;
         for (String chartID : chartIDs) {
-            ChartProvider[] rowChart = ChartTypeManager.getInstance().getChartTypes(chartID);
+            ChartProvider[] rowChart = ChartTypeManager.getInstance().getCharts(chartID);
             if (ArrayUtils.isEmpty(rowChart) && !ChartTypeManager.innerChart(chartID)) {
                 continue;
             }
@@ -364,7 +364,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
 
         try {
             //兼容 图表类型选择界面会调到这边
-            ChartProvider[] charts = ChartTypeManager.getInstanceWithCheck().getChartTypes(chartID);
+            ChartProvider[] charts = ChartTypeManager.getInstanceWithCheck().getCharts(chartID);
             result = new String[charts.length];
             for (int i = 0; i < charts.length; i++) {
                 //Chart && AbstractChart
@@ -403,7 +403,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
 
     //兼容
     private String[] getCompatibleSubName(String chartID, ChartTypeUIProvider provider) {
-        ChartProvider[] chartProviders = ChartTypeManager.getInstanceWithCheck().getChartTypes(chartID);
+        ChartProvider[] chartProviders = ChartTypeManager.getInstanceWithCheck().getCharts(chartID);
 
         if (chartProviders.length == 1) {
             return new String[]{getName(chartID)};
@@ -453,7 +453,7 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
 
 
         try {
-            ChartProvider chartProvider = ChartTypeManager.getInstanceWithCheck().getChartTypes(chartID)[0];
+            ChartProvider chartProvider = ChartTypeManager.getInstanceWithCheck().getCharts(chartID)[0];
             if (chartProvider instanceof Chart) {
                 //AbstractExtendedChartUIProvider
                 result = ((Chart) chartProvider).getChartName();
diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
index 0eb70fd129..8233e68e80 100644
--- a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
+++ b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
@@ -126,7 +126,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
         ChartProvider chart4Update = cc.getSelectedChartProvider();
         if (chart4Update == null) {
             String plotID = this.chartIDs[mainTypeList.getSelectedIndex()];
-            ChartProvider chart = ChartTypeManager.getInstance().getChartTypes(plotID)[iconViewList.getSelectedIndex()];
+            ChartProvider chart = ChartTypeManager.getInstance().getCharts(plotID)[iconViewList.getSelectedIndex()];
             try {
                 chart4Update = (ChartProvider) chart.clone();
                 cc.addChart(chart4Update);
diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java
index bb7d304106..77e75a69a1 100644
--- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java
+++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java
@@ -125,7 +125,7 @@ public class ChartTypePane extends AbstractChartAttrPane{
 
             try{
 				AbstractChartTypePane selectedPane = (AbstractChartTypePane) getSelectedPane();
-				ChartProvider newDefaultChart =(ChartProvider) ChartTypeManager.getInstanceWithCheck().getChartTypes(selectedPane.getPlotID())[0].clone();
+				ChartProvider newDefaultChart =(ChartProvider) ChartTypeManager.getInstanceWithCheck().getCharts(selectedPane.getPlotID())[0].clone();
 				if (!ComparatorUtils.equals(chart.getClass(), newDefaultChart.getClass())) {
 					//vanChart 和 chart 之间切换
 					//不同chart之间切换
diff --git a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedTypePane.java b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedTypePane.java
index 2d9ebb5dc1..d373eab4e8 100644
--- a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedTypePane.java
+++ b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedTypePane.java
@@ -67,7 +67,7 @@ public class ExtendedTypePane<T extends AbstractChart> extends AbstractChartType
 
     @Override
     public ChartProvider getDefaultChart() {
-        return ChartTypeManager.getInstance().getChartTypes(getPlotID())[0];
+        return ChartTypeManager.getInstance().getCharts(getPlotID())[0];
     }
 
     @Override