Changeset 10611 in josm for trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
- Timestamp:
- 2016-07-23T18:46:45+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
r10428 r10611 579 579 @Override 580 580 public void run() { 581 GuiHelper.runInEDTAndWait(new Runnable() { 582 @Override 583 public void run() { 584 model.setMode(SaveLayersModel.Mode.UPLOADING_AND_SAVING); 585 List<SaveLayerInfo> toUpload = model.getLayersToUpload(); 586 if (!toUpload.isEmpty()) { 587 uploadLayers(toUpload); 588 } 589 List<SaveLayerInfo> toSave = model.getLayersToSave(); 590 if (!toSave.isEmpty()) { 591 saveLayers(toSave); 592 } 593 model.setMode(SaveLayersModel.Mode.EDITING_DATA); 594 if (model.hasUnsavedData()) { 595 warnBecauseOfUnsavedData(); 596 model.setMode(Mode.EDITING_DATA); 597 if (canceled) { 598 setUserAction(UserAction.CANCEL); 599 closeDialog(); 600 } 601 } else { 602 setUserAction(UserAction.PROCEED); 581 GuiHelper.runInEDTAndWait(() -> { 582 model.setMode(SaveLayersModel.Mode.UPLOADING_AND_SAVING); 583 List<SaveLayerInfo> toUpload = model.getLayersToUpload(); 584 if (!toUpload.isEmpty()) { 585 uploadLayers(toUpload); 586 } 587 List<SaveLayerInfo> toSave = model.getLayersToSave(); 588 if (!toSave.isEmpty()) { 589 saveLayers(toSave); 590 } 591 model.setMode(SaveLayersModel.Mode.EDITING_DATA); 592 if (model.hasUnsavedData()) { 593 warnBecauseOfUnsavedData(); 594 model.setMode(Mode.EDITING_DATA); 595 if (canceled) { 596 setUserAction(UserAction.CANCEL); 603 597 closeDialog(); 604 598 } 599 } else { 600 setUserAction(UserAction.PROCEED); 601 closeDialog(); 605 602 } 606 603 });
Note:
See TracChangeset
for help on using the changeset viewer.