dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #35566
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18202: Unused dependency
------------------------------------------------------------
revno: 18202
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-02-09 15:06:32 +0100
message:
Unused dependency
modified:
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.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-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2015-01-28 10:50:56 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java 2015-02-09 14:06:32 +0000
@@ -107,7 +107,6 @@
import org.hisp.dhis.trackedentity.TrackedEntityInstanceQueryParams;
import org.hisp.dhis.trackedentity.TrackedEntityInstanceReminder;
import org.hisp.dhis.trackedentity.TrackedEntityInstanceReminderService;
-import org.hisp.dhis.trackedentity.TrackedEntityInstanceStore;
import org.hisp.dhis.trackedentity.TrackedEntityInstanceService;
import org.hisp.dhis.trackedentity.TrackedEntityService;
import org.hisp.dhis.trackedentityattributevalue.TrackedEntityAttributeValue;
@@ -1465,13 +1464,6 @@
this.programStageService = programStageService;
}
- private TrackedEntityInstanceStore instanceStore;
-
- public void setInstanceStore( TrackedEntityInstanceStore instanceStore )
- {
- this.instanceStore = instanceStore;
- }
-
private I18nFormat format;
public void setFormat( I18nFormat format )
@@ -1480,9 +1472,8 @@
}
@Override
- public Patient savePatient( org.hisp.dhis.api.mobile.model.LWUITmodel.Patient patient, int orgUnitId,
- String programIdText )
- throws NotAllowedException
+ public Patient savePatient( org.hisp.dhis.api.mobile.model.LWUITmodel.Patient patient, int orgUnitId, String programIdText )
+ throws NotAllowedException
{
TrackedEntityInstance patientWeb = new TrackedEntityInstance();
patientWeb.setOrganisationUnit( organisationUnitService.getOrganisationUnit( orgUnitId ) );
@@ -1508,7 +1499,6 @@
patientAttributeValue.setAttribute( patientAttribute );
patientAttributeValue.setValue( paAtt.getValue() );
patientAttributeValues.add( patientAttributeValue );
-
}
}
@@ -1517,6 +1507,7 @@
TrackedEntityInstance newTrackedEntityInstance = entityInstanceService
.getTrackedEntityInstance( this.patientId );
String errorMsg = null;
+
try
{
for ( org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramInstance mobileProgramInstance : patient
@@ -2566,9 +2557,7 @@
try
{
-
- for ( org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramInstance mobileProgramInstance : patient
- .getEnrollmentPrograms() )
+ for ( org.hisp.dhis.api.mobile.model.LWUITmodel.ProgramInstance mobileProgramInstance : patient.getEnrollmentPrograms() )
{
Date incidentDate = PeriodUtil.stringToDate( mobileProgramInstance.getDateOfIncident() );
enrollProgram( patientId + "-" + mobileProgramInstance.getProgramId(),