Merge branch 'dev' of http://www.finedevelop.com:2015/scm/~kerry/design into dev

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

@@ -44,6 +44,21 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
 		hyperEditPane = new ChartHyperEditPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
 		this.add(hyperEditPane, BorderLayout.CENTER);
 
+		ChartCollection cc =  createChartCollection();
+
+		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();
@@ -57,17 +72,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
         }else {
             cc.addChart(new Chart(new Bar2DPlot()));
         }
-		
-		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);
+        return cc;
     }
 
 	protected int getChartParaType() {
@@ -99,8 +104,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
 
 		BaseChartCollection cc = chartHyperlink.getChartCollection();
 		if (cc == null || cc.getChartCount() < 1) {
-			cc = new ChartCollection();
-			cc.addChart(new Chart(ChartFactory.createBar2DPlot()));
+			cc = createChartCollection();
 			chartHyperlink.setChartCollection(cc);
 		}