Changeset 1677 in josm for trunk/src/org/openstreetmap/josm/actions/UploadAction.java
- Timestamp:
- 2009-06-17T10:04:22+02:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/UploadAction.java
r1670 r1677 42 42 * An dialog is displayed asking the user to specify a rectangle to grab. 43 43 * The url and account settings from the preferences are used. 44 * 44 * 45 45 * If the upload fails this action offers various options to resolve conflicts. 46 46 * … … 236 236 * Synchronizes the local state of an {@see OsmPrimitive} with its state on the 237 237 * server. The method uses an individual GET for the primitive. 238 * 238 * 239 239 * @param id the primitive ID 240 240 */ … … 286 286 /** 287 287 * Synchronizes the local state of the dataset with the state on the server. 288 * 288 * 289 289 * Reuses the functionality of {@see UpdateDataAction}. 290 * 290 * 291 291 * @see UpdateDataAction#actionPerformed(ActionEvent) 292 292 */ … … 299 299 * Handles the case that a conflict in a specific {@see OsmPrimitive} was detected while 300 300 * uploading 301 * 301 * 302 302 * @param primitiveType the type of the primitive, either <code>node</code>, <code>way</code> or 303 303 * <code>relation</code> … … 349 349 * Handles the case that a conflict was detected while uploading where we don't 350 350 * know what {@see OsmPrimitive} actually caused the conflict (for whatever reason) 351 * 351 * 352 352 */ 353 353 protected void handleUploadConflictForUnknownConflict() { … … 387 387 /** 388 388 * handles an upload conflict, i.e. an error indicated by a HTTP return code 409. 389 * 389 * 390 390 * @param e the exception 391 391 */ … … 404 404 /** 405 405 * Handles an upload error due to a violated precondition, i.e. a HTTP return code 412 406 * 406 * 407 407 * @param e the exception 408 408 */ … … 428 428 * {@see OsmPrimitive}, i.e. a HTTP response code 410, where we know what 429 429 * {@see OsmPrimitive} is responsible for the error. 430 * 430 * 431 431 * Reuses functionality of the {@see UpdateSelectionAction} to resolve 432 432 * conflicts due to mismatches in the deleted state. 433 * 433 * 434 434 * @param primitiveType the type of the primitive 435 435 * @param id the id of the primitive 436 * 436 * 437 437 * @see UpdateSelectionAction#handlePrimitiveGoneException(long) 438 438 */ … … 446 446 * {@see OsmPrimitive}, i.e. a HTTP response code 410, where we don't know which 447 447 * {@see OsmPrimitive} is causing the error. 448 * 448 * 449 449 * @param e the exception 450 450 */ … … 472 472 * Note that an <strong>update</strong> on an already deleted object results 473 473 * in a 409, not a 410. 474 * 474 * 475 475 * @param e the exception 476 476 */ … … 490 490 /** 491 491 * error handler for any exception thrown during upload 492 * 492 * 493 493 * @param e the exception 494 494 */ … … 543 543 /** 544 544 * handles an exception caught during OSM API initialization 545 * 545 * 546 546 * @param e the exception 547 547 */
Note:
See TracChangeset
for help on using the changeset viewer.