dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17698
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2014-12-14 21:42:31 +0100
message:
  use getShortName/getDescription for displayShortName/displayDescription
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.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/common/BaseNameableObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java	2014-10-16 06:17:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java	2014-12-14 20:42:31 +0000
@@ -191,7 +191,7 @@
     @Override
     public String getDisplayShortName()
     {
-        return displayShortName != null && !displayShortName.trim().isEmpty() ? displayShortName : shortName;
+        return displayShortName != null && !displayShortName.trim().isEmpty() ? displayShortName : getShortName();
     }
 
     public void setDisplayShortName( String displayShortName )
@@ -202,7 +202,7 @@
     @Override
     public String getDisplayDescription()
     {
-        return displayDescription != null && !displayDescription.trim().isEmpty() ? displayDescription : description;
+        return displayDescription != null && !displayDescription.trim().isEmpty() ? displayDescription : getDescription();
     }
 
     public void setDisplayDescription( String displayDescription )