dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1888
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Fri 2010-07-30 16:20:36 +0200
message:
  Removed debug code
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitImporter.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/importer/OrganisationUnitImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitImporter.java	2010-07-30 14:13:32 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitImporter.java	2010-07-30 14:20:36 +0000
@@ -115,55 +115,42 @@
     {
         if ( !object.getName().equals( existing.getName() ) )
         {
-            System.out.println( "1" );
             return false;
         }
         if ( !object.getShortName().equals( existing.getShortName() ) )
         {
-            System.out.println( "2" );
             return false;
         }
         if ( !isSimiliar( object.getCode(), existing.getCode() ) || ( isNotNull( object.getCode(), existing.getCode() ) && !object.getCode().equals( existing.getCode() ) ) )
         {
-            System.out.println( "3" );
             return false;
         }
         if ( !isSimiliar( object.getOpeningDate(), existing.getOpeningDate() ) || ( isNotNull( object.getOpeningDate(), existing.getOpeningDate() ) && !object.getOpeningDate().equals( existing.getOpeningDate() ) ) )
         {
-            System.out.println( "4" );
-            System.out.println( "." + object.getOpeningDate() + "-" + existing.getOpeningDate() + "."); 
             return false;
         }
         if ( !isSimiliar( object.getClosedDate(), existing.getClosedDate() ) || ( isNotNull( object.getClosedDate(), existing.getClosedDate() ) && !object.getClosedDate().equals( existing.getClosedDate() ) ) )
         {
-            System.out.println( "5" );
             return false;
         }
         if ( object.isActive() != existing.isActive() )
         {
-            System.out.println( "6" );
             return false;
         }
         if ( !isSimiliar( object.getComment(), existing.getComment() ) || ( isNotNull( object.getComment(), existing.getComment() ) && !object.getComment().equals( existing.getComment() ) ) )
         {
-            System.out.println( "7" );
             return false;
         }
         if ( !isSimiliar( object.getGeoCode(), existing.getGeoCode() ) || ( isNotNull( object.getGeoCode(), existing.getGeoCode() ) && !object.getGeoCode().equals( existing.getGeoCode() ) ) )
         {
-            System.out.println( "8" );
             return false;
         }
         if ( !isSimiliar( object.getFeatureType(), existing.getFeatureType() ) || ( isNotNull( object.getFeatureType(), existing.getFeatureType() ) && !object.getFeatureType().equals( existing.getFeatureType() ) ) )
         {
-            System.out.println( "9" );
-            System.out.println( "." + object.getFeatureType() + "-" + existing.getFeatureType() + "."); 
             return false;
         }
         if ( !isSimiliar( object.getCoordinates(), existing.getCoordinates() ) || ( isNotNull( object.getCoordinates(), existing.getCoordinates() ) && !object.getCoordinates().equals( existing.getCoordinates() ) ) )
         {
-            System.out.println( "10" );
-            System.out.println( "." + object.getCoordinates() + "-" + existing.getCoordinates() + "."); 
             return false;
         }