=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java	2009-11-05 19:04:58 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java	2009-11-06 09:18:28 +0000
@@ -172,12 +172,7 @@
         {
             return null;
         }
-
-        public DimensionOption getDimensionOption( DimensionOptionElement element )
-        {
-            return null;
-        }
-        
+                
         @Override
         public boolean equals( Object o )
         {

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java	2009-11-05 19:04:58 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java	2009-11-06 09:18:28 +0000
@@ -32,7 +32,6 @@
 
 import org.hisp.dhis.dimension.Dimension;
 import org.hisp.dhis.dimension.DimensionOption;
-import org.hisp.dhis.dimension.DimensionOptionElement;
 
 /**
  * DataElementGroupSet is a set of DataElementGroups. It is by default exclusive,
@@ -68,19 +67,6 @@
         return members;
     }
     
-    public DimensionOption getDimensionOption( DimensionOptionElement dimensionOptionElement )
-    {
-        for ( DimensionOption dimensionOption : members )
-        {
-            if ( dimensionOption.getDimensionOptionElements().contains( dimensionOptionElement ) )
-            {
-                return dimensionOption;
-            }
-        }
-        
-        return null;
-    }
-    
     // -------------------------------------------------------------------------
     // equals and hashCode
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dimension/Dimension.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dimension/Dimension.java	2009-11-05 19:04:58 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dimension/Dimension.java	2009-11-06 09:18:28 +0000
@@ -39,7 +39,7 @@
 {
     public abstract List<? extends DimensionOption> getDimensionOptions();
 
-    public DimensionOption getDimensionOption( DimensionOptionElement dimensionOptionElement )
+    public final DimensionOption getDimensionOption( DimensionOptionElement dimensionOptionElement )
     {
         for ( DimensionOption dimensionOption : getDimensionOptions() )
         {

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dimension/Measure.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dimension/Measure.java	2009-11-05 19:04:58 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dimension/Measure.java	2009-11-06 09:18:28 +0000
@@ -37,4 +37,6 @@
     Map<Dimension, DimensionOption> getDimensions();
     
     Map<Dimension, DimensionOption> getDimensions( DimensionSet dimensionSet );
+    
+    String getMeasure();
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java	2009-11-05 19:04:58 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/period/Period.java	2009-11-06 09:18:28 +0000
@@ -100,11 +100,6 @@
             return null;
         }
         
-        public DimensionOption getDimensionOption( DimensionOptionElement element )
-        {
-            return null;
-        }
-        
         @Override
         public boolean equals( Object o )
         {

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/source/Source.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/source/Source.java	2009-11-05 19:04:58 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/source/Source.java	2009-11-06 09:18:28 +0000
@@ -66,11 +66,6 @@
         {
             return null;
         }
-
-        public DimensionOption getDimensionOption( DimensionOptionElement element )
-        {
-            return null;
-        }
         
         @Override
         public boolean equals( Object o )