rename getViewport/Animator/Layer() to viewport/animator/layers()

- these are composite parts of Map

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

@@ -76,7 +76,7 @@ public class MapEventLayer extends Layer implements Map.InputListener, GestureLi
 
 	public MapEventLayer(Map map) {
 		super(map);
-		mViewport = map.getViewport();
+		mViewport = map.viewport();
 		mTracker = new VelocityTracker();
 	}
 
@@ -110,7 +110,7 @@ public class MapEventLayer extends Layer implements Map.InputListener, GestureLi
 		int action = getAction(e);
 
 		if (action == MotionEvent.ACTION_DOWN) {
-			mMap.getAnimator().cancel();
+			mMap.animator().cancel();
 
 			mDoubleTap = false;
 			mStartMove = -1;
@@ -372,7 +372,7 @@ public class MapEventLayer extends Layer implements Map.InputListener, GestureLi
 		int w = Tile.SIZE * 3;
 		int h = Tile.SIZE * 3;
 
-		mMap.getAnimator().animateFling(Math.round(velocityX),
+		mMap.animator().animateFling(Math.round(velocityX),
 		                                Math.round(velocityY),
 		                                -w, w, -h, h);
 		return true;

vtm/src/org/oscim/layers/marker/ItemizedLayer.java

@@ -167,7 +167,7 @@ public class ItemizedLayer<Item extends MarkerItem> extends MarkerLayer<Item>
 
 		int eventX = (int) event.getX() - mMap.getWidth() / 2;
 		int eventY = (int) event.getY() - mMap.getHeight() / 2;
-		Viewport mapPosition = mMap.getViewport();
+		Viewport mapPosition = mMap.viewport();
 
 		BoundingBox bbox = mapPosition.getViewBox();
 

vtm/src/org/oscim/layers/marker/MarkerRenderer.java

@@ -78,7 +78,7 @@ public class MarkerRenderer extends ElementRenderer {
 		int changedVisible = 0;
 		int numVisible = 0;
 
-		mMarkerLayer.map().getViewport().getMapExtents(mBox, mExtents);
+		mMarkerLayer.map().viewport().getMapExtents(mBox, mExtents);
 
 		long flip = (long) (Tile.SIZE * pos.scale) >> 1;
 

vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java

@@ -284,7 +284,7 @@ public class LabelPlacement {
 		}
 
 		MapPosition pos = work.pos;
-		boolean changedPos = mMap.getViewport().getMapPosition(pos);
+		boolean changedPos = mMap.viewport().getMapPosition(pos);
 
 		/* do not loop! */
 		if (!changedTiles && !changedPos)

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

@@ -226,18 +226,24 @@ public abstract class Map {
 		return pos;
 	}
 
-	public Viewport getViewport() {
+	/**
+	 * @return Viewport instance
+	 */
+	public Viewport viewport() {
 		return mViewport;
 	}
 
-	public Layers getLayers() {
+	/**
+	 * @return Layers instance
+	 */
+	public Layers layers() {
 		return mLayers;
 	}
 
 	/**
 	 * @return MapAnimator instance
 	 */
-	public MapAnimator getAnimator() {
+	public MapAnimator animator() {
 		return mAnimator;
 	}
 

vtm/src/org/oscim/map/Viewport.java

@@ -78,7 +78,7 @@ public class Viewport {
 		mPos.tilt = 0;
 	}
 
-	public synchronized void setViewport(int width, int height) {
+	public synchronized void setScreenSize(int width, int height) {
 		float s = VIEW_SCALE;
 		float aspect = height / (float) width;
 		float[] tmp = new float[16];

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

@@ -236,10 +236,10 @@ public class MapRenderer {
 		GLState.bindTex2D(-1);
 		GLState.useProgram(-1);
 
-		mMap.getAnimator().updateAnimation();
+		mMap.animator().updateAnimation();
 
 		MapPosition pos = mMapPosition;
-		Viewport viewport = mMap.getViewport();
+		Viewport viewport = mMap.viewport();
 		boolean changed = false;
 
 		synchronized (viewport) {
@@ -261,7 +261,7 @@ public class MapRenderer {
 		}
 
 		/* update layers */
-		LayerRenderer[] layers = mMap.getLayers().getLayerRenderer();
+		LayerRenderer[] layers = mMap.layers().getLayerRenderer();
 
 		for (int i = 0, n = layers.length; i < n; i++) {
 			LayerRenderer renderer = layers[i];
@@ -304,7 +304,7 @@ public class MapRenderer {
 		screenWidth = width;
 		screenHeight = height;
 
-		mMap.getViewport().getMatrix(null, mMatrices.proj, null);
+		mMap.viewport().getMatrix(null, mMatrices.proj, null);
 
 		GL.glViewport(0, 0, width, height);
 		GL.glScissor(0, 0, width, height);

vtm/src/org/oscim/tiling/TileManager.java

@@ -130,7 +130,7 @@ public class TileManager {
 		mCacheLimit = cacheLimit;
 		mCacheReduce = 0;
 
-		mViewport = map.getViewport();
+		mViewport = map.viewport();
 
 		jobQueue = new JobQueue();
 		mJobs = new ArrayList<MapTile>();