dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 152
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Fri 2009-04-03 23:49:51 +0200
message:
  Fixed bug related to import of CalculatedDataElements
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractCalculatedDataElementConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementConverter.java

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractCalculatedDataElementConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractCalculatedDataElementConverter.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractCalculatedDataElementConverter.java	2009-04-03 21:49:51 +0000
@@ -49,7 +49,7 @@
         dataElementService.addDataElement( object );
     }
     
-    protected void importMatching( CalculatedDataElement match, CalculatedDataElement object )
+    protected void importMatching( CalculatedDataElement object, CalculatedDataElement match )
     {
         match.setUuid( object.getUuid() );
         match.setName( object.getName() );

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementConverter.java	2009-03-09 22:33:48 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementConverter.java	2009-04-03 21:49:51 +0000
@@ -144,7 +144,7 @@
         {
             final DataElement element = new DataElement();
             
-            DataElementCategoryCombo categoryCombo = new DataElementCategoryCombo();
+            final DataElementCategoryCombo categoryCombo = new DataElementCategoryCombo();
             element.setCategoryCombo( categoryCombo );
             
             reader.moveToStartElement( FIELD_ID );



--
Trunk
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.