dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1246
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2009-12-18 09:47:45 +0100
message:
  Fixed poorly implemented equals method in DataElementCategory. Led to DataElementCategoryComboCategoryAssociationConverter not working properly.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CategoryComboCategoryAssociationConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/NameMappingUtil.java
  dhis-2/pom.xml


--
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-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java	2009-11-05 19:04:58 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java	2009-12-18 08:47:45 +0000
@@ -100,7 +100,7 @@
             return false;
         }
         
-        if ( getClass() != object.getClass() )
+        if ( !(object instanceof DataElementCategory) )
         {
             return false;
         }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CategoryComboCategoryAssociationConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CategoryComboCategoryAssociationConverter.java	2009-12-16 10:41:19 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/CategoryComboCategoryAssociationConverter.java	2009-12-18 08:47:45 +0000
@@ -29,8 +29,6 @@
 
 import java.util.Collection;
 import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import org.amplecode.quick.BatchHandler;
 import org.amplecode.staxwax.reader.XMLReader;
@@ -54,8 +52,6 @@
 public class CategoryComboCategoryAssociationConverter
     extends AbstractGroupMemberConverter implements XMLConverter
 {
-    private static final Log log = LogFactory.getLog(CategoryComboCategoryAssociationConverter.class);
-
     public static final String COLLECTION_NAME = "categoryComboCategoryAssociations";
     public static final String ELEMENT_NAME = "categoryComboCategoryAssociation";
     
@@ -111,8 +107,10 @@
     public void write( XMLWriter writer, ExportParams params )
     {
         Collection<DataElementCategoryCombo> categoryCombos = categoryService.getDataElementCategoryCombos( params.getCategoryCombos() );
-        
-        if ( categoryCombos != null && categoryCombos.size() > 0 )
+        System.out.println( "catcom size " + categoryCombos.size() );
+        Collection<DataElementCategory> categories = categoryService.getDataElementCategories( params.getCategories() );
+        System.out.println( "cat size " + categories.size() );
+        if ( categoryCombos != null && categoryCombos.size() > 0 && categories != null && categories.size() > 0 )
         {
             writer.openElement( COLLECTION_NAME );
             
@@ -124,6 +122,10 @@
                     
                     for ( DataElementCategory category : categoryCombo.getCategories() )
                     {
+                    	System.out.println( "cat name "+ category.getName() );
+                    	if ( categories.contains( category ) )
+                    	{
+                    		System.out.println( "contains");
                             writer.openElement( ELEMENT_NAME );
                             
                             writer.writeElement( FIELD_CATEGORY_COMBO, String.valueOf( categoryCombo.getId() ) );
@@ -131,6 +133,7 @@
                             writer.writeElement( FIELD_SORT_ORDER, String.valueOf( sortOrder++ ) );
                             
                             writer.closeElement();
+                    	}
                     }
                 }
             }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/NameMappingUtil.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/NameMappingUtil.java	2009-11-01 20:57:16 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/NameMappingUtil.java	2009-12-18 08:47:45 +0000
@@ -471,7 +471,7 @@
     }
 
     // -------------------------------------------------------------------------
-    // ReportTable
+    // AggregationOperator
     // -------------------------------------------------------------------------
     
     public static void addDataElementAggregationOperatorMapping( Object dataElementId, String aggregationOperator )

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2009-12-17 09:05:15 +0000
+++ dhis-2/pom.xml	2009-12-18 08:47:45 +0000
@@ -466,7 +466,7 @@
       <dependency>
         <groupId>postgresql</groupId>
         <artifactId>postgresql</artifactId>
-        <version>8.3-603.jdbc4</version>
+        <version>8.4-701.jdbc4</version>
       </dependency>
       <!--Security -->
       <dependency>