← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13642: more typo fixes

 

------------------------------------------------------------
revno: 13642
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-01-07 20:37:58 +0100
message:
  more typo fixes
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamerge/DataMergeStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/location/LocationManager.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapgeneration/MapGenerationService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAudit.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierTypeService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierTypeStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationForm.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientcomment/PatientComment.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueStore.java
  dhis-2/dhis-api/src/test/java/org/hisp/dhis/sms/config/GenericHttpGatewayConfigTest.java
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/jdbc/JdbcDataMergeStore.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/DefaultPatientAttributeValueService.java
  dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java
  dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueServiceTest.java
  dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueStoreTest.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/RemovePatientAttributeOptionAction.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/datamerge/DataMergeStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamerge/DataMergeStore.java	2014-01-07 19:29:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamerge/DataMergeStore.java	2014-01-07 19:37:58 +0000
@@ -46,7 +46,7 @@
      * @param sourceCategoryOptionCombo the source category option combo.
      */
     void eliminateDuplicateDataElement( DataElement destDataElement, DataElementCategoryOptionCombo destCategoryOptionCombo,
-        DataElement sourceDataElemenet, DataElementCategoryOptionCombo sourceCategoryOptionCombo );
+        DataElement sourceDataElement, DataElementCategoryOptionCombo sourceCategoryOptionCombo );
     
     /**
      * Merge organisation units and their data values.

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java	2013-12-21 17:59:39 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValueService.java	2014-01-07 19:37:58 +0000
@@ -92,7 +92,7 @@
     int deleteDataValuesBySource( OrganisationUnit source );
 
     /**
-     * Deletes all DataValues registered for the given DataElemt.
+     * Deletes all DataValues registered for the given DataElement.
      * 
      * @param dataElement the DataElement for which the DataValues should be deleted.
      * @return the number of deleted DataValues.

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/location/LocationManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/location/LocationManager.java	2013-08-23 15:56:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/external/location/LocationManager.java	2014-01-07 19:37:58 +0000
@@ -79,7 +79,7 @@
      * Gets a file relative to the external configuration directory location,
      * which is set through an environment variable. A LocationManagerException 
      * is thrown if the external directory location is not set, if the file 
-     * does not exists, or cannot be read by the appliation.
+     * does not exists, or cannot be read by the application.
      * 
      * @param fileName the name of the file to be read.
      * @param directories the directories in the path relative to the external
@@ -161,7 +161,7 @@
     
     /**
      * Indicates whether the external configuration directory is set, valid,
-     * and writeable.
+     * and writable.
      */
     boolean externalDirectorySet();
     

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapgeneration/MapGenerationService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapgeneration/MapGenerationService.java	2013-10-07 10:19:08 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapgeneration/MapGenerationService.java	2014-01-07 19:37:58 +0000
@@ -74,7 +74,7 @@
      * @param date the date for relative periods.
      * @param unit the organisation unit.
      * @param width the maximum width of the map image.
