svn commit: r1778105 - in /xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop: render/afp/extensions/ render/intermediate/ render/intermediate/extensions/ render/pdf/extensions/ render/ps/extensions/ tools/fontlist/
[email protected] Tue, 10 Jan 2017 10:33:41 -0000
Newsgroups
gmane.text.xml.fop.cvs
Message-ID
<[email protected] >
Author: ssteiner
Date: Tue Jan 10 10:33:41 2017
New Revision: 1778105
URL: http://svn.apache.org/viewvc?rev=1778105&view=rev
Log:
FOP-2362: Using Saxon to intermediate format throws NullPointerException
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPIncludeFormMap.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMap.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPPageSegmentElement.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFSerializer.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/URIAction.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFDictionaryAttachment.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachment.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/extensions/PSSetPageDevice.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/extensions/PSSetupCode.java
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/fontlist/FontListSerializer.java
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPIncludeFormMap.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPIncludeFormMap.java?rev=1778105&r1=1778104&r2=1778105&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPIncludeFormMap.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPIncludeFormMap.java Tue Jan 10 10:33:41 2017
@@ -68,10 +68,10 @@ public class AFPIncludeFormMap extends A
public void toSAX(ContentHandler handler) throws SAXException {
AttributesImpl atts = new AttributesImpl();
if (name != null && name.length() > 0) {
- atts.addAttribute(null, ATT_NAME, ATT_NAME, "CDATA", name);
+ atts.addAttribute("", ATT_NAME, ATT_NAME, "CDATA", name);
}
if (this.src != null) {
- atts.addAttribute(null, ATT_SRC, ATT_SRC, "CDATA", this.src.toASCIIString());
+ atts.addAttribute("", ATT_SRC, ATT_SRC, "CDATA", this.src.toASCIIString());
}
handler.startElement(CATEGORY, elementName, elementName, atts);
handler.endElement(CATEGORY, elementName, elementName);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMap.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMap.java?rev=1778105&r1=1778104&r2=1778105&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMap.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPInvokeMediumMap.java Tue Jan 10 10:33:41 2017
@@ -41,7 +41,7 @@ public class AFPInvokeMediumMap extends
public void toSAX(ContentHandler handler) throws SAXException {
AttributesImpl atts = new AttributesImpl();
if (name != null && name.length() > 0) {
- atts.addAttribute(null, ATT_NAME, ATT_NAME, "CDATA", name);
+ atts.addAttribute("", ATT_NAME, ATT_NAME, "CDATA", name);
}
handler.startElement(CATEGORY, elementName, elementName, atts);
handler.endElement(CATEGORY, elementName, elementName);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java?rev=1778105&r1=1778104&r2=1778105&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPPageOverlay.java Tue Jan 10 10:33:41 2017
@@ -89,7 +89,7 @@ public class AFPPageOverlay extends AFPE
public void toSAX(ContentHandler handler) throws SAXException {
AttributesImpl atts = new AttributesImpl();
if (name != null && name.length() > 0) {
- atts.addAttribute(null, ATT_NAME, ATT_NAME, "CDATA", name);
+ atts.addAttribute("", ATT_NAME, ATT_NAME, "CDATA", name);
}
handler.startElement(CATEGORY, elementName, elementName, atts);
handler.endElement(CATEGORY, elementName, elementName);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPPageSegmentElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPPageSegmentElement.java?rev=1778105&r1=1778104&r2=1778105&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPPageSegmentElement.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPPageSegmentElement.java Tue Jan 10 10:33:41 2017
@@ -117,14 +117,14 @@ public class AFPPageSegmentElement exten
public void toSAX(ContentHandler handler) throws SAXException {
AttributesImpl atts = new AttributesImpl();
if (name != null && name.length() > 0) {
- atts.addAttribute(null, ATT_NAME, ATT_NAME, "CDATA", name);
+ atts.addAttribute("", ATT_NAME, ATT_NAME, "CDATA", name);
}
if (value != null && value.length() > 0) {
- atts.addAttribute(null, ATT_VALUE, ATT_VALUE, "CDATA", value);
+ atts.addAttribute("", ATT_VALUE, ATT_VALUE, "CDATA", value);
}
if (resourceSrc != null && resourceSrc.length() > 0) {
- atts.addAttribute(null, ATT_RESOURCE_SRC, ATT_RESOURCE_SRC, "CDATA", resourceSrc);
+ atts.addAttribute("", ATT_RESOURCE_SRC, ATT_RESOURCE_SRC, "CDATA", resourceSrc);
}
handler.startElement(CATEGORY, elementName, elementName, atts);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java?rev=1778105&r1=1778104&r2=1778105&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java Tue Jan 10 10:33:41 2017
@@ -138,16 +138,16 @@ public class AFPPageSetup extends AFPExt
public void toSAX(ContentHandler handler) throws SAXException {
AttributesImpl atts = new AttributesImpl();
if (name != null && name.length() > 0) {
- atts.addAttribute(null, ATT_NAME, ATT_NAME, "CDATA", name);
+ atts.addAttribute("", ATT_NAME, ATT_NAME, "CDATA", name);
}
if (value != null && value.length() > 0) {
- atts.addAttribute(null, ATT_VALUE, ATT_VALUE, "CDATA", value);
+ atts.addAttribute("", ATT_VALUE, ATT_VALUE, "CDATA", value);
}
if (this.placement != ExtensionPlacement.DEFAULT) {
- atts.addAttribute(null, ATT_PLACEMENT, ATT_PLACEMENT, "CDATA", placement.getXMLValue());
+ atts.addAttribute("", ATT_PLACEMENT, ATT_PLACEMENT, "CDATA", placement.getXMLValue());
}
if (encoding != TagLogicalElement.State.ENCODING_NONE) {
- atts.addAttribute(null, ATT_ENCODING, ATT_ENCODING, "CDATA", String.valueOf(encoding));
+ atts.addAttribute("", ATT_ENCODING, ATT_ENCODING, "CDATA", String.valueOf(encoding));
}
handler.startElement(CATEGORY, elementName, elementName, atts);
if (content != null && content.length() > 0) {
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFSerializer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFSerializer.java?rev=1778105&r1=1778104&r2=1778105&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFSerializer.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/IFSerializer.java Tue Jan 10 10:33:41 2017
@@ -841,7 +841,7 @@ implements IFConstants, IFPainter, IFDoc
noteAction(destination.getAction());
AttributesImpl atts = new AttributesImpl();
- atts.addAttribute(null, "name", "name", XMLConstants.CDATA, destination.getName());
+ atts.addAttribute("", "name", "name", XMLConstants.CDATA, destination.getName());
try {
handler.startElement(DocumentNavigationExtensionConstants.NAMED_DESTINATION, atts);
serializeXMLizable(destination.getAction());
@@ -872,8 +872,8 @@ implements IFConstants, IFPainter, IFDoc
noteAction(bookmark.getAction());
AttributesImpl atts = new AttributesImpl();
- atts.addAttribute(null, "title", "title", XMLUtil.CDATA, bookmark.getTitle());
- atts.addAttribute(null, "starting-state", "starting-state",
+ atts.addAttribute("", "title", "title", XMLUtil.CDATA, bookmark.getTitle());
+ atts.addAttribute("", "starting-state", "starting-state",
XMLUtil.CDATA, bookmark.isShown() ? "show" : "hide");
handler.startElement(DocumentNavigationExtensionConstants.BOOKMARK, atts);
serializeXMLizable(bookmark.getAction());
@@ -891,7 +891,7 @@ implements IFConstants, IFPainter, IFDoc
noteAction(link.getAction());
AttributesImpl atts = new AttributesImpl();
- atts.addAttribute(null, "rect", "rect",
+ atts.addAttribute("", "rect", "rect",
XMLConstants.CDATA, IFUtil.toString(link.getTargetRect()));
if (getUserAgent().isAccessibilityEnabled()) {
addStructRefAttribute(atts,
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java?rev=1778105&r1=1778104&r2=1778105&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/GoToXYAction.java Tue Jan 10 10:33:41 2017
@@ -144,15 +144,15 @@ public class GoToXYAction extends Abstra
AttributesImpl atts = new AttributesImpl();
if (this.isCompleteExceptTargetLocation()) {
final Point reportedTargetLocation = this.getTargetLocation();
- atts.addAttribute(null, "id", "id", XMLUtil.CDATA, getID());
- atts.addAttribute(null, "page-index", "page-index",
+ atts.addAttribute("", "id", "id", XMLUtil.CDATA, getID());
+ atts.addAttribute("", "page-index", "page-index",
XMLUtil.CDATA, Integer.toString(pageIndex));
- atts.addAttribute(null, "x", "x", XMLUtil.CDATA,
+ atts.addAttribute("", "x", "x", XMLUtil.CDATA,
Integer.toString(reportedTargetLocation.x));
- atts.addAttribute(null, "y", "y", XMLUtil.CDATA,
+ atts.addAttribute("", "y", "y", XMLUtil.CDATA,
Integer.toString(reportedTargetLocation.y));
} else {
- atts.addAttribute(null, "idref", "idref", XMLUtil.CDATA, getID());
+ atts.addAttribute("", "idref", "idref", XMLUtil.CDATA, getID());
}
handler.startElement(GOTO_XY.getNamespaceURI(),
GOTO_XY.getLocalName(), GOTO_XY.getQName(), atts);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/URIAction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/URIAction.java?rev=1778105&r1=1778104&r2=1778105&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/URIAction.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/intermediate/extensions/URIAction.java Tue Jan 10 10:33:41 2017
@@ -90,11 +90,11 @@ public class URIAction extends AbstractA
public void toSAX(ContentHandler handler) throws SAXException {
AttributesImpl atts = new AttributesImpl();
if (hasID()) {
- atts.addAttribute(null, "id", "id", XMLUtil.CDATA, getID());
+ atts.addAttribute("", "id", "id", XMLUtil.CDATA, getID());
}
- atts.addAttribute(null, "uri", "uri", XMLUtil.CDATA, getURI());
+ atts.addAttribute("", "uri", "uri", XMLUtil.CDATA, getURI());
if (isNewWindow()) {
- atts.addAttribute(null, "show-destination", "show-destination", XMLUtil.CDATA, "new");
+ atts.addAttribute("", "show-destination", "show-destination", XMLUtil.CDATA, "new");
}
handler.startElement(GOTO_URI.getNamespaceURI(),
GOTO_URI.getLocalName(), GOTO_URI.getQName(), atts);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFDictionaryAttachment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFDictionaryAttachment.java?rev=1778105&r1=1778104&r2=1778105&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFDictionaryAttachment.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFDictionaryAttachment.java Tue Jan 10 10:33:41 2017
@@ -113,26 +113,26 @@ public class PDFDictionaryAttachment ext
String idName = PDFDictionaryElement.ATT_ID;
String id = dictionary.getProperty(PDFDictionaryExtension.PROPERTY_ID);
if (id != null) {
- attributes.addAttribute(null, idName, idName, "ID", id);
+ attributes.addAttribute("", idName, idName, "ID", id);
}
}
if (type == PDFDictionaryType.Action) {
String actionTypeName = PDFActionElement.ATT_TYPE;
String actionType = dictionary.getProperty(PDFActionExtension.PROPERTY_TYPE);
if (actionType != null) {
- attributes.addAttribute(null, actionTypeName, actionTypeName, "CDATA", actionType);
+ attributes.addAttribute("", actionTypeName, actionTypeName, "CDATA", actionType);
}
} else if (type == PDFDictionaryType.Page) {
String pageNumbersName = PDFPageExtension.PROPERTY_PAGE_NUMBERS;
String pageNumbers = dictionary.getProperty(pageNumbersName);
if (pageNumbers != null) {
- attributes.addAttribute(null, pageNumbersName, pageNumbersName, "CDATA", pageNumbers);
+ attributes.addAttribute("", pageNumbersName, pageNumbersName, "CDATA", pageNumbers);
}
} else if (type == PDFDictionaryType.Dictionary) {
String keyName = PDFCollectionEntryElement.ATT_KEY;
String key = dictionary.getKey();
if (key != null) {
- attributes.addAttribute(null, keyName, keyName, "CDATA", key);
+ attributes.addAttribute("", keyName, keyName, "CDATA", key);
}
}
return attributes;
@@ -142,7 +142,7 @@ public class PDFDictionaryAttachment ext
String keyName = PDFCollectionEntryExtension.PROPERTY_KEY;
String key = array.getKey();
if (key != null) {
- attributes.addAttribute(null, keyName, keyName, "CDATA", key);
+ attributes.addAttribute("", keyName, keyName, "CDATA", key);
}
return attributes;
}
@@ -151,13 +151,13 @@ public class PDFDictionaryAttachment ext
String keyName = PDFCollectionEntryElement.ATT_KEY;
String key = entry.getKey();
if (key != null) {
- attributes.addAttribute(null, keyName, keyName, "CDATA", key);
+ attributes.addAttribute("", keyName, keyName, "CDATA", key);
}
if (entry instanceof PDFReferenceExtension) {
String refid = ((PDFReferenceExtension) entry).getReferenceId();
if (refid != null) {
String refidName = PDFReferenceElement.ATT_REFID;
- attributes.addAttribute(null, refidName, refidName, "IDREF", refid);
+ attributes.addAttribute("", refidName, refidName, "IDREF", refid);
}
}
return attributes;
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachment.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachment.java?rev=1778105&r1=1778104&r2=1778105&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachment.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/pdf/extensions/PDFEmbeddedFileAttachment.java Tue Jan 10 10:33:41 2017
@@ -140,13 +140,13 @@ public class PDFEmbeddedFileAttachment e
public void toSAX(ContentHandler handler) throws SAXException {
AttributesImpl atts = new AttributesImpl();
if (filename != null && filename.length() > 0) {
- atts.addAttribute(null, ATT_NAME, ATT_NAME, "CDATA", filename);
+ atts.addAttribute("", ATT_NAME, ATT_NAME, "CDATA", filename);
}
if (src != null && src.length() > 0) {
- atts.addAttribute(null, ATT_SRC, ATT_SRC, "CDATA", src);
+ atts.addAttribute("", ATT_SRC, ATT_SRC, "CDATA", src);
}
if (desc != null && desc.length() > 0) {
- atts.addAttribute(null, ATT_DESC, ATT_DESC, "CDATA", desc);
+ atts.addAttribute("", ATT_DESC, ATT_DESC, "CDATA", desc);
}
String element = getElement();
handler.startElement(CATEGORY, element, element, atts);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/extensions/PSSetPageDevice.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/extensions/PSSetPageDevice.java?rev=1778105&r1=1778104&r2=1778105&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/extensions/PSSetPageDevice.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/extensions/PSSetPageDevice.java Tue Jan 10 10:33:41 2017
@@ -101,7 +101,7 @@ public class PSSetPageDevice extends PSE
public void toSAX(ContentHandler handler) throws SAXException {
AttributesImpl atts = new AttributesImpl();
if (name != null && name.length() > 0) {
- atts.addAttribute(null, ATT_NAME, ATT_NAME, "CDATA", name);
+ atts.addAttribute("", ATT_NAME, ATT_NAME, "CDATA", name);
}
String element = getElement();
handler.startElement(CATEGORY, element, element, atts);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/extensions/PSSetupCode.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/extensions/PSSetupCode.java?rev=1778105&r1=1778104&r2=1778105&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/extensions/PSSetupCode.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/render/ps/extensions/PSSetupCode.java Tue Jan 10 10:33:41 2017
@@ -90,7 +90,7 @@ public class PSSetupCode extends PSExten
public void toSAX(ContentHandler handler) throws SAXException {
AttributesImpl atts = new AttributesImpl();
if (name != null && name.length() > 0) {
- atts.addAttribute(null, ATT_NAME, ATT_NAME, "CDATA", name);
+ atts.addAttribute("", ATT_NAME, ATT_NAME, "CDATA", name);
}
String element = getElement();
handler.startElement(CATEGORY, element, element, atts);
Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/fontlist/FontListSerializer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/fontlist/FontListSerializer.java?rev=1778105&r1=1778104&r2=1778105&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/fontlist/FontListSerializer.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/tools/fontlist/FontListSerializer.java Tue Jan 10 10:33:41 2017
@@ -83,8 +83,8 @@ public class FontListSerializer {
continue;
}
atts.clear();
- atts.addAttribute(null, NAME, NAME, CDATA, familyName);
- atts.addAttribute(null, STRIPPED_NAME, STRIPPED_NAME, CDATA,
+ atts.addAttribute("", NAME, NAME, CDATA, familyName);
+ atts.addAttribute("", STRIPPED_NAME, STRIPPED_NAME, CDATA,
stripQuotes(familyName));
handler.startElement(FAMILY, atts);
@@ -109,8 +109,8 @@ public class FontListSerializer {
for (Object container : containers) {
FontSpec cont = (FontSpec) container;
atts.clear();
- atts.addAttribute(null, KEY, KEY, CDATA, cont.getKey());
- atts.addAttribute(null, TYPE, TYPE, CDATA,
+ atts.addAttribute("", KEY, KEY, CDATA, cont.getKey());
+ atts.addAttribute("", TYPE, TYPE, CDATA,
cont.getFontMetrics().getFontType().getName());
handler.startElement(FONT, atts);
generateXMLForTriplets(handler, cont.getTriplets());
@@ -126,9 +126,9 @@ public class FontListSerializer {
for (Object triplet1 : triplets) {
FontTriplet triplet = (FontTriplet) triplet1;
atts.clear();
- atts.addAttribute(null, NAME, NAME, CDATA, triplet.getName());
- atts.addAttribute(null, STYLE, STYLE, CDATA, triplet.getStyle());
- atts.addAttribute(null, WEIGHT, WEIGHT, CDATA,
+ atts.addAttribute("", NAME, NAME, CDATA, triplet.getName());
+ atts.addAttribute("", STYLE, STYLE, CDATA, triplet.getStyle());
+ atts.addAttribute("", WEIGHT, WEIGHT, CDATA,
Integer.toString(triplet.getWeight()));
handler.element(TRIPLET, atts);
}