dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8718
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-10-25 19:39:39 +0200
message:
  Minor
modified:
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.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-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java	2012-10-23 13:24:16 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MetaData.java	2012-10-25 17:39:39 +0000
@@ -46,6 +46,7 @@
 import org.hisp.dhis.indicator.IndicatorGroupSet;
 import org.hisp.dhis.indicator.IndicatorType;
 import org.hisp.dhis.interpretation.Interpretation;
+import org.hisp.dhis.mapping.Map;
 import org.hisp.dhis.mapping.MapLayer;
 import org.hisp.dhis.mapping.MapLegend;
 import org.hisp.dhis.mapping.MapLegendSet;
@@ -136,7 +137,9 @@
 
     private List<ReportTable> reportTables = new ArrayList<ReportTable>();
 
-    private List<MapView> maps = new ArrayList<MapView>();
+    private List<Map> maps = new ArrayList<Map>();
+    
+    private List<MapView> mapViews = new ArrayList<MapView>();
 
     private List<MapLegend> mapLegends = new ArrayList<MapLegend>();
 
@@ -586,17 +589,30 @@
     @JsonProperty
     @JacksonXmlElementWrapper( localName = "maps", namespace = Dxf2Namespace.NAMESPACE )
     @JacksonXmlProperty( localName = "map", namespace = Dxf2Namespace.NAMESPACE )
-    public List<MapView> getMaps()
+    public List<Map> getMaps()
     {
         return maps;
     }
 
-    public void setMaps( List<MapView> maps )
+    public void setMaps( List<Map> maps )
     {
         this.maps = maps;
     }
 
     @JsonProperty
+    @JacksonXmlElementWrapper( localName = "mapViews", namespace = Dxf2Namespace.NAMESPACE )
+    @JacksonXmlProperty( localName = "mapView", namespace = Dxf2Namespace.NAMESPACE )
+    public List<MapView> getMapViews()
+    {
+        return mapViews;
+    }
+
+    public void setMapViews( List<MapView> mapViews )
+    {
+        this.mapViews = mapViews;
+    }
+
+    @JsonProperty
     @JacksonXmlElementWrapper( localName = "mapLegends", namespace = Dxf2Namespace.NAMESPACE )
     @JacksonXmlProperty( localName = "mapLegend", namespace = Dxf2Namespace.NAMESPACE )
     public List<MapLegend> getMapLegends()