=== modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SectionFormAction.java' --- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SectionFormAction.java 2010-11-12 11:12:37 +0000 +++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SectionFormAction.java 2011-03-22 10:30:57 +0000 @@ -259,10 +259,10 @@ calculatedValueMap = new HashMap(); - Map factorMap; + Map factorMap; DataValue dataValue; - int factor; + Double factor; int value = 0; for ( DataElement dataElement : dataElements ) === modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java' --- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java 2010-09-08 12:56:29 +0000 +++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/SelectAction.java 2011-03-22 10:30:57 +0000 @@ -230,9 +230,9 @@ return calculatedDataElementIds; } - private Map> calculatedDataElementMap; + private HashMap> calculatedDataElementMap; - public Map> getCalculatedDataElementMap() + public Map> getCalculatedDataElementMap() { return calculatedDataElementMap; } @@ -405,7 +405,7 @@ // --------------------------------------------------------------------- calculatedDataElementIds = new HashSet(); - calculatedDataElementMap = new HashMap>(); + calculatedDataElementMap = new HashMap>(); CalculatedDataElement cde; for ( DataElement dataElement : selectedDataSet.getDataElements() ) === modified file 'local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/multidimensional/SelectAction.java' --- local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/multidimensional/SelectAction.java 2010-06-04 11:50:05 +0000 +++ local/in/dhis-web-dataentry-linelisting/src/main/java/org/hisp/dhis/den/action/multidimensional/SelectAction.java 2011-03-22 10:30:57 +0000 @@ -165,9 +165,9 @@ return calculatedDataElementIds; } - private Map> calculatedDataElementMap; + private Map> calculatedDataElementMap; - public Map> getCalculatedDataElementMap() + public Map> getCalculatedDataElementMap() { return calculatedDataElementMap; } @@ -320,7 +320,7 @@ // --------------------------------------------------------------------- calculatedDataElementIds = new HashSet(); - calculatedDataElementMap = new HashMap>(); + calculatedDataElementMap = new HashMap>(); CalculatedDataElement cde; for ( DataElement dataElement : selectedDataSet.getDataElements() )