Allow parsing from InputStream.

This commit is contained in:
Michael Bayne
2013-01-23 15:37:04 -08:00
parent 7f3f5098ed
commit fd34ffda09
@@ -21,6 +21,7 @@ package com.threerings.miso.tools.xml;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
@@ -36,8 +37,7 @@ import com.threerings.miso.data.SimpleMisoSceneModel;
public class SimpleMisoSceneParser public class SimpleMisoSceneParser
{ {
/** /**
* Constructs a scene parser that parses scenes with the specified XML * Constructs a scene parser that parses scenes with the specified XML path prefix.
* path prefix.
*/ */
public SimpleMisoSceneParser (String prefix) public SimpleMisoSceneParser (String prefix)
{ {
@@ -63,15 +63,23 @@ public class SimpleMisoSceneParser
} }
/** /**
* Parses the XML file at the specified path into a scene model * Parses the XML file at the specified path into a scene model instance.
* instance.
*/ */
public SimpleMisoSceneModel parseScene (String path) public SimpleMisoSceneModel parseScene (String path)
throws IOException, SAXException throws IOException, SAXException
{
return parseScene(new FileInputStream(path));
}
/**
* Parses the XML file on the supplied input stream into a scene model instance.
*/
public SimpleMisoSceneModel parseScene (InputStream in)
throws IOException, SAXException
{ {
_model = null; _model = null;
_digester.push(this); _digester.push(this);
_digester.parse(new FileInputStream(path)); _digester.parse(in);
return _model; return _model;
} }