------------------------------------------------------------
revno: 19422
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Tue 2015-06-16 18:07:21 +0200
message:
Minor
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.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/BaseDimensionalObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.java 2015-06-13 14:19:23 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.java 2015-06-16 16:07:21 +0000
@@ -143,13 +143,13 @@
@Override
public boolean hasItems()
{
- return items != null && !items.isEmpty();
+ return !getItems().isEmpty();
}
@Override
public boolean hasLegendSet()
{
- return legendSet != null;
+ return getLegendSet() != null;
}
@Override
@@ -163,8 +163,8 @@
{
return
DimensionType.TRACKED_ENTITY_ATTRIBUTE.equals( dimensionType ) ||
- DimensionType.TRACKED_ENTITY_DATAELEMENT.equals( dimensionType ) ?
- AnalyticsType.EVENT : AnalyticsType.AGGREGATE;
+ DimensionType.TRACKED_ENTITY_DATAELEMENT.equals( dimensionType ) ?
+ AnalyticsType.EVENT : AnalyticsType.AGGREGATE;
}
/**
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
