- Summary:
Implement enhancement of
TOC localization and TOC visibility.
Fix bugzilla bugs:
152287 Problem about drill through to toc with linked
_expression_
153226 toc defined in data inside list group header
disappeared when preview
- Bugzilla Bug(s)
152287
153226
- Description:
RenderTask throws UnsupportedFormatException
if an unspported format is provided.
152287 : support matching between numbers with different scale,
between string and object.
153226 : create toc node for group instead set the toc on
the first item of the group.
- Tests
Description:
Manuel Test. Unit Test
- Notes to Build
Team:
- Notes to
Developers:
After the enhancement,
TOC tree should be get by 2 steps:
1.
get the toc tree represented by ITOCTree through IReportDocument by method getTOCTree( String format, ULocale locale ).
2.
find the TOC through methods in ITOCTree ( findTOC(String tocId), findTOCByValue( Object value)).
So, following Methods in
IReportDocument should be replaced by new API:
1. IReportDocument document
= …
TOCNode tocNode = document.findTOC( String
tocId)
Should be substituted by:
ITOCTree tocTree = document.getTOCTree(
format, locale);
TOCNode tocNode
=tocTree. findTOC( tocId );
2. TOCNode tocNode = document.findTOCByName(
String tocName)
Should be substituted by:
ITOCTree tocTree = IReportDocument.getTOCTree(
format, locale);
TOCNode tocNode
=tocTree. findTOCByValue( tocName );
3. List children = document.getChildren(
String tocID )
Should be substituted by:
ITOCTree tocTree = IReportDocument.getTOCTree(
format, locale);
TOCNode tocNode
=tocTree. findTOCByValue( tocName );
List children =
tocNode.getChildren();
- Notes to QA:
- Notes to
Documentation:
- Files Edited:
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/content/impl/AbstractContent.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/api/TOCNode.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/internal/presentation/TransientReportDocument.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/content/impl/ReportContent.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/internal/content/wrap/AbstractContentWrapper.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/executor/ListGroupExecutor.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/api/impl/ReportDocumentWriter.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/executor/TableGroupExecutor.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/parser/EngineIRVisitor.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/toc/TOCTreeNode.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/executor/ReportExecutor.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/api/ITOCTree.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/toc/TOCBuilder.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/api/impl/ReportDocumentReader.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/toc/TOCEntry.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/api/IReportDocument.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/internal/executor/doc/AbstractReportReader.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/internal/document/v2/ReportContentLoaderV2.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/executor/ReportItemExecutor.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/layout/html/HTMLTableLayoutEmitter.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/presentation/ReportDocumentBuilder.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/content/IReportContent.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/content/IContent.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/toc/TOCTree.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/internal/util/EngineIOUtil.java
/org.eclipse.birt.report.engine.emitter.html/src/org/eclipse/birt/report/engine/emitter/html/HTMLReportEmitter.java
/org.eclipse.birt.report.engine.emitter.pdf/src/org/eclipse/birt/report/engine/emitter/pdf/PDFEmitter.java
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/EngineCase.java
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/TOCTest.java
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/TOCNodeTest3.xml
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/TOCNodeTest1.xml
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/impl/DataExtractionTaskTest.java
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/impl/ReportDocumentTest.java
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/ReportletTest.java
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/TOCNodeTest4.xml
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/toc/TOCBuilderTest.java
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/RenderTaskTest.java
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/TOCNodeTest2.xml
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/TOCNodeTest.java
- Files Added:
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/api/ITOCTree.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/toc/TOCTree.java
/org.eclipse.birt.report.engine/src/org/eclipse/birt/report/engine/toc/TOCTreeNode.java
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/TOCNodeTest.java
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/TOCNodeTest2.xml
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/TOCNodeTest.xml
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/TOCNodeTest1.xml
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/TOCNodeTest4.xml
/org.eclipse.birt.report.engine/test/org/eclipse/birt/report/engine/api/TOCNodeTest3.xml
-Jun
Ouyang