dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6496
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-04-06 11:23:28 +0700
message:
  (local) Minor fix.
modified:
  local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/dataelement/DataElementFormNameComparator.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 'local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/dataelement/DataElementFormNameComparator.java'
--- local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/dataelement/DataElementFormNameComparator.java	2012-04-06 03:23:01 +0000
+++ local/vn/dhis-service-vn/src/main/java/org/hisp/dhis/dataelement/DataElementFormNameComparator.java	2012-04-06 04:23:28 +0000
@@ -39,8 +39,8 @@
 {
     public int compare( DataElement dataElement0, DataElement dataElement1 )
     {
-        String name0 = ( dataElement0.getFormName() != null || !dataElement0.getFormName().isEmpty() ) ? dataElement0.getFormName() : dataElement0.getName();
-        String name1 = ( dataElement1.getFormName() != null || !dataElement1.getFormName().isEmpty() ) ? dataElement1.getFormName() : dataElement1.getName();
+        String name0 = ( dataElement0.getFormName() != null && !dataElement0.getFormName().isEmpty() ) ? dataElement0.getFormName() : dataElement0.getName();
+        String name1 = ( dataElement1.getFormName() != null && !dataElement1.getFormName().isEmpty() ) ? dataElement1.getFormName() : dataElement1.getName();
         
         return name0.compareToIgnoreCase( name1 );
     }