Update column type to Object to allow specifying data type and other …

…options. See https://developers.google.com/chart/interactive/docs/datatables_dataviews (#40)
primefaces-extensions · Dec 9, 2016 · 6c473bb · 6c473bb
1 parent bedc9d1
commit 6c473bb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/org/primefaces/extensions/component/gchart/model/DefaultGChartModel.java b/src/main/java/org/primefaces/extensions/component/gchart/model/DefaultGChartModel.java
@@ -14,7 +14,7 @@ class DefaultGChartModel implements GChartModel{
 	private static final long serialVersionUID = -4757917806522708660L;
 
 	public DefaultGChartModel(List<GChartModelRow> rows, GChartType gChartType,
-			Map<String, Object> options, List<String> columns) {
+			Map<String, Object> options, List<Object> columns) {
 		super();
 		this.rows = rows;
 		this.gChartType = gChartType;
@@ -25,7 +25,7 @@ public DefaultGChartModel(List<GChartModelRow> rows, GChartType gChartType,
 	private List<GChartModelRow> rows;
 	private GChartType gChartType;
 	private Map<String,Object> options;
-	private List<String> columns;
+	private List<Object> columns;
 
 	public GChartType getgChartType() {
 		return gChartType;
@@ -35,7 +35,7 @@ public Map<String, Object> getOptions() {
 		return options;
 	}
 
-	public Collection<String> getColumns() {
+	public Collection<Object> getColumns() {
 		return columns;
 	}
 
@@ -61,7 +61,7 @@ public String toJson() {
     protected JsonElement extractData() {
         Collection<Collection<Object>> dataTable = new ArrayList<Collection<Object>>(0);
 
-        dataTable.add((Collection<Object>)(Collection<?>)this.getColumns());
+        dataTable.add(this.getColumns());
 
         for (GChartModelRow row : this.getRows()) {
             Collection<Object> dataRow = new ArrayList<Object>(0);
@@ -74,4 +74,4 @@ protected JsonElement extractData() {
         return GsonConverter.getGson().toJsonTree(dataTable);
     }
 
-}
+}
diff --git a/src/main/java/org/primefaces/extensions/component/gchart/model/GChartModel.java b/src/main/java/org/primefaces/extensions/component/gchart/model/GChartModel.java
@@ -7,7 +7,7 @@
 public interface GChartModel extends Serializable {
    Collection<GChartModelRow> getRows();
 
-   Collection<String> getColumns();
+   Collection<Object> getColumns();
 
    Map<String, Object> getOptions();
 

diff --git a/src/main/java/org/primefaces/extensions/component/gchart/model/GChartModelBuilder.java b/src/main/java/org/primefaces/extensions/component/gchart/model/GChartModelBuilder.java
@@ -14,7 +14,7 @@ public class GChartModelBuilder {
 	private List<GChartModelRow> rows = new ArrayList<GChartModelRow>(0);
 	private GChartType gChartType;
 	private Map<String,Object> options = new HashMap<String, Object>(0);
-	private List<String> columns = new ArrayList<String>(0);
+	private List<Object> columns = new ArrayList<Object>(0);
 
 	public GChartModelBuilder setChartType(GChartType chartType){
 		if(gChartType != null){
@@ -38,12 +38,12 @@ public GChartModelBuilder importTreeNode(TreeNode root){
         return this;
     }
 
-	public GChartModelBuilder addColumns(String... columns){
+	public GChartModelBuilder addColumns(Object... columns){
 		this.columns.addAll(Arrays.asList(columns));
 		return this;
 	}
 
-	public GChartModelBuilder addColumns(Collection<String> columns){
+	public GChartModelBuilder addColumns(Collection<Object> columns){
 		this.columns.addAll(columns);
 		return this;
 	}