------------------------------------------------------------
revno: 13639
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Tue 2014-01-07 20:21:34 +0100
message:
typo in method name
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java
dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/BaseAnalyticalObjectTest.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/common/BaseAnalyticalObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java 2013-12-09 16:33:18 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java 2014-01-07 19:21:34 +0000
@@ -555,7 +555,7 @@
* Generates an identifier based on the given lists of NameableObjects. Uses
* the UIDs for each NameableObject, sorts them and writes them out as a key.
*/
- public static String getIdentifer( List<NameableObject> column, List<NameableObject> row )
+ public static String getIdentifier( List<NameableObject> column, List<NameableObject> row )
{
List<String> ids = new ArrayList<String>();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2014-01-07 15:52:34 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2014-01-07 19:21:34 +0000
@@ -666,7 +666,7 @@
for ( List<NameableObject> column : gridColumns )
{
- String key = getIdentifer( column, row );
+ String key = getIdentifier( column, row );
Double value = valueMap.get( key );
=== modified file 'dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/BaseAnalyticalObjectTest.java'
--- dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/BaseAnalyticalObjectTest.java 2013-09-16 17:07:25 +0000
+++ dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/BaseAnalyticalObjectTest.java 2014-01-07 19:21:34 +0000
@@ -108,9 +108,9 @@
List<NameableObject> row = new ArrayList<NameableObject>();
row.add( oB );
- assertEquals( "a1-b1-c1", BaseAnalyticalObject.getIdentifer( column, row ) );
- assertEquals( "b1", BaseAnalyticalObject.getIdentifer( new ArrayList<NameableObject>(), row ) );
- assertEquals( "b1", BaseAnalyticalObject.getIdentifer( null, row ) );
+ assertEquals( "a1-b1-c1", BaseAnalyticalObject.getIdentifier( column, row ) );
+ assertEquals( "b1", BaseAnalyticalObject.getIdentifier( new ArrayList<NameableObject>(), row ) );
+ assertEquals( "b1", BaseAnalyticalObject.getIdentifier( null, row ) );
}
@Test
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
