dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8782
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-10-31 09:11:09 +0300
message:
  Renamed Map.views to Map.mapViews
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/mapping/hibernate/Map.hbm.xml
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/mapping/MapController.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/mapping/Map.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java	2012-10-25 17:40:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java	2012-10-31 06:11:09 +0000
@@ -61,7 +61,7 @@
     private Integer zoom;
 
     @Scanned
-    private Set<MapView> views = new HashSet<MapView>();
+    private Set<MapView> mapViews = new HashSet<MapView>();
 
     // -------------------------------------------------------------------------
     // Constructors
@@ -141,14 +141,14 @@
     @JsonView( {DetailedView.class, ExportView.class} )
     @JacksonXmlElementWrapper( localName = "mapViews", namespace = Dxf2Namespace.NAMESPACE )
     @JacksonXmlProperty( localName = "mapView", namespace = Dxf2Namespace.NAMESPACE )
-    public Set<MapView> getViews()
+    public Set<MapView> getMapViews()
     {
-        return views;
+        return mapViews;
     }
 
-    public void setViews( Set<MapView> views )
+    public void setMapViews( Set<MapView> mapViews )
     {
-        this.views = views;
+        this.mapViews = mapViews;
     }
 
     @Override
@@ -165,8 +165,8 @@
             latitude = map.getLatitude() == null ? latitude : map.getLatitude();
             zoom = map.getZoom() == null ? zoom : map.getZoom();
             
-            views.clear();
-            views.addAll( map.getViews() );
+            mapViews.clear();
+            mapViews.addAll( map.getMapViews() );
         }            
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/mapping/hibernate/Map.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/mapping/hibernate/Map.hbm.xml	2012-10-25 16:27:03 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/mapping/hibernate/Map.hbm.xml	2012-10-31 06:11:09 +0000
@@ -27,7 +27,7 @@
     
     <property name="zoom" />
     
-    <set name="views" table="mapmapviews">
+    <set name="mapViews" table="mapmapviews">
       <key column="mapid" foreign-key="fk_mapmapview_mapid" />
       <many-to-many column="mapviewid" class="org.hisp.dhis.mapping.MapView" foreign-key="fk_mapmapview_mapviewid" />
     </set>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/mapping/MapController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/mapping/MapController.java	2012-10-26 15:53:06 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/mapping/MapController.java	2012-10-31 06:11:09 +0000
@@ -100,7 +100,7 @@
 
         mergeMap( map );
         
-        for ( MapView view : map.getViews() )
+        for ( MapView view : map.getMapViews() )
         {
             mergeMapView( view );
             
@@ -125,7 +125,7 @@
             return;
         }
 
-        Iterator<MapView> views = map.getViews().iterator();
+        Iterator<MapView> views = map.getMapViews().iterator();
         
         while ( views.hasNext() )
         {
@@ -138,7 +138,7 @@
 
         mergeMap( newMap );
 
-        for ( MapView view : newMap.getViews() )
+        for ( MapView view : newMap.getMapViews() )
         {
             mergeMapView( view );
             
@@ -163,7 +163,7 @@
             return;
         }
 
-        Iterator<MapView> views = map.getViews().iterator();
+        Iterator<MapView> views = map.getMapViews().iterator();
         
         while ( views.hasNext() )
         {