Tag: mws_bea300 User: obo Date: 2008-04-28 15:23:59+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/output/OleProducer.java
Log: INTEGRATION: CWS dba30beta_BEA300 (1.3.6); FILE MERGED 2008/04/22 10:30:28 oj 1.3.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/ ===================================================================== File [changed]: OleProducer.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/OleProducer.java?r1=1.3&r2=1.3.4.1 Delta lines: +15 -13 --------------------- --- OleProducer.java 2008-04-10 17:36:08+0000 1.3 +++ OleProducer.java 2008-04-28 15:23:57+0000 1.3.4.1 @@ -39,8 +39,10 @@ import com.sun.star.report.ReportJobDefinition; import com.sun.star.report.pentaho.DefaultNameGenerator; import com.sun.star.report.pentaho.PentahoReportEngine; +import com.sun.star.report.pentaho.PentahoReportEngineMetaData; import java.io.IOException; -import java.util.Vector; +import java.util.List; +import org.jfree.util.Log; /** * @@ -48,11 +50,11 @@ */ public class OleProducer { - private InputRepository inputRepository; - private OutputRepository outputRepository; - private DefaultNameGenerator nameGenerator; - private DataSourceFactory dataSourceFactory; - private ImageService imageService; + private final InputRepository inputRepository; + private final OutputRepository outputRepository; + private final DefaultNameGenerator nameGenerator; + private final DataSourceFactory dataSourceFactory; + private final ImageService imageService; public OleProducer(final InputRepository inputRepository, @@ -71,14 +73,14 @@ this.imageService = imageService; } - String produceOle(final String source,final Vector masterColumns,final Vector masterValues,final Vector detailColumns) { + String produceOle(final String source,final List masterColumns,final List masterValues,final List detailColumns) { InputRepository subInputRepository = null; OutputRepository subOutputRepository = null; String output = ""; try { subInputRepository = inputRepository.openInputRepository(source); - output = nameGenerator.generateStorageName("Object ", null); - subOutputRepository = outputRepository.openOutputRepository(output); + output = nameGenerator.generateStorageName("Object", null); + subOutputRepository = outputRepository.openOutputRepository(output, PentahoReportEngineMetaData.OPENDOCUMENT_CHART); try { final PentahoReportEngine engine = new PentahoReportEngine(); @@ -89,7 +91,7 @@ procParms.setProperty(ReportEngineParameterNames.OUTPUT_REPOSITORY, subOutputRepository); procParms.setProperty(ReportEngineParameterNames.INPUT_NAME, "content.xml"); procParms.setProperty(ReportEngineParameterNames.OUTPUT_NAME, "content.xml"); - procParms.setProperty(ReportEngineParameterNames.CONTENT_TYPE, "application/vnd.oasis.opendocument.chart"); + procParms.setProperty(ReportEngineParameterNames.CONTENT_TYPE, PentahoReportEngineMetaData.OPENDOCUMENT_CHART); procParms.setProperty(ReportEngineParameterNames.INPUT_DATASOURCE_FACTORY, dataSourceFactory); procParms.setProperty(ReportEngineParameterNames.INPUT_MASTER_COLUMNS, masterColumns); procParms.setProperty(ReportEngineParameterNames.INPUT_MASTER_VALUES, masterValues); @@ -98,12 +100,12 @@ engine.createJob(definition).execute(); } catch (ReportExecutionException ex) { - ex.printStackTrace(); + Log.error("ReportProcessing failed", ex); } catch (IOException ex) { - ex.printStackTrace(); + Log.error("ReportProcessing failed", ex); } } catch (IOException ex) { - ex.printStackTrace(); + Log.error("ReportProcessing failed", ex); } finally { if (subInputRepository != null) { subInputRepository.closeInputRepository(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
