新增EMap，和Map（地图）类完全相同，只是为了避免和java.util.Map同时使用时不方便

abel533 · abel533 · commit cf4092cc24a4 · 2016-01-14T23:45:47.000+08:00
新增简单工厂`SeriesFactory`，提供了所有`Series`子类的创建方法
diff --git a/README.md b/README.md
@@ -70,6 +70,8 @@
 - `TreeData`添加缺少的两个属性`symbol`和`symbolSize`#69
 - `AxisPointer`增加`show`属性，该属性出现在scatter6的例子中
 - `AbstractData`中的`List<Object> data`属性和相关调用都去掉泛型类型`<Object>`
+- 新增`EMap`，和`Map`（地图）类完全相同，只是为了避免和`java.util.Map`同时使用时不方便
+- 新增简单工厂`SeriesFactory`，提供了所有`Series`子类的创建方法
 - `Legend`通用去掉`<Object>`
 - 由于fastjson存在多种bug，从这个版本移除`FsonOption`相关的类
 
diff --git a/src/main/java/com/github/abel533/echarts/series/EMap.java b/src/main/java/com/github/abel533/echarts/series/EMap.java
@@ -0,0 +1,15 @@
+package com.github.abel533.echarts.series;
+
+/**
+ * 和Map完全相同，只是为了避免和java.util.Map重名
+ *
+ * @author liuzh
+ */
+public class EMap extends Map {
+    public EMap() {
+    }
+
+    public EMap(String name) {
+        super(name);
+    }
+}
diff --git a/src/main/java/com/github/abel533/echarts/series/SeriesFactory.java b/src/main/java/com/github/abel533/echarts/series/SeriesFactory.java
@@ -0,0 +1,154 @@
+package com.github.abel533.echarts.series;
+
+/**
+ * Series工厂类
+ *
+ * @author liuzh
+ */
+public class SeriesFactory {
+
+    public static Tree newTree(){
+        return new Tree();
+    }
+
+    public static Tree newTree(String name){
+        return new Tree(name);
+    }
+
+    public static Line newLine(){
+        return new Line();
+    }
+
+    public static Line newLine(String name){
+        return new Line(name);
+    }
+
+    public static Gauge newGauge(){
+        return new Gauge();
+    }
+
+    public static Gauge newGauge(String name){
+        return new Gauge(name);
+    }
+
+    public static Chord newChord(){
+        return new Chord();
+    }
+
+    public static Chord newChord(String name){
+        return new Chord(name);
+    }
+
+    public static Bar newBar(){
+        return new Bar();
+    }
+
+    public static Bar newBar(String name){
+        return new Bar(name);
+    }
+
+    public static Scatter newScatter(){
+        return new Scatter();
+    }
+
+    public static Scatter newScatter(String name){
+        return new Scatter(name);
+    }
+
+    public static Force newForce(){
+        return new Force();
+    }
+
+    public static Force newForce(String name){
+        return new Force(name);
+    }
+
+    public static Radar newRadar(){
+        return new Radar();
+    }
+
+    public static Radar newRadar(String name){
+        return new Radar(name);
+    }
+
+    public static Pie newPie(){
+        return new Pie();
+    }
+
+    public static Pie newPie(String name){
+        return new Pie(name);
+    }
+
+    public static Venn newVenn(){
+        return new Venn();
+    }
+
+    public static Venn newVenn(String name){
+        return new Venn(name);
+    }
+
+    public static K newK(){
+        return new K();
+    }
+
+    public static K newK(String name){
+        return new K(name);
+    }
+
+    public static EventRiver newEventRiver(){
+        return new EventRiver();
+    }
+
+    public static EventRiver newEventRiver(String name){
+        return new EventRiver(name);
+    }
+
+    public static Island newIsland(){
+        return new Island();
+    }
+
+    public static Island newIsland(String name){
+        return new Island(name);
+    }
+
+    public static Funnel newFunnel(){
+        return new Funnel();
+    }
+
+    public static Funnel newFunnel(String name){
+        return new Funnel(name);
+    }
+
+    public static Treemap newTreemap(){
+        return new Treemap();
+    }
+
+    public static Treemap newTreemap(String name){
+        return new Treemap(name);
+    }
+
+    public static Heatmap newHeatmap(){
+        return new Heatmap();
+    }
+
+    public static Heatmap newHeatmap(String name){
+        return new Heatmap(name);
+    }
+
+    public static Map newMap(){
+        return new Map();
+    }
+
+    public static Map newMap(String name){
+        return new Map(name);
+    }
+
+    public static WordCloud newWordCloud(){
+        return new WordCloud();
+    }
+
+    public static WordCloud newWordCloud(String name){
+        return new WordCloud(name);
+    }
+
+}
diff --git a/src/test/java/com/github/abel533/echarts/samples/map/MapTest.java b/src/test/java/com/github/abel533/echarts/samples/map/MapTest.java
@@ -28,6 +28,7 @@
 import com.github.abel533.echarts.code.X;
 import com.github.abel533.echarts.code.Y;
 import com.github.abel533.echarts.data.Data;
+import com.github.abel533.echarts.series.EMap;
 import com.github.abel533.echarts.series.Map;
 import com.github.abel533.echarts.series.MapLocation;
 import com.github.abel533.echarts.util.EnhancedOption;
@@ -42,7 +43,7 @@ public class MapTest {
     public void test() {
         //地址：http://echarts.baidu.com/doc/example/map.html
         EnhancedOption option = new EnhancedOption();
-        Map map = new Map("Map");
+        EMap map = new EMap("Map");
         map.mapLocation(new MapLocation(X.left, Y.top, 500));
         map.selectedMode(SelectedMode.multiple);
         map.itemStyle().normal().borderWidth(2)
