Tag: cws_src680_oj14 User: oj Date: 2007-06-06 07:03:54+0000 Removed: dba/reportdesign/java/com/sun/star/report/pentaho/ImageService.java dba/reportdesign/java/com/sun/star/report/pentaho/SDBCReportDataFactory.java dba/reportdesign/java/com/sun/star/report/pentaho/SOImageService.java dba/reportdesign/java/com/sun/star/report/pentaho/StorageRepository.java
Modified: dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportEngine.java dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java dba/reportdesign/java/com/sun/star/report/pentaho/SOReportJobFactory.java dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java Log: #i77610# changes to images as well File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/ ============================================================== File [removed]: ImageService.java File [changed]: PentahoReportEngine.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportEngine.java?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +2 -9 ------------------- --- PentahoReportEngine.java 2007-05-10 12:14:23+0000 1.1.2.2 +++ PentahoReportEngine.java 2007-06-06 07:03:51+0000 1.1.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: PentahoReportEngine.java,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: oj $ $Date: 2007/05/10 12:14:23 $ + * last change: $Author: oj $ $Date: 2007/06/06 07:03:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -37,19 +37,12 @@ package com.sun.star.report.pentaho; -import java.io.File; -import java.io.IOException; - import com.sun.star.report.JobDefinitionException; -import com.sun.star.report.JobProperties; import com.sun.star.report.ReportEngine; import com.sun.star.report.ReportEngineMetaData; import com.sun.star.report.ReportJob; import com.sun.star.report.ReportJobDefinition; -import com.sun.star.report.ReportEngineParameterNames; -import com.sun.star.report.ReportExecutionException; import com.sun.star.report.util.DefaultReportJobDefinition; -import com.sun.star.report.util.FileRepository; import org.jfree.report.JFreeReportBoot; public class PentahoReportEngine implements ReportEngine File [changed]: PentahoReportEngineMetaData.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +19 -15 --------------------- --- PentahoReportEngineMetaData.java 2007-05-09 12:12:02+0000 1.1.2.1 +++ PentahoReportEngineMetaData.java 2007-06-06 07:03:51+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: PentahoReportEngineMetaData.java,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2007/05/09 12:12:02 $ + * last change: $Author: oj $ $Date: 2007/06/06 07:03:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -44,6 +44,8 @@ import com.sun.star.report.InputRepository; import com.sun.star.report.OutputRepository; import com.sun.star.report.ReportEngineMetaData; +import com.sun.star.report.ReportEngineParameterNames; +import com.sun.star.report.ImageService; import org.jfree.util.HashNMap; public class PentahoReportEngineMetaData @@ -60,20 +62,22 @@ public PentahoReportEngineMetaData () { mandatoryParameters = new HashSet(); - mandatoryParameters.add("content-type"); - mandatoryParameters.add("input.name"); - mandatoryParameters.add("input.repository"); - mandatoryParameters.add("output.name"); - mandatoryParameters.add("output.repository"); - mandatoryParameters.add("input.datasource-factory"); + mandatoryParameters.add(ReportEngineParameterNames.CONTENT_TYPE); + mandatoryParameters.add(ReportEngineParameterNames.INPUT_NAME); + mandatoryParameters.add(ReportEngineParameterNames.INPUT_REPOSITORY); + mandatoryParameters.add(ReportEngineParameterNames.OUTPUT_NAME); + mandatoryParameters.add(ReportEngineParameterNames.OUTPUT_REPOSITORY); + mandatoryParameters.add(ReportEngineParameterNames.INPUT_DATASOURCE_FACTORY); + mandatoryParameters.add(ReportEngineParameterNames.IMAGE_SERVICE); parameterTypes = new HashMap(); - parameterTypes.put ("content-type", String.class); - parameterTypes.put ("input.name", String.class); - parameterTypes.put ("output.name", String.class); - parameterTypes.put ("input.repository", InputRepository.class); - parameterTypes.put ("output.repository", OutputRepository.class); - parameterTypes.put ("input.datasource-factory", DataSourceFactory.class); + parameterTypes.put (ReportEngineParameterNames.CONTENT_TYPE, String.class); + parameterTypes.put (ReportEngineParameterNames.INPUT_NAME, String.class); + parameterTypes.put (ReportEngineParameterNames.OUTPUT_NAME, String.class); + parameterTypes.put (ReportEngineParameterNames.INPUT_REPOSITORY, InputRepository.class); + parameterTypes.put (ReportEngineParameterNames.OUTPUT_REPOSITORY, OutputRepository.class); + parameterTypes.put (ReportEngineParameterNames.INPUT_DATASOURCE_FACTORY, DataSourceFactory.class); + parameterTypes.put (ReportEngineParameterNames.IMAGE_SERVICE, ImageService.class); enumerationValues = new HashNMap(); enumerationValues.add("content-type", File [changed]: PentahoReportJob.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportJob.java?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +14 -7 -------------------- --- PentahoReportJob.java 2007-05-09 12:12:12+0000 1.1.2.1 +++ PentahoReportJob.java 2007-06-06 07:03:51+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: PentahoReportJob.java,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2007/05/09 12:12:12 $ + * last change: $Author: oj $ $Date: 2007/06/06 07:03:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,6 +51,7 @@ import com.sun.star.report.ReportExecutionException; import com.sun.star.report.ReportJob; import com.sun.star.report.ReportJobDefinition; +import com.sun.star.report.ImageService; import com.sun.star.report.pentaho.loader.InputRepositoryLoader; import com.sun.star.report.pentaho.model.OfficeDocument; import com.sun.star.report.pentaho.output.text.TextRawReportProcessor; @@ -77,6 +78,7 @@ private OfficeDocument report; private ResourceManager resourceManager; private String outputName; + private ImageService imageService; private InputRepository inputRepository; public PentahoReportJob (final ReportJobDefinition definition) @@ -119,6 +121,11 @@ throw new JobDefinitionException("OutputName must not be null"); } + this.imageService = (ImageService) jobProperties.getProperty(ReportEngineParameterNames.IMAGE_SERVICE); + if (imageService == null) + { + throw new JobDefinitionException("A valid image-service implementation must be given."); + } this.resourceManager = new ResourceManager(); this.resourceManager.registerDefaults(); this.resourceManager.registerLoader(new InputRepositoryLoader(inputRepository)); @@ -220,11 +227,11 @@ //noinspection OverlyBroadCatchBlock try { - long startTime = System.currentTimeMillis(); + final long startTime = System.currentTimeMillis(); final ReportProcessor rp = getProcessorForContentType(contentType); rp.processReport(job); job.close(); - long endTime = System.currentTimeMillis(); + final long endTime = System.currentTimeMillis(); Log.debug ("Report processing time: " + (endTime - startTime)); } catch (final Exception e) @@ -239,11 +246,11 @@ { if (PentahoReportEngineMetaData.OPENDOCUMENT_SPREADSHEET.equals(mimeType)) { - return new SpreadsheetRawReportProcessor(inputRepository, outputRepository, outputName); + return new SpreadsheetRawReportProcessor(inputRepository, outputRepository, outputName,imageService); } if (PentahoReportEngineMetaData.OPENDOCUMENT_TEXT.equals(mimeType)) { - return new TextRawReportProcessor(inputRepository, outputRepository, outputName); + return new TextRawReportProcessor(inputRepository, outputRepository, outputName,imageService); } if (PentahoReportEngineMetaData.DEBUG.equals(mimeType)) { File [removed]: SDBCReportDataFactory.java File [removed]: SOImageService.java File [changed]: SOReportJobFactory.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/SOReportJobFactory.java?r1=1.1.2.2&r2=1.1.2.3 Delta lines: +3 -2 ------------------- --- SOReportJobFactory.java 2007-06-04 11:16:31+0000 1.1.2.2 +++ SOReportJobFactory.java 2007-06-06 07:03:51+0000 1.1.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: SOReportJobFactory.java,v $ * - * $Revision: 1.1.2.2 $ + * $Revision: 1.1.2.3 $ * - * last change: $Author: oj $ $Date: 2007/06/04 11:16:31 $ + * last change: $Author: oj $ $Date: 2007/06/06 07:03:51 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,6 +52,7 @@ import com.sun.star.lib.uno.helper.PropertySetMixin; import com.sun.star.report.pentaho.PentahoReportEngine; import com.sun.star.report.*; +import com.sun.star.report.StorageRepository; import com.sun.star.uno.Type; import java.net.URL; File [removed]: StorageRepository.java Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ ============================================================================== File [changed]: ImageElementLayoutController.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ImageElementLayoutController.java?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +6 -6 ------------------- --- ImageElementLayoutController.java 2007-05-09 12:20:36+0000 1.1.2.1 +++ ImageElementLayoutController.java 2007-06-06 07:03:52+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: ImageElementLayoutController.java,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2007/05/09 12:20:36 $ + * last change: $Author: oj $ $Date: 2007/06/06 07:03:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -139,9 +139,9 @@ } final Element tableCell = (Element) cellController.getNode(); final int rowSpan = TextUtilities.parseInt - ((String) tableCell.getAttribute(OfficeNamespaces.TABLE_NS, "row-span"), 1); + ((String) tableCell.getAttribute(OfficeNamespaces.TABLE_NS, "number-rows-spanned"), 1); final int colSpan = TextUtilities.parseInt - ((String) tableCell.getAttribute(OfficeNamespaces.TABLE_NS, "col-span"), 1); + ((String) tableCell.getAttribute(OfficeNamespaces.TABLE_NS, "number-cols-spanned"), 1); if (rowSpan < 1 || colSpan < 1) { Log.warn("Rowspan or colspan for image-size calculation was invalid."); @@ -183,7 +183,7 @@ return null; } - final ImageElementContext context = new ImageElementContext(rowSpan, colSpan); + final ImageElementContext context = new ImageElementContext(colSpan, rowSpan); final Node[] columnDefs = columns.getNodeArray(); int columnCounter = 0; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
