=== 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 chartComparator; - - public void setChartComparator( Comparator chartComparator ) - { - this.chartComparator = chartComparator; - } - - // ------------------------------------------------------------------------- // Input/output // ------------------------------------------------------------------------- @@ -103,7 +92,7 @@ groupMembers = new ArrayList( chartGroup.getMembers() ); - Collections.sort( groupMembers, chartComparator ); + Collections.sort( groupMembers, new ChartTitleComparator() ); return SUCCESS; }