dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13004
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-11-22 10:59:37 +0700
message:
  Change from Boolean objects to boolean primitives in domain model
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/Patient.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationFormService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.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-api/src/main/java/org/hisp/dhis/patient/Patient.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/Patient.java	2013-11-18 10:39:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/Patient.java	2013-11-22 03:59:37 +0000
@@ -100,7 +100,7 @@
 
     private Date registrationDate;
 
-    private boolean isDead = false;
+    private boolean isDead;
 
     private Set<PatientIdentifier> identifiers = new HashSet<PatientIdentifier>();
     

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java	2013-09-27 17:04:23 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAttribute.java	2013-11-22 03:59:37 +0000
@@ -66,9 +66,9 @@
 
     private boolean mandatory;
 
-    private Boolean inherit;
+    private Boolean inherit = false;
 
-    private Boolean groupBy;
+    private Boolean groupBy = false;
 
     private PatientAttributeGroup patientAttributeGroup;
 
@@ -76,7 +76,7 @@
 
     private String expression;
 
-    private Boolean displayOnVisitSchedule;
+    private Boolean displayOnVisitSchedule = false;
 
     private Integer sortOrderInVisitSchedule;
 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java	2013-09-16 17:07:25 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientMobileSetting.java	2013-11-22 03:59:37 +0000
@@ -35,16 +35,16 @@
     public static final long serialVersionUID = -5947521380646718129L;
 
     private int id;
-    
-    private Boolean gender;
-
-    private Boolean dobtype;
-
-    private Boolean birthdate;
-
-    private Boolean registrationdate;
-
-    private Boolean autoUpdateClient;
+
+    private Boolean gender = false;
+
+    private Boolean dobtype = false;
+
+    private Boolean birthdate = false;
+
+    private Boolean registrationdate = false;
+
+    private Boolean autoUpdateClient = false;
 
     private Double versionToUpdate;
 
@@ -130,7 +130,7 @@
         {
             return versionToUpdate;
         }
-        
+
         return 0;
     }
 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationFormService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationFormService.java	2013-11-04 03:13:27 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationFormService.java	2013-11-22 03:59:37 +0000
@@ -44,7 +44,6 @@
  */
 public interface PatientRegistrationFormService
 {
-
     final Pattern INPUT_PATTERN = Pattern.compile( "(<input.*?/>)", Pattern.DOTALL );
 
     final Pattern FIXED_ATTRIBUTE_PATTERN = Pattern.compile( "fixedattributeid=\"(\\w+)\"" );

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java	2013-09-27 17:04:23 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java	2013-11-22 03:59:37 +0000
@@ -140,7 +140,7 @@
 
     private RelationshipType relationshipType;
 
-    private Boolean relationshipFromA;
+    private Boolean relationshipFromA = false;
 
     private Program relatedProgram;