dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30205
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15314: Mobile, correct interface modifiers
------------------------------------------------------------
revno: 15314
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-05-20 17:38:30 +0200
message:
Mobile, correct interface modifiers
modified:
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/ActivityReportingService.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/FacilityReportingService.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/IProgramService.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/NotAllowedException.java
dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/TrackedEntityMobileSettingService.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/api/mobile/ActivityReportingService.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/ActivityReportingService.java 2014-05-16 06:06:48 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/ActivityReportingService.java 2014-05-20 15:38:30 +0000
@@ -49,68 +49,68 @@
*/
public interface ActivityReportingService
{
- public ActivityPlan getCurrentActivityPlan( OrganisationUnit unit, String localeString );
-
- public ActivityPlan getAllActivityPlan( OrganisationUnit unit, String localeString );
-
- public void saveActivityReport( OrganisationUnit unit, ActivityValue activityValue, Integer programStageSectionId )
- throws NotAllowedException;
-
- public String findPatient( String name, int orgUnitId )
- throws NotAllowedException;
-
- public Patient findPatient( int patientId )
- throws NotAllowedException;
-
- public String findPatientInAdvanced( String keyword, int orgUnitId, int programId )
- throws NotAllowedException;
-
- public String saveProgramStage( ProgramStage programStage, int patientId, int orgUnitId )
- throws NotAllowedException;
-
- public Patient enrollProgram( String enrollInfo, Date incidentDate )
- throws NotAllowedException;
-
- public Collection<org.hisp.dhis.trackedentity.TrackedEntityAttribute> getPatientAtts( String programId );
-
- public Collection<PatientAttribute> getAttsForMobile();
-
- public Collection<PatientAttribute> getPatientAttributesForMobile( String programId );
-
- public Patient addRelationship( Relationship enrollmentRelationship, int orgUnitId )
- throws NotAllowedException;
-
- public Program getAllProgramByOrgUnit( int orgUnitId, String programType )
- throws NotAllowedException;
-
- public Program findProgram( String programInfo )
- throws NotAllowedException;
-
- public Patient findLatestPatient()
- throws NotAllowedException;
-
- public Integer savePatient( Patient patient, int orgUnitId, String programId )
- throws NotAllowedException;
-
- public String findLostToFollowUp( int orgUnitId, String programId )
- throws NotAllowedException;
-
- public Notification handleLostToFollowUp( LostEvent lostEvent )
- throws NotAllowedException;
-
- public Patient generateRepeatableEvent( int orgUnitId, String eventInfo )
- throws NotAllowedException;
-
- public String saveSingleEventWithoutRegistration( ProgramStage programStage, int orgUnitId )
- throws NotAllowedException;
-
- public String sendFeedback( Message message )
- throws NotAllowedException;
-
- public Collection<User> findUser( String keyword )
- throws NotAllowedException;
-
- public String sendMessage( Message message )
+ ActivityPlan getCurrentActivityPlan( OrganisationUnit unit, String localeString );
+
+ ActivityPlan getAllActivityPlan( OrganisationUnit unit, String localeString );
+
+ void saveActivityReport( OrganisationUnit unit, ActivityValue activityValue, Integer programStageSectionId )
+ throws NotAllowedException;
+
+ String findPatient( String name, int orgUnitId )
+ throws NotAllowedException;
+
+ Patient findPatient( int patientId )
+ throws NotAllowedException;
+
+ String findPatientInAdvanced( String keyword, int orgUnitId, int programId )
+ throws NotAllowedException;
+
+ String saveProgramStage( ProgramStage programStage, int patientId, int orgUnitId )
+ throws NotAllowedException;
+
+ Patient enrollProgram( String enrollInfo, Date incidentDate )
+ throws NotAllowedException;
+
+ Collection<org.hisp.dhis.trackedentity.TrackedEntityAttribute> getPatientAtts( String programId );
+
+ Collection<PatientAttribute> getAttsForMobile();
+
+ Collection<PatientAttribute> getPatientAttributesForMobile( String programId );
+
+ Patient addRelationship( Relationship enrollmentRelationship, int orgUnitId )
+ throws NotAllowedException;
+
+ Program getAllProgramByOrgUnit( int orgUnitId, String programType )
+ throws NotAllowedException;
+
+ Program findProgram( String programInfo )
+ throws NotAllowedException;
+
+ Patient findLatestPatient()
+ throws NotAllowedException;
+
+ Integer savePatient( Patient patient, int orgUnitId, String programId )
+ throws NotAllowedException;
+
+ String findLostToFollowUp( int orgUnitId, String programId )
+ throws NotAllowedException;
+
+ Notification handleLostToFollowUp( LostEvent lostEvent )
+ throws NotAllowedException;
+
+ Patient generateRepeatableEvent( int orgUnitId, String eventInfo )
+ throws NotAllowedException;
+
+ String saveSingleEventWithoutRegistration( ProgramStage programStage, int orgUnitId )
+ throws NotAllowedException;
+
+ String sendFeedback( Message message )
+ throws NotAllowedException;
+
+ Collection<User> findUser( String keyword )
+ throws NotAllowedException;
+
+ String sendMessage( Message message )
throws NotAllowedException;
}
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/FacilityReportingService.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/FacilityReportingService.java 2014-03-21 06:05:07 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/FacilityReportingService.java 2014-05-20 15:38:30 +0000
@@ -44,29 +44,22 @@
public interface FacilityReportingService
{
- public List<DataSet> getMobileDataSetsForUnit( OrganisationUnit unit, String localeString );
-
- public DataSet getDataSet( int id );
-
- public DataSet getDataSetForLocale( int dataSetId, Locale locale );
-
- /**
- * Save {@link DataSetValue} to given {@link OrganisationUnit}
- *
- * @param unit - the Organisation unit to save to
- * @param dataSetValue - the data set value to save
- * @throws NotAllowedException if saving is not allowed
- */
- public void saveDataSetValues( OrganisationUnit unit, DataSetValue dataSetValue )
- throws NotAllowedException;
-
- public DataSetValueList getDataSetValues( OrganisationUnit unit, DataSetList dataSetList )
- throws NotAllowedException;
-
- public DataSetList getUpdatedDataSet( DataSetList dataSetList, OrganisationUnit unit, String locale );
-
- public DataSetList getDataSetsForLocale( OrganisationUnit unit, String locale );
-
- public Contact updateContactForMobile();
+ List<DataSet> getMobileDataSetsForUnit( OrganisationUnit unit, String localeString );
+
+ DataSet getDataSet( int id );
+
+ DataSet getDataSetForLocale( int dataSetId, Locale locale );
+
+ void saveDataSetValues( OrganisationUnit unit, DataSetValue dataSetValue )
+ throws NotAllowedException;
+
+ DataSetValueList getDataSetValues( OrganisationUnit unit, DataSetList dataSetList )
+ throws NotAllowedException;
+
+ DataSetList getUpdatedDataSet( DataSetList dataSetList, OrganisationUnit unit, String locale );
+
+ DataSetList getDataSetsForLocale( OrganisationUnit unit, String locale );
+
+ Contact updateContactForMobile();
}
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/IProgramService.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/IProgramService.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/IProgramService.java 2014-05-20 15:38:30 +0000
@@ -36,14 +36,14 @@
public interface IProgramService
{
- public List<Program> getPrograms( OrganisationUnit unit, String localeString );
-
- public Program getProgram( int programId, String localeString );
-
- public List<org.hisp.dhis.api.mobile.model.LWUITmodel.Program> getProgramsLWUIT( OrganisationUnit unit );
-
- public org.hisp.dhis.api.mobile.model.LWUITmodel.Program getProgramLWUIT( int programId );
-
- public List<Program> updateProgram( ModelList programsFromClient, String localeString, OrganisationUnit unit );
+ List<Program> getPrograms( OrganisationUnit unit, String localeString );
+
+ Program getProgram( int programId, String localeString );
+
+ List<org.hisp.dhis.api.mobile.model.LWUITmodel.Program> getProgramsLWUIT( OrganisationUnit unit );
+
+ org.hisp.dhis.api.mobile.model.LWUITmodel.Program getProgramLWUIT( int programId );
+
+ List<Program> updateProgram( ModelList programsFromClient, String localeString, OrganisationUnit unit );
}
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/NotAllowedException.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/NotAllowedException.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/NotAllowedException.java 2014-05-20 15:38:30 +0000
@@ -31,11 +31,6 @@
public class NotAllowedException
extends Exception
{
- /**
- * Determines if a de-serialized file is compatible with this class.
- */
- private static final long serialVersionUID = 2830950542493770883L;
-
public static final NotAllowedException INVALID_PROGRAM_STAGE = new NotAllowedException( "INVALID_PROGRAM_STAGE" );
public static final NotAllowedException INVALID_DATASET_ASSOCIATION = new NotAllowedException( "INVALID_DATASET_ASSOCIATION" );
@@ -69,7 +64,7 @@
this.reason = reason;
}
- public String getReason()
+ String getReason()
{
return reason;
}
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/TrackedEntityMobileSettingService.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/TrackedEntityMobileSettingService.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/TrackedEntityMobileSettingService.java 2014-05-20 15:38:30 +0000
@@ -34,12 +34,12 @@
public interface TrackedEntityMobileSettingService
{
- public int saveTrackedEntityMobileSetting( TrackedEntityMobileSetting setting );
-
- public void updateTrackedEntityMobileSetting( TrackedEntityMobileSetting setting );
-
- public Collection<TrackedEntityMobileSetting> getCurrentSetting();
+ int saveTrackedEntityMobileSetting( TrackedEntityMobileSetting setting );
+
+ void updateTrackedEntityMobileSetting( TrackedEntityMobileSetting setting );
+
+ Collection<TrackedEntityMobileSetting> getCurrentSetting();
- public TrackedEntityMobileSetting get( int id );
+ TrackedEntityMobileSetting get( int id );
}
