Ignore:
Timestamp:
2009-12-30T20:18:59+01:00 (14 years ago)
Author:
stoecker
Message:

fix bad line endings

Location:
trunk/src/org/openstreetmap/josm/io
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/io/CacheFiles.java

    r2606 r2711  
    5757        this(ident, true);
    5858    }
    59    
     59
    6060    public CacheFiles(String ident, boolean isPlugin) {
    6161        String pref = isPlugin ? Main.pref.getPluginsDirFile().getPath() : Main.pref.getPreferencesDir();
    62        
     62
    6363        boolean dir_writeable;
    6464        this.ident = ident;

  • trunk/src/org/openstreetmap/josm/io/Capabilities.java

    r2599 r2711  
    7777     * don't include this parameter or if the parameter value is illegal (not a number,
    7878     * a negative number)
    79      * 
     79     *
    8080     * @return the max number of objects in a changeset
    8181     */

  • trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java

    r2599 r2711  
    5151    /**
    5252     * Replies true if <code>errorHeader</code> matches with {@see #ERROR_HEADER_PATTERN}
    53      * 
     53     *
    5454     * @param errorHeader the error header
    5555     * @return true if <code>errorHeader</code> matches with {@see #ERROR_HEADER_PATTERN}
    … …  
    9191    /**
    9292     * Creates the exception with the given <code>errorHeader</code>
    93      * 
     93     *
    9494     * @param errorHeader the error header
    9595     */
    … …  
    103103     * Creates the exception with the given error header and the given
    104104     * source.
    105      * 
     105     *
    106106     * @param errorHeader the error header
    107107     * @param source the source for the exception
    … …  
    115115    /**
    116116     * Creates the exception
    117      * 
     117     *
    118118     * @param changesetId the id if the closed changeset
    119119     * @param closedOn the date the changeset was closed on
    … …  
    129129    /**
    130130     * Replies the id of the changeset which was closed
    131      * 
     131     *
    132132     * @return the id of the changeset which was closed
    133133     */
    … …  
    138138    /**
    139139     * Replies the date the changeset was closed
    140      * 
     140     *
    141141     * @return the date the changeset was closed. May be null if the date isn't known.
    142142     */
    … …  
    147147    /**
    148148     * Replies the source where the exception was thrown
    149      * 
     149     *
    150150     * @return the source
    151151     */

  • trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java

    r2688 r2711  
    2020     * Replies a changeset query object from the query part of a OSM API URL for querying
    2121     * changesets.
    22      * 
     22     *
    2323     * @param query the query part
    2424     * @return the query object
    2525     * @throws ChangesetQueryUrlException thrown if query doesn't consist of valid query parameters
    26      * 
     26     *
    2727     */
    2828    static public ChangesetQuery buildFromUrlQuery(String query) throws ChangesetQueryUrlException{
    … …  
    4848    /**
    4949     * Restricts the query to changesets owned by the user with id <code>uid</code>.
    50      * 
     50     *
    5151     * @param uid the uid of the user. >0 expected.
    5252     * @return the query object with the applied restriction
    … …  
    6464    /**
    6565     * Restricts the query to changesets owned by the user with user name <code>username</code>.
    66      * 
     66     *
    6767     * Caveat: for historical reasons the username might not be unique! It is recommended to use
    6868     * {@see #forUser(int)} to restrict the query to a specific user.
    69      * 
     69     *
    7070     * @param username the username. Must not be null.
    7171     * @return the query object with the applied restriction
    … …  
    8383     * Replies true if this query is restricted to user whom we only know the user name
    8484     * for.
    85      * 
     85     *
    8686     * @return true if this query is restricted to user whom we only know the user name
    8787     * for
    … …  
    9494     * Replies the user name which this query is restricted to. null, if this query isn't
    9595     * restricted to a user name, i.e. if {@see #isRestrictedToPartiallyIdentifiedUser()} is false.
    96      * 
     96     *
    9797     * @return the user name which this query is restricted to
    9898     */
    … …  
    103103    /**
    104104     * Replies true if this query is restricted to user whom know the user id for.
    105      * 
     105     *
    106106     * @return true if this query is restricted to user whom know the user id for
    107107     */
    … …  
    112112    /**
    113113     * Replies a query which is restricted to a bounding box.
    114      * 
     114     *
    115115     * @param minLon  min longitude of the bounding box. Valid longitude value expected.
    116116     * @param minLat  min latitude of the bounding box. Valid latitude value expected.
    117117     * @param maxLon  max longitude of the bounding box. Valid longitude value expected.
    118118     * @param maxLat  max latitude of the bounding box.  Valid latitude value expected.
    119      * 
     119     *
    120120     * @return the restricted changeset query
    121121     * @throws IllegalArgumentException thrown if either of the parameters isn't a valid longitude or
    … …  
    137137    /**
    138138     * Replies a query which is restricted to a bounding box.
    139      * 
     139     *
    140140     * @param min the min lat/lon coordinates of the bounding box. Must not be null.
    141141     * @param max the max lat/lon coordiantes of the bounding box. Must not be null.
    142      * 
     142     *
    143143     * @return the restricted changeset query
    144144     * @throws IllegalArgumentException thrown if min is null
    … …  
    154154    /**
    155155     *  Replies a query which is restricted to a bounding box given by <code>bbox</code>.
    156      * 
     156     *
    157157     * @param bbox the bounding box. Must not be null.
    158158     * @return the changeset query
    … …  
    168168     * Restricts the result to changesets which have been closed after the date given by <code>d</code>.
    169169     * <code>d</code> d is a date relative to the current time zone.
    170      * 
     170     *
    171171     * @param d the date . Must not be null.
    172172     * @return the restricted changeset query
    … …  
    183183     * habe been created before <code>createdBefore</code>. Both dates are expressed relative to the current
    184184     * time zone.
    185      * 
     185     *
    186186     * @param closedAfter only reply changesets closed after this date. Must not be null.
    187187     * @param createdBefore only reply changesets created before this date. Must not be null.
    … …  
    201201     * Restricts the result to changesets which are or aren't open, depending on the value of
    202202     * <code>isOpen</code>
    203      * 
     203     *
    204204     * @param isOpen whether changesets should or should not be open
    205205     * @return the restricted changeset query
    … …  
    213213     * Restricts the result to changesets which are or aren't closed, depending on the value of
    214214     * <code>isClosed</code>
    215      * 
     215     *
    216216     * @param isClosed whether changesets should or should not be open
    217217     * @return the restricted changeset query
    … …  
    224224    /**
    225225     * Replies the query string to be used in a query URL for the OSM API.
    226      * 
     226     *
    227227     * @return the query string
    228228     */
    … …  
    268268        return sb.toString();
    269269    }
    270 
    271270
    272271    public static class ChangesetQueryUrlException extends Exception {
    … …  
    408407         * Parses the changeset query given as URL query parameters and replies a
    409408         * {@see ChangesetQuery}
    410          * 
     409         *
    411410         * <code>query</code> is the query part of a API url for querying changesets,
    412411         * see <a href="http://wiki.openstreetmap.org/wiki/API_v0.6#Query:_GET_.2Fapi.2F0.6.2Fchangesets">OSM API</a>.
    413          * 
     412         *
    414413         * Example for an query string:<br>
    415414         * <pre>
    416415         *    uid=1234&open=true
    417416         * </pre>
    418          * 
     417         *
    419418         * @param query the query string. If null, an empty query (identical to a query for all changesets) is
    420419         * assumed

  • trunk/src/org/openstreetmap/josm/io/DiffResultProcessor.java

    r2604 r2711  
    5353    /**
    5454     * Creates a diff result reader
    55      * 
     55     *
    5656     * @param primitives the collection of primitives which have been uploaded. If null,
    5757     * assumes an empty collection.
    … …  
    6767    /**
    6868     * Parse the response from a diff upload to the OSM API.
    69      * 
     69     *
    7070     * @param diffUploadResponse the response. Must not be null.
    7171     * @param progressMonitor a progress monitor. Defaults to {@see NullProgressMonitor#INSTANCE} if null
    7272     * @throws IllegalArgumentException thrown if diffUploadRequest is null
    7373     * @throws OsmDataParsingException thrown if the diffUploadRequest can't be parsed successfully
    74      * 
     74     *
    7575     */
    7676    public  void parse(String diffUploadResponse, ProgressMonitor progressMonitor) throws OsmDataParsingException {
    … …  
    9999    /**
    100100     * Postprocesses the diff result read and parsed from the server.
    101      * 
     101     *
    102102     * Uploaded objects are assigned their new id (if they got assigned a new
    103103     * id by the server), their new version (if the version was incremented),
    104104     * and the id of the changeset to which they were uploaded.
    105      * 
     105     *
    106106     * @param cs the current changeset. Ignored if null.
    107107     * @param monitor the progress monitor. Set to {@see NullProgressMonitor#INSTANCE} if null

  • trunk/src/org/openstreetmap/josm/io/FileImporter.java

    r2703 r2711  
    3131        return false;
    3232    }
    33    
     33
    3434    /**
    3535     * Needs to be implemented if isBatchImporter() returns false.
    … …  
    7979
    8080    /**
    81      * If multiple files (with multiple file formats) are selected, 
     81     * If multiple files (with multiple file formats) are selected,
    8282     * they are opened in the order of their priorities.
    8383     * Highest priority comes first.

  • trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java

    r2604 r2711  
    6868    /**
    6969     * Writes the prolog of the OsmChange document
    70      * 
     70     *
    7171     * @throws IllegalStateException thrown if the prologs has already been written
    7272     */
    … …  
    8282    /**
    8383     * Appends a collection of {@see OsmPrimitive}s to the OsmChange document.
    84      * 
     84     *
    8585     * @param primitives the collection of primitives. Ignored if null.
    8686     * @throws IllegalStateException thrown if the prologs has not been written yet
    … …  
    9999    /**
    100100     * Appends an {@see OsmPrimitive} to the OsmChange document.
    101      * 
     101     *
    102102     * @param p the primitive. Ignored if null.
    103103     * @throws IllegalStateException thrown if the prologs has not been written yet
    … …  
    115115    /**
    116116     * Writes the epilog of the OsmChange document
    117      * 
     117     *
    118118     * @throws IllegalStateException thrown if the prologs has not been written yet
    119119     */

  • trunk/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java

    r2688 r2711  
    274274    /**
    275275     * Create a parser
    276      * 
     276     *
    277277     * @param source the input stream with the changeset content as XML document. Must not be null.
    278278     * @throws IllegalArgumentException thrown if source is null.
    … …  
    292292    /**
    293293     * Parses the content
    294      * 
     294     *
    295295     * @param progressMonitor the progress monitor. Set to {@see NullProgressMonitor#INSTANCE}
    296296     * if null
    … …  
    323323    /**
    324324     * Parses the content from the input source
    325      * 
     325     *
    326326     * @return the parsed data
    327327     * @throws OsmDataParsingException thrown if something went wrong. Check for chained

  • trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java

    r2563 r2711  
    1717/**
    1818 * OsmServerObjectReader reads an individual object from the OSM server.
    19  * 
     19 *
    2020 * It can either download the object including or not including its immediate children.
    2121 * The former case is called a "full download".
    22  * 
     22 *
    2323 */
    2424public class OsmServerObjectReader extends OsmServerReader {
    … …  
    3030    /**
    3131     * Creates a new server object reader for a given id and a primitive type.
    32      * 
     32     *
    3333     * @param id the object id. > 0 required.
    3434     * @param type the type. Must not be null.
    … …  
    4949    /**
    5050     * Creates a new server object reader for an object with the given <code>id</code>
    51      * 
     51     *
    5252     * @param id the object id. Must not be null. Unique id > 0 required.
    5353     * @param full true, if a full download is requested (i.e. a download including
    … …  
    6767    /**
    6868     * Downloads and parses the data.
    69      * 
     69     *
    7070     * @param progressMonitor the progress monitor. Set to {@see NullProgressMonitor#INSTANCE} if
    7171     * null

  • trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

    r2599 r2711  
    4646
    4747    long uploadStartTime;
    48 
    4948
    5049    public String timeLeft(int progress, int list_size) {

  • trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java

    r2641 r2711  
    1818    /**
    1919     * Looks up the credentials for a given type.
    20      * 
     20     *
    2121     * @param the type of service. {@see RequestorType#SERVER} for the OSM API server, {@see RequestorType#PROXY}
    2222     * for a proxy server
    … …  
    2828    /**
    2929     * Saves the credentials in <code>credentials</code> for the given service type.
    30      * 
     30     *
    3131     * @param the type of service. {@see RequestorType#SERVER} for the OSM API server, {@see RequestorType#PROXY}
    3232     * for a proxy server
    … …  
    3737
    3838    /**
    39      * 
     39     *
    4040     * @param requestorType  the type of service. {@see RequestorType#SERVER} for the OSM API server, {@see RequestorType#PROXY}
    4141     * for a proxy server
Note: See TracChangeset for help on using the changeset viewer.