Merge pull request #1345 in BA/design from ~ZHENG/design:release/9.0 to release/9.0

* commit '458c1b6e583f1087b02ff100af8abee2553351ed':
  phantom在chartdemoimage哪个线程里面启动
  get default json url

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

@@ -69,6 +69,7 @@ import com.fr.plugin.chart.map.MapIndependentVanChartInterface;
 import com.fr.plugin.chart.map.VanChartMapPlot;
 import com.fr.plugin.chart.multilayer.MultiPieIndependentVanChartInterface;
 import com.fr.plugin.chart.multilayer.VanChartMultiPiePlot;
+import com.fr.plugin.chart.phantom.VanChartPhantomService;
 import com.fr.plugin.chart.pie.PieIndependentVanChartInterface;
 import com.fr.plugin.chart.radar.RadarIndependentVanChartInterface;
 import com.fr.plugin.chart.radar.VanChartRadarPlot;
@@ -157,6 +158,8 @@ public class ChartTypeInterfaceManager implements ExtraChartDesignClassManagerPr
             @Override
             public void run() {
 
+                VanChartPhantomService.startPhantomService();
+
                 initAllChartsDemoImage(allCharts);
             }
         }).start();

designer_chart/src/com/fr/plugin/chart/map/designer/type/VanChartMapSourceChoosePane.java

@@ -564,7 +564,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
 
         mapDataTree.changeRootNode(this.getRootNode());
         if(samePlotChange) {
-            mapPlot.setGeoUrl(GEOJSONHelper.getInstance().getDefaultJSONURL());
+            mapPlot.setGeoUrl(GEOJSONHelper.getDefaultJSONURL());
             mapDataTree.selectDefaultTreeNode();
             selectTreePath = mapDataTree.getSelectionPath();
             sourceComboBox.setSelectedItem(selectTreePath);