This commit is contained in:
Hannes Janetzek 2014-02-08 02:51:35 +01:00
parent cb82d4cc45
commit 7bbb74b985
14 changed files with 16 additions and 66 deletions

View File

@ -26,7 +26,7 @@ public class EventDispatcher<T, E> {
* *
* @param source the event source * @param source the event source
* @param event the event object/type * @param event the event object/type
* @param data, some object involved in this event * @param data some object involved in this event
*/ */
public void onEvent(Object source, Event event, E data); public void onEvent(Object source, Event event, E data);
} }

View File

@ -28,15 +28,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
/** /**
* Changes Viewport for scroll, fling, scale, rotation and tilt gestures * Changes Viewport for move, fling, scale, rotation and tilt gestures.
*
* @TODO:
* - better recognition of tilt/rotate/scale state
* one could check change of rotation / scale within a
* given time to estimate if the mode should be changed:
* http://en.wikipedia.org/wiki/Viterbi_algorithm
*/ */
public class MapEventLayer extends Layer implements Map.InputListener, GestureListener { public class MapEventLayer extends Layer implements Map.InputListener, GestureListener {
static final Logger log = LoggerFactory.getLogger(MapEventLayer.class); static final Logger log = LoggerFactory.getLogger(MapEventLayer.class);

View File

@ -277,15 +277,14 @@ public abstract class ItemizedLayer<Item extends MarkerItem> extends MarkerLayer
} }
/** /**
* TODO
* If the given Item is found in the overlay, force it to be the current * If the given Item is found in the overlay, force it to be the current
* focus-bearer. Any registered {@@link * focus-bearer. Any registered {link ItemizedLayer#OnFocusChangeListener}
* ItemizedOverlay#OnFocusChangeListener} will be notified. This does not * will be notified. This does not move the map, so if the Item isn't
* move the map, so if the Item isn't already centered, the user may get * already centered, the user may get confused. If the Item is not found,
* confused. If the Item is not found, this is a no-op. You can also pass * this is a no-op. You can also pass null to remove focus.
* null to remove focus.
* *
* @param item * @param item
* ...
*/ */
public void setFocus(final Item item) { public void setFocus(final Item item) {
mFocusedItem = item; mFocusedItem = item;

View File

@ -209,7 +209,7 @@ public abstract class Map {
/** /**
* Get current {@link MapPosition}. * Get current {@link MapPosition}.
* *
* @param mapPosition * @return true when MapPosition was updated (has changed)
*/ */
public boolean getMapPosition(MapPosition mapPosition) { public boolean getMapPosition(MapPosition mapPosition) {
return mViewport.getMapPosition(mapPosition); return mViewport.getMapPosition(mapPosition);

View File

@ -37,7 +37,7 @@ public abstract class LayerRenderer {
/** /**
* Set 'ready for render' state when layer data is ready for rendering. * Set 'ready for render' state when layer data is ready for rendering.
* *
* @param true if render() should be called, false otherwise. * @param ready true if render() should be called, false otherwise.
*/ */
protected void setReady(boolean ready) { protected void setReady(boolean ready) {
isReady = ready; isReady = ready;

View File

@ -23,8 +23,6 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Stack; import java.util.Stack;
import javax.xml.parsers.ParserConfigurationException;
import org.oscim.backend.CanvasAdapter; import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.XMLReaderAdapter; import org.oscim.backend.XMLReaderAdapter;
import org.oscim.backend.canvas.Bitmap; import org.oscim.backend.canvas.Bitmap;
@ -84,8 +82,6 @@ public class RenderThemeHandler extends DefaultHandler {
* the input stream. * the input stream.
* @throws SAXException * @throws SAXException
* if an error occurs while parsing the render theme XML. * if an error occurs while parsing the render theme XML.
* @throws ParserConfigurationException
* if an error occurs while creating the XML parser.
* @throws IOException * @throws IOException
* if an I/O error occurs while reading from the input stream. * if an I/O error occurs while reading from the input stream.
*/ */

View File

@ -333,9 +333,7 @@ public class TileManager {
} }
/** /**
* Unlock tiles and clear all item references. * Unlock TileSet and clear all item references.
*
* @param tiles
*/ */
public void releaseTiles(TileSet tileSet) { public void releaseTiles(TileSet tileSet) {
tileSet.releaseTiles(); tileSet.releaseTiles();
@ -508,7 +506,6 @@ public class TileManager {
* *
* @param tile * @param tile
* Tile ready for upload in TileRenderLayer * Tile ready for upload in TileRenderLayer
* @return caller does not care
*/ */
public void jobCompleted(final MapTile tile, final boolean success) { public void jobCompleted(final MapTile tile, final boolean success) {
mMap.post(new Runnable() { mMap.post(new Runnable() {

View File

@ -67,12 +67,6 @@ public class LwHttp {
/** /**
* @param url * @param url
* Base url for tiles * Base url for tiles
* @param contentType
* Expected Content-Type
* @param extension
* 'file' extension, usually .png
* @param deflate
* true when content uses gzip compression
*/ */
public LwHttp(URL url) { public LwHttp(URL url) {

View File

@ -78,9 +78,9 @@ public abstract class UrlTileSource extends TileSource {
* override getTileUrl() for custom url formatting using * override getTileUrl() for custom url formatting using
* Strings * Strings
* *
* @param tile Tile * @param tile the Tile
* @param path to write url string * @param buf to write url string
* @param curPos current position * @param pos current position
* @return new position * @return new position
*/ */
protected int formatTilePath(Tile tile, byte[] buf, int pos) { protected int formatTilePath(Tile tile, byte[] buf, int pos) {

View File

@ -19,8 +19,6 @@ package org.oscim.utils;
/** /**
* from http://en.wikipedia.org/wiki/Cohen%E2%80%93 * from http://en.wikipedia.org/wiki/Cohen%E2%80%93
* Sutherland_algorithm * Sutherland_algorithm
*
* @adapted by Hannes Janetzek
*/ */
public class LineClipper { public class LineClipper {

View File

@ -29,12 +29,10 @@ import org.oscim.core.Tile;
* <pre> * <pre>
* Viewport.getMapViewProjection(box) * Viewport.getMapViewProjection(box)
* ScanBox sb = new ScanBox(){ * ScanBox sb = new ScanBox(){
* @Override
* protected void setVisible(int y, int x1, int x2) { * protected void setVisible(int y, int x1, int x2) {
* } * }
* }; * };
* sb.scan(pos.x, pos.y, pos.scale, * zoomLevel, coords); * sb.scan(pos.x, pos.y, pos.scale, * zoomLevel, coords);
*
* </pre> * </pre>
* *
* where zoomLevel is the zoom-level for which tile coordinates should be * where zoomLevel is the zoom-level for which tile coordinates should be
@ -60,9 +58,7 @@ public abstract class ScanBox {
return mBox; return mBox;
} }
/* /* ported from Polymaps: Layer.js */
* ported from Polymaps: Layer.js
*/
static class Edge { static class Edge {
float x0, y0, x1, y1, dx, dy; float x0, y0, x1, y1, dx, dy;

View File

@ -32,16 +32,6 @@ public class Tessellator {
/** /**
* Special version for ExtrusionLayer to match indices with vertex * Special version for ExtrusionLayer to match indices with vertex
* positions. * positions.
*
* @param points
* @param ppos
* @param plen
* @param index
* @param ipos
* @param rings
* @param vertexOffset
* @param outTris
* @return
*/ */
public static int tessellate(float[] points, int ppos, int plen, short[] index, public static int tessellate(float[] points, int ppos, int plen, short[] index,
int ipos, int rings, int vertexOffset, VertexItem outTris) { int ipos, int rings, int vertexOffset, VertexItem outTris) {
@ -116,10 +106,6 @@ public class Tessellator {
/** /**
* Untested! * Untested!
*
* @param geom
* @param out
* @return
*/ */
public static int tessellate(GeometryBuffer geom, GeometryBuffer out) { public static int tessellate(GeometryBuffer geom, GeometryBuffer out) {
@ -171,15 +157,6 @@ public class Tessellator {
return 1; return 1;
} }
/**
*
* @param geom
* @param scale
* @param outPoints
* @param outTris
* @param vertexOffset
* @return
*/
public static int tessellate(GeometryBuffer geom, float scale, public static int tessellate(GeometryBuffer geom, float scale,
VertexItem outPoints, VertexItem outTris, int vertexOffset) { VertexItem outPoints, VertexItem outTris, int vertexOffset) {

View File

@ -42,7 +42,7 @@ public class AsyncExecutor {
* Creates a new AsynchExecutor that allows maxConcurrent {@link Runnable} * Creates a new AsynchExecutor that allows maxConcurrent {@link Runnable}
* instances to run in parallel. * instances to run in parallel.
* *
* @param maxConcurrent * @param maxConcurrent number of threads.
*/ */
public AsyncExecutor(int maxConcurrent) { public AsyncExecutor(int maxConcurrent) {
executor = Executors.newFixedThreadPool(maxConcurrent, new ThreadFactory() { executor = Executors.newFixedThreadPool(maxConcurrent, new ThreadFactory() {

View File

@ -40,7 +40,7 @@ public class AsyncResult<T> {
/** /**
* @return waits if necessary for the computation to complete and then * @return waits if necessary for the computation to complete and then
* returns the result * returns the result
* @throws GdxRuntimeException if there was an error * @throws RuntimeException if there was an error
*/ */
public T get() { public T get() {
try { try {