Ignore:
Timestamp:
2014-02-10T00:51:53+01:00 (10 years ago)
Author:
Don-vip
Message:

javadoc fixes for jdk8 compatibility

Location:
trunk/src/org/openstreetmap/josm/data
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/data/Bounds.java

    r6822 r6830  
    3030    /**
    3131     * Returns min latitude of bounds. Efficient shortcut for {@code getMin().lat()}.
    32      * 
     32     *
    3333     * @return min latitude of bounds.
    3434     * @since 6203
    … …  
    4040    /**
    4141     * Returns min longitude of bounds. Efficient shortcut for {@code getMin().lon()}.
    42      * 
     42     *
    4343     * @return min longitude of bounds.
    4444     * @since 6203
    … …  
    5454    /**
    5555     * Returns max latitude of bounds. Efficient shortcut for {@code getMax().lat()}.
    56      * 
     56     *
    5757     * @return max latitude of bounds.
    5858     * @since 6203
    … …  
    6464    /**
    6565     * Returns max longitude of bounds. Efficient shortcut for {@code getMax().lon()}.
    66      * 
     66     *
    6767     * @return max longitude of bounds.
    6868     * @since 6203
    … …  
    9595     * Single point Bounds defined by lat/lon {@code b}.
    9696     * Coordinates will be rounded to osm precision if {@code roundToOsmPrecision} is true.
    97      * 
     97     *
    9898     * @param b lat/lon of given point.
    9999     * @param roundToOsmPrecision defines if lat/lon will be rounded.
    … …  
    102102        this(b.lat(), b.lon(), roundToOsmPrecision);
    103103    }
    104    
     104
    105105    /**
    106106     * Single point Bounds defined by point [lat,lon].
    107107     * Coordinates will be rounded to osm precision if {@code roundToOsmPrecision} is true.
    108      * 
     108     *
    109109     * @param lat latitude of given point.
    110110     * @param lon longitude of given point.
    … …  
    232232     *
    233233     * @param center  the center coordinate pair. Must not be null.
    234      * @param latExtent the latitude extent. > 0 required.
    235      * @param lonExtent the longitude extent. > 0 required.
     234     * @param latExtent the latitude extent. > 0 required.
     235     * @param lonExtent the longitude extent. > 0 required.
    236236     * @throws IllegalArgumentException thrown if center is null
    237      * @throws IllegalArgumentException thrown if latExtent <= 0
    238      * @throws IllegalArgumentException thrown if lonExtent <= 0
     237     * @throws IllegalArgumentException thrown if latExtent &lt;= 0
     238     * @throws IllegalArgumentException thrown if lonExtent &lt;= 0
    239239     */
    240240    public Bounds(LatLon center, double latExtent, double lonExtent) {
    241241        CheckParameterUtil.ensureParameterNotNull(center, "center");
    242242        if (latExtent <= 0.0)
    243             throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0.0 exptected, got {1}", "latExtent", latExtent));
     243            throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0.0 expected, got {1}", "latExtent", latExtent));
    244244        if (lonExtent <= 0.0)
    245             throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0.0 exptected, got {1}", "lonExtent", lonExtent));
     245            throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0.0 expected, got {1}", "lonExtent", lonExtent));
    246246
    247247        this.minLat = LatLon.roundToOsmPrecision(LatLon.toIntervalLat(center.lat() - latExtent / 2));
    … …  
    253253    /**
    254254     * Creates BBox with same coordinates.
    255      * 
     255     *
    256256     * @return BBox with same coordinates.
    257257     * @since 6203
    … …  
    260260        return new BBox(minLon, minLat, maxLon, maxLat);
    261261    }
    262    
     262
    263263    @Override public String toString() {
    264264        return "Bounds["+minLat+","+minLon+","+maxLat+","+maxLon+"]";
    … …  
    277277     */
    278278    public LatLon getCenter() {
    279         if (crosses180thMeridian()) {           
     279        if (crosses180thMeridian()) {
    280280            double lat = (minLat + maxLat) / 2;
    281281            double lon = (minLon + maxLon - 360.0) / 2;
    … …  
    296296        extend(ll.lat(), ll.lon());
    297297    }
    298    
     298
    299299    /**
    300300     * Extend the bounds if necessary to include the given point [lat,lon].
    … …  
    358358    /**
    359359     * The two bounds intersect? Compared to java Shape.intersects, if does not use
    360      * the interior but the closure. (">=" instead of ">")
     360     * the interior but the closure. ("&gt;=" instead of "&gt;")
    361361     */
    362362    public boolean intersects(Bounds b) {
    … …  
    413413     */
    414414    public boolean isCollapsed() {
    415         return Double.doubleToLongBits(minLat) == Double.doubleToLongBits(maxLat) 
     415        return Double.doubleToLongBits(minLat) == Double.doubleToLongBits(maxLat)
    416416            && Double.doubleToLongBits(minLon) == Double.doubleToLongBits(maxLon);
    417417    }

  • trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java

    r6380 r6830  
    6767    /**
    6868     * The two bounds intersect? Compared to java Shape.intersects, if does not use
    69      * the interior but the closure. (">=" instead of ">")
     69     * the interior but the closure. ("&gt;=" instead of "&gt;")
    7070     */
    7171    public boolean intersects(ProjectionBounds b) {

  • trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

    r6566 r6830  
    3030 * where valid values are in the [-180,180] and positive values specify positions east of the prime meridian.
    3131 * <br>
    32  * <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/62/Latitude_and_Longitude_of_the_Earth.svg/500px-Latitude_and_Longitude_of_the_Earth.svg.png">
     32 * <img alt="lat/lon" src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/62/Latitude_and_Longitude_of_the_Earth.svg/500px-Latitude_and_Longitude_of_the_Earth.svg.png">
    3333 * <br>
    3434 * This class is immutable.
    … …  
    292292     *
    293293     * @param other the "destination" position
    294      * @return heading in the range 0 <= hd < 2*PI
     294     * @return heading in the range 0 &lt;= hd &lt; 2*PI
    295295     */
    296296    public double heading(LatLon other) {

  • trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

    r6380 r6830  
    1414/**
    1515 * Objects of this class represent a gpx file with tracks, waypoints and routes.
    16  * It uses GPX v1.1, see {@link <a href="http://www.topografix.com/GPX/1/1/">the spec</a>}
     16 * It uses GPX v1.1, see <a href="http://www.topografix.com/GPX/1/1/">the spec</a>
    1717 * for details.
    1818 *
    19  * @author Raphael Mack <ramack@raphael-mack.de>
     19 * @author Raphael Mack &lt;ramack@raphael-mack.de&gt;
    2020 */
    2121public class GpxData extends WithAttributes {
    … …  
    255255        };
    256256    }
    257    
     257
    258258    /**
    259259     * Iterates over all track segments and then over all routes.
    … …  
    320320        }
    321321    }
    322    
     322
    323323}

  • trunk/src/org/openstreetmap/josm/data/gpx/WithAttributes.java

    r6142 r6830  
    1111 * Base class for various classes in the GPX model.
    1212 *
    13  * @author Frederik Ramm <frederik@remote.org>
     13 * @author Frederik Ramm
    1414 * @since 444
    1515 */

  • trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

    r6690 r6830  
    2727 * Class that stores info about an image background layer.
    2828 *
    29  * @author Frederik Ramm <frederik@remote.org>
     29 * @author Frederik Ramm
    3030 */
    3131public class ImageryInfo implements Comparable<ImageryInfo>, Attributed {
    … …  
    8383     */
    8484    public static class ImageryBounds extends Bounds {
    85        
     85
    8686        /**
    8787         * Constructs a new {@code ImageryBounds} from string.

  • trunk/src/org/openstreetmap/josm/data/imagery/types/EntryType.java

    r6069 r6830  
    2525 *
    2626 * <pre>
    27  * &lt;complexType name="entry">
    28  *   &lt;complexContent>
    29  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
    30  *       &lt;sequence>
    31  *         &lt;element name="pixelPerDegree" type="{http://www.w3.org/2001/XMLSchema}double"/>
    32  *         &lt;element name="east" type="{http://www.w3.org/2001/XMLSchema}double"/>
    33  *         &lt;element name="north" type="{http://www.w3.org/2001/XMLSchema}double"/>
    34  *         &lt;element name="lastUsed" type="{http://www.w3.org/2001/XMLSchema}date"/>
    35  *         &lt;element name="lastModified" type="{http://www.w3.org/2001/XMLSchema}date"/>
    36  *         &lt;element name="filename" type="{http://www.w3.org/2001/XMLSchema}string"/>
    37  *       &lt;/sequence>
    38  *     &lt;/restriction>
    39  *   &lt;/complexContent>
    40  * &lt;/complexType>
     27 * &lt;complexType name="entry"&gt;
     28 *   &lt;complexContent&gt;
     29 *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
     30 *       &lt;sequence&gt;
     31 *         &lt;element name="pixelPerDegree" type="{http://www.w3.org/2001/XMLSchema}double"/&gt;
     32 *         &lt;element name="east" type="{http://www.w3.org/2001/XMLSchema}double"/&gt;
     33 *         &lt;element name="north" type="{http://www.w3.org/2001/XMLSchema}double"/&gt;
     34 *         &lt;element name="lastUsed" type="{http://www.w3.org/2001/XMLSchema}date"/&gt;
     35 *         &lt;element name="lastModified" type="{http://www.w3.org/2001/XMLSchema}date"/&gt;
     36 *         &lt;element name="filename" type="{http://www.w3.org/2001/XMLSchema}string"/&gt;
     37 *       &lt;/sequence&gt;
     38 *     &lt;/restriction&gt;
     39 *   &lt;/complexContent&gt;
     40 * &lt;/complexType&gt;
    4141 * </pre>
    42  *
    4342 *
    4443 */

  • trunk/src/org/openstreetmap/josm/data/imagery/types/ProjectionType.java

    r6069 r6830  
    55// Generated on: 2011.01.09 at 07:33:18 PM CET
    66//
    7 
    8 
    97package org.openstreetmap.josm.data.imagery.types;
    108
    119import java.util.ArrayList;
    1210import java.util.List;
     11
    1312import javax.xml.bind.annotation.XmlAccessType;
    1413import javax.xml.bind.annotation.XmlAccessorType;
    1514import javax.xml.bind.annotation.XmlAttribute;
    1615import javax.xml.bind.annotation.XmlType;
    17 
    1816
    1917/**
    … …  
    2321 *
    2422 * <pre>
    25  * &lt;complexType name="projection">
    26  *   &lt;complexContent>
    27  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
    28  *       &lt;sequence>
    29  *         &lt;element name="entry" type="{http://josm.openstreetmap.de/wms-cache}entry" maxOccurs="unbounded" minOccurs="0"/>
    30  *       &lt;/sequence>
    31  *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
    32  *       &lt;attribute name="cache-directory" type="{http://www.w3.org/2001/XMLSchema}string" />
    33  *     &lt;/restriction>
    34  *   &lt;/complexContent>
    35  * &lt;/complexType>
     23 * &lt;complexType name="projection"&gt;
     24 *   &lt;complexContent&gt;
     25 *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
     26 *       &lt;sequence&gt;
     27 *         &lt;element name="entry" type="{http://josm.openstreetmap.de/wms-cache}entry" maxOccurs="unbounded" minOccurs="0"/&gt;
     28 *       &lt;/sequence&gt;
     29 *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
     30 *       &lt;attribute name="cache-directory" type="{http://www.w3.org/2001/XMLSchema}string" /&gt;
     31 *     &lt;/restriction&gt;
     32 *   &lt;/complexContent&gt;
     33 * &lt;/complexType&gt;
    3634 * </pre>
    37  *
    3835 *
    3936 */

  • trunk/src/org/openstreetmap/josm/data/imagery/types/WmsCacheType.java

    r6069 r6830  
    55// Generated on: 2011.01.09 at 07:33:18 PM CET
    66//
    7 
    8 
    97package org.openstreetmap.josm.data.imagery.types;
    108
    119import java.util.ArrayList;
    1210import java.util.List;
     11
    1312import javax.xml.bind.annotation.XmlAccessType;
    1413import javax.xml.bind.annotation.XmlAccessorType;
    … …  
    1615import javax.xml.bind.annotation.XmlRootElement;
    1716import javax.xml.bind.annotation.XmlType;
    18 
    1917
    2018/**
    … …  
    2422 *
    2523 * <pre>
    26  * &lt;complexType>
    27  *   &lt;complexContent>
    28  *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
    29  *       &lt;sequence>
    30  *         &lt;element name="projection" type="{http://josm.openstreetmap.de/wms-cache}projection" maxOccurs="unbounded" minOccurs="0"/>
    31  *       &lt;/sequence>
    32  *       &lt;attribute name="tileSize" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
    33  *       &lt;attribute name="totalFileSize" use="required" type="{http://www.w3.org/2001/XMLSchema}int" />
    34  *     &lt;/restriction>
    35  *   &lt;/complexContent>
    36  * &lt;/complexType>
     24 * &lt;complexType&gt;
     25 *   &lt;complexContent&gt;
     26 *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"&gt;
     27 *       &lt;sequence&gt;
     28 *         &lt;element name="projection" type="{http://josm.openstreetmap.de/wms-cache}projection" maxOccurs="unbounded" minOccurs="0"/&gt;
     29 *       &lt;/sequence&gt;
     30 *       &lt;attribute name="tileSize" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&gt;
     31 *       &lt;attribute name="totalFileSize" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /&gt;
     32 *     &lt;/restriction&gt;
     33 *   &lt;/complexContent&gt;
     34 * &lt;/complexType&gt;
    3735 * </pre>
    38  *
    3936 *
    4037 */

  • trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

    r6821 r6830  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.data.osm;
    3 
    4 import org.openstreetmap.josm.tools.Utils;
    53
    64import static org.openstreetmap.josm.tools.I18n.tr;
    … …  
    1917import java.util.concurrent.atomic.AtomicLong;
    2018
     19import org.openstreetmap.josm.tools.Utils;
     20
    2121/**
    2222* Abstract class to represent common features of the datatypes primitives.
    … …  
    160160    /**
    161161     *
    162      * @return True if primitive is new (not yet uploaded the server, id <= 0)
     162     * @return True if primitive is new (not yet uploaded the server, id &lt;= 0)
    163163     */
    164164    @Override
    … …  
    184184     * is set to false.
    185185     *
    186      * @param id the id. > 0 required
    187      * @param version the version > 0 required
    188      * @throws IllegalArgumentException thrown if id <= 0
    189      * @throws IllegalArgumentException thrown if version <= 0
     186     * @param id the id. &gt; 0 required
     187     * @param version the version &gt; 0 required
     188     * @throws IllegalArgumentException thrown if id &lt;= 0
     189     * @throws IllegalArgumentException thrown if version &lt;= 0
    190190     * @throws DataIntegrityProblemException If id is changed and primitive was already added to the dataset
    191191     */
    … …  
    256256     * primitive.
    257257     *
    258      * @param changesetId the id. >= 0 required.
     258     * @param changesetId the id. &gt;= 0 required.
    259259     * @throws IllegalStateException thrown if this primitive is new.
    260      * @throws IllegalArgumentException thrown if id < 0
     260     * @throws IllegalArgumentException thrown if id &lt; 0
    261261     */
    262262    @Override

  • trunk/src/org/openstreetmap/josm/data/osm/Changeset.java

    r6380 r6830  
    5252
    5353    /**
    54      * Creates a changeset with id <code>id</code>. If id > 0, sets incomplete to true.
     54     * Creates a changeset with id <code>id</code>. If id &gt; 0, sets incomplete to true.
    5555     *
    5656     * @param id the id

  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r6643 r6830  
    778778     * exists
    779779     *
    780      * @param id  uniqueId of the primitive. Might be < 0 for newly created primitives
     780     * @param id  uniqueId of the primitive. Might be &lt; 0 for newly created primitives
    781781     * @param type the type of  the primitive. Must not be null.
    782782     * @return the primitive

  • trunk/src/org/openstreetmap/josm/data/osm/Node.java

    r6639 r6830  
    11// License: GPL. For details, see LICENSE file.
    22package org.openstreetmap.josm.data.osm;
     3
     4import java.util.Collection;
     5import java.util.Set;
     6import java.util.TreeSet;
    37
    48import org.openstreetmap.josm.Main;
    … …  
    1115import org.openstreetmap.josm.tools.Predicate;
    1216import org.openstreetmap.josm.tools.Utils;
    13 
    14 import java.util.Collection;
    15 import java.util.Set;
    16 import java.util.TreeSet;
    1717
    1818/**
    … …  
    139139    /**
    140140     * Constructs an incomplete {@code Node} object with the given id.
    141      * @param id The id. Must be >= 0
    142      * @throws IllegalArgumentException if id < 0
     141     * @param id The id. Must be &gt;= 0
     142     * @throws IllegalArgumentException if id &lt; 0
    143143     */
    144144    public Node(long id) throws IllegalArgumentException {
    … …  
    148148    /**
    149149     * Constructs a new {@code Node} with the given id and version.
    150      * @param id The id. Must be >= 0
     150     * @param id The id. Must be &gt;= 0
    151151     * @param version The version
    152      * @throws IllegalArgumentException if id < 0
     152     * @throws IllegalArgumentException if id &lt; 0
    153153     */
    154154    public Node(long id, int version) throws IllegalArgumentException {

  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

    r6733 r6830  
    241241     * Creates a new primitive for the given id.
    242242     *
    243      * If allowNegativeId is set, provided id can be < 0 and will be set to primitive without any processing.
     243     * If allowNegativeId is set, provided id can be &lt; 0 and will be set to primitive without any processing.
    244244     * If allowNegativeId is not set, then id will have to be 0 (in that case new unique id will be generated) or
    245245     * positive number.
    … …  
    247247     * @param id the id
    248248     * @param allowNegativeId
    249      * @throws IllegalArgumentException thrown if id < 0 and allowNegativeId is false
     249     * @throws IllegalArgumentException thrown if id &lt; 0 and allowNegativeId is false
    250250     */
    251251    protected OsmPrimitive(long id, boolean allowNegativeId) throws IllegalArgumentException {
    … …  
    269269     * Creates a new primitive for the given id and version.
    270270     *
    271      * If allowNegativeId is set, provided id can be < 0 and will be set to primitive without any processing.
     271     * If allowNegativeId is set, provided id can be &lt; 0 and will be set to primitive without any processing.
    272272     * If allowNegativeId is not set, then id will have to be 0 (in that case new unique id will be generated) or
    273273     * positive number.
    274274     *
    275      * If id is not > 0 version is ignored and set to 0.
     275     * If id is not &gt; 0 version is ignored and set to 0.
    276276     *
    277277     * @param id
    278278     * @param version
    279279     * @param allowNegativeId
    280      * @throws IllegalArgumentException thrown if id < 0 and allowNegativeId is false
     280     * @throws IllegalArgumentException thrown if id &lt; 0 and allowNegativeId is false
    281281     */
    282282    protected OsmPrimitive(long id, int version, boolean allowNegativeId) throws IllegalArgumentException {
    … …  
    356356     * is set to false.
    357357     *
    358      * @param id the id. > 0 required
    359      * @param version the version > 0 required
    360      * @throws IllegalArgumentException thrown if id <= 0
    361      * @throws IllegalArgumentException thrown if version <= 0
     358     * @param id the id. &gt; 0 required
     359     * @param version the version &gt; 0 required
     360     * @throws IllegalArgumentException thrown if id &lt;= 0
     361     * @throws IllegalArgumentException thrown if version &lt;= 0
    362362     * @throws DataIntegrityProblemException If id is changed and primitive was already added to the dataset
    363363     */
    … …  
    11431143     * semantic attributes.
    11441144     * <ol>
    1145      *   <li>equal id</ol>
     1145     *   <li>equal id</li>
    11461146     *   <li>both are complete or both are incomplete</li>
    11471147     *   <li>both have the same tags</li>
    … …  
    11651165     * technical attributes. The attributes:
    11661166     * <ol>
    1167      *   <li>deleted</ol>
    1168      *   <li>modified</ol>
    1169      *   <li>timestamp</ol>
    1170      *   <li>version</ol>
    1171      *   <li>visible</ol>
    1172      *   <li>user</ol>
     1167     *   <li>deleted</li>
     1168     *   <li>modified</li>
     1169     *   <li>timestamp</li>
     1170     *   <li>version</li>
     1171     *   <li>visible</li>
     1172     *   <li>user</li>
    11731173     * </ol>
    11741174     * have to be equal

  • trunk/src/org/openstreetmap/josm/data/osm/Relation.java

    r6717 r6830  
    2121 * An relation, having a set of tags and any number (0...n) of members.
    2222 *
    23  * @author Frederik Ramm <frederik@remote.org>
     23 * @author Frederik Ramm
    2424 */
    2525public final class Relation extends OsmPrimitive implements IRelation {
    … …  
    204204
    205205    /**
    206      * Creates a new relation for the given id. If the id > 0, the way is marked
     206     * Creates a new relation for the given id. If the id &gt; 0, the way is marked
    207207     * as incomplete.
    208208     *
    209      * @param id the id. > 0 required
    210      * @throws IllegalArgumentException thrown if id < 0
     209     * @param id the id. &gt; 0 required
     210     * @throws IllegalArgumentException thrown if id &lt; 0
    211211     */
    212212    public Relation(long id) throws IllegalArgumentException {

  • trunk/src/org/openstreetmap/josm/data/osm/RelationMemberData.java

    r6069 r6830  
    4848
    4949    /**
    50      * PrimitiveId implementation. Returns the same value as {@link #getMemberId()()}
     50     * PrimitiveId implementation. Returns the same value as {@link #getMemberId()}
    5151     */
    5252    @Override

  • trunk/src/org/openstreetmap/josm/data/osm/Storage.java

    r6717 r6830  
    1414 * A Set-like class that allows looking up equivalent preexising instance.
    1515 * It is useful whereever one would use self-mapping construct like
    16  * <code>Map<T,T>.put(t,t), that is, for caches, uniqueness filters or similar.
     16 * <code>Map&lt;T,T&gt;.put(t,t)</code>, that is, for caches, uniqueness filters or similar.
    1717 *
    1818 * The semantics of equivalency can be external to the object, using the
    … …  
    2424 * <ul><li>A String cache:
    2525 * <pre>
    26  * Storage<String> cache = new Storage(); // use default Hash
     26 * Storage&lt;String&gt; cache = new Storage(); // use default Hash
    2727 * for (String input : data) {
    2828 *     String onlyOne = cache.putIfUnique(input);
    … …  
    3232 * <li>Identity-based set:
    3333 * <pre>
    34  * Storage<Object> identity = new Storage(new Hash<Object,Object> {
     34 * Storage&lt;Object&gt; identity = new Storage(new Hash&lt;Object,Object&gt; {
    3535 *     public int getHashCode(Object o) {
    3636 *         return System.identityHashCode(o);
    … …  
    4444 * <pre>
    4545 * class Thing { int id; }
    46  * Storage<Thing> things = new Storage(new Hash<Thing,Thing>() {
     46 * Storage&lt;Thing&gt; things = new Storage(new Hash&lt;Thing,Thing&gt;() {
    4747 *     public int getHashCode(Thing t) {
    4848 *         return t.id;
    … …  
    5252 *     }
    5353 *  });
    54  * Map<Integer,Thing> fk = things.foreignKey(new Hash<Integer,Thing>() {
     54 * Map&lt;Integer,Thing&gt; fk = things.foreignKey(new Hash&lt;Integer,Thing&gt;() {
    5555 *     public int getHashCode(Integer i) {
    5656 *         return i.getIntValue();
    … …  
    6464 * assert things.get(new Thing(3)) == fk.get(3);
    6565 * </pre></li>
    66  *
     66 * </ul>
    6767 *
    6868 * @author nenik

  • trunk/src/org/openstreetmap/josm/data/osm/Way.java

    r6717 r6830  
    126126     * @param index the position
    127127     * @return  the node at position <code>index</code>
    128      * @exception IndexOutOfBoundsException thrown if <code>index</code> < 0
    129      * or <code>index</code> >= {@link #getNodesCount()}
     128     * @exception IndexOutOfBoundsException thrown if <code>index</code> &lt; 0
     129     * or <code>index</code> &gt;= {@link #getNodesCount()}
    130130     * @since 1862
    131131     */
    … …  
    254254
    255255    /**
    256      * Contructs a new {@code Way} for the given id. If the id > 0, the way is marked
     256     * Contructs a new {@code Way} for the given id. If the id &gt; 0, the way is marked
    257257     * as incomplete. If id == 0 then way is marked as new
    258258     *
    259      * @param id the id. >= 0 required
    260      * @throws IllegalArgumentException if id < 0
     259     * @param id the id. &gt;= 0 required
     260     * @throws IllegalArgumentException if id &lt; 0
    261261     * @since 343
    262262     */
    … …  
    267267    /**
    268268     * Contructs a new {@code Way} with given id and version.
    269      * @param id the id. >= 0 required
     269     * @param id the id. &gt;= 0 required
    270270     * @param version the version
    271      * @throws IllegalArgumentException if id < 0
     271     * @throws IllegalArgumentException if id &lt; 0
    272272     * @since 2620
    273273     */

  • trunk/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java

    r5170 r6830  
    2222    /**
    2323     * Returns list of primitives modified by this event.
    24      * <br/>
     24     * <br>
    2525     * <strong>WARNING</strong> This value might be incorrect in case
    2626     * of {@link DataChangedEvent}. It returns all primitives in the dataset

  • trunk/src/org/openstreetmap/josm/data/osm/history/History.java

    r6623 r6830  
    4343     * Creates a new history for an OSM primitive
    4444     *
    45      * @param id the id. >0 required.
     45     * @param id the id. &gt; 0 required.
    4646     * @param type the primitive type. Must not be null.
    4747     * @param versions a list of versions. Can be null.
    48      * @throws IllegalArgumentException thrown if id <= 0
     48     * @throws IllegalArgumentException thrown if id &lt;= 0
    4949     * @throws IllegalArgumentException if type is null
    5050     *

  • trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java

    r6449 r6830  
    8383     * and version <code>version</code>. null, if no such primitive exists.
    8484     *
    85      * @param id the id of the primitive. > 0 required.
     85     * @param id the id of the primitive. &gt; 0 required.
    8686     * @param type the primitive type. Must not be null.
    87      * @param version the version of the primitive. > 0 required
     87     * @param version the version of the primitive. &gt; 0 required
    8888     * @return the history primitive for the primitive with id <code>id</code>,
    8989     * type <code>type</code>, and version <code>version</code>
    … …  
    135135     * and type <code>type</code>.
    136136     *
    137      * @param id the id the if of the primitive. > 0 required
     137     * @param id the id the if of the primitive. &gt; 0 required
    138138     * @param type the type of the primitive. Must not be null.
    139139     * @return the history. null, if there isn't a history for <code>id</code> and
    140140     * <code>type</code>.
    141      * @throws IllegalArgumentException thrown if id <= 0
     141     * @throws IllegalArgumentException thrown if id &lt;= 0
    142142     * @throws IllegalArgumentException thrown if type is null
    143143     */

  • trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java

    r6069 r6830  
    2222     * Constructs a new {@code HistoryNode}.
    2323     *
    24      * @param id the id (> 0 required)
    25      * @param version the version (> 0 required)
     24     * @param id the id (&gt; 0 required)
     25     * @param version the version (&gt; 0 required)
    2626     * @param visible whether the node is still visible
    27      * @param user the user (! null required)
    28      * @param changesetId the changeset id (> 0 required)
    29      * @param timestamp the timestamp (! null required)
     27     * @param user the user (!= null required)
     28     * @param changesetId the changeset id (&gt; 0 required)
     29     * @param timestamp the timestamp (!= null required)
    3030     * @param coords the coordinates
    3131     * @throws IllegalArgumentException if preconditions are violated
    … …  
    3939     * This is needed to build virtual HistoryNodes for modified nodes, which do not have a timestamp and a changeset id.
    4040     *
    41      * @param id the id (> 0 required)
    42      * @param version the version (> 0 required)
     41     * @param id the id (&gt; 0 required)
     42     * @param version the version (&gt; 0 required)
    4343     * @param visible whether the node is still visible
    44      * @param user the user (! null required)
    45      * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
    46      * @param timestamp the timestamp (! null required if {@code checkHistoricParams} is true)
     44     * @param user the user (!= null required)
     45     * @param changesetId the changeset id (&gt; 0 required if {@code checkHistoricParams} is true)
     46     * @param timestamp the timestamp (!= null required if {@code checkHistoricParams} is true)
    4747     * @param coords the coordinates
    4848     * @param checkHistoricParams if true, checks values of {@code changesetId} and {@code timestamp}

  • trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

    r6440 r6830  
    4747     * Constructs a new {@code HistoryOsmPrimitive}.
    4848     *
    49      * @param id the id (> 0 required)
    50      * @param version the version (> 0 required)
     49     * @param id the id (&gt; 0 required)
     50     * @param version the version (&gt; 0 required)
    5151     * @param visible whether the primitive is still visible
    52      * @param user the user (! null required)
    53      * @param changesetId the changeset id (> 0 required)
    54      * @param timestamp the timestamp (! null required)
     52     * @param user the user (!= null required)
     53     * @param changesetId the changeset id (&gt; 0 required)
     54     * @param timestamp the timestamp (!= null required)
    5555     *
    5656     * @throws IllegalArgumentException if preconditions are violated
    … …  
    6464     * This is needed to build virtual HistoryOsmPrimitives for modified primitives, which do not have a timestamp and a changeset id.
    6565     *
    66      * @param id the id (> 0 required)
    67      * @param version the version (> 0 required)
     66     * @param id the id (&gt; 0 required)
     67     * @param version the version (&gt; 0 required)
    6868     * @param visible whether the primitive is still visible
    69      * @param user the user (! null required)
    70      * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
    71      * @param timestamp the timestamp (! null required if {@code checkHistoricParams} is true)
     69     * @param user the user (!= null required)
     70     * @param changesetId the changeset id (&gt; 0 required if {@code checkHistoricParams} is true)
     71     * @param timestamp the timestamp (!= null required if {@code checkHistoricParams} is true)
    7272     * @param checkHistoricParams if true, checks values of {@code changesetId} and {@code timestamp}
    7373     *

  • trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java

    r6317 r6830  
    2626     * constructor
    2727     *
    28      * @param id the id (>0 required)
    29      * @param version the version (> 0 required)
     28     * @param id the id (&gt; 0 required)
     29     * @param version the version (&gt; 0 required)
    3030     * @param visible whether the primitive is still visible
    31      * @param user  the user (! null required)
    32      * @param changesetId the changeset id (> 0 required)
    33      * @param timestamp the timestamp (! null required)
     31     * @param user  the user (!= null required)
     32     * @param changesetId the changeset id (&gt; 0 required)
     33     * @param timestamp the timestamp (!= null required)
    3434     *
    3535     * @throws IllegalArgumentException if preconditions are violated
    … …  
    4242     * constructor
    4343     *
    44      * @param id the id (>0 required)
    45      * @param version the version (> 0 required)
     44     * @param id the id (&gt; 0 required)
     45     * @param version the version (&gt; 0 required)
    4646     * @param visible whether the primitive is still visible
    47      * @param user  the user (! null required)
    48      * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
    49      * @param timestamp the timestamp (! null required if {@code checkHistoricParams} is true)
     47     * @param user  the user (!= null required)
     48     * @param changesetId the changeset id (&gt; 0 required if {@code checkHistoricParams} is true)
     49     * @param timestamp the timestamp (!= null required if {@code checkHistoricParams} is true)
    5050     * @param checkHistoricParams If true, checks values of {@code changesetId} and {@code timestamp}
    5151     *
    … …  
    6060     * constructor
    6161     *
    62      * @param id the id (>0 required)
    63      * @param version the version (> 0 required)
     62     * @param id the id (&gt; 0 required)
     63     * @param version the version (&gt; 0 required)
    6464     * @param visible whether the primitive is still visible
    65      * @param user  the user (! null required)
    66      * @param changesetId the changeset id (> 0 required)
    67      * @param timestamp the timestamp (! null required)
     65     * @param user  the user (!= null required)
     66     * @param changesetId the changeset id (&gt; 0 required)
     67     * @param timestamp the timestamp (!= null required)
    6868     * @param members list of members for this relation
    6969     *

  • trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java

    r6317 r6830  
    2626     * Constructs a new {@code HistoryWay}.
    2727     *
    28      * @param id the id (> 0 required)
    29      * @param version the version (> 0 required)
     28     * @param id the id (&gt; 0 required)
     29     * @param version the version (&gt; 0 required)
    3030     * @param visible whether the node is still visible
    31      * @param user the user (! null required)
    32      * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
    33      * @param timestamp the timestamp (! null required if {@code checkHistoricParams} is true)
     31     * @param user the user (!= null required)
     32     * @param changesetId the changeset id (&gt; 0 required if {@code checkHistoricParams} is true)
     33     * @param timestamp the timestamp (!= null required if {@code checkHistoricParams} is true)
    3434     * @throws IllegalArgumentException if preconditions are violated
    3535     */
    … …  
    4242     * This is needed to build virtual HistoryWays for modified ways, which do not have a timestamp and a changeset id.
    4343     *
    44      * @param id the id (> 0 required)
    45      * @param version the version (> 0 required)
     44     * @param id the id (&gt; 0 required)
     45     * @param version the version (&gt; 0 required)
    4646     * @param visible whether the node is still visible
    47      * @param user the user (! null required)
    48      * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
    49      * @param timestamp the timestamp (! null required if {@code checkHistoricParams} is true)
     47     * @param user the user (!= null required)
     48     * @param changesetId the changeset id (&gt; 0 required if {@code checkHistoricParams} is true)
     49     * @param timestamp the timestamp (!= null required if {@code checkHistoricParams} is true)
    5050     * @param checkHistoricParams if true, checks values of {@code changesetId} and {@code timestamp}
    5151     * @throws IllegalArgumentException if preconditions are violated
    … …  
    5959     * Constructs a new {@code HistoryWay} with a given list of node ids.
    6060     *
    61      * @param id the id (> 0 required)
    62      * @param version the version (> 0 required)
     61     * @param id the id (&gt; 0 required)
     62     * @param version the version (&gt; 0 required)
    6363     * @param visible whether the node is still visible
    64      * @param user the user (! null required)
    65      * @param changesetId the changeset id (> 0 required if {@code checkHistoricParams} is true)
    66      * @param timestamp the timestamp (! null required if {@code checkHistoricParams} is true)
    67      * @param nodeIdList the node ids (! null required)
     64     * @param user the user (!= null required)
     65     * @param changesetId the changeset id (&gt; 0 required if {@code checkHistoricParams} is true)
     66     * @param timestamp the timestamp (!= null required if {@code checkHistoricParams} is true)
     67     * @param nodeIdList the node ids (!= null required)
    6868     * @throws IllegalArgumentException if preconditions are violated
    6969     */
    … …  
    9595     * @param idx the index
    9696     * @return the idx-th node id
    97      * @exception IndexOutOfBoundsException thrown, if  idx <0 || idx >= {#see {@link #getNumNodes()}
     97     * @exception IndexOutOfBoundsException thrown, if  idx &lt; 0 || idx &gt;= {#see {@link #getNumNodes()}
    9898     */
    9999    public long getNodeId(int idx) throws IndexOutOfBoundsException {

  • trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

    r6380 r6830  
    281281     * With this bug, <code>gv.setGlyphTransform(i, trfm)</code> has a different
    282282     * effect than on most other systems, namely the translation components
    283      * ("m02" & "m12", {@link AffineTransform}) appear to be twice as large, as
    284      * they actually are. The rotation is unaffected (scale & shear not tested
     283     * ("m02" &amp; "m12", {@link AffineTransform}) appear to be twice as large, as
     284     * they actually are. The rotation is unaffected (scale &amp; shear not tested
    285285     * so far).
    286286     *
    … …  
    445445    /**
    446446     * Displays text at specified position including its halo, if applicable.
    447      * 
     447     *
    448448     * @param gv Text's glyphs to display. If {@code null}, use text from {@code s} instead.
    449449     * @param s text to display if {@code gv} is {@code null}
    … …  
    484484        }
    485485    }
    486    
     486
    487487    protected void drawArea(OsmPrimitive osm, Path2D.Double path, Color color, MapImage fillImage, TextElement text) {
    488488

  • trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java

    r6463 r6830  
    184184
    185185    /**
    186      *  Returns the <i>radius of curvature in the meridian<i>
     186     *  Returns the <i>radius of curvature in the meridian</i>
    187187     *  for this reference ellipsoid at the specified latitude.
    188188     *

  • trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

    r6822 r6830  
    200200     * @param gs A GridShift object containing the coordinate to shift
    201201     * @return True if the coordinate is within a Sub Grid, false if not
    202      * @throws IOException
    203202     */
    204203    public boolean gridShiftForward(NTV2GridShift gs) {
    … …  
    223222     * @param gs A GridShift object containing the coordinate to shift
    224223     * @return True if the coordinate is within a Sub Grid, false if not
    225      * @throws IOException
    226224     */
    227225    public boolean gridShiftReverse(NTV2GridShift gs) {

  • trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

    r6781 r6830  
    6363 * A OSM data validator.
    6464 *
    65  * @author Francisco R. Santos <frsantos@gmail.com>
     65 * @author Francisco R. Santos &lt;frsantos@gmail.com&gt;
    6666 */
    6767public class OsmValidator implements LayerChangeListener {
    … …  
    119119        ConditionalKeys.class, // 3200 .. 3299
    120120    };
    121    
     121
    122122    private static Map<String, Test> allTestsMap;
    123123    static {
    … …  
    226226        return new TreeMap<String, Test>(allTestsMap);
    227227    }
    228    
     228
    229229    /**
    230230     * Returns the instance of the given test class.
    … …  
    281281    /**
    282282     * Initialize grid details based on current projection system. Values based on
    283      * the original value fixed for EPSG:4326 (10000) using heuristics (that is, test&error
     283     * the original value fixed for EPSG:4326 (10000) using heuristics (that is, test&amp;error
    284284     * until most bugs were discovered while keeping the processing time reasonable)
    285285     */

  • trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

    r6639 r6830  
    101101    /** The map of potential duplicates.
    102102     *
    103      * If there is exactly one node for a given pos, the map includes a pair <pos, Node>.
     103     * If there is exactly one node for a given pos, the map includes a pair &lt;pos, Node&gt;.
    104104     * If there are multiple nodes for a given pos, the map includes a pair
    105      * <pos, NodesByEqualTagsMap>
     105     * &lt;pos, NodesByEqualTagsMap&gt;
    106106     */
    107107    private Storage<Object> potentialDuplicates;

  • trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java

    r6659 r6830  
    2929
    3030/**
    31  * Checks for nodes in power lines/minor_lines that do not have a power=tower/pole tag.<br/>
     31 * Checks for nodes in power lines/minor_lines that do not have a power=tower/pole tag.<br>
    3232 * See #7812 for discussions about this test.
    3333 */

  • trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

    r6791 r6830  
    3333/**
    3434 * Tests if there are segments that crosses in the same layer.
    35  * <br/>
     35 * <br>
    3636 * This class is abstract since highway/railway/waterway/… ways must be handled separately.
    3737 * An actual implementation must override {@link #isPrimitiveUsable(OsmPrimitive)}
    … …  
    5353            super(tr("Unconnected highways"));
    5454        }
    55        
     55
    5656        @Override
    5757        public boolean isPrimitiveUsable(OsmPrimitive p) {
    … …  
    7171            super(tr("Unconnected railways"));
    7272        }
    73        
     73
    7474        @Override
    7575        public boolean isPrimitiveUsable(OsmPrimitive p) {
    … …  
    8989            super(tr("Unconnected waterways"));
    9090        }
    91        
     91
    9292        @Override
    9393        public boolean isPrimitiveUsable(OsmPrimitive p) {
    … …  
    107107            super(tr("Unconnected natural lands and landuses"));
    108108        }
    109        
     109
    110110        @Override
    111111        public boolean isPrimitiveUsable(OsmPrimitive p) {
    … …  
    125125            super(tr("Unconnected power ways"));
    126126        }
    127        
     127
    128128        @Override
    129129        public boolean isPrimitiveUsable(OsmPrimitive p) {
Note: See TracChangeset for help on using the changeset viewer.