dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #10048
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2738: Fixed bug related to report table ordering of periods. Again.
------------------------------------------------------------
revno: 2738
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-01-25 13:07:27 +0100
message:
Fixed bug related to report table ordering of periods. Again.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.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/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2011-01-18 14:51:18 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2011-01-25 12:07:27 +0000
@@ -30,10 +30,9 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -295,7 +294,7 @@
* Generated pretty-print names for crosstabulated columns in the report table,
* where key is column name and value is pretty column name.
*/
- private SortedMap<String, String> prettyCrossTabColumns = new TreeMap<String, String>();
+ private Map<String, String> prettyCrossTabColumns = new LinkedHashMap<String, String>();
/**
* Generated unique identifiers used to retrieve the corresponding value from the datavalue table.
@@ -1340,7 +1339,7 @@
return crossTabColumns;
}
- public SortedMap<String, String> getPrettyCrossTabColumns()
+ public Map<String, String> getPrettyCrossTabColumns()
{
return prettyCrossTabColumns;
}