User: kz Date: 2008-05-05 15:19:19+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java
Log: INTEGRATION: CWS dba30beta (1.4.6); FILE MERGED 2008/04/22 10:30:31 oj 1.4.6.1: #i88503# merge changes from rptchart02 File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/ ========================================================================= File [changed]: ReportReadHandler.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/parser/rpt/ReportReadHandler.java?r1=1.4&r2=1.5 Delta lines: +58 -46 --------------------- --- ReportReadHandler.java 2008-04-10 17:50:04+0000 1.4 +++ ReportReadHandler.java 2008-05-05 15:19:16+0000 1.5 @@ -35,6 +35,7 @@ import com.sun.star.report.pentaho.model.OfficeReport; import com.sun.star.report.pentaho.parser.ElementReadHandler; import com.sun.star.report.pentaho.parser.chart.ChartReadHandler; +import java.util.List; import org.jfree.report.structure.Element; import org.jfree.report.structure.Section; import org.jfree.xmlns.parser.XmlReadHandler; @@ -49,11 +50,16 @@ private RootTableReadHandler reportHeader; private RootTableReadHandler reportFooter; private RootTableReadHandler detail; + + public void setDetail(final RootTableReadHandler detail) + { + this.detail = detail; + } private GroupReadHandler groups; - private OfficeReport rootSection; - private ArrayList functionHandlers; - private ArrayList preBodyHandlers; - private ArrayList postBodyHandlers; + private final OfficeReport rootSection; + private final List functionHandlers; + private final List preBodyHandlers; + private final List postBodyHandlers; private boolean pre = true; public ReportReadHandler() @@ -78,9 +84,10 @@ final Attributes atts) throws SAXException { - if (OfficeNamespaces.CHART_NS.equals(uri) == true) + final XmlReadHandler erh; + if (OfficeNamespaces.CHART_NS.equals(uri)) { - final ChartReadHandler erh = new ChartReadHandler(); + erh = new ChartReadHandler(this); if (pre) { preBodyHandlers.add(erh); @@ -89,50 +96,55 @@ { postBodyHandlers.add(erh); } - return erh; } - if (OfficeNamespaces.OOREPORT_NS.equals(uri) == false) + else if (OfficeNamespaces.OOREPORT_NS.equals(uri)) { - return null; - } if ("function".equals(tagName)) { - final FunctionReadHandler erh = new FunctionReadHandler(); + erh = new FunctionReadHandler(); functionHandlers.add(erh); - return erh; } - if ("page-header".equals(tagName)) + else if ("page-header".equals(tagName)) { pageHeader = new RootTableReadHandler(); - return pageHeader; + erh = pageHeader; } - if ("report-header".equals(tagName)) + else if ("report-header".equals(tagName)) { reportHeader = new RootTableReadHandler(); - return reportHeader; + erh = reportHeader; } - if ("report-footer".equals(tagName)) + else if ("report-footer".equals(tagName)) { reportFooter = new RootTableReadHandler(); - return reportFooter; + erh = reportFooter; } - if ("page-footer".equals(tagName)) + else if ("page-footer".equals(tagName)) { pageFooter = new RootTableReadHandler(); - return pageFooter; + erh = pageFooter; } - if ("detail".equals(tagName)) + else if ("detail".equals(tagName)) { pre = false; detail = new DetailRootTableReadHandler(); - return detail; + erh = detail; } - if ("group".equals(tagName)) + else if ("group".equals(tagName)) { groups = new GroupReadHandler(); - return groups; + erh = groups; } - return null; + else + { + erh = null; + } + } + else + { + erh = null; + } + return erh; } /** @@ -200,7 +212,7 @@ return rootSection; } - private final Section createSection(final String name, final ArrayList handler) + private final Section createSection(final String name, final List handler) { if (!handler.isEmpty()) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
