Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java =================================================================== --- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java (revision 31292) +++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java (revision 31293) @@ -87,5 +87,5 @@ * Enables or disables that the map pane can be moved using the mouse. * - * @param movementEnabled + * @param movementEnabled {@code true} to allow the map pane to be moved using the mouse */ public void setMovementEnabled(boolean movementEnabled) { @@ -98,6 +98,5 @@ /** - * Sets the mouse button that is used for moving the map. Possible values - * are: + * Sets the mouse button that is used for moving the map. Possible values are: * * - * @param movementMouseButton + * @param movementMouseButton the mouse button that is used for moving the map */ public void setMovementMouseButton(int movementMouseButton) { Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java =================================================================== --- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java (revision 31292) +++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java (revision 31293) @@ -233,10 +233,7 @@ /** - * @param args + * @param args Main program arguments */ public static void main(String[] args) { - // java.util.Properties systemProperties = System.getProperties(); - // systemProperties.setProperty("http.proxyHost", "localhost"); - // systemProperties.setProperty("http.proxyPort", "8008"); new Demo().setVisible(true); } @@ -256,4 +253,3 @@ } } - } Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java =================================================================== --- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (revision 31292) +++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (revision 31293) @@ -40,5 +40,5 @@ * * @author Jan Peter Stotz - * + * @author Jason Huntley */ public class JMapViewer extends JPanel implements TileLoaderListener { @@ -391,6 +391,6 @@ * the displayed map) into a latitude / longitude coordinate * - * @param mapPointX - * @param mapPointY + * @param mapPointX X coordinate + * @param mapPointY Y coordinate * @return latitude / longitude */ @@ -406,7 +406,7 @@ * Calculates the position on the map of a given coordinate * - * @param lat - * @param lon - * @param checkOutside + * @param lat latitude + * @param lon longitude + * @param checkOutside check if the point is outside the displayed area * @return point on the map or null if the point is not visible * and checkOutside set to true @@ -429,5 +429,5 @@ * @param lat Latitude * @param offset Offset respect Latitude - * @param checkOutside + * @param checkOutside check if the point is outside the displayed area * @return Integer the radius in pixels */ @@ -445,6 +445,6 @@ * Calculates the position on the map of a given coordinate * - * @param lat - * @param lon + * @param lat latitude + * @param lon longitude * @return point on the map or null if the point is not visible */ @@ -473,5 +473,5 @@ * Calculates the position on the map of a given coordinate * - * @param coord + * @param coord coordinate * @return point on the map or null if the point is not visible */ @@ -486,5 +486,6 @@ * Calculates the position on the map of a given coordinate * - * @param coord + * @param coord coordinate + * @param checkOutside check if the point is outside the displayed area * @return point on the map or null if the point is not visible * and checkOutside set to true @@ -501,5 +502,4 @@ * * @return the meter per pixel - * @author Jason Huntley */ public double getMeterPerPixel() { @@ -875,5 +875,5 @@ * Enables or disables painting of the {@link MapMarker} * - * @param mapMarkersVisible + * @param mapMarkersVisible {@code true} to enable painting of markers * @see #addMapMarker(MapMarker) * @see #getMapMarkerList() @@ -997,5 +997,5 @@ * Enables or disables painting of the {@link MapRectangle} * - * @param mapRectanglesVisible + * @param mapRectanglesVisible {@code true} to enable painting of rectangles * @see #addMapRectangle(MapRectangle) * @see #getMapRectangleList() @@ -1013,5 +1013,5 @@ * Enables or disables painting of the {@link MapPolygon} * - * @param mapPolygonsVisible + * @param mapPolygonsVisible {@code true} to enable painting of polygons * @see #addMapPolygon(MapPolygon) * @see #getMapPolygonList() Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java =================================================================== --- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java (revision 31292) +++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java (revision 31293) @@ -69,6 +69,6 @@ } - public void paint(Graphics g, Point position, int radio) { - int size_h = radio; + public void paint(Graphics g, Point position, int radius) { + int size_h = radius; int size = size_h * 2; Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java =================================================================== --- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java (revision 31292) +++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java (revision 31293) @@ -8,4 +8,6 @@ * space is measured in pixels. The origin of the map space is the top left * corner. The map space origin (0,0) has latitude ~85 and longitude -180. + * @author Jan Peter Stotz + * @author Jason Huntley */ public class OsmMercator { @@ -38,5 +40,5 @@ /** * Creates instance with provided tile size. - * @param tileSize + * @param tileSize tile size in pixels */ public OsmMercator(int tileSize) { @@ -77,5 +79,4 @@ * @param zoomLevel the zoom level * @return the distance - * @author Jason Huntley */ public double getDistance(int x1, int y1, int x2, int y2, int zoomLevel) { @@ -96,5 +97,4 @@ * @param lo2 the Longitude from 2nd coordinate in degrees * @return the distance - * @author Jason Huntley */ public double getDistance(double la1, double lo1, double la2, double lo2) { @@ -127,5 +127,4 @@ * [-180..180] * @return [0..2^Zoomlevel*TILE_SIZE[ - * @author Jan Peter Stotz */ public double LonToX(double aLongitude, int aZoomlevel) { @@ -151,5 +150,4 @@ * [-90...90] * @return [0..2^Zoomlevel*TILE_SIZE[ - * @author Jan Peter Stotz */ public double LatToY(double aLat, int aZoomlevel) { @@ -181,5 +179,4 @@ * [0..2^Zoomlevel*TILE_WIDTH[ * @return ]-180..180[ - * @author Jan Peter Stotz */ public double XToLon(int aX, int aZoomlevel) { Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java =================================================================== --- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java (revision 31292) +++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java (revision 31293) @@ -47,8 +47,8 @@ * coordinates within g * - * @param g - * @param position - * @param radio + * @param g graphics + * @param position coordinates + * @param radius radius */ - public void paint(Graphics g, Point position, int radio); + public void paint(Graphics g, Point position, int radius); } Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java =================================================================== --- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java (revision 31292) +++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java (revision 31293) @@ -10,5 +10,5 @@ * Interface to be implemented by polygons that can be displayed on the map. * - * @author Vincent + * @author Vincent Privat */ public interface MapPolygon extends MapObject{ @@ -20,18 +20,18 @@ /** - * Paints the map rectangle on the map. The points + * Paints the map polygon on the map. The points * are specifying the coordinates within g * - * @param g - * @param points + * @param g graphics + * @param points list of points defining the polygon to draw */ public void paint(Graphics g, List points); /** - * Paints the map rectangle on the map. The polygon + * Paints the map polygon on the map. The polygon * is specifying the coordinates within g * - * @param g - * @param polygon + * @param g graphics + * @param polygon polygon to draw */ public void paint(Graphics g, Polygon polygon); Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java =================================================================== --- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java (revision 31292) +++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java (revision 31293) @@ -84,8 +84,9 @@ * Constructs the tile url. * - * @param zoom - * @param tilex - * @param tiley + * @param zoom zoom level + * @param tilex X coordinate + * @param tiley Y coordinate * @return fully qualified url for downloading the specified tile image + * @throws IOException if any I/O error occurs */ String getTileUrl(int zoom, int tilex, int tiley) throws IOException; Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java =================================================================== --- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java (revision 31292) +++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java (revision 31293) @@ -35,5 +35,5 @@ private int tileSize = OsmMercator.DEFAUL_TILE_SIZE; - /** mapping
*/ + /** mapping <header key, metadata key> */ protected Map metadataHeaders; @@ -41,7 +41,7 @@ * Create a TileSourceInfo class * - * @param name - * @param base_url - * @param id + * @param name name + * @param base_url base URL + * @param id unique id */ public TileSourceInfo(String name, String base_url, String id) { @@ -54,5 +54,5 @@ * Create a TileSourceInfo class * - * @param name + * @param name name */ public TileSourceInfo(String name) { @@ -124,5 +124,5 @@ /** * Sets the tile size provided by this tile source - * @param tileSize + * @param tileSize tile size in pixels */ public void setTileSize(int tileSize) { @@ -135,5 +135,5 @@ /** * - * @return mapping for copying HTTP headers to Tile metadata + * @return mapping <HTTP header name, Metadata key name> for copying HTTP headers to Tile metadata * @since 31125 */