From fcabb741e1c100cc2f461f2ebd731f824120c563 Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Sun, 13 Jul 2008 12:11:17 +0000 Subject: [PATCH] null is not correct here, an empty String needs to be used for the default namespace. Saxon 9 fails with a NullPointerException otherwise. Xalan is more tolerant. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@676307 13f79535-47bb-0310-9956-ffa450edef68 --- .../fop/events/model/EventMethodModel.java | 58 +++++++++---------- .../apache/fop/events/model/EventModel.java | 4 +- .../fop/events/model/EventProducerModel.java | 24 ++++---- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/java/org/apache/fop/events/model/EventMethodModel.java b/src/java/org/apache/fop/events/model/EventMethodModel.java index 930cda53d..b9c62f8ab 100644 --- a/src/java/org/apache/fop/events/model/EventMethodModel.java +++ b/src/java/org/apache/fop/events/model/EventMethodModel.java @@ -37,12 +37,12 @@ import org.apache.xmlgraphics.util.XMLizable; public class EventMethodModel implements Serializable, XMLizable { private static final long serialVersionUID = -7548882973341444354L; - + private String methodName; private EventSeverity severity; private List params = new java.util.ArrayList(); private String exceptionClass; - + /** * Creates an new instance. * @param methodName the event method's name @@ -52,7 +52,7 @@ public class EventMethodModel implements Serializable, XMLizable { this.methodName = methodName; this.severity = severity; } - + /** * Adds a method parameter. * @param param the method parameter @@ -60,7 +60,7 @@ public class EventMethodModel implements Serializable, XMLizable { public void addParameter(Parameter param) { this.params.add(param); } - + /** * Adds a method parameter. * @param type the type of the parameter @@ -68,11 +68,11 @@ public class EventMethodModel implements Serializable, XMLizable { * @return the resulting Parameter instance */ public Parameter addParameter(Class type, String name) { - Parameter param = new Parameter(type, name); + Parameter param = new Parameter(type, name); addParameter(param); return param; } - + /** * Sets the event method name. * @param name the event name @@ -80,7 +80,7 @@ public class EventMethodModel implements Serializable, XMLizable { public void setMethodName(String name) { this.methodName = name; } - + /** * Returns the event method name * @return the event name @@ -88,7 +88,7 @@ public class EventMethodModel implements Serializable, XMLizable { public String getMethodName() { return this.methodName; } - + /** * Sets the event's severity level. * @param severity the severity @@ -96,7 +96,7 @@ public class EventMethodModel implements Serializable, XMLizable { public void setSeverity(EventSeverity severity) { this.severity = severity; } - + /** * Returns the event's severity level. * @return the severity @@ -104,7 +104,7 @@ public class EventMethodModel implements Serializable, XMLizable { public EventSeverity getSeverity() { return this.severity; } - + /** * Returns an unmodifiable list of parameters for this event method. * @return the list of parameters @@ -112,7 +112,7 @@ public class EventMethodModel implements Serializable, XMLizable { public List getParameters() { return Collections.unmodifiableList(this.params); } - + /** * Sets the primary exception class for this event method. Note: Not all event methods throw * exceptions! @@ -121,7 +121,7 @@ public class EventMethodModel implements Serializable, XMLizable { public void setExceptionClass(String exceptionClass) { this.exceptionClass = exceptionClass; } - + /** * Returns the primary exception class for this event method. This method returns null if * the event is only informational or just a warning. @@ -130,34 +130,34 @@ public class EventMethodModel implements Serializable, XMLizable { public String getExceptionClass() { return this.exceptionClass; } - + /** {@inheritDoc} */ public void toSAX(ContentHandler handler) throws SAXException { AttributesImpl atts = new AttributesImpl(); - atts.addAttribute(null, "name", "name", "CDATA", getMethodName()); - atts.addAttribute(null, "severity", "severity", "CDATA", getSeverity().getName()); + atts.addAttribute("", "name", "name", "CDATA", getMethodName()); + atts.addAttribute("", "severity", "severity", "CDATA", getSeverity().getName()); if (getExceptionClass() != null) { - atts.addAttribute(null, "exception", "exception", "CDATA", getExceptionClass()); + atts.addAttribute("", "exception", "exception", "CDATA", getExceptionClass()); } String elName = "method"; - handler.startElement(null, elName, elName, atts); + handler.startElement("", elName, elName, atts); Iterator iter = this.params.iterator(); while (iter.hasNext()) { ((XMLizable)iter.next()).toSAX(handler); } - handler.endElement(null, elName, elName); + handler.endElement("", elName, elName); } - + /** * Represents an event parameter. */ public static class Parameter implements Serializable, XMLizable { - + private static final long serialVersionUID = 6062500277953887099L; - + private Class type; private String name; - + /** * Creates a new event parameter. * @param type the parameter type @@ -167,7 +167,7 @@ public class EventMethodModel implements Serializable, XMLizable { this.type = type; this.name = name; } - + /** * Returns the parameter type. * @return the parameter type @@ -175,7 +175,7 @@ public class EventMethodModel implements Serializable, XMLizable { public Class getType() { return this.type; } - + /** * Returns the parameter name. * @return the parameter name @@ -187,12 +187,12 @@ public class EventMethodModel implements Serializable, XMLizable { /** {@inheritDoc} */ public void toSAX(ContentHandler handler) throws SAXException { AttributesImpl atts = new AttributesImpl(); - atts.addAttribute(null, "type", "type", "CDATA", getType().getName()); - atts.addAttribute(null, "name", "name", "CDATA", getName()); + atts.addAttribute("", "type", "type", "CDATA", getType().getName()); + atts.addAttribute("", "name", "name", "CDATA", getName()); String elName = "parameter"; - handler.startElement(null, elName, elName, atts); - handler.endElement(null, elName, elName); + handler.startElement("", elName, elName, atts); + handler.endElement("", elName, elName); } - + } } diff --git a/src/java/org/apache/fop/events/model/EventModel.java b/src/java/org/apache/fop/events/model/EventModel.java index 54c58bd4b..a10237ad5 100644 --- a/src/java/org/apache/fop/events/model/EventModel.java +++ b/src/java/org/apache/fop/events/model/EventModel.java @@ -93,12 +93,12 @@ public class EventModel implements Serializable, XMLizable { public void toSAX(ContentHandler handler) throws SAXException { AttributesImpl atts = new AttributesImpl(); String elName = "event-model"; - handler.startElement(null, elName, elName, atts); + handler.startElement("", elName, elName, atts); Iterator iter = getProducers(); while (iter.hasNext()) { ((XMLizable)iter.next()).toSAX(handler); } - handler.endElement(null, elName, elName); + handler.endElement("", elName, elName); } private void writeXMLizable(XMLizable object, File outputFile) throws IOException { diff --git a/src/java/org/apache/fop/events/model/EventProducerModel.java b/src/java/org/apache/fop/events/model/EventProducerModel.java index 938609cd9..b0d334e99 100644 --- a/src/java/org/apache/fop/events/model/EventProducerModel.java +++ b/src/java/org/apache/fop/events/model/EventProducerModel.java @@ -35,18 +35,18 @@ import org.apache.xmlgraphics.util.XMLizable; public class EventProducerModel implements Serializable, XMLizable { private static final long serialVersionUID = 122267104123721902L; - + private String interfaceName; private Map methods = new java.util.LinkedHashMap(); - + /** * Creates a new instance. - * @param interfaceName the fully qualified interface name of the event producer + * @param interfaceName the fully qualified interface name of the event producer */ public EventProducerModel(String interfaceName) { this.interfaceName = interfaceName; } - + /** * Returns the fully qualified interface name of the event producer. * @return the fully qualified interface name @@ -54,7 +54,7 @@ public class EventProducerModel implements Serializable, XMLizable { public String getInterfaceName() { return this.interfaceName; } - + /** * Sets the fully qualified interface name of the event producer. * @param name the fully qualified interface name @@ -62,7 +62,7 @@ public class EventProducerModel implements Serializable, XMLizable { public void setInterfaceName(String name) { this.interfaceName = name; } - + /** * Adds a model instance of an event method. * @param method the event method model @@ -70,7 +70,7 @@ public class EventProducerModel implements Serializable, XMLizable { public void addMethod(EventMethodModel method) { this.methods.put(method.getMethodName(), method); } - + /** * Returns the model instance of an event method for the given method name. * @param methodName the method name @@ -79,7 +79,7 @@ public class EventProducerModel implements Serializable, XMLizable { public EventMethodModel getMethod(String methodName) { return (EventMethodModel)this.methods.get(methodName); } - + /** * Returns an iterator over the contained event producer methods. * @return an iterator (Iterator<EventMethodModel>) @@ -91,15 +91,15 @@ public class EventProducerModel implements Serializable, XMLizable { /** {@inheritDoc} */ public void toSAX(ContentHandler handler) throws SAXException { AttributesImpl atts = new AttributesImpl(); - atts.addAttribute(null, "name", "name", "CDATA", getInterfaceName()); + atts.addAttribute("", "name", "name", "CDATA", getInterfaceName()); String elName = "producer"; - handler.startElement(null, elName, elName, atts); + handler.startElement("", elName, elName, atts); Iterator iter = getMethods(); while (iter.hasNext()) { ((XMLizable)iter.next()).toSAX(handler); } - handler.endElement(null, elName, elName); + handler.endElement("", elName, elName); } - + } -- 2.39.5