------------------------------------------------------------
revno: 4235
committer: Hieu <[email protected]>
branch nick: dhis2
timestamp: Fri 2011-07-29 11:06:52 +0700
message:
Fixed edit Chart Group.
modified:
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/ShowUpdateChartGroupFormAction.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-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/ShowUpdateChartGroupFormAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/ShowUpdateChartGroupFormAction.java 2011-07-21 06:51:02 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/chartgroup/action/ShowUpdateChartGroupFormAction.java 2011-07-29 04:06:52 +0000
@@ -29,12 +29,12 @@
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Comparator;
import java.util.List;
import org.hisp.dhis.chart.Chart;
import org.hisp.dhis.chart.ChartGroup;
import org.hisp.dhis.chart.ChartService;
+import org.hisp.dhis.chart.comparator.ChartTitleComparator;
import com.opensymphony.xwork2.Action;
@@ -58,17 +58,6 @@
}
// -------------------------------------------------------------------------
- // Comparator
- // -------------------------------------------------------------------------
-
- private Comparator<Chart> chartComparator;
-
- public void setChartComparator( Comparator<Chart> chartComparator )
- {
- this.chartComparator = chartComparator;
- }
-
- // -------------------------------------------------------------------------
// Input/output
// -------------------------------------------------------------------------
@@ -103,7 +92,7 @@
groupMembers = new ArrayList<Chart>( chartGroup.getMembers() );
- Collections.sort( groupMembers, chartComparator );
+ Collections.sort( groupMembers, new ChartTitleComparator() );
return SUCCESS;
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
