=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java	2010-03-17 13:16:09 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java	2010-03-18 13:47:29 +0000
@@ -489,5 +489,5 @@
      * 
      * @return a collection of all Operands.
      */
-    Collection<DataElementOperand> getAllOperands();
+    Collection<DataElementOperand> getAllGeneratedOperands();
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java	2010-03-17 13:16:09 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java	2010-03-18 13:47:29 +0000
@@ -266,10 +266,10 @@
     // -------------------------------------------------------------------------
 
     /**
-     * Returns all Operands. Requires the categoryoptioncomboname resource table
-     * to be populated.
+     * Returns all generated permutations of Operands. Requires the 
+     * categoryoptioncomboname resource table to be populated.
      * 
      * @return a collection of all Operands.
      */
-    Collection<DataElementOperand> getAllOperands();
+    Collection<DataElementOperand> getAllGeneratedOperands();
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2010-03-17 13:16:09 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2010-03-18 13:47:29 +0000
@@ -613,8 +613,8 @@
     // Operand
     // -------------------------------------------------------------------------
     
-    public Collection<DataElementOperand> getAllOperands()
+    public Collection<DataElementOperand> getAllGeneratedOperands()
     {
-        return dataElementStore.getAllOperands();
+        return dataElementStore.getAllGeneratedOperands();
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java	2010-03-17 13:16:09 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java	2010-03-18 13:47:29 +0000
@@ -418,7 +418,7 @@
     // Operand
     // -------------------------------------------------------------------------
     
-    public Collection<DataElementOperand> getAllOperands()
+    public Collection<DataElementOperand> getAllGeneratedOperands()
     {
         final ObjectMapper<DataElementOperand> mapper = new ObjectMapper<DataElementOperand>();
         

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java	2010-03-17 13:16:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOperandsAction.java	2010-03-18 13:47:29 +0000
@@ -72,7 +72,7 @@
 
     public String execute()
     {
-        operands = new ArrayList<DataElementOperand>( dataElementService.getAllOperands() );
+        operands = new ArrayList<DataElementOperand>( dataElementService.getAllGeneratedOperands() );
         
         Collections.sort( operands, new DataElementOperandNameComparator() );