dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1102
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-11-24 09:32:34 +0100
message:
  Fixed issues reported by FindBugs
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CalculatedDataElement.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractConverter.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/dataelement/CalculatedDataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CalculatedDataElement.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CalculatedDataElement.java	2009-11-24 08:32:34 +0000
@@ -82,4 +82,14 @@
     {
         this.expression = expression;
     }
+    
+    public boolean equals( Object other )
+    {
+        return super.equals( other );
+    }
+    
+    public int hashCode()
+    {
+        return super.hashCode();
+    }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractConverter.java	2009-10-31 01:31:57 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/converter/AbstractConverter.java	2009-11-24 08:32:34 +0000
@@ -100,7 +100,7 @@
                     }
                 }
             }
-            else if ( match != null && params.getImportStrategy() == NEW_AND_UPDATES ) // Similar object exists
+            else if ( params.getImportStrategy() == NEW_AND_UPDATES ) // Similar object exists
             {
                 if ( !params.isPreview() ) // Import object
                 {