dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #03742
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1240: Sorting ignore case
------------------------------------------------------------
revno: 1240
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2009-12-17 10:16:13 +0100
message:
Sorting ignore case
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/comparator/ChartTitleComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/comparator/IdentifiableObjectNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/comparator/DataDictionaryNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementAlternativeNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCategoryComboNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCategoryNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCategoryOptionNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCodeComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementGroupNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementGroupSetNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementShortNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamart/comparator/DataMartExportComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/DataSetCodeComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/DataSetNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/DataSetShortNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/comparator/DocumentNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorAlternativeNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorCodeComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorGroupNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorShortNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorTypeNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapLayerNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapViewNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitCodeComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitGroupNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitGroupSetNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitShortNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/comparator/ExcelItemComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/comparator/ReportTableComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/comparator/ValidationRuleGroupNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/comparator/ValidationRuleNameComparator.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/chart/comparator/ChartTitleComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/comparator/ChartTitleComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/comparator/ChartTitleComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( Chart chart1, Chart chart2 )
{
- return chart1.getTitle().compareTo( chart2.getTitle() );
+ return chart1.getTitle().compareToIgnoreCase( chart2.getTitle() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/comparator/IdentifiableObjectNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/comparator/IdentifiableObjectNameComparator.java 2009-11-06 14:08:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/comparator/IdentifiableObjectNameComparator.java 2009-12-17 09:16:13 +0000
@@ -39,6 +39,6 @@
{
public int compare( IdentifiableObject object0, IdentifiableObject object1 )
{
- return object0.getName().compareTo( object1.getName() );
+ return object0.getName().compareToIgnoreCase( object1.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/comparator/DataDictionaryNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/comparator/DataDictionaryNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datadictionary/comparator/DataDictionaryNameComparator.java 2009-12-17 09:16:13 +0000
@@ -9,6 +9,6 @@
{
public int compare( DataDictionary dataDictionary0, DataDictionary dataDictionary1 )
{
- return dataDictionary0.getName().compareTo( dataDictionary1.getName() );
+ return dataDictionary0.getName().compareToIgnoreCase( dataDictionary1.getName() );
}
}
\ No newline at end of file
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementAlternativeNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementAlternativeNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementAlternativeNameComparator.java 2009-12-17 09:16:13 +0000
@@ -49,6 +49,6 @@
return -1;
}
- return dataElement0.getAlternativeName().compareTo( dataElement1.getAlternativeName() );
+ return dataElement0.getAlternativeName().compareToIgnoreCase( dataElement1.getAlternativeName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCategoryComboNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCategoryComboNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCategoryComboNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( DataElementCategoryCombo categoryCombo1, DataElementCategoryCombo categoryCombo2 )
{
- return categoryCombo1.getName().compareTo( categoryCombo2.getName() );
+ return categoryCombo1.getName().compareToIgnoreCase( categoryCombo2.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCategoryNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCategoryNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCategoryNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( DataElementCategory category1, DataElementCategory category2 )
{
- return category1.getName().compareTo( category2.getName() );
+ return category1.getName().compareToIgnoreCase( category2.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCategoryOptionNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCategoryOptionNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCategoryOptionNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( DataElementCategoryOption categoryOption1, DataElementCategoryOption categoryOption2 )
{
- return categoryOption1.getName().compareTo( categoryOption2.getName() );
+ return categoryOption1.getName().compareToIgnoreCase( categoryOption2.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCodeComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCodeComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementCodeComparator.java 2009-12-17 09:16:13 +0000
@@ -49,6 +49,6 @@
return -1;
}
- return dataElement0.getCode().compareTo( dataElement1.getCode() );
+ return dataElement0.getCode().compareToIgnoreCase( dataElement1.getCode() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementGroupNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementGroupNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementGroupNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( DataElementGroup dataElementGroup0, DataElementGroup dataElementGroup1 )
{
- return dataElementGroup0.getName().compareTo( dataElementGroup1.getName() );
+ return dataElementGroup0.getName().compareToIgnoreCase( dataElementGroup1.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementGroupSetNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementGroupSetNameComparator.java 2009-11-23 13:26:45 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementGroupSetNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( DataElementGroupSet o1, DataElementGroupSet o2 )
{
- return o1.getName().compareTo( o2.getName() );
+ return o1.getName().compareToIgnoreCase( o2.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( DataElement dataElement0, DataElement dataElement1 )
{
- return dataElement0.getName().compareTo( dataElement1.getName() );
+ return dataElement0.getName().compareToIgnoreCase( dataElement1.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementShortNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementShortNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/comparator/DataElementShortNameComparator.java 2009-12-17 09:16:13 +0000
@@ -49,6 +49,6 @@
return -1;
}
- return dataElement0.getShortName().compareTo( dataElement1.getShortName() );
+ return dataElement0.getShortName().compareToIgnoreCase( dataElement1.getShortName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamart/comparator/DataMartExportComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamart/comparator/DataMartExportComparator.java 2009-04-23 19:30:27 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamart/comparator/DataMartExportComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( DataMartExport export1, DataMartExport export2 )
{
- return export1.getName().compareTo( export2.getName() );
+ return export1.getName().compareToIgnoreCase( export2.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/DataSetCodeComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/DataSetCodeComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/DataSetCodeComparator.java 2009-12-17 09:16:13 +0000
@@ -50,6 +50,6 @@
return -1;
}
- return object0.getCode().compareTo( object1.getCode() );
+ return object0.getCode().compareToIgnoreCase( object1.getCode() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/DataSetNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/DataSetNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/DataSetNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( DataSet dataSet0, DataSet dataSet1 )
{
- return dataSet0.getName().compareTo( dataSet1.getName() );
+ return dataSet0.getName().compareToIgnoreCase( dataSet1.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/DataSetShortNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/DataSetShortNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/DataSetShortNameComparator.java 2009-12-17 09:16:13 +0000
@@ -50,6 +50,6 @@
return -1;
}
- return object0.getShortName().compareTo( object1.getShortName() );
+ return object0.getShortName().compareToIgnoreCase( object1.getShortName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/comparator/DocumentNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/comparator/DocumentNameComparator.java 2009-03-06 12:05:23 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/comparator/DocumentNameComparator.java 2009-12-17 09:16:13 +0000
@@ -9,6 +9,6 @@
{
public int compare( Document object1, Document object2 )
{
- return object1.getName().compareTo( object2.getName() );
+ return object1.getName().compareToIgnoreCase( object2.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorAlternativeNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorAlternativeNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorAlternativeNameComparator.java 2009-12-17 09:16:13 +0000
@@ -49,6 +49,6 @@
return -1;
}
- return indicator0.getAlternativeName().compareTo( indicator1.getAlternativeName() );
+ return indicator0.getAlternativeName().compareToIgnoreCase( indicator1.getAlternativeName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorCodeComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorCodeComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorCodeComparator.java 2009-12-17 09:16:13 +0000
@@ -49,6 +49,6 @@
return -1;
}
- return indicator0.getCode().compareTo( indicator1.getCode() );
+ return indicator0.getCode().compareToIgnoreCase( indicator1.getCode() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorGroupNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorGroupNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorGroupNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( IndicatorGroup indicatorGroup0, IndicatorGroup indicatorGroup1 )
{
- return indicatorGroup0.getName().compareTo( indicatorGroup1.getName() );
+ return indicatorGroup0.getName().compareToIgnoreCase( indicatorGroup1.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( Indicator indicator0, Indicator indicator1 )
{
- return indicator0.getName().compareTo( indicator1.getName() );
+ return indicator0.getName().compareToIgnoreCase( indicator1.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorShortNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorShortNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorShortNameComparator.java 2009-12-17 09:16:13 +0000
@@ -49,6 +49,6 @@
return -1;
}
- return indicator0.getShortName().compareTo( indicator1.getShortName() );
+ return indicator0.getShortName().compareToIgnoreCase( indicator1.getShortName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorTypeNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorTypeNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/comparator/IndicatorTypeNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( IndicatorType indicatorType0, IndicatorType indicatorType1 )
{
- return indicatorType0.getName().compareTo( indicatorType1.getName() );
+ return indicatorType0.getName().compareToIgnoreCase( indicatorType1.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapLayerNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapLayerNameComparator.java 2009-09-06 10:39:18 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapLayerNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( MapLayer mapLayer0, MapLayer mapLayer1 )
{
- return mapLayer0.getName().compareTo( mapLayer1.getName() );
+ return mapLayer0.getName().compareToIgnoreCase( mapLayer1.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapNameComparator.java 2009-09-06 10:39:18 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( Map map0, Map map1 )
{
- return map0.getName().compareTo( map1.getName() );
+ return map0.getName().compareToIgnoreCase( map1.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapViewNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapViewNameComparator.java 2009-09-06 10:39:18 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/comparator/MapViewNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( MapView mapView0, MapView mapView1 )
{
- return mapView0.getName().compareTo( mapView1.getName() );
+ return mapView0.getName().compareToIgnoreCase( mapView1.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitCodeComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitCodeComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitCodeComparator.java 2009-12-17 09:16:13 +0000
@@ -49,6 +49,6 @@
return -1;
}
- return organisationUnit0.getCode().compareTo( organisationUnit1.getCode() );
+ return organisationUnit0.getCode().compareToIgnoreCase( organisationUnit1.getCode() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitGroupNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitGroupNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitGroupNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( OrganisationUnitGroup organisationUnitGroup0, OrganisationUnitGroup organisationUnitGroup1 )
{
- return organisationUnitGroup0.getName().compareTo( organisationUnitGroup1.getName() );
+ return organisationUnitGroup0.getName().compareToIgnoreCase( organisationUnitGroup1.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitGroupSetNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitGroupSetNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitGroupSetNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( OrganisationUnitGroupSet groupSet0, OrganisationUnitGroupSet groupSet1 )
{
- return groupSet0.getName().compareTo( groupSet1.getName() );
+ return groupSet0.getName().compareToIgnoreCase( groupSet1.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( OrganisationUnit organisationUnit0, OrganisationUnit organisationUnit1 )
{
- return organisationUnit0.getName().compareTo( organisationUnit1.getName() );
+ return organisationUnit0.getName().compareToIgnoreCase( organisationUnit1.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitShortNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitShortNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/comparator/OrganisationUnitShortNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( OrganisationUnit organisationUnit0, OrganisationUnit organisationUnit1 )
{
- return organisationUnit0.getShortName().compareTo( organisationUnit1.getShortName() );
+ return organisationUnit0.getShortName().compareToIgnoreCase( organisationUnit1.getShortName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/comparator/ExcelItemComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/comparator/ExcelItemComparator.java 2009-10-27 06:36:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/excelitem/comparator/ExcelItemComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( ExcelItem excelItem1, ExcelItem excelItem2 )
{
- return excelItem1.getName().compareTo( excelItem2.getName() );
+ return excelItem1.getName().compareToIgnoreCase( excelItem2.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/comparator/ReportTableComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/comparator/ReportTableComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/comparator/ReportTableComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( ReportTable table1, ReportTable table2 )
{
- return table1.getName().compareTo( table2.getName() );
+ return table1.getName().compareToIgnoreCase( table2.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/comparator/ValidationRuleGroupNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/comparator/ValidationRuleGroupNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/comparator/ValidationRuleGroupNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( ValidationRuleGroup group1, ValidationRuleGroup group2 )
{
- return group1.getName().compareTo( group2.getName() );
+ return group1.getName().compareToIgnoreCase( group2.getName() );
}
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/comparator/ValidationRuleNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/comparator/ValidationRuleNameComparator.java 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/comparator/ValidationRuleNameComparator.java 2009-12-17 09:16:13 +0000
@@ -40,6 +40,6 @@
{
public int compare( ValidationRule rule1, ValidationRule rule2 )
{
- return rule1.getName().compareTo( rule2.getName() );
+ return rule1.getName().compareToIgnoreCase( rule2.getName() );
}
}
