Merge pull request #203 in BA/design from ~XIAOHU/design:release to release

* commit '69483fcc2fa04533f22bf12667c6c63e2ee64a67':
  update

designer_chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java

@@ -43,8 +43,22 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
 
 		hyperEditPane = new ChartHyperEditPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
 		this.add(hyperEditPane, BorderLayout.CENTER);
+        ChartCollection cc = createChartCollection();
 		
-		ChartCollection cc = new ChartCollection();
+		chartComponent = new ChartComponent();
+		chartComponent.setPreferredSize(new Dimension(220, 170));// 在单元格弹出时 需要调整保证属性表的大小.
+		chartComponent.setSupportEdit(false);
+		chartComponent.populate(cc);
+		
+		this.add(chartComponent, BorderLayout.EAST);
+		
+		hyperEditPane.populate(cc);
+		
+		hyperEditPane.useChartComponent(chartComponent);
+	}
+
+    private ChartCollection createChartCollection() {
+        ChartCollection cc = new ChartCollection();
 
         Chart chart = ChartTypeManager.getFirstChart();
         if (chart != null){
@@ -57,20 +71,10 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
         }else {
             cc.addChart(new Chart(new Bar2DPlot()));
         }
-		
+        return cc;
-		chartComponent = new ChartComponent();
+    }
-		chartComponent.setPreferredSize(new Dimension(220, 170));// 在单元格弹出时 需要调整保证属性表的大小.
+
-		chartComponent.setSupportEdit(false);
+    protected int getChartParaType() {
-		chartComponent.populate(cc);
-		
-		this.add(chartComponent, BorderLayout.EAST);
-		
-		hyperEditPane.populate(cc);
-		
-		hyperEditPane.useChartComponent(chartComponent);
-	}
-	
-	protected int getChartParaType() {
 		return ParameterTableModel.CHART_NORMAL_USE;
 	}
 
@@ -99,8 +103,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
 
 		BaseChartCollection cc = chartHyperlink.getChartCollection();
 		if (cc == null || cc.getChartCount() < 1) {
-			cc = new ChartCollection();
+			cc = createChartCollection();
-			cc.addChart(new Chart(ChartFactory.createBar2DPlot()));
 			chartHyperlink.setChartCollection(cc);
 		}