dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13345
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-12-20 14:23:31 +0100
message:
  minor fix
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.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/dataelement/DataElementCategoryService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java	2013-12-20 12:55:20 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java	2013-12-20 13:23:31 +0000
@@ -28,13 +28,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import org.hisp.dhis.concept.Concept;
+import org.hisp.dhis.hierarchy.HierarchyViolationException;
+
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 
-import org.hisp.dhis.concept.Concept;
-import org.hisp.dhis.hierarchy.HierarchyViolationException;
-
 /**
  * @author Abyot Asalefew
  */
@@ -94,10 +94,10 @@
      * @return a collection of DataElementCategories.
      */
     Collection<DataElementCategory> getDataElementCategories( Collection<Integer> identifiers );
-    
+
     /**
      * Retrieves the DataElementCategories with the given uids.
-     * 
+     *
      * @param uids the uids of the DataElementCategories to retrieve.
      * @return a collection of DataElementCategories.
      */
@@ -113,16 +113,16 @@
 
     /**
      * Returns DataElementCategories which are considered data dimensions.
-     * 
+     *
      * @return DataElementCategories which are considered data dimensions.
      */
     Collection<DataElementCategory> getDataDimensionDataElementCategories();
-    
+
     /**
      * Returns all DataElementCategories.
      *
      * @return a collection of all DataElementCategories, or an empty collection if there
-     *         are no DataElementCategories.
+     * are no DataElementCategories.
      */
     Collection<DataElementCategory> getAllDataElementCategories();
 
@@ -197,7 +197,7 @@
      * @return a Collection of DataElementCategoryOptions.
      */
     Collection<DataElementCategoryOption> getDataElementCategoryOptionsByUid( Collection<String> uids );
-    
+
     /**
      * Retrieves the DataElementCategoryOption with the given name.
      *
@@ -218,7 +218,7 @@
      * Returns all DataElementCategoryOptions.
      *
      * @return a collection of all DataElementCategoryOptions, or an empty collection if there
-     *         are no DataElementCategoryOptions.
+     * are no DataElementCategoryOptions.
      */
     Collection<DataElementCategoryOption> getAllDataElementCategoryOptions();
 
@@ -227,9 +227,9 @@
      *
      * @param concept the Concept
      * @return a collection of all DataElementCategoryOptions, or an empty collection if there
-     *         are no DataElementCategoryOptions.
+     * are no DataElementCategoryOptions.
      */
-    Collection<DataElementCategoryOption> getDataElementCategorOptionsByConcept( Concept concept );
+    Collection<DataElementCategoryOption> getDataElementCategoryOptionsByConcept( Concept concept );
 
     // -------------------------------------------------------------------------
     // CategoryCombo
@@ -362,7 +362,7 @@
      * @return a Collection of DataElementCategoryOptionCombos.
      */
     Collection<DataElementCategoryOptionCombo> getDataElementCategoryOptionCombos( Collection<Integer> identifiers );
-    
+
     Collection<DataElementCategoryOptionCombo> getDataElementCategoryOptionCombosByUid( Collection<String> uids );
 
     /**
@@ -382,7 +382,7 @@
      * @return a DataElementCategoryOptionCombo.
      */
     DataElementCategoryOptionCombo getDataElementCategoryOptionCombo( DataElementCategoryOptionCombo categoryOptionCombo );
-    
+
     DataElementCategoryOptionCombo getDataElementCategoryOptionCombo( DataElementCategoryCombo categoryCombo, Set<DataElementCategoryOption> categoryOptions );
 
     /**
@@ -436,7 +436,7 @@
      * combos.
      */
     void updateAllOptionCombos();
-    
+
     /**
      * Populates all transient properties on each Operand in the given collection.
      *
@@ -489,9 +489,9 @@
      * @return a collection of all DataElementCategories, or an empty collection.
      */
     Collection<DataElementCategory> getDataElementCategorysByConcept( Concept concept );
-    
+
     Map<String, Integer> getDataElementCategoryOptionComboUidIdMap();
-    
+
     int getDataElementCategoryCount();
 
     int getDataElementCategoryCountByName( String name );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java	2013-12-20 12:55:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java	2013-12-20 13:23:31 +0000
@@ -307,7 +307,7 @@
     }
 
     @Override
-    public Collection<DataElementCategoryOption> getDataElementCategorOptionsByConcept( Concept concept )
+    public Collection<DataElementCategoryOption> getDataElementCategoryOptionsByConcept( Concept concept )
     {
         return categoryOptionStore.getByConcept( concept );
     }