dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7868
committer: Magnus Korvald <korvald@xxxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2012-08-07 08:42:24 +0200
message:
  Commented out no longer existing class
modified:
  dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/utils/FormUtils.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-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/utils/FormUtils.java'
--- dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/utils/FormUtils.java	2012-06-18 06:14:19 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/java/org/hisp/dhis/sms/utils/FormUtils.java	2012-08-07 06:42:24 +0000
@@ -49,7 +49,7 @@
 import org.hisp.dhis.expression.ExpressionService;
 import org.hisp.dhis.minmax.MinMaxDataElement;
 import org.hisp.dhis.minmax.MinMaxDataElementService;
-import org.hisp.dhis.minmax.validation.MinMaxValuesGenerationService;
+//import org.hisp.dhis.minmax.validation.MinMaxValuesGenerationService;
 import org.hisp.dhis.setting.SystemSettingManager;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
@@ -128,12 +128,12 @@
         this.systemSettingManager = systemSettingManager;
     }
 
-    private MinMaxValuesGenerationService minMaxValuesGenerationService;
-
-    public void setMinMaxValuesGenerationService( MinMaxValuesGenerationService minMaxValuesGenerationService )
-    {
-        this.minMaxValuesGenerationService = minMaxValuesGenerationService;
-    }
+//    private MinMaxValuesGenerationService minMaxValuesGenerationService;
+//
+//    public void setMinMaxValuesGenerationService( MinMaxValuesGenerationService minMaxValuesGenerationService )
+//    {
+//        this.minMaxValuesGenerationService = minMaxValuesGenerationService;
+//    }
 
     private MinMaxDataElementService minMaxDataElementService;
 
@@ -175,26 +175,26 @@
             Double factor = (Double) systemSettingManager.getSystemSetting(
                 SystemSettingManager.KEY_FACTOR_OF_DEVIATION, 2.0 );
 
-            Collection<DeflatedDataValue> stdDevs = stdDevOutlierAnalysisService.analyse( organisationUnit,
-                dataElements, ListUtils.getCollection( period ), factor );
-
-            Collection<DeflatedDataValue> minMaxs = minMaxOutlierAnalysisService.analyse( organisationUnit,
-                dataElements, ListUtils.getCollection( period ), null );
-
-            deflatedDataValues = CollectionUtils.union( stdDevs, minMaxs );
+//            Collection<DeflatedDataValue> stdDevs = stdDevOutlierAnalysisService.analyse( organisationUnit,
+//                dataElements, ListUtils.getCollection( period ), factor );
+//
+//            Collection<DeflatedDataValue> minMaxs = minMaxOutlierAnalysisService.analyse( organisationUnit,
+//                dataElements, ListUtils.getCollection( period ), null );
+
+//            deflatedDataValues = CollectionUtils.union( stdDevs, minMaxs );
         }
         else
         {
-            deflatedDataValues = minMaxValuesGenerationService.findOutliers( organisationUnit,
-                ListUtils.getCollection( period ), minmaxs );
+//            deflatedDataValues = minMaxValuesGenerationService.findOutliers( organisationUnit,
+//                ListUtils.getCollection( period ), minmaxs );
         }
 
-        for ( DeflatedDataValue deflatedDataValue : deflatedDataValues )
-        {
-            String key = String.format( "DE%dOC%d", deflatedDataValue.getDataElementId(),
-                deflatedDataValue.getCategoryOptionComboId() );
-            validationErrorMap.put( key, deflatedDataValue );
-        }
+//        for ( DeflatedDataValue deflatedDataValue : deflatedDataValues )
+//        {
+//            String key = String.format( "DE%dOC%d", deflatedDataValue.getDataElementId(),
+//                deflatedDataValue.getCategoryOptionComboId() );
+//            validationErrorMap.put( key, deflatedDataValue );
+//        }
 
         return validationErrorMap;
     }