dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3128
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-03-22 17:53:11 +0100
message:
  Minor fix
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/MetaDataExportAction.java
  dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml


--
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-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/MetaDataExportAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/MetaDataExportAction.java	2011-02-02 17:56:01 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/exp/MetaDataExportAction.java	2011-03-22 16:53:11 +0000
@@ -34,8 +34,6 @@
 import org.hisp.dhis.i18n.I18nFormat;
 import org.hisp.dhis.importexport.ExportParams;
 import org.hisp.dhis.importexport.ExportService;
-import org.hisp.dhis.importexport.ImportDataValueService;
-import org.hisp.dhis.importexport.ImportObjectService;
 
 import com.opensymphony.xwork2.ActionSupport;
 
@@ -59,20 +57,6 @@
         this.serviceProvider = serviceProvider;
     }
 
-    private ImportObjectService importObjectService;
-
-    public void setImportObjectService( ImportObjectService importObjectService )
-    {
-        this.importObjectService = importObjectService;
-    }
-
-    private ImportDataValueService importDataValueService;
-
-    public void setImportDataValueService( ImportDataValueService importDataValueService )
-    {
-        this.importDataValueService = importDataValueService;
-    }
-
     private I18n i18n;
 
     public void setI18n( I18n i18n )
@@ -247,9 +231,6 @@
     public String execute()
         throws Exception
     {
-        importDataValueService.deleteImportDataValues();
-        importObjectService.deleteImportObjects();
-
         ExportParams params = new ExportParams();
 
         if ( dataElements || dataElementGroups || indicators || dataSets || validationRules || reportTables || charts )

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml	2011-03-22 13:57:39 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/META-INF/dhis/beans.xml	2011-03-22 16:53:11 +0000
@@ -131,10 +131,6 @@
 		class="org.hisp.dhis.importexport.action.exp.MetaDataExportAction"
 		scope="prototype">
 		<property name="serviceProvider" ref="exportServiceProvider" />
-		<property name="importObjectService"
-			ref="org.hisp.dhis.importexport.ImportObjectService" />
-		<property name="importDataValueService"
-			ref="org.hisp.dhis.importexport.ImportDataValueService" />
 	</bean>
 
 	<bean