User: kz Date: 2008-03-05 17:38:15+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java
Log: INTEGRATION: CWS rptchart01_DEV300 (1.2.70); FILE MERGED 2008/02/21 09:57:25 oj 1.2.70.2: #i85225# fixes found with PMD 2008/02/13 07:04:23 oj 1.2.70.1: #i85225# impl chart readhandler and oleproducer File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/text/ ========================================================================== File [changed]: TextRawReportProcessor.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/text/TextRawReportProcessor.java?r1=1.2&r2=1.3 Delta lines: +50 -41 --------------------- --- TextRawReportProcessor.java 2007-07-09 11:56:08+0000 1.2 +++ TextRawReportProcessor.java 2008-03-05 17:38:12+0000 1.3 @@ -33,9 +33,9 @@ * MA 02111-1307 USA * ************************************************************************/ - package com.sun.star.report.pentaho.output.text; +import com.sun.star.report.DataSourceFactory; import com.sun.star.report.OutputRepository; import com.sun.star.report.InputRepository; import com.sun.star.report.ImageService; @@ -53,15 +53,18 @@ */ public class TextRawReportProcessor extends SinglePassReportProcessor { + private OutputRepository outputRepository; private String targetName; private InputRepository inputRepository; private ImageService imageService; + private DataSourceFactory dataSourceFactory; public TextRawReportProcessor(final InputRepository inputRepository, final OutputRepository outputRepository, final String targetName, - final ImageService imageService) + final ImageService imageService, + final DataSourceFactory dataSourceFactory) { if (inputRepository == null) { @@ -79,10 +82,16 @@ { 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) @@ -91,7 +100,7 @@ final ReportStructureRoot report = job.getReportStructureRoot(); final ResourceManager resourceManager = report.getResourceManager(); - return new TextRawReportTarget (job, resourceManager, report.getBaseResource(), - inputRepository, outputRepository, targetName, imageService); + return new TextRawReportTarget(job, resourceManager, report.getBaseResource(), + inputRepository, outputRepository, targetName, imageService, dataSourceFactory); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
