WIP Additional Fields API

mifosng-data/src/main/java/org/mifosng/data/AdditionalFieldSet.java

@@ -3,16 +3,16 @@ package org.mifosng.data;
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement
-public class ExtraDatasetRow {
+public class AdditionalFieldSet {
 
 	private Integer id;
 	private String name;
 	private String type;
-	protected ExtraDatasetRow() {
+	protected AdditionalFieldSet() {
 		//
 	}
 
-	public ExtraDatasetRow(final Integer id, final String name, final String type) {
+	public AdditionalFieldSet(final Integer id, final String name, final String type) {
 		this.id = id;
 		this.name = name;
 		this.type = type;

mifosng-data/src/main/java/org/mifosng/data/AdditionalFieldSets.java

@@ -0,0 +1,29 @@
+package org.mifosng.data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class AdditionalFieldSets {
+
+	private List<AdditionalFieldSet> additionalFieldsSets = new ArrayList<AdditionalFieldSet>();
+
+	protected AdditionalFieldSets() {
+		//
+	}
+
+	public AdditionalFieldSets(final List<AdditionalFieldSet> additionalFieldsSets) {
+		this.additionalFieldsSets = additionalFieldsSets;
+	}
+
+	public List<AdditionalFieldSet> getAdditionalFieldsSets() {
+		return additionalFieldsSets;
+	}
+
+	public void setAdditionalFieldsSets(List<AdditionalFieldSet> additionalFieldsSets) {
+		this.additionalFieldsSets = additionalFieldsSets;
+	}
+
+}

mifosng-data/src/main/java/org/mifosng/data/ExtraDatasets.java

@@ -1,29 +0,0 @@
-package org.mifosng.data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-public class ExtraDatasets {
-
-	private List<ExtraDatasetRow> extraDatasetRow = new ArrayList<ExtraDatasetRow>();
-
-	protected ExtraDatasets() {
-		//
-	}
-
-	public ExtraDatasets(final List<ExtraDatasetRow> extraDatasetRow) {
-		this.extraDatasetRow = extraDatasetRow;
-	}
-
-	public List<ExtraDatasetRow> getExtraDatasetRow() {
-		return extraDatasetRow;
-	}
-
-	public void setExtraDatasetRow(List<ExtraDatasetRow> extraDatasetRow) {
-		this.extraDatasetRow = extraDatasetRow;
-	}
-
-}

mifosng-data/src/main/java/org/mifosng/data/reports/GenericResultset.java

@@ -8,14 +8,6 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement
 public class GenericResultset {
 
-	// [
-		// [contact_email, field 2, field 3], 
-	    // [
-	         // ["abb.net", "r2", "x"], ["abb.net", "r3"]
-	    // ]
-	// ]
-	
-	// create types for these
 	private List<ResultsetColumnHeader> columnHeaders = new ArrayList<ResultsetColumnHeader>();
 	private List<ResultsetDataRow> data = new ArrayList<ResultsetDataRow>();