dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15313
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-05-20 17:35:16 +0200
message:
  Override annotations
modified:
  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/DefaultProgramService.java
  dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.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	2014-05-16 06:06:48 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/ActivityReportingServiceImpl.java	2014-05-20 15:35:16 +0000
@@ -857,29 +857,6 @@
         }
         patientModel.setRelationships( relationshipList );
 
-        // Set available enrollment relationships
-        // List<RelationshipType> enrollmentRelationshipList = new
-        // ArrayList<RelationshipType>(
-        // relationshipTypeService.getAllRelationshipTypes() );
-        // List<org.hisp.dhis.api.mobile.model.LWUITmodel.Relationship>
-        // enrollmentRelationshipMobileList = new
-        // ArrayList<org.hisp.dhis.api.mobile.model.LWUITmodel.Relationship>();
-        // for ( RelationshipType enrollmentRelationship :
-        // enrollmentRelationshipList )
-        // {
-        // org.hisp.dhis.api.mobile.model.LWUITmodel.Relationship
-        // enrollmentRelationshipMobile = new
-        // org.hisp.dhis.api.mobile.model.LWUITmodel.Relationship();
-        // enrollmentRelationshipMobile.setId( enrollmentRelationship.getId() );
-        // enrollmentRelationshipMobile.setName(
-        // enrollmentRelationship.getName() );
-        // enrollmentRelationshipMobile.setaIsToB(
-        // enrollmentRelationship.getaIsToB() );
-        // enrollmentRelationshipMobile.setbIsToA(
-        // enrollmentRelationship.getbIsToA() );
-        // enrollmentRelationshipMobileList.add( enrollmentRelationshipMobile );
-        // }
-        // patientModel.setRelationships( enrollmentRelationshipMobileList );
         return patientModel;
     }
 
@@ -1203,6 +1180,7 @@
                         programsInfo += program.getId() + "/" + program.getName() + "$";
                     }
                 }
+                
                 throw new NotAllowedException( programsInfo );
             }
         }
@@ -1401,6 +1379,7 @@
         }
     }
 
+    @Override
     public Collection<TrackedEntityAttribute> getPatientAtts( String programId )
     {
         Collection<TrackedEntityAttribute> patientAttributes = null;
@@ -1418,6 +1397,7 @@
         return patientAttributes;
     }
 
+    @Override
     public Collection<org.hisp.dhis.api.mobile.model.PatientAttribute> getAttsForMobile()
     {
         Collection<org.hisp.dhis.api.mobile.model.PatientAttribute> list = new HashSet<org.hisp.dhis.api.mobile.model.PatientAttribute>();
@@ -1820,14 +1800,16 @@
         return mobilePatient;
     }
 
+    // TODO remove, we cannot have state like this in a singleton
+    
     private org.hisp.dhis.api.mobile.model.LWUITmodel.Patient patientMobile;
 
-    public org.hisp.dhis.api.mobile.model.LWUITmodel.Patient getPatientMobile()
+    private org.hisp.dhis.api.mobile.model.LWUITmodel.Patient getPatientMobile()
     {
         return patientMobile;
     }
 
-    public void setPatientMobile( org.hisp.dhis.api.mobile.model.LWUITmodel.Patient patientMobile )
+    private void setPatientMobile( org.hisp.dhis.api.mobile.model.LWUITmodel.Patient patientMobile )
     {
         this.patientMobile = patientMobile;
     }

=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java	2014-05-17 12:04:42 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/DefaultProgramService.java	2014-05-20 15:35:16 +0000
@@ -61,6 +61,7 @@
     // ProgramService
     // -------------------------------------------------------------------------
 
+    @Override
     public List<Program> getPrograms( OrganisationUnit unit, String localeString )
     {
         List<Program> programs = new ArrayList<Program>();
@@ -73,6 +74,7 @@
         return programs;
     }
 
+    @Override
     public List<org.hisp.dhis.api.mobile.model.LWUITmodel.Program> getProgramsLWUIT( OrganisationUnit unit )
     {
         Collection<org.hisp.dhis.program.Program> programByUnit = programService.getPrograms( unit );
@@ -92,6 +94,7 @@
         return programs;
     }
 
+    @Override
     public List<Program> updateProgram( ModelList programsFromClient, String localeString, OrganisationUnit unit )
     {
         List<Program> programs = new ArrayList<Program>();
@@ -176,6 +179,7 @@
         return pr;
     }
 
+    @Override
     public org.hisp.dhis.api.mobile.model.LWUITmodel.Program getProgramLWUIT( int programId )
     {
         org.hisp.dhis.program.Program program = programService.getProgram( programId );

=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.java	2014-03-21 06:05:07 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/mobile/service/FacilityReportingServiceImpl.java	2014-05-20 15:35:16 +0000
@@ -118,6 +118,7 @@
     // Service methods
     // -------------------------------------------------------------------------
 
+    @Override
     public List<DataSet> getMobileDataSetsForUnit( OrganisationUnit unit, String localeString )
     {
 
@@ -149,6 +150,7 @@
         return datasets;
     }
 
+    @Override
     public DataSetList getUpdatedDataSet( DataSetList dataSetList, OrganisationUnit unit, String locale )
     {
         if ( DEBUG )
@@ -207,6 +209,7 @@
         return updatedDataSetList;
     }
 
+    @Override
     public DataSetList getDataSetsForLocale( OrganisationUnit unit, String locale )
     {
         DataSetList dataSetList = new DataSetList();
@@ -215,11 +218,13 @@
         return dataSetList;
     }
 
+    @Override
     public DataSet getDataSet( int id )
     {
         return getDataSetForLocale( id, null );
     }
 
+    @Override
     public DataSet getDataSetForLocale( int dataSetId, Locale locale )
     {
         org.hisp.dhis.dataset.DataSet dataSet = dataSetService.getDataSet( dataSetId );
@@ -498,7 +503,7 @@
     // Supportive method
     // -------------------------------------------------------------------------
 
-    public Period getPeriod( String periodName, PeriodType periodType )
+    private Period getPeriod( String periodName, PeriodType periodType )
     {
         Period period = PeriodUtil.getPeriod( periodName, periodType );