Attachment #26720 for bug #50852

View | Details | Raw Unified | Return to bug 50852
Collapse All | Expand All




public class Flow extends FObj {
    // The value of properties relevant for fo:flow.
    private String flowName;
    private String role; // used for accessibility
    // End of property values

    /** used for FO validation */

    public void bind(PropertyList pList) throws FOPException {
        super.bind(pList);
        flowName = pList.get(PR_FLOW_NAME).getString();
        role = pList.get(PR_ROLE).getString(); // used for accessibility
    }

    /** {@inheritDoc} */

    /** {@inheritDoc} */
    public void addStructureElements(StructureElement parent) {
        StructureElement structure = createStructureElement();
        structure.setRole(role);
        parent.addChild(structure);
        super.addStructureElements(structure);
    }




public class PageSequence extends AbstractPageSequence {

    // The value of properties relevant for fo:page-sequence.
    private String role; // used for accessibility
    private String country;
    private String language;
    private String masterReference;

    /** {@inheritDoc} */
    public void bind(PropertyList pList) throws FOPException {
        super.bind(pList);
        role = pList.get(PR_ROLE).getString(); // used for accessibility
        country = pList.get(PR_COUNTRY).getString();
        language = pList.get(PR_LANGUAGE).getString();
        masterReference = pList.get(PR_MASTER_REFERENCE).getString();

        }
        if (getUserAgent().isAccessibilityEnabled()) {
            structTree = createStructureElement();
            structTree.setRole(role);
            for(int i=0;i<flowList.size();i++)
                flowList.get(i).addStructureElements(structTree);
            if (mainFlow != null)

Lines 131-137 class PDFLogicalStructureHandler { Link Here

(-)a/src/java/org/apache/fop/render/pdf/PDFLogicalStructureHandler.java (-2 / +1 lines)
131	void processStructureTree(StructureElement structureTree, Locale language) {	131	void processStructureTree(StructureElement structureTree, Locale language) {
132	pdfDoc.enforceLanguageOnRoot();	132	pdfDoc.enforceLanguageOnRoot();
133	PDFStructElem structElemPart = pdfDoc.getFactory().makeStructureElement(	133	PDFStructElem structElemPart = pdfDoc.getFactory().makeStructureElement(
134	FOToPDFRoleMap.mapFormattingObject("page-sequence", rootStructureElement),	134	FOToPDFRoleMap.mapFormattingObject(structureTree, rootStructureElement, eventBroadcaster),
135	rootStructureElement);	135	rootStructureElement);
136	rootStructureElement.addKid(structElemPart);	136	rootStructureElement.addKid(structElemPart);
137	if (language != null) {	137	if (language != null) {
138	-

Return to bug 50852

Lines 39-44 import org.apache.fop.fo.ValidationException; Link Here

(-)a/src/java/org/apache/fop/fo/pagination/PageSequence.java (+3 lines)
39	public class PageSequence extends AbstractPageSequence {	39	public class PageSequence extends AbstractPageSequence {
40		40
41	// The value of properties relevant for fo:page-sequence.	41	// The value of properties relevant for fo:page-sequence.
		42	private String role; // used for accessibility
42	private String country;	43	private String country;
43	private String language;	44	private String language;
44	private String masterReference;	45	private String masterReference;
Lines 88-93 public class PageSequence extends AbstractPageSequence { Link Here
88	/** {@inheritDoc} */	89	/** {@inheritDoc} */
89	public void bind(PropertyList pList) throws FOPException {	90	public void bind(PropertyList pList) throws FOPException {
90	super.bind(pList);	91	super.bind(pList);
		92	role = pList.get(PR_ROLE).getString(); // used for accessibility
91	country = pList.get(PR_COUNTRY).getString();	93	country = pList.get(PR_COUNTRY).getString();
92	language = pList.get(PR_LANGUAGE).getString();	94	language = pList.get(PR_LANGUAGE).getString();
93	masterReference = pList.get(PR_MASTER_REFERENCE).getString();	95	masterReference = pList.get(PR_MASTER_REFERENCE).getString();
Lines 124-129 public class PageSequence extends AbstractPageSequence { Link Here
124	}	126	}
125	if (getUserAgent().isAccessibilityEnabled()) {	127	if (getUserAgent().isAccessibilityEnabled()) {
126	structTree = createStructureElement();	128	structTree = createStructureElement();
		129	structTree.setRole(role);
127	for(int i=0;i<flowList.size();i++)	130	for(int i=0;i<flowList.size();i++)
128	flowList.get(i).addStructureElements(structTree);	131	flowList.get(i).addStructureElements(structTree);
129	if (mainFlow != null)	132	if (mainFlow != null)

Lines 36-41 import org.apache.fop.fo.ValidationException; Link Here

(-)a/src/java/org/apache/fop/fo/pagination/Flow.java (+3 lines)
36	public class Flow extends FObj {	36	public class Flow extends FObj {
37	// The value of properties relevant for fo:flow.	37	// The value of properties relevant for fo:flow.
38	private String flowName;	38	private String flowName;
		39	private String role; // used for accessibility
39	// End of property values	40	// End of property values
40		41
41	/** used for FO validation */	42	/** used for FO validation */
Lines 53-58 public class Flow extends FObj { Link Here
53	public void bind(PropertyList pList) throws FOPException {	54	public void bind(PropertyList pList) throws FOPException {
54	super.bind(pList);	55	super.bind(pList);
55	flowName = pList.get(PR_FLOW_NAME).getString();	56	flowName = pList.get(PR_FLOW_NAME).getString();
		57	role = pList.get(PR_ROLE).getString(); // used for accessibility
56	}	58	}
57		59
58	/** {@inheritDoc} */	60	/** {@inheritDoc} */
Lines 124-129 public class Flow extends FObj { Link Here
124	/** {@inheritDoc} */	126	/** {@inheritDoc} */
125	public void addStructureElements(StructureElement parent) {	127	public void addStructureElements(StructureElement parent) {
126	StructureElement structure = createStructureElement();	128	StructureElement structure = createStructureElement();
		129	structure.setRole(role);
127	parent.addChild(structure);	130	parent.addChild(structure);
128	super.addStructureElements(structure);	131	super.addStructureElements(structure);
129	}	132	}