Author: ssteiner
Date: Wed Aug 12 13:58:15 2015
New Revision: 1695517
URL: http://svn.apache.org/r1695517
Log:
FOP-2510: Flow name infinite Loop
Added:
xmlgraphics/fop/trunk/test/events/flowNameNotMapped.fo (with props)
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/FlowNamedNotMappedTestCase.java
(with props)
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java?rev=1695517&r1=1695516&r2=1695517&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequence.java
Wed Aug 12 13:58:15 2015
@@ -193,7 +193,7 @@ public class PageSequence extends Abstra
* @throws org.apache.fop.fo.ValidationException if the fo:flow maps
* to an invalid page-region
*/
- private void addFlow(Flow flow) throws ValidationException {
+ private void addFlow(Flow flow) throws ValidationException {
String flowName = flow.getFlowName();
if (hasFlowName(flowName)) {
@@ -201,14 +201,20 @@ public class PageSequence extends Abstra
flowName, flow.getLocator());
}
- if (!getRoot().getLayoutMasterSet().regionNameExists(flowName)
- && !flowName.equals("xsl-before-float-separator")
- && !flowName.equals("xsl-footnote-separator")) {
+ if (!hasRegion(flowName) &&
!flowName.equals("xsl-before-float-separator")
+ && !flowName.equals("xsl-footnote-separator")) {
getFOValidationEventProducer().flowNameNotMapped(this,
flow.getName(),
flowName, flow.getLocator());
}
}
+ private boolean hasRegion(String flowName) {
+ LayoutMasterSet set = getRoot().getLayoutMasterSet();
+ PageSequenceMaster psm = set.getPageSequenceMaster(masterReference);
+ return (psm != null) ?
psm.getLayoutMasterSet().regionNameExists(flowName)
+ :
set.getSimplePageMaster(masterReference).regionNameExists(flowName);
+ }
+
/**
* Get the static content FO node from the flow map.
* This gets the static content flow for the given flow name.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java?rev=1695517&r1=1695516&r2=1695517&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
Wed Aug 12 13:58:15 2015
@@ -117,6 +117,10 @@ public class PageSequenceMaster extends
subSequenceSpecifiers.add(pageMasterReference);
}
+ public LayoutMasterSet getLayoutMasterSet() {
+ return layoutMasterSet;
+ }
+
/**
* Returns the next subsequence specifier
* @return a subsequence specifier
Added: xmlgraphics/fop/trunk/test/events/flowNameNotMapped.fo
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/events/flowNameNotMapped.fo?rev=1695517&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/events/flowNameNotMapped.fo (added)
+++ xmlgraphics/fop/trunk/test/events/flowNameNotMapped.fo Wed Aug 12 13:58:15
2015
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";>
+<fo:layout-master-set>
+<fo:simple-page-master master-name="CoverPage_A4">
+<fo:region-body region-name="CoverPage_Body"/>
+</fo:simple-page-master>
+<fo:simple-page-master master-name="ContentPage_A4">
+<fo:region-body region-name="ContentPage_Body"/>
+</fo:simple-page-master>
+</fo:layout-master-set>
+<fo:page-sequence master-reference="CoverPage_A4">
+<fo:flow flow-name="ContentPage_Body">
+<fo:block>hi</fo:block>
+</fo:flow>
+</fo:page-sequence>
+</fo:root>
Propchange: xmlgraphics/fop/trunk/test/events/flowNameNotMapped.fo
------------------------------------------------------------------------------
svn:eol-style = native
Added:
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/FlowNamedNotMappedTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/events/FlowNamedNotMappedTestCase.java?rev=1695517&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/FlowNamedNotMappedTestCase.java
(added)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/FlowNamedNotMappedTestCase.java
Wed Aug 12 13:58:15 2015
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+package org.apache.fop.events;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.Map;
+
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.commons.io.output.NullOutputStream;
+
+import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.apps.Fop;
+import org.apache.fop.apps.FopFactory;
+import org.apache.fop.apps.MimeConstants;
+import org.apache.fop.fo.FOValidationEventProducer;
+
+public class FlowNamedNotMappedTestCase {
+
+
+ private static class FlowNameNotMappedEventChecker implements
EventListener {
+ private final String personalID =
FOValidationEventProducer.class.getName() + ".flowNameNotMapped";
+
+ public void processEvent(Event event) {
+ Map<String, Object> t = event.getParams();
+ assertEquals("fo:flow", event.getParam("elementName"));
+ assertEquals("ContentPage_Body", event.getParam("flowName"));
+ assertEquals(personalID, event.getEventID());
+ }
+ }
+
+ @Test
+ public void testFlowNamedNotMapped() throws Exception {
+ FlowNameNotMappedEventChecker flowChecker;
+ Fop fop;
+ FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
+ FOUserAgent userAgent = fopFactory.newFOUserAgent();
+ flowChecker = new FlowNameNotMappedEventChecker();
+ userAgent.getEventBroadcaster().addEventListener(flowChecker);
+ fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent, new
NullOutputStream());
+ Source src = new StreamSource(new
FileInputStream("test/events/flowNameNotMapped.fo"));
+ SAXResult res = new SAXResult(fop.getDefaultHandler());
+ Transformer transformer =
TransformerFactory.newInstance().newTransformer();
+ String expected = "on fo:flow could not be mapped to a region-name in
the layout-master-set.";
+ String test = "";
+ try {
+ transformer.transform(src, res);
+ } catch (TransformerException te) {
+ test = te.getLocalizedMessage();
+ }
+ assertTrue(test.contains(expected));
+ }
+}
Propchange:
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/FlowNamedNotMappedTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
