User: hr Date: 2007-08-03 09:49:26+0000 Added: dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java
Log: INTEGRATION: CWS rpt23fix02 (1.1.2); FILE ADDED 2007/07/25 15:05:45 tmorgner 1.1.2.1: Issue number: 78128 This commit fixes the messed up repeating-header system. The whole thing has been redesigned to create a clean state-flow that can be debugged and traced without any weird mind-bending activities. The report-targets now have a new state (IN_GROUP_INSTANCE) to keep track of the group's processing and to separate repeating headers and footers from ordinary headers and footers. This patch also enforces a clean state-flow in the OfficeReportOutputTarget and explicitly checks for all allowed band-types and throws exceptions on every illegal state. File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/ ============================================================================== File [added]: OfficeGroupInstanceSectionLayoutController.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/layoutprocessor/OfficeGroupInstanceSectionLayoutController.java?rev=1.2&content-type=text/vnd.viewcvs-markup Added lines: 159 ---------------- package com.sun.star.report.pentaho.layoutprocessor; import org.jfree.report.flow.layoutprocessor.SectionLayoutController; import org.jfree.report.flow.layoutprocessor.LayoutController; import org.jfree.report.flow.layoutprocessor.ElementLayoutController; import org.jfree.report.flow.layoutprocessor.LayoutControllerFactory; import org.jfree.report.flow.layoutprocessor.LayoutControllerUtil; import org.jfree.report.flow.FlowController; import org.jfree.report.flow.ReportTarget; import org.jfree.report.flow.ReportContext; import org.jfree.report.DataSourceException; import org.jfree.report.ReportDataFactoryException; import org.jfree.report.ReportProcessingException; import org.jfree.report.expressions.Expression; import org.jfree.report.structure.Element; import org.jfree.report.structure.Node; import org.jfree.layouting.util.AttributeMap; import com.sun.star.report.pentaho.model.VariablesDeclarationSection; import com.sun.star.report.pentaho.model.OfficeGroupSection; import com.sun.star.report.pentaho.OfficeNamespaces; /** * Creation-Date: 25.07.2007, 14:50:45 * * @author Thomas Morgner */ public class OfficeGroupInstanceSectionLayoutController extends SectionLayoutController { public static final int STATE_PROCESS_VARIABLES = 2; public static final int STATE_PROCESS_NORMAL_FLOW = 3; private int state; private boolean waitForJoin; public OfficeGroupInstanceSectionLayoutController() { } public void initialize(final Object node, final FlowController flowController, final LayoutController parent) throws DataSourceException, ReportDataFactoryException, ReportProcessingException { super.initialize(node, flowController, parent); state = STATE_PROCESS_VARIABLES; } protected LayoutController processContent(final ReportTarget target) throws DataSourceException, ReportProcessingException, ReportDataFactoryException { if (state == OfficeGroupInstanceSectionLayoutController.STATE_PROCESS_VARIABLES) { // todo: Fill the variables section with something sensible .. final VariablesDeclarationSection variables = new VariablesDeclarationSection(); final OfficeGroupInstanceSectionLayoutController controller = (OfficeGroupInstanceSectionLayoutController) clone(); controller.state = OfficeGroupLayoutController.STATE_PROCESS_NORMAL_FLOW; controller.waitForJoin = true; return processChild(controller, variables, getFlowController()); } return super.processContent(target); } // isDisplayable is private in version 0.9.1, so until the upgrade we keep this copy of the method // todo: Delete it unce the sun-cvs contains version 0.9.2. protected LayoutController processChild(final SectionLayoutController derived, final Node node, final FlowController flowController) throws DataSourceException, ReportProcessingException, ReportDataFactoryException { final ReportContext reportContext = flowController.getReportContext(); final LayoutControllerFactory layoutControllerFactory = reportContext.getLayoutControllerFactory(); if (isDisplayable(node)) { derived.setProcessingState(ElementLayoutController.WAITING_FOR_JOIN); return layoutControllerFactory.create(flowController, node, derived); } else { derived.setProcessingState(ElementLayoutController.WAITING_FOR_JOIN); final LayoutController childLc = layoutControllerFactory.create(flowController, node, derived); return LayoutControllerUtil.skipInvisibleElement(childLc); } } protected boolean isDisplayable(final Node node) throws DataSourceException { if (node instanceof OfficeGroupSection == false) { return _isDisplayable(node); } final OfficeGroupSection section = (OfficeGroupSection) node; if (section.isRepeatSection()) { return false; } return _isDisplayable(node); } protected boolean _isDisplayable(final Node node) throws DataSourceException { // temp method until the pending upgrade to 0.9.2. Later we just call super.isDisplayable(..) instead. if (node.isEnabled() == false) { return false; } final Expression expression = node.getDisplayCondition(); if (expression == null) { return true; } final Object result = LayoutControllerUtil.evaluateExpression(getFlowController(), node, expression); if (Boolean.TRUE.equals(result)) { return true; } return false; } protected void resetSectionForRepeat() { super.resetSectionForRepeat(); state = STATE_PROCESS_VARIABLES; } /** * Joins with a delegated process flow. This is generally called from a child * flow and should *not* (I mean it!) be called from outside. If you do, * you'll suffer. * * @param flowController the flow controller of the parent. * @return the joined layout controller that incorperates all changes from the * delegate. */ public LayoutController join(final FlowController flowController) { if (waitForJoin) { final OfficeGroupInstanceSectionLayoutController derived = (OfficeGroupInstanceSectionLayoutController) clone(); derived.setProcessingState(ElementLayoutController.OPENED); derived.setFlowController(flowController); derived.waitForJoin = false; return derived; } return super.join(flowController); } protected AttributeMap computeAttributes(final FlowController fc, final Element element, final ReportTarget target) throws DataSourceException { final AttributeMap map = super.computeAttributes(fc, element, target); map.setAttribute(OfficeNamespaces.INTERNAL_NS, "iteration-count", new Integer(getIterationCount())); return map; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
