dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21100
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-11-17 21:05:06 +0100
message:
  Revert r 21082
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.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/program/ProgramTrackedEntityAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java	2015-11-17 10:14:31 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java	2015-11-17 20:05:06 +0000
@@ -34,15 +34,10 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.google.common.base.MoreObjects;
-
-import org.hisp.dhis.analytics.AggregationType;
-import org.hisp.dhis.common.BaseDimensionalObject;
 import org.hisp.dhis.common.BaseIdentifiableObject;
-import org.hisp.dhis.common.DimensionType;
 import org.hisp.dhis.common.DxfNamespaces;
 import org.hisp.dhis.common.view.DetailedView;
 import org.hisp.dhis.common.view.ExportView;
-import org.hisp.dhis.legend.LegendSet;
 import org.hisp.dhis.trackedentity.TrackedEntityAttribute;
 
 /**
@@ -50,7 +45,7 @@
  */
 @JacksonXmlRootElement( localName = "programTrackedEntityAttribute", namespace = DxfNamespaces.DXF_2_0 )
 public class ProgramTrackedEntityAttribute
-    extends BaseDimensionalObject
+    extends BaseIdentifiableObject
 {
     private Program program;
     
@@ -97,28 +92,6 @@
     }
 
     // -------------------------------------------------------------------------
-    // DimensionalObject
-    // -------------------------------------------------------------------------
-
-    @Override
-    public DimensionType getDimensionType()
-    {
-        return DimensionType.PROGRAM_ATTRIBUTE;
-    }
-    
-    @Override
-    public LegendSet getLegendSet()
-    {
-        return attribute.getLegendSet();
-    }
-
-    @Override
-    public AggregationType getAggregationType()
-    {
-        return attribute.getAggregationType();
-    }
-    
-    // -------------------------------------------------------------------------
     // Getters && Setters
     // -------------------------------------------------------------------------