=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14TypeHandler.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14TypeHandler.java 2012-06-27 20:01:50 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/util/Dhis14TypeHandler.java 2013-04-15 14:03:44 +0000 @@ -46,7 +46,7 @@ public static String convertBooleanToDhis14( String value ) { - return (String) (value.equals("true") ? "1" : "0"); + return value.equals("true") ? "1" : "0"; } public static boolean convertBooleanFromDhis14( String value ) === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/synchronous/ExportPivotViewService.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/synchronous/ExportPivotViewService.java 2011-12-26 10:07:59 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/synchronous/ExportPivotViewService.java 2013-04-15 14:03:44 +0000 @@ -67,7 +67,7 @@ public enum RequestType { DATAVALUE, INDICATORVALUE - }; + } public static int PRECISION = 5; === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipAnalyzer.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipAnalyzer.java 2010-09-30 11:22:27 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipAnalyzer.java 2013-04-15 14:03:44 +0000 @@ -47,13 +47,14 @@ static { - knownDataStreams.add( "Data_CROSS.xml" ); // sdmx cross sectional data file - knownDataStreams.add( "GMS_INDICATOR.xml" ); // sdmx indicator metadata - knownDataStreams.add( "xl/workbook.xml" ); // xslsx file - knownDataStreams.add( "content.xml" ); // xslsx file + knownDataStreams.add( "Data_CROSS.xml" ); // sdmx cross sectional data file + knownDataStreams.add( "GMS_INDICATOR.xml" ); // sdmx indicator metadata + knownDataStreams.add( "xl/workbook.xml" ); // xslsx file + knownDataStreams.add( "content.xml" ); // xslsx file } - public static InputStream getTransformableStream( ZipFile zipFile ) throws IOException + public static InputStream getTransformableStream( ZipFile zipFile ) + throws IOException { InputStream resultStream = null; Enumeration entries = zipFile.entries(); @@ -63,7 +64,8 @@ { ZipEntry entry = zipFile.entries().nextElement(); resultStream = zipFile.getInputStream( entry ); - } else + } + else { while ( entries.hasMoreElements() ) {