[OFBiz] SVN: r5966 - trunk/framework/webapp/src/org/ofbiz/webapp/view

[jonesde at svn.ofbiz.org]

Author: jonesde
Date: 2005-10-15 00:15:04 -0500 (Sat, 15 Oct 2005)
New Revision: 5966

Modified:
   trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java
   trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java
Log:
Applied patch from Peter Goron to fix JasperReports build warnings; Jira #OFBIZ-526

Modified: trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java
===================================================================
--- trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java	2005-10-15 00:03:12 UTC (rev 5965)
+++ trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsPdfViewHandler.java	2005-10-15 05:15:04 UTC (rev 5966)
@@ -35,7 +35,8 @@
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JREmptyDataSource;
 import net.sf.jasperreports.engine.JasperCompileManager;
-import net.sf.jasperreports.engine.JasperManager;
+import net.sf.jasperreports.engine.JasperExportManager;
+import net.sf.jasperreports.engine.JasperFillManager;
 import net.sf.jasperreports.engine.JasperPrint;
 import net.sf.jasperreports.engine.JasperReport;
 
@@ -111,14 +112,14 @@
                 String datasourceName = delegator.getEntityHelperName(info);
                 if (datasourceName != null && datasourceName.length() > 0) {
                     Debug.logInfo("Filling report with connection from datasource: " + datasourceName, module);
-                    jp = JasperManager.fillReport(report, parameters, ConnectionFactory.getConnection(datasourceName));
+                    jp = JasperFillManager.fillReport(report, parameters, ConnectionFactory.getConnection(datasourceName));
                 } else {
                     Debug.logInfo("Filling report with an empty JR datasource", module);
-                    jp = JasperManager.fillReport(report, parameters, new JREmptyDataSource());
+                    jp = JasperFillManager.fillReport(report, parameters, new JREmptyDataSource());
                 }
             } else {
                 Debug.logInfo("Filling report with a passed in jrDataSource", module);
-                jp = JasperManager.fillReport(report, parameters, jrDataSource);
+                jp = JasperFillManager.fillReport(report, parameters, jrDataSource);
             }
 
             if (jp.getPages().size() < 1) {
@@ -126,7 +127,7 @@
             } else {
                 Debug.logInfo("Got report, there are " + jp.getPages().size() + " pages.", module);
             }
-            JasperManager.printReportToPdfStream(jp, response.getOutputStream());
+            JasperExportManager.exportReportToPdfStream(jp, response.getOutputStream());
         } catch (IOException ie) {
             throw new ViewHandlerException("IO Error in report", ie);
         } catch (java.sql.SQLException e) {

Modified: trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java
===================================================================
--- trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java	2005-10-15 00:03:12 UTC (rev 5965)
+++ trunk/framework/webapp/src/org/ofbiz/webapp/view/JasperReportsXmlViewHandler.java	2005-10-15 05:15:04 UTC (rev 5966)
@@ -36,8 +36,8 @@
 
 import net.sf.jasperreports.engine.JREmptyDataSource;
 import net.sf.jasperreports.engine.JasperCompileManager;
+import net.sf.jasperreports.engine.JasperExportManager;
 import net.sf.jasperreports.engine.JasperFillManager;
-import net.sf.jasperreports.engine.JasperPrintManager;
 import net.sf.jasperreports.engine.JasperReport;
 
 import org.ofbiz.base.util.Debug;
@@ -103,7 +103,7 @@
             } else {
                 JasperFillManager.fillReportToStream(report, fillToPrintOutputStream, parameters, new JREmptyDataSource());
             }
-            JasperPrintManager.printReportToXmlStream(fillToPrintInputStream, response.getOutputStream());
+            JasperExportManager.exportReportToXmlStream(fillToPrintInputStream, response.getOutputStream());
         } catch (IOException ie) {
             throw new ViewHandlerException("IO Error in region", ie);
         } catch (java.sql.SQLException e) {