refactor: rename LayerManager -> Layers

vtm/src/org/oscim/layers/MapEventLayer.java

@@ -299,7 +299,7 @@ public class MapEventLayer extends InputLayer {
 			printState("onDoubleTap");
 
 		// avoid onLongPress
-		mMap.getLayerManager().cancelGesture();
+		mMap.getLayers().cancelGesture();
 
 		return true;
 	}

vtm/src/org/oscim/renderer/GLRenderer.java

@@ -310,7 +310,7 @@ public class GLRenderer {
 		//GL.glBindTexture(GL20.GL_TEXTURE_2D, 0);
 
 		/* update layers */
-		RenderLayer[] layers = mMap.getLayerManager().getRenderLayers();
+		RenderLayer[] layers = mMap.getLayers().getRenderLayers();
 
 		for (int i = 0, n = layers.length; i < n; i++)
 			layers[i].update(pos, changed, mMatrices);

vtm/src/org/oscim/view/Layers.java

@@ -29,13 +29,13 @@ import org.oscim.layers.Layer;
 import org.oscim.layers.overlay.Overlay.Snappable;
 import org.oscim.renderer.RenderLayer;
 
-public class LayerManager extends AbstractList<Layer> {
-	private final static String TAG = LayerManager.class.getName();
+public class Layers extends AbstractList<Layer> {
+	private final static String TAG = Layers.class.getName();
 	private final static boolean debugInput = false;
 
 	private final CopyOnWriteArrayList<Layer> mLayerList;
 
-	LayerManager() {
+	Layers() {
 		mLayerList = new CopyOnWriteArrayList<Layer>();
 	}
 

vtm/src/org/oscim/view/Map.java

@@ -14,15 +14,11 @@
  */
 package org.oscim.view;
 
-import java.util.List;
-
 import org.oscim.backend.Log;
 import org.oscim.core.BoundingBox;
 import org.oscim.core.GeoPoint;
 import org.oscim.core.MapPosition;
-import org.oscim.layers.Layer;
 import org.oscim.layers.MapEventLayer;
-import org.oscim.layers.overlay.Overlay;
 import org.oscim.layers.tile.bitmap.BitmapTileLayer;
 import org.oscim.layers.tile.vector.MapTileLayer;
 import org.oscim.layers.tile.vector.MapTileLoader;
@@ -37,8 +33,7 @@ public abstract class Map {
 
 	private static final String TAG = Map.class.getName();
 
-	//public static boolean enableClosePolygons;
-	private final LayerManager mLayerManager;
+	private final Layers mLayers;
 	private final Viewport mViewport;
 	private final MapPosition mMapPosition;
 	private final AsyncExecutor mAsyncExecutor;
@@ -55,7 +50,7 @@ public abstract class Map {
 
 		mViewport = new Viewport(this);
 		mMapPosition = new MapPosition();
-		mLayerManager = new LayerManager();
+		mLayers = new Layers();
 		mAsyncExecutor = new AsyncExecutor(2);
 
 		// FIXME!
@@ -63,7 +58,7 @@ public abstract class Map {
 		MapTileLoader.setDebugSettings(mDebugSettings);
 
 		mEventLayer = new MapEventLayer(this);
-		mLayerManager.add(0, mEventLayer);
+		mLayers.add(0, mEventLayer);
 	}
 
 	public MapEventLayer getEventLayer() {
@@ -74,17 +69,17 @@ public abstract class Map {
 		mBaseLayer = new MapTileLayer(this);
 
 		mBaseLayer.setTileSource(tileSource);
-		mLayerManager.add(1, mBaseLayer);
+		mLayers.add(1, mBaseLayer);
 
 		return mBaseLayer;
 	}
 
 	public void setBackgroundMap(BitmapTileLayer tileLayer) {
-		mLayerManager.add(1, tileLayer);
+		mLayers.add(1, tileLayer);
 	}
 
 	public MapTileLayer setBaseMap(BitmapTileLayer tileLayer) {
-		mLayerManager.add(1, tileLayer);
+		mLayers.add(1, tileLayer);
 		return null;
 	}
 
@@ -114,7 +109,7 @@ public abstract class Map {
 	}
 
 	public void destroy() {
-		mLayerManager.destroy();
+		mLayers.destroy();
 		mAsyncExecutor.dispose();
 	}
 
@@ -174,7 +169,7 @@ public abstract class Map {
 		// get the current MapPosition
 		changed |= mViewport.getMapPosition(mMapPosition);
 
-		mLayerManager.onUpdate(mMapPosition, changed, mClearMap);
+		mLayers.onUpdate(mMapPosition, changed, mClearMap);
 		mClearMap = false;
 	}
 
@@ -207,26 +202,12 @@ public abstract class Map {
 		updateMap(true);
 	}
 
-	/**
-	 * @return Viewport
-	 */
 	public Viewport getViewport() {
 		return mViewport;
 	}
 
-	/**
-	 * You can add/remove/reorder your Overlays using the List of
-	 * {@link Overlay}. The first (index 0) Overlay gets drawn first, the one
-	 * with the highest as the last one.
-	 *
-	 * @return ...
-	 */
-	public List<Layer> getOverlays() {
-		return this.getLayerManager();
-	}
-
-	public LayerManager getLayerManager() {
-		return mLayerManager;
+	public Layers getLayers() {
+		return mLayers;
 	}
 
 	/**