Mercurial > hg > release > icedtea6-1.5
changeset 586:94b86ca839e4
2008-02-02 Francis Kung <fkung@redhat.com>
* tools/netx/jnlp/Parser.java: Re-added Node class.
* tools/netx/jnlp/runtime/AppletEnvironment.java: Removed unused import.
author | Francis Kung <fkung@redhat.com> |
---|---|
date | Sat, 02 Feb 2008 17:55:55 -0500 |
parents | 6c63976cd18b |
children | 942c462067e4 |
files | tools/netx/jnlp/Parser.java tools/netx/jnlp/runtime/AppletEnvironment.java |
diffstat | 2 files changed, 141 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tools/netx/jnlp/Parser.java Sat Feb 02 17:13:16 2008 -0500 +++ b/tools/netx/jnlp/Parser.java Sat Feb 02 17:55:55 2008 -0500 @@ -958,4 +958,144 @@ } } - + +// this class makes assumptions on how parser calls methods (such +// as getFirstChild->getNextChild only called by a single loop at +// a time, so no need for an iterator). + +/** + * This class converts the NanoXML's XMLElement nodes into the + * regular XML Node interface (for the methods used by Parser). + */ +/* NANO */ +class Node { + private XMLElement xml; + private Node next; + private Node children[]; + + Node(XMLElement xml) { + this.xml = xml; + } + + Node getFirstChild() { + if (children == null) + getChildNodes(); + + if (children.length == 0) + return null; + else + return children[0]; + } + + Node getNextSibling() { + return next; + } + + void normalize() { + } + + String getNodeValue() { + return xml.getContent(); + } + + Node[] getChildNodes() { + if (children == null) { + List list = new ArrayList(); + + for (Enumeration e = xml.enumerateChildren(); e.hasMoreElements();) + list.add( new Node((XMLElement)e.nextElement()) ); + + children = (Node[]) list.toArray( new Node[list.size()] ); + + for (int i=0; i < children.length-1; i++) + children[i].next = children[i+1]; + } + + return children; + } + + String getAttribute(String name) { + return (String)xml.getAttribute(name); + } + + String getNodeName() { + if (xml.getName() == null) + return ""; + else + return xml.getName(); + } + + public String toString() { + return getNodeName(); + } +} + +/** + * This class converts the TinyXML's ParsedXML nodes into the + * regular XML Node interface (for the methods used by Parser). + */ +/* TINY +class Node { + private ParsedXML tinyNode; + private Node next; + private Node children[]; + + Node(ParsedXML tinyNode) { + this.tinyNode = tinyNode; + } + + Node getFirstChild() { + if (children == null) + getChildNodes(); + + if (children.length == 0) + return null; + else + return children[0]; + } + + Node getNextSibling() { + return next; + } + + void normalize() { + } + + String getNodeValue() { + return tinyNode.getContent(); + } + + Node[] getChildNodes() { + if (children == null) { + List list = new ArrayList(); + + for (Enumeration e = tinyNode.elements(); e.hasMoreElements();) { + list.add( new Node((ParsedXML)e.nextElement()) ); + } + children = (Node[]) list.toArray( new Node[list.size()] ); + + for (int i=0; i < children.length-1; i++) + children[i].next = children[i+1]; + } + + return children; + } + + String getAttribute(String name) { + return tinyNode.getAttribute(name); + } + + String getNodeName() { + if (tinyNode.getName() == null) + return ""; + else + return tinyNode.getName(); + } + + public String toString() { + return getNodeName(); + } +} +*/ + +
--- a/tools/netx/jnlp/runtime/AppletEnvironment.java Sat Feb 02 17:13:16 2008 -0500 +++ b/tools/netx/jnlp/runtime/AppletEnvironment.java Sat Feb 02 17:55:55 2008 -0500 @@ -27,7 +27,6 @@ import javax.swing.*; import netx.jnlp.*; import netx.jnlp.util.*; -import sun.applet.AppletViewerPanel; /** * The applet environment including stub, context, and frame. The