You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2011/08/14 23:10:37 UTC
svn commit: r1157669 - in
/xml/commons/trunk/java/external/src/javax/xml/stream: XMLEventFactory.java
XMLInputFactory.java XMLOutputFactory.java
Author: mrglavas
Date: Sun Aug 14 21:10:37 2011
New Revision: 1157669
URL: http://svn.apache.org/viewvc?rev=1157669&view=rev
Log:
JIRA Issue #85: http://issues.apache.org/jira/browse/XMLCOMMONS-85. StAX 1.2 API updates. Add newFactory() and newFactory(String,ClassLoader) methods to XML*Factory classes. Deprecate newInstance(String,ClassLoader) methods in XML*Factory classes.
Modified:
xml/commons/trunk/java/external/src/javax/xml/stream/XMLEventFactory.java
xml/commons/trunk/java/external/src/javax/xml/stream/XMLInputFactory.java
xml/commons/trunk/java/external/src/javax/xml/stream/XMLOutputFactory.java
Modified: xml/commons/trunk/java/external/src/javax/xml/stream/XMLEventFactory.java
URL: http://svn.apache.org/viewvc/xml/commons/trunk/java/external/src/javax/xml/stream/XMLEventFactory.java?rev=1157669&r1=1157668&r2=1157669&view=diff
==============================================================================
--- xml/commons/trunk/java/external/src/javax/xml/stream/XMLEventFactory.java (original)
+++ xml/commons/trunk/java/external/src/javax/xml/stream/XMLEventFactory.java Sun Aug 14 21:10:37 2011
@@ -43,7 +43,7 @@ public abstract class XMLEventFactory {
protected XMLEventFactory() {}
- public static XMLEventFactory newInstance()
+ public static XMLEventFactory newFactory()
throws FactoryConfigurationError {
try {
return (XMLEventFactory) FactoryFinder.find(PROPERTY_NAME, DEFAULT_FACTORY);
@@ -53,7 +53,7 @@ public abstract class XMLEventFactory {
}
}
- public static XMLEventFactory newInstance(String factoryId,
+ public static XMLEventFactory newFactory(String factoryId,
ClassLoader classLoader) throws FactoryConfigurationError {
if (classLoader == null) {
classLoader = SecuritySupport.getContextClassLoader();
@@ -65,6 +65,18 @@ public abstract class XMLEventFactory {
throw new FactoryConfigurationError(e.getException(), e.getMessage());
}
}
+
+ public static XMLEventFactory newInstance() throws FactoryConfigurationError {
+ return newFactory();
+ }
+
+ /**
+ * @deprecated
+ */
+ public static XMLEventFactory newInstance(String factoryId, ClassLoader classLoader)
+ throws FactoryConfigurationError {
+ return newFactory(factoryId, classLoader);
+ }
public abstract void setLocation(Location location);
Modified: xml/commons/trunk/java/external/src/javax/xml/stream/XMLInputFactory.java
URL: http://svn.apache.org/viewvc/xml/commons/trunk/java/external/src/javax/xml/stream/XMLInputFactory.java?rev=1157669&r1=1157668&r2=1157669&view=diff
==============================================================================
--- xml/commons/trunk/java/external/src/javax/xml/stream/XMLInputFactory.java (original)
+++ xml/commons/trunk/java/external/src/javax/xml/stream/XMLInputFactory.java Sun Aug 14 21:10:37 2011
@@ -41,7 +41,7 @@ public abstract class XMLInputFactory {
protected XMLInputFactory() {}
- public static XMLInputFactory newInstance()
+ public static XMLInputFactory newFactory()
throws FactoryConfigurationError {
try {
return (XMLInputFactory) FactoryFinder.find(PROPERTY_NAME, DEFAULT_FACTORY);
@@ -51,7 +51,7 @@ public abstract class XMLInputFactory {
}
}
- public static XMLInputFactory newInstance(String factoryId,
+ public static XMLInputFactory newFactory(String factoryId,
ClassLoader classLoader) throws FactoryConfigurationError {
if (classLoader == null) {
classLoader = SecuritySupport.getContextClassLoader();
@@ -63,6 +63,18 @@ public abstract class XMLInputFactory {
throw new FactoryConfigurationError(e.getException(), e.getMessage());
}
}
+
+ public static XMLInputFactory newInstance() throws FactoryConfigurationError {
+ return newFactory();
+ }
+
+ /**
+ * @deprecated
+ */
+ public static XMLInputFactory newInstance(String factoryId, ClassLoader classLoader)
+ throws FactoryConfigurationError {
+ return newFactory(factoryId, classLoader);
+ }
public abstract XMLStreamReader createXMLStreamReader(Reader reader)
throws XMLStreamException;
Modified: xml/commons/trunk/java/external/src/javax/xml/stream/XMLOutputFactory.java
URL: http://svn.apache.org/viewvc/xml/commons/trunk/java/external/src/javax/xml/stream/XMLOutputFactory.java?rev=1157669&r1=1157668&r2=1157669&view=diff
==============================================================================
--- xml/commons/trunk/java/external/src/javax/xml/stream/XMLOutputFactory.java (original)
+++ xml/commons/trunk/java/external/src/javax/xml/stream/XMLOutputFactory.java Sun Aug 14 21:10:37 2011
@@ -31,7 +31,7 @@ public abstract class XMLOutputFactory {
protected XMLOutputFactory() {}
- public static XMLOutputFactory newInstance()
+ public static XMLOutputFactory newFactory()
throws FactoryConfigurationError {
try {
return (XMLOutputFactory) FactoryFinder.find(PROPERTY_NAME, DEFAULT_FACTORY);
@@ -41,19 +41,30 @@ public abstract class XMLOutputFactory {
}
}
- public static XMLInputFactory newInstance(String factoryId,
+ public static XMLOutputFactory newFactory(String factoryId,
ClassLoader classLoader) throws FactoryConfigurationError {
if (classLoader == null) {
classLoader = SecuritySupport.getContextClassLoader();
}
try {
- return (XMLInputFactory) FactoryFinder.find(factoryId,
- classLoader, "com.ctc.wstx.stax.WstxInputFactory");
+ return (XMLOutputFactory) FactoryFinder.find(factoryId, classLoader, DEFAULT_FACTORY);
}
catch (FactoryFinder.ConfigurationError e) {
throw new FactoryConfigurationError(e.getException(), e.getMessage());
}
}
+
+ public static XMLOutputFactory newInstance() throws FactoryConfigurationError {
+ return newFactory();
+ }
+
+ /**
+ * @deprecated
+ */
+ public static XMLInputFactory newInstance(String factoryId, ClassLoader classLoader)
+ throws FactoryConfigurationError {
+ return XMLInputFactory.newFactory(factoryId, classLoader);
+ }
public abstract XMLStreamWriter createXMLStreamWriter(Writer stream)
throws XMLStreamException;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org