Accept INode instead of HopObject as argument since HopObject now
implements org.mozilla.javascript.Wrapped and will be unwrapped when passed outside the scripting engine.
This commit is contained in:
parent
d8236fb3b5
commit
cd10424299
1 changed files with 4 additions and 28 deletions
|
@ -54,14 +54,8 @@ public class XmlObject {
|
||||||
* @throws IOException ...
|
* @throws IOException ...
|
||||||
* @throws RuntimeException ...
|
* @throws RuntimeException ...
|
||||||
*/
|
*/
|
||||||
public boolean write(Object hopObject, String file)
|
public boolean write(INode node, String file)
|
||||||
throws IOException {
|
throws IOException {
|
||||||
INode node = null;
|
|
||||||
|
|
||||||
if (hopObject instanceof HopObject) {
|
|
||||||
node = ((HopObject) hopObject).getNode();
|
|
||||||
}
|
|
||||||
|
|
||||||
// we definitly need a node
|
// we definitly need a node
|
||||||
if (node == null) {
|
if (node == null) {
|
||||||
throw new RuntimeException("First argument in Xml.write() is not an hopobject");
|
throw new RuntimeException("First argument in Xml.write() is not an hopobject");
|
||||||
|
@ -92,13 +86,7 @@ public class XmlObject {
|
||||||
* Xml.create() is used to get a string containing the xml-content.
|
* Xml.create() is used to get a string containing the xml-content.
|
||||||
* Useful if Xml-content should be made public through the web.
|
* Useful if Xml-content should be made public through the web.
|
||||||
*/
|
*/
|
||||||
public String writeToString(Object hopObject) throws IOException {
|
public String writeToString(INode node) throws IOException {
|
||||||
INode node = null;
|
|
||||||
|
|
||||||
if (hopObject instanceof HopObject) {
|
|
||||||
node = ((HopObject) hopObject).getNode();
|
|
||||||
}
|
|
||||||
|
|
||||||
// we definitly need a node
|
// we definitly need a node
|
||||||
if (node == null) {
|
if (node == null) {
|
||||||
throw new RuntimeException("First argument in Xml.write() is not an hopobject");
|
throw new RuntimeException("First argument in Xml.write() is not an hopobject");
|
||||||
|
@ -142,17 +130,11 @@ public class XmlObject {
|
||||||
*
|
*
|
||||||
* @throws RuntimeException ...
|
* @throws RuntimeException ...
|
||||||
*/
|
*/
|
||||||
public Object read(String file, Object hopObject) throws RuntimeException {
|
public Object read(String file, INode node) throws RuntimeException {
|
||||||
if (file == null) {
|
if (file == null) {
|
||||||
throw new RuntimeException("Missing arguments in Xml.read()");
|
throw new RuntimeException("Missing arguments in Xml.read()");
|
||||||
}
|
}
|
||||||
|
|
||||||
INode node = null;
|
|
||||||
|
|
||||||
if (hopObject instanceof HopObject) {
|
|
||||||
node = ((HopObject) hopObject).getNode();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node == null) {
|
if (node == null) {
|
||||||
// make sure we have a node, even if 2nd arg doesn't exist or is not a node
|
// make sure we have a node, even if 2nd arg doesn't exist or is not a node
|
||||||
node = new Node((String) null, (String) null,
|
node = new Node((String) null, (String) null,
|
||||||
|
@ -194,18 +176,12 @@ public class XmlObject {
|
||||||
*
|
*
|
||||||
* @throws RuntimeException ...
|
* @throws RuntimeException ...
|
||||||
*/
|
*/
|
||||||
public Object readFromString(String str, Object hopObject)
|
public Object readFromString(String str, INode node)
|
||||||
throws RuntimeException {
|
throws RuntimeException {
|
||||||
if (str == null) {
|
if (str == null) {
|
||||||
throw new RuntimeException("Missing arguments in Xml.read()");
|
throw new RuntimeException("Missing arguments in Xml.read()");
|
||||||
}
|
}
|
||||||
|
|
||||||
INode node = null;
|
|
||||||
|
|
||||||
if (hopObject instanceof HopObject) {
|
|
||||||
node = ((HopObject) hopObject).getNode();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node == null) {
|
if (node == null) {
|
||||||
// make sure we have a node, even if 2nd arg doesn't exist or is not a node
|
// make sure we have a node, even if 2nd arg doesn't exist or is not a node
|
||||||
node = new Node((String) null, (String) null,
|
node = new Node((String) null, (String) null,
|
||||||
|
|
Loading…
Add table
Reference in a new issue