dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9780
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-02-10 15:06:34 +0200
message:
  Fixed compilation error in light module
modified:
  dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.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-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java	2013-02-01 07:09:23 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java	2013-02-10 13:06:34 +0000
@@ -39,7 +39,6 @@
 import org.apache.struts2.ServletActionContext;
 import org.hisp.dhis.dataelement.DataElementCategoryService;
 import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.i18n.I18nFormat;
 import org.hisp.dhis.light.utils.NamebasedUtils;
 import org.hisp.dhis.patient.Patient;
 import org.hisp.dhis.patient.PatientService;
@@ -401,8 +400,6 @@
         return validated;
     }
 
-    private I18nFormat format;
-
     private List<ProgramValidationResult> programValidationResults;
 
     public List<ProgramValidationResult> getProgramValidationResults()
@@ -567,11 +564,11 @@
 
         if ( validations != null )
         {
-            for ( ProgramValidation validation : validations )
+            Collection<ProgramValidationResult> validationResults = programValidationService.validate( validations,
+                programStageInstance );
+            
+            for ( ProgramValidationResult validationResult : validationResults )
             {
-                ProgramValidationResult validationResult = programValidationService.validate( validation,
-                    programStageInstance, format );
-
                 if ( validationResult != null )
                 {
                     programValidationResults.add( validationResult );