=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/manager/DefaultReportManager.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/manager/DefaultReportManager.java	2010-05-17 21:05:26 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/manager/DefaultReportManager.java	2010-05-18 15:18:53 +0000
@@ -78,12 +78,8 @@
         this.reportConfigFile = reportConfigFile;
     }
     
+    @Autowired
     private JdbcConfiguration jdbcConfiguration;
-
-    public void setJdbcConfiguration( JdbcConfiguration jdbcConfiguration )
-    {
-        this.jdbcConfiguration = jdbcConfiguration;
-    }
     
     // -------------------------------------------------------------------------
     // Dependencies

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml	2010-05-18 14:57:16 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml	2010-05-18 15:18:53 +0000
@@ -81,7 +81,6 @@
       value="reports"/>
     <property name="reportConfigFile" 
       value="reportConfiguration.xml"/>
-	<property name="jdbcConfiguration" ref="jdbcConfiguration"/> 
   </bean>
   
   <!-- Chart -->

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DefaultDataEntryScreenManager.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DefaultDataEntryScreenManager.java	2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/screen/DefaultDataEntryScreenManager.java	2010-05-18 15:18:53 +0000
@@ -39,7 +39,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hisp.dhis.customvalue.CustomValue;
-import org.hisp.dhis.customvalue.CustomValueService;
 import org.hisp.dhis.dataelement.CalculatedDataElement;
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategoryCombo;
@@ -80,13 +79,7 @@
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------
-    private CustomValueService customValueService;
-
-    public void setCustomValueService( CustomValueService customValueService )
-    {
-        this.customValueService = customValueService;
-    }
-
+    
     private PatientDataValueService patientDataValueService;
 
     public void setPatientDataValueService( PatientDataValueService patientDataValueService )
@@ -1101,7 +1094,7 @@
         final String jsCodeForDate = " name=\"entryfield\" $DISABLED onchange=\"saveDateCustom( this )\" data=\"{compulsory:$COMPULSORY, dataElementId:$DATAELEMENTID, dataElementName:'$DATAELEMENTNAME', dataElementType:'$DATAELEMENTTYPE', programStageId:$PROGRAMSTAGEID, programStageName: '$PROGRAMSTAGENAME', orgUnitName:'$ORGUNITNAME'}\"";
         // final String historyCode =
         // " ondblclick='javascript:viewHistory( $DATAELEMENTID, $OPTIONCOMBOID, true )' ";
-        final String calDataElementCode = " class=\"calculated\" disabled ";
+        //final String calDataElementCode = " class=\"calculated\" disabled ";
 
         // ---------------------------------------------------------------------
         // Metadata code to add to HTML before outputting

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2010-05-17 14:19:14 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2010-05-18 15:18:53 +0000
@@ -165,9 +165,6 @@
       ref="org.hisp.dhis.dataelement.DataElementService"/>    
     <property name="categoryService"
       ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
-    <property name="customValueService">
-      <ref bean="org.hisp.dhis.customvalue.CustomValueService"/>
-    </property>        
     <property name="programStageInstanceService">
       <ref bean="org.hisp.dhis.program.ProgramStageInstanceService"/>
     </property>     

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetPreviewOptionsAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetPreviewOptionsAction.java	2010-05-12 13:38:28 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetPreviewOptionsAction.java	2010-05-18 15:18:53 +0000
@@ -27,10 +27,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import static org.hisp.dhis.util.SessionUtils.*;
+import static org.hisp.dhis.util.SessionUtils.KEY_PREVIEW_STATUS;
+import static org.hisp.dhis.util.SessionUtils.KEY_PREVIEW_TYPE;
+import static org.hisp.dhis.util.SessionUtils.getSessionVar;
+import static org.hisp.dhis.util.SessionUtils.setSessionVar;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/UpdateSectionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/UpdateSectionAction.java	2010-04-20 22:58:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/section/UpdateSectionAction.java	2010-05-18 15:18:53 +0000
@@ -64,24 +64,15 @@
 
     private Integer sectionId;
 
-    private Integer dataSetId;
-
     private String sectionLabel;
 
     private List<String> selectedList;
 
-    private List<String> availableList;
-
     public void setSectionId( Integer sectionId )
     {
         this.sectionId = sectionId;
     }
 
-    public void setDataSetId( Integer dataSetId )
-    {
-        this.dataSetId = dataSetId;
-    }
-
     public void setSectionLabel( String sectionLabel )
     {
         this.sectionLabel = sectionLabel;
@@ -92,11 +83,6 @@
         this.selectedList = selectedList;
     }
 
-    public void setAvailableList( List<String> availableList )
-    {
-        this.availableList = availableList;
-    }
-
     // -------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------