dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10847
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-05-15 14:43:03 +0200
message:
  Cleanup
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitHierarchyConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ReportTableConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipAnalyzer.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-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitHierarchyConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitHierarchyConverter.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitHierarchyConverter.java	2013-05-15 12:43:03 +0000
@@ -94,7 +94,7 @@
     {
         this.importObjectService = importObjectService;
         this.organisationUnitService = organisationUnitService;
-        this.organisationUnitMapping = new MimicingHashMap<Object, Integer>();;
+        this.organisationUnitMapping = new MimicingHashMap<Object, Integer>();
     }
     
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ReportTableConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ReportTableConverter.java	2013-05-15 12:34:55 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ReportTableConverter.java	2013-05-15 12:43:03 +0000
@@ -93,7 +93,6 @@
     private static final String FIELD_PARAM_ORG_UNIT = "paramOrganisationUnit";
         
     private Map<Object, Integer> dataElementMapping;
-    private Map<Object, Integer> categoryComboMapping;
     private Map<Object, Integer> indicatorMapping;
     private Map<Object, Integer> dataSetMapping;
     private Map<Object, Integer> periodMapping;
@@ -156,7 +155,6 @@
         this.periodService = periodService;
         this.organisationUnitService = organisationUnitService;
         this.dataElementMapping = dataElementMapping;
-        this.categoryComboMapping = categoryComboMapping;
         this.indicatorMapping = indicatorMapping;
         this.dataSetMapping = dataSetMapping;
         this.periodMapping = periodMapping;
@@ -305,7 +303,6 @@
             }
             
             reader.moveToStartElement( FIELD_CATEGORY_COMBO );
-            String cc = reader.getElementValue();
             
             reader.moveToStartElement( FIELD_DO_INDICATORS );
             reportTable.setDoIndicators( Boolean.parseBoolean( reader.getElementValue() ) );

=== 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	2013-04-15 14:03:44 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/zip/ZipAnalyzer.java	2013-05-15 12:43:03 +0000
@@ -76,6 +76,7 @@
                 }
             }
         }
+        
         return resultStream;
     }
 }