=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddMapViewToDashboardAction.java' --- dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddMapViewToDashboardAction.java 2012-11-06 07:01:56 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/AddMapViewToDashboardAction.java 2013-06-17 11:19:14 +0000 @@ -35,12 +35,12 @@ import org.hisp.dhis.mapping.MappingService; import org.hisp.dhis.user.CurrentUserService; import org.hisp.dhis.user.User; +import org.springframework.beans.factory.annotation.Autowired; import com.opensymphony.xwork2.Action; /** * @author Lars Helge Overland - * @version $Id$ */ public class AddMapViewToDashboardAction implements Action @@ -51,27 +51,15 @@ // Dependencies // ------------------------------------------------------------------------- + @Autowired private CurrentUserService currentUserService; - public void setCurrentUserService( CurrentUserService currentUserService ) - { - this.currentUserService = currentUserService; - } - + @Autowired private DashboardService dashboardService; - public void setDashboardService( DashboardService dashboardService ) - { - this.dashboardService = dashboardService; - } - + @Autowired private MappingService mappingService; - public void setMappingService( MappingService mappingService ) - { - this.mappingService = mappingService; - } - // ------------------------------------------------------------------------- // Input // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml 2013-06-09 19:12:02 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/META-INF/dhis/beans.xml 2013-06-17 11:19:14 +0000 @@ -18,6 +18,12 @@ + + + + - + === modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml 2013-05-24 14:04:12 +0000 +++ dhis-2/dhis-web/dhis-web-mapping/src/main/resources/struts.xml 2013-06-17 11:19:14 +0000 @@ -15,6 +15,12 @@ app/index.html + + + + /dhis-web-mapping/void.vm + +