dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5418
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-12-14 16:54:36 +0100
message:
  tuned xmloutput for grid..
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridRow.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridRows.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/GridRowsXmlAdapter.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridRow.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridRow.java	2011-12-14 12:52:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridRow.java	2011-12-14 15:54:36 +0000
@@ -1,5 +1,32 @@
 package org.hisp.dhis.common;
 
+/*
+ * Copyright (c) 2004-2011, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ *   be used to endorse or promote products derived from this software without
+ *   specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 import org.codehaus.jackson.annotate.JsonProperty;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -16,17 +43,17 @@
 @XmlAccessorType( value = XmlAccessType.NONE )
 public class GridRow
 {
-    private List<Object> row = new ArrayList<Object>();
+    private List<String> rowData = new ArrayList<String>();
 
     @XmlElement
     @JsonProperty
-    public List<Object> getRow()
+    public List<String> getRowData()
     {
-        return row;
+        return rowData;
     }
 
-    public void setRow( List<Object> row )
+    public void setRowData( List<String> rowData )
     {
-        this.row = row;
+        this.rowData = rowData;
     }
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridRows.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridRows.java	2011-12-14 13:00:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GridRows.java	2011-12-14 15:54:36 +0000
@@ -45,7 +45,7 @@
 {
     private List<GridRow> rows = new ArrayList<GridRow>();
 
-    @XmlElement
+    @XmlElement(name = "row")
     @JsonProperty
     public List<GridRow> getRows()
     {

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/GridRowsXmlAdapter.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/GridRowsXmlAdapter.java	2011-12-14 12:52:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/GridRowsXmlAdapter.java	2011-12-14 15:54:36 +0000
@@ -52,7 +52,12 @@
         for ( List<Object> row : rows )
         {
             GridRow gridRow = new GridRow();
-            gridRow.setRow( row );
+
+            for ( Object object : row )
+            {
+                gridRow.getRowData().add( object != null ? object.toString() : null );
+            }
+
             gridRows.getRows().add( gridRow );
         }