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

TileImageLayer: require both elements to be non-null

Browse source 
simplifies some algorithms
This commit is contained in:
Jason Long 2014-08-18 16:29:22 -07:00
parent 744e74267a
commit a99a6f0f1c
3 changed files with 30 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/micropolisj/build_tool/MakeTiles.java
View file

@ -308,19 +308,19 @@ public class MakeTiles
static TileImage parseFrameSpec(String [] layerStrings)
throws IOException
{
if (layerStrings.length == 1) {
return parseLayerSpec(layerStrings[0]);
}
TileImageLayer result = null;
TileImage result = null;
for (String layerStr : layerStrings) {
TileImageLayer rv = new TileImageLayer(
result,
parseLayerSpec(layerStr)
);
result = rv;
TileImage newLayer = parseLayerSpec(layerStr);
if (result == null) {
result = newLayer;
}
else {
result = new TileImageLayer(
result,
newLayer);
}
}
return result;