Changeset 31293 in osm for applications/viewer


Ignore:
Timestamp:
2015-06-20T13:27:47+02:00 (9 years ago)
Author:
donvip
Message:

[jmapviewer] checkstyle fixes

Location:
applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java

    r30900 r31293  
    8787     * Enables or disables that the map pane can be moved using the mouse.
    8888     *
    89      * @param movementEnabled
     89     * @param movementEnabled {@code true} to allow the map pane to be moved using the mouse
    9090     */
    9191    public void setMovementEnabled(boolean movementEnabled) {
     
    9898
    9999    /**
    100      * Sets the mouse button that is used for moving the map. Possible values
    101      * are:
     100     * Sets the mouse button that is used for moving the map. Possible values are:
    102101     * <ul>
    103102     * <li>{@link MouseEvent#BUTTON1} (left mouse button)</li>
     
    106105     * </ul>
    107106     *
    108      * @param movementMouseButton
     107     * @param movementMouseButton the mouse button that is used for moving the map
    109108     */
    110109    public void setMovementMouseButton(int movementMouseButton) {
  • applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java

    r31077 r31293  
    233233
    234234    /**
    235      * @param args
     235     * @param args Main program arguments
    236236     */
    237237    public static void main(String[] args) {
    238         // java.util.Properties systemProperties = System.getProperties();
    239         // systemProperties.setProperty("http.proxyHost", "localhost");
    240         // systemProperties.setProperty("http.proxyPort", "8008");
    241238        new Demo().setVisible(true);
    242239    }
     
    256253        }
    257254    }
    258 
    259255}
  • applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java

    r31127 r31293  
    4040 *
    4141 * @author Jan Peter Stotz
    42  *
     42 * @author Jason Huntley
    4343 */
    4444public class JMapViewer extends JPanel implements TileLoaderListener {
     
    391391     * the displayed map) into a latitude / longitude coordinate
    392392     *
    393      * @param mapPointX
    394      * @param mapPointY
     393     * @param mapPointX X coordinate
     394     * @param mapPointY Y coordinate
    395395     * @return latitude / longitude
    396396     */
     
    406406     * Calculates the position on the map of a given coordinate
    407407     *
    408      * @param lat
    409      * @param lon
    410      * @param checkOutside
     408     * @param lat latitude
     409     * @param lon longitude
     410     * @param checkOutside check if the point is outside the displayed area
    411411     * @return point on the map or <code>null</code> if the point is not visible
    412412     *         and checkOutside set to <code>true</code>
     
    429429     * @param lat Latitude
    430430     * @param offset Offset respect Latitude
    431      * @param checkOutside
     431     * @param checkOutside check if the point is outside the displayed area
    432432     * @return Integer the radius in pixels
    433433     */
     
    445445     * Calculates the position on the map of a given coordinate
    446446     *
    447      * @param lat
    448      * @param lon
     447     * @param lat latitude
     448     * @param lon longitude
    449449     * @return point on the map or <code>null</code> if the point is not visible
    450450     */
     
    473473     * Calculates the position on the map of a given coordinate
    474474     *
    475      * @param coord
     475     * @param coord coordinate
    476476     * @return point on the map or <code>null</code> if the point is not visible
    477477     */
     
    486486     * Calculates the position on the map of a given coordinate
    487487     *
    488      * @param coord
     488     * @param coord coordinate
     489     * @param checkOutside check if the point is outside the displayed area
    489490     * @return point on the map or <code>null</code> if the point is not visible
    490491     *         and checkOutside set to <code>true</code>
     
    501502     *
    502503     * @return the meter per pixel
    503      * @author Jason Huntley
    504504     */
    505505    public double getMeterPerPixel() {
     
    875875     * Enables or disables painting of the {@link MapMarker}
    876876     *
    877      * @param mapMarkersVisible
     877     * @param mapMarkersVisible {@code true} to enable painting of markers
    878878     * @see #addMapMarker(MapMarker)
    879879     * @see #getMapMarkerList()
     
    997997     * Enables or disables painting of the {@link MapRectangle}
    998998     *
    999      * @param mapRectanglesVisible
     999     * @param mapRectanglesVisible {@code true} to enable painting of rectangles
    10001000     * @see #addMapRectangle(MapRectangle)
    10011001     * @see #getMapRectangleList()
     
    10131013     * Enables or disables painting of the {@link MapPolygon}
    10141014     *
    1015      * @param mapPolygonsVisible
     1015     * @param mapPolygonsVisible {@code true} to enable painting of polygons
    10161016     * @see #addMapPolygon(MapPolygon)
    10171017     * @see #getMapPolygonList()
  • applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java

    r30900 r31293  
    6969    }
    7070
    71     public void paint(Graphics g, Point position, int radio) {
    72         int size_h = radio;
     71    public void paint(Graphics g, Point position, int radius) {
     72        int size_h = radius;
    7373        int size = size_h * 2;
    7474
  • applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java

    r31135 r31293  
    88 * space is measured in pixels. The origin of the map space is the top left
    99 * corner. The map space origin (0,0) has latitude ~85 and longitude -180.
     10 * @author Jan Peter Stotz
     11 * @author Jason Huntley
    1012 */
    1113public class OsmMercator {
     
    3840    /**
    3941     * Creates instance with provided tile size.
    40      * @param tileSize
     42     * @param tileSize tile size in pixels
    4143     */
    4244    public OsmMercator(int tileSize) {
     
    7779     * @param zoomLevel the zoom level
    7880     * @return the distance
    79      * @author Jason Huntley
    8081     */
    8182    public double getDistance(int x1, int y1, int x2, int y2, int zoomLevel) {
     
    9697     * @param lo2 the Longitude from 2nd coordinate in degrees
    9798     * @return the distance
    98      * @author Jason Huntley
    9999     */
    100100    public double getDistance(double la1, double lo1, double la2, double lo2) {
     
    127127     *            [-180..180]
    128128     * @return [0..2^Zoomlevel*TILE_SIZE[
    129      * @author Jan Peter Stotz
    130129     */
    131130    public double LonToX(double aLongitude, int aZoomlevel) {
     
    151150     *            [-90...90]
    152151     * @return [0..2^Zoomlevel*TILE_SIZE[
    153      * @author Jan Peter Stotz
    154152     */
    155153    public double LatToY(double aLat, int aZoomlevel) {
     
    181179     *            [0..2^Zoomlevel*TILE_WIDTH[
    182180     * @return ]-180..180[
    183      * @author Jan Peter Stotz
    184181     */
    185182    public double XToLon(int aX, int aZoomlevel) {
  • applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java

    r30900 r31293  
    4747     * coordinates within <code>g</code>
    4848     *
    49      * @param g
    50      * @param position
    51      * @param radio
     49     * @param g graphics
     50     * @param position coordinates
     51     * @param radius radius
    5252     */
    53     public void paint(Graphics g, Point position, int radio);
     53    public void paint(Graphics g, Point position, int radius);
    5454}
  • applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapPolygon.java

    r30223 r31293  
    1010 * Interface to be implemented by polygons that can be displayed on the map.
    1111 *
    12  * @author Vincent
     12 * @author Vincent Privat
    1313 */
    1414public interface MapPolygon extends MapObject{
     
    2020
    2121    /**
    22      * Paints the map rectangle on the map. The <code>points</code>
     22     * Paints the map polygon on the map. The <code>points</code>
    2323     * are specifying the coordinates within <code>g</code>
    2424     *
    25      * @param g
    26      * @param points
     25     * @param g graphics
     26     * @param points list of points defining the polygon to draw
    2727     */
    2828    public void paint(Graphics g, List<Point> points);
    2929
    3030    /**
    31      * Paints the map rectangle on the map. The <code>polygon</code>
     31     * Paints the map polygon on the map. The <code>polygon</code>
    3232     * is specifying the coordinates within <code>g</code>
    3333     *
    34      * @param g
    35      * @param polygon
     34     * @param g graphics
     35     * @param polygon polygon to draw
    3636     */
    3737    public void paint(Graphics g, Polygon polygon);
  • applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java

    r31142 r31293  
    8484     * Constructs the tile url.
    8585     *
    86      * @param zoom
    87      * @param tilex
    88      * @param tiley
     86     * @param zoom zoom level
     87     * @param tilex X coordinate
     88     * @param tiley Y coordinate
    8989     * @return fully qualified url for downloading the specified tile image
     90     * @throws IOException if any I/O error occurs
    9091     */
    9192    String getTileUrl(int zoom, int tilex, int tiley) throws IOException;
  • applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java

    r31143 r31293  
    3535    private int tileSize = OsmMercator.DEFAUL_TILE_SIZE;
    3636
    37     /** mapping <header key, metadata key> */
     37    /** mapping &lt;header key, metadata key&gt; */
    3838    protected Map<String, String> metadataHeaders;
    3939
     
    4141     * Create a TileSourceInfo class
    4242     *
    43      * @param name
    44      * @param base_url
    45      * @param id
     43     * @param name name
     44     * @param base_url base URL
     45     * @param id unique id
    4646     */
    4747    public TileSourceInfo(String name, String base_url, String id) {
     
    5454     * Create a TileSourceInfo class
    5555     *
    56      * @param name
     56     * @param name name
    5757     */
    5858    public TileSourceInfo(String name) {
     
    124124    /**
    125125     * Sets the tile size provided by this tile source
    126      * @param tileSize
     126     * @param tileSize tile size in pixels
    127127     */
    128128    public void setTileSize(int tileSize) {
     
    135135    /**
    136136     *
    137      * @return mapping <HTTP header name, Metadata key name> for copying HTTP headers to Tile metadata
     137     * @return mapping &lt;HTTP header name, Metadata key name&gt; for copying HTTP headers to Tile metadata
    138138     * @since 31125
    139139     */
Note: See TracChangeset for help on using the changeset viewer.