Ignore:
Timestamp:
2015-04-29T01:44:01+02:00 (5 years ago)
Author:
Don-vip
Message:

fix squid:RedundantThrowsDeclarationCheck + consistent Javadoc for exceptions

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

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/io/AbstractReader.java

    r7937 r8291  
    5252     */
    5353    protected final Map<Long, Collection<RelationMemberData>> relations = new HashMap<>();
    54    
     54
    5555    /**
    5656     * Replies the parsed data set
     
    6161        return ds;
    6262    }
    63    
     63
    6464    /**
    6565     * Processes the parsed nodes after parsing. Just adds them to
     
    7979     * adds the way to the dataset
    8080     *
    81      * @throws IllegalDataException thrown if a data integrity problem is detected
     81     * @throws IllegalDataException if a data integrity problem is detected
    8282     */
    8383    protected void processWaysAfterParsing() throws IllegalDataException{
     
    119119     * Completes the parsed relations with its members.
    120120     *
    121      * @throws IllegalDataException thrown if a data integrity problem is detected, i.e. if a
     121     * @throws IllegalDataException if a data integrity problem is detected, i.e. if a
    122122     * relation member refers to a local primitive which wasn't available in the data
    123      *
    124123     */
    125124    protected void processRelationsAfterParsing() throws IllegalDataException {
     
    191190        }
    192191    }
    193    
     192
    194193    protected final void prepareDataSet() throws IllegalDataException {
    195194        try {
  • trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java

    r7303 r8291  
    3232     * @param query the query part
    3333     * @return the query object
    34      * @throws ChangesetQueryUrlException thrown if query doesn't consist of valid query parameters
    35      *
     34     * @throws ChangesetQueryUrlException if query doesn't consist of valid query parameters
    3635     */
    3736    public static ChangesetQuery buildFromUrlQuery(String query) throws ChangesetQueryUrlException{
     
    6766     * @param uid the uid of the user. &gt; 0 expected.
    6867     * @return the query object with the applied restriction
    69      * @throws IllegalArgumentException thrown if uid &lt;= 0
     68     * @throws IllegalArgumentException if uid &lt;= 0
    7069     * @see #forUser(String)
    7170     */
    72     public ChangesetQuery forUser(int uid) throws IllegalArgumentException{
     71    public ChangesetQuery forUser(int uid) {
    7372        if (uid <= 0)
    7473            throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "uid", uid));
     
    8685     * @param username the username. Must not be null.
    8786     * @return the query object with the applied restriction
    88      * @throws IllegalArgumentException thrown if username is null.
     87     * @throws IllegalArgumentException if username is null.
    8988     * @see #forUser(int)
    9089     */
     
    133132     *
    134133     * @return the restricted changeset query
    135      * @throws IllegalArgumentException thrown if either of the parameters isn't a valid longitude or
     134     * @throws IllegalArgumentException if either of the parameters isn't a valid longitude or
    136135     * latitude value
    137136     */
    138     public ChangesetQuery inBbox(double minLon, double minLat, double maxLon, double maxLat) throws IllegalArgumentException{
     137    public ChangesetQuery inBbox(double minLon, double minLat, double maxLon, double maxLat) {
    139138        if (!LatLon.isValidLon(minLon))
    140139            throw new IllegalArgumentException(tr("Illegal longitude value for parameter ''{0}'', got {1}", "minLon", minLon));
     
    156155     *
    157156     * @return the restricted changeset query
    158      * @throws IllegalArgumentException thrown if min is null
    159      * @throws IllegalArgumentException thrown if max is null
     157     * @throws IllegalArgumentException if min is null
     158     * @throws IllegalArgumentException if max is null
    160159     */
    161160    public ChangesetQuery inBbox(LatLon min, LatLon max) {
     
    171170     * @param bbox the bounding box. Must not be null.
    172171     * @return the changeset query
    173      * @throws IllegalArgumentException thrown if bbox is null.
    174      */
    175     public ChangesetQuery inBbox(Bounds bbox) throws IllegalArgumentException {
     172     * @throws IllegalArgumentException if bbox is null.
     173     */
     174    public ChangesetQuery inBbox(Bounds bbox) {
    176175        CheckParameterUtil.ensureParameterNotNull(bbox, "bbox");
    177176        this.bounds = bbox;
     
    185184     * @param d the date . Must not be null.
    186185     * @return the restricted changeset query
    187      * @throws IllegalArgumentException thrown if d is null
    188      */
    189     public ChangesetQuery closedAfter(Date d) throws IllegalArgumentException{
     186     * @throws IllegalArgumentException if d is null
     187     */
     188    public ChangesetQuery closedAfter(Date d) {
    190189        CheckParameterUtil.ensureParameterNotNull(d, "d");
    191190        this.closedAfter = d;
     
    201200     * @param createdBefore only reply changesets created before this date. Must not be null.
    202201     * @return the restricted changeset query
    203      * @throws IllegalArgumentException thrown if closedAfter is null
    204      * @throws IllegalArgumentException thrown if createdBefore is null
    205      */
    206     public ChangesetQuery closedAfterAndCreatedBefore(Date closedAfter, Date createdBefore ) throws IllegalArgumentException {
     202     * @throws IllegalArgumentException if closedAfter is null
     203     * @throws IllegalArgumentException if createdBefore is null
     204     */
     205    public ChangesetQuery closedAfterAndCreatedBefore(Date closedAfter, Date createdBefore ) {
    207206        CheckParameterUtil.ensureParameterNotNull(closedAfter, "closedAfter");
    208207        CheckParameterUtil.ensureParameterNotNull(createdBefore, "createdBefore");
     
    241240     * @param changesetIds the changeset ids
    242241     * @return the query object with the applied restriction
    243      * @throws IllegalArgumentException thrown if changesetIds is null.
     242     * @throws IllegalArgumentException if changesetIds is null.
    244243     */
    245244    public ChangesetQuery forChangesetIds(Collection<Long> changesetIds) {
  • trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

    r7432 r8291  
    113113     * @throws NoSuchElementException if ds does not include an {@link OsmPrimitive} with id=<code>id</code>
    114114     */
    115     protected void remember(DataSet ds, long id, OsmPrimitiveType type) throws IllegalArgumentException, NoSuchElementException{
     115    protected void remember(DataSet ds, long id, OsmPrimitiveType type) throws NoSuchElementException{
    116116        CheckParameterUtil.ensureParameterNotNull(ds, "ds");
    117117        if (id <= 0) return;
  • trunk/src/org/openstreetmap/josm/io/OsmApi.java

    r8285 r8291  
    9090     * @param serverUrl  the server URL
    9191     * @return the OsmApi
    92      * @throws IllegalArgumentException thrown, if serverUrl is null
     92     * @throws IllegalArgumentException if serverUrl is null
    9393     *
    9494     */
     
    134134     *
    135135     * @param serverUrl the server URL. Must not be null
    136      * @throws IllegalArgumentException thrown, if serverUrl is null
     136     * @throws IllegalArgumentException if serverUrl is null
    137137     */
    138138    protected OsmApi(String serverUrl)  {
     
    417417     * @param progressMonitor the progress monitor
    418418     * @throws OsmTransferException signifying a non-200 return code, or connection errors
    419      * @throws IllegalArgumentException thrown if changeset is null
     419     * @throws IllegalArgumentException if changeset is null
    420420     */
    421421    public void openChangeset(Changeset changeset, ProgressMonitor progressMonitor) throws OsmTransferException {
     
    487487     *
    488488     * @throws OsmTransferException if something goes wrong.
    489      * @throws IllegalArgumentException thrown if changeset is null
    490      * @throws IllegalArgumentException thrown if changeset.getId() &lt;= 0
     489     * @throws IllegalArgumentException if changeset is null
     490     * @throws IllegalArgumentException if changeset.getId() &lt;= 0
    491491     */
    492492    public void closeChangeset(Changeset changeset, ProgressMonitor monitor) throws OsmTransferException {
     
    756756     * Ensures that the current changeset can be used for uploading data
    757757     *
    758      * @throws OsmTransferException thrown if the current changeset can't be used for
    759      * uploading data
     758     * @throws OsmTransferException if the current changeset can't be used for uploading data
    760759     */
    761760    protected void ensureValidChangeset() throws OsmTransferException {
     
    781780     *
    782781     * @param changeset the changeset
    783      * @throws IllegalArgumentException thrown if changeset.getId() &lt;= 0
    784      * @throws IllegalArgumentException thrown if !changeset.isOpen()
     782     * @throws IllegalArgumentException if changeset.getId() &lt;= 0
     783     * @throws IllegalArgumentException if !changeset.isOpen()
    785784     */
    786785    public void setChangeset(Changeset changeset) {
  • trunk/src/org/openstreetmap/josm/io/OsmChangeBuilder.java

    r6889 r8291  
    7070     * Writes the prolog of the OsmChange document
    7171     *
    72      * @throws IllegalStateException thrown if the prologs has already been written
     72     * @throws IllegalStateException if the prologs has already been written
    7373     */
    74     public void start() throws IllegalStateException{
     74    public void start() {
    7575        if (prologWritten)
    7676            throw new IllegalStateException(tr("Prolog of OsmChange document already written. Please write only once."));
     
    8585     *
    8686     * @param primitives the collection of primitives. Ignored if null.
    87      * @throws IllegalStateException thrown if the prologs has not been written yet
     87     * @throws IllegalStateException if the prologs has not been written yet
    8888     * @see #start()
    8989     * @see #append(IPrimitive)
    9090     */
    91     public void append(Collection<? extends IPrimitive> primitives) throws IllegalStateException{
     91    public void append(Collection<? extends IPrimitive> primitives) {
    9292        if (primitives == null) return;
    9393        if (!prologWritten)
     
    102102     *
    103103     * @param p the primitive. Ignored if null.
    104      * @throws IllegalStateException thrown if the prologs has not been written yet
     104     * @throws IllegalStateException if the prologs has not been written yet
    105105     * @see #start()
    106106     * @see #append(Collection)
    107 
    108107     */
    109108    public void append(IPrimitive p) {
     
    117116     * Writes the epilog of the OsmChange document
    118117     *
    119      * @throws IllegalStateException thrown if the prologs has not been written yet
     118     * @throws IllegalStateException if the prologs has not been written yet
    120119     */
    121     public void finish() throws IllegalStateException {
     120    public void finish() {
    122121        if (!prologWritten)
    123122            throw new IllegalStateException(tr("Prolog of OsmChange document not written yet. Please write first."));
  • trunk/src/org/openstreetmap/josm/io/OsmChangeReader.java

    r7937 r8291  
    103103     *
    104104     * @return the dataset with the parsed data
    105      * @throws IllegalDataException thrown if the an error was found while parsing the data from the source
    106      * @throws IllegalArgumentException thrown if source is <code>null</code>
     105     * @throws IllegalDataException if the an error was found while parsing the data from the source
     106     * @throws IllegalArgumentException if source is <code>null</code>
    107107     */
    108108    public static DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
  • trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java

    r8287 r8291  
    269269     *
    270270     * @return the list of changesets
    271      * @throws IllegalDataException thrown if the an error was found while parsing the data from the source
     271     * @throws IllegalDataException if the an error was found while parsing the data from the source
    272272     */
    273273    @SuppressWarnings("resource")
  • trunk/src/org/openstreetmap/josm/io/OsmConnection.java

    r7082 r8291  
    7373     *
    7474     * @param con the connection
    75      * @throws OsmTransferException thrown if something went wrong. Check for nested exceptions
     75     * @throws OsmTransferException if something went wrong. Check for nested exceptions
    7676     */
    7777    protected void addBasicAuthorizationHeader(HttpURLConnection con) throws OsmTransferException {
     
    110110     * @param connection the connection
    111111     *
    112      * @throws OsmTransferException thrown if there is currently no OAuth Access Token configured
    113      * @throws OsmTransferException thrown if signing fails
     112     * @throws OsmTransferException if there is currently no OAuth Access Token configured
     113     * @throws OsmTransferException if signing fails
    114114     */
    115115    protected void addOAuthAuthorizationHeader(HttpURLConnection connection) throws OsmTransferException {
  • trunk/src/org/openstreetmap/josm/io/OsmExporter.java

    r7562 r8291  
    6363     * @throws IllegalArgumentException if {@code layer} is not an instance of {@code OsmDataLayer}
    6464     */
    65     public void exportData(File file, Layer layer, boolean noBackup) throws IllegalArgumentException {
     65    public void exportData(File file, Layer layer, boolean noBackup) {
    6666        checkOsmDataLayer(layer);
    6767        save(file, (OsmDataLayer) layer, noBackup);
    6868    }
    6969
    70     protected static void checkOsmDataLayer(Layer layer) throws IllegalArgumentException {
     70    protected static void checkOsmDataLayer(Layer layer) {
    7171        if (!(layer instanceof OsmDataLayer)) {
    7272            throw new IllegalArgumentException(MessageFormat.format("Expected instance of OsmDataLayer. Got ''{0}''.", layer
  • trunk/src/org/openstreetmap/josm/io/OsmReader.java

    r8126 r8291  
    644644     *
    645645     * @return the dataset with the parsed data
    646      * @throws IllegalDataException thrown if the an error was found while parsing the data from the source
    647      * @throws IllegalArgumentException thrown if source is null
     646     * @throws IllegalDataException if the an error was found while parsing the data from the source
     647     * @throws IllegalArgumentException if source is null
    648648     */
    649649    public static DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
  • trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java

    r7092 r8291  
    4747     * @param primitive  the primitive to be read. Must not be null. primitive.id &gt; 0 expected
    4848     *
    49      * @exception IllegalArgumentException thrown if primitive is null
    50      * @exception IllegalArgumentException thrown if primitive.id &lt;= 0
    51      */
    52     public OsmServerBackreferenceReader(OsmPrimitive primitive) throws IllegalArgumentException {
     49     * @throws IllegalArgumentException if primitive is null
     50     * @throws IllegalArgumentException if primitive.id &lt;= 0
     51     */
     52    public OsmServerBackreferenceReader(OsmPrimitive primitive) {
    5353        CheckParameterUtil.ensureValidPrimitiveId(primitive, "primitive");
    5454        this.id = primitive.getId();
     
    6363     * @param type the type of the primitive. Must not be null.
    6464     *
    65      * @exception IllegalArgumentException thrown if id &lt;= 0
    66      * @exception IllegalArgumentException thrown if type is null
    67      *
    68      */
    69     public OsmServerBackreferenceReader(long id, OsmPrimitiveType type) throws IllegalArgumentException   {
     65     * @throws IllegalArgumentException if id &lt;= 0
     66     * @throws IllegalArgumentException if type is null
     67     */
     68    public OsmServerBackreferenceReader(long id, OsmPrimitiveType type) {
    7069        if (id <= 0)
    7170            throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got ''{1}''.", "id", id));
     
    9594     * @param readFull true, if referers should be read fully (i.e. including their immediate children)
    9695     *
    97      * @exception IllegalArgumentException thrown if id &lt;= 0
    98      * @exception IllegalArgumentException thrown if type is null
    99      *
    100      */
    101     public OsmServerBackreferenceReader(long id, OsmPrimitiveType type, boolean readFull) throws IllegalArgumentException  {
     96     * @throws IllegalArgumentException if id &lt;= 0
     97     * @throws IllegalArgumentException if type is null
     98     */
     99    public OsmServerBackreferenceReader(long id, OsmPrimitiveType type, boolean readFull)  {
    102100        this(id, type);
    103101        this.readFull = readFull;
     
    185183     * @param progressMonitor  the progress monitor
    186184     * @return the modified dataset
    187      * @throws OsmTransferException thrown if an exception occurs.
     185     * @throws OsmTransferException if an exception occurs.
    188186     */
    189187    protected DataSet readIncompletePrimitives(DataSet ds, ProgressMonitor progressMonitor) throws OsmTransferException {
     
    224222     * @param progressMonitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null.
    225223     * @return the dataset with the referring primitives
    226      * @exception OsmTransferException thrown if an error occurs while communicating with the server
     224     * @throws OsmTransferException if an error occurs while communicating with the server
    227225     */
    228226    @Override
  • trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java

    r7704 r8291  
    5858     * @param monitor a progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null
    5959     * @return the list of changesets read from the server
    60      * @throws IllegalArgumentException thrown if query is null
    61      * @throws OsmTransferException thrown if something goes wrong w
     60     * @throws IllegalArgumentException if query is null
     61     * @throws OsmTransferException if something goes wrong w
    6262     */
    6363    public List<Changeset> queryChangesets(ChangesetQuery query, ProgressMonitor monitor) throws OsmTransferException {
     
    9696     * @param monitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null
    9797     * @return the changeset read
    98      * @throws OsmTransferException thrown if something goes wrong
     98     * @throws OsmTransferException if something goes wrong
    9999     * @throws IllegalArgumentException if id &lt;= 0
    100100     * @since 7704
     
    137137     * @param monitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null
    138138     * @return the changeset read
    139      * @throws OsmTransferException thrown if something goes wrong
     139     * @throws OsmTransferException if something goes wrong
    140140     * @throws IllegalArgumentException if id &lt;= 0
    141141     * @since 7704
     
    187187     * @param monitor the progress monitor. {@link NullProgressMonitor#INSTANCE} assumed if null.
    188188     * @return the changeset content
    189      * @throws IllegalArgumentException thrown if id &lt;= 0
    190      * @throws OsmTransferException thrown if something went wrong
    191      */
    192     public ChangesetDataSet downloadChangeset(int id, ProgressMonitor monitor) throws IllegalArgumentException, OsmTransferException {
     189     * @throws IllegalArgumentException if id &lt;= 0
     190     * @throws OsmTransferException if something went wrong
     191     */
     192    public ChangesetDataSet downloadChangeset(int id, ProgressMonitor monitor) throws OsmTransferException {
    193193        if (id <= 0)
    194194            throw new IllegalArgumentException(MessageFormat.format("Expected value of type integer > 0 for parameter ''{0}'', got {1}", "id", id));
  • trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java

    r7033 r8291  
    2929     * @param id the id of the primitive
    3030     *
    31      *  @exception IllegalArgumentException thrown, if type is null
     31     *  @throws IllegalArgumentException if type is null
    3232     */
    33     public OsmServerHistoryReader(OsmPrimitiveType type, long id) throws IllegalArgumentException {
     33    public OsmServerHistoryReader(OsmPrimitiveType type, long id) {
    3434        CheckParameterUtil.ensureParameterNotNull(type, "type");
    3535        if (id < 0)
     
    5252     *
    5353     * @return the data set with the parsed history data
    54      * @throws OsmTransferException thrown, if an exception occurs
     54     * @throws OsmTransferException if an exception occurs
    5555     */
    5656    public HistoryDataSet parseHistory(ProgressMonitor progressMonitor) throws OsmTransferException {
  • trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java

    r7432 r8291  
    4040     * @param full true, if a full download is requested (i.e. a download including
    4141     * immediate children); false, otherwise
    42      * @throws IllegalArgumentException thrown if id &lt;= 0
    43      * @throws IllegalArgumentException thrown if type is null
     42     * @throws IllegalArgumentException if id &lt;= 0
     43     * @throws IllegalArgumentException if type is null
    4444     */
    45     public OsmServerObjectReader(long id, OsmPrimitiveType type, boolean full) throws IllegalArgumentException {
     45    public OsmServerObjectReader(long id, OsmPrimitiveType type, boolean full) {
    4646        this(id, type, full, -1);
    4747    }
     
    5353     * @param type the type. Must not be null.
    5454     * @param version the specific version number, if required; -1, otherwise
    55      * @throws IllegalArgumentException thrown if id &lt;= 0
    56      * @throws IllegalArgumentException thrown if type is null
     55     * @throws IllegalArgumentException if id &lt;= 0
     56     * @throws IllegalArgumentException if type is null
    5757     */
    58     public OsmServerObjectReader(long id, OsmPrimitiveType type, int version) throws IllegalArgumentException {
     58    public OsmServerObjectReader(long id, OsmPrimitiveType type, int version) {
    5959        this(id, type, false, version);
    6060    }
    6161
    62     protected OsmServerObjectReader(long id, OsmPrimitiveType type, boolean full, int version) throws IllegalArgumentException {
     62    protected OsmServerObjectReader(long id, OsmPrimitiveType type, boolean full, int version) {
    6363        if (id <= 0)
    6464            throw new IllegalArgumentException(MessageFormat.format("Expected value > 0 for parameter ''{0}'', got {1}", "id", id));
     
    7575     * @param full true, if a full download is requested (i.e. a download including
    7676     * immediate children); false, otherwise
    77      * @throws IllegalArgumentException thrown if id is null
    78      * @throws IllegalArgumentException thrown if id.getUniqueId() &lt;= 0
     77     * @throws IllegalArgumentException if id is null
     78     * @throws IllegalArgumentException if id.getUniqueId() &lt;= 0
    7979     */
    8080    public OsmServerObjectReader(PrimitiveId id, boolean full) {
     
    8787     * @param id the object id. Must not be null. Unique id &gt; 0 required.
    8888     * @param version the specific version number, if required; -1, otherwise
    89      * @throws IllegalArgumentException thrown if id is null
    90      * @throws IllegalArgumentException thrown if id.getUniqueId() &lt;= 0
     89     * @throws IllegalArgumentException if id is null
     90     * @throws IllegalArgumentException if id.getUniqueId() &lt;= 0
    9191     */
    9292    public OsmServerObjectReader(PrimitiveId id, int version) {
  • trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

    r8218 r8291  
    4646     * @param progressMonitor progress monitoring and abort handler
    4747     * @return A reader reading the input stream (servers answer) or <code>null</code>.
    48      * @throws OsmTransferException thrown if data transfer errors occur
     48     * @throws OsmTransferException if data transfer errors occur
    4949     */
    5050    protected InputStream getInputStream(String urlStr, ProgressMonitor progressMonitor) throws OsmTransferException  {
     
    6060     * @param reason The reason to show on console. Can be {@code null} if no reason is given
    6161     * @return A reader reading the input stream (servers answer) or <code>null</code>.
    62      * @throws OsmTransferException thrown if data transfer errors occur
     62     * @throws OsmTransferException if data transfer errors occur
    6363     */
    6464    protected InputStream getInputStream(String urlStr, ProgressMonitor progressMonitor, String reason) throws OsmTransferException  {
     
    8686     * @param progressMonitor progress monitoring and abort handler
    8787     * @return An reader reading the input stream (servers answer) or <code>null</code>.
    88      * @throws OsmTransferException thrown if data transfer errors occur
     88     * @throws OsmTransferException if data transfer errors occur
    8989     */
    9090    protected InputStream getInputStreamRaw(String urlStr, ProgressMonitor progressMonitor) throws OsmTransferException {
     
    9999     * @param reason The reason to show on console. Can be {@code null} if no reason is given
    100100     * @return An reader reading the input stream (servers answer) or <code>null</code>.
    101      * @throws OsmTransferException thrown if data transfer errors occur
     101     * @throws OsmTransferException if data transfer errors occur
    102102     */
    103103    protected InputStream getInputStreamRaw(String urlStr, ProgressMonitor progressMonitor, String reason) throws OsmTransferException {
     
    114114     *                                                for {@code filename} and uncompress a gzip/bzip2 stream.
    115115     * @return An reader reading the input stream (servers answer) or <code>null</code>.
    116      * @throws OsmTransferException thrown if data transfer errors occur
     116     * @throws OsmTransferException if data transfer errors occur
    117117     */
    118118    @SuppressWarnings("resource")
  • trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

    r8285 r8291  
    8383     * @param primitives the collection of primitives to upload
    8484     * @param progressMonitor the progress monitor
    85      * @throws OsmTransferException thrown if an exception occurs
     85     * @throws OsmTransferException if an exception occurs
    8686     */
    8787    protected void uploadChangesIndividually(Collection<? extends OsmPrimitive> primitives, ProgressMonitor progressMonitor) throws OsmTransferException {
     
    125125     * @param primitives the collection of primitives to upload
    126126     * @param progressMonitor  the progress monitor
    127      * @throws OsmTransferException thrown if an exception occurs
     127     * @throws OsmTransferException if an exception occurs
    128128     */
    129129    protected void uploadChangesAsDiffUpload(Collection<? extends OsmPrimitive> primitives, ProgressMonitor progressMonitor) throws OsmTransferException {
     
    144144     * @param progressMonitor  the progress monitor
    145145     * @param chunkSize the size of the individual upload chunks. &gt; 0 required.
    146      * @throws IllegalArgumentException thrown if chunkSize &lt;= 0
    147      * @throws OsmTransferException thrown if an exception occurs
     146     * @throws IllegalArgumentException if chunkSize &lt;= 0
     147     * @throws OsmTransferException if an exception occurs
    148148     */
    149149    protected void uploadChangesInChunks(Collection<? extends OsmPrimitive> primitives, ProgressMonitor progressMonitor, int chunkSize) throws OsmTransferException, IllegalArgumentException {
     
    186186     * @param changeset the changeset the data is uploaded to. Must not be null.
    187187     * @param monitor the progress monitor. If null, assumes {@link NullProgressMonitor#INSTANCE}
    188      * @throws IllegalArgumentException thrown if changeset is null
    189      * @throws IllegalArgumentException thrown if strategy is null
    190      * @throws OsmTransferException thrown if something goes wrong
     188     * @throws IllegalArgumentException if changeset is null
     189     * @throws IllegalArgumentException if strategy is null
     190     * @throws OsmTransferException if something goes wrong
    191191     */
    192192    public void uploadOsm(UploadStrategySpecification strategy, Collection<? extends OsmPrimitive> primitives, Changeset changeset, ProgressMonitor monitor) throws OsmTransferException {
  • trunk/src/org/openstreetmap/josm/io/auth/CredentialsAgent.java

    r6830 r8291  
    2828     * @param host the hostname for these credentials
    2929     * @return the credentials
    30      * @throws CredentialsAgentException thrown if a problem occurs in a implementation of this interface
     30     * @throws CredentialsAgentException if a problem occurs in a implementation of this interface
    3131     */
    3232    PasswordAuthentication lookup(RequestorType requestorType, String host) throws CredentialsAgentException;
     
    3939     * @param host the hostname for these credentials
    4040     * @param credentials the credentials
    41      * @throws CredentialsAgentException thrown if a problem occurs in a implementation of this interface
     41     * @throws CredentialsAgentException if a problem occurs in a implementation of this interface
    4242     */
    4343    void store(RequestorType requestorType, String host, PasswordAuthentication credentials) throws CredentialsAgentException;
     
    5050     * @param noSuccessWithLastResponse true, if the last request with the supplied credentials failed; false otherwise.
    5151     * If true, implementations of this interface are advised to prompt the user for new credentials.
    52      * @throws CredentialsAgentException thrown if a problem occurs in a implementation of this interface
     52     * @throws CredentialsAgentException if a problem occurs in a implementation of this interface
    5353
    5454     */
     
    6060     *
    6161     * @return the current OAuth Access Token to access the OSM server.
    62      * @throws CredentialsAgentException thrown if something goes wrong
     62     * @throws CredentialsAgentException if something goes wrong
    6363     */
    6464    OAuthToken lookupOAuthAccessToken() throws CredentialsAgentException;
     
    6868     *
    6969     * @param accessToken the access Token. null, to remove the Access Token.
    70      * @throws CredentialsAgentException thrown if something goes wrong
     70     * @throws CredentialsAgentException if something goes wrong
    7171     */
    7272    void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsAgentException;
  • trunk/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialAgent.java

    r7083 r8291  
    9999     *
    100100     * @return the current OAuth Access Token to access the OSM server.
    101      * @throws CredentialsAgentException thrown if something goes wrong
     101     * @throws CredentialsAgentException if something goes wrong
    102102     */
    103103    @Override
     
    114114     *
    115115     * @param accessToken the access Token. null, to remove the Access Token.
    116      * @throws CredentialsAgentException thrown if something goes wrong
     116     * @throws CredentialsAgentException if something goes wrong
    117117     */
    118118    @Override
  • trunk/src/org/openstreetmap/josm/io/remotecontrol/DNSName.java

    r7937 r8291  
    118118     *
    119119     * @param out the DER stream to encode the DNSName to.
    120      * @exception IOException on encoding errors.
     120     * @throws IOException on encoding errors.
    121121     */
    122122    @Override
Note: See TracChangeset for help on using the changeset viewer.