REPORT-102520 fix:代码质量

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

@@ -62,22 +62,21 @@ public class NormalChartDataPane extends DataContentsPane {
 				JPanel contentPane = new JPanel(new BorderLayout());
 				dataPane = new UIComboBoxPane<ChartCollection>() {
 					protected void initLayout() {
+						this.setLayout(new BorderLayout(ChartEditContext.normalMode() ? LayoutConstants.HGAP_LARGE : 0,6));
 						if (ChartEditContext.supportReportData()) {
+							JPanel northPane;
 							if (ChartEditContext.normalMode()) {
-								this.setLayout(new BorderLayout(LayoutConstants.HGAP_LARGE,6));
+								northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE, 0));
-								JPanel northPane = new JPanel(new BorderLayout(LayoutConstants.HGAP_LARGE,0));
 								northPane.add(jcb, BorderLayout.CENTER);
 								UILabel label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"));
 								label1.setPreferredSize(new Dimension(ChartDataPane.LABEL_WIDTH,ChartDataPane.LABEL_HEIGHT));
 								northPane.add(GUICoreUtils.createBorderLayoutPane(new Component[]{jcb, null, null, label1, null}));
 								northPane.setBorder(BorderFactory.createEmptyBorder(0,5,0,8));
-								this.add(northPane, BorderLayout.NORTH);
 							} else {
-								this.setLayout(new BorderLayout(0, 6));
+								northPane = DataLayoutHelper.createDataLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"), jcb);
-								JPanel northPane = DataLayoutHelper.createDataLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Source"), jcb);
 								northPane.setBorder(BorderFactory.createEmptyBorder(0, DataLayoutHelper.LEFT_GAP, 0, DataLayoutHelper.RIGHT_GAP));
-								this.add(northPane, BorderLayout.NORTH);
 							}
+							this.add(northPane, BorderLayout.NORTH);
 						}
 						this.add(cardPane, BorderLayout.CENTER);