Updated W3C tests and bug-fixes

2 files changed, 7 insertions, 15 deletions

diff --git a/src/bindings/swig/java/JavaDataModel.h b/src/bindings/swig/java/JavaDataModel.h
index 5d76480..ca503d1 100644
--- a/src/bindings/swig/java/JavaDataModel.h
+++ b/src/bindings/swig/java/JavaDataModel.h
@@ -62,7 +62,7 @@ public:
 	}
 
 	virtual void assign(const Arabica::DOM::Element<std::string>& assignElem,
-	                    const Arabica::DOM::Document<std::string>& doc,
+	                    const Arabica::DOM::Node<std::string>& node,
 	                    const std::string& content) {
 		// convert XML back into strings
 		std::string location;
@@ -72,9 +72,9 @@ public:
 		std::ostringstream ssAssign;
 		ssAssign << assignElem;
 		std::string tmp;
-		if (doc) {
+		if (node) {
 			std::ostringstream ssContent;
-			ssContent << doc;
+			ssContent << node;
 			tmp = ssContent.str();
 		} else {
 			tmp = content;
@@ -89,7 +89,7 @@ public:
 	// this is assign the function exposed to java
 
 	virtual void init(const Arabica::DOM::Element<std::string>& dataElem,
-	                  const Arabica::DOM::Document<std::string>& doc,
+	                  const Arabica::DOM::Node<std::string>& node,
 	                  const std::string& content) {
 		// convert XML back into strings
 		std::string location;
@@ -100,9 +100,9 @@ public:
 		if (dataElem)
 			ssData << dataElem;
 		std::string tmp;
-		if (doc) {
+		if (node) {
 			std::ostringstream ssContent;
-			ssContent << doc;
+			ssContent << node;
 			tmp = ssContent.str();
 		} else {
 			tmp = content;
diff --git a/src/bindings/swig/php/uscxmlNativePHP.php b/src/bindings/swig/php/uscxmlNativePHP.php
index 6e4823a..358975a 100644
--- a/src/bindings/swig/php/uscxmlNativePHP.php
+++ b/src/bindings/swig/php/uscxmlNativePHP.php
@@ -2,7 +2,7 @@
 
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.7
+ * Version 2.0.9
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -423,14 +423,6 @@ class Event {
 		Event_setDOM($this->_cPtr,$dom);
 	}
 
-	static function getFirstDOMElement($self_or_dom) {
-		return Event_getFirstDOMElement($self_or_dom);
-	}
-
-	static function getStrippedDOM($self_or_dom) {
-		return Event_getStrippedDOM($self_or_dom);
-	}
-
 	function getRaw() {
 		return Event_getRaw($this->_cPtr);
 	}