Ignore:
Timestamp:
2018-02-18T14:13:19+01:00 (21 months ago)
Author:
Don-vip
Message:

see #8039, see #10456 - fix regressions and code style issues

Location:
trunk/src/org/openstreetmap/josm/gui/layer
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/layer/MainLayerManager.java

    r13434 r13435  
    496496     * @param layer The OsmDataLayer to be uploaded
    497497     */
    498     public void prepareLayerForUpload(OsmDataLayer layer) {
     498    public synchronized void prepareLayerForUpload(OsmDataLayer layer) {
    499499        GuiHelper.assertCallFromEdt();
    500500        layer.setUploadInProgress();
     
    516516     * @param layer The OsmDataLayer uploaded
    517517     */
    518     public void processLayerAfterUpload(OsmDataLayer layer) {
     518    public synchronized void processLayerAfterUpload(OsmDataLayer layer) {
    519519        GuiHelper.assertCallFromEdt();
    520520        layer.unsetReadOnly();
  • trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

    r13434 r13435  
    11881188    }
    11891189
     1190    /**
     1191     * Sets the "upload in progress" flag, which will result in displaying a new icon and forbid to remove the layer.
     1192     * @since 13434
     1193     */
    11901194    public void setUploadInProgress() {
    11911195        if (!isUploadInProgress.compareAndSet(false, true)) {
     
    11941198    }
    11951199
     1200    /**
     1201     * Unsets the "upload in progress" flag, which will result in displaying the standard icon and allow to remove the layer.
     1202     * @since 13434
     1203     */
    11961204    public void unsetUploadInProgress() {
    11971205        if (!isUploadInProgress.compareAndSet(true, false)) {
Note: See TracChangeset for help on using the changeset viewer.