Merge pull request #183 in BA/design from ~XIAOHU/design:dev to dev

* commit 'fae3c64892e0276b74035e93a4e1e3577059226b':
  超鏈
  update

designer_chart/src/com/fr/design/ChartTypeInterfaceManager.java

@@ -52,9 +52,6 @@ public class ChartTypeInterfaceManager extends XMLFileManager implements ExtraCh
 
     private static ChartTypeInterfaceManager classManager = null;
 
-    //判断默认图表是否读取
-    private static boolean isReadDefault = false;
-
     private static LinkedHashMap<String, IndependentChartUIProvider> chartTypeInterfaces = new LinkedHashMap<String, IndependentChartUIProvider>();
 
     public synchronized static ChartTypeInterfaceManager getInstance() {

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

@@ -5,6 +5,7 @@ import com.fr.chart.chartattr.Bar2DPlot;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.ChartFactory;
+import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.chart.web.ChartHyperPoplink;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.chart.gui.ChartComponent;
@@ -43,7 +44,13 @@ public class ChartHyperPoplinkPane extends BasicBeanPane<ChartHyperPoplink> {
 		this.add(hyperEditPane, BorderLayout.CENTER);
 		
 		ChartCollection cc = new ChartCollection();
-		cc.addChart(new Chart(new Bar2DPlot()));
+
+        Chart chart = ChartTypeManager.getFirstChart();
+        if (chart != null){
+            cc.addChart(chart);
+        }else {
+            cc.addChart(new Chart(new Bar2DPlot()));
+        }
 		
 		chartComponent = new ChartComponent();
 		chartComponent.setPreferredSize(new Dimension(220, 170));// 在单元格弹出时 需要调整保证属性表的大小.