Renamed URI to URL

Some fixes for Xincludes

2 files changed, 5 insertions, 4 deletions

diff --git a/src/bindings/swig/java/uscxml.i b/src/bindings/swig/java/uscxml.i
index 9a86c28..e9b6bf0 100644
--- a/src/bindings/swig/java/uscxml.i
+++ b/src/bindings/swig/java/uscxml.i
@@ -96,7 +96,7 @@ using namespace Arabica::DOM;
 %enddef
 
 WRAP_THROW_EXCEPTION(uscxml::Interpreter::fromXML);
-WRAP_THROW_EXCEPTION(uscxml::Interpreter::fromURI);
+WRAP_THROW_EXCEPTION(uscxml::Interpreter::fromURL);
 WRAP_THROW_EXCEPTION(uscxml::Interpreter::step);
 WRAP_THROW_EXCEPTION(uscxml::Interpreter::interpret);
 
@@ -231,8 +231,8 @@ import java.net.URL;
 %}
 
 %typemap(javacode) uscxml::Interpreter %{
-  public static Interpreter fromURI(URL uri) throws org.uscxml.InterpreterException {
-    return Interpreter.fromURI(uri.toString());
+  public static Interpreter fromURL(URL uri) throws org.uscxml.InterpreterException {
+    return Interpreter.fromURL(uri.toString());
   }
 	
 	public Map<String, NativeIOProcessor> getIOProcessors() {
diff --git a/src/bindings/swig/uscxml_ignores.i b/src/bindings/swig/uscxml_ignores.i
index e6b7e88..e445bd9 100644
--- a/src/bindings/swig/uscxml_ignores.i
+++ b/src/bindings/swig/uscxml_ignores.i
@@ -38,7 +38,7 @@
 %ignore uscxml::Interpreter::Interpreter(const boost::shared_ptr<InterpreterImpl>);
 %ignore uscxml::Interpreter::Interpreter(const Interpreter&);
 %ignore uscxml::Interpreter::getDelayQueue();
-%ignore uscxml::Interpreter::fromURI(const URL&);
+%ignore uscxml::Interpreter::fromURL(const URL&);
 %ignore uscxml::Interpreter::fromDOM;
 %ignore uscxml::Interpreter::fromClone;
 %ignore uscxml::Interpreter::start();
@@ -51,6 +51,7 @@
 %ignore uscxml::Interpreter::getDocument;
 %ignore uscxml::Interpreter::getImpl;
 %ignore uscxml::Interpreter::runOnMainThread;
+%ignore uscxml::Interpreter::getBaseURL(const Arabica::DOM::Node<std::string>&);
 %ignore uscxml::Interpreter::getHTTPServlet();
 %ignore uscxml::Interpreter::getNodeSetForXPath(const std::string&);
 %ignore uscxml::Interpreter::isLegalConfiguration(const Arabica::XPath::NodeSet<std::string>&);