=== 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;
     }
 
     /**