dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3391
committer: Bharath <chbharathk@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-04-15 16:42:27 +0530
message:
  Merging Code from 2.1 - work in progress
added:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageOrderComparator.java
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties


--
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

=== added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageOrderComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageOrderComparator.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/comparator/ProgramStageOrderComparator.java	2011-04-15 11:12:27 +0000
@@ -0,0 +1,13 @@
+package org.hisp.dhis.program.comparator;
+
+import java.util.Comparator;
+
+import org.hisp.dhis.program.ProgramStage;
+
+public class ProgramStageOrderComparator implements Comparator<ProgramStage>
+{
+    public int compare( ProgramStage programStage1, ProgramStage programStage2 )
+    {
+        return programStage1.getStageInProgram() - programStage2.getStageInProgram();
+    }
+}

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2011-04-11 15:59:50 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2011-04-15 11:12:27 +0000
@@ -70,7 +70,7 @@
 dhis-web-excel-reporting = Excel Reports
 dhis-web-mobile = Mobiles
 dhis-web-maintenance-in = Configuration
-dhis-web-excelimport = Excel Import
+dhis-web-excelimport = Data Integration
 dhis-web-linelisting-mp = Manpower
 patient_attribute_group = Beneficiary Attribute Group
 patient_attribute_group_management = Beneficiary Attribute Group Management