dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8277
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-09-27 08:16:43 +0200
message:
  Codestyle
modified:
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java
  dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/FindBeneficiarytAction.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-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientService.java	2012-09-27 05:47:35 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/DefaultPatientService.java	2012-09-27 06:16:43 +0000
@@ -546,17 +546,6 @@
     @Override
     public Collection<Patient> getPatientsByPhone( String phoneNumber, Integer min, Integer max)
     {
-      
-        return patientStore.getByPhoneNumber( phoneNumber, min, max );
-      
+        return patientStore.getByPhoneNumber( phoneNumber, min, max ); 
     }
-
-   
-
-   
-
-
-
-   
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java	2012-09-27 05:47:35 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java	2012-09-27 06:16:43 +0000
@@ -38,7 +38,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.Query;
-import org.hibernate.SQLQuery;
 import org.hibernate.criterion.Conjunction;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Projections;
@@ -538,7 +537,6 @@
         return sql;
     }
 
-    @SuppressWarnings( "unchecked" )
     @Override
     public Collection<Patient> getByPhoneNumber( String phoneNumber, Integer min, Integer max )
     {
@@ -572,7 +570,5 @@
             ex.printStackTrace();
         }
         return patients;
-
     }
-
 }

=== 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	2012-09-27 05:47:35 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/namebaseddataentry/action/FindBeneficiarytAction.java	2012-09-27 06:16:43 +0000
@@ -105,8 +105,6 @@
         this.patientId = patientId;
     }
 
-    // Use in search related patient
-
     private Integer originalPatientId;
 
     public void setOriginalPatientId( Integer originalPatientId )
@@ -181,31 +179,5 @@
         }
 
         return SUCCESS;
-
-        // if ( keyPhone != null )
-        // {
-        // int index = keyPhone.indexOf( ' ' );
-        //
-        // if ( index != -1 && index == keyPhone.lastIndexOf( ' ' ) )
-        // {
-        // String[] keys = keyPhone.split( " " );
-        // keyPhone = keys[0] + "  " + keys[1];
-        // }
-        // }
-        //
-        // patients = patientService.getPatientsByPhone( keyPhone,
-        // organisationUnitId );
-        //
-        //
-        // if ( patients.size() == 1 )
-        // {
-        // Patient patient = patients.iterator().next();
-        //
-        // phoneNumber = patient.getPhoneNumber();
-        // return REDIRECT;
-        // }
-        //
-        // return SUCCESS;
     }
-
 }