=== 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	2009-11-10 15:53:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java	2009-11-26 12:05:49 +0000
@@ -128,15 +128,7 @@
      *         are no DataElements.
      */
     Collection<DataElement> getAllDataElements(); 
-    
-    
-    /**
-     * Returns all DataElements which are instances of CalculatedDataElement.
-     * 
-     * @return all DataElements which are instances of CalculatedDataElement.
-     */
-    Collection<CalculatedDataElement> getCalculatedDataElements();
-    
+        
     /**
      * Returns all DataElements which are not instances of CalculatedDataElements.
      * 

=== 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	2009-11-12 17:59:58 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java	2009-11-26 12:05:49 +0000
@@ -139,21 +139,6 @@
         return i18n( i18nService, dataElementStore.getAllDataElements() );
     }
     
-    public Collection<CalculatedDataElement> getCalculatedDataElements()
-    {        
-        Collection<CalculatedDataElement> calculatedDataElements = new ArrayList<CalculatedDataElement>();
-        
-        for ( DataElement dataElement : getAllDataElements() )
-        {
-            if ( dataElement instanceof CalculatedDataElement )
-            {
-                calculatedDataElements.add( (CalculatedDataElement) dataElement );
-            }
-        }
-        
-        return calculatedDataElements;
-    }
-    
     public Collection<DataElement> getNonCalculatedDataElements()
     {
         Collection<DataElement> dataElements = new ArrayList<DataElement>();
@@ -190,7 +175,7 @@
     {
         if ( identifiers == null )
         {
-            return getCalculatedDataElements();
+            return getAllCalculatedDataElements();
         }
         
         Collection<CalculatedDataElement> objects = new ArrayList<CalculatedDataElement>();

=== 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	2009-11-07 14:09:00 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java	2009-11-26 12:05:49 +0000
@@ -155,7 +155,7 @@
 
         return criteria.list();
     }
-
+    
     @SuppressWarnings( "unchecked" )
     public Collection<DataElement> getAggregateableDataElements()
     {

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java	2009-11-26 10:38:53 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/importer/DefaultDXFImportService.java	2009-11-26 12:05:49 +0000
@@ -372,8 +372,7 @@
             }
             catch ( javax.xml.bind.JAXBException ex )
             {
-                log.warn( "Parsing error: " + ex ); // report something to GUI
-                
+                log.warn( "Parsing error: " + ex ); // report something to GUI                
             }
         }
         else

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetMatchOptionsAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetMatchOptionsAction.java	2009-11-02 11:56:51 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/imp/GetMatchOptionsAction.java	2009-11-26 12:05:49 +0000
@@ -202,7 +202,7 @@
         }
         else if ( objectType.equals( CALCULATEDDATAELEMENT.name() ) )
         {
-            objects = dataElementService.getCalculatedDataElements();
+            objects = dataElementService.getAllCalculatedDataElements();
         }
         else if ( objectType.equals( DATAELEMENTGROUP.name() ) )
         {