=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/state/DefaultSelectedStateManager.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/state/DefaultSelectedStateManager.java	2011-07-08 07:22:42 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/state/DefaultSelectedStateManager.java	2011-07-15 08:43:13 +0000
@@ -33,11 +33,9 @@
 import org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager;
 import org.hisp.dhis.patient.Patient;
 import org.hisp.dhis.patient.PatientService;
-import org.hisp.dhis.program.Program;
 import org.hisp.dhis.program.ProgramInstance;
 import org.hisp.dhis.program.ProgramInstanceService;
 import org.hisp.dhis.program.ProgramService;
-import org.hisp.dhis.program.ProgramStage;
 import org.hisp.dhis.program.ProgramStageInstance;
 import org.hisp.dhis.program.ProgramStageInstanceService;
 import org.hisp.dhis.program.ProgramStageService;
@@ -85,20 +83,6 @@
         this.patientService = patientService;
     }
 
-    private ProgramService programService;
-
-    public void setProgramService( ProgramService programService )
-    {
-        this.programService = programService;
-    }
-
-    private ProgramStageService programStageService;
-
-    public void setProgramStageService( ProgramStageService programStageService )
-    {
-        this.programStageService = programStageService;
-    }
-
     private ProgramInstanceService programInstanceService;
 
     public void setProgramInstanceService( ProgramInstanceService programInstanceService )
@@ -188,50 +172,6 @@
         getSession().remove( SESSION_KEY_SELECTED_PROGRAM_STAGE_INSTANCE_ID );
     }
 
-    public void setSelectedProgram( Program program )
-    {
-        getSession().put( SESSION_KEY_SELECTED_PROGRAM_ID, program.getId() );
-    }
-
-    public Program getSelectedProgram()
-    {
-        Integer id = (Integer) getSession().get( SESSION_KEY_SELECTED_PROGRAM_ID );
-
-        if ( id == null )
-        {
-            return null;
-        }
-
-        return programService.getProgram( id );
-    }
-
-    public void clearSelectedProgram()
-    {
-        getSession().remove( SESSION_KEY_SELECTED_PROGRAM_ID );
-    }
-
-    public void setSelectedProgramStage( ProgramStage programStage )
-    {
-        getSession().put( SESSION_KEY_SELECTED_PROGRAMSTAGE_ID, programStage.getId() );
-    }
-
-    public ProgramStage getSelectedProgramStage()
-    {
-        Integer id = (Integer) getSession().get( SESSION_KEY_SELECTED_PROGRAMSTAGE_ID );
-
-        if ( id == null )
-        {
-            return null;
-        }
-
-        return programStageService.getProgramStage( id );
-    }
-
-    public void clearSelectedProgramStage()
-    {
-        getSession().remove( SESSION_KEY_SELECTED_PROGRAMSTAGE_ID );
-    }
-
     public void clearListAll()
     {
         getSession().remove( SESSION_KEY_LISTALL );

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/state/SelectedStateManager.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/state/SelectedStateManager.java	2011-07-08 08:34:57 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/state/SelectedStateManager.java	2011-07-15 08:43:13 +0000
@@ -29,9 +29,7 @@
 
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.patient.Patient;
-import org.hisp.dhis.program.Program;
 import org.hisp.dhis.program.ProgramInstance;
-import org.hisp.dhis.program.ProgramStage;
 import org.hisp.dhis.program.ProgramStageInstance;
 
 /**
@@ -73,26 +71,6 @@
     void clearSelectedProgramStageInstance();
 
     // -------------------------------------------------------------------------
-    // Progam
-    // -------------------------------------------------------------------------
-
-    void setSelectedProgram( Program program );
-
-    Program getSelectedProgram();
-
-    void clearSelectedProgram();
-
-    // -------------------------------------------------------------------------
-    // Progam-stages
-    // -------------------------------------------------------------------------
-
-    void setSelectedProgramStage( ProgramStage programStage );
-
-    ProgramStage getSelectedProgramStage();
-
-    void clearSelectedProgramStage();
-
-    // -------------------------------------------------------------------------
     // for searching patients
     // -------------------------------------------------------------------------
 

=== 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	2011-07-15 08:07:54 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/META-INF/dhis/beans.xml	2011-07-15 08:43:13 +0000
@@ -7,8 +7,6 @@
 
   <bean id="org.hisp.dhis.caseentry.state.SelectedStateManager" class="org.hisp.dhis.caseentry.state.DefaultSelectedStateManager">
     <property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
-    <property name="programService" ref="org.hisp.dhis.program.ProgramService" />
-    <property name="programStageService" ref="org.hisp.dhis.program.ProgramStageService" />
     <property name="selectionManager" ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" />
     <property name="programInstanceService" ref="org.hisp.dhis.program.ProgramInstanceService" />
     <property name="programStageInstanceService" ref="org.hisp.dhis.program.ProgramStageInstanceService" />