User: kz Date: 2008-05-05 13:53:41+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java
Log: INTEGRATION: CWS dba30beta (1.3.6); FILE MERGED 2008/04/22 10:30:26 oj 1.3.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ ============================================================================== File [changed]: ObjectOleLayoutController.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ObjectOleLayoutController.java?r1=1.3&r2=1.4 Delta lines: +13 -10 --------------------- --- ObjectOleLayoutController.java 2008-04-10 17:24:10+0000 1.3 +++ ObjectOleLayoutController.java 2008-05-05 13:53:37+0000 1.4 @@ -29,10 +29,13 @@ ************************************************************************/ package com.sun.star.report.pentaho.layoutprocessor; +import com.sun.star.report.SDBCReportDataFactory; import com.sun.star.report.pentaho.OfficeNamespaces; +import com.sun.star.report.OfficeToken; import com.sun.star.report.pentaho.model.ObjectOleElement; +import java.util.ArrayList; import java.util.Iterator; -import java.util.Vector; +import java.util.List; import org.jfree.report.DataSourceException; import org.jfree.report.ReportDataFactoryException; import org.jfree.report.ReportProcessingException; @@ -58,9 +61,9 @@ protected boolean isValueChanged() { final ObjectOleElement element = (ObjectOleElement) getNode(); - final Vector masterfields = element.getMasterfields(); + final List masterfields = element.getMasterfields(); final DataRow view = getFlowController().getMasterRow().getGlobalView(); - for (Iterator iter = masterfields.iterator(); iter.hasNext();) + for (final Iterator iter = masterfields.iterator(); iter.hasNext();) { final String master = (String) iter.next(); try @@ -79,7 +82,7 @@ return false; } - protected LayoutController delegateContentGeneration(ReportTarget target) throws ReportProcessingException, ReportDataFactoryException, DataSourceException + protected LayoutController delegateContentGeneration(final ReportTarget target) throws ReportProcessingException, ReportDataFactoryException, DataSourceException { final ObjectOleElement element = (ObjectOleElement) getNode(); final String url = element.getUrl(); @@ -87,13 +90,13 @@ { final AttributeMap ole = new AttributeMap(); ole.setAttribute(JFreeReportInfo.REPORT_NAMESPACE, Element.NAMESPACE_ATTRIBUTE, OfficeNamespaces.INTERNAL_NS); - ole.setAttribute(JFreeReportInfo.REPORT_NAMESPACE, Element.TYPE_ATTRIBUTE, "object-ole"); + ole.setAttribute(JFreeReportInfo.REPORT_NAMESPACE, Element.TYPE_ATTRIBUTE, OfficeToken.OBJECT_OLE); ole.setAttribute(OfficeNamespaces.INTERNAL_NS, "href", url); ole.setAttribute(OfficeNamespaces.INTERNAL_NS, "class-id", element.getClassid()); - final Vector masterfields = element.getMasterfields(); - Vector values = new Vector(); + final List masterfields = element.getMasterfields(); + final List values = new ArrayList(); final DataRow view = getFlowController().getMasterRow().getGlobalView(); - for (Iterator iter = masterfields.iterator(); iter.hasNext();) + for (final Iterator iter = masterfields.iterator(); iter.hasNext();) { final String master = (String) iter.next(); try @@ -110,8 +113,8 @@ } } ole.setAttribute(OfficeNamespaces.INTERNAL_NS, "master-columns", masterfields); - ole.setAttribute(OfficeNamespaces.INTERNAL_NS, "master-values", values); - ole.setAttribute(OfficeNamespaces.INTERNAL_NS, "detail-columns", element.getDetailfields()); + ole.setAttribute(OfficeNamespaces.INTERNAL_NS, SDBCReportDataFactory.MASTER_VALUES, values); + ole.setAttribute(OfficeNamespaces.INTERNAL_NS, SDBCReportDataFactory.DETAIL_COLUMNS, element.getDetailfields()); target.startElement(ole); target.endElement(ole); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
