dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #13949
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4584: Upgraded to jasperreports 4.1.1.
------------------------------------------------------------
revno: 4584
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-09-14 14:46:13 +0200
message:
Upgraded to jasperreports 4.1.1.
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJasperResult.java
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/RenderReportAction.java
dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/ExportTableAction.java
dhis-2/pom.xml
--
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-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java 2011-09-14 03:44:56 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java 2011-09-14 12:46:13 +0000
@@ -303,7 +303,7 @@
return getRootOrganisationUnits();
}
- HashSet<OrganisationUnit> result = new HashSet<OrganisationUnit>();
+ Set<OrganisationUnit> result = new HashSet<OrganisationUnit>();
for ( OrganisationUnit root : organisationUnitStore.getRootOrganisationUnits() )
{
@@ -328,7 +328,7 @@
"Level must be greater than or equal to level of parent OrganisationUnit" );
}
- HashSet<OrganisationUnit> result = new HashSet<OrganisationUnit>();
+ Set<OrganisationUnit> result = new HashSet<OrganisationUnit>();
if ( level == parentLevel )
{
@@ -348,7 +348,7 @@
* the current level.
*/
private void addOrganisationUnitChildrenAtLevel( OrganisationUnit parent, int currentLevel, int targetLevel,
- HashSet<OrganisationUnit> result )
+ Set<OrganisationUnit> result )
{
if ( currentLevel == targetLevel )
{
=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java 2011-07-12 12:15:23 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/grid/GridUtils.java 2011-09-14 12:46:13 +0000
@@ -283,7 +283,7 @@
/**
* Writes a Jasper Reports representation of the given Grid to the given OutputStream.
*/
- public static void toJasperReport( Grid grid, Map<?, ?> params, OutputStream out )
+ public static void toJasperReport( Grid grid, Map<String, Object> params, OutputStream out )
throws Exception
{
final StringWriter writer = new StringWriter();
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJasperResult.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJasperResult.java 2011-09-11 18:19:48 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/result/GridJasperResult.java 2011-09-14 12:46:13 +0000
@@ -65,9 +65,9 @@
this.grid = grid;
}
- private Map<Object, Object> params;
+ private Map<String, Object> params;
- public void setParams( Map<Object, Object> params )
+ public void setParams( Map<String, Object> params )
{
this.params = params;
}
@@ -89,7 +89,7 @@
grid = _grid != null ? _grid : grid;
- Map<Object, Object> _params = (Map<Object, Object>) invocation.getStack().findValue( "params" );
+ Map<String, Object> _params = (Map<String, Object>) invocation.getStack().findValue( "params" );
params = _params != null ? _params : params;
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/RenderReportAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/RenderReportAction.java 2011-09-11 18:19:48 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/reportviewer/action/RenderReportAction.java 2011-09-14 12:46:13 +0000
@@ -155,7 +155,7 @@
Report report = reportService.getReport( id );
- Map<Object, Object> params = new HashMap<Object, Object>();
+ Map<String, Object> params = new HashMap<String, Object>();
params.putAll( constantService.getConstantParameterMap() );
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/ExportTableAction.java'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/ExportTableAction.java 2011-09-11 18:19:48 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/tablecreator/action/ExportTableAction.java 2011-09-14 12:46:13 +0000
@@ -130,9 +130,9 @@
return grid;
}
- private Map<Object, Object> params = new HashMap<Object, Object>();
+ private Map<String, Object> params = new HashMap<String, Object>();
- public Map<Object, Object> getParams()
+ public Map<String, Object> getParams()
{
return params;
}
@@ -149,7 +149,7 @@
if ( useLast )
{
grid = (Grid) SessionUtils.getSessionVar( SessionUtils.KEY_REPORT_TABLE_GRID );
- params = (Map<Object, Object>) SessionUtils.getSessionVar( SessionUtils.KEY_REPORT_TABLE_PARAMS );
+ params = (Map<String, Object>) SessionUtils.getSessionVar( SessionUtils.KEY_REPORT_TABLE_PARAMS );
}
else
{
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2011-09-02 10:40:22 +0000
+++ dhis-2/pom.xml 2011-09-14 12:46:13 +0000
@@ -581,7 +581,7 @@
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
- <version>4.0.1</version>
+ <version>4.1.1</version>
<exclusions>
<exclusion>
<groupId>xalan</groupId>
