=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateLockExceptionStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateLockExceptionStore.java	2012-02-14 07:51:50 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateLockExceptionStore.java	2012-02-16 14:00:33 +0000
@@ -27,6 +27,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+
 import org.hibernate.Criteria;
 import org.hibernate.Query;
 import org.hibernate.Session;
@@ -39,11 +44,6 @@
 import org.hisp.dhis.period.PeriodService;
 import org.springframework.jdbc.core.RowCallbackHandler;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-
 /**
  * @author Morten Olav Hansen <mortenoh@gmail.com>
  */
@@ -113,12 +113,10 @@
         query.setParameter( "period", period );
 
         query.executeUpdate();
-
-//        final String sql = "DELETE FROM LockException WHERE dataSetId=? AND periodId=?";
-//        jdbcTemplate.update( sql, new Object[]{dataSet.getId(), period.getId()} );
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public Collection<LockException> getBetween( int first, int max )
     {
         Criteria criteria = getCriteria();

=== 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	2012-01-09 11:55:36 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/settings/action/GetSettingsAction.java	2012-02-16 14:00:33 +0000
@@ -28,15 +28,19 @@
 
 package org.hisp.dhis.light.settings.action;
 
-import com.opensymphony.xwork2.Action;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+
 import org.apache.commons.lang.Validate;
-import org.hisp.dhis.i18n.I18nService;
 import org.hisp.dhis.i18n.locale.LocaleManager;
 import org.hisp.dhis.i18n.resourcebundle.ResourceBundleManager;
 import org.hisp.dhis.user.CurrentUserService;
 import org.hisp.dhis.user.User;
 
-import java.util.*;
+import com.opensymphony.xwork2.Action;
 
 /**
  * @author Morten Olav Hansen <mortenoh@gmail.com>
@@ -62,13 +66,6 @@
         this.localeManager = localeManager;
     }
 
-    private I18nService i18nService;
-
-    public void setI18nService( I18nService i18nService )
-    {
-        this.i18nService = i18nService;
-    }
-
     private CurrentUserService currentUserService;
 
     public void setCurrentUserService( CurrentUserService currentUserService )

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/settings/action/SaveSettingsFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/settings/action/SaveSettingsFormAction.java	2012-01-09 11:55:36 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/settings/action/SaveSettingsFormAction.java	2012-02-16 14:00:33 +0000
@@ -27,7 +27,8 @@
 
 package org.hisp.dhis.light.settings.action;
 
-import com.opensymphony.xwork2.Action;
+import java.util.Locale;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
 import org.apache.commons.validator.EmailValidator;
@@ -36,7 +37,7 @@
 import org.hisp.dhis.user.User;
 import org.hisp.dhis.user.UserService;
 
-import java.util.Locale;
+import com.opensymphony.xwork2.Action;
 
 public class SaveSettingsFormAction
     implements Action
@@ -52,13 +53,6 @@
         this.localeManagerInterface = localeManagerInterface;
     }
 
-    private LocaleManager localeManagerDB;
-
-    public void setLocaleManagerDB( LocaleManager localeManagerDB )
-    {
-        this.localeManagerDB = localeManagerDB;
-    }
-
     private CurrentUserService currentUserService;
 
     public void setCurrentUserService( CurrentUserService currentUserService )
@@ -84,13 +78,6 @@
         this.currentLocale = locale;
     }
 
-    private String currentLocaleDb;
-
-    public void setCurrentLocaleDb( String currentLocaleDb )
-    {
-        this.currentLocaleDb = currentLocaleDb;
-    }
-
     private String firstName;
 
     public String getFirstName()

=== 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	2012-02-16 12:58:37 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/META-INF/dhis/beans.xml	2012-02-16 14:00:33 +0000
@@ -12,7 +12,7 @@
     <property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
   </bean>
 
-  <!-- data entry -->
+  <!-- Data entry -->
 
   <bean id="org.hisp.dhis.light.dataentry.utils.FormUtils" class="org.hisp.dhis.light.utils.FormUtils">
     <property name="organisationUnitService" ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />
@@ -93,7 +93,7 @@
     <property name="formUtils" ref="org.hisp.dhis.light.dataentry.utils.FormUtils" />
   </bean>
 
-  <!-- dashboard -->
+  <!-- Dashboard -->
 
   <bean id="org.hisp.dhis.light.dashboard.action.ProvideContentAction"
       class="org.hisp.dhis.light.dashboard.action.ProvideContentAction"
@@ -129,7 +129,6 @@
       scope="prototype">
     <property name="resourceBundleManager" ref="org.hisp.dhis.i18n.resourcebundle.ResourceBundleManager" />
     <property name="localeManager" ref="org.hisp.dhis.i18n.locale.LocaleManager" />
-    <property name="i18nService" ref="org.hisp.dhis.i18n.I18nService" />
     <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
   </bean>
 
@@ -137,7 +136,6 @@
       class="org.hisp.dhis.light.settings.action.SaveSettingsFormAction"
       scope="prototype">
     <property name="localeManagerInterface" ref="org.hisp.dhis.i18n.locale.LocaleManager" />
-    <property name="localeManagerDB" ref="org.hisp.dhis.i18n.locale.LocaleManagerDb" />
     <property name="currentUserService" ref="org.hisp.dhis.user.CurrentUserService" />
     <property name="userService" ref="org.hisp.dhis.user.UserService" />
   </bean>