diff options
Diffstat (limited to 'libjava/classpath/gnu/xml/dom')
102 files changed, 1107 insertions, 1191 deletions
diff --git a/libjava/classpath/gnu/xml/dom/Consumer.java b/libjava/classpath/gnu/xml/dom/Consumer.java index 026e2754ef9..836c8d25728 100644 --- a/libjava/classpath/gnu/xml/dom/Consumer.java +++ b/libjava/classpath/gnu/xml/dom/Consumer.java @@ -1,4 +1,4 @@ -/* Consumer.java -- +/* Consumer.java -- Copyright (C) 2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -81,8 +81,8 @@ public class Consumer extends DomConsumer public Consumer () throws SAXException { - super (DomDocument.class); - setHandler (new Backdoor (this)); + super (DomDocument.class); + setHandler (new Backdoor (this)); } /** @@ -93,8 +93,8 @@ public class Consumer extends DomConsumer public Consumer (EventConsumer next) throws SAXException { - super (DomDocument.class, next); - setHandler (new Backdoor (this)); + super (DomDocument.class, next); + setHandler (new Backdoor (this)); } /** @@ -105,160 +105,160 @@ public class Consumer extends DomConsumer */ public static class Backdoor extends DomConsumer.Handler { - /** - * Constructor. - * @param consumer must have been initialized to use the - * {@link DomDocument} class (or a subclass) for - * constructing DOM trees - */ - protected Backdoor (DomConsumer consumer) - throws SAXException - { super (consumer); } - - // helper routine - private DomDoctype getDoctype () - throws SAXException - { - DomDocument doc = (DomDocument) getDocument (); - DocumentType dt = doc.getDoctype (); - - if (dt == null) - throw new SAXException ("doctype missing!"); - return (DomDoctype) dt; - } - - // SAX2 "lexical" event - public void startDTD (String name, String publicId, String systemId) - throws SAXException - { - DomDocument doc = (DomDocument) getDocument (); - - super.startDTD (name, publicId, systemId); - // DOM L2 doctype creation model is bizarre - DomDoctype dt = new DomDoctype (doc, name, publicId, systemId); - doc.appendChild (dt); - } - - // SAX2 "lexical" event - public void endDTD () - throws SAXException - { - super.endDTD (); - // DOM L2 has no way to make things readonly - getDoctype ().makeReadonly (); - } - - // SAX1 DTD event - public void notationDecl ( - String name, - String publicId, String systemId - ) throws SAXException - { - // DOM L2 can't create/save notation nodes - getDoctype ().declareNotation (name, publicId, systemId); - } - - // SAX1 DTD event - public void unparsedEntityDecl ( - String name, - String publicId, String systemId, - String notationName - ) throws SAXException - { - // DOM L2 can't create/save entity nodes - getDoctype ().declareEntity (name, publicId, systemId, - notationName); - } - - // SAX2 declaration event - public void internalEntityDecl (String name, String value) - throws SAXException - { - // DOM L2 can't create/save entity nodes - // NOTE: this doesn't save the value as a child of this - // node, though it could realistically do so. - getDoctype ().declareEntity (name, null, null, null); - } - - // SAX2 declaration event - public void externalEntityDecl ( - String name, - String publicId, - String systemId - ) throws SAXException - { - // DOM L2 can't create/save entity nodes - // NOTE: DOM allows for these to have children, if - // they don't have unbound namespace references. - getDoctype ().declareEntity (name, publicId, systemId, null); - } - - // SAX2 element - public void startElement ( - String uri, - String localName, - String qName, - Attributes atts - ) throws SAXException - { - Node top; - - super.startElement (uri, localName, qName, atts); - - // might there be more work? - top = getTop (); - if (!top.hasAttributes () || !(atts instanceof Attributes2)) - return; - - // remember any attributes that got defaulted - DomNamedNodeMap map = (DomNamedNodeMap) top.getAttributes (); - Attributes2 attrs = (Attributes2) atts; - int length = atts.getLength (); - - //map.compact (); - for (int i = 0; i < length; i++) { - if (attrs.isSpecified (i)) - continue; - - // value was defaulted. - String temp = attrs.getQName (i); - DomAttr attr; - - if ("".equals (temp)) - attr = (DomAttr) map.getNamedItemNS (attrs.getURI (i), - atts.getLocalName (i)); - else - attr = (DomAttr) map.getNamedItem (temp); - - // DOM L2 can't write this flag, only read it - attr.setSpecified (false); - } - } - - public void endElement ( - String uri, - String localName, - String qName - ) throws SAXException - { - DomNode top = (DomNode) getTop (); - top.compact (); - super.endElement (uri, localName, qName); - } - - protected Text createText ( - boolean isCDATA, - char buf [], - int off, - int len - ) { - DomDocument doc = (DomDocument) getDocument (); - - if (isCDATA) - return doc.createCDATASection (buf, off, len); - else - return doc.createTextNode (buf, off, len); - } + /** + * Constructor. + * @param consumer must have been initialized to use the + * {@link DomDocument} class (or a subclass) for + * constructing DOM trees + */ + protected Backdoor (DomConsumer consumer) + throws SAXException + { super (consumer); } + + // helper routine + private DomDoctype getDoctype () + throws SAXException + { + DomDocument doc = (DomDocument) getDocument (); + DocumentType dt = doc.getDoctype (); + + if (dt == null) + throw new SAXException ("doctype missing!"); + return (DomDoctype) dt; + } + + // SAX2 "lexical" event + public void startDTD (String name, String publicId, String systemId) + throws SAXException + { + DomDocument doc = (DomDocument) getDocument (); + + super.startDTD (name, publicId, systemId); + // DOM L2 doctype creation model is bizarre + DomDoctype dt = new DomDoctype (doc, name, publicId, systemId); + doc.appendChild (dt); + } + + // SAX2 "lexical" event + public void endDTD () + throws SAXException + { + super.endDTD (); + // DOM L2 has no way to make things readonly + getDoctype ().makeReadonly (); + } + + // SAX1 DTD event + public void notationDecl ( + String name, + String publicId, String systemId + ) throws SAXException + { + // DOM L2 can't create/save notation nodes + getDoctype ().declareNotation (name, publicId, systemId); + } + + // SAX1 DTD event + public void unparsedEntityDecl ( + String name, + String publicId, String systemId, + String notationName + ) throws SAXException + { + // DOM L2 can't create/save entity nodes + getDoctype ().declareEntity (name, publicId, systemId, + notationName); + } + + // SAX2 declaration event + public void internalEntityDecl (String name, String value) + throws SAXException + { + // DOM L2 can't create/save entity nodes + // NOTE: this doesn't save the value as a child of this + // node, though it could realistically do so. + getDoctype ().declareEntity (name, null, null, null); + } + + // SAX2 declaration event + public void externalEntityDecl ( + String name, + String publicId, + String systemId + ) throws SAXException + { + // DOM L2 can't create/save entity nodes + // NOTE: DOM allows for these to have children, if + // they don't have unbound namespace references. + getDoctype ().declareEntity (name, publicId, systemId, null); + } + + // SAX2 element + public void startElement ( + String uri, + String localName, + String qName, + Attributes atts + ) throws SAXException + { + Node top; + + super.startElement (uri, localName, qName, atts); + + // might there be more work? + top = getTop (); + if (!top.hasAttributes () || !(atts instanceof Attributes2)) + return; + + // remember any attributes that got defaulted + DomNamedNodeMap map = (DomNamedNodeMap) top.getAttributes (); + Attributes2 attrs = (Attributes2) atts; + int length = atts.getLength (); + + //map.compact (); + for (int i = 0; i < length; i++) { + if (attrs.isSpecified (i)) + continue; + + // value was defaulted. + String temp = attrs.getQName (i); + DomAttr attr; + + if ("".equals (temp)) + attr = (DomAttr) map.getNamedItemNS (attrs.getURI (i), + atts.getLocalName (i)); + else + attr = (DomAttr) map.getNamedItem (temp); + + // DOM L2 can't write this flag, only read it + attr.setSpecified (false); + } + } + + public void endElement ( + String uri, + String localName, + String qName + ) throws SAXException + { + DomNode top = (DomNode) getTop (); + top.compact (); + super.endElement (uri, localName, qName); + } + + protected Text createText ( + boolean isCDATA, + char buf [], + int off, + int len + ) { + DomDocument doc = (DomDocument) getDocument (); + + if (isCDATA) + return doc.createCDATASection (buf, off, len); + else + return doc.createTextNode (buf, off, len); + } public void elementDecl(String name, String model) throws SAXException @@ -266,87 +266,87 @@ public class Consumer extends DomConsumer getDoctype().elementDecl(name, model); } - public void attributeDecl ( - String ename, - String aname, - String type, - String mode, - String value - ) throws SAXException - { + public void attributeDecl ( + String ename, + String aname, + String type, + String mode, + String value + ) throws SAXException + { getDoctype().attributeDecl(ename, aname, type, mode, value); /* - if (value == null && !"ID".equals (type)) - return; - - DomDoctype.ElementInfo info; - - info = getDoctype ().getElementInfo (ename); - if (value != null) - info.setAttrDefault (aname, value); - if ("ID".equals (type)) - info.setIdAttr (aname); + if (value == null && !"ID".equals (type)) + return; + + DomDoctype.ElementInfo info; + + info = getDoctype ().getElementInfo (ename); + if (value != null) + info.setAttrDefault (aname, value); + if ("ID".equals (type)) + info.setIdAttr (aname); */ - - } - - // force duplicate name checking off while we're - // using parser output (don't duplicate the work) - public void startDocument () throws SAXException - { - super.startDocument (); - + + } + + // force duplicate name checking off while we're + // using parser output (don't duplicate the work) + public void startDocument () throws SAXException + { + super.startDocument (); + DomDocument doc = (DomDocument) getDocument (); doc.setStrictErrorChecking(false); doc.setBuilding(true); - } + } - public void endDocument () - throws SAXException - { - DomDocument doc = (DomDocument) getDocument (); - doc.setStrictErrorChecking(true); + public void endDocument () + throws SAXException + { + DomDocument doc = (DomDocument) getDocument (); + doc.setStrictErrorChecking(true); doc.setBuilding(false); - doc.compact (); + doc.compact (); DomDoctype doctype = (DomDoctype) doc.getDoctype(); if (doctype != null) { doctype.makeReadonly(); } - super.endDocument (); - } - - // these three methods collaborate to populate entity - // refs, marking contents readonly on end-of-entity - - public boolean canPopulateEntityRefs () - { return true; } - - public void startEntity (String name) - throws SAXException - { - if (name.charAt (0) == '%' || "[dtd]".equals (name)) - return; - super.startEntity (name); - - DomNode top = (DomNode) getTop (); - - if (top.getNodeType () == Node.ENTITY_REFERENCE_NODE) - top.readonly = false; - } - - public void endEntity (String name) - throws SAXException - { - if (name.charAt (0) == '%' || "[dtd]".equals (name)) - return; - DomNode top = (DomNode) getTop (); - - if (top.getNodeType () == Node.ENTITY_REFERENCE_NODE) { - top.compact (); - top.makeReadonly (); - } - super.endEntity (name); - } + super.endDocument (); + } + + // these three methods collaborate to populate entity + // refs, marking contents readonly on end-of-entity + + public boolean canPopulateEntityRefs () + { return true; } + + public void startEntity (String name) + throws SAXException + { + if (name.charAt (0) == '%' || "[dtd]".equals (name)) + return; + super.startEntity (name); + + DomNode top = (DomNode) getTop (); + + if (top.getNodeType () == Node.ENTITY_REFERENCE_NODE) + top.readonly = false; + } + + public void endEntity (String name) + throws SAXException + { + if (name.charAt (0) == '%' || "[dtd]".equals (name)) + return; + DomNode top = (DomNode) getTop (); + + if (top.getNodeType () == Node.ENTITY_REFERENCE_NODE) { + top.compact (); + top.makeReadonly (); + } + super.endEntity (name); + } } } diff --git a/libjava/classpath/gnu/xml/dom/DTDAttributeTypeInfo.java b/libjava/classpath/gnu/xml/dom/DTDAttributeTypeInfo.java index e3c69c43ecb..d6e25529d7e 100644 --- a/libjava/classpath/gnu/xml/dom/DTDAttributeTypeInfo.java +++ b/libjava/classpath/gnu/xml/dom/DTDAttributeTypeInfo.java @@ -1,4 +1,4 @@ -/* DTDAttributeTypeInfo.java -- +/* DTDAttributeTypeInfo.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -81,4 +81,3 @@ class DTDAttributeTypeInfo } } - diff --git a/libjava/classpath/gnu/xml/dom/DTDElementTypeInfo.java b/libjava/classpath/gnu/xml/dom/DTDElementTypeInfo.java index c5553e20e62..9063d4c7957 100644 --- a/libjava/classpath/gnu/xml/dom/DTDElementTypeInfo.java +++ b/libjava/classpath/gnu/xml/dom/DTDElementTypeInfo.java @@ -1,4 +1,4 @@ -/* DTDElementTypeInfo.java -- +/* DTDElementTypeInfo.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -107,6 +107,5 @@ class DTDElementTypeInfo } return attributes.values().iterator(); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/DomAttr.java b/libjava/classpath/gnu/xml/dom/DomAttr.java index 6a8da837154..421baf76a48 100644 --- a/libjava/classpath/gnu/xml/dom/DomAttr.java +++ b/libjava/classpath/gnu/xml/dom/DomAttr.java @@ -1,4 +1,4 @@ -/* DomAttr.java -- +/* DomAttr.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -65,7 +65,7 @@ import org.w3c.dom.events.MutationEvent; * methods (setNodeValue, setValue, and Element.setAttribute) to modify * those values. That is, if you manipulate those children directly, * elements won't get notified that attribute values have changed. - * The natural fix for that will report other modifications, but won't + * The natural fix for that will report other modifications, but won't * be able to expose "previous" attribute value; it'll need to be cached * or something (at which point why bother using child nodes). </p> * @@ -79,10 +79,10 @@ public class DomAttr extends DomNsNode implements Attr { - + private boolean specified; private String value; // string value cache - + /** * Constructs an Attr node associated with the specified document. * The "specified" flag is initialized to true, since this DOM has @@ -95,7 +95,7 @@ public class DomAttr * * @param owner The document with which this node is associated * @param namespaceURI Combined with the local part of the name, - * this is used to uniquely identify a type of attribute + * this is used to uniquely identify a type of attribute * @param name Name of this attribute, which may include a prefix */ protected DomAttr(DomDocument owner, String namespaceURI, String name) @@ -103,7 +103,7 @@ public class DomAttr super(ATTRIBUTE_NODE, owner, namespaceURI, name); specified = true; length = 1; - + // XXX register self to get insertion/removal events // and character data change events and when they happen, // report self-mutation @@ -121,18 +121,18 @@ public class DomAttr * <p> * With this constructor, the prefix and local part are given explicitly * rather than being computed. This allows them to be explicitly set to - * {@code null} as required by {@link Document#createAttribute(String)}. + * {@code null} as required by {@link Document#createAttribute(String)}. * </p> * * @param owner The document with which this node is associated * @param namespaceURI Combined with the local part of the name, - * this is used to uniquely identify a type of attribute + * this is used to uniquely identify a type of attribute * @param name Name of this attribute, which may include a prefix * @param prefix the namespace prefix of the name. May be {@code null}. * @param localName the local part of the name. May be {@code null}. */ protected DomAttr(DomDocument owner, String namespaceURI, String name, - String prefix, String localName) + String prefix, String localName) { super(ATTRIBUTE_NODE, owner, namespaceURI, name, prefix, localName); specified = true; @@ -147,7 +147,7 @@ public class DomAttr { return getNodeName(); } - + /** * <b>DOM L1</b> * Returns true if a parser reported this was in the source text. @@ -156,7 +156,7 @@ public class DomAttr { return specified; } - + /** * Records whether this attribute was in the source text. */ @@ -194,7 +194,7 @@ public class DomAttr } return buf.toString(); } - + /** * <b>DOM L1</b> * Assigns the value of the attribute; it will have one child, @@ -205,7 +205,7 @@ public class DomAttr { setNodeValue(value); } - + /** * <b>DOM L1</b> * Returns the value of the attribute as a non-null string; same @@ -216,7 +216,7 @@ public class DomAttr { return getNodeValue(); } - + /** * <b>DOM L1</b> * Assigns the attribute value; using this API, no entity or @@ -246,7 +246,7 @@ public class DomAttr this.value = value; length = 1; specified = true; - + mutating(oldValue, value, MutationEvent.MODIFICATION); } @@ -334,7 +334,7 @@ public class DomAttr { return null; } - + /** * Shallow clone of the attribute, breaking all ties with any * elements. @@ -345,18 +345,18 @@ public class DomAttr retval.specified = true; return retval; } - + private void mutating(String oldValue, String newValue, short why) { if (!reportMutations || parent == null || equal(newValue, oldValue)) { return; } - + // EVENT: DOMAttrModified, target = parent, - // prev/new values provided, also attr name - MutationEvent event; - + // prev/new values provided, also attr name + MutationEvent event; + event = (MutationEvent) createEvent ("MutationEvents"); event.initMutationEvent ("DOMAttrModified", true /* bubbles */, false /* nocancel */, @@ -365,7 +365,7 @@ public class DomAttr } // DOM Level 3 methods - + public TypeInfo getSchemaTypeInfo() { if (parent != null) @@ -409,4 +409,3 @@ public class DomAttr } } - diff --git a/libjava/classpath/gnu/xml/dom/DomCDATASection.java b/libjava/classpath/gnu/xml/dom/DomCDATASection.java index e34359e71bf..770f7d5dd29 100644 --- a/libjava/classpath/gnu/xml/dom/DomCDATASection.java +++ b/libjava/classpath/gnu/xml/dom/DomCDATASection.java @@ -1,4 +1,4 @@ -/* DomCDATASection.java -- +/* DomCDATASection.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -58,7 +58,7 @@ public class DomCDATASection extends DomText implements CDATASection { - + /** * Constructs a CDATA section node associated with the specified * document and holding the specified data. @@ -86,6 +86,5 @@ public class DomCDATASection { return "#cdata-section"; } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/DomCharacterData.java b/libjava/classpath/gnu/xml/dom/DomCharacterData.java index 1eec5bea734..396c5f7a720 100644 --- a/libjava/classpath/gnu/xml/dom/DomCharacterData.java +++ b/libjava/classpath/gnu/xml/dom/DomCharacterData.java @@ -1,4 +1,4 @@ -/* DomCharacterData.java -- +/* DomCharacterData.java -- Copyright (C) 1999,2000,2001,2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -73,7 +73,7 @@ public abstract class DomCharacterData { return null; } - + } /** @@ -82,7 +82,7 @@ public abstract class DomCharacterData static final NodeList CHILD_NODES = new EmptyNodeList(); private String text; - + // package private DomCharacterData(short nodeType, DomDocument doc, String value) { @@ -113,7 +113,7 @@ public abstract class DomCharacterData mutating(value); text = value; } - + /** * <b>DOM L1</b> * Modifies the value of this node. @@ -153,7 +153,7 @@ public abstract class DomCharacterData throw new DomDOMException(DOMException.INDEX_SIZE_ERR); } } - + /** * <b>DOM L1</b> * Returns the value of this node. @@ -162,7 +162,7 @@ public abstract class DomCharacterData { return text; } - + /** * <b>DOM L1</b> * Returns the value of this node; same as getNodeValue. @@ -180,7 +180,7 @@ public abstract class DomCharacterData { return text.length(); } - + /** * <b>DOM L1</b> * Modifies the value of this node. @@ -194,7 +194,7 @@ public abstract class DomCharacterData char[] raw = text.toCharArray(); char[] tmp = arg.toCharArray (); char[] buf = new char[raw.length + tmp.length]; - + try { System.arraycopy(raw, 0, buf, 0, offset); @@ -210,7 +210,7 @@ public abstract class DomCharacterData throw new DomDOMException(DOMException.INDEX_SIZE_ERR); } } - + /** * <b>DOM L1</b> * Modifies the value of this node. Causes DOMCharacterDataModified @@ -223,7 +223,7 @@ public abstract class DomCharacterData throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR); } char[] raw = text.toCharArray(); - + // deleteData if (offset < 0 || count < 0 || offset > raw.length) { @@ -239,7 +239,7 @@ public abstract class DomCharacterData System.arraycopy(raw, 0, buf, 0, offset); System.arraycopy(raw, offset + count, buf, offset, raw.length - (offset + count)); - + // insertData char[] tmp = arg.toCharArray (); char[] buf2 = new char[buf.length + tmp.length]; @@ -256,7 +256,7 @@ public abstract class DomCharacterData throw new DomDOMException(DOMException.INDEX_SIZE_ERR); } } - + /** * <b>DOM L1</b> * Assigns the value of this node. @@ -275,7 +275,7 @@ public abstract class DomCharacterData mutating(value); text = value; } - + /** * <b>DOM L1</b> * Assigns the value of this node; same as setNodeValue. @@ -329,17 +329,16 @@ public abstract class DomCharacterData { return; } - + // EVENT: DOMCharacterDataModified, target = this, // prev/new values provided MutationEvent event; - + event = (MutationEvent) createEvent("MutationEvents"); event.initMutationEvent("DOMCharacterDataModified", true /* bubbles */, false /* nocancel */, null, text, newValue, null, (short) 0); dispatchEvent(event); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/DomComment.java b/libjava/classpath/gnu/xml/dom/DomComment.java index 71c8160485f..5be6bd5181c 100644 --- a/libjava/classpath/gnu/xml/dom/DomComment.java +++ b/libjava/classpath/gnu/xml/dom/DomComment.java @@ -1,4 +1,4 @@ -/* DomComment.java -- +/* DomComment.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -54,7 +54,7 @@ public class DomComment extends DomCharacterData implements Comment { - + /** * Constructs a comment node associated with the specified * document and holding the specified data. @@ -67,7 +67,7 @@ public class DomComment { super(COMMENT_NODE, owner, value); } - + /** * <b>DOM L1</b> * Returns the string "#comment". @@ -78,4 +78,3 @@ public class DomComment } } - diff --git a/libjava/classpath/gnu/xml/dom/DomDOMException.java b/libjava/classpath/gnu/xml/dom/DomDOMException.java index cf93fcf9749..4a3ba7a8c82 100644 --- a/libjava/classpath/gnu/xml/dom/DomDOMException.java +++ b/libjava/classpath/gnu/xml/dom/DomDOMException.java @@ -1,4 +1,4 @@ -/* DomDOMException.java -- +/* DomDOMException.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,7 +48,7 @@ import org.w3c.dom.Node; * that is being reported, in terms of the relevant DOM structures * and data. * - * @author David Brownell + * @author David Brownell */ public class DomDOMException extends DOMException @@ -56,13 +56,13 @@ public class DomDOMException /** @serial Data that caused an error to be reported */ private String data; - + /** @serial Node associated with the error. */ private Node node; - + /** @serial Data associated with the error. */ private int value; - + /** * Constructs an exception, with the diagnostic message * corresponding to the specified code. @@ -71,7 +71,7 @@ public class DomDOMException { super(code, diagnostic(code)); } - + /** * Constructs an exception, with the diagnostic message * corresponding to the specified code and additional @@ -110,7 +110,7 @@ public class DomDOMException public String getMessage() { String retval = super.getMessage(); - + if (data != null) { retval += "\nMore Information: " + data; @@ -127,11 +127,11 @@ public class DomDOMException } // these strings should be localizable. - + private static String diagnostic(short code) { switch (code) - { + { // DOM L1: case INDEX_SIZE_ERR: return "An index or size is out of range."; @@ -153,7 +153,7 @@ public class DomDOMException return "That object is not supported."; case INUSE_ATTRIBUTE_ERR: return "The attribute belongs to a different element."; - + // DOM L2: case INVALID_STATE_ERR: return "The object is not usable."; @@ -172,4 +172,3 @@ public class DomDOMException } } - diff --git a/libjava/classpath/gnu/xml/dom/DomDoctype.java b/libjava/classpath/gnu/xml/dom/DomDoctype.java index d35eedc7f75..ecf7a9588d2 100644 --- a/libjava/classpath/gnu/xml/dom/DomDoctype.java +++ b/libjava/classpath/gnu/xml/dom/DomDoctype.java @@ -1,4 +1,4 @@ -/* DomDoctype.java -- +/* DomDoctype.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -72,22 +72,22 @@ import org.w3c.dom.Notation; * @see DomEntityReference * @see DomNotation * - * @author David Brownell + * @author David Brownell * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> */ public class DomDoctype extends DomExtern implements DocumentType { - + private DomNamedNodeMap notations; private DomNamedNodeMap entities; private final DOMImplementation implementation; private String subset; - + private HashMap elements = new HashMap(); private boolean ids; - + /** * Constructs a DocumentType node associated with the specified * implementation, with the specified name. @@ -103,11 +103,11 @@ public class DomDoctype * @param impl The implementation with which this object is associated * @param name Name of this root element * @param publicId If non-null, provides the external subset's - * PUBLIC identifier + * PUBLIC identifier * @param systemId If non-null, provides the external subset's - * SYSTEM identifier + * SYSTEM identifier * @param internalSubset Provides the literal value (unparsed, no - * entities expanded) of the DTD's internal subset. + * entities expanded) of the DTD's internal subset. */ protected DomDoctype(DOMImplementation impl, String name, @@ -154,7 +154,7 @@ public class DomDoctype * then it doesn't have the strange construction rules of L2.</em> * * @exception DOMException HIERARCHY_REQUEST_ERR if the DocumentType - * is not associated with a document. + * is not associated with a document. */ public NamedNodeMap getEntities() { @@ -172,15 +172,15 @@ public class DomDoctype * @param publicId If non-null, provides the entity's PUBLIC identifier * @param systemId Provides the entity's SYSTEM identifier * @param notation If non-null, provides the entity's notation - * (indicating an unparsed entity) + * (indicating an unparsed entity) * @return The Entity that was declared, or null if the entity wasn't - * recorded (because it's a parameter entity or because an entity with - * this name was already declared). + * recorded (because it's a parameter entity or because an entity with + * this name was already declared). * * @exception DOMException NO_MODIFICATION_ALLOWED_ERR if the - * DocumentType is no longer writable. + * DocumentType is no longer writable. * @exception DOMException HIERARCHY_REQUEST_ERR if the DocumentType - * is not associated with a document. + * is not associated with a document. */ public Entity declareEntity(String name, String publicId, @@ -188,7 +188,7 @@ public class DomDoctype String notation) { DomEntity entity; - + if (name.charAt(0) == '%' || "[dtd]".equals(name)) { return null; @@ -198,19 +198,19 @@ public class DomDoctype throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR); } getEntities(); - + DomDocument.checkName(name, (owner != null) ? "1.1".equals(owner.getXmlVersion()) : false); if (entities.getNamedItem(name) != null) { return null; } - + entity = new DomEntity(owner, name, publicId, systemId, notation); entities.setNamedItem(entity); return entity; } - + /** * <b>DOM L1</b> * Returns information about any notations declared in the DTD. @@ -219,7 +219,7 @@ public class DomDoctype * then it doesn't have the strange construction rules of L2.</em> * * @exception DOMException HIERARCHY_REQUEST_ERR if the DocumentType - * is not associated with a document. + * is not associated with a document. */ public NamedNodeMap getNotations() { @@ -239,25 +239,25 @@ public class DomDoctype * @return The notation that was declared. * * @exception DOMException NO_MODIFICATION_ALLOWED_ERR if the - * DocumentType is no longer writable. + * DocumentType is no longer writable. * @exception DOMException HIERARCHY_REQUEST_ERR if the DocumentType - * is not associated with a document. + * is not associated with a document. */ public Notation declareNotation(String name, String publicId, String systemId) { DomNotation notation; - + if (isReadonly()) { throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR); } getNotations(); - + DomDocument.checkName(name, (owner != null) ? "1.1".equals(owner.getXmlVersion()) : false); - + notation = new DomNotation(owner, name, publicId, systemId); notations.setNamedItem(notation); return notation; @@ -290,7 +290,7 @@ public class DomDoctype { return null; } - + /** * Sets the internal "readonly" flag so the node and its associated * data (only lists of entities and notations, no type information @@ -337,7 +337,7 @@ public class DomDoctype { return implementation.hasFeature(feature, version); } - + /** * Returns the implementation associated with this document type. */ @@ -395,7 +395,7 @@ public class DomDoctype { return ids; } - + public boolean isSameNode(Node arg) { if (equals(arg)) @@ -423,7 +423,7 @@ public class DomDoctype // TODO notations return true; } - + /** * Shallow clone of the doctype, except that associated * entities and notations are (deep) cloned. diff --git a/libjava/classpath/gnu/xml/dom/DomDocument.java b/libjava/classpath/gnu/xml/dom/DomDocument.java index b32c6b82dfc..b1e99f46d69 100644 --- a/libjava/classpath/gnu/xml/dom/DomDocument.java +++ b/libjava/classpath/gnu/xml/dom/DomDocument.java @@ -1,4 +1,4 @@ -/* DomDocument.java -- +/* DomDocument.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -76,7 +76,7 @@ import org.w3c.dom.xpath.XPathNSResolver; * of basic XML conformance tests. (The huge XML character tables are * hairy to implement.) * - * @author David Brownell + * @author David Brownell * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> */ public class DomDocument @@ -90,7 +90,7 @@ public class DomDocument private boolean defaultAttributes = true; boolean building; // if true, skip mutation events in the tree - + DomDocumentConfiguration config; String inputEncoding; @@ -98,7 +98,7 @@ public class DomDocument String version = "1.0"; boolean standalone; String systemId; - + /** * Constructs a Document node, associating it with an instance * of the DomImpl class. @@ -115,7 +115,7 @@ public class DomDocument { this(new DomImpl()); } - + /** * Constructs a Document node, associating it with the specified * implementation. This should only be used in conjunction with @@ -165,7 +165,7 @@ public class DomDocument { defaultAttributes = flag; } - + /** * <b>DOM L1</b> * Returns the constant "#document". @@ -236,12 +236,12 @@ public class DomDocument { doctype = null; } - + // yes, this is linear in size of document. // it'd be easy enough to maintain a hashtable. Node current = getDocumentElement(); Node temp; - + if (current == null) { return null; @@ -286,14 +286,14 @@ public class DomDocument return element; } } - + // descend? if (current.hasChildNodes()) { current = current.getFirstChild(); continue; } - + // lateral? temp = current.getNextSibling(); if (temp != null) @@ -301,8 +301,8 @@ public class DomDocument current = temp; continue; } - - // back up ... + + // back up ... do { temp = current.getParentNode(); @@ -385,13 +385,13 @@ public class DomDocument } return super.replaceChild(newChild, refChild); } - + // NOTE: DOM can't really tell when the name of an entity, // notation, or PI must follow the namespace rules (excluding // colons) instead of the XML rules (which allow them without // much restriction). That's an API issue. verifyXmlName // aims to enforce the XML rules, not the namespace rules. - + /** * Throws a DOM exception if the specified name is not a legal XML 1.0 * Name. @@ -417,7 +417,7 @@ public class DomDocument } // dog: rewritten to use the rules for XML 1.0 and 1.1 - + // Name start character char c = name.charAt(0); if (xml11) @@ -565,13 +565,13 @@ public class DomDocument char[] chars = value.toCharArray(); checkChar(chars, 0, chars.length, xml11); } - + static void checkChar(char[] buf, int off, int len, boolean xml11) { for (int i = 0; i < len; i++) { char c = buf[i]; - + // assume surrogate pairing checks out OK, for simplicity if ((c >= 0x0020 && c <= 0xd7ff) || (c == 0x000a || c == 0x000d || c == 0x0009) || @@ -603,7 +603,7 @@ public class DomDocument public Element createElement(String name) { Element element; - + if (checkingCharacters) { checkName(name, "1.1".equals(version)); @@ -633,7 +633,7 @@ public class DomDocument { checkNCName(name, "1.1".equals(version)); } - + if ("".equals(namespaceURI)) { namespaceURI = null; @@ -661,13 +661,13 @@ public class DomDocument "prefixed name '" + name + "' needs a URI", this, 0); } - + Element element = new DomElement(this, namespaceURI, name); if (defaultAttributes) setDefaultAttributes(element, name); return element; } - + private void setDefaultAttributes(Element element, String name) { DomDoctype doctype = (DomDoctype) getDoctype(); @@ -687,7 +687,7 @@ public class DomDocument if ("#IMPLIED".equals(attr.mode) && value == null) continue; DomAttr node = (DomAttr) createAttribute(attr.name); - + if (value == null) { value = ""; @@ -830,7 +830,7 @@ public class DomDocument { checkNCName(name, "1.1".equals(version)); } - + if ("".equals(namespaceURI)) { namespaceURI = null; @@ -871,7 +871,7 @@ public class DomDocument } return new DomAttr(this, namespaceURI, name); } - + /** * <b>DOM L1</b> * Returns a newly created reference to the specified entity. @@ -1006,7 +1006,7 @@ public class DomDocument { Attr a = (Attr) srcAttrs.item(i); Attr dflt; - + // maybe update defaulted attributes dflt = (Attr) dstAttrs.getNamedItem(a.getNodeName()); if (dflt != null) @@ -1019,7 +1019,7 @@ public class DomDocument } continue; } - + dstAttrs.setNamedItem((Attr) importNode(a, false)); } if (deep) @@ -1039,7 +1039,7 @@ public class DomDocument default: throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR, null, src, 0); } - + // FIXME cleanup a bit -- for deep copies, copy those // children in one place, here (code sharing is healthy) @@ -1077,7 +1077,7 @@ public class DomDocument } // DOM Level 3 methods - + /** * DOM L3 */ @@ -1090,7 +1090,7 @@ public class DomDocument { this.inputEncoding = inputEncoding; } - + /** * DOM L3 */ @@ -1098,12 +1098,12 @@ public class DomDocument { return encoding; } - + public void setXmlEncoding(String encoding) { this.encoding = encoding; } - + public boolean getXmlStandalone() { return standalone; @@ -1181,7 +1181,7 @@ public class DomDocument return systemId; */ } - + public String getDocumentURI() { return systemId; @@ -1454,7 +1454,7 @@ public class DomDocument ctx = ctxNext; } } - + public Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException { @@ -1514,7 +1514,7 @@ public class DomDocument "xmlns namespace must be " + XMLConstants.XMLNS_ATTRIBUTE_NS_URI, src, 0); } - + } src.setNodeName(qualifiedName); src.setNamespaceURI(namespaceURI); @@ -1527,19 +1527,19 @@ public class DomDocument } // -- XPathEvaluator -- - + public XPathExpression createExpression(String expression, XPathNSResolver resolver) throws XPathException, DOMException { return new DomXPathExpression(this, expression, resolver); } - + public XPathNSResolver createNSResolver(Node nodeResolver) { return new DomXPathNSResolver(nodeResolver); } - + public Object evaluate(String expression, Node contextNode, XPathNSResolver resolver, @@ -1553,4 +1553,3 @@ public class DomDocument } } - diff --git a/libjava/classpath/gnu/xml/dom/DomDocumentBuilder.java b/libjava/classpath/gnu/xml/dom/DomDocumentBuilder.java index e62ce207639..99c254481b4 100644 --- a/libjava/classpath/gnu/xml/dom/DomDocumentBuilder.java +++ b/libjava/classpath/gnu/xml/dom/DomDocumentBuilder.java @@ -1,4 +1,4 @@ -/* DomDocumentBuilder.java -- +/* DomDocumentBuilder.java -- Copyright (C) 2004,2006,2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -68,7 +68,7 @@ class DomDocumentBuilder final DOMImplementation impl; final DOMImplementationLS ls; final LSParser parser; - + DomDocumentBuilder(DOMImplementation impl, DOMImplementationLS ls, LSParser parser) @@ -83,7 +83,7 @@ class DomDocumentBuilder DOMConfiguration config = parser.getDomConfig(); return ((Boolean) config.getParameter("namespaces")).booleanValue(); } - + public boolean isValidating() { DOMConfiguration config = parser.getDomConfig(); @@ -112,7 +112,7 @@ class DomDocumentBuilder { return impl; } - + public Document newDocument() { return impl.createDocument(null, null, null); @@ -225,4 +225,3 @@ class DomDocumentBuilder } } - diff --git a/libjava/classpath/gnu/xml/dom/DomDocumentBuilderFactory.java b/libjava/classpath/gnu/xml/dom/DomDocumentBuilderFactory.java index 4d2828af84e..1e3eaa58274 100644 --- a/libjava/classpath/gnu/xml/dom/DomDocumentBuilderFactory.java +++ b/libjava/classpath/gnu/xml/dom/DomDocumentBuilderFactory.java @@ -1,4 +1,4 @@ -/* DomDocumentBuilderFactory.java -- +/* DomDocumentBuilderFactory.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -156,7 +156,7 @@ public class DomDocumentBuilderFactory { // TODO } - + public void setFeature(String name, boolean value) throws ParserConfigurationException { @@ -177,6 +177,5 @@ public class DomDocumentBuilderFactory return secureProcessing; throw new ParserConfigurationException(name); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/DomDocumentConfiguration.java b/libjava/classpath/gnu/xml/dom/DomDocumentConfiguration.java index 5c589f82fe2..9aab44532e9 100644 --- a/libjava/classpath/gnu/xml/dom/DomDocumentConfiguration.java +++ b/libjava/classpath/gnu/xml/dom/DomDocumentConfiguration.java @@ -1,4 +1,4 @@ -/* DomDocumentConfiguration.java -- +/* DomDocumentConfiguration.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -245,12 +245,12 @@ class DomDocumentConfiguration return null; } } - + public int getLength() { return SUPPORTED_PARAMETERS.size(); } - + public boolean contains(String str) { str = str.toLowerCase(); diff --git a/libjava/classpath/gnu/xml/dom/DomDocumentFragment.java b/libjava/classpath/gnu/xml/dom/DomDocumentFragment.java index 8d260377821..8c4e0db3b62 100644 --- a/libjava/classpath/gnu/xml/dom/DomDocumentFragment.java +++ b/libjava/classpath/gnu/xml/dom/DomDocumentFragment.java @@ -1,4 +1,4 @@ -/* DomDocumentFragment.java -- +/* DomDocumentFragment.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -42,14 +42,14 @@ import org.w3c.dom.DocumentFragment; /** * <p> "DocumentFragment" implementation. </p> * - * @author David Brownell + * @author David Brownell * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> */ public class DomDocumentFragment extends DomNode implements DocumentFragment { - + /** * Constructs a DocumentFragment node associated with the * specified document. @@ -71,6 +71,5 @@ public class DomDocumentFragment { return "#document-fragment"; } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/DomElement.java b/libjava/classpath/gnu/xml/dom/DomElement.java index 462cb9178a6..429749978a3 100644 --- a/libjava/classpath/gnu/xml/dom/DomElement.java +++ b/libjava/classpath/gnu/xml/dom/DomElement.java @@ -1,4 +1,4 @@ -/* DomElement.java -- +/* DomElement.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -51,7 +51,7 @@ import org.w3c.dom.TypeInfo; /** * <p> "Element" implementation. * - * @author David Brownell + * @author David Brownell * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> */ public class DomElement @@ -81,7 +81,7 @@ public class DomElement * * @param owner The document with which this node is associated * @param namespaceURI Combined with the local part of the name, - * this is used to uniquely identify a type of element + * this is used to uniquely identify a type of element * @param name Name of this element, which may include a prefix */ protected DomElement(DomDocument owner, String namespaceURI, String name) @@ -99,18 +99,18 @@ public class DomElement * <p> * With this constructor, the prefix and local part are given explicitly * rather than being computed. This allows them to be explicitly set to - * {@code null} as required by {@link Document#createElement(String)}. + * {@code null} as required by {@link Document#createElement(String)}. * </p> * * @param owner The document with which this node is associated * @param namespaceURI Combined with the local part of the name, - * this is used to uniquely identify a type of element + * this is used to uniquely identify a type of element * @param name Name of this element, which may include a prefix * @param prefix the namespace prefix of the name. May be {@code null}. * @param localName the local part of the name. May be {@code null}. */ protected DomElement(DomDocument owner, String namespaceURI, String name, - String prefix, String localName) + String prefix, String localName) { super(ELEMENT_NODE, owner, namespaceURI, name, prefix, localName); } @@ -263,7 +263,7 @@ public class DomElement * <b>DOM L1</b> * Modifies an existing attribute to have the specified value, * or creates a new one with that value. The name used is the - * nodeName value. + * nodeName value. */ public void setAttribute(String name, String value) { @@ -476,7 +476,7 @@ public class DomElement } return super.lookupNamespaceURI(prefix); } - + public String getBaseURI() { if (attributes != null) @@ -490,7 +490,7 @@ public class DomElement } return super.getBaseURI(); } - + public TypeInfo getSchemaTypeInfo() { // DTD implementation @@ -509,7 +509,7 @@ public class DomElement Attr attr = (Attr) attrs.getNamedItem(name); setIdAttributeNode(attr, isId); } - + public void setIdAttributeNode(Attr attr, boolean isId) { if (readonly) @@ -578,5 +578,5 @@ public class DomElement } return true; } - + } diff --git a/libjava/classpath/gnu/xml/dom/DomEntity.java b/libjava/classpath/gnu/xml/dom/DomEntity.java index 3a76479a389..be44d735992 100644 --- a/libjava/classpath/gnu/xml/dom/DomEntity.java +++ b/libjava/classpath/gnu/xml/dom/DomEntity.java @@ -1,4 +1,4 @@ -/* DomEntity.java -- +/* DomEntity.java -- Copyright (C) 1999,2000,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,17 +45,17 @@ import org.w3c.dom.Entity; * particularly well in this API:</p><dl> * * <dt><em>Unparsed Entities</em></dt> - * <dd>Since ENTITY/ENTITIES attributes, the only legal use of unparsed - * entities in XML, can't be detected with DOM, there isn't much point in - * trying to use unparsed entities in DOM applications. (XML Linking is - * working to provide a better version of this functionality.) </dd> + * <dd>Since ENTITY/ENTITIES attributes, the only legal use of unparsed + * entities in XML, can't be detected with DOM, there isn't much point in + * trying to use unparsed entities in DOM applications. (XML Linking is + * working to provide a better version of this functionality.) </dd> * * <dt><em>Parsed Entities</em></dt> - * <dd> While the DOM specification permits nodes for parsed entities - * to have a readonly set of children, this is not required and there - * is no portable way to provide such children. <em>This implementation - * currently does not permit children to be added to Entities.</em> - * There are related issues with the use of EntityReference nodes. </dd> + * <dd> While the DOM specification permits nodes for parsed entities + * to have a readonly set of children, this is not required and there + * is no portable way to provide such children. <em>This implementation + * currently does not permit children to be added to Entities.</em> + * There are related issues with the use of EntityReference nodes. </dd> * * </dl> * @@ -65,14 +65,14 @@ import org.w3c.dom.Entity; * @see DomEntityReference * @see DomNotation * - * @author David Brownell + * @author David Brownell * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> */ public class DomEntity extends DomExtern implements Entity { - + private String notation; /** @@ -113,13 +113,13 @@ public class DomEntity } // DOM Level 3 methods - + public String getInputEncoding() { // TODO - return null; + return null; } - + public String getXmlEncoding() { // TODO @@ -142,6 +142,5 @@ public class DomEntity String systemId = getSystemId(); return (systemId == null) ? owner.getBaseURI() : systemId; } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/DomEntityReference.java b/libjava/classpath/gnu/xml/dom/DomEntityReference.java index d4596b405d4..1fa2ea628eb 100644 --- a/libjava/classpath/gnu/xml/dom/DomEntityReference.java +++ b/libjava/classpath/gnu/xml/dom/DomEntityReference.java @@ -1,4 +1,4 @@ -/* DomEntityReference.java -- +/* DomEntityReference.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -71,7 +71,7 @@ import org.w3c.dom.EntityReference; * @see DomDoctype * @see DomEntity * - * @author David Brownell + * @author David Brownell * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> */ public class DomEntityReference @@ -80,7 +80,7 @@ public class DomEntityReference { private String name; - + /** * Constructs an EntityReference node associated with the specified * document. The creator should populate this with whatever contents @@ -97,7 +97,7 @@ public class DomEntityReference super(ENTITY_REFERENCE_NODE, owner); this.name = name; } - + /** * Returns the name of the referenced entity. * @since DOM Level 1 Core diff --git a/libjava/classpath/gnu/xml/dom/DomEvent.java b/libjava/classpath/gnu/xml/dom/DomEvent.java index 9190ed8eb0e..3e9a6550a64 100644 --- a/libjava/classpath/gnu/xml/dom/DomEvent.java +++ b/libjava/classpath/gnu/xml/dom/DomEvent.java @@ -1,4 +1,4 @@ -/* DomEvent.java -- +/* DomEvent.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,7 +46,7 @@ import org.w3c.dom.events.EventTarget; import org.w3c.dom.events.MutationEvent; import org.w3c.dom.events.UIEvent; -import org.w3c.dom.views.AbstractView; // used by UIEvent +import org.w3c.dom.views.AbstractView; // used by UIEvent /** * "Event" implementation. Events are @@ -62,7 +62,7 @@ import org.w3c.dom.views.AbstractView; // used by UIEvent public class DomEvent implements Event { - + String type; // init EventTarget target; EventTarget currentNode; @@ -130,10 +130,10 @@ public class DomEvent { return timeStamp; } - + boolean stop; boolean doDefault; - + /** * Requests the event no longer be captured or bubbled; only * listeners on the event target will see the event, if they @@ -174,7 +174,7 @@ public class DomEvent cancelable = cancelableArg; timeStamp = System.currentTimeMillis(); } - + /** Constructs, but does not initialize, an event. */ public DomEvent(String type) { @@ -216,7 +216,7 @@ public class DomEvent buf.append("]"); return buf.toString(); } - + /** * "MutationEvent" implementation. */ @@ -224,46 +224,46 @@ public class DomEvent extends DomEvent implements MutationEvent { - + // package private Node relatedNode; // init - + private String prevValue; // init private String newValue; // init - + private String attrName; // init private short attrChange; // init - + /** Returns any "related" node provided by this type of event */ public final Node getRelatedNode() { return relatedNode; } - + /** Returns any "previous value" provided by this type of event */ public final String getPrevValue() { return prevValue; } - + /** Returns any "new value" provided by this type of event */ public final String getNewValue() { return newValue; } - + /** For attribute change events, returns the attribute's name */ public final String getAttrName() { return attrName; } - + /** For attribute change events, returns how the attribuet changed */ public final short getAttrChange() { return attrChange; } - + /** Initializes a mutation event */ public final void initMutationEvent(String typeArg, boolean canBubbleArg, @@ -281,7 +281,7 @@ public class DomEvent bubbles = canBubbleArg; cancelable = cancelableArg; timeStamp = System.currentTimeMillis(); - + relatedNode = relatedNodeArg; prevValue = prevValueArg; newValue = newValueArg; @@ -304,7 +304,7 @@ public class DomEvent { super(type); } - + } /** @@ -314,16 +314,16 @@ public class DomEvent extends DomEvent implements UIEvent { - + private AbstractView view; // init private int detail; // init - + /** Constructs an uninitialized User Interface (UI) event */ public DomUIEvent (String type) { super (type); } - + public final AbstractView getView () { return view; } public final int getDetail () { return detail; } - + /** Initializes a UI event */ public final void initUIEvent(String typeArg, boolean canBubbleArg, @@ -335,7 +335,7 @@ public class DomEvent view = viewArg; detail = detailArg; } - + } /* @@ -349,4 +349,3 @@ public class DomEvent */ } - diff --git a/libjava/classpath/gnu/xml/dom/DomExtern.java b/libjava/classpath/gnu/xml/dom/DomExtern.java index 87a6909f758..7f2e55afc6a 100644 --- a/libjava/classpath/gnu/xml/dom/DomExtern.java +++ b/libjava/classpath/gnu/xml/dom/DomExtern.java @@ -1,4 +1,4 @@ -/* DomExtern.java -- +/* DomExtern.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,17 +48,17 @@ package gnu.xml.dom; * of them is defined fully enough to permit full use of the * XML feature they partially expose. </p> * - * @author David Brownell + * @author David Brownell * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> */ public abstract class DomExtern extends DomNode { - + private final String name; private final String publicId; private final String systemId; - + /** * Constructs a node associated with the specified document, * with the specified descriptive data. @@ -98,7 +98,7 @@ public abstract class DomExtern { return publicId; } - + /** * <b>DOM L1</b> * Returns the object's name. @@ -112,6 +112,5 @@ public abstract class DomExtern { return name; } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/DomImpl.java b/libjava/classpath/gnu/xml/dom/DomImpl.java index cabe741c931..76a63caf60c 100644 --- a/libjava/classpath/gnu/xml/dom/DomImpl.java +++ b/libjava/classpath/gnu/xml/dom/DomImpl.java @@ -1,4 +1,4 @@ -/* DomImpl.java -- +/* DomImpl.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,13 +64,13 @@ import gnu.xml.dom.ls.DomLSSerializer; * It is possible to compile the package so it doesn't support some of these * features (notably, Traversal). * - * @author David Brownell + * @author David Brownell * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> */ public class DomImpl implements DOMImplementation, DOMImplementationLS { - + /** * Constructs a DOMImplementation object which supports * "XML" and other DOM Level 2 features. @@ -95,7 +95,7 @@ public class DomImpl { name = name.substring(1); } - + if ("xml".equals(name) || "core".equals(name)) { return (version == null || @@ -103,7 +103,7 @@ public class DomImpl "1.0".equals(version) || "2.0".equals(version) || "3.0".equals(version)); - + } else if ("ls".equals(name) || "ls-async".equals(name)) { @@ -120,7 +120,7 @@ public class DomImpl return (version == null || "".equals(version) || "2.0".equals(version)); - + // Extension: "USER-" prefix event types can // be created and passed through the DOM. @@ -131,11 +131,11 @@ public class DomImpl "".equals(version) || "0.1".equals(version)); - // NOTE: "hasFeature" for events is here interpreted to - // mean the DOM can manufacture those sorts of events, - // since actually choosing to report the events is more - // often part of the environment or application. It's - // only really an issue for mutation events. + // NOTE: "hasFeature" for events is here interpreted to + // mean the DOM can manufacture those sorts of events, + // since actually choosing to report the events is more + // often part of the environment or application. It's + // only really an issue for mutation events. } else if (DomNode.reportMutations @@ -143,7 +143,7 @@ public class DomImpl { return (version == null || "".equals(version) || - "2.0".equals(version)); + "2.0".equals(version)); } else if ("xpath".equals(name)) { @@ -162,7 +162,7 @@ public class DomImpl // stylesheets // css, css2 // range - + return false; } @@ -208,7 +208,7 @@ public class DomImpl { Document doc = createDocument(); Element root = null; - + if (rootName != null) { root = doc.createElementNS(namespaceURI, rootName); @@ -221,7 +221,7 @@ public class DomImpl // Bleech -- L2 seemingly _requires_ omission of xmlns attributes. if (doctype != null) { - doc.appendChild(doctype); // handles WRONG_DOCUMENT error + doc.appendChild(doctype); // handles WRONG_DOCUMENT error } if (root != null) { @@ -236,7 +236,7 @@ public class DomImpl } // DOM Level 3 - + public Object getFeature(String feature, String version) { if (hasFeature(feature, version)) @@ -273,6 +273,5 @@ public class DomImpl { return new DomLSOutput(); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/DomIterator.java b/libjava/classpath/gnu/xml/dom/DomIterator.java index 31f9982467b..d5f305cd845 100644 --- a/libjava/classpath/gnu/xml/dom/DomIterator.java +++ b/libjava/classpath/gnu/xml/dom/DomIterator.java @@ -1,4 +1,4 @@ -/* DomIterator.java -- +/* DomIterator.java -- Copyright (C) 1999, 2000, 2001, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,21 +50,21 @@ import org.w3c.dom.traversal.NodeIterator; * <p> "NodeIterator" implementation, usable with any L2 DOM which * supports MutationEvents. </p> * - * @author David Brownell + * @author David Brownell */ public final class DomIterator implements NodeIterator, EventListener { - + private Node reference; private boolean right; private boolean done; - + private final Node root; private final int whatToShow; private final NodeFilter filter; private final boolean expandEntityReferences; - + /** * Constructs and initializes an iterator. */ @@ -73,22 +73,22 @@ public final class DomIterator NodeFilter filter, boolean entityReferenceExpansion) { - if (!root.isSupported("MutationEvents", "2.0")) + if (!root.isSupported("MutationEvents", "2.0")) { throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR, "Iterator needs mutation events", root, 0); } - + this.root = root; this.whatToShow = whatToShow; this.filter = filter; this.expandEntityReferences = entityReferenceExpansion; - + // start condition: going right, seen nothing yet. reference = null; right = true; - - EventTarget target = (EventTarget) root; + + EventTarget target = (EventTarget) root; target.addEventListener("DOMNodeRemoved", this, false); } @@ -100,7 +100,7 @@ public final class DomIterator */ public void detach() { - EventTarget target = (EventTarget) root; + EventTarget target = (EventTarget) root; target.removeEventListener("DOMNodeRemoved", this, false); done = true; } @@ -114,7 +114,7 @@ public final class DomIterator { return expandEntityReferences; } - + /** * <b>DOM L2</b> * Returns the filter provided during construction. @@ -123,7 +123,7 @@ public final class DomIterator { return filter; } - + /** * <b>DOM L2</b> * Returns the root of the tree this is iterating through. @@ -132,7 +132,7 @@ public final class DomIterator { return root; } - + /** * <b>DOM L2</b> * Returns the mask of flags provided during construction. @@ -141,7 +141,7 @@ public final class DomIterator { return whatToShow; } - + /** * <b>DOM L2</b> * Returns the next node in a forward iteration, masked and filtered. @@ -228,7 +228,7 @@ public final class DomIterator } return leaf; } - + // // Returns the immediate successor in a forward (or backward) // document order walk, sans filtering ... except that it knows @@ -253,13 +253,13 @@ public final class DomIterator { return here.getFirstChild(); } - + // There's no way up or sideways from the root, so if we // couldn't move down to a child, there's nowhere to go. // if (here == root) return null; - + // // Siblings ... if forward, we visit them, if backwards // we visit their children first. @@ -284,7 +284,7 @@ public final class DomIterator } return next; } - + // // We can't go down or lateral -- it's up, then. The logic is // the converse of what's above: backwards is easy (the parent @@ -295,7 +295,7 @@ public final class DomIterator { return next; } - + Node temp = null; while (next != null && next != root @@ -303,7 +303,7 @@ public final class DomIterator { next = next.getParentNode(); } - + // If we have exceeded the root node then stop traversing. if (next == root.getParentNode()) { @@ -324,7 +324,7 @@ public final class DomIterator { MutationEvent event; Node ancestor, removed; - + if (reference == null || !"DOMNodeRemoved".equals(e.getType()) || e.getEventPhase() != Event.BUBBLING_PHASE) @@ -372,10 +372,9 @@ search: } return; } - + // The current DOM WD talks about a special case here; // I've not yet seen it. } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/DomNSResolverContext.java b/libjava/classpath/gnu/xml/dom/DomNSResolverContext.java index 4cf57772e9b..3dd9575605c 100644 --- a/libjava/classpath/gnu/xml/dom/DomNSResolverContext.java +++ b/libjava/classpath/gnu/xml/dom/DomNSResolverContext.java @@ -1,4 +1,4 @@ -/* DomNSResolverContext.java -- +/* DomNSResolverContext.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,41 +50,41 @@ class DomNSResolverContext implements NamespaceContext, Iterator { - final XPathNSResolver resolver; - - DomNSResolverContext(XPathNSResolver resolver) - { - this.resolver = resolver; - } - - public String getNamespaceURI(String prefix) - { - return resolver.lookupNamespaceURI(prefix); - } - - public String getPrefix(String namespaceURI) - { - return null; - } - - public Iterator getPrefixes(String namespaceURI) - { - return this; - } - - public boolean hasNext() - { - return false; - } - - public Object next() - { - return null; - } - - public void remove() - { - throw new UnsupportedOperationException(); - } + final XPathNSResolver resolver; + + DomNSResolverContext(XPathNSResolver resolver) + { + this.resolver = resolver; + } + + public String getNamespaceURI(String prefix) + { + return resolver.lookupNamespaceURI(prefix); + } + + public String getPrefix(String namespaceURI) + { + return null; + } + + public Iterator getPrefixes(String namespaceURI) + { + return this; + } + + public boolean hasNext() + { + return false; + } + + public Object next() + { + return null; + } + + public void remove() + { + throw new UnsupportedOperationException(); + } } diff --git a/libjava/classpath/gnu/xml/dom/DomNamedNodeMap.java b/libjava/classpath/gnu/xml/dom/DomNamedNodeMap.java index e37cc3dceb5..7a767355a31 100644 --- a/libjava/classpath/gnu/xml/dom/DomNamedNodeMap.java +++ b/libjava/classpath/gnu/xml/dom/DomNamedNodeMap.java @@ -1,4 +1,4 @@ -/* DomNamedNodeMap.java -- +/* DomNamedNodeMap.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,7 +46,7 @@ import org.w3c.dom.Node; * Used mostly to hold element attributes, but sometimes also * to list notations or entities. * - * @author David Brownell + * @author David Brownell * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> */ public class DomNamedNodeMap @@ -55,11 +55,11 @@ public class DomNamedNodeMap final DomNode owner; final short type; - + DomNode first; int length; boolean readonly; - + // package private DomNamedNodeMap(DomNode owner, short type) { @@ -76,8 +76,8 @@ public class DomNamedNodeMap public final boolean isReadonly() { return readonly; - } - + } + /** * Sets the internal "readonly" flag so the node and its * children can't be changed. @@ -90,7 +90,7 @@ public class DomNamedNodeMap ctx.makeReadonly(); } } - + /** * <b>DOM L1</b> * Returns the named item from the map, or null; names are just @@ -189,7 +189,7 @@ public class DomNamedNodeMap node.parent = owner; node.depth = owner.depth + 1; } - + String nodeName = node.getNodeName(); String localName = ns ? node.getLocalName() : null; String namespaceURI = ns ? node.getNamespaceURI() : null; @@ -197,7 +197,7 @@ public class DomNamedNodeMap { namespaceURI = null; } - + // maybe attribute ADDITION events (?) DomNode last = null; for (DomNode ctx = first; ctx != null; ctx = ctx.next) @@ -373,10 +373,10 @@ public class DomNamedNodeMap ctx.index = 0; return ctx; } - } + } throw new DomDOMException(DOMException.NOT_FOUND_ERR); } - + String getDefaultValue(String name) { DomDoctype doctype = (DomDoctype) owner.owner.getDoctype(); @@ -417,5 +417,5 @@ public class DomNamedNodeMap { return length; } - + } diff --git a/libjava/classpath/gnu/xml/dom/DomNode.java b/libjava/classpath/gnu/xml/dom/DomNode.java index 78e1ab85c85..879baaa8d4c 100644 --- a/libjava/classpath/gnu/xml/dom/DomNode.java +++ b/libjava/classpath/gnu/xml/dom/DomNode.java @@ -1,4 +1,4 @@ -/* DomNode.java -- +/* DomNode.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -102,10 +102,10 @@ public abstract class DomNode //final static String xmlnsURI = "http://www.w3.org/2000/xmlns/"; // tunable - // NKIDS_* affects arrays of children (which grow) + // NKIDS_* affects arrays of children (which grow) // (currently) fixed size: - // ANCESTORS_* is for event capture/bubbling, # ancestors - // NOTIFICATIONS_* is for per-node event delivery, # events + // ANCESTORS_* is for event capture/bubbling, # ancestors + // NOTIFICATIONS_* is for per-node event delivery, # events private static final int NKIDS_DELTA = 8; private static final int ANCESTORS_INIT = 20; private static final int NOTIFICATIONS_INIT = 10; @@ -193,7 +193,7 @@ public abstract class DomNode this.owner = owner; this.listeners = new HashSet(); } - + /** * <b>DOM L1</b> @@ -314,7 +314,7 @@ public abstract class DomNode this.owner; DomDocument childOwner = child.owner; short childNodeType = child.nodeType; - + if (childOwner != owner) { // new in DOM L2, this case -- patch it up later, in reparent() @@ -338,7 +338,7 @@ public abstract class DomNode return; } break; - + case ATTRIBUTE_NODE: switch (childNodeType) { @@ -347,7 +347,7 @@ public abstract class DomNode return; } break; - + case DOCUMENT_FRAGMENT_NODE: case ENTITY_REFERENCE_NODE: case ELEMENT_NODE: @@ -384,7 +384,7 @@ public abstract class DomNode this, 0); } } - + // Here's hoping a good optimizer will detect the case when the // next several methods are never called, and won't allocate // object code space of any kind. (Case: not reporting any @@ -399,7 +399,7 @@ public abstract class DomNode return; } boolean doFree = false; - + if (event == null) { event = getMutationEvent(); @@ -531,7 +531,7 @@ public abstract class DomNode { try { - DomNode child = (DomNode) newChild; + DomNode child = (DomNode) newChild; if (child.nodeType == DOCUMENT_FRAGMENT_NODE) { @@ -610,9 +610,9 @@ public abstract class DomNode try { - DomNode child = (DomNode) newChild; + DomNode child = (DomNode) newChild; DomNode ref = (DomNode) refChild; - + if (child.nodeType == DOCUMENT_FRAGMENT_NODE) { // Append all nodes in the fragment to this node @@ -641,7 +641,7 @@ public abstract class DomNode "can't insert node before itself", ref, 0); } - + if (child.parent != null) { child.parent.removeChild(child); @@ -672,7 +672,7 @@ public abstract class DomNode } length++; } - + return child; } catch (ClassCastException e) @@ -713,10 +713,10 @@ public abstract class DomNode { DomNode child = (DomNode) newChild; DomNode ref = (DomNode) refChild; - + DomEvent.DomMutationEvent event = getMutationEvent(); boolean doFree = (event != null); - + if (child.nodeType == DOCUMENT_FRAGMENT_NODE) { // Append all nodes in the fragment to this node @@ -729,14 +729,14 @@ public abstract class DomNode throw new DomDOMException(DOMException.NOT_FOUND_ERR, null, ref, 0); } - + if (reportMutations) { removalEvent(event, ref); } length--; length += child.length; - + if (child.length == 0) { // Removal @@ -793,12 +793,12 @@ public abstract class DomNode throw new DomDOMException(DOMException.NOT_FOUND_ERR, null, ref, 0); } - + if (reportMutations) { removalEvent(event, ref); } - + if (child.parent != null) { child.parent.removeChild(child); @@ -839,7 +839,7 @@ public abstract class DomNode ref.setDepth(0); ref.previous = null; ref.next = null; - + return ref; } catch (ClassCastException e) @@ -875,7 +875,7 @@ public abstract class DomNode throw new DomDOMException(DOMException.NO_MODIFICATION_ALLOWED_ERR, null, this, 0); } - + for (DomNode child = first; child != null; child = child.next) { if (child == ref) @@ -913,7 +913,7 @@ public abstract class DomNode ref.index = 0; ref.previous = null; ref.next = null; - + return ref; } } @@ -1002,9 +1002,9 @@ public abstract class DomNode */ public boolean isSupported(String feature, String version) { - Document doc = owner; - DOMImplementation impl = null; - + Document doc = owner; + DOMImplementation impl = null; + if (doc == null && nodeType == DOCUMENT_NODE) { doc = (Document) this; @@ -1183,7 +1183,7 @@ public abstract class DomNode try { DomNode node = (DomNode) super.clone(); - + node.parent = null; node.depth = 0; node.index = 0; @@ -1192,7 +1192,7 @@ public abstract class DomNode node.last = null; node.previous = null; node.next = null; - + node.readonly = false; node.listeners = new HashSet(); node.nListeners = 0; @@ -1242,7 +1242,7 @@ public abstract class DomNode { private LiveNodeList liveList; - + ShadowList(String ns, String local) { liveList = new LiveNodeList(ns, local); @@ -1268,15 +1268,15 @@ public abstract class DomNode final class LiveNodeList implements NodeList, EventListener, NodeFilter { - + private final boolean matchAnyURI; - private final boolean matchAnyName; + private final boolean matchAnyName; private final String elementURI; private final String elementName; - + private DomIterator current; private int lastIndex; - + LiveNodeList(String uri, String name) { elementURI = uri; @@ -1336,28 +1336,28 @@ public abstract class DomNode { return new DomIterator(DomNode.this, NodeFilter.SHOW_ELEMENT, - this, /* filter */ - true /* expand entity refs */ + this, /* filter */ + true /* expand entity refs */ ); } public void handleEvent(Event e) { - MutationEvent mutation = (MutationEvent) e; - Node related = mutation.getRelatedNode(); - + MutationEvent mutation = (MutationEvent) e; + Node related = mutation.getRelatedNode(); + // XXX if it's got children ... check all kids too, they // will invalidate our saved index - + if (related.getNodeType() != Node.ELEMENT_NODE || related.getNodeName() != elementName || related.getNamespaceURI() != elementURI) { return; } - + if (current != null) - current.detach(); + current.detach(); current = null; } @@ -1368,7 +1368,7 @@ public abstract class DomNode current = createIterator(); lastIndex = -1; } - + // last node or before? go backwards if (index <= lastIndex) { while (index != lastIndex) { @@ -1376,11 +1376,11 @@ public abstract class DomNode lastIndex--; } Node ret = current.previousNode (); - current.detach(); + current.detach(); current = null; return ret; - } - + } + // somewhere after last node while (++lastIndex != index) current.nextNode (); @@ -1390,12 +1390,12 @@ public abstract class DomNode current = null; return ret; } - + public int getLength() { int retval = 0; NodeIterator iter = createIterator(); - + while (iter.nextNode() != null) { retval++; @@ -1403,7 +1403,7 @@ public abstract class DomNode iter.detach(); return retval; } - + } // @@ -1411,7 +1411,7 @@ public abstract class DomNode // static final class ListenerRecord { - + String type; EventListener listener; boolean useCapture; @@ -1435,10 +1435,10 @@ public abstract class DomNode && useCapture == rec.useCapture && type == rec.type; } - + public int hashCode() { - return listener.hashCode() ^ type.hashCode(); + return listener.hashCode() ^ type.hashCode(); } } @@ -1456,32 +1456,32 @@ public abstract class DomNode * of DomEvent and pass that to dispatchEvent(). * * @param eventType Identifies the particular DOM feature module - * defining the type of event, such as "MutationEvents". - * <em>The event "name" is a different kind of "type".</em> + * defining the type of event, such as "MutationEvents". + * <em>The event "name" is a different kind of "type".</em> */ public Event createEvent(String eventType) { eventType = eventType.toLowerCase(); - + if ("mutationevents".equals(eventType)) { return new DomEvent.DomMutationEvent(null); } - + if ("htmlevents".equals(eventType) || "events".equals(eventType) || "user-events".equals(eventType)) { return new DomEvent(null); } - + if ("uievents".equals(eventType)) { return new DomEvent.DomUIEvent(null); } - // mouse events - + // mouse events + throw new DomDOMException(DOMException.NOT_SUPPORTED_ERR, eventType, null, 0); } @@ -1508,12 +1508,12 @@ public abstract class DomNode static final class DomEventException extends EventException { - + DomEventException() { super(UNSPECIFIED_EVENT_TYPE_ERR, "unspecified event type"); } - + } /** @@ -1527,7 +1527,7 @@ public abstract class DomNode * * @exception NullPointerException When a null event is passed. * @exception ClassCastException When the event wasn't provided by - * the createEvent method, or otherwise isn't a DomEvent. + * the createEvent method, or otherwise isn't a DomEvent. * @exception EventException If the event type wasn't specified */ public final boolean dispatchEvent(Event event) @@ -1537,7 +1537,7 @@ public abstract class DomNode DomNode[] ancestors = null; int ancestorMax = 0; boolean haveDispatchDataLock = false; - + if (e.type == null) { throw new DomEventException(); @@ -1545,7 +1545,7 @@ public abstract class DomNode e.doDefault = true; e.target = this; - + // // Typical case: one nonrecursive dispatchEvent call at a time // for this class. If that's our case, we can avoid allocating @@ -1565,7 +1565,7 @@ public abstract class DomNode boolean haveAncestorRegistrations = false; ListenerRecord[] notificationSet; int ancestorLen; - + synchronized (lockNode) { if (!dispatchDataLock) @@ -1581,7 +1581,7 @@ public abstract class DomNode } ancestorLen = ancestors.length; } - + // Climb to the top of this subtree and handle capture, letting // each node (from the top down) capture until one stops it or // until we get to this one. @@ -1597,7 +1597,7 @@ public abstract class DomNode { if (current == null || current.depth == 0) break; - + if (current.nListeners != 0) { haveAncestorRegistrations = true; @@ -1609,10 +1609,10 @@ public abstract class DomNode { throw new RuntimeException("dispatchEvent capture stack size"); } - + ancestorMax = index; e.stop = false; - + if (haveAncestorRegistrations) { e.eventPhase = Event.CAPTURING_PHASE; @@ -1625,7 +1625,7 @@ public abstract class DomNode } } } - + // Always deliver events to the target node (this) // unless stopPropagation was called. If we saw // no registrations yet (typical!), we never will. @@ -1638,11 +1638,11 @@ public abstract class DomNode { e.stop = true; } - + // If the event bubbles and propagation wasn't halted, // walk back up the ancestor list. Stop bubbling when // any bubbled event handler stops it. - + if (!e.stop && e.bubbles) { e.eventPhase = Event.BUBBLING_PHASE; @@ -1659,11 +1659,11 @@ public abstract class DomNode } } e.eventPhase = 0; - + // Caller chooses whether to perform the default // action based on return from this method. return e.doDefault; - + } finally { @@ -1678,13 +1678,13 @@ public abstract class DomNode ancestors [i] = null; } // notificationSet handled by notifyNode - + dispatchDataLock = false; } } } } - + private void notifyNode(DomEvent e, DomNode current, boolean capture, @@ -1704,7 +1704,7 @@ public abstract class DomNode { continue; } - if (!e.type.equals (rec.type)) + if (!e.type.equals (rec.type)) { continue; } @@ -1722,18 +1722,18 @@ public abstract class DomNode iter = null; // Notify just those listeners - e.currentNode = current; + e.currentNode = current; for (int i = 0; i < count; i++) { try { - iter = current.listeners.iterator(); + iter = current.listeners.iterator(); // Late in the DOM CR process (3rd or 4th CR?) the // removeEventListener spec became asymmetric with respect // to addEventListener ... effect is now immediate. - while (iter.hasNext()) + while (iter.hasNext()) { - ListenerRecord rec = (ListenerRecord)iter.next(); + ListenerRecord rec = (ListenerRecord)iter.next(); if (rec.equals(notificationSet[i])) { @@ -1747,7 +1747,7 @@ public abstract class DomNode { // ignore all exceptions } - notificationSet[i] = null; // free for GC + notificationSet[i] = null; // free for GC } } @@ -2074,7 +2074,7 @@ public abstract class DomNode } if (ctx != null || argCtx != null) return false; - + // TODO DocumentType return true; } @@ -2082,9 +2082,9 @@ public abstract class DomNode boolean equal(String arg1, String arg2) { return ((arg1 == null && arg2 == null) || - (arg1 != null && arg1.equals(arg2))); + (arg1 != null && arg1.equals(arg2))); } - + public Object getFeature(String feature, String version) { DOMImplementation impl = (nodeType == DOCUMENT_NODE) ? @@ -2145,7 +2145,7 @@ public abstract class DomNode buf.append(']'); return buf.toString(); } - + String encode(String value) { CPStringBuilder buf = null; @@ -2220,4 +2220,3 @@ public abstract class DomNode } } - diff --git a/libjava/classpath/gnu/xml/dom/DomNodeIterator.java b/libjava/classpath/gnu/xml/dom/DomNodeIterator.java index 8001556e580..9f9ec7e3937 100644 --- a/libjava/classpath/gnu/xml/dom/DomNodeIterator.java +++ b/libjava/classpath/gnu/xml/dom/DomNodeIterator.java @@ -1,4 +1,4 @@ -/* DomNodeIterator.java -- +/* DomNodeIterator.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -140,7 +140,7 @@ public class DomNodeIterator current = (ret == null) ? current : ret; } while (!accept(ret)); - + return ret; } diff --git a/libjava/classpath/gnu/xml/dom/DomNotation.java b/libjava/classpath/gnu/xml/dom/DomNotation.java index 26e78724f27..abb0e9da97e 100644 --- a/libjava/classpath/gnu/xml/dom/DomNotation.java +++ b/libjava/classpath/gnu/xml/dom/DomNotation.java @@ -1,4 +1,4 @@ -/* DomNotation.java -- +/* DomNotation.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -56,14 +56,14 @@ import org.w3c.dom.Notation; * @see DomEntity * @see DomPI * - * @author David Brownell + * @author David Brownell * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> */ public class DomNotation extends DomExtern implements Notation { - + /** * Constructs a Notation node associated with the specified document, * with the specified descriptive data. Note that at least one of @@ -72,7 +72,7 @@ public class DomNotation * * <p>This constructor should only be invoked by a DomDoctype object * as part of its declareNotation functionality, or through a subclass - * which is similarly used in a "Sub-DOM" style layer. + * which is similarly used in a "Sub-DOM" style layer. * * @param owner The document with which this notation is associated * @param name Name of this notation @@ -87,7 +87,7 @@ public class DomNotation super(NOTATION_NODE, owner, name, publicId, systemId); makeReadonly(); } - + /** * The base URI of an external entity is its system ID. * The base URI of an internal entity is the parent document's base URI. @@ -98,6 +98,5 @@ public class DomNotation String systemId = getSystemId(); return (systemId == null) ? owner.getBaseURI() : systemId; } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/DomNsNode.java b/libjava/classpath/gnu/xml/dom/DomNsNode.java index d3361515b70..55e351185e3 100644 --- a/libjava/classpath/gnu/xml/dom/DomNsNode.java +++ b/libjava/classpath/gnu/xml/dom/DomNsNode.java @@ -1,4 +1,4 @@ -/* DomNsNode.java -- +/* DomNsNode.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,25 +44,25 @@ import org.w3c.dom.DOMException; * <p> Abstract implemention of namespace support. This facilitates * sharing code for attribute and element nodes. * - * @author David Brownell + * @author David Brownell * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> */ public abstract class DomNsNode extends DomNode { - + private String name; private String namespace; private String prefix; private String localName; - + /** * Constructs a node associated with the specified document, and * with the specified namespace information. * * @param owner The document with which this entity is associated * @param namespaceURI Combined with the local part of the name, - * this identifies a type of element or attribute; may be null. + * this identifies a type of element or attribute; may be null. * If this is the empty string, it is reassigned as null so that * applications only need to test that case. * @param name Name of this node, which may include a prefix @@ -84,7 +84,7 @@ public abstract class DomNsNode * * @param owner The document with which this entity is associated * @param namespaceURI Combined with the local part of the name, - * this identifies a type of element or attribute; may be null. + * this identifies a type of element or attribute; may be null. * If this is the empty string, it is reassigned as null so that * applications only need to test that case. * @param name Name of this node, which may include a prefix @@ -93,7 +93,7 @@ public abstract class DomNsNode */ // package private DomNsNode(short nodeType, DomDocument owner, String namespaceURI, String name, - String prefix, String localName) + String prefix, String localName) { super(nodeType, owner); this.name = name.intern(); @@ -126,7 +126,7 @@ public abstract class DomNsNode localName = name.substring(index + 1).intern(); } } - + /** * <b>DOM L2</b> * Returns the node's namespace URI @@ -145,7 +145,7 @@ public abstract class DomNsNode } namespace = (namespaceURI == null) ? null : namespaceURI.intern(); } - + /** * <b>DOM L2</b> * Returns any prefix part of the node's name (before any colon). @@ -222,6 +222,5 @@ public abstract class DomNsNode { return localName; } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/DomProcessingInstruction.java b/libjava/classpath/gnu/xml/dom/DomProcessingInstruction.java index 2c90967d00f..6d443a29373 100644 --- a/libjava/classpath/gnu/xml/dom/DomProcessingInstruction.java +++ b/libjava/classpath/gnu/xml/dom/DomProcessingInstruction.java @@ -1,4 +1,4 @@ -/* DomProcessingInstruction.java -- +/* DomProcessingInstruction.java -- Copyright (C) 1999,2000,2001,2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,24 +55,24 @@ import org.w3c.dom.ProcessingInstruction; * * @see DomNotation * - * @author David Brownell + * @author David Brownell * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> */ public class DomProcessingInstruction extends DomNode implements ProcessingInstruction { - + private String target; private String data; - + /** * Constructs a ProcessingInstruction node associated with the * specified document, with the specified data. * * <p>This constructor should only be invoked by a Document object as * part of its createProcessingInstruction functionality, or through - * a subclass which is similarly used in a "Sub-DOM" style layer. + * a subclass which is similarly used in a "Sub-DOM" style layer. */ protected DomProcessingInstruction(DomDocument owner, String target, String data) @@ -129,7 +129,7 @@ public class DomProcessingInstruction { setNodeValue(data); } - + /** * <b>DOM L1</b> * Assigns the data associated with the processing instruction. @@ -142,6 +142,5 @@ public class DomProcessingInstruction } this.data = data; } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/DomText.java b/libjava/classpath/gnu/xml/dom/DomText.java index 167eba3c1d2..b74c5b4c2a9 100644 --- a/libjava/classpath/gnu/xml/dom/DomText.java +++ b/libjava/classpath/gnu/xml/dom/DomText.java @@ -1,4 +1,4 @@ -/* DomText.java -- +/* DomText.java -- Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,24 +45,24 @@ import org.w3c.dom.Text; /** * <p> "Text" implementation. </p> * - * @author David Brownell + * @author David Brownell * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> */ public class DomText extends DomCharacterData implements Text { - + // NOTE: deleted unused per-instance "isIgnorable" // support to reclaim its space. - + /** * Constructs a text node associated with the specified * document and holding the specified data. * * <p>This constructor should only be invoked by a Document object * as part of its createTextNode functionality, or through a subclass - * which is similarly used in a "Sub-DOM" style layer. + * which is similarly used in a "Sub-DOM" style layer. */ protected DomText(DomDocument owner, String value) { @@ -112,7 +112,7 @@ public class DomText String before = text.substring(0, offset); String after = text.substring(offset); Text next; - + if (getNodeType() == TEXT_NODE) { next = owner.createTextNode(after); @@ -121,7 +121,7 @@ public class DomText { next = owner.createCDATASection(after); } - + if (this.next != null) { parent.insertBefore(next, this.next); @@ -132,16 +132,16 @@ public class DomText } setNodeValue(before); return next; - + } catch (IndexOutOfBoundsException x) { throw new DomDOMException(DOMException.INDEX_SIZE_ERR); } } - + // DOM Level 3 - + public boolean isElementContentWhitespace() { if (parent != null) @@ -192,7 +192,7 @@ public class DomText { setNodeValue(content); } - + DomNode ref = this; DomNode ctx; for (ctx = previous; ctx != null && @@ -218,5 +218,5 @@ public class DomText } return (isEmpty) ? null : this; } - + } diff --git a/libjava/classpath/gnu/xml/dom/DomXPathExpression.java b/libjava/classpath/gnu/xml/dom/DomXPathExpression.java index 25187520c0f..0b69629300b 100644 --- a/libjava/classpath/gnu/xml/dom/DomXPathExpression.java +++ b/libjava/classpath/gnu/xml/dom/DomXPathExpression.java @@ -1,4 +1,4 @@ -/* DomXPathExpression.java -- +/* DomXPathExpression.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -73,13 +73,13 @@ implements org.w3c.dom.xpath.XPathExpression { this.doc = doc; this.resolver = resolver; - - XPathFactory factory = XPathFactory.newInstance(); - XPath xpath = factory.newXPath(); - if (resolver != null) - { - xpath.setNamespaceContext(new DomNSResolverContext(resolver)); - } + + XPathFactory factory = XPathFactory.newInstance(); + XPath xpath = factory.newXPath(); + if (resolver != null) + { + xpath.setNamespaceContext(new DomNSResolverContext(resolver)); + } try { this.expression = xpath.compile(expression); @@ -87,61 +87,61 @@ implements org.w3c.dom.xpath.XPathExpression catch (XPathExpressionException e) { throw new XPathException(XPathException.INVALID_EXPRESSION_ERR, - e.getMessage ()); + e.getMessage ()); } } public Object evaluate(Node contextNode, short type, Object result) throws XPathException, DOMException { - try - { - QName typeName = null; - switch (type) - { - case XPathResult.BOOLEAN_TYPE: - typeName = XPathConstants.BOOLEAN; - break; - case XPathResult.NUMBER_TYPE: - typeName = XPathConstants.NUMBER; - break; - case XPathResult.STRING_TYPE: - typeName = XPathConstants.STRING; - break; - case XPathResult.ANY_UNORDERED_NODE_TYPE: - case XPathResult.FIRST_ORDERED_NODE_TYPE: - typeName = XPathConstants.NODE; - break; - case XPathResult.UNORDERED_NODE_ITERATOR_TYPE: - case XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE: - case XPathResult.ORDERED_NODE_ITERATOR_TYPE: - case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE: - typeName = XPathConstants.NODESET; - break; - default: - throw new XPathException(XPathException.TYPE_ERR, null); - } - Object val = expression.evaluate(contextNode, typeName); - switch (type) - { - case XPathResult.ORDERED_NODE_ITERATOR_TYPE: - case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE: - // Sort the nodes - List ns = new ArrayList((Collection) val); - Collections.sort(ns, new DocumentOrderComparator()); - val = ns; - } - return new DomXPathResult(val, type); - } - catch (javax.xml.xpath.XPathException e) - { - throw new XPathException(XPathException.TYPE_ERR, e.getMessage()); - } + try + { + QName typeName = null; + switch (type) + { + case XPathResult.BOOLEAN_TYPE: + typeName = XPathConstants.BOOLEAN; + break; + case XPathResult.NUMBER_TYPE: + typeName = XPathConstants.NUMBER; + break; + case XPathResult.STRING_TYPE: + typeName = XPathConstants.STRING; + break; + case XPathResult.ANY_UNORDERED_NODE_TYPE: + case XPathResult.FIRST_ORDERED_NODE_TYPE: + typeName = XPathConstants.NODE; + break; + case XPathResult.UNORDERED_NODE_ITERATOR_TYPE: + case XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE: + case XPathResult.ORDERED_NODE_ITERATOR_TYPE: + case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE: + typeName = XPathConstants.NODESET; + break; + default: + throw new XPathException(XPathException.TYPE_ERR, null); + } + Object val = expression.evaluate(contextNode, typeName); + switch (type) + { + case XPathResult.ORDERED_NODE_ITERATOR_TYPE: + case XPathResult.ORDERED_NODE_SNAPSHOT_TYPE: + // Sort the nodes + List ns = new ArrayList((Collection) val); + Collections.sort(ns, new DocumentOrderComparator()); + val = ns; + } + return new DomXPathResult(val, type); + } + catch (javax.xml.xpath.XPathException e) + { + throw new XPathException(XPathException.TYPE_ERR, e.getMessage()); + } } public String toString () { return getClass ().getName () + "[expression=" + expression + "]"; } - + } diff --git a/libjava/classpath/gnu/xml/dom/DomXPathNSResolver.java b/libjava/classpath/gnu/xml/dom/DomXPathNSResolver.java index 96dfd97d46a..fb0719a4e87 100644 --- a/libjava/classpath/gnu/xml/dom/DomXPathNSResolver.java +++ b/libjava/classpath/gnu/xml/dom/DomXPathNSResolver.java @@ -1,4 +1,4 @@ -/* DomXPathNSResolver.java -- +/* DomXPathNSResolver.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -60,5 +60,5 @@ implements XPathNSResolver { return node.lookupNamespaceURI (prefix); } - + } diff --git a/libjava/classpath/gnu/xml/dom/DomXPathResult.java b/libjava/classpath/gnu/xml/dom/DomXPathResult.java index bed249624f9..da8fcf5130c 100644 --- a/libjava/classpath/gnu/xml/dom/DomXPathResult.java +++ b/libjava/classpath/gnu/xml/dom/DomXPathResult.java @@ -1,4 +1,4 @@ -/* DomXPathResult.java -- +/* DomXPathResult.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/gnu/xml/dom/ImplementationList.java b/libjava/classpath/gnu/xml/dom/ImplementationList.java index 8c0f4491610..c99f55d0da4 100644 --- a/libjava/classpath/gnu/xml/dom/ImplementationList.java +++ b/libjava/classpath/gnu/xml/dom/ImplementationList.java @@ -1,4 +1,4 @@ -/* ImplementationList.java -- +/* ImplementationList.java -- Copyright (C) 2004 Free Software Foundation, Inc.. This file is part of GNU Classpath. diff --git a/libjava/classpath/gnu/xml/dom/ImplementationSource.java b/libjava/classpath/gnu/xml/dom/ImplementationSource.java index 913079cd0c3..5f404423ad1 100644 --- a/libjava/classpath/gnu/xml/dom/ImplementationSource.java +++ b/libjava/classpath/gnu/xml/dom/ImplementationSource.java @@ -1,4 +1,4 @@ -/* ImplementationSource.java -- +/* ImplementationSource.java -- Copyright (C) 2004 Free Software Foundation, Inc.. This file is part of GNU Classpath. @@ -72,7 +72,7 @@ public class ImplementationSource } catch (Exception e) { - // libxmlj not available + // libxmlj not available } catch (UnsatisfiedLinkError e) { diff --git a/libjava/classpath/gnu/xml/dom/JAXPFactory.java b/libjava/classpath/gnu/xml/dom/JAXPFactory.java index ca14a8e9daf..d7d399b5bf3 100644 --- a/libjava/classpath/gnu/xml/dom/JAXPFactory.java +++ b/libjava/classpath/gnu/xml/dom/JAXPFactory.java @@ -1,4 +1,4 @@ -/* JAXPFactory.java -- +/* JAXPFactory.java -- Copyright (C) 2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -66,20 +66,20 @@ import javax.xml.parsers.SAXParserFactory; public final class JAXPFactory extends DocumentBuilderFactory { - - private static final String PROPERTY = "http://xml.org/sax/properties/"; - private static final String FEATURE = "http://xml.org/sax/features/"; - - private SAXParserFactory pf; + + private static final String PROPERTY = "http://xml.org/sax/properties/"; + private static final String FEATURE = "http://xml.org/sax/features/"; + + private SAXParserFactory pf; private boolean secureProcessing; - + /** * Default constructor. */ public JAXPFactory() { } - + /** * Constructs a JAXP document builder which uses the default * JAXP SAX2 parser and the DOM implementation in this package. @@ -94,14 +94,14 @@ public final class JAXPFactory pf = new gnu.xml.aelfred2.JAXPFactory(); // pf = SAXParserFactory.newInstance (); } - + // JAXP default: false pf.setValidating(isValidating()); // FIXME: this namespace setup may cause errors in some // conformant SAX2 parsers, which we CAN patch up by // splicing a "NSFilter" stage up front ... - + // JAXP default: false pf.setNamespaceAware(isNamespaceAware()); @@ -118,7 +118,7 @@ public final class JAXPFactory throw new ParserConfigurationException(msg); } } - + /** There seems to be no useful specification for attribute names */ public void setAttribute(String name, Object value) throws IllegalArgumentException @@ -160,21 +160,21 @@ public final class JAXPFactory return secureProcessing; throw new ParserConfigurationException(name); } - + static final class JAXPBuilder extends DocumentBuilder implements ErrorHandler { - private Consumer consumer; - private XMLReader producer; - private DomImpl impl; - + private Consumer consumer; + private XMLReader producer; + private DomImpl impl; + JAXPBuilder(XMLReader parser, JAXPFactory factory) throws ParserConfigurationException { impl = new DomImpl(); - + // set up consumer side try { @@ -198,8 +198,8 @@ public final class JAXPFactory try { - String id; - + String id; + // if validating, report validity errors, and default // to treating them as fatal if (factory.isValidating ()) @@ -207,7 +207,7 @@ public final class JAXPFactory producer.setFeature(FEATURE + "validation", true); producer.setErrorHandler(this); } - + // always save prefix info, maybe do namespace processing producer.setFeature(FEATURE + "namespace-prefixes", true); producer.setFeature(FEATURE + "namespaces", @@ -219,15 +219,15 @@ public final class JAXPFactory id = PROPERTY + "declaration-handler"; producer.setProperty(id, consumer.getProperty(id)); - + } catch (SAXException e) { throw new ParserConfigurationException(e.getMessage()); } } - - public Document parse(InputSource source) + + public Document parse(InputSource source) throws SAXException, IOException { producer.parse(source); @@ -283,27 +283,26 @@ public final class JAXPFactory { return new DomDocument(); } - + // implementation of error handler that's used when validating public void fatalError(SAXParseException e) throws SAXException { throw e; } - + public void error(SAXParseException e) throws SAXException { throw e; } - + public void warning(SAXParseException e) throws SAXException { /* ignore */ } - + } } - diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAnchorElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLAnchorElement.java index 5da91330604..4448dd58021 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAnchorElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLAnchorElement.java @@ -1,4 +1,4 @@ -/* DomHTMLAnchorElement.java -- +/* DomHTMLAnchorElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLAnchorElement { setHTMLAttribute("accesskey", accessKey); } - + public String getCharset() { return getHTMLAttribute("charset"); @@ -74,7 +74,7 @@ public class DomHTMLAnchorElement { setHTMLAttribute("charset", charset); } - + public String getCoords() { return getHTMLAttribute("coords"); @@ -84,7 +84,7 @@ public class DomHTMLAnchorElement { setHTMLAttribute("coords", coords); } - + public String getHref() { return getHTMLAttribute("href"); @@ -94,7 +94,7 @@ public class DomHTMLAnchorElement { setHTMLAttribute("href", href); } - + public String getHreflang() { return getHTMLAttribute("hreflang"); @@ -104,7 +104,7 @@ public class DomHTMLAnchorElement { setHTMLAttribute("hreflang", hreflang); } - + public String getName() { return getHTMLAttribute("name"); @@ -114,7 +114,7 @@ public class DomHTMLAnchorElement { setHTMLAttribute("name", name); } - + public String getRel() { return getHTMLAttribute("rel"); @@ -124,7 +124,7 @@ public class DomHTMLAnchorElement { setHTMLAttribute("rel", rel); } - + public String getRev() { return getHTMLAttribute("rev"); @@ -134,7 +134,7 @@ public class DomHTMLAnchorElement { setHTMLAttribute("rev", rev); } - + public String getShape() { return getHTMLAttribute("shape"); @@ -144,7 +144,7 @@ public class DomHTMLAnchorElement { setHTMLAttribute("shape", shape); } - + public int getTabIndex() { return getIntHTMLAttribute("tabindex"); @@ -154,7 +154,7 @@ public class DomHTMLAnchorElement { setIntHTMLAttribute("tabindex", tabIndex); } - + public String getTarget() { return getHTMLAttribute("target"); @@ -164,7 +164,7 @@ public class DomHTMLAnchorElement { setHTMLAttribute("target", target); } - + public String getType() { return getHTMLAttribute("type"); @@ -184,6 +184,5 @@ public class DomHTMLAnchorElement { dispatchUIEvent("focus"); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAppletElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLAppletElement.java index 918cf0d92f0..429fb0038bc 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAppletElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLAppletElement.java @@ -1,4 +1,4 @@ -/* DomHTMLAppletElement.java -- +/* DomHTMLAppletElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLAppletElement { setHTMLAttribute("align", align); } - + public String getCls() { return getHTMLAttribute("class"); @@ -74,7 +74,7 @@ public class DomHTMLAppletElement { setHTMLAttribute("class", cls); } - + public String getSrc() { return getHTMLAttribute("src"); @@ -84,7 +84,7 @@ public class DomHTMLAppletElement { setHTMLAttribute("src", src); } - + public String getAlt() { return getHTMLAttribute("alt"); @@ -94,7 +94,7 @@ public class DomHTMLAppletElement { setHTMLAttribute("alt", alt); } - + public String getArchive() { return getHTMLAttribute("archive"); @@ -104,7 +104,7 @@ public class DomHTMLAppletElement { setHTMLAttribute("archive", archive); } - + public String getCode() { return getHTMLAttribute("code"); @@ -114,7 +114,7 @@ public class DomHTMLAppletElement { setHTMLAttribute("code", code); } - + public String getCodeBase() { return getHTMLAttribute("codebase"); @@ -124,7 +124,7 @@ public class DomHTMLAppletElement { setHTMLAttribute("codebase", codeBase); } - + public String getHeight() { return getHTMLAttribute("height"); @@ -134,7 +134,7 @@ public class DomHTMLAppletElement { setHTMLAttribute("height", height); } - + public int getHspace() { return getIntHTMLAttribute("hspace"); @@ -144,7 +144,7 @@ public class DomHTMLAppletElement { setIntHTMLAttribute("hspace", hspace); } - + public String getName() { return getHTMLAttribute("name"); @@ -154,7 +154,7 @@ public class DomHTMLAppletElement { setHTMLAttribute("name", name); } - + public String getObject() { return getHTMLAttribute("object"); @@ -164,7 +164,7 @@ public class DomHTMLAppletElement { setHTMLAttribute("object", object); } - + public int getVspace() { return getIntHTMLAttribute("vspace"); @@ -174,7 +174,7 @@ public class DomHTMLAppletElement { setIntHTMLAttribute("vspace", vspace); } - + public String getWidth() { return getHTMLAttribute("width"); @@ -185,4 +185,3 @@ public class DomHTMLAppletElement setHTMLAttribute("width", width); } } - diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAreaElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLAreaElement.java index d7eed07dd1f..728b3fdfc80 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLAreaElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLAreaElement.java @@ -1,4 +1,4 @@ -/* DomHTMLAreaElement.java -- +/* DomHTMLAreaElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLAreaElement { setHTMLAttribute("accesskey", accessKey); } - + public String getAlt() { return getHTMLAttribute("alt"); @@ -74,7 +74,7 @@ public class DomHTMLAreaElement { setHTMLAttribute("alt", alt); } - + public String getCoords() { return getHTMLAttribute("coords"); @@ -84,7 +84,7 @@ public class DomHTMLAreaElement { setHTMLAttribute("coords", coords); } - + public String getHref() { return getHTMLAttribute("href"); @@ -94,7 +94,7 @@ public class DomHTMLAreaElement { setHTMLAttribute("href", href); } - + public boolean getNoHref() { return getBooleanHTMLAttribute("nohref"); @@ -104,7 +104,7 @@ public class DomHTMLAreaElement { setBooleanHTMLAttribute("nohref", nohref); } - + public String getShape() { return getHTMLAttribute("shape"); @@ -114,7 +114,7 @@ public class DomHTMLAreaElement { setHTMLAttribute("shape", shape); } - + public int getTabIndex() { return getIntHTMLAttribute("tabindex"); @@ -124,7 +124,7 @@ public class DomHTMLAreaElement { setIntHTMLAttribute("tabindex", tabIndex); } - + public String getTarget() { return getHTMLAttribute("target"); @@ -134,6 +134,5 @@ public class DomHTMLAreaElement { setHTMLAttribute("target", target); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBRElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBRElement.java index 673699d527a..5ad49c54911 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBRElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBRElement.java @@ -1,4 +1,4 @@ -/* DomHTMLBRElement.java -- +/* DomHTMLBRElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,6 +64,5 @@ public class DomHTMLBRElement { setHTMLAttribute("clear", clear); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseElement.java index ddc8053079f..99a0993babc 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseElement.java @@ -1,4 +1,4 @@ -/* DomHTMLBaseElement.java -- +/* DomHTMLBaseElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLBaseElement { setHTMLAttribute("href", href); } - + public String getTarget() { return getHTMLAttribute("target"); @@ -74,6 +74,5 @@ public class DomHTMLBaseElement { setHTMLAttribute("target", target); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseFontElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseFontElement.java index 73172d3bf11..73ec96dbd9b 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseFontElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBaseFontElement.java @@ -1,4 +1,4 @@ -/* DomHTMLBaseFontElement.java -- +/* DomHTMLBaseFontElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLBaseFontElement { setHTMLAttribute("color", color); } - + public String getFace() { return getHTMLAttribute("face"); @@ -74,7 +74,7 @@ public class DomHTMLBaseFontElement { setHTMLAttribute("face", face); } - + public int getSize() { return getIntHTMLAttribute("size"); @@ -84,6 +84,5 @@ public class DomHTMLBaseFontElement { setIntHTMLAttribute("size", size); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBodyElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBodyElement.java index 44fbcf23cc5..d4528625b6a 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLBodyElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLBodyElement.java @@ -1,4 +1,4 @@ -/* DomHTMLBodyElement.java -- +/* DomHTMLBodyElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLBodyElement { setHTMLAttribute("alink", alink); } - + public String getBackground() { return getHTMLAttribute("background"); @@ -74,7 +74,7 @@ public class DomHTMLBodyElement { setHTMLAttribute("background", background); } - + public String getBgColor() { return getHTMLAttribute("bgcolor"); @@ -84,7 +84,7 @@ public class DomHTMLBodyElement { setHTMLAttribute("bgcolor", bgcolor); } - + public String getLink() { return getHTMLAttribute("link"); @@ -94,7 +94,7 @@ public class DomHTMLBodyElement { setHTMLAttribute("link", link); } - + public String getText() { return getHTMLAttribute("text"); @@ -104,7 +104,7 @@ public class DomHTMLBodyElement { setHTMLAttribute("text", text); } - + public String getVLink() { return getHTMLAttribute("vlink"); @@ -114,6 +114,5 @@ public class DomHTMLBodyElement { setHTMLAttribute("vlink", vlink); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLButtonElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLButtonElement.java index 3bca44c0992..696169ac214 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLButtonElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLButtonElement.java @@ -1,4 +1,4 @@ -/* DomHTMLButtonElement.java -- +/* DomHTMLButtonElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -70,7 +70,7 @@ public class DomHTMLButtonElement { setHTMLAttribute("accesskey", accessKey); } - + public boolean getDisabled() { return getBooleanHTMLAttribute("disabled"); @@ -80,7 +80,7 @@ public class DomHTMLButtonElement { setBooleanHTMLAttribute("disabled", disabled); } - + public String getName() { return getHTMLAttribute("name"); @@ -90,7 +90,7 @@ public class DomHTMLButtonElement { setHTMLAttribute("name", name); } - + public int getTabIndex() { return getIntHTMLAttribute("tabindex"); @@ -105,7 +105,7 @@ public class DomHTMLButtonElement { return getHTMLAttribute("type"); } - + public String getValue() { return getHTMLAttribute("value"); @@ -115,6 +115,5 @@ public class DomHTMLButtonElement { setHTMLAttribute("value", value); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLCollection.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLCollection.java index c63620087e3..830028753be 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLCollection.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLCollection.java @@ -1,4 +1,4 @@ -/* DomHTMLCollection.java -- +/* DomHTMLCollection.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -221,6 +221,5 @@ class DomHTMLCollection } return null; } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDListElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDListElement.java index 2b9dbf23623..9acce856a04 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDListElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDListElement.java @@ -1,4 +1,4 @@ -/* DomHTMLDListElement.java -- +/* DomHTMLDListElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,6 +64,5 @@ public class DomHTMLDListElement { setBooleanHTMLAttribute("compact", compact); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDirectoryElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDirectoryElement.java index 26af97e781b..e0f94a1ed4d 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDirectoryElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDirectoryElement.java @@ -1,4 +1,4 @@ -/* DomHTMLDirectoryElement.java -- +/* DomHTMLDirectoryElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,6 +64,5 @@ public class DomHTMLDirectoryElement { setBooleanHTMLAttribute("compact", compact); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDivElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDivElement.java index 462069dcf1a..66b3ac743e0 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDivElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDivElement.java @@ -1,4 +1,4 @@ -/* DomHTMLDivElement.java -- +/* DomHTMLDivElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,6 +64,5 @@ public class DomHTMLDivElement { setHTMLAttribute("align", align); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDocument.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDocument.java index d45c1b2230b..1afed7bebf0 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLDocument.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLDocument.java @@ -1,4 +1,4 @@ -/* DomHTMLDocument.java -- +/* DomHTMLDocument.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -424,4 +424,3 @@ public class DomHTMLDocument } } - diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLElement.java index b957083d680..deeefec608f 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLElement.java @@ -1,4 +1,4 @@ -/* DomHTMLElement.java -- +/* DomHTMLElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -242,7 +242,7 @@ public abstract class DomHTMLElement { setHTMLAttribute("id", id); } - + public String getTitle() { return getHTMLAttribute("title"); @@ -252,7 +252,7 @@ public abstract class DomHTMLElement { setHTMLAttribute("title", title); } - + public String getLang() { return getHTMLAttribute("lang"); @@ -262,7 +262,7 @@ public abstract class DomHTMLElement { setHTMLAttribute("lang", lang); } - + public String getDir() { return getHTMLAttribute("dir"); @@ -272,7 +272,7 @@ public abstract class DomHTMLElement { setHTMLAttribute("dir", dir); } - + public String getClassName() { return getHTMLAttribute("class"); @@ -282,6 +282,5 @@ public abstract class DomHTMLElement { setHTMLAttribute("class", className); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLEmbedElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLEmbedElement.java index 1ae081c2827..22113153382 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLEmbedElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLEmbedElement.java @@ -1,4 +1,4 @@ -/* DomHTMLEmbedElement.java -- +/* DomHTMLEmbedElement.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,7 +46,7 @@ public class DomHTMLEmbedElement { super(owner, namespaceURI, name); } - + public String getJavaObject() { return getHTMLAttribute("java_object"); @@ -56,7 +56,7 @@ public class DomHTMLEmbedElement { setHTMLAttribute("java_object", object); } - + public String getJavaCodeBase() { return getHTMLAttribute("java_codebase"); @@ -66,7 +66,7 @@ public class DomHTMLEmbedElement { setHTMLAttribute("java_codebase", codeBase); } - + public String getJavaArchive() { return getHTMLAttribute("java_archive"); @@ -81,42 +81,42 @@ public class DomHTMLEmbedElement { setHTMLAttribute("java_code", code); } - + public String getJavaCode() { return getHTMLAttribute("java_code"); } - + public void setJavaType(String type) { setHTMLAttribute("java_type", type); } - + public String getJavaType() { return getHTMLAttribute("java_type"); } - + public void setType(String type) { setHTMLAttribute("type", type); } - + public String getType() { return getHTMLAttribute("type"); } - + public String getPluginsPage() { return getHTMLAttribute("pluginspage"); } - + public void setPluginsPage(String pluginspage) { setHTMLAttribute("pluginspage", pluginspage); } - + public String getMayscript() { return getHTMLAttribute("mayscript"); diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFieldSetElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFieldSetElement.java index 2c857721947..252cd3d2beb 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFieldSetElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFieldSetElement.java @@ -1,4 +1,4 @@ -/* DomHTMLFieldSetElement.java -- +/* DomHTMLFieldSetElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -62,4 +62,3 @@ public class DomHTMLFieldSetElement } } - diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFontElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFontElement.java index 08bd349fa62..5bfbb6f36c9 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFontElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFontElement.java @@ -1,4 +1,4 @@ -/* DomHTMLFontElement.java -- +/* DomHTMLFontElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLFontElement { setHTMLAttribute("color", color); } - + public String getFace() { return getHTMLAttribute("face"); @@ -74,7 +74,7 @@ public class DomHTMLFontElement { setHTMLAttribute("face", face); } - + public String getSize() { return getHTMLAttribute("size"); @@ -84,6 +84,5 @@ public class DomHTMLFontElement { setHTMLAttribute("size", size); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFormElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFormElement.java index 119d97eb885..9fe2ae80205 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFormElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFormElement.java @@ -1,4 +1,4 @@ -/* DomHTMLFormElement.java -- +/* DomHTMLFormElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -85,7 +85,7 @@ public class DomHTMLFormElement { setHTMLAttribute("name", name); } - + public String getAcceptCharset() { return getHTMLAttribute("accept-charset"); @@ -95,7 +95,7 @@ public class DomHTMLFormElement { setHTMLAttribute("accept-charset", acceptCharset); } - + public String getAction() { return getHTMLAttribute("action"); @@ -105,7 +105,7 @@ public class DomHTMLFormElement { setHTMLAttribute("action", action); } - + public String getEnctype() { return getHTMLAttribute("enctype"); @@ -115,7 +115,7 @@ public class DomHTMLFormElement { setHTMLAttribute("enctype", enctype); } - + public String getMethod() { return getHTMLAttribute("method"); @@ -125,7 +125,7 @@ public class DomHTMLFormElement { setHTMLAttribute("method", method); } - + public String getTarget() { return getHTMLAttribute("target"); @@ -145,6 +145,5 @@ public class DomHTMLFormElement { dispatchUIEvent("reset"); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameElement.java index 124f35268e8..2465c4b8901 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameElement.java @@ -1,4 +1,4 @@ -/* DomHTMLFrameElement.java -- +/* DomHTMLFrameElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -65,7 +65,7 @@ public class DomHTMLFrameElement { setHTMLAttribute("frameborder", frameBorder); } - + public String getLongDesc() { return getHTMLAttribute("longdesc"); @@ -75,7 +75,7 @@ public class DomHTMLFrameElement { setHTMLAttribute("longdesc", longDesc); } - + public String getMarginHeight() { return getHTMLAttribute("marginheight"); @@ -85,7 +85,7 @@ public class DomHTMLFrameElement { setHTMLAttribute("marginheight", marginHeight); } - + public String getMarginWidth() { return getHTMLAttribute("marginwidth"); @@ -95,7 +95,7 @@ public class DomHTMLFrameElement { setHTMLAttribute("marginwidth", marginWidth); } - + public String getName() { return getHTMLAttribute("name"); @@ -105,7 +105,7 @@ public class DomHTMLFrameElement { setHTMLAttribute("name", name); } - + public boolean getNoResize() { return getBooleanHTMLAttribute("noresize"); @@ -115,7 +115,7 @@ public class DomHTMLFrameElement { setBooleanHTMLAttribute("noresize", noResize); } - + public String getScrolling() { return getHTMLAttribute("scrolling"); @@ -125,7 +125,7 @@ public class DomHTMLFrameElement { setHTMLAttribute("scrolling", scrolling); } - + public String getSrc() { return getHTMLAttribute("src"); @@ -141,6 +141,5 @@ public class DomHTMLFrameElement // TODO getContentDocument return null; } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameSetElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameSetElement.java index 44d317f64a3..dae9430fb84 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameSetElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLFrameSetElement.java @@ -1,4 +1,4 @@ -/* DomHTMLFrameSetElement.java -- +/* DomHTMLFrameSetElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLFrameSetElement { setHTMLAttribute("cols", cols); } - + public String getRows() { return getHTMLAttribute("rows"); @@ -74,6 +74,5 @@ public class DomHTMLFrameSetElement { setHTMLAttribute("rows", rows); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHRElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHRElement.java index d1b48012175..e27ef55957f 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHRElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHRElement.java @@ -1,4 +1,4 @@ -/* DomHTMLHRElement.java -- +/* DomHTMLHRElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLHRElement { setHTMLAttribute("align", align); } - + public boolean getNoShade() { return getBooleanHTMLAttribute("noshade"); @@ -74,7 +74,7 @@ public class DomHTMLHRElement { setBooleanHTMLAttribute("noshade", noShade); } - + public String getSize() { return getHTMLAttribute("size"); @@ -84,7 +84,7 @@ public class DomHTMLHRElement { setHTMLAttribute("size", size); } - + public String getWidth() { return getHTMLAttribute("width"); @@ -94,6 +94,5 @@ public class DomHTMLHRElement { setHTMLAttribute("width", width); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadElement.java index f68e8c7fad3..4a8ef995b07 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadElement.java @@ -1,4 +1,4 @@ -/* DomHTMLHeadElement.java -- +/* DomHTMLHeadElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,6 +64,5 @@ public class DomHTMLHeadElement { setHTMLAttribute("profile", profile); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadingElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadingElement.java index f1427ad89e6..6e78e900431 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadingElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHeadingElement.java @@ -1,4 +1,4 @@ -/* DomHTMLHeadingElement.java -- +/* DomHTMLHeadingElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,6 +64,5 @@ public class DomHTMLHeadingElement { setHTMLAttribute("align", align); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHtmlElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHtmlElement.java index 95d45264eee..73f7243ed3d 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLHtmlElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLHtmlElement.java @@ -1,4 +1,4 @@ -/* DomHTMLHtmlElement.java -- +/* DomHTMLHtmlElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,6 +64,5 @@ public class DomHTMLHtmlElement { setHTMLAttribute("version", version); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLIFrameElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLIFrameElement.java index c5ca75d8c21..1a58fb73e9c 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLIFrameElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLIFrameElement.java @@ -1,4 +1,4 @@ -/* DomHTMLIFrameElement.java -- +/* DomHTMLIFrameElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -65,7 +65,7 @@ public class DomHTMLIFrameElement { setHTMLAttribute("align", align); } - + public String getFrameBorder() { return getHTMLAttribute("frameborder"); @@ -75,7 +75,7 @@ public class DomHTMLIFrameElement { setHTMLAttribute("frameborder", frameBorder); } - + public String getHeight() { return getHTMLAttribute("height"); @@ -85,7 +85,7 @@ public class DomHTMLIFrameElement { setHTMLAttribute("height", height); } - + public String getLongDesc() { return getHTMLAttribute("longdesc"); @@ -95,7 +95,7 @@ public class DomHTMLIFrameElement { setHTMLAttribute("longdesc", longDesc); } - + public String getMarginHeight() { return getHTMLAttribute("marginheight"); @@ -105,7 +105,7 @@ public class DomHTMLIFrameElement { setHTMLAttribute("marginheight", marginHeight); } - + public String getMarginWidth() { return getHTMLAttribute("marginwidth"); @@ -115,7 +115,7 @@ public class DomHTMLIFrameElement { setHTMLAttribute("marginwidth", marginWidth); } - + public String getName() { return getHTMLAttribute("name"); @@ -125,7 +125,7 @@ public class DomHTMLIFrameElement { setHTMLAttribute("name", name); } - + public String getScrolling() { return getHTMLAttribute("scrolling"); @@ -135,7 +135,7 @@ public class DomHTMLIFrameElement { setHTMLAttribute("scrolling", scrolling); } - + public String getSrc() { return getHTMLAttribute("src"); @@ -155,12 +155,11 @@ public class DomHTMLIFrameElement { setHTMLAttribute("width", width); } - + public Document getContentDocument() { // TODO getContentDocument return null; } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLImageElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLImageElement.java index c96e5fede4d..c5d294c6f73 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLImageElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLImageElement.java @@ -1,4 +1,4 @@ -/* DomHTMLImageElement.java -- +/* DomHTMLImageElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLImageElement { setHTMLAttribute("name", name); } - + public String getAlign() { return getHTMLAttribute("align"); @@ -74,7 +74,7 @@ public class DomHTMLImageElement { setHTMLAttribute("align", align); } - + public String getAlt() { return getHTMLAttribute("alt"); @@ -84,7 +84,7 @@ public class DomHTMLImageElement { setHTMLAttribute("alt", alt); } - + public String getBorder() { return getHTMLAttribute("border"); @@ -94,7 +94,7 @@ public class DomHTMLImageElement { setHTMLAttribute("border", border); } - + public int getHeight() { return getIntHTMLAttribute("height"); @@ -104,7 +104,7 @@ public class DomHTMLImageElement { setIntHTMLAttribute("height", height); } - + public int getHspace() { return getIntHTMLAttribute("hspace"); @@ -114,7 +114,7 @@ public class DomHTMLImageElement { setIntHTMLAttribute("hspace", hspace); } - + public boolean getIsMap() { return getBooleanHTMLAttribute("ismap"); @@ -124,7 +124,7 @@ public class DomHTMLImageElement { setBooleanHTMLAttribute("ismap", isMap); } - + public String getLongDesc() { return getHTMLAttribute("longdesc"); @@ -134,7 +134,7 @@ public class DomHTMLImageElement { setHTMLAttribute("longdesc", longDesc); } - + public String getSrc() { return getHTMLAttribute("src"); @@ -154,7 +154,7 @@ public class DomHTMLImageElement { setHTMLAttribute("usemap", useMap); } - + public int getVspace() { return getIntHTMLAttribute("vspace"); @@ -164,7 +164,7 @@ public class DomHTMLImageElement { setIntHTMLAttribute("vspace", vspace); } - + public int getWidth() { return getIntHTMLAttribute("width"); @@ -174,6 +174,5 @@ public class DomHTMLImageElement { setIntHTMLAttribute("width", width); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLImpl.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLImpl.java index 9f0db085040..a5faee5ce9e 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLImpl.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLImpl.java @@ -1,4 +1,4 @@ -/* DomHTMLImpl.java -- +/* DomHTMLImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,7 +48,7 @@ import org.w3c.dom.Document; public class DomHTMLImpl extends DomImpl { - + protected Document createDocument() { return new DomHTMLDocument(this); @@ -64,4 +64,3 @@ public class DomHTMLImpl } } - diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLInputElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLInputElement.java index 1dbc9c28de0..21201889d2c 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLInputElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLInputElement.java @@ -1,4 +1,4 @@ -/* DomHTMLInputElement.java -- +/* DomHTMLInputElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -68,7 +68,7 @@ public class DomHTMLInputElement { setHTMLAttribute("value", defaultValue); } - + public boolean getDefaultChecked() { return getBooleanHTMLAttribute("checked"); @@ -83,7 +83,7 @@ public class DomHTMLInputElement { return (HTMLFormElement) getParentElement("form"); } - + public String getAccept() { return getHTMLAttribute("accept"); @@ -93,7 +93,7 @@ public class DomHTMLInputElement { setHTMLAttribute("accept", accept); } - + public String getAccessKey() { return getHTMLAttribute("accesskey"); @@ -103,7 +103,7 @@ public class DomHTMLInputElement { setHTMLAttribute("accesskey", accessKey); } - + public String getAlign() { return getHTMLAttribute("align"); @@ -113,7 +113,7 @@ public class DomHTMLInputElement { setHTMLAttribute("align", align); } - + public String getAlt() { return getHTMLAttribute("alt"); @@ -123,7 +123,7 @@ public class DomHTMLInputElement { setHTMLAttribute("alt", alt); } - + public boolean getChecked() { if (checked == null) @@ -137,7 +137,7 @@ public class DomHTMLInputElement { this.checked = Boolean.valueOf(checked); } - + public boolean getDisabled() { return getBooleanHTMLAttribute("disabled"); @@ -147,7 +147,7 @@ public class DomHTMLInputElement { setBooleanHTMLAttribute("disabled", disabled); } - + public int getMaxLength() { return getIntHTMLAttribute("maxLength"); @@ -157,7 +157,7 @@ public class DomHTMLInputElement { setIntHTMLAttribute("maxLength", maxLength); } - + public String getName() { return getHTMLAttribute("name"); @@ -167,7 +167,7 @@ public class DomHTMLInputElement { setHTMLAttribute("name", name); } - + public boolean getReadOnly() { return getBooleanHTMLAttribute("readonly"); @@ -177,7 +177,7 @@ public class DomHTMLInputElement { setBooleanHTMLAttribute("readonly", readOnly); } - + public int getSize() { return getIntHTMLAttribute("size"); @@ -187,7 +187,7 @@ public class DomHTMLInputElement { setIntHTMLAttribute("size", size); } - + public String getSrc() { return getHTMLAttribute("src"); @@ -197,7 +197,7 @@ public class DomHTMLInputElement { setHTMLAttribute("src", src); } - + public int getTabIndex() { return getIntHTMLAttribute("tabindex"); @@ -207,7 +207,7 @@ public class DomHTMLInputElement { setIntHTMLAttribute("tabindex", tabIndex); } - + public String getType() { return getHTMLAttribute("type"); @@ -217,7 +217,7 @@ public class DomHTMLInputElement { setHTMLAttribute("type", type); } - + public String getUseMap() { return getHTMLAttribute("usemap"); @@ -227,7 +227,7 @@ public class DomHTMLInputElement { setHTMLAttribute("usemap", useMap); } - + public String getValue() { if (value == null) @@ -261,6 +261,5 @@ public class DomHTMLInputElement { dispatchUIEvent("click"); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLIsIndexElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLIsIndexElement.java index 087f4a0cd79..8578cb6c0b3 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLIsIndexElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLIsIndexElement.java @@ -1,4 +1,4 @@ -/* DomHTMLIsIndexElement.java -- +/* DomHTMLIsIndexElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -70,6 +70,5 @@ public class DomHTMLIsIndexElement { setHTMLAttribute("prompt", prompt); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLIElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLIElement.java index 11eccdf5df3..cab1412ddc5 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLIElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLIElement.java @@ -1,4 +1,4 @@ -/* DomHTMLLIElement.java -- +/* DomHTMLLIElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLLIElement { setHTMLAttribute("type", type); } - + public int getValue() { return getIntHTMLAttribute("value"); @@ -74,6 +74,5 @@ public class DomHTMLLIElement { setIntHTMLAttribute("value", value); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLabelElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLabelElement.java index c0cc39f8e96..96cfbaab5c6 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLabelElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLabelElement.java @@ -1,4 +1,4 @@ -/* DomHTMLLabelElement.java -- +/* DomHTMLLabelElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -70,7 +70,7 @@ public class DomHTMLLabelElement { setHTMLAttribute("accesskey", accessKey); } - + public String getHtmlFor() { return getHTMLAttribute("for"); @@ -80,6 +80,5 @@ public class DomHTMLLabelElement { setHTMLAttribute("for", htmlFor); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLegendElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLegendElement.java index a500f8fa14c..045861cae53 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLegendElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLegendElement.java @@ -1,4 +1,4 @@ -/* DomHTMLLegendElement.java -- +/* DomHTMLLegendElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -70,7 +70,7 @@ public class DomHTMLLegendElement { setHTMLAttribute("accesskey", accessKey); } - + public String getAlign() { return getHTMLAttribute("align"); @@ -80,6 +80,5 @@ public class DomHTMLLegendElement { setHTMLAttribute("align", align); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLinkElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLinkElement.java index 127726ef7e3..292ec930551 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLLinkElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLLinkElement.java @@ -1,4 +1,4 @@ -/* DomHTMLLinkElement.java -- +/* DomHTMLLinkElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLLinkElement { setBooleanHTMLAttribute("disabled", disabled); } - + public String getCharset() { return getHTMLAttribute("charset"); @@ -74,7 +74,7 @@ public class DomHTMLLinkElement { setHTMLAttribute("charset", charset); } - + public String getHref() { return getHTMLAttribute("href"); @@ -84,7 +84,7 @@ public class DomHTMLLinkElement { setHTMLAttribute("href", href); } - + public String getHreflang() { return getHTMLAttribute("hreflang"); @@ -94,7 +94,7 @@ public class DomHTMLLinkElement { setHTMLAttribute("hreflang", hreflang); } - + public String getMedia() { return getHTMLAttribute("media"); @@ -104,7 +104,7 @@ public class DomHTMLLinkElement { setHTMLAttribute("media", media); } - + public String getRel() { return getHTMLAttribute("rel"); @@ -114,7 +114,7 @@ public class DomHTMLLinkElement { setHTMLAttribute("rel", rel); } - + public String getRev() { return getHTMLAttribute("rev"); @@ -124,7 +124,7 @@ public class DomHTMLLinkElement { setHTMLAttribute("rev", rev); } - + public String getTarget() { return getHTMLAttribute("target"); @@ -134,7 +134,7 @@ public class DomHTMLLinkElement { setHTMLAttribute("target", target); } - + public String getType() { return getHTMLAttribute("type"); @@ -144,6 +144,5 @@ public class DomHTMLLinkElement { setHTMLAttribute("type", type); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMapElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLMapElement.java index 1f7182f4f29..4497b00e235 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMapElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLMapElement.java @@ -1,4 +1,4 @@ -/* DomHTMLMapElement.java -- +/* DomHTMLMapElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLMapElement ret.evaluate(); return ret; } - + public String getName() { return getHTMLAttribute("name"); @@ -74,6 +74,5 @@ public class DomHTMLMapElement { setHTMLAttribute("name", name); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMenuElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLMenuElement.java index 17f6f589f9a..2a6ff08f1ba 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMenuElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLMenuElement.java @@ -1,4 +1,4 @@ -/* DomHTMLMenuElement.java -- +/* DomHTMLMenuElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,6 +64,5 @@ public class DomHTMLMenuElement { setBooleanHTMLAttribute("compact", compact); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMetaElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLMetaElement.java index 1a0440504de..e555a427382 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLMetaElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLMetaElement.java @@ -1,4 +1,4 @@ -/* DomHTMLMetaElement.java -- +/* DomHTMLMetaElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLMetaElement { setHTMLAttribute("content", content); } - + public String getHttpEquiv() { return getHTMLAttribute("http-equiv"); @@ -74,7 +74,7 @@ public class DomHTMLMetaElement { setHTMLAttribute("http-equiv", httpEquiv); } - + public String getName() { return getHTMLAttribute("name"); @@ -84,7 +84,7 @@ public class DomHTMLMetaElement { setHTMLAttribute("name", name); } - + public String getScheme() { return getHTMLAttribute("scheme"); @@ -94,6 +94,5 @@ public class DomHTMLMetaElement { setHTMLAttribute("scheme", scheme); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLModElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLModElement.java index 493f7242ba1..8c158f48aa4 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLModElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLModElement.java @@ -1,4 +1,4 @@ -/* DomHTMLModElement.java -- +/* DomHTMLModElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLModElement { setHTMLAttribute("cite", cite); } - + public String getDateTime() { return getHTMLAttribute("datetime"); @@ -74,6 +74,5 @@ public class DomHTMLModElement { setHTMLAttribute("datetime", dateTime); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOListElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLOListElement.java index fb98cf40d79..54f7fd46be4 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOListElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLOListElement.java @@ -1,4 +1,4 @@ -/* DomHTMLOListElement.java -- +/* DomHTMLOListElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLOListElement { setBooleanHTMLAttribute("compact", compact); } - + public int getStart() { return getIntHTMLAttribute("start"); @@ -74,7 +74,7 @@ public class DomHTMLOListElement { setIntHTMLAttribute("start", start); } - + public String getType() { return getHTMLAttribute("type"); @@ -84,6 +84,5 @@ public class DomHTMLOListElement { setHTMLAttribute("type", type); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLObjectElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLObjectElement.java index 9bb621122a4..2ce5f45c36b 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLObjectElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLObjectElement.java @@ -1,4 +1,4 @@ -/* DomHTMLObjectElement.java -- +/* DomHTMLObjectElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -71,7 +71,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("code", code); } - + public String getJavaCode() { return getHTMLAttribute("java_code"); @@ -81,7 +81,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("java_code", code); } - + public String getObject() { return getHTMLAttribute("object"); @@ -91,7 +91,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("object", obj); } - + public String getJavaObject() { return getHTMLAttribute("java_object"); @@ -101,7 +101,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("java_object", obj); } - + public String getAlign() { return getHTMLAttribute("align"); @@ -111,7 +111,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("align", align); } - + public String getArchive() { return getHTMLAttribute("archive"); @@ -121,7 +121,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("archive", archive); } - + public String getJavaArchive() { return getHTMLAttribute("java_archive"); @@ -131,7 +131,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("java_archive", archive); } - + public String getBorder() { return getHTMLAttribute("border"); @@ -141,7 +141,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("border", border); } - + public String getCodeBase() { return getHTMLAttribute("codebase"); @@ -151,7 +151,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("codebase", codeBase); } - + public String getJavaCodeBase() { return getHTMLAttribute("java_codebase"); @@ -161,7 +161,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("java_codebase", codeBase); } - + public String getCodeType() { return getHTMLAttribute("codetype"); @@ -171,7 +171,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("codetype", codeType); } - + public String getData() { return getHTMLAttribute("data"); @@ -181,7 +181,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("data", data); } - + public boolean getDeclare() { return getBooleanHTMLAttribute("declare"); @@ -191,7 +191,7 @@ public class DomHTMLObjectElement { setBooleanHTMLAttribute("declare", declare); } - + public String getHeight() { return getHTMLAttribute("height"); @@ -201,7 +201,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("height", height); } - + public int getHspace() { return getIntHTMLAttribute("hspace"); @@ -211,7 +211,7 @@ public class DomHTMLObjectElement { setIntHTMLAttribute("hspace", hspace); } - + public String getName() { return getHTMLAttribute("name"); @@ -221,7 +221,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("name", name); } - + public String getStandby() { return getHTMLAttribute("standby"); @@ -231,7 +231,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("standby", standby); } - + public int getTabIndex() { return getIntHTMLAttribute("tabindex"); @@ -241,7 +241,7 @@ public class DomHTMLObjectElement { setIntHTMLAttribute("tabindex", tabIndex); } - + public String getType() { return getHTMLAttribute("type"); @@ -251,7 +251,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("type", type); } - + public String getJavaType() { return getHTMLAttribute("java_type"); @@ -261,7 +261,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("java_type", type); } - + public String getUseMap() { return getHTMLAttribute("usemap"); @@ -271,7 +271,7 @@ public class DomHTMLObjectElement { setHTMLAttribute("usemap", useMap); } - + public int getVspace() { return getIntHTMLAttribute("vspace"); @@ -281,7 +281,7 @@ public class DomHTMLObjectElement { setIntHTMLAttribute("vspace", vspace); } - + public String getWidth() { return getHTMLAttribute("width"); @@ -297,25 +297,24 @@ public class DomHTMLObjectElement // TODO getContentDocument return null; } - + public void setMayscript(String may) { setHTMLAttribute("mayscript", may); } - + public String getMayscript() { return getHTMLAttribute("mayscript"); } - + public void setScriptable(String scr) { setHTMLAttribute("scriptable", scr); } - + public String getScriptable() { return getHTMLAttribute("scriptable"); } } - diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptGroupElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptGroupElement.java index 76545e130cb..acb94848482 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptGroupElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptGroupElement.java @@ -1,4 +1,4 @@ -/* DomHTMLOptGroupElement.java -- +/* DomHTMLOptGroupElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -74,6 +74,5 @@ public class DomHTMLOptGroupElement { setHTMLAttribute("label", label); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptionElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptionElement.java index 69c059d9d43..f775c138a7b 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptionElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLOptionElement.java @@ -1,4 +1,4 @@ -/* DomHTMLOptionElement.java -- +/* DomHTMLOptionElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -82,7 +82,7 @@ public class DomHTMLOptionElement { return super.getIndex(); } - + public boolean getDisabled() { return getBooleanHTMLAttribute("disabled"); @@ -92,7 +92,7 @@ public class DomHTMLOptionElement { setBooleanHTMLAttribute("disabled", disabled); } - + public String getLabel() { return getHTMLAttribute("label"); @@ -102,7 +102,7 @@ public class DomHTMLOptionElement { setHTMLAttribute("label", label); } - + public boolean getSelected() { if (selected == null) @@ -116,7 +116,7 @@ public class DomHTMLOptionElement { this.selected = Boolean.valueOf(selected); } - + public String getValue() { return getHTMLAttribute("value"); @@ -126,6 +126,5 @@ public class DomHTMLOptionElement { setHTMLAttribute("value", value); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParagraphElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLParagraphElement.java index 2a8c4f6fb11..4c867fdc129 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParagraphElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLParagraphElement.java @@ -1,4 +1,4 @@ -/* DomHTMLParagraphElement.java -- +/* DomHTMLParagraphElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,6 +64,5 @@ public class DomHTMLParagraphElement { setHTMLAttribute("align", align); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParamElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLParamElement.java index 81c6559529e..cdd74ad4a46 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParamElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLParamElement.java @@ -1,4 +1,4 @@ -/* DomHTMLParamElement.java -- +/* DomHTMLParamElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLParamElement { setHTMLAttribute("name", name); } - + public String getType() { return getHTMLAttribute("type"); @@ -74,7 +74,7 @@ public class DomHTMLParamElement { setHTMLAttribute("type", type); } - + public String getValue() { return getHTMLAttribute("value"); @@ -84,7 +84,7 @@ public class DomHTMLParamElement { setHTMLAttribute("value", value); } - + public String getValueType() { return getHTMLAttribute("valuetype"); @@ -94,6 +94,5 @@ public class DomHTMLParamElement { setHTMLAttribute("valuetype", valueType); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParser.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLParser.java index c6d8c4c5ca6..88656d2d35d 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLParser.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLParser.java @@ -60,11 +60,11 @@ import org.w3c.dom.html2.HTMLDocument; * The tag attributes become the node attributes. The text inside * HTML tag is inserted as one or several text nodes. The nested * HTML tags are inserted as child nodes. - * + * * If the strict tree structure, closing the tag means closing all * nested tags. To work around this, this parser closes the nested * tags and immediately reopens them after the closed tag. - * In this way, <code><b><i>c</b>d</code> + * In this way, <code><b><i>c</b>d</code> * is parsed as <code><b><i>c</i></b><i>d</code> . * * @author Audrius Meskauskas (AudriusA@Bioinformatics.org) @@ -124,9 +124,9 @@ public class DomHTMLParser document = new DomHTMLDocument(); document.setCheckWellformedness(false); document.setCheckingCharacters(false); - + cursor = document; - + parse(input); DomHTMLDocument h = document; @@ -139,7 +139,7 @@ public class DomHTMLParser throw new IOException("Exception: " + ex.getMessage()); } } - + /** * Create a new node. * @param name the name of node, case insensitive. @@ -165,13 +165,13 @@ public class DomHTMLParser natts.setNamedItem(attribute); } - // The default values are stored in a parent node. + // The default values are stored in a parent node. hatts = hatts.getResolveParent(); } return new_node; } - + /** * Handle comment by inserting the comment node. * @param text the comment text. @@ -181,7 +181,7 @@ public class DomHTMLParser Node c = document.createComment(new String(text)); cursor.appendChild(c); } - + /** * Handle the tag with no content. * @param tag the tag to handle. @@ -196,7 +196,7 @@ public class DomHTMLParser Node c = createNode(name); cursor.appendChild(c); } - + /** * Close the given tag. Close and reopen all nested tags. * @param tag the tag to close. @@ -229,7 +229,7 @@ public class DomHTMLParser else cursor = close.getParentNode(); - // Insert the copies of the opened nodes. + // Insert the copies of the opened nodes. Iterator iter = open.iterator(); while (iter.hasNext()) { @@ -251,7 +251,7 @@ public class DomHTMLParser cursor.appendChild(c); cursor = c; } - + /** * Handle text by inserting the text node. * @param text the text to insert. diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLPreElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLPreElement.java index 9b36a288700..9a51aaeebad 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLPreElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLPreElement.java @@ -1,4 +1,4 @@ -/* DomHTMLPreElement.java -- +/* DomHTMLPreElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,6 +64,5 @@ public class DomHTMLPreElement { setIntHTMLAttribute("width", width); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLQuoteElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLQuoteElement.java index 678a5ada697..811aed58bc4 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLQuoteElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLQuoteElement.java @@ -1,4 +1,4 @@ -/* DomHTMLQuoteElement.java -- +/* DomHTMLQuoteElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,6 +64,5 @@ public class DomHTMLQuoteElement { setHTMLAttribute("cite", cite); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLScriptElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLScriptElement.java index 8f8fff58a82..1bd7b341790 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLScriptElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLScriptElement.java @@ -1,4 +1,4 @@ -/* DomHTMLScriptElement.java -- +/* DomHTMLScriptElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -124,6 +124,5 @@ public class DomHTMLScriptElement { setHTMLAttribute("type", type); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLSelectElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLSelectElement.java index 09752e1ffe4..fc1debbd60d 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLSelectElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLSelectElement.java @@ -1,4 +1,4 @@ -/* DomHTMLSelectElement.java -- +/* DomHTMLSelectElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -60,7 +60,7 @@ public class DomHTMLSelectElement { super(owner, namespaceURI, name); } - + public String getType() { return getHTMLAttribute("type"); @@ -95,7 +95,7 @@ public class DomHTMLSelectElement option.setSelected(i == selectedIndex); } } - + public String getValue() { return getHTMLAttribute("value"); @@ -105,7 +105,7 @@ public class DomHTMLSelectElement { setHTMLAttribute("value", value); } - + public int getLength() { return getIntHTMLAttribute("length"); @@ -129,7 +129,7 @@ public class DomHTMLSelectElement ret.evaluate(); return ret; } - + public boolean getDisabled() { return getBooleanHTMLAttribute("disabled"); @@ -139,7 +139,7 @@ public class DomHTMLSelectElement { setBooleanHTMLAttribute("disabled", disabled); } - + public boolean getMultiple() { return getBooleanHTMLAttribute("multiple"); @@ -149,7 +149,7 @@ public class DomHTMLSelectElement { setBooleanHTMLAttribute("multiple", multiple); } - + public String getName() { return getHTMLAttribute("name"); @@ -159,7 +159,7 @@ public class DomHTMLSelectElement { setHTMLAttribute("name", name); } - + public int getSize() { return getIntHTMLAttribute("size"); @@ -169,7 +169,7 @@ public class DomHTMLSelectElement { setIntHTMLAttribute("size", size); } - + public int getTabIndex() { return getIntHTMLAttribute("tabindex"); @@ -206,6 +206,5 @@ public class DomHTMLSelectElement { dispatchUIEvent("focus"); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLStyleElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLStyleElement.java index f6f1fcc6844..78cef3b1826 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLStyleElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLStyleElement.java @@ -1,4 +1,4 @@ -/* DomHTMLStyleElement.java -- +/* DomHTMLStyleElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLStyleElement { setBooleanHTMLAttribute("disabled", disabled); } - + public String getMedia() { return getHTMLAttribute("media"); @@ -74,7 +74,7 @@ public class DomHTMLStyleElement { setHTMLAttribute("media", media); } - + public String getType() { return getHTMLAttribute("type"); @@ -84,6 +84,5 @@ public class DomHTMLStyleElement { setHTMLAttribute("type", type); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCaptionElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCaptionElement.java index 28ea3418895..2133b14124b 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCaptionElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCaptionElement.java @@ -1,4 +1,4 @@ -/* DomHTMLTableCaptionElement.java -- +/* DomHTMLTableCaptionElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -65,6 +65,5 @@ public class DomHTMLTableCaptionElement { setHTMLAttribute("align", align); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCellElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCellElement.java index 41d33af26f8..350f0bf427f 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCellElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableCellElement.java @@ -1,4 +1,4 @@ -/* DomHTMLTableCellElement.java -- +/* DomHTMLTableCellElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -70,7 +70,7 @@ public class DomHTMLTableCellElement { setHTMLAttribute("abbr", abbr); } - + public String getAlign() { return getHTMLAttribute("align"); @@ -80,7 +80,7 @@ public class DomHTMLTableCellElement { setHTMLAttribute("align", align); } - + public String getAxis() { return getHTMLAttribute("axis"); @@ -90,7 +90,7 @@ public class DomHTMLTableCellElement { setHTMLAttribute("axis", axis); } - + public String getBgColor() { return getHTMLAttribute("bgcolor"); @@ -100,7 +100,7 @@ public class DomHTMLTableCellElement { setHTMLAttribute("bgcolor", bgColor); } - + public String getCh() { return getHTMLAttribute("char"); @@ -110,7 +110,7 @@ public class DomHTMLTableCellElement { setHTMLAttribute("char", ch); } - + public String getChOff() { return getHTMLAttribute("charoff"); @@ -120,7 +120,7 @@ public class DomHTMLTableCellElement { setHTMLAttribute("charoff", chOff); } - + public int getColSpan() { return getIntHTMLAttribute("colspan"); @@ -130,7 +130,7 @@ public class DomHTMLTableCellElement { setIntHTMLAttribute("colspan", colSpan); } - + public String getHeaders() { return getHTMLAttribute("headers"); @@ -140,7 +140,7 @@ public class DomHTMLTableCellElement { setHTMLAttribute("headers", headers); } - + public String getHeight() { return getHTMLAttribute("height"); @@ -150,7 +150,7 @@ public class DomHTMLTableCellElement { setHTMLAttribute("height", height); } - + public boolean getNoWrap() { return getBooleanHTMLAttribute("nowrap"); @@ -160,7 +160,7 @@ public class DomHTMLTableCellElement { setBooleanHTMLAttribute("nowrap", noWrap); } - + public int getRowSpan() { return getIntHTMLAttribute("rowspan"); @@ -170,7 +170,7 @@ public class DomHTMLTableCellElement { setIntHTMLAttribute("rowspan", rowSpan); } - + public String getScope() { return getHTMLAttribute("scope"); @@ -180,7 +180,7 @@ public class DomHTMLTableCellElement { setHTMLAttribute("scope", scope); } - + public String getVAlign() { return getHTMLAttribute("valign"); @@ -190,7 +190,7 @@ public class DomHTMLTableCellElement { setHTMLAttribute("valign", vAlign); } - + public String getWidth() { return getHTMLAttribute("width"); @@ -200,6 +200,5 @@ public class DomHTMLTableCellElement { setHTMLAttribute("width", width); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableColElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableColElement.java index 799447dc81e..c7cef31ebe4 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableColElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableColElement.java @@ -1,4 +1,4 @@ -/* DomHTMLTableColElement.java -- +/* DomHTMLTableColElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -65,7 +65,7 @@ public class DomHTMLTableColElement { setHTMLAttribute("align", align); } - + public String getCh() { return getHTMLAttribute("char"); @@ -75,7 +75,7 @@ public class DomHTMLTableColElement { setHTMLAttribute("char", ch); } - + public String getChOff() { return getHTMLAttribute("charoff"); @@ -85,7 +85,7 @@ public class DomHTMLTableColElement { setHTMLAttribute("charoff", chOff); } - + public int getSpan() { return getIntHTMLAttribute("span"); @@ -95,7 +95,7 @@ public class DomHTMLTableColElement { setIntHTMLAttribute("span", span); } - + public String getVAlign() { return getHTMLAttribute("valign"); @@ -105,7 +105,7 @@ public class DomHTMLTableColElement { setHTMLAttribute("valign", vAlign); } - + public String getWidth() { return getHTMLAttribute("width"); @@ -115,6 +115,5 @@ public class DomHTMLTableColElement { setHTMLAttribute("width", width); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableElement.java index ea925400e56..ade463ef7ab 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableElement.java @@ -1,4 +1,4 @@ -/* DomHTMLTableElement.java -- +/* DomHTMLTableElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -79,7 +79,7 @@ public class DomHTMLTableElement replaceChild(caption, ref); } } - + public HTMLTableSectionElement getTHead() { return (HTMLTableSectionElement) getChildElement("thead"); @@ -133,7 +133,7 @@ public class DomHTMLTableElement ret.evaluate(); return ret; } - + public String getAlign() { return getHTMLAttribute("align"); @@ -143,7 +143,7 @@ public class DomHTMLTableElement { setHTMLAttribute("align", align); } - + public String getBgColor() { return getHTMLAttribute("bgcolor"); @@ -153,7 +153,7 @@ public class DomHTMLTableElement { setHTMLAttribute("bgcolor", bgColor); } - + public String getBorder() { return getHTMLAttribute("border"); @@ -163,7 +163,7 @@ public class DomHTMLTableElement { setHTMLAttribute("border", border); } - + public String getCellPadding() { return getHTMLAttribute("cellpadding"); @@ -173,7 +173,7 @@ public class DomHTMLTableElement { setHTMLAttribute("cellpadding", cellPadding); } - + public String getCellSpacing() { return getHTMLAttribute("cellspacing"); @@ -183,7 +183,7 @@ public class DomHTMLTableElement { setHTMLAttribute("cellspacing", cellSpacing); } - + public String getFrame() { return getHTMLAttribute("frame"); @@ -193,7 +193,7 @@ public class DomHTMLTableElement { setHTMLAttribute("frame", frame); } - + public String getRules() { return getHTMLAttribute("rules"); @@ -203,7 +203,7 @@ public class DomHTMLTableElement { setHTMLAttribute("rules", rules); } - + public String getSummary() { return getHTMLAttribute("summary"); @@ -213,7 +213,7 @@ public class DomHTMLTableElement { setHTMLAttribute("summary", summary); } - + public String getWidth() { return getHTMLAttribute("width"); @@ -320,9 +320,9 @@ public class DomHTMLTableElement } ref.getParentNode().removeChild(ref); } - + Node getRow(final int index) - { + { int i = 0; Node thead = getChildElement("thead"); if (thead != null) @@ -395,4 +395,3 @@ public class DomHTMLTableElement } } - diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableRowElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableRowElement.java index ecd07a743b4..9943585f4ec 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableRowElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableRowElement.java @@ -1,4 +1,4 @@ -/* DomHTMLTableRowElement.java -- +/* DomHTMLTableRowElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -134,7 +134,7 @@ public class DomHTMLTableRowElement { setHTMLAttribute("align", align); } - + public String getBgColor() { return getHTMLAttribute("bgcolor"); @@ -144,7 +144,7 @@ public class DomHTMLTableRowElement { setHTMLAttribute("bgcolor", bgColor); } - + public String getCh() { return getHTMLAttribute("char"); @@ -154,7 +154,7 @@ public class DomHTMLTableRowElement { setHTMLAttribute("char", ch); } - + public String getChOff() { return getHTMLAttribute("charoff"); @@ -164,7 +164,7 @@ public class DomHTMLTableRowElement { setHTMLAttribute("charoff", chOff); } - + public String getVAlign() { return getHTMLAttribute("valign"); @@ -199,9 +199,9 @@ public class DomHTMLTableRowElement } removeChild(ref); } - + Node getCell(final int index) - { + { int i = 0; for (Node ctx = getFirstChild(); ctx != null; ctx = ctx.getNextSibling()) @@ -224,6 +224,5 @@ public class DomHTMLTableRowElement } return null; } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableSectionElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableSectionElement.java index da015f1f67a..389eb591b53 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableSectionElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTableSectionElement.java @@ -1,4 +1,4 @@ -/* DomHTMLTableSectionElement.java -- +/* DomHTMLTableSectionElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -70,7 +70,7 @@ public class DomHTMLTableSectionElement { setHTMLAttribute("align", align); } - + public String getCh() { return getHTMLAttribute("char"); @@ -80,7 +80,7 @@ public class DomHTMLTableSectionElement { setHTMLAttribute("char", ch); } - + public String getChOff() { return getHTMLAttribute("charoff"); @@ -90,7 +90,7 @@ public class DomHTMLTableSectionElement { setHTMLAttribute("charoff", chOff); } - + public String getVAlign() { return getHTMLAttribute("valign"); @@ -134,9 +134,9 @@ public class DomHTMLTableSectionElement } removeChild(ref); } - + Node getRow(final int index) - { + { int i = 0; for (Node ctx = getFirstChild(); ctx != null; ctx = ctx.getNextSibling()) @@ -158,6 +158,5 @@ public class DomHTMLTableSectionElement } return null; } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTextAreaElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTextAreaElement.java index 22d6105696f..9acfab13438 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTextAreaElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTextAreaElement.java @@ -1,4 +1,4 @@ -/* DomHTMLTextAreaElement.java -- +/* DomHTMLTextAreaElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -73,7 +73,7 @@ public class DomHTMLTextAreaElement { return (HTMLFormElement) getParentElement("form"); } - + public String getAccessKey() { return getHTMLAttribute("accesskey"); @@ -83,7 +83,7 @@ public class DomHTMLTextAreaElement { setHTMLAttribute("accesskey", accessKey); } - + public int getCols() { return getIntHTMLAttribute("cols"); @@ -93,7 +93,7 @@ public class DomHTMLTextAreaElement { setIntHTMLAttribute("cols", cols); } - + public boolean getDisabled() { return getBooleanHTMLAttribute("disabled"); @@ -103,7 +103,7 @@ public class DomHTMLTextAreaElement { setBooleanHTMLAttribute("disabled", disabled); } - + public String getName() { return getHTMLAttribute("name"); @@ -113,7 +113,7 @@ public class DomHTMLTextAreaElement { setHTMLAttribute("name", name); } - + public boolean getReadOnly() { return getBooleanHTMLAttribute("readOnly"); @@ -123,7 +123,7 @@ public class DomHTMLTextAreaElement { setBooleanHTMLAttribute("readonly", readOnly); } - + public int getRows() { return getIntHTMLAttribute("rows"); @@ -133,7 +133,7 @@ public class DomHTMLTextAreaElement { setIntHTMLAttribute("rows", rows); } - + public int getTabIndex() { return getIntHTMLAttribute("tabindex"); @@ -143,7 +143,7 @@ public class DomHTMLTextAreaElement { setIntHTMLAttribute("tabindex", tabIndex); } - + public String getType() { return "textarea"; @@ -172,11 +172,10 @@ public class DomHTMLTextAreaElement { dispatchUIEvent("focus"); } - + public void select() { dispatchUIEvent("select"); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTitleElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTitleElement.java index f62342d6ff5..4f581061b8b 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLTitleElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLTitleElement.java @@ -1,4 +1,4 @@ -/* DomHTMLTitleElement.java -- +/* DomHTMLTitleElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,6 +64,5 @@ public class DomHTMLTitleElement { setTextContent(text); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/html2/DomHTMLUListElement.java b/libjava/classpath/gnu/xml/dom/html2/DomHTMLUListElement.java index c07adeabf20..39cdce7d3a0 100644 --- a/libjava/classpath/gnu/xml/dom/html2/DomHTMLUListElement.java +++ b/libjava/classpath/gnu/xml/dom/html2/DomHTMLUListElement.java @@ -1,4 +1,4 @@ -/* DomHTMLUListElement.java -- +/* DomHTMLUListElement.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ public class DomHTMLUListElement { setBooleanHTMLAttribute("compact", compact); } - + public String getType() { return getHTMLAttribute("type"); @@ -74,6 +74,5 @@ public class DomHTMLUListElement { setHTMLAttribute("type", type); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/ls/DomLSException.java b/libjava/classpath/gnu/xml/dom/ls/DomLSException.java index 6ac49e66934..31efc845fbc 100644 --- a/libjava/classpath/gnu/xml/dom/ls/DomLSException.java +++ b/libjava/classpath/gnu/xml/dom/ls/DomLSException.java @@ -1,4 +1,4 @@ -/* DomLSException.java -- +/* DomLSException.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/gnu/xml/dom/ls/DomLSInput.java b/libjava/classpath/gnu/xml/dom/ls/DomLSInput.java index 68705fdee92..39b17694ff2 100644 --- a/libjava/classpath/gnu/xml/dom/ls/DomLSInput.java +++ b/libjava/classpath/gnu/xml/dom/ls/DomLSInput.java @@ -1,4 +1,4 @@ -/* DomLSInput.java -- +/* DomLSInput.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -155,6 +155,5 @@ public class DomLSInput { this.certifiedText = certifiedText; } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/ls/DomLSOutput.java b/libjava/classpath/gnu/xml/dom/ls/DomLSOutput.java index c2f4d4132ce..e8bec2ec137 100644 --- a/libjava/classpath/gnu/xml/dom/ls/DomLSOutput.java +++ b/libjava/classpath/gnu/xml/dom/ls/DomLSOutput.java @@ -1,4 +1,4 @@ -/* DomLSOutput.java -- +/* DomLSOutput.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -94,5 +94,5 @@ public class DomLSOutput { this.encoding = encoding; } - + } diff --git a/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java b/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java index f4f555e8c39..99db79d6422 100644 --- a/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java +++ b/libjava/classpath/gnu/xml/dom/ls/DomLSParser.java @@ -1,4 +1,4 @@ -/* DomLSParser.java -- +/* DomLSParser.java -- Copyright (C) 1999,2000,2001,2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -125,12 +125,12 @@ public class DomLSParser } // -- LSParser -- - + public DOMConfiguration getDomConfig() { return this; } - + public LSParserFilter getFilter() { return filter; @@ -283,7 +283,7 @@ public class DomLSParser catch (SAXNotRecognizedException e) { // ignore - } + } try { reader.setFeature("http://xml.org/sax/features/use-attributes2", @@ -563,6 +563,5 @@ public class DomLSParser } abort(); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/ls/DomLSSerializer.java b/libjava/classpath/gnu/xml/dom/ls/DomLSSerializer.java index cedaf151e70..c282b0b9f68 100644 --- a/libjava/classpath/gnu/xml/dom/ls/DomLSSerializer.java +++ b/libjava/classpath/gnu/xml/dom/ls/DomLSSerializer.java @@ -1,4 +1,4 @@ -/* DomLSSerializer.java -- +/* DomLSSerializer.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -85,7 +85,7 @@ public class DomLSSerializer } // -- LSSerializer -- - + public DOMConfiguration getDomConfig() { return this; @@ -349,6 +349,5 @@ public class DomLSSerializer { return SUPPORTED_PARAMETERS.contains(str); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/ls/FilteredSAXEventSink.java b/libjava/classpath/gnu/xml/dom/ls/FilteredSAXEventSink.java index 1c99ee524fa..65c1d37a417 100644 --- a/libjava/classpath/gnu/xml/dom/ls/FilteredSAXEventSink.java +++ b/libjava/classpath/gnu/xml/dom/ls/FilteredSAXEventSink.java @@ -1,4 +1,4 @@ -/* FilteredSAXEventSink.java -- +/* FilteredSAXEventSink.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -64,7 +64,7 @@ class FilteredSAXEventSink * Stack of elements to insert. */ LinkedList nodes; - + /** * Corresponding stack of filter decisions about the nodes. */ @@ -90,7 +90,7 @@ class FilteredSAXEventSink } nodes = new LinkedList(); decisions = new LinkedList(); - + super.startDocument(); } @@ -110,7 +110,7 @@ class FilteredSAXEventSink doc = null; break; } - + nodes = null; decisions = null; } @@ -125,7 +125,7 @@ class FilteredSAXEventSink } Element element = createElement(uri, localName, qName, atts); ctx = element; - + short decision = getDecision(element, true); nodes.addLast(element); decisions.addLast(new Short(decision)); @@ -164,7 +164,7 @@ class FilteredSAXEventSink return; } super.endElement(uri, localName, qName); - + Element element = (Element) nodes.removeLast(); Node parent = nodes.isEmpty() ? doc : (Node) nodes.getLast(); ctx = parent; @@ -303,40 +303,40 @@ class FilteredSAXEventSink { case Node.ATTRIBUTE_NODE: show = ((whatToShow & NodeFilter.SHOW_ATTRIBUTE) != 0); - break; + break; case Node.TEXT_NODE: show = ((whatToShow & NodeFilter.SHOW_TEXT) != 0); - break; + break; case Node.CDATA_SECTION_NODE: show = ((whatToShow & NodeFilter.SHOW_CDATA_SECTION) != 0); - break; + break; case Node.ELEMENT_NODE: show = ((whatToShow & NodeFilter.SHOW_ELEMENT) != 0); - break; + break; case Node.COMMENT_NODE: show = ((whatToShow & NodeFilter.SHOW_COMMENT) != 0); - break; + break; case Node.DOCUMENT_NODE: show = ((whatToShow & NodeFilter.SHOW_DOCUMENT) != 0); - break; + break; case Node.PROCESSING_INSTRUCTION_NODE: show = ((whatToShow & NodeFilter.SHOW_PROCESSING_INSTRUCTION) != 0); - break; + break; case Node.DOCUMENT_FRAGMENT_NODE: show = ((whatToShow & NodeFilter.SHOW_DOCUMENT_FRAGMENT) != 0); - break; + break; case Node.DOCUMENT_TYPE_NODE: show = ((whatToShow & NodeFilter.SHOW_DOCUMENT_TYPE) != 0); - break; + break; case Node.ENTITY_REFERENCE_NODE: show = ((whatToShow & NodeFilter.SHOW_ENTITY_REFERENCE) != 0); - break; + break; case Node.ENTITY_NODE: show = ((whatToShow & NodeFilter.SHOW_ENTITY) != 0); - break; + break; case Node.NOTATION_NODE: show = ((whatToShow & NodeFilter.SHOW_NOTATION) != 0); - break; + break; } } if (!show) @@ -351,4 +351,3 @@ class FilteredSAXEventSink } } - diff --git a/libjava/classpath/gnu/xml/dom/ls/ReaderInputStream.java b/libjava/classpath/gnu/xml/dom/ls/ReaderInputStream.java index 5b41abd3d74..cf279ab396b 100644 --- a/libjava/classpath/gnu/xml/dom/ls/ReaderInputStream.java +++ b/libjava/classpath/gnu/xml/dom/ls/ReaderInputStream.java @@ -1,4 +1,4 @@ -/* ReaderInputStream.java -- +/* ReaderInputStream.java -- Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -124,7 +124,7 @@ public class ReaderInputStream String s = new String(c, 0, l); byte[] d = s.getBytes(encoding); - + int available = d.length; int more = d.length - len; if (more > 0) @@ -134,7 +134,7 @@ public class ReaderInputStream System.arraycopy(d, len, extra, 0, more); available -= more; } - + System.arraycopy(d, 0, b, off, available); return available; } @@ -232,6 +232,5 @@ public class ReaderInputStream { return getClass().getName() + "[" + reader + ", " + encoding + "]"; } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java b/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java index 1f8de046d42..06333dd7e91 100644 --- a/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java +++ b/libjava/classpath/gnu/xml/dom/ls/SAXEventSink.java @@ -1,4 +1,4 @@ -/* SAXEventSink.java -- +/* SAXEventSink.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -96,7 +96,7 @@ public class SAXEventSink boolean coalescing; XMLReader reader; // reference back to the parser to get features - + DomDocument doc; // document being constructed Node ctx; // current context (parent node) LinkedList entityCtx; // entity context @@ -122,7 +122,7 @@ public class SAXEventSink } // -- ContentHandler2 -- - + public void setDocumentLocator(Locator locator) { this.locator = locator; @@ -378,7 +378,7 @@ public class SAXEventSink } // -- LexicalHandler -- - + public void startDTD(String name, String publicId, String systemId) throws SAXException { @@ -534,7 +534,7 @@ public class SAXEventSink } // -- DeclHandler -- - + public void elementDecl(String name, String model) throws SAXException { @@ -599,6 +599,5 @@ public class SAXEventSink DomDoctype doctype = (DomDoctype) ctx; Entity entity = doctype.declareEntity(name, publicId, systemId, null); } - -} +} diff --git a/libjava/classpath/gnu/xml/dom/ls/WriterOutputStream.java b/libjava/classpath/gnu/xml/dom/ls/WriterOutputStream.java index 2fb20614722..f1ae344f47e 100644 --- a/libjava/classpath/gnu/xml/dom/ls/WriterOutputStream.java +++ b/libjava/classpath/gnu/xml/dom/ls/WriterOutputStream.java @@ -1,4 +1,4 @@ -/* WriterOutputStream.java -- +/* WriterOutputStream.java -- Copyright (C) 1999,2000,2001 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -93,6 +93,5 @@ public class WriterOutputStream { writer.flush(); } - -} +} |
