From 7fc6ab209a9bfd11156c62b52f44cabd8f2495cc Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Mon, 17 Jun 2013 05:35:45 +0200 Subject: [PATCH] cleanups --- src/org/oscim/renderer/sublayers/Layers.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/org/oscim/renderer/sublayers/Layers.java b/src/org/oscim/renderer/sublayers/Layers.java index 29b46c29..1806562d 100644 --- a/src/org/oscim/renderer/sublayers/Layers.java +++ b/src/org/oscim/renderer/sublayers/Layers.java @@ -85,6 +85,7 @@ public class Layers { public LineLayer getLineLayer(int level) { return (LineLayer) getLayer(level, Layer.LINE); } + /** * Get or add the PolygonLayer for a level. Levels are ordered from * bottom (0) to top @@ -93,6 +94,7 @@ public class Layers { public PolygonLayer getPolygonLayer(int level) { return (PolygonLayer) getLayer(level, Layer.POLYGON); } + /** * Get or add the TexLineLayer for a level. Levels are ordered from * bottom (0) to top @@ -160,7 +162,8 @@ public class Layers { if (layer.type != type) { // check if found layer matches requested type - Log.d(TAG, "BUG wrong layer " + layer.type + " " + type); + Log.d(TAG, "BUG wrong layer " + layer.type + " " + type + + " on layer " + layer.level); // TODO throw exception return null; } @@ -288,22 +291,20 @@ public class Layers { public void clear() { // clear line and polygon layers directly - Layer l = baseLayers; - while (l != null) { + for (Layer l = baseLayers; l != null; l = l.next) { if (l.vertexItems != null) { VertexItem.pool.releaseAll(l.vertexItems); l.vertexItems = null; l.curItem = null; } l.verticesCnt = 0; - l = l.next; } - for (l = textureLayers; l != null; l = l.next) { + for (Layer l = textureLayers; l != null; l = l.next) { l.clear(); } - for (l = extrusionLayers; l != null; l = l.next) { + for (Layer l = extrusionLayers; l != null; l = l.next) { l.clear(); } baseLayers = null;