dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5869
committer: bobjolliffe <bobjolliffe@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-02-06 13:20:20 +0000
message:
  Avoid unnecessary aborts of dxf imports
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/AggregatedDataValueConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ConceptImporter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ConstantImporter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryComboImporter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryImporter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryOptionComboImporter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/GroupMemberImporter.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/dxf/converter/AggregatedDataValueConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/AggregatedDataValueConverter.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/AggregatedDataValueConverter.java	2012-02-06 13:20:20 +0000
@@ -146,6 +146,7 @@
     
     public void read( XMLReader reader, ImportParams params )
     {
-        throw new UnsupportedOperationException( "Read operation for AggregatedDataValue not supported" );
+        // this code should never be called
+	throw new UnsupportedOperationException( "Read operation for AggregatedDataValue not supported" );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ConceptImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ConceptImporter.java	2010-09-17 21:30:59 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ConceptImporter.java	2012-02-06 13:20:20 +0000
@@ -73,7 +73,7 @@
     @Override
     protected void importMatching( Concept object, Concept match )
     {
-        throw new UnsupportedOperationException( "Concept can only be unique or duplicate" );
+        log.info( object.getName() + ": Concept can only be unique or duplicate" );
     }
 
     @Override

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ConstantImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ConstantImporter.java	2011-07-13 11:32:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/ConstantImporter.java	2012-02-06 13:20:20 +0000
@@ -73,7 +73,7 @@
     @Override
     protected void importMatching( Constant object, Constant match )
     {
-        throw new UnsupportedOperationException( "Constant can only be unique or duplicate" );
+        log.info( object.getName() + ": Constant can only be unique or duplicate" );
     }
 
     @Override

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryComboImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryComboImporter.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryComboImporter.java	2012-02-06 13:20:20 +0000
@@ -71,7 +71,7 @@
     @Override
     protected void importMatching( DataElementCategoryCombo object, DataElementCategoryCombo match )
     {
-        throw new UnsupportedOperationException( "DataElementCategoryCombo can only be unique or duplicate" );
+        log.info( object.getName() + ": DataElementCategoryCombo can only be unique or duplicate" );
     }
 
     @Override

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryImporter.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryImporter.java	2012-02-06 13:20:20 +0000
@@ -71,7 +71,7 @@
     @Override
     protected void importMatching( DataElementCategory object, DataElementCategory match )
     {
-        throw new UnsupportedOperationException( "DataElementCategory can only be unique or duplicate" );
+        log.info( object.getName() + ": DataElementCategory can only be unique or duplicate" );
     }
 
     @Override

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryOptionComboImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryOptionComboImporter.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementCategoryOptionComboImporter.java	2012-02-06 13:20:20 +0000
@@ -71,7 +71,7 @@
     @Override
     protected void importMatching( DataElementCategoryOptionCombo object, DataElementCategoryOptionCombo match )
     {
-        throw new UnsupportedOperationException( "DataElementCategoryOptionCombo can only be unique or duplicate" );
+        log.info( object.getName() + ": DataElementCategoryOptionCombo can only be unique or duplicate" );
     }
 
     @Override

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/GroupMemberImporter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/GroupMemberImporter.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/GroupMemberImporter.java	2012-02-06 13:20:20 +0000
@@ -47,7 +47,7 @@
 
     protected void importMatching( GroupMemberAssociation object, GroupMemberAssociation match )
     {
-        throw new UnsupportedOperationException( "GroupMemberAssociations can only be unique or duplicate" );
+        log.info( object.getName() + ": GroupMemberAssociations can only be unique or duplicate" );
     }
     
     protected GroupMemberAssociation getMatching( GroupMemberAssociation object )