From d4333439f369e0884a8262ba9d445416a241d907 Mon Sep 17 00:00:00 2001 From: Adrian Cumiskey Date: Fri, 26 Oct 2007 18:58:15 +0000 Subject: [PATCH] Bugzilla #43042: Applied [PATCH] 43042 - PS extension implementation code cleanup. Partially modified the patch due to code changes. Many thanks to Andrejus Chaliapinas for this patch :) Submitted by: Andrejus Chaliapinas git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@588749 13f79535-47bb-0310-9956-ffa450edef68 --- .../render/ps/extensions/PSCommentAfterElement.java | 4 +++- .../render/ps/extensions/PSCommentBeforeElement.java | 4 +++- .../ps/extensions/PSExtensionElementMapping.java | 10 +++++----- .../render/ps/extensions/PSPageSetupCodeElement.java | 4 +++- .../render/ps/extensions/PSSetPageDeviceElement.java | 4 +++- .../fop/render/ps/extensions/PSSetupCodeElement.java | 4 +++- 6 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/java/org/apache/fop/render/ps/extensions/PSCommentAfterElement.java b/src/java/org/apache/fop/render/ps/extensions/PSCommentAfterElement.java index 2dbbf1f36..306cd7bda 100644 --- a/src/java/org/apache/fop/render/ps/extensions/PSCommentAfterElement.java +++ b/src/java/org/apache/fop/render/ps/extensions/PSCommentAfterElement.java @@ -27,6 +27,8 @@ import org.apache.fop.fo.extensions.ExtensionAttachment; */ public class PSCommentAfterElement extends AbstractPSCommentElement { + protected static final String ELEMENT = "ps-comment-after"; + /** * Main constructor * @param parent node @@ -40,7 +42,7 @@ public class PSCommentAfterElement extends AbstractPSCommentElement { * @see org.apache.fop.fo.FONode#getLocalName() */ public String getLocalName() { - return "ps-comment-after"; + return ELEMENT; } /** diff --git a/src/java/org/apache/fop/render/ps/extensions/PSCommentBeforeElement.java b/src/java/org/apache/fop/render/ps/extensions/PSCommentBeforeElement.java index 7abb67007..6058f355b 100644 --- a/src/java/org/apache/fop/render/ps/extensions/PSCommentBeforeElement.java +++ b/src/java/org/apache/fop/render/ps/extensions/PSCommentBeforeElement.java @@ -27,6 +27,8 @@ import org.apache.fop.fo.extensions.ExtensionAttachment; */ public class PSCommentBeforeElement extends AbstractPSCommentElement { + protected static final String ELEMENT = "ps-comment-before"; + /** * Main constructor * @param parent parent node @@ -40,7 +42,7 @@ public class PSCommentBeforeElement extends AbstractPSCommentElement { * @see org.apache.fop.fo.FONode#getLocalName() */ public String getLocalName() { - return "ps-comment-before"; + return ELEMENT; } /** diff --git a/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java b/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java index bfb402d29..45ace5f80 100644 --- a/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java +++ b/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java @@ -39,11 +39,11 @@ public class PSExtensionElementMapping extends ElementMapping { 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("ps-setpagedevice", new PSSetPageDeviceMaker()); - foObjs.put("ps-comment-before", new PSCommentBeforeMaker()); - foObjs.put("ps-comment-after", new PSCommentAfterMaker()); + foObjs.put(PSSetupCodeElement.ELEMENT, new PSSetupCodeMaker()); + foObjs.put(PSPageSetupCodeElement.ELEMENT, new PSPageSetupCodeMaker()); + foObjs.put(PSSetPageDeviceElement.ELEMENT, new PSSetPageDeviceMaker()); + foObjs.put(PSCommentBeforeElement.ELEMENT, new PSCommentBeforeMaker()); + foObjs.put(PSCommentAfterElement.ELEMENT, new PSCommentAfterMaker()); } } diff --git a/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java b/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java index 98163a0bb..ad46b9364 100644 --- a/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java +++ b/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java @@ -29,6 +29,8 @@ import org.apache.fop.fo.ValidationException; */ 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 @@ public class PSPageSetupCodeElement extends AbstractPSExtensionObject { /** {@inheritDoc} */ public String getLocalName() { - return "ps-page-setup-code"; + return ELEMENT; } } diff --git a/src/java/org/apache/fop/render/ps/extensions/PSSetPageDeviceElement.java b/src/java/org/apache/fop/render/ps/extensions/PSSetPageDeviceElement.java index da51e9531..ff7e8f792 100644 --- a/src/java/org/apache/fop/render/ps/extensions/PSSetPageDeviceElement.java +++ b/src/java/org/apache/fop/render/ps/extensions/PSSetPageDeviceElement.java @@ -33,6 +33,8 @@ import org.xml.sax.Locator; */ public class PSSetPageDeviceElement extends AbstractPSExtensionElement { + protected static final String ELEMENT = "ps-setpagedevice"; + /** * Main constructor * @param parent parent FO node @@ -79,7 +81,7 @@ public class PSSetPageDeviceElement extends AbstractPSExtensionElement { * @return local name * @see org.apache.fop.fo.FONode#getLocalName() */ public String getLocalName() { - return "ps-setpagedevice"; + return ELEMENT; } /** diff --git a/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java b/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java index a4f25323c..ec7216c44 100644 --- a/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java +++ b/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java @@ -29,6 +29,8 @@ import org.apache.fop.fo.ValidationException; */ public class PSSetupCodeElement extends AbstractPSExtensionObject { + protected static final String ELEMENT = "ps-setup-code"; + /** * Main constructor * @param parent parent FO node @@ -47,7 +49,7 @@ public class PSSetupCodeElement extends AbstractPSExtensionObject { /** {@inheritDoc} */ public String getLocalName() { - return "ps-setup-code"; + return ELEMENT; } } -- 2.39.5