You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2009/10/07 19:34:29 UTC
svn commit: r822810 -
/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFSerializer.java
Author: vhennebert
Date: Wed Oct 7 17:34:29 2009
New Revision: 822810
URL: http://svn.apache.org/viewvc?rev=822810&view=rev
Log:
Removed unnecessary languageStack field
Modified:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFSerializer.java
Modified: xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFSerializer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFSerializer.java?rev=822810&r1=822809&r2=822810&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFSerializer.java (original)
+++ xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/intermediate/IFSerializer.java Wed Oct 7 17:34:29 2009
@@ -29,7 +29,6 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Stack;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -215,7 +214,11 @@
if (id != null) {
atts.addAttribute(XML_NAMESPACE, "id", "xml:id", XMLUtil.CDATA, id);
}
- applyLanguage(atts);
+ Locale lang = getContext().getLanguage();
+ if (lang != null) {
+ atts.addAttribute(XML_NAMESPACE, "lang", "xml:lang", XMLUtil.CDATA,
+ XMLUtil.toRFC3066(lang));
+ }
addForeignAttributes(atts);
handler.startElement(EL_PAGE_SEQUENCE, atts);
if (this.getUserAgent().isAccessibilityEnabled()) {
@@ -237,7 +240,6 @@
public void endPageSequence() throws IFException {
try {
handler.endElement(EL_PAGE_SEQUENCE);
- popLanguage();
} catch (SAXException e) {
throw new IFException("SAX error in endPageSequence()", e);
}
@@ -772,25 +774,4 @@
}
}
- private Stack languageStack = new Stack();
-
- private void applyLanguage(AttributesImpl atts) {
- Locale lang = getContext().getLanguage();
- if (lang != null) {
- if (languageStack.isEmpty() || !languageStack.peek().equals(lang)) {
- atts.addAttribute(XML_NAMESPACE, "lang", "xml:lang", XMLUtil.CDATA,
- XMLUtil.toRFC3066(lang));
- }
- languageStack.push(lang);
- } else {
- assert languageStack.isEmpty();
- }
- }
-
- private void popLanguage() {
- if (!languageStack.isEmpty()) {
- languageStack.pop();
- }
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org