Polishing
This commit is contained in:
@@ -27,6 +27,7 @@ import org.springframework.util.ClassUtils;
|
||||
|
||||
/**
|
||||
* Abstract base class for {@code XMLEventReader}s.
|
||||
*
|
||||
* @author Arjen Poutsma
|
||||
* @since 5.0
|
||||
*/
|
||||
@@ -34,6 +35,7 @@ abstract class AbstractXMLEventReader implements XMLEventReader {
|
||||
|
||||
private boolean closed;
|
||||
|
||||
|
||||
@Override
|
||||
public Object next() {
|
||||
try {
|
||||
@@ -113,12 +115,17 @@ abstract class AbstractXMLEventReader implements XMLEventReader {
|
||||
throw new IllegalArgumentException("Property not supported: [" + name + "]");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() {
|
||||
this.closed = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns {@code true} if closed; {@code false} otherwise.
|
||||
* @see #close()
|
||||
*/
|
||||
protected boolean isClosed() {
|
||||
return closed;
|
||||
return this.closed;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -133,8 +140,4 @@ abstract class AbstractXMLEventReader implements XMLEventReader {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() {
|
||||
closed = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,20 +35,22 @@ class ListBasedXMLEventReader extends AbstractXMLEventReader {
|
||||
|
||||
private int cursor = 0;
|
||||
|
||||
|
||||
public ListBasedXMLEventReader(List<XMLEvent> events) {
|
||||
Assert.notNull(events, "'events' must not be null");
|
||||
this.events = Collections.unmodifiableList(events);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean hasNext() {
|
||||
return cursor != events.size();
|
||||
return (this.cursor != this.events.size());
|
||||
}
|
||||
|
||||
@Override
|
||||
public XMLEvent nextEvent() {
|
||||
if (cursor < events.size()) {
|
||||
return events.get(cursor++);
|
||||
if (this.cursor < this.events.size()) {
|
||||
return this.events.get(this.cursor++);
|
||||
}
|
||||
else {
|
||||
throw new NoSuchElementException();
|
||||
@@ -57,8 +59,8 @@ class ListBasedXMLEventReader extends AbstractXMLEventReader {
|
||||
|
||||
@Override
|
||||
public XMLEvent peek() {
|
||||
if (cursor < events.size()) {
|
||||
return events.get(cursor);
|
||||
if (this.cursor < this.events.size()) {
|
||||
return this.events.get(this.cursor);
|
||||
}
|
||||
else {
|
||||
return null;
|
||||
@@ -70,4 +72,5 @@ class ListBasedXMLEventReader extends AbstractXMLEventReader {
|
||||
super.close();
|
||||
this.events.clear();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user