dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #26802
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13260: removed getters for injection points in light module
------------------------------------------------------------
revno: 13260
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-12-16 16:45:17 +0100
message:
removed getters for injection points in light module
modified:
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/AddNewRalationshipAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/FindBeneficiarytAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetActivityListAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetAddNewRelationshipFormAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetBeneficiaryDetailAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetFindBeneficiaryFormAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientLocationFormAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientProgramListAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageFormAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageListAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetRepeatableEventRegistrationFormAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/RegisterPatientLocationAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java
dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveRepeatableEventAction.java
--
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/namebaseddataentry/action/AddNewRalationshipAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/AddNewRalationshipAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/AddNewRalationshipAction.java 2013-12-16 15:45:17 +0000
@@ -28,14 +28,13 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import com.opensymphony.xwork2.Action;
import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.patient.PatientService;
import org.hisp.dhis.relationship.Relationship;
import org.hisp.dhis.relationship.RelationshipService;
import org.hisp.dhis.relationship.RelationshipTypeService;
-import com.opensymphony.xwork2.Action;
-
public class AddNewRalationshipAction
implements Action
{
@@ -47,11 +46,6 @@
private RelationshipService relationshipService;
- public RelationshipService getRelationshipService()
- {
- return relationshipService;
- }
-
public void setRelationshipService( RelationshipService relationshipService )
{
this.relationshipService = relationshipService;
@@ -59,11 +53,6 @@
private RelationshipTypeService relationshipTypeService;
- public RelationshipTypeService getRelationshipTypeService()
- {
- return relationshipTypeService;
- }
-
public void setRelationshipTypeService( RelationshipTypeService relationshipTypeService )
{
this.relationshipTypeService = relationshipTypeService;
@@ -71,11 +60,6 @@
private PatientService patientService;
- public PatientService getPatientService()
- {
- return patientService;
- }
-
public void setPatientService( PatientService patientService )
{
this.patientService = patientService;
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/FindBeneficiarytAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/FindBeneficiarytAction.java 2013-10-01 08:28:26 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/FindBeneficiarytAction.java 2013-12-16 15:45:17 +0000
@@ -45,11 +45,6 @@
private PatientService patientService;
- public PatientService getPatientService()
- {
- return patientService;
- }
-
public void setPatientService( PatientService patientService )
{
this.patientService = patientService;
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetActivityListAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetActivityListAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetActivityListAction.java 2013-12-16 15:45:17 +0000
@@ -28,16 +28,16 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.ArrayList;
-import java.util.List;
-
+import com.opensymphony.xwork2.Action;
+import org.hisp.dhis.api.mobile.ActivityReportingService;
import org.hisp.dhis.api.mobile.model.Activity;
-import org.hisp.dhis.api.mobile.ActivityReportingService;
import org.hisp.dhis.api.mobile.model.ActivityPlan;
import org.hisp.dhis.light.utils.NamebasedUtils;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import com.opensymphony.xwork2.Action;
+
+import java.util.ArrayList;
+import java.util.List;
public class GetActivityListAction
implements Action
@@ -67,11 +67,6 @@
this.util = util;
}
- public NamebasedUtils getUtil()
- {
- return util;
- }
-
// -------------------------------------------------------------------------
// Input & Output
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetAddNewRelationshipFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetAddNewRelationshipFormAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetAddNewRelationshipFormAction.java 2013-12-16 15:45:17 +0000
@@ -42,11 +42,6 @@
// -------------------------------------------------------------------------
private RelationshipTypeService relationshipTypeService;
- public RelationshipTypeService getRelationshipTypeService()
- {
- return relationshipTypeService;
- }
-
public void setRelationshipTypeService( RelationshipTypeService relationshipTypeService )
{
this.relationshipTypeService = relationshipTypeService;
@@ -54,11 +49,6 @@
private PatientService patientService;
- public PatientService getPatientService()
- {
- return patientService;
- }
-
public void setPatientService( PatientService patientService )
{
this.patientService = patientService;
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetBeneficiaryDetailAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetBeneficiaryDetailAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetBeneficiaryDetailAction.java 2013-12-16 15:45:17 +0000
@@ -43,11 +43,6 @@
private PatientService patientService;
- public PatientService getPatientService()
- {
- return patientService;
- }
-
public void setPatientService( PatientService patientService )
{
this.patientService = patientService;
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetFindBeneficiaryFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetFindBeneficiaryFormAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetFindBeneficiaryFormAction.java 2013-12-16 15:45:17 +0000
@@ -48,11 +48,6 @@
private CurrentUserService currentUserService;
- public CurrentUserService getCurrentUserService()
- {
- return currentUserService;
- }
-
public void setCurrentUserService( CurrentUserService currentUserService )
{
this.currentUserService = currentUserService;
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientLocationFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientLocationFormAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientLocationFormAction.java 2013-12-16 15:45:17 +0000
@@ -62,11 +62,6 @@
private PatientService patientService;
- public PatientService getPatientService()
- {
- return patientService;
- }
-
public void setPatientService( PatientService patientService )
{
this.patientService = patientService;
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientProgramListAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientProgramListAction.java 2013-11-04 03:49:17 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetPatientProgramListAction.java 2013-12-16 15:45:17 +0000
@@ -63,11 +63,6 @@
private ProgramInstanceService programInstanceService;
- public ProgramInstanceService getProgramInstanceService()
- {
- return programInstanceService;
- }
-
public void setProgramInstanceService( ProgramInstanceService programInstanceService )
{
this.programInstanceService = programInstanceService;
@@ -75,11 +70,6 @@
private PatientIdentifierService patientIdentifierService;
- public PatientIdentifierService getPatientIdentifierService()
- {
- return patientIdentifierService;
- }
-
public void setPatientIdentifierService( PatientIdentifierService patientIdentifierService )
{
this.patientIdentifierService = patientIdentifierService;
@@ -87,11 +77,6 @@
private ProgramService programService;
- public ProgramService getProgramService()
- {
- return programService;
- }
-
public void setProgramService( ProgramService programService )
{
this.programService = programService;
@@ -99,11 +84,6 @@
private PatientService patientService;
- public PatientService getPatientService()
- {
- return patientService;
- }
-
public void setPatientService( PatientService patientService )
{
this.patientService = patientService;
@@ -123,11 +103,6 @@
private RelationshipService relationshipService;
- public RelationshipService getRelationshipService()
- {
- return relationshipService;
- }
-
public void setRelationshipService( RelationshipService relationshipService )
{
this.relationshipService = relationshipService;
@@ -135,11 +110,6 @@
public RelationshipTypeService relationshipTypeService;
- public RelationshipTypeService getRelationshipTypeService()
- {
- return relationshipTypeService;
- }
-
public void setRelationshipTypeService( RelationshipTypeService relationshipTypeService )
{
this.relationshipTypeService = relationshipTypeService;
@@ -147,11 +117,6 @@
private CurrentUserService currentUserService;
- public CurrentUserService getCurrentUserService()
- {
- return currentUserService;
- }
-
public void setCurrentUserService( CurrentUserService currentUserService )
{
this.currentUserService = currentUserService;
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageFormAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageFormAction.java 2013-12-16 15:45:17 +0000
@@ -71,11 +71,6 @@
private ProgramStageInstanceService programStageInstanceService;
- public ProgramStageInstanceService getProgramStageInstanceService()
- {
- return programStageInstanceService;
- }
-
public void setProgramStageInstanceService( ProgramStageInstanceService programStageInstanceService )
{
this.programStageInstanceService = programStageInstanceService;
@@ -83,11 +78,6 @@
private PatientDataValueService patientDataValueService;
- public PatientDataValueService getPatientDataValueService()
- {
- return patientDataValueService;
- }
-
public void setPatientDataValueService( PatientDataValueService patientDataValueService )
{
this.patientDataValueService = patientDataValueService;
@@ -95,11 +85,6 @@
private PatientService patientService;
- public PatientService getPatientService()
- {
- return patientService;
- }
-
public void setPatientService( PatientService patientService )
{
this.patientService = patientService;
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageListAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageListAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetProgramStageListAction.java 2013-12-16 15:45:17 +0000
@@ -64,11 +64,6 @@
private ProgramInstanceService programInstanceService;
- public ProgramInstanceService getProgramInstanceService()
- {
- return programInstanceService;
- }
-
public void setProgramInstanceService( ProgramInstanceService programInstanceService )
{
this.programInstanceService = programInstanceService;
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetRepeatableEventRegistrationFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetRepeatableEventRegistrationFormAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/GetRepeatableEventRegistrationFormAction.java 2013-12-16 15:45:17 +0000
@@ -45,11 +45,6 @@
private ProgramStageService programStageService;
- public ProgramStageService getProgramStageService()
- {
- return programStageService;
- }
-
public void setProgramStageService( ProgramStageService programStageService )
{
this.programStageService = programStageService;
@@ -57,11 +52,6 @@
private ProgramInstanceService programInstanceService;
- public ProgramInstanceService getProgramInstanceService()
- {
- return programInstanceService;
- }
-
public void setProgramInstanceService( ProgramInstanceService programInstanceService )
{
this.programInstanceService = programInstanceService;
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/RegisterPatientLocationAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/RegisterPatientLocationAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/RegisterPatientLocationAction.java 2013-12-16 15:45:17 +0000
@@ -28,44 +28,38 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import com.opensymphony.xwork2.Action;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.patient.Patient;
import org.hisp.dhis.patient.PatientService;
-import com.opensymphony.xwork2.Action;
-
public class RegisterPatientLocationAction
implements Action
{
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
-
+
private PatientService patientService;
public void setPatientService( PatientService patientService )
{
this.patientService = patientService;
}
-
+
private OrganisationUnitService organisationUnitService;
-
- public OrganisationUnitService getOrganisationUnitService()
- {
- return organisationUnitService;
- }
public void setOrganisationUnitService( OrganisationUnitService organisationUnitService )
{
this.organisationUnitService = organisationUnitService;
}
-
+
// -------------------------------------------------------------------------
// Input & Output
// -------------------------------------------------------------------------
-
+
private Integer patientId;
-
+
public Integer getPatientId()
{
return patientId;
@@ -75,7 +69,7 @@
{
this.patientId = patientId;
}
-
+
private Integer orgUnitId;
public Integer getOrgUnitId()
@@ -95,7 +89,7 @@
Patient patient = patientService.getPatient( patientId );
patient.setOrganisationUnit( organisationUnitService.getOrganisationUnit( orgUnitId ) );
patientService.savePatient( patient );
-
+
return SUCCESS;
}
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java 2013-12-16 15:38:30 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveProgramStageFormAction.java 2013-12-16 15:45:17 +0000
@@ -112,11 +112,6 @@
private PatientService patientService;
- public PatientService getPatientService()
- {
- return patientService;
- }
-
public void setPatientService( PatientService patientService )
{
this.patientService = patientService;
@@ -124,11 +119,6 @@
private DataElementCategoryService dataElementCategoryService;
- public DataElementCategoryService getDataElementCategoryService()
- {
- return dataElementCategoryService;
- }
-
public void setDataElementCategoryService( DataElementCategoryService dataElementCategoryService )
{
this.dataElementCategoryService = dataElementCategoryService;
@@ -136,11 +126,6 @@
private ProgramStageService programStageService;
- public ProgramStageService getProgramStageService()
- {
- return programStageService;
- }
-
public void setProgramStageService( ProgramStageService programStageService )
{
this.programStageService = programStageService;
@@ -148,11 +133,6 @@
private ProgramStageDataElementService programStageDataElementService;
- public ProgramStageDataElementService getProgramStageDataElementService()
- {
- return programStageDataElementService;
- }
-
public void setProgramStageDataElementService( ProgramStageDataElementService programStageDataElementService )
{
this.programStageDataElementService = programStageDataElementService;
@@ -160,11 +140,6 @@
private PatientDataValueService patientDataValueService;
- public PatientDataValueService getPatientDataValueService()
- {
- return patientDataValueService;
- }
-
public void setPatientDataValueService( PatientDataValueService patientDataValueService )
{
this.patientDataValueService = patientDataValueService;
@@ -172,11 +147,6 @@
private ProgramValidationService programValidationService;
- public ProgramValidationService getProgramValidationService()
- {
- return programValidationService;
- }
-
public void setProgramValidationService( ProgramValidationService programValidationService )
{
this.programValidationService = programValidationService;
@@ -184,11 +154,6 @@
private ProgramStageInstanceService programStageInstanceService;
- public ProgramStageInstanceService getProgramStageInstanceService()
- {
- return programStageInstanceService;
- }
-
public void setProgramStageInstanceService( ProgramStageInstanceService programStageInstanceService )
{
this.programStageInstanceService = programStageInstanceService;
@@ -203,11 +168,6 @@
private ProgramExpressionService programExpressionService;
- public ProgramExpressionService getProgramExpressionService()
- {
- return programExpressionService;
- }
-
public void setProgramExpressionService( ProgramExpressionService programExpressionService )
{
this.programExpressionService = programExpressionService;
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveRepeatableEventAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveRepeatableEventAction.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/SaveRepeatableEventAction.java 2013-12-16 15:45:17 +0000
@@ -61,11 +61,6 @@
private ProgramStageService programStageService;
- public ProgramStageService getProgramStageService()
- {
- return programStageService;
- }
-
public void setProgramStageService( ProgramStageService programStageService )
{
this.programStageService = programStageService;
@@ -73,11 +68,6 @@
private ProgramStageInstanceService programStageInstanceService;
- public ProgramStageInstanceService getProgramStageInstanceService()
- {
- return programStageInstanceService;
- }
-
public void setProgramStageInstanceService( ProgramStageInstanceService programStageInstanceService )
{
this.programStageInstanceService = programStageInstanceService;
