User: kz Date: 2008-03-05 17:36:20+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java
Log: INTEGRATION: CWS rptchart01_DEV300 (1.3.62); FILE MERGED 2008/02/21 09:57:24 oj 1.3.62.2: #i85225# fixes found with PMD 2008/02/13 07:04:23 oj 1.3.62.1: #i85225# impl chart readhandler and oleproducer File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/spreadsheet/ ================================================================================= File [changed]: SpreadsheetRawReportProcessor.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportProcessor.java?r1=1.3&r2=1.4 Delta lines: +54 -47 --------------------- --- SpreadsheetRawReportProcessor.java 2007-08-03 10:35:05+0000 1.3 +++ SpreadsheetRawReportProcessor.java 2008-03-05 17:36:17+0000 1.4 @@ -33,9 +33,9 @@ * MA 02111-1307 USA * ************************************************************************/ - package com.sun.star.report.pentaho.output.spreadsheet; +import com.sun.star.report.DataSourceFactory; import org.jfree.report.DataSourceException; import org.jfree.report.ReportDataFactoryException; import org.jfree.report.ReportProcessingException; @@ -53,16 +53,18 @@ */ public class SpreadsheetRawReportProcessor extends AbstractReportProcessor { - private OutputRepository outputRepository; + private OutputRepository outputRepository; private String targetName; private InputRepository inputRepository; private ImageService imageService; + private DataSourceFactory dataSourceFactory; public SpreadsheetRawReportProcessor(final InputRepository inputRepository, final OutputRepository outputRepository, final String targetName, - final ImageService imageService) + final ImageService imageService, + final DataSourceFactory dataSourceFactory) { if (outputRepository == null) { @@ -80,18 +82,23 @@ { throw new NullPointerException(); } + if (dataSourceFactory == null) + { + throw new NullPointerException(); + } + this.targetName = targetName; this.inputRepository = inputRepository; this.outputRepository = outputRepository; this.imageService = imageService; + this.dataSourceFactory = dataSourceFactory; } protected ReportTarget createReportTarget(final ReportJob job) throws ReportProcessingException { final ReportStructureRoot report = job.getReportStructureRoot(); final ResourceManager resourceManager = report.getResourceManager(); - return new SpreadsheetRawReportTarget - (job, resourceManager, report.getBaseResource(), inputRepository, outputRepository, targetName, imageService); + return new SpreadsheetRawReportTarget(job, resourceManager, report.getBaseResource(), inputRepository, outputRepository, targetName, imageService, dataSourceFactory); } public void processReport(final ReportJob job) throws ReportDataFactoryException, DataSourceException, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
