Author: ssteiner
Date: Thu Jul 4 13:48:41 2019
New Revision: 1862557
URL: http://svn.apache.org/viewvc?rev=1862557&view=rev
Log:
FOP-2762: Serialisation issues with accessibility and conserve-memory
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFName.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFStructElem.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/StandardStructureTypes.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PageSequenceStructElem.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/TableStructElem.java
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/ConserveMemoryTestCase.java
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFName.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFName.java?rev=1862557&r1=1862556&r2=1862557&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFName.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFName.java
Thu Jul 4 13:48:41 2019
@@ -21,14 +21,16 @@ package org.apache.fop.pdf;
import java.io.IOException;
import java.io.OutputStream;
+import java.io.Serializable;
import org.apache.commons.io.output.CountingOutputStream;
/**
* Class representing a PDF name object.
*/
-public class PDFName extends PDFObject {
+public class PDFName extends PDFObject implements Serializable {
+ private static final long serialVersionUID = -968412396459739925L;
private String name;
/**
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFStructElem.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFStructElem.java?rev=1862557&r1=1862556&r2=1862557&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFStructElem.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFStructElem.java
Thu Jul 4 13:48:41 2019
@@ -22,6 +22,7 @@ package org.apache.fop.pdf;
import java.io.IOException;
import java.io.OutputStream;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -35,8 +36,9 @@ import org.apache.fop.util.LanguageTags;
* Class representing a PDF Structure Element.
*/
public class PDFStructElem extends StructureHierarchyMember
- implements StructureTreeElement, CompressedObject {
+ implements StructureTreeElement, CompressedObject, Serializable {
+ private static final long serialVersionUID = -3055241807589202532L;
private StructureType structureType;
protected PDFStructElem parentElement;
@@ -246,7 +248,7 @@ public class PDFStructElem extends Struc
}
public int output(OutputStream stream) throws IOException {
- if (getDocument().getProfile().getPDFUAMode().isEnabled()) {
+ if (getDocument() != null &&
getDocument().getProfile().getPDFUAMode().isEnabled()) {
if (entries.containsKey("Alt") && "".equals(get("Alt"))) {
put("Alt", "No alternate text specified");
} else if (kids != null) {
@@ -275,6 +277,8 @@ public class PDFStructElem extends Struc
*/
public static class Placeholder extends PDFStructElem {
+ private static final long serialVersionUID = -2397980642558372068L;
+
@Override
public void outputInline(OutputStream out, StringBuilder textBuffer)
throws IOException {
if (kids != null) {
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/StandardStructureTypes.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/StandardStructureTypes.java?rev=1862557&r1=1862556&r2=1862557&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/StandardStructureTypes.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/StandardStructureTypes.java
Thu Jul 4 13:48:41 2019
@@ -19,6 +19,7 @@
package org.apache.fop.pdf;
+import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
@@ -98,8 +99,9 @@ public final class StandardStructureType
public static final StructureType FORM = new StructureTypeImpl("Form");
}
- private static class StructureTypeImpl implements StructureType {
+ private static class StructureTypeImpl implements StructureType,
Serializable {
+ private static final long serialVersionUID = 8577475043360334210L;
private final PDFName name;
protected StructureTypeImpl(String name) {
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PageSequenceStructElem.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PageSequenceStructElem.java?rev=1862557&r1=1862556&r2=1862557&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PageSequenceStructElem.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/PageSequenceStructElem.java
Thu Jul 4 13:48:41 2019
@@ -29,6 +29,7 @@ import org.apache.fop.pdf.StructureType;
public class PageSequenceStructElem extends PDFStructElem {
+ private static final long serialVersionUID = -9146602678931267198L;
private List<PDFStructElem> regionBefores = new ArrayList<PDFStructElem>();
private List<PDFStructElem> regionAfters = new ArrayList<PDFStructElem>();
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/TableStructElem.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/TableStructElem.java?rev=1862557&r1=1862556&r2=1862557&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/TableStructElem.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/TableStructElem.java
Thu Jul 4 13:48:41 2019
@@ -25,6 +25,7 @@ import org.apache.fop.pdf.StructureType;
class TableStructElem extends PDFStructElem {
+ private static final long serialVersionUID = -3550873504343680465L;
private PDFStructElem tableFooter;
public TableStructElem(PDFObject parent, StructureType structureType) {
Modified:
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/ConserveMemoryTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/ConserveMemoryTestCase.java?rev=1862557&r1=1862556&r2=1862557&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/ConserveMemoryTestCase.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/render/ConserveMemoryTestCase.java
Thu Jul 4 13:48:41 2019
@@ -58,6 +58,7 @@ public class ConserveMemoryTestCase {
FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI());
FOUserAgent userAgent = fopFactory.newFOUserAgent();
userAgent.setConserveMemoryPolicy(true);
+ userAgent.setAccessibility(true);
Fop fop = fopFactory.newFop("application/pdf", userAgent, new
ByteArrayOutputStream());
Transformer transformer =
TransformerFactory.newInstance().newTransformer();
Source src = new StreamSource(new ByteArrayInputStream(fo.getBytes()));
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org
