[jboss-svn-commits] JBoss Common SVN: r2862 - in jbossxb/trunk/src/main/java/org/jboss/xb/binding: parser and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jun 11 05:25:40 EDT 2008
Author: alex.loubyansky at jboss.com
Date: 2008-06-11 05:25:40 -0400 (Wed, 11 Jun 2008)
New Revision: 2862
Modified:
jbossxb/trunk/src/main/java/org/jboss/xb/binding/Unmarshaller.java
jbossxb/trunk/src/main/java/org/jboss/xb/binding/UnmarshallerImpl.java
jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/JBossXBParser.java
jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/sax/SaxJBossXBParser.java
Log:
JBXB-144 use InputSource instead
Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/Unmarshaller.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/Unmarshaller.java 2008-06-10 21:47:59 UTC (rev 2861)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/Unmarshaller.java 2008-06-11 09:25:40 UTC (rev 2862)
@@ -30,6 +30,7 @@
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
/**
* @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
@@ -67,29 +68,23 @@
Object unmarshal(Reader xmlReader, SchemaBinding schemaBinding) throws JBossXBException;
- Object unmarshal(Reader xmlReader, String systemId, SchemaBinding schemaBinding) throws JBossXBException;
-
Object unmarshal(InputStream xmlStream, SchemaBinding schemaBinding) throws JBossXBException;
- Object unmarshal(InputStream xmlStream, String systemId, SchemaBinding schemaBinding) throws JBossXBException;
+ Object unmarshal(InputSource source, SchemaBinding schemaBinding) throws JBossXBException;
Object unmarshal(String xml, SchemaBindingResolver schemaResolver) throws JBossXBException;
Object unmarshal(Reader xmlReader, SchemaBindingResolver schemaResolver) throws JBossXBException;
- Object unmarshal(Reader xmlReader, String systemId, SchemaBindingResolver schemaResolver) throws JBossXBException;
-
Object unmarshal(InputStream xmlStream, SchemaBindingResolver schemaResolver) throws JBossXBException;
- Object unmarshal(InputStream xmlStream, String systemId, SchemaBindingResolver schemaResolver) throws JBossXBException;
+ Object unmarshal(InputSource source, SchemaBindingResolver schemaResolver) throws JBossXBException;
Object unmarshal(Reader reader, ObjectModelFactory factory, Object root) throws JBossXBException;
- Object unmarshal(Reader reader, String systemId, ObjectModelFactory factory, Object root) throws JBossXBException;
-
Object unmarshal(InputStream is, ObjectModelFactory factory, Object root) throws JBossXBException;
- Object unmarshal(InputStream is, String systemId, ObjectModelFactory factory, Object root) throws JBossXBException;
+ Object unmarshal(InputSource source, ObjectModelFactory factory, Object root) throws JBossXBException;
Object unmarshal(String systemId, ObjectModelFactory factory, Object root) throws JBossXBException;
Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/UnmarshallerImpl.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/UnmarshallerImpl.java 2008-06-10 21:47:59 UTC (rev 2861)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/UnmarshallerImpl.java 2008-06-11 09:25:40 UTC (rev 2862)
@@ -32,6 +32,7 @@
import org.jboss.xb.binding.sunday.unmarshalling.SundayContentHandler;
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
/**
* Unmarshaller implementation.
@@ -126,13 +127,6 @@
return cHandler.getRoot();
}
- public Object unmarshal(Reader xmlReader, String systemId, SchemaBinding schemaBinding) throws JBossXBException
- {
- JBossXBParser.ContentHandler cHandler = new SundayContentHandler(schemaBinding);
- parser.parse(xmlReader, systemId, cHandler);
- return cHandler.getRoot();
- }
-
public Object unmarshal(InputStream xmlStream, SchemaBinding schemaBinding) throws JBossXBException
{
JBossXBParser.ContentHandler cHandler = new SundayContentHandler(schemaBinding);
@@ -140,10 +134,10 @@
return cHandler.getRoot();
}
- public Object unmarshal(InputStream xmlStream, String systemId, SchemaBinding schemaBinding) throws JBossXBException
+ public Object unmarshal(InputSource source, SchemaBinding schemaBinding) throws JBossXBException
{
JBossXBParser.ContentHandler cHandler = new SundayContentHandler(schemaBinding);
- parser.parse(xmlStream, systemId, cHandler);
+ parser.parse(source, cHandler);
return cHandler.getRoot();
}
@@ -161,13 +155,6 @@
return cHandler.getRoot();
}
- public Object unmarshal(Reader xmlReader, String systemId, SchemaBindingResolver schemaResolver) throws JBossXBException
- {
- JBossXBParser.ContentHandler cHandler = new SundayContentHandler(schemaResolver);
- parser.parse(xmlReader, systemId, cHandler);
- return cHandler.getRoot();
- }
-
public Object unmarshal(InputStream xmlStream, SchemaBindingResolver schemaResolver) throws JBossXBException
{
JBossXBParser.ContentHandler cHandler = new SundayContentHandler(schemaResolver);
@@ -175,10 +162,10 @@
return cHandler.getRoot();
}
- public Object unmarshal(InputStream xmlStream, String systemId, SchemaBindingResolver schemaResolver) throws JBossXBException
+ public Object unmarshal(InputSource source, SchemaBindingResolver schemaResolver) throws JBossXBException
{
JBossXBParser.ContentHandler cHandler = new SundayContentHandler(schemaResolver);
- parser.parse(xmlStream, systemId, cHandler);
+ parser.parse(source, cHandler);
return cHandler.getRoot();
}
@@ -193,17 +180,6 @@
return builder.getRoot();
}
- public Object unmarshal(Reader reader, String systemId, ObjectModelFactory factory, Object root) throws JBossXBException
- {
- if(builder == null)
- {
- builder = new ObjectModelBuilder();
- }
- builder.init(factory, root);
- parser.parse(reader, systemId, builder);
- return builder.getRoot();
- }
-
public Object unmarshal(InputStream is, ObjectModelFactory factory, Object root) throws JBossXBException
{
if(builder == null)
@@ -215,25 +191,25 @@
return builder.getRoot();
}
- public Object unmarshal(InputStream is, String systemId, ObjectModelFactory factory, Object root) throws JBossXBException
+ public Object unmarshal(String systemId, ObjectModelFactory factory, Object root) throws JBossXBException
{
if(builder == null)
{
builder = new ObjectModelBuilder();
}
builder.init(factory, root);
- parser.parse(is, systemId, builder);
+ parser.parse(systemId, builder);
return builder.getRoot();
}
- public Object unmarshal(String systemId, ObjectModelFactory factory, Object root) throws JBossXBException
+ public Object unmarshal(InputSource is, ObjectModelFactory factory, Object root) throws JBossXBException
{
if(builder == null)
{
builder = new ObjectModelBuilder();
}
builder.init(factory, root);
- parser.parse(systemId, builder);
+ parser.parse(is, builder);
return builder.getRoot();
}
Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/JBossXBParser.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/JBossXBParser.java 2008-06-10 21:47:59 UTC (rev 2861)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/JBossXBParser.java 2008-06-11 09:25:40 UTC (rev 2862)
@@ -28,6 +28,7 @@
import org.jboss.xb.binding.JBossXBException;
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
/**
* @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
@@ -70,9 +71,7 @@
void parse(InputStream is, ContentHandler handler) throws JBossXBException;
- void parse(InputStream is, String systemId, ContentHandler handler) throws JBossXBException;
-
void parse(Reader reader, ContentHandler handler) throws JBossXBException;
- void parse(Reader reader, String systemId, ContentHandler handler) throws JBossXBException;
+ void parse(InputSource source, ContentHandler handler) throws JBossXBException;
}
Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/sax/SaxJBossXBParser.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/sax/SaxJBossXBParser.java 2008-06-10 21:47:59 UTC (rev 2861)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/sax/SaxJBossXBParser.java 2008-06-11 09:25:40 UTC (rev 2862)
@@ -180,34 +180,15 @@
public void parse(InputStream is, ContentHandler handler) throws JBossXBException
{
- parse(is, null, handler);
+ parse(new InputSource(is), handler);
}
- public void parse(InputStream is, String systemId, ContentHandler handler) throws JBossXBException
- {
- this.contentHandler = handler;
- trace = log.isTraceEnabled();
-
- logParserInfo();
- try
- {
- InputSource source = new InputSource(is);
- if (systemId != null)
- source.setSystemId(systemId);
- reader.parse(source);
- }
- catch(Throwable e)
- {
- throw new JBossXBException("Failed to parse source: " + e.getMessage(), e);
- }
- }
-
public void parse(Reader reader, ContentHandler handler) throws JBossXBException
{
- parse(reader, null, handler);
+ parse(new InputSource(reader), handler);
}
- public void parse(Reader reader, String systemId, ContentHandler handler) throws JBossXBException
+ public void parse(InputSource source, ContentHandler handler) throws JBossXBException
{
this.contentHandler = handler;
trace = log.isTraceEnabled();
@@ -215,10 +196,7 @@
logParserInfo();
try
{
- InputSource source = new InputSource(reader);
- if (systemId != null)
- source.setSystemId(systemId);
- this.reader.parse(source);
+ reader.parse(source);
}
catch(Throwable e)
{
More information about the jboss-svn-commits
mailing list