Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Coordinate.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Coordinate.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Coordinate.java (revision 18772) @@ -12,7 +12,7 @@ * This class encapsulates a Point2D.Double and provide access * via lat and lon. - * + * * @author Jan Peter Stotz - * + * */ public class Coordinate implements Serializable { Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/DefaultMapController.java (revision 18772) @@ -13,7 +13,7 @@ * Default map controller which implements map moving by pressing the right * mouse button and zooming by double click or by mouse wheel. - * + * * @author Jan Peter Stotz - * + * */ public class DefaultMapController extends JMapController implements MouseListener, MouseMotionListener, @@ -87,5 +87,5 @@ /** * Enables or disables that the map pane can be moved using the mouse. - * + * * @param movementEnabled */ @@ -106,5 +106,5 @@ *
  • {@link MouseEvent#BUTTON3} (right mouse button)
    • * - * + * * @param movementMouseButton */ Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Demo.java (revision 18772) @@ -20,9 +20,9 @@ /** - * + * * Demonstrates the usage of {@link JMapViewer} - * + * * @author Jan Peter Stotz - * + * */ public class Demo extends JFrame { Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapController.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapController.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapController.java (revision 18772) @@ -16,5 +16,5 @@ *
  • {@link MouseWheelListener}
    • * - * + * * @author Jan Peter Stotz */ Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java (revision 18772) @@ -28,10 +28,10 @@ /** - * + * * Provides a simple panel that displays pre-rendered map tiles loaded from the * OpenStreetMap project. - * + * * @author Jan Peter Stotz - * + * */ public class JMapViewer extends JPanel implements TileLoaderListener { @@ -54,6 +54,6 @@ protected boolean tileGridVisible; - - protected TileController tileController; + + protected TileController tileController; /** @@ -71,6 +71,4 @@ protected JButton zoomInButton; protected JButton zoomOutButton; - - /** @@ -150,5 +148,5 @@ * Changes the map pane so that it is centered on the specified coordinate * at the given zoom level. - * + * * @param lat * latitude of the specified coordinate @@ -166,5 +164,5 @@ * level is displayed on the map at the screen coordinate * mapPoint. - * + * * @param mapPoint * point on the map denoted in pixels where the coordinate should @@ -252,5 +250,5 @@ setDisplayPosition(x, y, newZoom); } - + /** * Sets the displayed map pane and zoom level so that all map markers are @@ -318,9 +316,9 @@ /** * Calculates the position on the map of a given coordinate - * + * * @param lat * @param lon * @param checkOutside - * @return point on the map or null if the point is not visible and checkOutside set to true + * @return point on the map or null if the point is not visible and checkOutside set to true */ public Point getMapPosition(double lat, double lon, boolean checkOutside) { @@ -336,8 +334,8 @@ return new Point(x, y); } - + /** * Calculates the position on the map of a given coordinate - * + * * @param lat * @param lon @@ -347,8 +345,8 @@ return getMapPosition(lat, lon, true); } - + /** * Calculates the position on the map of a given coordinate - * + * * @param coord * @return point on the map or null if the point is not visible @@ -361,8 +359,8 @@ } } - + /** * Calculates the position on the map of a given coordinate - * + * * @param coord * @return point on the map or null if the point is not visible and checkOutside set to true @@ -476,5 +474,5 @@ /** * Moves the visible map pane. - * + * * @param x * horizontal movement in pixel. @@ -540,5 +538,5 @@ * derived implementations for adapting zoom dependent values. The new zoom * level can be obtained via {@link #getZoom()}. - * + * * @param oldZoom * the previous zoom level @@ -567,5 +565,5 @@ /** * Enables or disables painting of the {@link MapMarker} - * + * * @param mapMarkersVisible * @see #addMapMarker(MapMarker) @@ -644,5 +642,5 @@ /** * Enables or disables painting of the {@link MapSquare} - * + * * @param mapMarkersVisible * @see #addMapSquare(MapSquare) Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JobDispatcher.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JobDispatcher.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JobDispatcher.java (revision 18772) @@ -13,5 +13,5 @@ * more than {@link #WORKER_THREAD_TIMEOUT} seconds (default: 30), the instance * ends itself. - * + * * @author Jan Peter Stotz */ Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerDot.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerDot.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerDot.java (revision 18772) @@ -13,7 +13,7 @@ * is painted as a circle with a black border line and filled with a specified * color. - * + * * @author Jan Peter Stotz - * + * */ public class MapMarkerDot implements MapMarker { Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java (revision 18772) @@ -13,5 +13,5 @@ * memory up to a certain limit ({@link #getCacheSize()}). If the limit is * exceeded the least recently used {@link Tile} objects will be deleted. - * + * * @author Jan Peter Stotz */ @@ -81,5 +81,5 @@ /** - * Clears the cache deleting all tiles from memory + * Clears the cache deleting all tiles from memory */ public void clear() { @@ -100,5 +100,5 @@ /** * Changes the maximum number of {@link Tile} objects that this cache holds. - * + * * @param cacheSize * new maximum number of tiles @@ -142,5 +142,5 @@ * elements. It supports element removal in constant time - in difference to * the Java implementation which needs O(n). - * + * * @author Jan Peter Stotz */ @@ -162,5 +162,5 @@ /** * Add the element to the head of the list. - * + * * @param new element to be added */ @@ -182,5 +182,5 @@ /** * Removes the specified elemntent form the list. - * + * * @param element * to be removed Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java (revision 18772) @@ -27,5 +27,5 @@ * saves all loaded files in a directory located in the the temporary directory. * If a tile is present in this file cache it will not be loaded from OSM again. - * + * * @author Jan Peter Stotz * @author Stefan Zeller @@ -71,6 +71,6 @@ throw new IOException("No temp directory set"); String subDirName = "JMapViewerTiles"; - // On Linux/Unix systems we do not have a per user tmp directory. - // Therefore we add the user name for getting a unique dir name. + // On Linux/Unix systems we do not have a per user tmp directory. + // Therefore we add the user name for getting a unique dir name. if (userName != null && userName.length() > 0) subDirName += "_" + userName; @@ -273,5 +273,5 @@ * Performs a HEAD request for retrieving the * LastModified header value. - * + * * Note: This does only work with servers providing the * LastModified header: @@ -280,5 +280,5 @@ *
  • {@link OsmTileLoader#MAP_MAPNIK} - not supported
    • * - * + * * @param fileAge * @return true if the tile on the server is newer than the @@ -371,5 +371,5 @@ * if a newer tile is available using the mechanism specified for the * selected tile source/server. - * + * * @param maxFileAge * maximum age in milliseconds Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmMercator.java (revision 18772) @@ -9,7 +9,7 @@ * 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 Tim Haussmann - * + * */ @@ -27,5 +27,5 @@ * Returns the absolut number of pixels in y or x, defined as: 2^Zoomlevel * * TILE_WIDTH where TILE_WIDTH is the width of a tile in pixels - * + * * @param aZoomlevel * @return @@ -45,5 +45,5 @@ /** * Transform longitude to pixelspace - * + * *

    * Mathematical optimization
    @@ -55,5 +55,5 @@ * *

    - * + * * @param aLongitude * [-180..180] @@ -74,5 +74,5 @@ * * log(u) := log((1.0 + sin(toRadians(aLat))) / (1.0 - sin(toRadians(aLat))
    - * + * * y = -1 * (radius(aZoomlevel) / 2 * log(u)))) - falseNorthing(aZoomlevel))
    * y = -1 * (getMaxPixel(aZoomlevel) / 2 * PI / 2 * log(u)) - -1 * getMaxPixel(aZoomLevel) / 2
    @@ -101,5 +101,5 @@ /** * Transforms pixel coordinate X to longitude - * + * *

    * Mathematical optimization
    @@ -123,5 +123,5 @@ /** * Transforms pixel coordinate Y to latitude - * + * * @param aY * [0..2^Zoomlevel*TILE_WIDTH[ Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java (revision 18772) @@ -15,5 +15,5 @@ /** * A {@link TileLoader} implementation that loads tiles from OSM via HTTP. - * + * * @author Jan Peter Stotz */ @@ -21,5 +21,5 @@ /** - * Holds the used user agent used for HTTP requests. If this field is + * Holds the used user agent used for HTTP requests. If this field is * null, the default Java user agent is used. */ Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileSource.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileSource.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileSource.java (revision 18772) Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java (revision 18772) @@ -18,5 +18,5 @@ * Holds one map tile. Additionally the code for loading the tile image and * painting it is also included in this class. - * + * * @author Jan Peter Stotz */ @@ -52,5 +52,5 @@ /** * Creates a tile with empty image. - * + * * @param source * @param xtile @@ -191,5 +191,5 @@ * Paints the tile-image on the {@link Graphics} g at the * position x/y. - * + * * @param g * @param x Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/TileController.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/TileController.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/TileController.java (revision 18772) @@ -11,7 +11,7 @@ protected TileCache tileCache; protected TileSource tileSource; - + JobDispatcher jobDispatcher; - + public TileController(TileSource source, TileCache tileCache, TileLoaderListener listener) { tileSource = new OsmTileSource.Mapnik(); @@ -20,9 +20,9 @@ jobDispatcher = JobDispatcher.getInstance(); } - + /** * retrieves a tile from the cache. If the tile is not present in the cache * a load job is added to the working queue of {@link JobThread}. - * + * * @param tilex * @param tiley @@ -76,5 +76,5 @@ /** - * + * */ public void cancelOutstandingJobs() { Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapMarker.java (revision 18772) @@ -10,5 +10,5 @@ /** * Interface to be implemented by all one dimensional elements that can be displayed on the map. - * + * * @author Jan Peter Stotz * @see JMapViewer#addMapMarker(MapMarker) @@ -30,5 +30,5 @@ * Paints the map marker on the map. The position specifies the * coordinates within g - * + * * @param g * @param position Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapSquare.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapSquare.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/MapSquare.java (revision 18772) @@ -11,5 +11,5 @@ /** * Interface to be implemented by squares that can be displayed on the map. - * + * * @author Stefan Zeller * @see JMapViewer#addMapSquare(MapSquare) @@ -32,5 +32,5 @@ * Paints the map square on the map. The topLeft and * bottomRight specifies the coordinates within g - * + * * @param g * @param position Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileCache.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileCache.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileCache.java (revision 18772) @@ -9,5 +9,5 @@ * Implement this interface for creating your custom tile cache for * {@link JMapViewer}. - * + * * @author Jan Peter Stotz */ @@ -17,5 +17,5 @@ * Retrieves a tile from the cache if present, otherwise null * will be returned. - * + * * @param source * @param x @@ -34,5 +34,5 @@ * via {@link #getTile(int, int, int)} is unspecified and depends on the * implementation. - * + * * @param tile */ Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileLoader.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileLoader.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileLoader.java (revision 18772) @@ -6,5 +6,5 @@ * Interface for implementing a tile loader. Tiles are usually loaded via HTTP * or from a file. - * + * * @author Jan Peter Stotz */ @@ -15,5 +15,5 @@ * should create and return a new {@link Job} instance that performs the * load action. - * + * * @param tileLayerSource * @param tilex Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileLoaderListener.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileLoaderListener.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileLoaderListener.java (revision 18772) @@ -8,7 +8,7 @@ /** - * Will be called if a new {@link Tile} has been loaded successfully. - * Loaded can mean downloaded or loaded from file cache. - * + * Will be called if a new {@link Tile} has been loaded successfully. + * Loaded can mean downloaded or loaded from file cache. + * * @param tile */ Index: applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java =================================================================== --- applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java (revision 18356) +++ applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java (revision 18772) @@ -6,5 +6,5 @@ /** - * + * * @author Jan Peter Stotz */ @@ -40,5 +40,5 @@ * Specifies the maximum zoom value. The number of zoom levels is [0.. * {@link #getMaxZoom()}]. - * + * * @return maximum zoom value that has to be smaller or equal to * {@link JMapViewer#MAX_ZOOM} @@ -47,8 +47,8 @@ /** - * Specifies the minimum zoom value. This value is usually 0. - * Only for maps that cover a certain region up to a limited zoom level - * this method should return a value different than 0. - * + * Specifies the minimum zoom value. This value is usually 0. + * Only for maps that cover a certain region up to a limited zoom level + * this method should return a value different than 0. + * * @return minimum zoom value - usually 0 */ @@ -64,5 +64,5 @@ * A tile layer name has to be unique and has to consist only of characters * valid for filenames. - * + * * @return Name of the tile layer */ @@ -71,5 +71,5 @@ /** * Constructs the tile url. - * + * * @param zoom * @param tilex @@ -82,5 +82,5 @@ * Specifies the tile image type. For tiles rendered by Mapnik or * Osmarenderer this is usually "png". - * + * * @return file extension of the tile image type */