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

TileImage: new method readTileImage() to read a top-level image tag

Browse source
This commit is contained in:
Jason Long 2015-01-11 11:13:56 -05:00
parent 860faa1081
commit 33de15568a
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/micropolisj/graphics/TileImage.java
View file

@ -190,6 +190,23 @@ public abstract class TileImage
return anim;
}
public static TileImage readTileImage(XMLStreamReader in, LoaderContext ctx)
throws XMLStreamException
{
assert in.isStartElement();
String tagName = in.getLocalName();
if (tagName.equals("image")) {
return readSimpleImage(in, ctx);
}
else if (tagName.equals("animation")) {
return readAnimation(in, ctx);
}
else {
throw new XMLStreamException("unrecognized tag: "+tagName);
}
}
/**
* @param in an XML stream reader with the parent tag of the tag to be read
* still selected
@ -201,11 +218,11 @@ public abstract class TileImage
while (in.nextTag() != XMLStreamConstants.END_ELEMENT) {
assert in.isStartElement();
if (in.getLocalName().equals("image")) {
img = readSimpleImage(in, ctx);
}
else if (in.getLocalName().equals("animation")) {
img = readAnimation(in, ctx);
String tagName = in.getLocalName();
if (tagName.equals("image") ||
tagName.equals("animation"))
{
img = readTileImage(in, ctx);
}
else {
skipToEndElement(in);