Hi Adrian,
I would suggest you go ahead and
submit a patch.
Please find related patch attached done over today's fop trunk code. Not
sure who could commit it though to the code.
Andrejus
------------------------------------------------------------------------
Index:
D:/eclipse/test/fop_trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java
===================================================================
---
D:/eclipse/test/fop_trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java
(revision 562199)
+++
D:/eclipse/test/fop_trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java
(working copy)
@@ -39,8 +39,8 @@
protected void initialize() {
if (foObjs == null) {
foObjs = new java.util.HashMap();
- foObjs.put("ps-setup-code", new PSSetupCodeMaker());
- foObjs.put("ps-page-setup-code", new PSPageSetupCodeMaker());
+ foObjs.put(PSSetupCodeElement.ELEMENT, new PSSetupCodeMaker());
+ foObjs.put(PSPageSetupCodeElement.ELEMENT, new
PSPageSetupCodeMaker());
}
}
Index: D:/eclipse/test/fop_trunk/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java
===================================================================
---
D:/eclipse/test/fop_trunk/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java
(revision 562199)
+++
D:/eclipse/test/fop_trunk/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java
(working copy)
@@ -29,6 +29,8 @@
*/
public class PSPageSetupCodeElement extends AbstractPSExtensionObject {
+ protected static final String ELEMENT = "ps-page-setup-code";
+
/**
* Main constructor
* @param parent parent FO node
@@ -47,7 +49,7 @@
/** [EMAIL PROTECTED] */
public String getLocalName() {
- return "ps-page-setup-code";
+ return ELEMENT;
}
}
Index:
D:/eclipse/test/fop_trunk/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java
===================================================================
---
D:/eclipse/test/fop_trunk/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java
(revision 562199)
+++
D:/eclipse/test/fop_trunk/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java
(working copy)
@@ -29,6 +29,8 @@
*/
public class PSSetupCodeElement extends AbstractPSExtensionObject {
+ protected static final String ELEMENT = "ps-setup-code";
+
/**
* Main constructor
* @param parent parent FO node
@@ -47,7 +49,7 @@
/** [EMAIL PROTECTED] */
public String getLocalName() {
- return "ps-setup-code";
+ return ELEMENT;
}
}
Index:
D:/eclipse/test/fop_trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandler.java
===================================================================
---
D:/eclipse/test/fop_trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandler.java
(revision 562199)
+++
D:/eclipse/test/fop_trunk/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandler.java
(working copy)
@@ -49,7 +49,7 @@
if (PSSetupCode.CATEGORY.equals(uri)) {
lastAttributes = attributes;
handled = true;
- if ("ps-setup-code".equals(localName)) {
+ if (PSSetupCodeElement.ELEMENT.equals(localName)) {
//handled in endElement
} else {
handled = false;
@@ -69,7 +69,7 @@
/** [EMAIL PROTECTED] */
public void endElement(String uri, String localName, String qName) throws
SAXException {
if (PSSetupCode.CATEGORY.equals(uri)) {
- if ("ps-setup-code".equals(localName)) {
+ if (PSSetupCodeElement.ELEMENT.equals(localName)) {
String name = lastAttributes.getValue("name");
this.returnedObject = new PSSetupCode(name,
content.toString());
}
Index:
D:/eclipse/test/fop_trunk/src/java/org/apache/fop/render/ps/extensions/PSSetupCode.java
===================================================================
---
D:/eclipse/test/fop_trunk/src/java/org/apache/fop/render/ps/extensions/PSSetupCode.java
(revision 562199)
+++
D:/eclipse/test/fop_trunk/src/java/org/apache/fop/render/ps/extensions/PSSetupCode.java
(working copy)
@@ -92,7 +92,6 @@
}
private static final String ATT_NAME = "name";
- private static final String ELEMENT = "ps-setup-code";
/** [EMAIL PROTECTED] */
public void toSAX(ContentHandler handler) throws SAXException {
@@ -100,7 +99,7 @@
if (name != null && name.length() > 0) {
atts.addAttribute(null, ATT_NAME, ATT_NAME, "CDATA", name);
}
- handler.startElement(CATEGORY, ELEMENT, ELEMENT, atts);
+ handler.startElement(CATEGORY, PSSetupCodeElement.ELEMENT,
PSSetupCodeElement.ELEMENT, atts);
if (content != null && content.length() > 0) {
char[] chars = content.toCharArray();
handler.characters(chars, 0, chars.length);
------------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
