Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed XmlReader classes to XMLReader classes

Browse Source
This commit is contained in:
Arjen Poutsma
2009-01-06 16:43:49 +00:00
parent 5f8d442708
commit 8152b266b1
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.core/src/main/java/org/springframework/util/xml/AbstractStaxXMLReader.java
View File

@@ -40,7 +40,7 @@ import org.springframework.util.StringUtils;
* @see #setErrorHandler(org.xml.sax.ErrorHandler)
* @since 3.0
*/
abstract class AbstractStaxXmlReader extends AbstractXmlReader {
abstract class AbstractStaxXMLReader extends AbstractXMLReader {
private static final String NAMESPACES_FEATURE_NAME = "http://xml.org/sax/features/namespaces";

2
org.springframework.core/src/main/java/org/springframework/util/xml/AbstractXMLReader.java
View File

@@ -36,7 +36,7 @@ import org.xml.sax.ext.LexicalHandler;
* @see #setErrorHandler(org.xml.sax.ErrorHandler)
* @since 3.0
*/
abstract class AbstractXmlReader implements XMLReader {
abstract class AbstractXMLReader implements XMLReader {
private DTDHandler dtdHandler;

4
org.springframework.core/src/main/java/org/springframework/util/xml/StaxEventXMLReader.java
View File

@@ -52,7 +52,7 @@ import org.springframework.util.StringUtils;
* @see #setErrorHandler(org.xml.sax.ErrorHandler)
* @since 1.0.0
*/
class StaxEventXmlReader extends AbstractStaxXmlReader {
class StaxEventXMLReader extends AbstractStaxXMLReader {
private final XMLEventReader reader;
@@ -64,7 +64,7 @@ class StaxEventXmlReader extends AbstractStaxXmlReader {
* @param reader the <code>XMLEventReader</code> to read from
* @throws IllegalStateException if the reader is not at the start of a document or element
*/
StaxEventXmlReader(XMLEventReader reader) {
StaxEventXMLReader(XMLEventReader reader) {
try {
XMLEvent event = reader.peek();
if (event == null || !(event.isStartDocument() || event.isStartElement())) {

4
org.springframework.core/src/main/java/org/springframework/util/xml/StaxSource.java
View File

@@ -58,7 +58,7 @@ public class StaxSource extends SAXSource {
* @throws IllegalStateException if the reader is not at the start of a document or element
*/
public StaxSource(XMLStreamReader streamReader) {
super(new StaxStreamXmlReader(streamReader), new InputSource());
super(new StaxStreamXMLReader(streamReader), new InputSource());
this.streamReader = streamReader;
}
@@ -71,7 +71,7 @@ public class StaxSource extends SAXSource {
* @throws IllegalStateException if the reader is not at the start of a document or element
*/
public StaxSource(XMLEventReader eventReader) {
super(new StaxEventXmlReader(eventReader), new InputSource());
super(new StaxEventXMLReader(eventReader), new InputSource());
this.eventReader = eventReader;
}

4
org.springframework.core/src/main/java/org/springframework/util/xml/StaxStreamXMLReader.java
View File

@@ -39,7 +39,7 @@ import org.springframework.util.StringUtils;
* @see #setErrorHandler(org.xml.sax.ErrorHandler)
* @since 1.0.0
*/
class StaxStreamXmlReader extends AbstractStaxXmlReader {
class StaxStreamXMLReader extends AbstractStaxXMLReader {
private final XMLStreamReader reader;
@@ -51,7 +51,7 @@ class StaxStreamXmlReader extends AbstractStaxXmlReader {
* @param reader the <code>XMLEventReader</code> to read from
* @throws IllegalStateException if the reader is not at the start of a document or element
*/
StaxStreamXmlReader(XMLStreamReader reader) {
StaxStreamXMLReader(XMLStreamReader reader) {
int event = reader.getEventType();
if (!(event == XMLStreamConstants.START_DOCUMENT || event == XMLStreamConstants.START_ELEMENT)) {
throw new IllegalStateException("XMLEventReader not at start of document or element");