dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12728
committer: dhis2-c <dhis2@xxxxxxxxxxxxxx>
branch nick: trunk
timestamp: Wed 2013-10-16 09:46:59 -0400
message:
  Change ValidationRunType.ALERT to ValidationRunType.SCHEDULED
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRunType.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/Validator.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidatorThread.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/scheduling/MonitoringTask.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-core/src/main/java/org/hisp/dhis/validation/ValidationRunType.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRunType.java	2013-10-09 05:16:53 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidationRunType.java	2013-10-16 13:46:59 +0000
@@ -33,5 +33,6 @@
  */
 public enum ValidationRunType
 {
-    INTERACTIVE, ALERT
+    INTERACTIVE,
+    SCHEDULED
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/Validator.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/Validator.java	2013-10-16 12:39:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/Validator.java	2013-10-16 13:46:59 +0000
@@ -72,7 +72,7 @@
         ConstantService constantService, ExpressionService expressionService, PeriodService periodService, DataValueService dataValueService)
     {
         ValidationRunContext context = ValidationRunContext.getNewValidationRunContext( sources, periods, rules,
-            constantService.getConstantMap(), ValidationRunType.ALERT, lastAlertRun,
+            constantService.getConstantMap(), ValidationRunType.SCHEDULED, lastAlertRun,
             expressionService, periodService, dataValueService );
 
         int threadPoolSize = getThreadPoolSize( context );

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidatorThread.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidatorThread.java	2013-10-16 13:41:01 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/ValidatorThread.java	2013-10-16 13:46:59 +0000
@@ -229,7 +229,7 @@
     {
         boolean evaluate = true; // Assume true for now.
 
-        if ( ValidationRunType.ALERT == context.getRunType() )
+        if ( ValidationRunType.SCHEDULED == context.getRunType() )
         {
             if ( context.getLastAlertRun() != null ) // True if no previous alert run
             {

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/scheduling/MonitoringTask.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/scheduling/MonitoringTask.java	2013-10-15 12:45:25 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/scheduling/MonitoringTask.java	2013-10-16 13:46:59 +0000
@@ -162,7 +162,7 @@
         log.info( "alertRun sources[" + sources.size() + "] periods[" + periods.size() + "] rules[" + rules.size()
             + "] last run " + lastAlertRun == null ? "(none)" : lastAlertRun );
         
-        Collection<ValidationResult> results = Validator.validate( sources, periods, rules, ValidationRunType.ALERT,
+        Collection<ValidationResult> results = Validator.validate( sources, periods, rules, ValidationRunType.SCHEDULED,
             lastAlertRun, constantService, expressionService, periodService, dataValueService );
         
         log.trace( "alertRun() results[" + results.size() + "]" );