archives/citylimitsj
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup: remove redundant copy of XML_Helper

Browse source
This commit is contained in:
Jason Long 2014-09-21 13:11:30 -04:00
parent 9a285f18ab
commit 20b442f600
2 changed files with 2 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/micropolisj/engine/Micropolis.java
View file

@ -16,6 +16,8 @@ import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;
import javax.xml.stream.*; import javax.xml.stream.*;
import micropolisj.XML_Helper;
import static micropolisj.engine.TileConstants.*; import static micropolisj.engine.TileConstants.*;
/** /**

133
src/micropolisj/engine/XML_Helper.java
View file

@ -1,133 +0,0 @@
package micropolisj.engine;
import java.io.*;
import javax.xml.stream.*;
public class XML_Helper
{
private XML_Helper() {}
public static void skipToEndElement(XMLStreamReader in)
throws XMLStreamException
{
int tagDepth = 1;
while (tagDepth > 0 && in.hasNext()) {
in.next();
if (in.isStartElement()) {
tagDepth++;
}
else if (in.isEndElement()) {
tagDepth--;
}
}
}
public static Reader readElementText(XMLStreamReader in)
{
return new ElementTextReader(in);
}
static class ElementTextReader extends Reader
{
XMLStreamReader xsr;
int tagDepth;
char [] buf;
int buf_start;
int buf_end;
ElementTextReader(XMLStreamReader xsr)
{
this.xsr = xsr;
this.tagDepth = 1;
}
private void readMore()
throws XMLStreamException
{
while (tagDepth > 0 && buf_start == buf_end) {
int nodeType = xsr.next();
if (nodeType == XMLStreamConstants.START_ELEMENT) {
tagDepth++;
}
else if (nodeType == XMLStreamConstants.END_ELEMENT) {
tagDepth--;
}
else if (nodeType == XMLStreamConstants.CDATA ||
nodeType == XMLStreamConstants.CHARACTERS ||
nodeType == XMLStreamConstants.ENTITY_REFERENCE ||
nodeType == XMLStreamConstants.SPACE)
{
buf = xsr.getTextCharacters();
buf_start = xsr.getTextStart();
buf_end = buf_start + xsr.getTextLength();
}
}
}
@Override
public int read(char[] cbuf, int off, int len)
throws IOException
{
if (buf_start == buf_end) {
try {
readMore();
}
catch (XMLStreamException e) {
throw new IOException("XML stream error: "+ e, e);
}
if (tagDepth == 0) {
// reached closing tag
return -1;
}
}
if (buf_start + len <= buf_end) {
// already have the text loaded
System.arraycopy(buf, buf_start, cbuf, off, len);
buf_start += len;
return len;
}
else {
// not enough text available for entire request,
// so just return what we have until the next
// request
len = buf_end - buf_start;
assert len > 0;
System.arraycopy(buf, buf_start, cbuf, off, len);
buf_start += len;
assert buf_start == buf_end;
return len;
}
}
@Override
public void close()
throws IOException
{
buf_start = 0;
buf_end = 0;
try {
while (tagDepth > 0 && xsr.hasNext()) {
xsr.next();
if (xsr.isStartElement()) {
tagDepth++;
}
else if (xsr.isEndElement()) {
tagDepth--;
}
}
}
catch (XMLStreamException e) {
throw new IOException("XML stream error: "+e, e);
}
}
}
}