dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 218
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-04-21 18:32:31 +0200
message:
  Renamed all MapLegendSet methods
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:21:49 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingService.java	2009-04-21 16:32:31 +0000
@@ -29,9 +29,7 @@
 
 import java.util.Collection;
 
-import org.hisp.dhis.gis.Legend;
 import org.hisp.dhis.gis.LegendSet;
-import org.hisp.dhis.indicator.Indicator;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
 
@@ -250,13 +248,15 @@
     // LegendSet
     // -------------------------------------------------------------------------    
     
-    int addLegendSet( LegendSet legendSet );
-    
-    void deleteLegendSet( LegendSet legendSet );
-    
-    LegendSet getLegendSet( int id );
-    
-    LegendSet getLegendSetByIndicator( int indicatorId );
-    
-    Collection<LegendSet> getAllLegendSets();
+    int addMapLegendSet( LegendSet legendSet );
+    
+    void deleteMapLegendSet( LegendSet legendSet );
+    
+    LegendSet getMapLegendSet( int id );
+    
+    LegendSet getMapLegendSetByIndicator( int indicatorId );
+    
+    Collection<LegendSet> 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:21:49 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MappingStore.java	2009-04-21 16:32:31 +0000
@@ -29,9 +29,7 @@
 
 import java.util.Collection;
 
-import org.hisp.dhis.gis.Legend;
 import org.hisp.dhis.gis.LegendSet;
-import org.hisp.dhis.indicator.Indicator;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
 
@@ -169,11 +167,11 @@
     // LegendSet
     // -------------------------------------------------------------------------    
     
-    int addLegendSet( LegendSet legendSet );
-    
-    void deleteLegendSet( LegendSet legendSet );
-    
-    LegendSet getLegendSet( int id );
-    
-    Collection<LegendSet> getAllLegendSets();    
+    int addMapLegendSet( LegendSet legendSet );
+    
+    void deleteMapLegendSet( LegendSet legendSet );
+    
+    LegendSet getMapLegendSet( int id );
+    
+    Collection<LegendSet> 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:24:05 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java	2009-04-21 16:32:31 +0000
@@ -267,26 +267,26 @@
     // LegendSet
     // -------------------------------------------------------------------------    
     
-    public int addLegendSet( LegendSet legendSet )
-    {
-        return mappingStore.addLegendSet( legendSet );
-    }
-    
-    public void deleteLegendSet( LegendSet legendSet )
-    {
-        mappingStore.deleteLegendSet( legendSet );
-    }
-    
-    public LegendSet getLegendSet( int id )
-    {
-        return mappingStore.getLegendSet( id );
-    }
-    
-    public LegendSet getLegendSetByIndicator( int indicatorId )
+    public int addMapLegendSet( LegendSet legendSet )
+    {
+        return mappingStore.addMapLegendSet( legendSet );
+    }
+    
+    public void deleteMapLegendSet( LegendSet legendSet )
+    {
+        mappingStore.deleteMapLegendSet( legendSet );
+    }
+    
+    public LegendSet getMapLegendSet( int id )
+    {
+        return mappingStore.getMapLegendSet( id );
+    }
+    
+    public LegendSet getMapLegendSetByIndicator( int indicatorId )
     {
         Indicator indicator = indicatorService.getIndicator( indicatorId );
         
-        Collection<LegendSet> legendSets = mappingStore.getAllLegendSets();
+        Collection<LegendSet> legendSets = mappingStore.getAllMapLegendSets();
         
         for ( LegendSet legendSet : legendSets )
         {
@@ -299,16 +299,16 @@
         return null;
     }
     
-    public Collection<LegendSet> getAllLegendSets()
+    public Collection<LegendSet> getAllMapLegendSets()
     {
-        return mappingStore.getAllLegendSets();
+        return mappingStore.getAllMapLegendSets();
     }
     
-    public boolean indicatorHasLegendSet( int indicatorId )
+    public boolean indicatorHasMapLegendSet( int indicatorId )
     {
         Indicator indicator = indicatorService.getIndicator( indicatorId );
         
-        Collection<LegendSet> legendSets = mappingStore.getAllLegendSets();
+        Collection<LegendSet> legendSets = mappingStore.getAllMapLegendSets();
         
         for ( LegendSet legendSet : legendSets )
         {

=== 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:24:05 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java	2009-04-21 16:32:31 +0000
@@ -195,21 +195,21 @@
     // LegendSet
     // -------------------------------------------------------------------------    
     
-    public int addLegendSet( LegendSet legendSet )
+    public int addMapLegendSet( LegendSet legendSet )
     {
         Session session = sessionManager.getCurrentSession();
 
         return (Integer) session.save( legendSet );
     }
     
-    public void deleteLegendSet( LegendSet legendSet )
+    public void deleteMapLegendSet( LegendSet legendSet )
     {
         Session session = sessionManager.getCurrentSession();
 
         session.update( legendSet );
     }
     
-    public LegendSet getLegendSet( int id )
+    public LegendSet getMapLegendSet( int id )
     {
         Session session = sessionManager.getCurrentSession();
 
@@ -217,7 +217,7 @@
     }
     
     @SuppressWarnings("unchecked")
-    public Collection<LegendSet> getAllLegendSets()
+    public Collection<LegendSet> 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.