-     * @param height the maxium height of the map image.
+     * @param height the maximum height of the map image.
      * @return the rendered map image or null if there is no data for the map view.
      */
     BufferedImage generateMapImage( Map map, Date date, OrganisationUnit unit, Integer width, Integer height );

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupService.java	2013-12-30 11:12:53 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupService.java	2014-01-07 19:37:58 +0000
@@ -252,7 +252,7 @@
     Collection<OrganisationUnitGroupSet> getCompulsoryOrganisationUnitGroupSetsWithMembers();
 
     /**
-     * Returns a Collection of compulsory OrganisationUnitGroupSets whichs groups 
+     * Returns a Collection of compulsory OrganisationUnitGroupSets which groups
      * the given OrganisationUnit is not a member of.
      * 
      * @param organisationUnit the OrganisationUnit.

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java	2013-11-02 16:06:03 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java	2014-01-07 19:37:58 +0000
@@ -220,7 +220,7 @@
 
     /**
      * Returns all OrganisationUnits which are part of the subtree of the
-     * OrganisationUnit with the given identifer and have no children.
+     * OrganisationUnit with the given identifier and have no children.
      *
      * @param id the identifier of the parent OrganisationUnit.
      * @return a collection of OrganisationUnits.

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAudit.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAudit.java	2013-08-23 15:56:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientAudit.java	2014-01-07 19:37:58 +0000
@@ -68,7 +68,7 @@
         this.accessedModule = accessedModule;
     }
 
-    //TODO implement hashcode and equals
+    //TODO implement hashCode and equals
     
     // -------------------------------------------------------------------------
     // Getters && Setters

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierTypeService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierTypeService.java	2014-01-07 15:02:45 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierTypeService.java	2014-01-07 19:37:58 +0000
@@ -98,7 +98,7 @@
     PatientIdentifierType getPatientIdentifierTypeByUid( String uid );
 
     /**
-     * Retrieve patient identifer types based on mandatory option
+     * Retrieve patient identifier types based on mandatory option
      * 
      * @param mandatory True/False value
      * 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierTypeStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierTypeStore.java	2014-01-07 15:02:45 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientIdentifierTypeStore.java	2014-01-07 19:37:58 +0000
@@ -36,7 +36,7 @@
     extends GenericNameableObjectStore<PatientIdentifierType>
 {
     /**
-     * Retrieve patient identifer types based on mandatory option
+     * Retrieve patient identifier types based on mandatory option
      * 
      * @param mandatory True/False value
      * 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationForm.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationForm.java	2013-12-16 04:27:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientRegistrationForm.java	2014-01-07 19:37:58 +0000
@@ -65,7 +65,7 @@
         this.dataEntryForm = dataEntryForm;
     }
 
-    // TODO implement hashcode and equals
+    // TODO implement hashCode and equals
 
     // -------------------------------------------------------------------------
     // Getters && Setters

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientService.java	2014-01-05 14:04:13 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientService.java	2014-01-07 19:37:58 +0000
@@ -381,8 +381,8 @@
      * registering or updating information
      * 
      * @param patient Patient object
-     * @param program Progam which person needs to enroll. If this paramameter
-     *        is null, the system check idenfifiers of the patient
+     * @param program Program which person needs to enroll. If this parameter
+     *        is null, the system check identifiers of the patient
      * 
      * @return Error code 0 : Validation is OK 1 : The identifier is duplicated
      *         2 : Violate validation criteria of the program

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientStore.java	2014-01-05 14:04:13 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patient/PatientStore.java	2014-01-07 19:37:58 +0000
@@ -232,8 +232,8 @@
      * registering / updating information
      * 
      * @param patient Patient object
-     * @param program Progam which person needs to enroll. If this paramameter
-     *        is null, the system check idenfifiers of the patient
+     * @param program Program which person needs to enroll. If this parameter
+     *        is null, the system check identifiers of the patient
      * 
      * @return Error code 0 : Validation is OK 1 : The identifier is duplicated
      *         2 : Violate validation criteria of the program

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueService.java	2014-01-02 13:13:21 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueService.java	2014-01-07 19:37:58 +0000
@@ -124,7 +124,7 @@
      * Returns all {@link PatientAttributeValue}
      * 
      * @return a collection of all PatientAttributeValue, or an empty collection
-     *         if there are no PatientAttributPatientAttributeValues.
+     *         if there are no PatientAttributePatientAttributeValues.
      */
     Collection<PatientAttributeValue> getAllPatientAttributeValues();
 
@@ -153,7 +153,7 @@
         PatientAttribute patientAttribute );
 
     /**
-     * Search PatientAttribueValue objects by a PatientAttribute and a attribute
+     * Search PatientAttributeValue objects by a PatientAttribute and a attribute
      * value (performs partial search )
      * 
      * @param patientAttribute PatientAttribute
@@ -194,10 +194,9 @@
      * Get the number of {@link PatientAttributeOption} in all
      * {@link PatientAttribute}
      * 
-     * @param attributeOption PatientAttributeOption
+     * @param patientAttributeOption PatientAttributeOption
      * 
      * @return The number of PatientAttributeOptions
      */
