=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionaryService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionaryService.java 2013-08-23 15:56:19 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/DataDictionaryService.java 2014-01-07 19:29:07 +0000 @@ -78,7 +78,7 @@ List getDataDictionaryByName( String name ); /** - * Deteles the DataDictionary. + * Deletes the DataDictionary. * * @param dataDictionary the DataDictionary to delete. */ @@ -93,9 +93,9 @@ List getDataElementsByDictionaryId( int dictionaryId ); - List getDataDictionarysBetween( int first, int max ); + List getDataDictionariesBetween( int first, int max ); - List getDataDictionarysBetweenByName( String name, int first, int max ); + List getDataDictionariesBetweenByName( String name, int first, int max ); int getDataDictionaryCount(); === 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 2014-01-02 13:13:21 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java 2014-01-07 19:29:07 +0000 @@ -62,7 +62,7 @@ * as name, with type DataElement.TYPE_INT. DataElements can be structured * hierarchically, one DataElement can have a parent and a collection of * children. The sum of the children represent the same entity as the parent. - * Hiearchies of DataElements are used to give more fine- or course-grained + * Hierarchies of DataElements are used to give more fine- or course-grained * representations of the entities. *

* DataElement acts as a DimensionSet in the dynamic dimensional model, and as a @@ -341,7 +341,7 @@ /** * Tests whether the DataElement is associated with a - * DataELementCategoryCombo with more than one DataElementCategory, or any + * DataElementCategoryCombo with more than one DataElementCategory, or any * DataElementCategory with more than one DataElementCategoryOption. */ public boolean isMultiDimensional() === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java 2013-12-23 17:18:05 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java 2014-01-07 19:29:07 +0000 @@ -414,7 +414,7 @@ /** * Generates and persists a default DataElementCategory, - * DataElmentCategoryOption, DataElementCategoryCombo and + * DataElementCategoryOption, DataElementCategoryCombo and * DataElementCategoryOptionCombo. */ void generateDefaultDimension(); @@ -483,7 +483,7 @@ Collection getOperands( Collection dataElements, boolean includeTotals ); /** - * Gets the Operands for the DataElements whith names like the given name. + * Gets the Operands for the DataElements with names like the given name. * * @param name the name. * @return the Operands for the DataElements with names like the given name. @@ -498,9 +498,9 @@ */ Collection getFullOperands( Collection dataElements ); - Collection getDataElementCategorysBetween( int first, int max ); + Collection getDataElementCategoriesBetween( int first, int max ); - Collection getDataElementCategorysBetweenByName( String name, int first, int max ); + Collection getDataElementCategoriesBetweenByName( String name, int first, int max ); /** * Returns all DataElementCategories for a given concept @@ -508,7 +508,7 @@ * @param concept the Concept * @return a collection of all DataElementCategories, or an empty collection. */ - Collection getDataElementCategorysByConcept( Concept concept ); + Collection getDataElementCategoriesByConcept( Concept concept ); Map getDataElementCategoryOptionComboUidIdMap(); === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java 2013-09-16 17:07:25 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java 2014-01-07 19:29:07 +0000 @@ -244,7 +244,7 @@ * organisation unit level. If no aggregation levels lower than the * organisation unit level exist, null is returned. * - * @param organisationUnitLevel the hiearchy level of the relevant + * @param organisationUnitLevel the hierarchy level of the relevant * OrganisationUnit. */ public Integer getRelevantAggregationLevel( int organisationUnitLevel ) === 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 2013-12-30 11:02:39 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java 2014-01-07 19:29:07 +0000 @@ -169,7 +169,7 @@ Collection getAllActiveDataElements(); /** - * Returns all DataElements with a given aggregantion operator. + * Returns all DataElements with a given aggregation operator. * * @param aggregationOperator the aggregation operator of the DataElements * to return. === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryForm.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryForm.java 2013-08-23 15:56:19 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryForm.java 2014-01-07 19:29:07 +0000 @@ -91,7 +91,7 @@ private int format; // ------------------------------------------------------------------------- - // Contructors + // Constructors // ------------------------------------------------------------------------- public DataEntryForm() === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormService.java 2013-08-23 15:56:19 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormService.java 2014-01-07 19:29:07 +0000 @@ -147,7 +147,7 @@ Set getOperandsInDataEntryForm( DataSet dataSet ); - Collection listDisctinctDataEntryFormByProgramStageIds( List programStageIds ); + Collection listDistinctDataEntryFormByProgramStageIds( List programStageIds ); - Collection listDisctinctDataEntryFormByDataSetIds( List dataSetIds ); + Collection listDistinctDataEntryFormByDataSetIds( List dataSetIds ); } === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormStore.java 2013-08-23 15:56:19 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormStore.java 2014-01-07 19:29:07 +0000 @@ -84,7 +84,7 @@ */ Collection getAllDataEntryForms(); - Collection listDisctinctDataEntryFormByProgramStageIds( List programStageIds ); + Collection listDistinctDataEntryFormByProgramStageIds( List programStageIds ); - Collection listDisctinctDataEntryFormByDataSetIds( List dataSetIds ); + Collection listDistinctDataEntryFormByDataSetIds( List dataSetIds ); } === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamerge/DataMergeService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamerge/DataMergeService.java 2013-08-23 15:56:19 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamerge/DataMergeService.java 2014-01-07 19:29:07 +0000 @@ -38,7 +38,7 @@ public interface DataMergeService { void eliminateDuplicateDataElement( DataElement destDataElement, DataElementCategoryOptionCombo destCategoryOptionCombo, - DataElement sourceDataElemenet, DataElementCategoryOptionCombo sourceCategoryOptionCombo ); + DataElement sourceDataElement, DataElementCategoryOptionCombo sourceCategoryOptionCombo ); void mergeOrganisationUnits( OrganisationUnit dest, OrganisationUnit source ); } === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamerge/DataMergeStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamerge/DataMergeStore.java 2013-08-23 15:56:19 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamerge/DataMergeStore.java 2014-01-07 19:29:07 +0000 @@ -42,7 +42,7 @@ * * @param destDataElement the destination data element. * @param destCategoryOptionCombo the destination category option combo. - * @param sourceDataElemenet the source data element. + * @param sourceDataElement the source data element. * @param sourceCategoryOptionCombo the source category option combo. */ void eliminateDuplicateDataElement( DataElement destDataElement, DataElementCategoryOptionCombo destCategoryOptionCombo, === modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/DefaultDataMergeService.java' --- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/DefaultDataMergeService.java 2013-08-23 16:00:30 +0000 +++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/DefaultDataMergeService.java 2014-01-07 19:29:07 +0000 @@ -34,8 +34,6 @@ import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; import org.hisp.dhis.dataelement.DataElementService; -import org.hisp.dhis.datamerge.DataMergeService; -import org.hisp.dhis.datamerge.DataMergeStore; import org.hisp.dhis.hierarchy.HierarchyViolationException; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; @@ -80,13 +78,13 @@ @Transactional public void eliminateDuplicateDataElement( DataElement destDataElement, DataElementCategoryOptionCombo destCategoryOptionCombo, - DataElement sourceDataElemenet, DataElementCategoryOptionCombo sourceCategoryOptionCombo ) + DataElement sourceDataElement, DataElementCategoryOptionCombo sourceCategoryOptionCombo ) { // --------------------------------------------------------------------- // Eliminate duplicates // --------------------------------------------------------------------- - dataMergeStore.eliminateDuplicateDataElement( destDataElement, destCategoryOptionCombo, sourceDataElemenet, sourceCategoryOptionCombo ); + dataMergeStore.eliminateDuplicateDataElement( destDataElement, destCategoryOptionCombo, sourceDataElement, sourceCategoryOptionCombo ); // --------------------------------------------------------------------- // Delete source @@ -94,7 +92,7 @@ try { - dataElementService.deleteDataElement( sourceDataElemenet ); + dataElementService.deleteDataElement( sourceDataElement ); } catch ( DeleteNotAllowedException ex ) { === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datadictionary/DefaultDataDictionaryService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datadictionary/DefaultDataDictionaryService.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/datadictionary/DefaultDataDictionaryService.java 2014-01-07 19:29:07 +0000 @@ -124,12 +124,12 @@ return dataDictionaryStore.getCountLikeName( name ); } - public List getDataDictionarysBetween( int first, int max ) + public List getDataDictionariesBetween( int first, int max ) { return new ArrayList( i18n( i18nService, dataDictionaryStore.getAllOrderedName( first, max ) ) ); } - public List getDataDictionarysBetweenByName( String name, int first, int max ) + public List getDataDictionariesBetweenByName( String name, int first, int max ) { return new ArrayList( i18n( i18nService, dataDictionaryStore.getAllLikeNameOrderedName( name, first, max ) ) ); } === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java 2013-12-23 17:18:05 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java 2014-01-07 19:29:07 +0000 @@ -184,7 +184,7 @@ } @Override - public Collection getDataElementCategorysByConcept( Concept concept ) + public Collection getDataElementCategoriesByConcept( Concept concept ) { return i18n( i18nService, categoryStore.getByConcept( concept ) ); } @@ -241,12 +241,12 @@ return i18n( i18nService, categoryStore.getAllLikeNameOrderedName( name, first, max ) ); } - public Collection getDataElementCategorysBetween( int first, int max ) + public Collection getDataElementCategoriesBetween( int first, int max ) { return i18n( i18nService, categoryStore.getAllOrderedName( first, max ) ); } - public Collection getDataElementCategorysBetweenByName( String name, int first, int max ) + public Collection getDataElementCategoriesBetweenByName( String name, int first, int max ) { return i18n( i18nService, categoryStore.getAllLikeNameOrderedName( name, first, max ) ); } === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java 2013-12-18 17:45:28 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java 2014-01-07 19:29:07 +0000 @@ -422,24 +422,24 @@ return operands; } - public Collection listDisctinctDataEntryFormByProgramStageIds( List programStageIds ) + public Collection listDistinctDataEntryFormByProgramStageIds( List programStageIds ) { if ( programStageIds == null || programStageIds.isEmpty() ) { return null; } - return dataEntryFormStore.listDisctinctDataEntryFormByProgramStageIds( programStageIds ); + return dataEntryFormStore.listDistinctDataEntryFormByProgramStageIds( programStageIds ); } - public Collection listDisctinctDataEntryFormByDataSetIds( List dataSetIds ) + public Collection listDistinctDataEntryFormByDataSetIds( List dataSetIds ) { if ( dataSetIds == null || dataSetIds.size() == 0 ) { return null; } - return dataEntryFormStore.listDisctinctDataEntryFormByDataSetIds( dataSetIds ); + return dataEntryFormStore.listDistinctDataEntryFormByDataSetIds( dataSetIds ); } public Collection getDataEntryForms( final Collection identifiers ) === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/hibernate/HibernateDataEntryFormStore.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/hibernate/HibernateDataEntryFormStore.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/hibernate/HibernateDataEntryFormStore.java 2014-01-07 19:29:07 +0000 @@ -127,7 +127,7 @@ } @SuppressWarnings( "unchecked" ) - public Collection listDisctinctDataEntryFormByProgramStageIds( List programStageIds ) + public Collection listDistinctDataEntryFormByProgramStageIds( List programStageIds ) { Session session = sessionFactory.getCurrentSession(); @@ -139,7 +139,7 @@ } @SuppressWarnings( "unchecked" ) - public Collection listDisctinctDataEntryFormByDataSetIds( List dataSetIds ) + public Collection listDistinctDataEntryFormByDataSetIds( List dataSetIds ) { Session session = sessionFactory.getCurrentSession(); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryListAction.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryListAction.java 2014-01-07 19:29:07 +0000 @@ -99,13 +99,13 @@ { this.paging = createPaging( dataElementCategoryService.getDataElementCategoryCountByName( key ) ); - dataElementCategories = new ArrayList( dataElementCategoryService.getDataElementCategorysBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) ); + dataElementCategories = new ArrayList( dataElementCategoryService.getDataElementCategoriesBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) ); } else { this.paging = createPaging( dataElementCategoryService.getDataElementCategoryCount() ); - dataElementCategories = new ArrayList( dataElementCategoryService.getDataElementCategorysBetween( paging.getStartPos(), paging.getPageSize() ) ); + dataElementCategories = new ArrayList( dataElementCategoryService.getDataElementCategoriesBetween( paging.getStartPos(), paging.getPageSize() ) ); } Collections.sort( dataElementCategories, IdentifiableObjectNameComparator.INSTANCE ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryListAction.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/datadictionary/GetDataDictionaryListAction.java 2014-01-07 19:29:07 +0000 @@ -91,13 +91,13 @@ { this.paging = createPaging( dataDictionaryService.getDataDictionaryCountByName( key ) ); - dataDictionaries = new ArrayList( dataDictionaryService.getDataDictionarysBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) ); + dataDictionaries = new ArrayList( dataDictionaryService.getDataDictionariesBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) ); } else { this.paging = createPaging( dataDictionaryService.getDataDictionaryCount() ); - dataDictionaries = new ArrayList( dataDictionaryService.getDataDictionarysBetween( paging.getStartPos(), paging.getPageSize() ) ); + dataDictionaries = new ArrayList( dataDictionaryService.getDataDictionariesBetween( paging.getStartPos(), paging.getPageSize() ) ); } Collections.sort( dataDictionaries, IdentifiableObjectNameComparator.INSTANCE ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java 2013-08-23 16:05:01 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/dataentryform/ViewDataEntryFormAction.java 2014-01-07 19:29:07 +0000 @@ -203,7 +203,7 @@ } existingDataEntryForms = new ArrayList( - dataEntryFormService.listDisctinctDataEntryFormByProgramStageIds( listAssociationIds ) ); + dataEntryFormService.listDistinctDataEntryFormByProgramStageIds( listAssociationIds ) ); existingDataEntryForms.remove( dataEntryForm );