User: kz Date: 2008-05-05 13:38:53+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java
Log: INTEGRATION: CWS dba30beta (1.4.6); FILE MERGED 2008/04/22 10:30:24 oj 1.4.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/ ============================================================== File [changed]: PentahoReportEngineMetaData.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java?r1=1.4&r2=1.5 Delta lines: +11 -7 -------------------- --- PentahoReportEngineMetaData.java 2008-04-10 17:19:26+0000 1.4 +++ PentahoReportEngineMetaData.java 2008-05-05 13:38:50+0000 1.5 @@ -39,7 +39,9 @@ import com.sun.star.report.ReportEngineMetaData; import com.sun.star.report.ReportEngineParameterNames; import com.sun.star.report.ImageService; -import java.util.Vector; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.jfree.util.HashNMap; public class PentahoReportEngineMetaData @@ -51,9 +53,9 @@ public static final String OPENDOCUMENT_CHART = "application/vnd.oasis.opendocument.chart"; public final static String CONTENT_TYPE = "content-type"; public static final String DEBUG = "raw/text+xml"; - private HashSet mandatoryParameters; - private HashMap parameterTypes; - private HashNMap enumerationValues; + private final Set mandatoryParameters; + private final Map parameterTypes; + private final HashNMap enumerationValues; public PentahoReportEngineMetaData() { @@ -80,15 +82,17 @@ parameterTypes.put(ReportEngineParameterNames.INPUT_DATASOURCE_FACTORY, DataSourceFactory.class); parameterTypes.put(ReportEngineParameterNames.IMAGE_SERVICE, ImageService.class); parameterTypes.put(ReportEngineParameterNames.INPUT_REPORTJOB_FACTORY, ReportJobFactory.class); - parameterTypes.put(ReportEngineParameterNames.INPUT_MASTER_COLUMNS, Vector.class); - parameterTypes.put(ReportEngineParameterNames.INPUT_MASTER_VALUES, Vector.class); - parameterTypes.put(ReportEngineParameterNames.INPUT_DETAIL_COLUMNS, Vector.class); + parameterTypes.put(ReportEngineParameterNames.INPUT_MASTER_COLUMNS, List.class); + parameterTypes.put(ReportEngineParameterNames.INPUT_MASTER_VALUES, List.class); + parameterTypes.put(ReportEngineParameterNames.INPUT_DETAIL_COLUMNS, List.class); enumerationValues = new HashNMap(); enumerationValues.add(CONTENT_TYPE, PentahoReportEngineMetaData.OPENDOCUMENT_TEXT); enumerationValues.add(CONTENT_TYPE, PentahoReportEngineMetaData.OPENDOCUMENT_SPREADSHEET); + enumerationValues.add(CONTENT_TYPE, + PentahoReportEngineMetaData.OPENDOCUMENT_CHART); enumerationValues.add(CONTENT_TYPE, PentahoReportEngineMetaData.DEBUG); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
