dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1385
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-02-02 23:47:59 +0100
message:
  Minor fix
modified:
  dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetTableDataExportAction.java
  dhis-2/dhis-web/dhis-web-reporting/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-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetTableDataExportAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetTableDataExportAction.java	2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/GetTableDataExportAction.java	2010-02-02 22:47:59 +0000
@@ -29,10 +29,10 @@
 
 import java.io.InputStream;
 
+import org.hisp.dhis.common.ServiceProvider;
 import org.hisp.dhis.i18n.I18nFormat;
 import org.hisp.dhis.importexport.ExportParams;
 import org.hisp.dhis.importexport.ExportService;
-import org.hisp.dhis.importexport.ImportExportServiceManager;
 
 import com.opensymphony.xwork2.Action;
 
@@ -47,13 +47,13 @@
     // Dependencies
     // -------------------------------------------------------------------------
 
-    private ImportExportServiceManager serviceManager;
+    private ServiceProvider<ExportService> serviceProvider;
 
-    public void setServiceManager( ImportExportServiceManager serviceManager )
+    public void setServiceProvider( ServiceProvider<ExportService> serviceProvider )
     {
-        this.serviceManager = serviceManager;
+        this.serviceProvider = serviceProvider;
     }
-    
+
     private I18nFormat format;
 
     public void setFormat( I18nFormat format )
@@ -103,7 +103,7 @@
 
     public String execute() throws Exception
     {
-        ExportService exportService = serviceManager.getExportService( exportFormat );
+        ExportService exportService = serviceProvider.provide( exportFormat );
         
         ExportParams params = new ExportParams();
         

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml	2010-02-02 13:21:02 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/META-INF/dhis/beans.xml	2010-02-02 22:47:59 +0000
@@ -253,8 +253,8 @@
   <bean id="org.hisp.dhis.reporting.tablecreator.action.GetTableDataExportAction"
     class="org.hisp.dhis.reporting.tablecreator.action.GetTableDataExportAction"
     scope="prototype">
-    <property name="serviceManager"
-      ref="org.hisp.dhis.importexport.ImportExportServiceManager"/>
+    <property name="serviceProvider"
+      ref="exportServiceProvider"/>
   </bean>
   
   <bean id="org.hisp.dhis.reporting.tablecreator.action.GenerateTableDataWorkbookAction"