User: kz Date: 2008-03-05 17:29:45+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/PentahoReportEngineMetaData.java
Log: INTEGRATION: CWS rptchart01_DEV300 (1.2.70); FILE MERGED 2008/02/21 09:57:23 oj 1.2.70.4: #i85225# fixes found with PMD 2008/02/20 10:52:55 oj 1.2.70.3: format changes 2008/02/19 06:42:48 oj 1.2.70.2: #i85225# ongoing work 2008/02/13 07:04:22 oj 1.2.70.1: #i85225# impl chart readhandler and oleproducer 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.2&r2=1.3 Delta lines: +95 -85 --------------------- --- PentahoReportEngineMetaData.java 2007-07-09 11:56:04+0000 1.2 +++ PentahoReportEngineMetaData.java 2008-03-05 17:29:43+0000 1.3 @@ -33,10 +33,9 @@ * MA 02111-1307 USA * ************************************************************************/ - - package com.sun.star.report.pentaho; +import com.sun.star.report.ReportJobFactory; import java.util.HashMap; import java.util.HashSet; @@ -46,20 +45,23 @@ import com.sun.star.report.ReportEngineMetaData; import com.sun.star.report.ReportEngineParameterNames; import com.sun.star.report.ImageService; +import java.util.Vector; import org.jfree.util.HashNMap; public class PentahoReportEngineMetaData implements ReportEngineMetaData { + public static final String OPENDOCUMENT_TEXT = "application/vnd.oasis.opendocument.text"; public static final String OPENDOCUMENT_SPREADSHEET = "application/vnd.oasis.opendocument.spreadsheet"; + 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; - public PentahoReportEngineMetaData () + public PentahoReportEngineMetaData() { mandatoryParameters = new HashSet(); mandatoryParameters.add(ReportEngineParameterNames.CONTENT_TYPE); @@ -69,35 +71,44 @@ mandatoryParameters.add(ReportEngineParameterNames.OUTPUT_REPOSITORY); mandatoryParameters.add(ReportEngineParameterNames.INPUT_DATASOURCE_FACTORY); mandatoryParameters.add(ReportEngineParameterNames.IMAGE_SERVICE); + mandatoryParameters.add(ReportEngineParameterNames.INPUT_REPORTJOB_FACTORY); + mandatoryParameters.add(ReportEngineParameterNames.INPUT_MASTER_COLUMNS); + mandatoryParameters.add(ReportEngineParameterNames.INPUT_MASTER_VALUES); + mandatoryParameters.add(ReportEngineParameterNames.INPUT_DETAIL_COLUMNS); + parameterTypes = new HashMap(); - 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); + 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); + 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); enumerationValues = new HashNMap(); - enumerationValues.add("content-type", + enumerationValues.add(CONTENT_TYPE, PentahoReportEngineMetaData.OPENDOCUMENT_TEXT); - enumerationValues.add("content-type", + enumerationValues.add(CONTENT_TYPE, PentahoReportEngineMetaData.OPENDOCUMENT_SPREADSHEET); - enumerationValues.add("content-type", PentahoReportEngineMetaData.DEBUG); + enumerationValues.add(CONTENT_TYPE, PentahoReportEngineMetaData.DEBUG); } - public Object[] getEnumerationValues (final String parameter) + public Object[] getEnumerationValues(final String parameter) { return enumerationValues.toArray(parameter); } - public Class getParameterType (final String parameter) + public Class getParameterType(final String parameter) { return (Class) parameterTypes.get(parameter); } - public boolean isEnumeration (final String parameter) + public boolean isEnumeration(final String parameter) { return enumerationValues.containsKey(parameter); } @@ -109,10 +120,9 @@ * @param mimeType * @return true, if the output type is supported; false otherwise. */ - public boolean isOutputSupported (final String mimeType) + public boolean isOutputSupported(final String mimeType) { - return enumerationValues.containsValue - ("content-type", mimeType.toLowerCase()); + return enumerationValues.containsValue(CONTENT_TYPE, mimeType.toLowerCase()); } /** @@ -122,12 +132,12 @@ * @param mimeType * @return */ - public String[] getOutputParameters (final String mimeType) + public String[] getOutputParameters(final String mimeType) { return new String[0]; } - public boolean isMandatory (final String parameter) + public boolean isMandatory(final String parameter) { return mandatoryParameters.contains(parameter); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
