dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7397
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-06-26 10:03:53 +0300
message:
  minor fixes, also adds support for updating greyFields on dataSets (for meta-data importer)
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.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-api/src/main/java/org/hisp/dhis/attribute/Attribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java	2012-06-25 20:32:44 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java	2012-06-26 07:03:53 +0000
@@ -101,8 +101,6 @@
         if ( mandatory != attribute.mandatory ) return false;
         if ( organisationUnitAttribute != attribute.organisationUnitAttribute ) return false;
         if ( userAttribute != attribute.userAttribute ) return false;
-        if ( attributeValues != null ? !attributeValues.equals( attribute.attributeValues ) : attribute.attributeValues != null )
-            return false;
         if ( dataElementGroupAttribute != null ? !dataElementGroupAttribute.equals( attribute.dataElementGroupAttribute ) : attribute.dataElementGroupAttribute != null )
             return false;
         if ( indicatorGroupAttribute != null ? !indicatorGroupAttribute.equals( attribute.indicatorGroupAttribute ) : attribute.indicatorGroupAttribute != null )
@@ -132,7 +130,7 @@
         result = 31 * result + (userGroupAttribute != null ? userGroupAttribute.hashCode() : 0);
         result = 31 * result + (mandatory ? 1 : 0);
         result = 31 * result + (sortOrder != null ? sortOrder.hashCode() : 0);
-        result = 31 * result + (attributeValues != null ? attributeValues.hashCode() : 0);
+
         return result;
     }
 

=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2012-06-25 20:14:42 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2012-06-26 07:03:53 +0000
@@ -137,7 +137,7 @@
             {
                 deleteAttributeValues( object );
                 // deleteDataElementOperands( compulsoryDataElementOperands );
-                // deleteDataElementOperands( object, "greyedFields" );
+                deleteDataElementOperands( object, "greyedFields" );
                 // deleteExpression( object, "leftSide" );
                 // deleteExpression( object, "rightSide" );
             }