← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14277: changed from getUnique to isUnique in TEA

 

------------------------------------------------------------
revno: 14277
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-03-18 14:40:38 +0100
message:
  changed from getUnique to isUnique in TEA
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.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/trackedentity/TrackedEntityAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java	2014-03-18 13:40:38 +0000
@@ -315,7 +315,7 @@
     @JsonProperty
     @JsonView( { DetailedView.class } )
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
-    public Boolean getUnique()
+    public Boolean isUnique()
     {
         return unique;
     }
@@ -429,7 +429,7 @@
             sortOrderInVisitSchedule = trackedEntityAttribute.getSortOrderInVisitSchedule();
             displayInListNoProgram = trackedEntityAttribute.getDisplayInListNoProgram();
             sortOrderInListNoProgram = trackedEntityAttribute.getSortOrderInListNoProgram();
-            unique = trackedEntityAttribute.getUnique();
+            unique = trackedEntityAttribute.isUnique();
             orgunitScope = trackedEntityAttribute.getOrgunitScope();
             programScope = trackedEntityAttribute.getProgramScope();
             periodType = trackedEntityAttribute.getPeriodType();

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java	2014-03-18 13:40:38 +0000
@@ -455,7 +455,7 @@
             {
                 TrackedEntityAttribute attribute = attributeValue.getAttribute();
 
-                if ( attribute.getUnique() )
+                if ( attribute.isUnique() )
                 {
                     hasUnique = true;
                     break;
@@ -475,7 +475,7 @@
                 {
                     TrackedEntityAttribute attribute = attributeValue.getAttribute();
 
-                    if ( attribute.getUnique() )
+                    if ( attribute.isUnique() )
                     {
                         Conjunction conjunction = Restrictions.conjunction();
                         conjunction.add( Restrictions.eq( "attributeValue.value", attributeValue.getValue() ) );