dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17716
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-12-16 18:08:27 +0100
message:
  minor fix
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/PdfDataEntryFormImportUtil.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-api/src/main/java/org/hisp/dhis/webapi/utils/PdfDataEntryFormImportUtil.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/PdfDataEntryFormImportUtil.java	2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/PdfDataEntryFormImportUtil.java	2014-12-16 17:08:27 +0000
@@ -28,13 +28,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.io.InputStream;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
+import com.lowagie.text.pdf.AcroFields;
+import com.lowagie.text.pdf.PdfReader;
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementService;
 import org.hisp.dhis.dxf2.pdfform.PdfDataEntryFormUtil;
@@ -53,8 +48,12 @@
 import org.hisp.dhis.user.CurrentUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.lowagie.text.pdf.AcroFields;
-import com.lowagie.text.pdf.PdfReader;
+import java.io.InputStream;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 
 public class PdfDataEntryFormImportUtil
 {
@@ -87,7 +86,7 @@
     // METHODS
     // -------------------------------------------------------------------------
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings( "unchecked" )
     public void ImportProgramStage( InputStream in, I18nFormat format )
         throws Exception
     {
@@ -145,12 +144,12 @@
 
         // For each row, add new programStageInstance and add data elements
         // to it.
-        for ( Map.Entry<Integer, ProgramStageInstanceStoage> entry : programStageInstanceDataManager
+        for ( Map.Entry<Integer, ProgramStageInstanceStorage> entry : programStageInstanceDataManager
             .getProgramStageInstanceData().entrySet() )
         {
-            ProgramStageInstanceStoage programStageInstanceStoage = entry.getValue();
+            ProgramStageInstanceStorage programStageInstanceStorage = entry.getValue();
 
-            int date = programStageInstanceStoage.getDate();
+            int date = programStageInstanceStorage.getDate();
             executeDateCal.set( Calendar.DATE, date );
             Date executionDate = executeDateCal.getTime();
 
@@ -160,7 +159,7 @@
 
             programStageInstance = programStageInstanceService.getProgramStageInstance( programStageInstanceId );
 
-            for ( Map.Entry<Integer, String> dataElementsEntry : programStageInstanceStoage.getDataElementsValue()
+            for ( Map.Entry<Integer, String> dataElementsEntry : programStageInstanceStorage.getDataElementsValue()
                 .entrySet() )
             {
                 Integer dataElementId = dataElementsEntry.getKey();
@@ -263,9 +262,9 @@
 
     class ProgramStageInstanceDataManager
     {
-        Map<Integer, ProgramStageInstanceStoage> programStageInstanceData;
+        Map<Integer, ProgramStageInstanceStorage> programStageInstanceData;
 
-        public Map<Integer, ProgramStageInstanceStoage> getProgramStageInstanceData()
+        public Map<Integer, ProgramStageInstanceStorage> getProgramStageInstanceData()
         {
             return programStageInstanceData;
         }
@@ -289,10 +288,10 @@
             else
             {
                 // Create and add
-                ProgramStageInstanceStoage programStageInstanceStoage = new ProgramStageInstanceStoage();
-                programStageInstanceStoage.setDate( date );
+                ProgramStageInstanceStorage programStageInstanceStorage = new ProgramStageInstanceStorage();
+                programStageInstanceStorage.setDate( date );
 
-                programStageInstanceData.put( rowNumber, programStageInstanceStoage );
+                programStageInstanceData.put( rowNumber, programStageInstanceStorage );
             }
 
         }
@@ -309,17 +308,16 @@
             else
             {
                 // Create and add
-                ProgramStageInstanceStoage programStageInstanceStoage = new ProgramStageInstanceStoage();
-                programStageInstanceStoage.addDataElements( dataElementId, value );
+                ProgramStageInstanceStorage programStageInstanceStorage = new ProgramStageInstanceStorage();
+                programStageInstanceStorage.addDataElements( dataElementId, value );
 
-                programStageInstanceData.put( rowNumber, programStageInstanceStoage );
+                programStageInstanceData.put( rowNumber, programStageInstanceStorage );
             }
 
         }
-
     }
 
-    class ProgramStageInstanceStoage
+    class ProgramStageInstanceStorage
     {
         int date;
 
@@ -348,7 +346,7 @@
         // CONSTRUCTOR
         // -------------------------------------------------------------------------
 
-        public ProgramStageInstanceStoage()
+        public ProgramStageInstanceStorage()
         {
             dataElementsValue = new HashMap<>();
         }