dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6517
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2012-04-07 11:22:54 +0200
message:
  Minor fix
modified:
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportService.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MetaDataController.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-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportService.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportService.java	2012-04-02 17:23:48 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportService.java	2012-04-07 09:22:54 +0000
@@ -38,5 +38,5 @@
 {
     ImportSummary importDxf2( DXF2 dxf2 );
 
-    ImportSummary importDxf2WithImportOptions( DXF2 dxf2, ImportOptions importOptions );
+    ImportSummary importDxf2( DXF2 dxf2, ImportOptions importOptions );
 }

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MetaDataController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MetaDataController.java	2012-04-07 09:08:59 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/MetaDataController.java	2012-04-07 09:22:54 +0000
@@ -127,7 +127,7 @@
         DXF2 dxf2 = JacksonUtils.fromXml( request.getInputStream(), DXF2.class );
         System.err.println( dxf2 );
 
-        ImportSummary summary = importService.importDxf2WithImportOptions( dxf2, importOptions );
+        ImportSummary summary = importService.importDxf2( dxf2, importOptions );
 
         response.setContentType( MediaType.APPLICATION_XML.toString() );
         JacksonUtils.toXml( response.getOutputStream(), summary );
@@ -140,7 +140,7 @@
         DXF2 dxf2 = JacksonUtils.fromJson( request.getInputStream(), DXF2.class );
         System.err.println( dxf2 );
 
-        ImportSummary summary = importService.importDxf2WithImportOptions( dxf2, importOptions );
+        ImportSummary summary = importService.importDxf2( dxf2, importOptions );
 
         response.setContentType( MediaType.APPLICATION_JSON.toString() );
         JacksonUtils.toJson( response.getOutputStream(), summary );
@@ -156,7 +156,7 @@
         DXF2 dxf2 = JacksonUtils.fromXml( zip, DXF2.class );
         System.err.println( dxf2 );
 
-        ImportSummary summary = importService.importDxf2WithImportOptions( dxf2, importOptions );
+        ImportSummary summary = importService.importDxf2( dxf2, importOptions );
 
         response.setContentType( MediaType.APPLICATION_XML.toString() );
         JacksonUtils.toXml( response.getOutputStream(), summary );
@@ -172,7 +172,7 @@
         DXF2 dxf2 = JacksonUtils.fromJson( zip, DXF2.class );
         System.err.println( dxf2 );
 
-        ImportSummary summary = importService.importDxf2WithImportOptions( dxf2, importOptions );
+        ImportSummary summary = importService.importDxf2( dxf2, importOptions );
 
         response.setContentType( MediaType.APPLICATION_JSON.toString() );
         JacksonUtils.toJson( response.getOutputStream(), summary );