-    int countByPatientAttributeoption( PatientAttributeOption patientAttributeOption );
-
+    int countByPatientAttributeOption( PatientAttributeOption patientAttributeOption );
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueStore.java	2013-11-11 07:56:27 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueStore.java	2014-01-07 19:37:58 +0000
@@ -106,7 +106,7 @@
     Collection<PatientAttributeValue> get( Collection<Patient> patients );
 
     /**
-     * Search PatientAttribueValue objects by a PatientAttribute and a attribute
+     * Search PatientAttributeValue objects by a PatientAttribute and a attribute
      * value (performs partial search )
      * 
      * @param patientAttribute PatientAttribute
@@ -124,7 +124,7 @@
      * 
      * @return The number of PatientAttributeOptions
      */
-    int countByPatientAttributeoption( PatientAttributeOption attributeOption );
+    int countByPatientAttributeOption( PatientAttributeOption attributeOption );
 
     /**
      * Retrieve patients who have the same value on an attribute

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientcomment/PatientComment.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientcomment/PatientComment.java	2013-08-23 15:56:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientcomment/PatientComment.java	2014-01-07 19:37:58 +0000
@@ -60,7 +60,7 @@
         this.createdDate = createdDate;
     }
     
-    //TODO implement hashcode and equals
+    //TODO implement hashCode and equals
 
     // -------------------------------------------------------------------------
     // Getters/Setters

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueService.java	2013-11-12 04:21:08 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueService.java	2014-01-07 19:37:58 +0000
@@ -114,7 +114,7 @@
     Collection<PatientDataValue> getPatientDataValues( DataElement dataElement );
 
     /**
-     * Retrive patient data values of a patient on data elements specified from
+     * Retrieve patient data values of a patient on data elements specified from
      * a certain period
      * 
      * @param patient Patient

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueStore.java	2013-11-12 04:21:08 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValueStore.java	2014-01-07 19:37:58 +0000
@@ -100,9 +100,9 @@
 
     /**
      * Retrieve patient data values of a {@link Patient} on a
-     * {@link DataElement} lisy
+     * {@link DataElement} list.
      * 
-     * @patient patient Patient
+     * @param patient Patient
      * @param dataElements The data element list
      * @param after Optional date the instance should be on or after.
      * @param before Optional date the instance should be on or before.

=== modified file 'dhis-2/dhis-api/src/test/java/org/hisp/dhis/sms/config/GenericHttpGatewayConfigTest.java'
--- dhis-2/dhis-api/src/test/java/org/hisp/dhis/sms/config/GenericHttpGatewayConfigTest.java	2013-08-23 15:56:19 +0000
+++ dhis-2/dhis-api/src/test/java/org/hisp/dhis/sms/config/GenericHttpGatewayConfigTest.java	2014-01-07 19:37:58 +0000
@@ -95,7 +95,7 @@
     }
 
     @Test
-    public void testUntmarshalling()
+    public void testUnmarshalling()
         throws JAXBException
     {
         String xml = "<smsConfiguration xmlns=\"http://dhis2.org/schema/dxf/2.0\";><enabled>true</enabled><longNumber>DHIS2</longNumber>";

=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/jdbc/JdbcDataMergeStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/jdbc/JdbcDataMergeStore.java	2013-08-23 16:00:30 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/datamerge/jdbc/JdbcDataMergeStore.java	2014-01-07 19:37:58 +0000
@@ -68,11 +68,11 @@
     // -------------------------------------------------------------------------
 
     public void eliminateDuplicateDataElement( DataElement destDataElement, DataElementCategoryOptionCombo destCategoryOptionCombo,
-        DataElement sourceDataElemenet, DataElementCategoryOptionCombo sourceCategoryOptionCombo )
+        DataElement sourceDataElement, DataElementCategoryOptionCombo sourceCategoryOptionCombo )
     {
         final int destDataElementId = destDataElement.getId();
         final int destCategoryOptionComboId = destCategoryOptionCombo.getId();
-        final int sourceDataElementId = sourceDataElemenet.getId();
+        final int sourceDataElementId = sourceDataElement.getId();
         final int sourceCategoryOptionComboId = sourceCategoryOptionCombo.getId();
 
         // Move from source to destination where destination does not exist

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/DefaultPatientAttributeValueService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/DefaultPatientAttributeValueService.java	2014-01-02 13:13:21 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/DefaultPatientAttributeValueService.java	2014-01-07 19:37:58 +0000
@@ -206,9 +206,9 @@
         }
     }
 
-    public int countByPatientAttributeoption( PatientAttributeOption attributeOption )
+    public int countByPatientAttributeOption( PatientAttributeOption attributeOption )
     {
-        return patientAttributeValueStore.countByPatientAttributeoption( attributeOption );
+        return patientAttributeValueStore.countByPatientAttributeOption( attributeOption );
     }
 
     public Collection<Patient> getPatient( PatientAttribute attribute, String value )

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java	2013-11-11 07:56:27 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientattributevalue/hibernate/HibernatePatientAttributeValueStore.java	2014-01-07 19:37:58 +0000
@@ -103,7 +103,7 @@
             Restrictions.ilike( "value", "%" + searchText + "%" ) ).list();
     }
 
-    public int countByPatientAttributeoption( PatientAttributeOption attributeOption )
+    public int countByPatientAttributeOption( PatientAttributeOption attributeOption )
     {
         Number rs = (Number) getCriteria( Restrictions.eq( "patientAttributeOption", attributeOption ) ).setProjection(
             Projections.rowCount() ).uniqueResult();

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueServiceTest.java'
--- dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueServiceTest.java	2014-01-02 13:13:21 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueServiceTest.java	2014-01-07 19:37:58 +0000
@@ -45,8 +45,6 @@
 import org.hisp.dhis.patient.PatientAttributeOptionService;
 import org.hisp.dhis.patient.PatientAttributeService;
 import org.hisp.dhis.patient.PatientService;
-import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
-import org.hisp.dhis.patientattributevalue.PatientAttributeValueService;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -393,7 +391,7 @@
         attributeValueService.savePatientAttributeValue( attributeValueD );
         attributeValueService.savePatientAttributeValue( attributeValueE );
 
-        int count = attributeValueService.countByPatientAttributeoption( attributeOpionA );
+        int count = attributeValueService.countByPatientAttributeOption( attributeOpionA );
         assertEquals( 1, count );
     }
 

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueStoreTest.java'
--- dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueStoreTest.java	2013-11-13 04:19:10 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patientattributevalue/PatientAttributeValueStoreTest.java	2014-01-07 19:37:58 +0000
@@ -44,8 +44,6 @@
 import org.hisp.dhis.patient.PatientAttributeOptionService;
 import org.hisp.dhis.patient.PatientAttributeService;
 import org.hisp.dhis.patient.PatientService;
-import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
-import org.hisp.dhis.patientattributevalue.PatientAttributeValueStore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -288,7 +286,7 @@
         attributeValueStore.saveVoid( attributeValueD );
         attributeValueStore.saveVoid( attributeValueE );
 
-        int count = attributeValueStore.countByPatientAttributeoption( attributeOpionA );
+        int count = attributeValueStore.countByPatientAttributeOption( attributeOpionA );
         assertEquals( 1, count );
     }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/RemovePatientAttributeOptionAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patientattribute/RemovePatientAttributeOptionAction.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/patientattribute/RemovePatientAttributeOptionAction.java	2014-01-07 19:37:58 +0000
@@ -99,7 +99,7 @@
 
         if ( attributeOption != null )
         {
-            int count = patientAttributeValueService.countByPatientAttributeoption( attributeOption );
+            int count = patientAttributeValueService.countByPatientAttributeOption( attributeOption );
             if ( count > 0 )
             {
                 message = i18n.getString( "warning_delete_patient_attribute_option" );