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

@@ -23,7 +23,7 @@ import com.fr.general.Inter;
 import java.awt.*;
 
 /**
- * 类说明: 图表超链 -- 弹出 悬浮窗. 
+ * 类说明: 图表超链 -- 弹出 悬浮窗.
  * @author kunsnat E-mail:kunsnat@gmail.com
  * @version 创建时间：2011-12-28 上午10:41:39
  */
@@ -32,7 +32,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
 	private UITextField itemNameTextField;
 	private ChartHyperEditPane hyperEditPane;
 	private ChartComponent chartComponent;
-	
+
 	public ChartHyperPoplinkPane() {
 		this.setLayout(FRGUIPaneFactory.createM_BorderLayout());
 
@@ -43,8 +43,23 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
 
 		hyperEditPane = new ChartHyperEditPane(getChartParaType(), getValueEditorPane(), getValueEditorPane());
 		this.add(hyperEditPane, BorderLayout.CENTER);
-		
-		ChartCollection cc = new ChartCollection();
+
+		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();
         if (chart != null){
@@ -57,19 +72,9 @@ 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() {
 		return ParameterTableModel.CHART_NORMAL_USE;
 	}
@@ -85,7 +90,7 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
     protected boolean needRenamePane(){
         return true;
     }
-	
+
 	@Override
 	protected String title4PopupWindow() {
 		return Inter.getLocText("FR-Chart-Pop_Chart");
@@ -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);
 		}