Bugzilla #43439:

Fixed the restoration of the TLE values from the intermediate format for the AFP extension elements.
Submitted by: Adrian Cumiskey <dev.at.cumiskey.com>

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@582178 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java b/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java
index 8d0e50fbc2a5597a1a20ae815ac14674e179b890..8318488bfecd40797d91374051efd1693057e81b 100644 (file)
--- a/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java
+++ b/src/java/org/apache/fop/render/afp/extensions/AFPExtensionHandler.java
@@ -74,9 +74,15 @@ public class AFPExtensionHandler extends DefaultHandler
     /** {@inheritDoc} */\r
     public void endElement(String uri, String localName, String qName) throws SAXException {\r
         if (AFPPageSetup.CATEGORY.equals(uri)) {\r
-            String name = lastAttributes.getValue("name");\r
             this.returnedObject = new AFPPageSetup(localName);\r
-            returnedObject.setName(name);\r
+            String name = lastAttributes.getValue("name");\r
+            if (name != null) {\r
+                returnedObject.setName(name);\r
+            }\r
+            String value = lastAttributes.getValue("value");\r
+            if (value != null) {\r
+                returnedObject.setValue(value);\r
+            }\r
             if (content.length() > 0) {\r
                 returnedObject.setContent(content.toString());\r
                 content.setLength(0); //Reset text buffer (see characters())\r

diff --git a/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java b/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java
index 3fe6c1e53bcef8ac50b0daba1fb846c4f6c4dda2..ca568028e251832f1095cd905a6426b968dac604 100644 (file)
--- a/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java
+++ b/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java
@@ -109,7 +109,8 @@ public class AFPPageSetup implements ExtensionAttachment, Serializable, XMLizabl
 
     /** {@inheritDoc} */
     public String toString() {
-        return "AFPPageSetup(element-name=" + getElementName() + " name=" + getName() + ")";
+        return "AFPPageSetup(element-name=" + getElementName() 
+            + " name=" + getName() + " value=" + getValue() + ")";
     }
 
     private static final String ATT_NAME = "name";

diff --git a/status.xml b/status.xml
index 24b90423ca9074921f2ad856f9266477129ac2c7..f9fb720d717841394375aafc80de9c4ade4e986e 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -28,6 +28,10 @@
 
   <changes>
     <release version="FOP Trunk">
+      <action context="Code" dev="JM" type="fix" fixes-bug="43439" due-to="Adrian Cumiskey">
+        Fixed the restoration of the TLE values from the intermediate format 
+        for the AFP extension elements.
+      </action>
       <action context="Code" dev="JM" type="add" fixes-bug="43041" due-to="Adrian Cumiskey">
         Added a configuration setting for the renderer/device resolution to the AFP renderer.
       </action>