=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java	2010-11-02 13:02:10 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java	2010-11-10 13:49:29 +0000
@@ -548,6 +548,7 @@
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public Collection<DataElementGroup> getAllDataElementGroups( int from, int to )
     {
         Session session = sessionFactory.getCurrentSession();
@@ -572,6 +573,7 @@
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public Collection<DataElementGroup> searchDataElementGroupByName( String key, int from, int to )
     {
         Session session = sessionFactory.getCurrentSession();

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java	2010-11-01 06:32:22 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/hibernate/HibernateDataSetStore.java	2010-11-10 13:49:29 +0000
@@ -41,7 +41,6 @@
 import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.source.Source;
 import org.hisp.dhis.system.util.ConversionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @author Kristian Nordal

=== modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java	2010-10-29 11:24:12 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java	2010-11-10 13:49:29 +0000
@@ -55,7 +55,6 @@
 import org.hisp.dhis.period.PeriodService;
 import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.system.util.MathUtils;
-import org.hisp.dhis.system.util.Timer;
 import org.hisp.dhis.user.UserSettingService;
 import org.springframework.transaction.annotation.Transactional;
 

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/hibernate/HibernateProgramAttributeValueStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/hibernate/HibernateProgramAttributeValueStore.java	2010-11-09 02:09:53 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/programattributevalue/hibernate/HibernateProgramAttributeValueStore.java	2010-11-10 13:49:29 +0000
@@ -51,37 +51,44 @@
         sessionFactory.getCurrentSession().save( programAttributeValue );
     }
 
-    public int delete( ProgramAttribute programAttribute ){
-        
+    public int delete( ProgramAttribute programAttribute )
+    {
         Query query = getQuery( "delete from ProgramAttributeValue where programAttribute = :programAttribute" );
         query.setEntity( "programAttribute", programAttribute );
-        
+
         return query.executeUpdate();
     }
 
-    public int delete( ProgramInstance programInstance ){
+    public int delete( ProgramInstance programInstance )
+    {
         Query query = getQuery( "delete from ProgramAttributeValue where programInstance = :programInstance" );
         query.setEntity( "programInstance", programInstance );
-        
+
         return query.executeUpdate();
     }
 
-    public ProgramAttributeValue get( ProgramInstance programInstance, ProgramAttribute programAttribute ){
+    public ProgramAttributeValue get( ProgramInstance programInstance, ProgramAttribute programAttribute )
+    {
         return (ProgramAttributeValue) getCriteria( Restrictions.eq( "programInstance", programInstance ),
             Restrictions.eq( "programAttribute", programAttribute ) ).uniqueResult();
     }
-    
-    public Collection<ProgramAttributeValue> get( ProgramInstance progranInstance ){
+
+    @SuppressWarnings("unchecked")
+    public Collection<ProgramAttributeValue> get( ProgramInstance progranInstance )
+    {
         return getCriteria( Restrictions.eq( "progranInstance", progranInstance ) ).list();
     }
 
-    public Collection<ProgramAttributeValue> get( ProgramAttribute programAttribute ){
+    @SuppressWarnings("unchecked")
+    public Collection<ProgramAttributeValue> get( ProgramAttribute programAttribute )
+    {
         return getCriteria( Restrictions.eq( "programAttribute", programAttribute ) ).list();
     }
 
-    public Collection<ProgramAttributeValue> search( ProgramAttribute programAttribute, String searchText ){
+    @SuppressWarnings("unchecked")
+    public Collection<ProgramAttributeValue> search( ProgramAttribute programAttribute, String searchText )
+    {
         return getCriteria( Restrictions.eq( "programAttribute", programAttribute ),
             Restrictions.ilike( "value", "%" + searchText + "%" ) ).list();
     }
-
 }

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/ViewCustomDataSetReportAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/ViewCustomDataSetReportAction.java	2010-08-31 14:34:31 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/datasetcompleted/action/ViewCustomDataSetReportAction.java	2010-11-10 13:49:29 +0000
@@ -33,7 +33,6 @@
 import org.hisp.dhis.dataelement.DataElementCategoryCombo;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
 import org.hisp.dhis.dataentryform.DataEntryForm;
-import org.hisp.dhis.dataentryform.DataEntryFormService;
 import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.dataset.DataSetService;
 import org.hisp.dhis.datavalue.DataValue;
@@ -57,8 +56,6 @@
     // Dependency
     // -------------------------------------------
 
-    private DataEntryFormService dataEntryFormService;
-
     private PeriodService periodService;
 
     private DataSetService dataSetService;
@@ -89,11 +86,6 @@
     // Getter & Setter
     // -------------------------------------------
 
-    public void setDataEntryFormService( DataEntryFormService dataEntryFormService )
-    {
-        this.dataEntryFormService = dataEntryFormService;
-    }
-
     public DataSet getDataSet()
     {
         return dataSet;

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml	2010-10-29 12:19:15 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/META-INF/dhis/beans.xml	2010-11-10 13:49:29 +0000
@@ -613,8 +613,6 @@
 		scope="prototype">
 		<property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
 		<property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
-		<property name="dataEntryFormService"
-			ref="org.hisp.dhis.dataentryform.DataEntryFormService" />
 		<property name="dataValueService" ref="org.hisp.dhis.datavalue.DataValueService" />
 		<property name="organisationUnitService"
 			ref="org.hisp.dhis.organisationunit.OrganisationUnitService" />