dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 219
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-04-21 18:40:40 +0200
message:
  Changed from LegendSet to MapLegendSet in MappingService
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingStore.java
  dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java
  dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java	2009-04-21 16:32:31 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java	2009-04-21 16:40:40 +0000
@@ -29,7 +29,6 @@
 
 import java.util.Collection;
 
-import org.hisp.dhis.gis.LegendSet;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
 
@@ -248,15 +247,15 @@
     // LegendSet
     // -------------------------------------------------------------------------    
     
-    int addMapLegendSet( LegendSet legendSet );
-    
-    void deleteMapLegendSet( LegendSet legendSet );
-    
-    LegendSet getMapLegendSet( int id );
-    
-    LegendSet getMapLegendSetByIndicator( int indicatorId );
-    
-    Collection<LegendSet> getAllMapLegendSets();
+    int addMapLegendSet( MapLegendSet legendSet );
+    
+    void deleteMapLegendSet( MapLegendSet legendSet );
+    
+    MapLegendSet getMapLegendSet( int id );
+    
+    MapLegendSet getMapLegendSetByIndicator( int indicatorId );
+    
+    Collection<MapLegendSet> getAllMapLegendSets();
     
     boolean indicatorHasMapLegendSet( int indicatorId );
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingStore.java	2009-04-21 16:32:31 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingStore.java	2009-04-21 16:40:40 +0000
@@ -29,7 +29,6 @@
 
 import java.util.Collection;
 
-import org.hisp.dhis.gis.LegendSet;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
 
@@ -167,11 +166,11 @@
     // LegendSet
     // -------------------------------------------------------------------------    
     
-    int addMapLegendSet( LegendSet legendSet );
-    
-    void deleteMapLegendSet( LegendSet legendSet );
-    
-    LegendSet getMapLegendSet( int id );
-    
-    Collection<LegendSet> getAllMapLegendSets();    
+    int addMapLegendSet( MapLegendSet legendSet );
+    
+    void deleteMapLegendSet( MapLegendSet legendSet );
+    
+    MapLegendSet getMapLegendSet( int id );
+    
+    Collection<MapLegendSet> getAllMapLegendSets();    
 }

=== modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java	2009-04-21 16:32:31 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java	2009-04-21 16:40:40 +0000
@@ -31,7 +31,6 @@
 import java.util.Collection;
 import java.util.Set;
 
-import org.hisp.dhis.gis.LegendSet;
 import org.hisp.dhis.indicator.Indicator;
 import org.hisp.dhis.indicator.IndicatorService;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -267,28 +266,28 @@
     // LegendSet
     // -------------------------------------------------------------------------    
     
-    public int addMapLegendSet( LegendSet legendSet )
+    public int addMapLegendSet( MapLegendSet legendSet )
     {
         return mappingStore.addMapLegendSet( legendSet );
     }
     
-    public void deleteMapLegendSet( LegendSet legendSet )
+    public void deleteMapLegendSet( MapLegendSet legendSet )
     {
         mappingStore.deleteMapLegendSet( legendSet );
     }
     
-    public LegendSet getMapLegendSet( int id )
+    public MapLegendSet getMapLegendSet( int id )
     {
         return mappingStore.getMapLegendSet( id );
     }
     
-    public LegendSet getMapLegendSetByIndicator( int indicatorId )
+    public MapLegendSet getMapLegendSetByIndicator( int indicatorId )
     {
         Indicator indicator = indicatorService.getIndicator( indicatorId );
         
-        Collection<LegendSet> legendSets = mappingStore.getAllMapLegendSets();
+        Collection<MapLegendSet> legendSets = mappingStore.getAllMapLegendSets();
         
-        for ( LegendSet legendSet : legendSets )
+        for ( MapLegendSet legendSet : legendSets )
         {
             if ( legendSet.getIndicators().contains( indicator ))
             {
@@ -299,7 +298,7 @@
         return null;
     }
     
-    public Collection<LegendSet> getAllMapLegendSets()
+    public Collection<MapLegendSet> getAllMapLegendSets()
     {
         return mappingStore.getAllMapLegendSets();
     }
@@ -308,9 +307,9 @@
     {
         Indicator indicator = indicatorService.getIndicator( indicatorId );
         
-        Collection<LegendSet> legendSets = mappingStore.getAllMapLegendSets();
+        Collection<MapLegendSet> legendSets = mappingStore.getAllMapLegendSets();
         
-        for ( LegendSet legendSet : legendSets )
+        for ( MapLegendSet legendSet : legendSets )
         {
             if ( legendSet.getIndicators().contains( indicator ))
             {

=== modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java	2009-04-21 16:32:31 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java	2009-04-21 16:40:40 +0000
@@ -33,9 +33,9 @@
 import org.hibernate.Query;
 import org.hibernate.Session;
 import org.hibernate.criterion.Restrictions;
-import org.hisp.dhis.gis.LegendSet;
 import org.hisp.dhis.hibernate.HibernateSessionManager;
 import org.hisp.dhis.mapping.Map;
+import org.hisp.dhis.mapping.MapLegendSet;
 import org.hisp.dhis.mapping.MapOrganisationUnitRelation;
 import org.hisp.dhis.mapping.MappingStore;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -195,29 +195,29 @@
     // LegendSet
     // -------------------------------------------------------------------------    
     
-    public int addMapLegendSet( LegendSet legendSet )
+    public int addMapLegendSet( MapLegendSet legendSet )
     {
         Session session = sessionManager.getCurrentSession();
 
         return (Integer) session.save( legendSet );
     }
     
-    public void deleteMapLegendSet( LegendSet legendSet )
+    public void deleteMapLegendSet( MapLegendSet legendSet )
     {
         Session session = sessionManager.getCurrentSession();
 
         session.update( legendSet );
     }
     
-    public LegendSet getMapLegendSet( int id )
+    public MapLegendSet getMapLegendSet( int id )
     {
         Session session = sessionManager.getCurrentSession();
 
-        return (LegendSet) session.get( LegendSet.class, id );
+        return (MapLegendSet) session.get( MapLegendSet.class, id );
     }
     
     @SuppressWarnings("unchecked")
-    public Collection<LegendSet> getAllMapLegendSets()
+    public Collection<MapLegendSet> getAllMapLegendSets()
     {
         Session session = sessionManager.getCurrentSession();
 



--
Trunk
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.