diff options
Diffstat (limited to 'libjava/classpath/gnu/xml/stream')
30 files changed, 173 insertions, 199 deletions
diff --git a/libjava/classpath/gnu/xml/stream/AttributeImpl.java b/libjava/classpath/gnu/xml/stream/AttributeImpl.java index f74aebd3526..58a0dbe2126 100644 --- a/libjava/classpath/gnu/xml/stream/AttributeImpl.java +++ b/libjava/classpath/gnu/xml/stream/AttributeImpl.java @@ -1,4 +1,4 @@ -/* AttributeImpl.java -- +/* AttributeImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -94,7 +94,7 @@ public class AttributeImpl { return specified; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -119,6 +119,5 @@ public class AttributeImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/BufferedReader.java b/libjava/classpath/gnu/xml/stream/BufferedReader.java index f8287e823fd..dc69fb34ba3 100644 --- a/libjava/classpath/gnu/xml/stream/BufferedReader.java +++ b/libjava/classpath/gnu/xml/stream/BufferedReader.java @@ -1,4 +1,4 @@ -/* BufferedReader.java -- +/* BufferedReader.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -59,7 +59,7 @@ class BufferedReader { this(in, DEFAULT_BUFFER_SIZE); } - + BufferedReader(Reader in, int bufferSize) { if (bufferSize < 1) @@ -110,19 +110,19 @@ class BufferedReader { if (off < 0 || len < 0 || b.length - off < len) throw new IndexOutOfBoundsException(); - + if (len == 0) return 0; - + if (pos >= count && !refill()) return -1; - + int ret = Math.min(count - pos, len); System.arraycopy(buf, pos, b, off, ret); pos += ret; off += ret; len -= ret; - + while (len > 0 && refill()) { int remain = Math.min(count - pos, len); @@ -132,7 +132,7 @@ class BufferedReader len -= remain; ret += remain; } - + return ret; } @@ -177,7 +177,7 @@ class BufferedReader { char[] newbuf = buf; if (markpos < bufferSize) - { + { newbuf = new char[count - markpos + bufferSize]; } System.arraycopy(buf, markpos, newbuf, 0, markcount); diff --git a/libjava/classpath/gnu/xml/stream/CRLFReader.java b/libjava/classpath/gnu/xml/stream/CRLFReader.java index dad02b94a1d..7f3cf4d7446 100644 --- a/libjava/classpath/gnu/xml/stream/CRLFReader.java +++ b/libjava/classpath/gnu/xml/stream/CRLFReader.java @@ -1,4 +1,4 @@ -/* CRLFReader.java -- +/* CRLFReader.java -- Copyright (C) 2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -115,7 +115,7 @@ class CRLFReader } else l = in.read(b, off, len); // CR(s) but no LF - } + } } return l; } @@ -178,4 +178,3 @@ class CRLFReader } } - diff --git a/libjava/classpath/gnu/xml/stream/CharactersImpl.java b/libjava/classpath/gnu/xml/stream/CharactersImpl.java index 6df06582b87..2107a5a6d59 100644 --- a/libjava/classpath/gnu/xml/stream/CharactersImpl.java +++ b/libjava/classpath/gnu/xml/stream/CharactersImpl.java @@ -1,4 +1,4 @@ -/* CharactersImpl.java -- +/* CharactersImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -88,12 +88,12 @@ public class CharactersImpl { return cdata; } - + public boolean isIgnorableWhiteSpace() { return ignorableWhitespace; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -105,7 +105,7 @@ public class CharactersImpl writer.write(data); writer.write("]]>"); } - else + else writer.write(encode(data, false)); } catch (IOException e) @@ -115,6 +115,5 @@ public class CharactersImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/CommentImpl.java b/libjava/classpath/gnu/xml/stream/CommentImpl.java index 5863fb05aec..118ac7a5767 100644 --- a/libjava/classpath/gnu/xml/stream/CommentImpl.java +++ b/libjava/classpath/gnu/xml/stream/CommentImpl.java @@ -1,4 +1,4 @@ -/* CommentImpl.java -- +/* CommentImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -70,7 +70,7 @@ public class CommentImpl { return text; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -87,6 +87,5 @@ public class CommentImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/DTDImpl.java b/libjava/classpath/gnu/xml/stream/DTDImpl.java index 8e008aaede1..cf049d3620e 100644 --- a/libjava/classpath/gnu/xml/stream/DTDImpl.java +++ b/libjava/classpath/gnu/xml/stream/DTDImpl.java @@ -1,4 +1,4 @@ -/* DTDImpl.java -- +/* DTDImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -93,7 +93,7 @@ public class DTDImpl { return entities; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -110,6 +110,5 @@ public class DTDImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/EndDocumentImpl.java b/libjava/classpath/gnu/xml/stream/EndDocumentImpl.java index 0e3ed9630ad..13877c5c965 100644 --- a/libjava/classpath/gnu/xml/stream/EndDocumentImpl.java +++ b/libjava/classpath/gnu/xml/stream/EndDocumentImpl.java @@ -1,4 +1,4 @@ -/* EndDocumentImpl.java -- +/* EndDocumentImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -61,11 +61,10 @@ public class EndDocumentImpl { return END_DOCUMENT; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/EndElementImpl.java b/libjava/classpath/gnu/xml/stream/EndElementImpl.java index 7b5382ec5f3..71f6aa0bcac 100644 --- a/libjava/classpath/gnu/xml/stream/EndElementImpl.java +++ b/libjava/classpath/gnu/xml/stream/EndElementImpl.java @@ -1,4 +1,4 @@ -/* EndElementImpl.java -- +/* EndElementImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -80,7 +80,7 @@ public class EndElementImpl { return namespaces.iterator(); } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -103,6 +103,5 @@ public class EndElementImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/EntityDeclarationImpl.java b/libjava/classpath/gnu/xml/stream/EntityDeclarationImpl.java index 41ec2fb9b0d..b6e33e8d2b0 100644 --- a/libjava/classpath/gnu/xml/stream/EntityDeclarationImpl.java +++ b/libjava/classpath/gnu/xml/stream/EntityDeclarationImpl.java @@ -1,4 +1,4 @@ -/* EntityDeclarationImpl.java -- +/* EntityDeclarationImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -159,6 +159,5 @@ public class EntityDeclarationImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/EntityReferenceImpl.java b/libjava/classpath/gnu/xml/stream/EntityReferenceImpl.java index 38e1f00b1af..6f8a11c80fd 100644 --- a/libjava/classpath/gnu/xml/stream/EntityReferenceImpl.java +++ b/libjava/classpath/gnu/xml/stream/EntityReferenceImpl.java @@ -1,4 +1,4 @@ -/* EntityReferenceImpl.java -- +/* EntityReferenceImpl.java -- Copyright (C) 2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -99,4 +99,3 @@ public class EntityReferenceImpl } } - diff --git a/libjava/classpath/gnu/xml/stream/FilteredEventReader.java b/libjava/classpath/gnu/xml/stream/FilteredEventReader.java index fd6fe8b0721..1ddb469df0a 100644 --- a/libjava/classpath/gnu/xml/stream/FilteredEventReader.java +++ b/libjava/classpath/gnu/xml/stream/FilteredEventReader.java @@ -1,4 +1,4 @@ -/* FilteredEventReader.java -- +/* FilteredEventReader.java -- Copyright (C) 2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -72,7 +72,7 @@ class FilteredEventReader while (!filter.accept(ret)); return ret; } - + public Object next() { try @@ -86,7 +86,7 @@ class FilteredEventReader throw e2; } } - + public XMLEvent peek() throws XMLStreamException { @@ -98,7 +98,7 @@ class FilteredEventReader while (!filter.accept(ret)); return ret; } - + public XMLEvent nextTag() throws XMLStreamException { @@ -110,6 +110,5 @@ class FilteredEventReader while (!filter.accept(ret)); return ret; } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/FilteredStreamReader.java b/libjava/classpath/gnu/xml/stream/FilteredStreamReader.java index 90ebb330d0b..62d96488eb0 100644 --- a/libjava/classpath/gnu/xml/stream/FilteredStreamReader.java +++ b/libjava/classpath/gnu/xml/stream/FilteredStreamReader.java @@ -1,4 +1,4 @@ -/* FilteredStreamReader.java -- +/* FilteredStreamReader.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -74,7 +74,7 @@ class FilteredStreamReader while (!filter.accept(reader)); return ret; } - + public int nextTag() throws XMLStreamException { @@ -86,6 +86,5 @@ class FilteredStreamReader while (!filter.accept(reader)); return ret; } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/NamespaceImpl.java b/libjava/classpath/gnu/xml/stream/NamespaceImpl.java index 1a595ee83d4..241f980b600 100644 --- a/libjava/classpath/gnu/xml/stream/NamespaceImpl.java +++ b/libjava/classpath/gnu/xml/stream/NamespaceImpl.java @@ -1,4 +1,4 @@ -/* NamespaceImpl.java -- +/* NamespaceImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -109,7 +109,7 @@ public class NamespaceImpl { return (prefix == null || "".equals(prefix)); } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -133,6 +133,5 @@ public class NamespaceImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/NotationDeclarationImpl.java b/libjava/classpath/gnu/xml/stream/NotationDeclarationImpl.java index 2d08599f577..a338237eec9 100644 --- a/libjava/classpath/gnu/xml/stream/NotationDeclarationImpl.java +++ b/libjava/classpath/gnu/xml/stream/NotationDeclarationImpl.java @@ -1,4 +1,4 @@ -/* NotationDeclarationImpl.java -- +/* NotationDeclarationImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -86,7 +86,7 @@ public class NotationDeclarationImpl { return systemId; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -121,6 +121,5 @@ public class NotationDeclarationImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/ProcessingInstructionImpl.java b/libjava/classpath/gnu/xml/stream/ProcessingInstructionImpl.java index 6a5028956ad..4ce0badc828 100644 --- a/libjava/classpath/gnu/xml/stream/ProcessingInstructionImpl.java +++ b/libjava/classpath/gnu/xml/stream/ProcessingInstructionImpl.java @@ -1,4 +1,4 @@ -/* ProcessingInstructionImpl.java -- +/* ProcessingInstructionImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -78,7 +78,7 @@ public class ProcessingInstructionImpl { return data; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -100,6 +100,5 @@ public class ProcessingInstructionImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/SAXParser.java b/libjava/classpath/gnu/xml/stream/SAXParser.java index ab1f86e49ed..b71d98ed30f 100644 --- a/libjava/classpath/gnu/xml/stream/SAXParser.java +++ b/libjava/classpath/gnu/xml/stream/SAXParser.java @@ -1,4 +1,4 @@ -/* SAXParser.java -- +/* SAXParser.java -- Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -131,13 +131,13 @@ public class SAXParser } // -- SAXParser -- - + public Parser getParser() throws SAXException { return null; } - + public XMLReader getXMLReader() throws SAXException { @@ -365,11 +365,11 @@ public class SAXParser } reader = parser; baseURI = systemId; - + if (xIncludeAware) reader = new XIncludeFilter(parser, systemId, namespaceAware, validating, true); - + if (contentHandler != null) contentHandler.setDocumentLocator(this); boolean startDocumentDone = false; @@ -864,7 +864,7 @@ public class SAXParser } // -- Locator2 -- - + public int getColumnNumber() { Location l = reader.getLocation(); @@ -888,7 +888,7 @@ public class SAXParser Location l = reader.getLocation(); return l.getSystemId(); } - + public String getEncoding() { return encoding; @@ -900,7 +900,7 @@ public class SAXParser } // -- XMLResolver -- - + public Object resolveEntity(String publicId, String systemId, String baseURI, String namespace) throws XMLStreamException @@ -1037,5 +1037,5 @@ public class SAXParser pos++; } } - + } diff --git a/libjava/classpath/gnu/xml/stream/SAXParserFactory.java b/libjava/classpath/gnu/xml/stream/SAXParserFactory.java index a2ccea1e694..ebaeb3cb2cc 100644 --- a/libjava/classpath/gnu/xml/stream/SAXParserFactory.java +++ b/libjava/classpath/gnu/xml/stream/SAXParserFactory.java @@ -1,4 +1,4 @@ -/* SAXParserFactory.java -- +/* SAXParserFactory.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -92,13 +92,13 @@ public class SAXParserFactory features.put(name, value ? Boolean.TRUE : Boolean.FALSE); } - public boolean getFeature(String name) - throws ParserConfigurationException, SAXNotRecognizedException, SAXNotSupportedException + public boolean getFeature(String name) + throws ParserConfigurationException, SAXNotRecognizedException, SAXNotSupportedException { if (!FEATURE_NAMES.contains(name)) throw new SAXNotSupportedException(name); Boolean value = (Boolean) features.get(name); return (value == null) ? false : value.booleanValue(); } - + } diff --git a/libjava/classpath/gnu/xml/stream/StartDocumentImpl.java b/libjava/classpath/gnu/xml/stream/StartDocumentImpl.java index dc4251dd9bf..d2e590cfc90 100644 --- a/libjava/classpath/gnu/xml/stream/StartDocumentImpl.java +++ b/libjava/classpath/gnu/xml/stream/StartDocumentImpl.java @@ -1,4 +1,4 @@ -/* StartDocumentImpl.java -- +/* StartDocumentImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -109,7 +109,7 @@ public class StartDocumentImpl { return xmlVersion; } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -139,6 +139,5 @@ public class StartDocumentImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/StartElementImpl.java b/libjava/classpath/gnu/xml/stream/StartElementImpl.java index 48f88656046..66e68d56071 100644 --- a/libjava/classpath/gnu/xml/stream/StartElementImpl.java +++ b/libjava/classpath/gnu/xml/stream/StartElementImpl.java @@ -1,4 +1,4 @@ -/* StartElementImpl.java -- +/* StartElementImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -115,7 +115,7 @@ public class StartElementImpl { return namespaceContext.getNamespaceURI(prefix); } - + public void writeAsEncodedUnicode(Writer writer) throws XMLStreamException { @@ -148,6 +148,5 @@ public class StartElementImpl throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/UnicodeReader.java b/libjava/classpath/gnu/xml/stream/UnicodeReader.java index 9350cb2e0b6..aa2a95422b0 100644 --- a/libjava/classpath/gnu/xml/stream/UnicodeReader.java +++ b/libjava/classpath/gnu/xml/stream/UnicodeReader.java @@ -1,4 +1,4 @@ -/* UnicodeReader.java -- +/* UnicodeReader.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -201,5 +201,5 @@ public class UnicodeReader } return buf; } - + } diff --git a/libjava/classpath/gnu/xml/stream/XIncludeFilter.java b/libjava/classpath/gnu/xml/stream/XIncludeFilter.java index aed9d9a0f00..6d955c492e7 100644 --- a/libjava/classpath/gnu/xml/stream/XIncludeFilter.java +++ b/libjava/classpath/gnu/xml/stream/XIncludeFilter.java @@ -1,4 +1,4 @@ -/* XIncludeFilter.java -- +/* XIncludeFilter.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -107,7 +107,7 @@ class XIncludeFilter HashSet seen = new HashSet(); boolean backtracking; boolean lookahead; - + Reader includedText; char[] buf; int len = -1; @@ -677,7 +677,7 @@ class XIncludeFilter String base = (String) getParent().getProperty("gnu.xml.stream.baseURI"); return (base == null) ? systemId : base; } - + boolean includeResource(String href, String parse, String xpointer, String encoding, String accept, String acceptLanguage) @@ -700,7 +700,7 @@ class XIncludeFilter walker = null; current = null; backtracking = false; - + URLConnection connection = getURLConnection(href, accept, acceptLanguage); InputStream in = connection.getInputStream(); @@ -927,5 +927,5 @@ class XIncludeFilter } return null; } - + } diff --git a/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java index dd2b18c943f..a1824bfc54d 100644 --- a/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java @@ -1,4 +1,4 @@ -/* XMLEventAllocatorImpl.java -- +/* XMLEventAllocatorImpl.java -- Copyright (C) 2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -188,7 +188,7 @@ public class XMLEventAllocatorImpl { return new XMLEventAllocatorImpl(); } - + protected boolean isWhitespace(String text) { int len = text.length(); @@ -200,6 +200,5 @@ public class XMLEventAllocatorImpl } return true; } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java index 5ca1aab7ce8..12f7f2c790b 100644 --- a/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java @@ -1,4 +1,4 @@ -/* XMLEventFactoryImpl.java -- +/* XMLEventFactoryImpl.java -- Copyright (C) 2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -81,7 +81,7 @@ public class XMLEventFactoryImpl new QName(namespaceURI, localName, prefix), value, "CDATA", true); } - + public Attribute createAttribute(String localName, String value) { return new AttributeImpl(location, @@ -117,7 +117,7 @@ public class XMLEventFactoryImpl createLinkedList(namespaces), null); } - + public StartElement createStartElement(String prefix, String namespaceUri, String localName) @@ -155,7 +155,7 @@ public class XMLEventFactoryImpl createLinkedList(namespaces), context); } - + public EndElement createEndElement(QName name, Iterator namespaces) { @@ -171,7 +171,7 @@ public class XMLEventFactoryImpl new QName(namespaceUri, localName, prefix), Collections.EMPTY_LIST); } - + public EndElement createEndElement(String prefix, String namespaceUri, String localName, @@ -215,7 +215,7 @@ public class XMLEventFactoryImpl return new StartDocumentImpl(location, null, encoding, version, standalone, true, true); } - + public StartDocument createStartDocument(String encoding, String version) { @@ -265,6 +265,5 @@ public class XMLEventFactoryImpl ret.add(i.next()); return ret; } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/XMLEventImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventImpl.java index 8d73b177427..2e650bf74f6 100644 --- a/libjava/classpath/gnu/xml/stream/XMLEventImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLEventImpl.java @@ -1,4 +1,4 @@ -/* XMLEventImpl.java -- +/* XMLEventImpl.java -- Copyright (C) 2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -136,7 +136,7 @@ public abstract class XMLEventImpl { return null; } - + public abstract void writeAsEncodedUnicode(Writer writer) throws XMLStreamException; @@ -192,8 +192,7 @@ public abstract class XMLEventImpl buf.append(c); } } - return (buf == null) ? text : buf.toString(); + return (buf == null) ? text : buf.toString(); } } - diff --git a/libjava/classpath/gnu/xml/stream/XMLEventReaderImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventReaderImpl.java index bb64b1e3f9d..bab6d9378b4 100644 --- a/libjava/classpath/gnu/xml/stream/XMLEventReaderImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLEventReaderImpl.java @@ -1,4 +1,4 @@ -/* XMLEventReaderImpl.java -- +/* XMLEventReaderImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -102,7 +102,7 @@ public class XMLEventReaderImpl return false; } } - + public XMLEvent peek() throws XMLStreamException { @@ -155,4 +155,3 @@ public class XMLEventReaderImpl } } - diff --git a/libjava/classpath/gnu/xml/stream/XMLEventWriterImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventWriterImpl.java index 72b7adce24c..33b1dce31b0 100644 --- a/libjava/classpath/gnu/xml/stream/XMLEventWriterImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLEventWriterImpl.java @@ -1,4 +1,4 @@ -/* XMLEventWriterImpl.java -- +/* XMLEventWriterImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -62,7 +62,7 @@ import javax.xml.stream.events.XMLEvent; public class XMLEventWriterImpl implements XMLEventWriter { - + protected final XMLStreamWriter writer; protected XMLEventWriterImpl(XMLStreamWriter writer) @@ -181,11 +181,10 @@ public class XMLEventWriterImpl { writer.setNamespaceContext(context); } - + public NamespaceContext getNamespaceContext() { return writer.getNamespaceContext(); } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/XMLInputFactoryImpl.java b/libjava/classpath/gnu/xml/stream/XMLInputFactoryImpl.java index 5f72e361e52..87aa32107d3 100644 --- a/libjava/classpath/gnu/xml/stream/XMLInputFactoryImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLInputFactoryImpl.java @@ -1,4 +1,4 @@ -/* XMLInputFactoryImpl.java -- +/* XMLInputFactoryImpl.java -- Copyright (C) 2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,7 +91,7 @@ public class XMLInputFactoryImpl { return createXMLStreamReader(null, reader); } - + public XMLStreamReader createXMLStreamReader(Source source) throws XMLStreamException { @@ -114,13 +114,13 @@ public class XMLInputFactoryImpl replacingEntityReferences); return ret; } - + public XMLStreamReader createXMLStreamReader(InputStream in) throws XMLStreamException { return createXMLStreamReader(null, in); } - + public XMLStreamReader createXMLStreamReader(InputStream in, String encoding) throws XMLStreamException { @@ -175,34 +175,34 @@ public class XMLInputFactoryImpl XMLStreamReader sr = createXMLStreamReader(reader); return new XMLEventReaderImpl(sr, allocator, null); } - + public XMLEventReader createXMLEventReader(String systemId, Reader reader) throws XMLStreamException { XMLStreamReader sr = createXMLStreamReader(systemId, reader); return new XMLEventReaderImpl(sr, allocator, null); } - + public XMLEventReader createXMLEventReader(XMLStreamReader reader) throws XMLStreamException { return new XMLEventReaderImpl(reader, allocator, null); } - + public XMLEventReader createXMLEventReader(Source source) throws XMLStreamException { XMLStreamReader sr = createXMLStreamReader(source); return new XMLEventReaderImpl(sr, allocator, null); } - + public XMLEventReader createXMLEventReader(InputStream in) throws XMLStreamException { XMLStreamReader sr = createXMLStreamReader(in); return new XMLEventReaderImpl(sr, allocator, null); } - + public XMLEventReader createXMLEventReader(InputStream in, String encoding) throws XMLStreamException { @@ -216,7 +216,7 @@ public class XMLInputFactoryImpl XMLStreamReader sr = createXMLStreamReader(systemId, in); return new XMLEventReaderImpl(sr, allocator, null); } - + public XMLStreamReader createFilteredReader(XMLStreamReader reader, StreamFilter filter) throws XMLStreamException @@ -240,7 +240,7 @@ public class XMLInputFactoryImpl { this.resolver = resolver; } - + public XMLReporter getXMLReporter() { return reporter; @@ -327,7 +327,7 @@ public class XMLInputFactoryImpl name.equals("gnu.xml.stream.baseAware") || name.equals("gnu.xml.stream.xIncludeAware"); } - + public void setEventAllocator(XMLEventAllocator allocator) { this.allocator = allocator; @@ -393,6 +393,5 @@ public class XMLInputFactoryImpl } return in; } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/XMLOutputFactoryImpl.java b/libjava/classpath/gnu/xml/stream/XMLOutputFactoryImpl.java index c8c651fb1af..d849e8ba5ed 100644 --- a/libjava/classpath/gnu/xml/stream/XMLOutputFactoryImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLOutputFactoryImpl.java @@ -1,4 +1,4 @@ -/* XMLOutputFactoryImpl.java -- +/* XMLOutputFactoryImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -149,7 +149,7 @@ public class XMLOutputFactoryImpl } throw new UnsupportedOperationException(); } - + public void setProperty(String name, Object value) throws IllegalArgumentException { @@ -183,6 +183,5 @@ public class XMLOutputFactoryImpl { prefixDefaulting = value; } - -} +} diff --git a/libjava/classpath/gnu/xml/stream/XMLParser.java b/libjava/classpath/gnu/xml/stream/XMLParser.java index 6072a9c730f..71e8765695a 100644 --- a/libjava/classpath/gnu/xml/stream/XMLParser.java +++ b/libjava/classpath/gnu/xml/stream/XMLParser.java @@ -1,4 +1,4 @@ -/* XMLParser.java -- +/* XMLParser.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -113,7 +113,7 @@ import gnu.classpath.debug.TeeReader; * @see http://www.w3.org/TR/REC-xml-names * @see http://www.w3.org/TR/xml-names11 * @see http://www.w3.org/TR/xmlbase/ - * + * * @author <a href='mailto:dog@gnu.org'>Chris Burdess</a> */ public class XMLParser @@ -168,7 +168,7 @@ public class XMLParser * Stack of end-entity events to be reported. */ private LinkedList endEntityStack = new LinkedList(); - + /** * Current parser state within the main state machine. */ @@ -224,7 +224,7 @@ public class XMLParser * Temporary Unicode character buffer used during character data reads. */ private int[] tmpBuf = new int[1024]; - + /** * The element content model for the current element. */ @@ -682,7 +682,7 @@ public class XMLParser String elementName = buf.toString(); return doctype.isAttributeDeclared(elementName, qn); } - + public String getCharacterEncodingScheme() { return xmlEncoding; @@ -1022,7 +1022,7 @@ public class XMLParser { return (event != XMLStreamConstants.END_DOCUMENT && event != -1); } - + public int next() throws XMLStreamException { @@ -1253,7 +1253,7 @@ public class XMLParser { return input.read(b, off, len); } - + /** * Parsed character read. */ @@ -1415,7 +1415,7 @@ public class XMLParser "U+" + Integer.toHexString(c)); } else if (!isChar(c)) - error("illegal XML character", + error("illegal XML character", "U+" + Integer.toHexString(c)); buf.append(Character.toChars(c)); } @@ -1635,7 +1635,7 @@ public class XMLParser // We can't use java.net.URL here to do the parsing, as it searches for // a protocol handler. A protocol handler may not be registered for the // URL scheme here. Do it manually. - // + // // Set aside scheme and host portion of base URL String basePrefix = null; ci = base.indexOf(':'); @@ -1780,7 +1780,7 @@ public class XMLParser throws IOException, XMLStreamException { final int flags = LIT_DISABLE_CREF | LIT_DISABLE_PE | LIT_DISABLE_EREF; - + requireWhitespace(); require("version"); readEq(); @@ -1791,9 +1791,9 @@ public class XMLParser input.xml11 = true; else throw new XMLStreamException("illegal XML version: " + xmlVersion); - + boolean white = tryWhitespace(); - + if (tryRead("encoding")) { if (!white) @@ -1802,7 +1802,7 @@ public class XMLParser xmlEncoding = readLiteral(flags, false); white = tryWhitespace(); } - + if (tryRead("standalone")) { if (!white) @@ -1837,7 +1837,7 @@ public class XMLParser ExternalIds ids = readExternalIds(false, true); doctype = this.new Doctype(rootName, ids.publicId, ids.systemId); - + // Parse internal subset first skipWhitespace(); if (tryRead('[')) @@ -2075,7 +2075,7 @@ public class XMLParser { int separator; ElementContentModel model = new ElementContentModel(); - + // Parse first content particle skipWhitespace(); model.addContentParticle(readContentParticle(acc)); @@ -2375,7 +2375,7 @@ public class XMLParser int flags = LIT_ATTRIBUTE; String value = null, defaultType = null; boolean saved = expandPE; - + if (!"CDATA".equals(type)) flags |= LIT_NORMALIZE; @@ -2599,7 +2599,7 @@ public class XMLParser int c; int flags = LIT_DISABLE_CREF | LIT_DISABLE_PE | LIT_DISABLE_EREF; ExternalIds ids = new ExternalIds(); - + if (tryRead("PUBLIC")) { requireWhitespace(); @@ -3300,7 +3300,7 @@ public class XMLParser */ private void readEq() throws IOException, XMLStreamException - { + { skipWhitespace(); require('='); skipWhitespace(); @@ -3569,7 +3569,7 @@ public class XMLParser { return readNmtoken(isName, nmtokenBuf); } - + /** * Parses an NMTOKEN or Name production using the specified buffer. * @param isName if a Name, otherwise an NMTOKEN @@ -4123,7 +4123,7 @@ public class XMLParser (c >= 0x10000 && c < 0x110000) || c == 0xa || c == 0x9 || c == 0xd; } - + /** * Interns the specified text or not, depending on the value of * stringInterning. @@ -4141,7 +4141,7 @@ public class XMLParser { error(message, null); } - + /** * Report a parsing error. */ @@ -4403,7 +4403,7 @@ public class XMLParser { event = reader.next(); Location loc = reader.getLocation(); - System.out.print(loc.getLineNumber() + ":" + + System.out.print(loc.getLineNumber() + ":" + loc.getColumnNumber() + " "); switch (event) { @@ -4579,7 +4579,7 @@ public class XMLParser String uri = getNamespaceURI(prefix); if (uri == null && (auri == null || (input.xml11 && "".equals(auri)))) - return true; + return true; if (uri != null) { if ("".equals(uri) && input.xml11 && "".equals(auri)) @@ -4615,7 +4615,7 @@ public class XMLParser buf.append(']'); return buf.toString(); } - + } /** @@ -4661,7 +4661,7 @@ public class XMLParser /** * Map of anonymous keys to comments. - */ + */ private final LinkedHashMap comments = new LinkedHashMap(); /** @@ -4753,7 +4753,7 @@ public class XMLParser if (inExternalSubset) externalEntities.add(name); } - + /** * Adds an entity declaration. * @param name the entity name @@ -4916,7 +4916,7 @@ public class XMLParser { return entries.iterator(); } - + } /** @@ -4950,7 +4950,7 @@ public class XMLParser static final int ANY = 1; static final int ELEMENT = 2; static final int MIXED = 3; - + int min; int max; final int type; @@ -4963,7 +4963,7 @@ public class XMLParser min = 1; max = 1; } - + } /** @@ -4972,14 +4972,14 @@ public class XMLParser class EmptyContentModel extends ContentModel { - + EmptyContentModel() { super(ContentModel.EMPTY); min = 0; max = 0; } - + } /** @@ -4988,14 +4988,14 @@ public class XMLParser class AnyContentModel extends ContentModel { - + AnyContentModel() { super(ContentModel.ANY); min = 0; max = -1; } - + } /** @@ -5008,7 +5008,7 @@ public class XMLParser LinkedList contentParticles; boolean or; String regex; // regular expression cache - + ElementContentModel() { super(ContentModel.ELEMENT); @@ -5019,7 +5019,7 @@ public class XMLParser { contentParticles.add(cp); } - + } class ContentParticle @@ -5028,7 +5028,7 @@ public class XMLParser int min = 1; int max = 1; Object content; // Name (String) or ElementContentModel - + } /** @@ -5039,7 +5039,7 @@ public class XMLParser { private HashSet names; - + MixedContentModel() { super(ContentModel.MIXED); @@ -5055,7 +5055,7 @@ public class XMLParser { return names.contains(name); } - + } /** @@ -5063,7 +5063,7 @@ public class XMLParser */ class AttributeDecl { - + /** * The attribute type (CDATA, ID, etc). */ @@ -5105,7 +5105,7 @@ public class XMLParser this.values = values; this.external = external; } - + } /** @@ -5114,14 +5114,14 @@ public class XMLParser static class Input implements Location { - + int line = 1, markLine; int column, markColumn; int offset, markOffset; final String publicId, systemId, name; final boolean report; // report start- and end-entity final boolean normalize; // normalize CR, etc to LF - + InputStream in; Reader reader; UnicodeReader unicodeReader; @@ -5161,12 +5161,12 @@ public class XMLParser } // -- Location -- - + public int getCharacterOffset() { return offset; } - + public int getColumnNumber() { return column; @@ -5295,7 +5295,7 @@ public class XMLParser } // Detection of input encoding - + private static final int[] SIGNATURE_UCS_4_1234 = new int[] { 0x00, 0x00, 0x00, 0x3c }; private static final int[] SIGNATURE_UCS_4_4321 = @@ -5316,7 +5316,7 @@ public class XMLParser new int[] { 0x3c, 0x3f, 0x78, 0x6d }; private static final int[] SIGNATURE_UTF_8_BOM = new int[] { 0xef, 0xbb, 0xbf }; - + /** * Detect the input encoding. */ @@ -5351,7 +5351,7 @@ public class XMLParser else if (equals(SIGNATURE_UCS_4_2143, signature) || equals(SIGNATURE_UCS_4_3412, signature)) throw new UnsupportedEncodingException("unsupported UCS-4 byte ordering"); - + // 2-byte encodings else if (equals(SIGNATURE_UCS_2_12, signature)) { @@ -5401,7 +5401,7 @@ public class XMLParser } return true; } - + void setInputEncoding(String encoding) throws IOException { @@ -5432,4 +5432,3 @@ public class XMLParser } } - diff --git a/libjava/classpath/gnu/xml/stream/XMLStreamWriterImpl.java b/libjava/classpath/gnu/xml/stream/XMLStreamWriterImpl.java index 1549420c9df..83b8f723986 100644 --- a/libjava/classpath/gnu/xml/stream/XMLStreamWriterImpl.java +++ b/libjava/classpath/gnu/xml/stream/XMLStreamWriterImpl.java @@ -1,4 +1,4 @@ -/* XMLStreamWriterImpl.java -- +/* XMLStreamWriterImpl.java -- Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -84,7 +84,7 @@ public class XMLStreamWriterImpl * in scope. */ protected NamespaceContext namespaceContext; - + /** * The stack of elements in scope. * Used to close the remaining elements. @@ -100,7 +100,7 @@ public class XMLStreamWriterImpl * Whether we are in an empty element. */ private boolean emptyElement; - + private NamespaceSupport namespaces; private int count = 0; @@ -153,10 +153,10 @@ public class XMLStreamWriterImpl endStartElement(); namespaces.pushContext(); - + writer.write('<'); writer.write(localName); - + elements.addLast(new String[] { null, localName }); inStartElement = true; } @@ -180,7 +180,7 @@ public class XMLStreamWriterImpl endStartElement(); namespaces.pushContext(); - + String prefix = getPrefix(namespaceURI); boolean isDeclared = (prefix != null); if (!isDeclared) @@ -203,7 +203,7 @@ public class XMLStreamWriterImpl { writeNamespaceImpl(prefix, namespaceURI); } - + elements.addLast(new String[] { prefix, localName }); } catch (IOException e) @@ -249,7 +249,7 @@ public class XMLStreamWriterImpl endStartElement(); namespaces.pushContext(); - + String currentPrefix = getPrefix(namespaceURI); boolean isCurrent = prefix.equals(currentPrefix); writer.write('<'); @@ -263,7 +263,7 @@ public class XMLStreamWriterImpl { writeNamespaceImpl(prefix, namespaceURI); } - + elements.addLast(new String[] { prefix, localName }); inStartElement = true; } @@ -451,7 +451,7 @@ public class XMLStreamWriterImpl throw new IllegalArgumentException("illegal Name: " + localName); if (!isChars(value)) throw new IllegalArgumentException("illegal character: " + value); - + String prefix = getPrefix(namespaceURI); if (prefix == null) { @@ -522,7 +522,7 @@ public class XMLStreamWriterImpl prefix = XMLConstants.DEFAULT_NS_PREFIX; setPrefix(prefix, namespaceURI); - + writer.write(' '); writer.write("xmlns"); if (!XMLConstants.DEFAULT_NS_PREFIX.equals(prefix)) @@ -566,7 +566,7 @@ public class XMLStreamWriterImpl throw new IllegalArgumentException("illegal comment: " + data); endStartElement(); - + writer.write("<!--"); if (hasXML11RestrictedChars) { @@ -651,7 +651,7 @@ public class XMLStreamWriterImpl throw new IllegalArgumentException("illegal XML character: " + data); if (data.indexOf("]]") != -1) throw new IllegalArgumentException("illegal CDATA section: " + data); - + endStartElement(); writer.write("<![CDATA["); @@ -1012,7 +1012,5 @@ public class XMLStreamWriterImpl } return true; } - -} - +} |