Merge pull request #1460 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0

* commit '02c271ba2efff03f6926ddbff1c276312fcbf52d':
  CHART-12794 图表切换

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@@ -294,13 +294,14 @@ public class ChartTypePane extends AbstractChartAttrPane{
 	 * @param collection
 	 */
 	public void reLayoutEditPane(String lastPlotID, ChartCollection collection){
+		if (editPane == null) {
+			return;
+		}
 		ChartProvider chart = collection.getSelectedChartProvider(ChartProvider.class);
 		String plotID = chart.getID();
 		boolean isUseDefault = ChartTypeInterfaceManager.getInstance().isUseDefaultPane(plotID);
-		if (editPane != null && editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, plotID))){
+		if (editPane.isDefaultPane() != isUseDefault || (!isUseDefault && !ComparatorUtils.equals(lastPlotID, plotID))) {
 			editPane.reLayout(chart);
-		}else {
-			throw new IllegalArgumentException("editPane can not be null.");
 		}
 	}