dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #03123
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1041: Minor fix
------------------------------------------------------------
revno: 1041
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-11-17 08:40:59 +0100
message:
Minor fix
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 2009-11-16 11:20:47 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2009-11-17 07:40:59 +0000
@@ -341,6 +341,7 @@
// Init
// -------------------------------------------------------------------------
+ @SuppressWarnings( "unchecked" )
public void init()
{
if ( nonEmptyLists( dataElements, indicators, dataSets ) > 1 )
@@ -368,10 +369,9 @@
{
// -----------------------------------------------------------------
// CategoryCombo is set, populate CategoryOptionCombos
+ // Unchecked conversion is safe due to dimension set type check
// -----------------------------------------------------------------
- // TODO switch to dimoptelm. make report table unaware of catoptcom. ?
-
categoryOptionCombos = (List<DataElementCategoryOptionCombo>) categoryCombo.getDimensionOptionElements();
}
else if ( isDimensional() && dimensionSetType.equals( DimensionSet.TYPE_GROUP_SET ) )
@@ -386,7 +386,7 @@
{
elements.addAll( element.getDataElements() );
}
-
+
dimensionalDataElements = elements;
}