dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2281
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2010-12-04 01:05:04 +0100
message:
  Minor fix
modified:
  dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.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-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java	2010-12-04 00:03:38 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java	2010-12-04 00:05:04 +0000
@@ -233,26 +233,6 @@
         // ---------------------------------------------------------------------
         // Filter and get operands
         // ---------------------------------------------------------------------
-
-        /*
-        final Collection<Integer> nonCalculatedDataElementIds = ConversionUtils.getIdentifiers( DataElement.class, nonCalculatedDataElements );
-        final Set<Integer> dataElementInIndicatorIds = getDataElementIdsInIndicators( indicators );
-        final Set<Integer> dataElementInCalculatedDataElementIds = getDataElementIdsInCalculatedDataElements( calculatedDataElements );
-
-        final Set<Integer> allDataElementIds = new HashSet<Integer>();
-        allDataElementIds.addAll( nonCalculatedDataElementIds );
-        allDataElementIds.addAll( dataElementInIndicatorIds );
-        allDataElementIds.addAll( dataElementInCalculatedDataElementIds );
-
-        final Collection<DataElementOperand> allDataElementOperands = categoryService
-            .getOperandsByIds( allDataElementIds );
-        final Collection<DataElementOperand> dataElementInIndicatorOperands = categoryService
-            .getOperandsByIds( dataElementInIndicatorIds );
-        final Collection<DataElementOperand> dataElementInCalculatedDataElementOperands = categoryService
-            .getOperandsByIds( dataElementInCalculatedDataElementIds );
-        final Collection<DataElementOperand> nonCalculatedDataElementOperands = categoryService
-            .getOperandsByIds( nonCalculatedDataElementIds );
-            */
         
         Collection<DataElementOperand> nonCalculatedOperands = categoryService.getOperands( nonCalculatedDataElements );
         Collection<DataElementOperand> indicatorOperands = categoryService.populateOperands( getOperandsInIndicators( indicators ) );