------------------------------------------------------------
revno: 15982
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Sun 2014-07-06 19:15:30 +0200
message:
Minor
modified:
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/settings/action/GetSettingsAction.java
dhis-2/dhis-web/dhis-web-light/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-light/src/main/java/org/hisp/dhis/light/settings/action/GetSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/settings/action/GetSettingsAction.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/settings/action/GetSettingsAction.java 2014-07-06 17:15:30 +0000
@@ -36,9 +36,10 @@
import org.apache.commons.lang.Validate;
import org.hisp.dhis.i18n.locale.LocaleManager;
-import org.hisp.dhis.i18n.resourcebundle.ResourceBundleManager;
+import org.hisp.dhis.i18n.ui.resourcebundle.ResourceBundleManager;
import org.hisp.dhis.user.CurrentUserService;
import org.hisp.dhis.user.User;
+import org.springframework.beans.factory.annotation.Autowired;
import com.opensymphony.xwork2.Action;
@@ -52,27 +53,15 @@
// Dependencies
// -------------------------------------------------------------------------
+ @Autowired
private ResourceBundleManager resourceBundleManager;
- public void setResourceBundleManager( ResourceBundleManager resourceBundleManager )
- {
- this.resourceBundleManager = resourceBundleManager;
- }
-
+ @Autowired
private LocaleManager localeManager;
- public void setLocaleManager( LocaleManager localeManager )
- {
- this.localeManager = localeManager;
- }
-
+ @Autowired
private CurrentUserService currentUserService;
- public void setCurrentUserService( CurrentUserService currentUserService )
- {
- this.currentUserService = currentUserService;
- }
-
// -------------------------------------------------------------------------
// Input & Output
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml 2014-06-23 21:31:31 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml 2014-07-06 17:15:30 +0000
@@ -496,12 +496,7 @@
<!-- Settings -->
<bean id="org.hisp.dhis.light.settings.action.GetSettingsAction"
- class="org.hisp.dhis.light.settings.action.GetSettingsAction" scope="prototype">
- <property name="resourceBundleManager"
- ref="org.hisp.dhis.i18n.resourcebundle.ResourceBundleManager" />
- <property name="localeManager" ref="org.hisp.dhis.i18n.locale.LocaleManager" />
- <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
- </bean>
+ class="org.hisp.dhis.light.settings.action.GetSettingsAction" scope="prototype"/>
<bean id="org.hisp.dhis.light.settings.action.SaveSettingsFormAction"
class="org.hisp.dhis.light.settings.action.SaveSettingsFormAction"
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
